Merge branch 'develop' into activitypub

install/package.json

@@ -110,7 +110,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",
@@ -144,7 +144,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",

public/language/zh-CN/topic.json

@@ -42,10 +42,10 @@
     "copy-ip": "复制IP",
     "ban-ip": "封禁 IP",
     "view-history": "编辑历史",
-    "wrote-ago": "编写<a href=\"%1\" class=\"timeago text-muted\" title=\"%2\"></a>",
+    "wrote-ago": "编写于<a href=\"%1\" class=\"timeago text-muted\" title=\"%2\"></a>",
     "wrote-on": "写于<a href=\"%1\" class=\"timeago text-muted\" title=\"%2\"></a>",
     "replied-to-user-ago": "回复了<a component=\"post/parent\" data-topid=\"%1\" href=\"%2\">%3</a> <a href=\"%4\" class=\"timeago text-muted\" title=\"%5\"></a>",
-    "replied-to-user-on": "在 <a href=\"%4\" class=\"timeago text-muted\" title=\"%5\"></a> 中回复了 <a component=\"post/parent\" data-topid=\"%1\" href=\"%2\">%3</a>",
+    "replied-to-user-on": "在 <a href=\"%4\" class=\"timeago text-muted\" title=\"%5\"></a> 回复了 <a component=\"post/parent\" data-topid=\"%1\" href=\"%2\">%3</a>",
     "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": "此主题已并入<a href=\"/topic/%1\">%2</a>",
-    "forked-message": "This topic was forked from <a href=\"%1\">%2</a>",
+    "merged-message": "此主题已合并到<a href=\"/topic/%1\">%2</a>",
+    "forked-message": "此主题由 <a href=\"%1\">%2</a> 分支而来",
     "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": "踩帖",

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": "没有原因",

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('');