From 115f236fba16802be0d3457a12aff0f2929cecf4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 20 Jun 2024 09:59:09 -0400 Subject: [PATCH 1/4] fix(deps): update dependency webpack to v5.92.1 (#12644) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index fb71cf959c..453d6a476e 100644 --- a/install/package.json +++ b/install/package.json @@ -143,7 +143,7 @@ "toobusy-js": "0.5.1", "tough-cookie": "4.1.4", "validator": "13.12.0", - "webpack": "5.92.0", + "webpack": "5.92.1", "webpack-merge": "5.10.0", "winston": "3.13.0", "workerpool": "9.1.2", From 94691372a660208e94ff339dac14878eb3090fd1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 20 Jun 2024 09:59:22 -0400 Subject: [PATCH 2/4] fix(deps): update dependency nodemailer to v6.9.14 (#12643) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 453d6a476e..35afca14e9 100644 --- a/install/package.json +++ b/install/package.json @@ -109,7 +109,7 @@ "nodebb-theme-peace": "2.2.5", "nodebb-theme-persona": "13.3.21", "nodebb-widget-essentials": "7.0.16", - "nodemailer": "6.9.13", + "nodemailer": "6.9.14", "nprogress": "0.2.0", "passport": "0.7.0", "passport-http-bearer": "1.0.1", From 3332480cf1f3fff4fc7a75f519dfd1050916640e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 20 Jun 2024 14:15:52 -0400 Subject: [PATCH 3/4] fix: #12645, use titleRaw like reply button --- public/src/modules/quickreply.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/modules/quickreply.js b/public/src/modules/quickreply.js index 99be979319..55aea0b769 100644 --- a/public/src/modules/quickreply.js +++ b/public/src/modules/quickreply.js @@ -115,7 +115,7 @@ define('quickreply', [ const textEl = components.get('topic/quickreply/text'); composer.newReply({ tid: ajaxify.data.tid, - title: ajaxify.data.title, + title: ajaxify.data.titleRaw, body: textEl.val(), }); textEl.val(''); From 5726199b1a7c7a21835fcfddaab5fef41d1123c7 Mon Sep 17 00:00:00 2001 From: Misty Release Bot Date: Fri, 21 Jun 2024 09:18:56 +0000 Subject: [PATCH 4/4] Latest translations and fallbacks --- public/language/zh-CN/topic.json | 10 +++++----- public/language/zh-CN/user.json | 14 +++++++------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/public/language/zh-CN/topic.json b/public/language/zh-CN/topic.json index 42a6d6a334..fb3078b586 100644 --- a/public/language/zh-CN/topic.json +++ b/public/language/zh-CN/topic.json @@ -42,10 +42,10 @@ "copy-ip": "复制IP", "ban-ip": "封禁 IP", "view-history": "编辑历史", - "wrote-ago": "编写", + "wrote-ago": "编写于", "wrote-on": "写于", "replied-to-user-ago": "回复了%3 ", - "replied-to-user-on": "在 中回复了 %3", + "replied-to-user-on": "在 回复了 %3", "user-locked-topic-ago": "%1 锁定了该主题 %2", "user-locked-topic-on": "%1 在 %2 中锁定了该主题", "user-unlocked-topic-ago": "%1 解锁了该主题 %2", @@ -72,8 +72,8 @@ "already-flagged": "已举报", "view-flag-report": "查看举报报告", "resolve-flag": "解决举报", - "merged-message": "此主题已并入%2", - "forked-message": "This topic was forked from %2", + "merged-message": "此主题已合并到%2", + "forked-message": "此主题由 %2 分支而来", "deleted-message": "此主题已被删除。只有拥有主题管理权限的用户可以查看。", "following-topic.message": "当有人回复此主题时，您会收到通知。", "not-following-topic.message": "您将在未读主题列表中看到这个主题，但您不会在帖子被回复时收到通知。", @@ -210,7 +210,7 @@ "no-more-next-post": "您在此主题中没有更多的帖子了", "open-composer": "打开编辑器", "post-quick-reply": "快速回复", - "navigator.index": "发布 %2 的 %1", + "navigator.index": "%1 / %2", "navigator.unread": "未读 %1", "upvote-post": "顶贴", "downvote-post": "踩帖", diff --git a/public/language/zh-CN/user.json b/public/language/zh-CN/user.json index 5ce0e61c62..1a38157a1a 100644 --- a/public/language/zh-CN/user.json +++ b/public/language/zh-CN/user.json @@ -1,9 +1,9 @@ { "user-menu": "用户菜单", "banned": "已封禁", - "unbanned": "Unbanned", + "unbanned": "未被封禁", "muted": "禁言", - "unmuted": "Unmuted", + "unmuted": "未被禁言", "offline": "离线", "deleted": "已删除", "username": "用户名", @@ -138,7 +138,7 @@ "open-links-in-new-tab": "在新标签打开外部链接", "enable-topic-searching": "启用主题内搜索", "topic-search-help": "如果启用此项，主题内搜索会替代浏览器默认的页面搜索，您将可以在整个主题内搜索，而不仅仅只搜索页面上展现的内容。", - "update-url-with-post-index": "浏览主题是更新链接和索引", + "update-url-with-post-index": "浏览帖子时 URL 跟随浏览中的楼层变化", "scroll-to-my-post": "在提交回复之后显示新回复", "follow-topics-you-reply-to": "关注您回复过的主题", "follow-topics-you-create": "关注您创建的主题", @@ -164,16 +164,16 @@ "sso.dissociate-confirm-title": "确认解除关联", "sso.dissociate-confirm": "您确定您要将您的账号与 %1 解除关联吗？", "info.latest-flags": "最新举报", - "info.profile": "Profile", - "info.post": "Post", + "info.profile": "资料", + "info.post": "帖子", "info.view-flag": "View flag", - "info.reported-by": "Reported by:", + "info.reported-by": "举报者：", "info.no-flags": "没有找到被举报的帖子", "info.ban-history": "最近封禁历史", "info.no-ban-history": "该用户从未被封禁", "info.banned-until": "封禁到 %1", "info.banned-expiry": "到期", - "info.ban-expired": "Ban expired", + "info.ban-expired": "封禁过期", "info.banned-permanently": "永久封禁", "info.banned-reason-label": "原因", "info.banned-no-reason": "没有原因",