Merge branch 'main' of github.com:AsakuraMizu/Learn-Helper

package.json

@@ -28,7 +28,7 @@
     "@samrum/vite-plugin-web-extension": "^5.0.0",
     "@svgr/core": "^8.1.0",
     "@svgr/plugin-jsx": "^8.1.0",
-    "@types/node": "^18.11.11",
+    "@types/node": "^20.7.0",
     "@types/randomstring": "^1.1.8",
     "@types/react": "^18.2.23",
     "@types/react-dom": "^18.2.7",

src/components/pages/About.tsx

@@ -11,7 +11,7 @@ import AboutZH from './zh/About.md';
 import AboutEN from './en/About.md';
 
 const About = () => {
-  const { i18n } = useLingui()
+  const { i18n } = useLingui();
   const dispatch = useAppDispatch();
 
   return (

src/components/pages/Changelog.tsx

@@ -11,7 +11,7 @@ import ChangelogZH from '../../../CHANGELOG_ZH.md';
 import ChangelogEN from '../../../CHANGELOG.md';
 
 const Changelog = () => {
-  const { i18n } = useLingui()
+  const { i18n } = useLingui();
   const dispatch = useAppDispatch();
 
   return (

src/components/pages/Readme.tsx

@@ -11,7 +11,7 @@ import ReadmeZH from './zh/Readme.mdx';
 import ReadmeEN from './en/Readme.mdx';
 
 const Readme = () => {
-  const { i18n } = useLingui()
+  const { i18n } = useLingui();
   const dispatch = useAppDispatch();
 
   return (

src/constants/ui.tsx

@@ -153,7 +153,7 @@ export const SETTINGS_FUNC_LIST = [
   },
   {
     icon: <IconEnvelopeOpen />,
-    name: msg`标记为已读`,
+    name: msg`全部标记已读`,
     handler: (dispatch: AppDispatch) => {
       dispatch(markAllRead());
     },

src/locales/en.po

@@ -77,81 +77,80 @@ msgstr "Nothing here"
 msgid "加载更多"
 msgstr "Load more"
 
-#: src/components/ContentCard.tsx:123
+#: src/components/ContentCard.tsx:129
 msgid "已提交"
 msgstr "Submitted"
 
-#: src/components/ContentCard.tsx:123
+#: src/components/ContentCard.tsx:129
 msgid "未提交"
 msgstr "Unsubmitted"
 
-#: src/components/ContentCard.tsx:129
+#: src/components/ContentCard.tsx:135
 msgid "{0}分"
 msgstr "{0}"
 
-#: src/components/ContentCard.tsx:130
+#: src/components/ContentCard.tsx:136
 #: src/components/ContentDetail.tsx:146
 msgid "无评分"
 msgstr "No grade"
 
-#: src/components/ContentCard.tsx:130
+#: src/components/ContentCard.tsx:136
 msgid "（{0}）"
 msgstr "({0})"
 
-#: src/components/ContentCard.tsx:131
+#: src/components/ContentCard.tsx:137
 msgid "未批阅"
 msgstr "Not graded"
 
-#: src/components/ContentCard.tsx:133
+#: src/components/ContentCard.tsx:139
 msgid "重要"
 msgstr "Important"
 
-#: src/components/ContentCard.tsx:135
+#: src/components/ContentCard.tsx:141
 msgid "发布者:{0}"
 msgstr "Publisher:{0}"
 
-#: src/components/ContentCard.tsx:141
+#: src/components/ContentCard.tsx:147
 msgid "回复:{0}"
 msgstr "Replies:{0}"
 
-#: src/components/ContentCard.tsx:142
+#: src/components/ContentCard.tsx:148
 msgid "最后回复:{0}"
 msgstr "Latest replier:{0}"
 
-#: src/components/ContentCard.tsx:149
+#: src/components/ContentCard.tsx:155
 msgid "取消星标"
 msgstr "Unstar"
 
-#: src/components/ContentCard.tsx:149
+#: src/components/ContentCard.tsx:155
 msgid "加星标"
 msgstr "Star"
 
-#: src/components/ContentCard.tsx:168
+#: src/components/ContentCard.tsx:174
 msgid "标记为未读"
 msgstr "Mark as unread"
 
-#: src/components/ContentCard.tsx:168
-#: src/constants/ui.tsx:156
+#: src/components/ContentCard.tsx:174
 msgid "标记为已读"
 msgstr "Mark as read"
 
-#: src/components/ContentCard.tsx:185
+#: src/components/ContentCard.tsx:191
 msgid "取消忽略此项"
 msgstr "Unignore"
 
-#: src/components/ContentCard.tsx:185
+#: src/components/ContentCard.tsx:191
 msgid "忽略此项"
 msgstr "Ignore"
 
-#: src/components/ContentCard.tsx:207
+#: src/components/ContentCard.tsx:213
 msgid "提交作业"
 msgstr "Submit homework"
 
-#: src/components/ContentCard.tsx:224
+#: src/components/ContentCard.tsx:230
 msgid "下载文件"
 msgstr "Download file"
 
-#: src/components/ContentCard.tsx:240
+#: src/components/ContentCard.tsx:246
 msgid "附件：{0}"
 msgstr "Attachment: {0}"
 
@@ -540,6 +539,10 @@ msgstr "Discussion"
 msgid "答疑"
 msgstr "Q&A"
 
+#: src/constants/ui.tsx:156
+msgid "全部标记已读"
+msgstr "Mark all as read"
+
 #: src/constants/ui.tsx:163
 msgid "手动刷新"
 msgstr "Refresh"

src/locales/zh.po

@@ -77,81 +77,80 @@ msgstr "这里什么也没有"
 msgid "加载更多"
 msgstr "加载更多"
 
-#: src/components/ContentCard.tsx:123
+#: src/components/ContentCard.tsx:129
 msgid "已提交"
 msgstr "已提交"
 
-#: src/components/ContentCard.tsx:123
+#: src/components/ContentCard.tsx:129
 msgid "未提交"
 msgstr "未提交"
 
-#: src/components/ContentCard.tsx:129
+#: src/components/ContentCard.tsx:135
 msgid "{0}分"
 msgstr "{0}分"
 
-#: src/components/ContentCard.tsx:130
+#: src/components/ContentCard.tsx:136
 #: src/components/ContentDetail.tsx:146
 msgid "无评分"
 msgstr "无评分"
 
-#: src/components/ContentCard.tsx:130
+#: src/components/ContentCard.tsx:136
 msgid "（{0}）"
 msgstr "（{0}）"
 
-#: src/components/ContentCard.tsx:131
+#: src/components/ContentCard.tsx:137
 msgid "未批阅"
 msgstr "未批阅"
 
-#: src/components/ContentCard.tsx:133
+#: src/components/ContentCard.tsx:139
 msgid "重要"
 msgstr "重要"
 
-#: src/components/ContentCard.tsx:135
+#: src/components/ContentCard.tsx:141
 msgid "发布者:{0}"
 msgstr "发布者:{0}"
 
-#: src/components/ContentCard.tsx:141
+#: src/components/ContentCard.tsx:147
 msgid "回复:{0}"
 msgstr "回复:{0}"
 
-#: src/components/ContentCard.tsx:142
+#: src/components/ContentCard.tsx:148
 msgid "最后回复:{0}"
 msgstr "最后回复:{0}"
 
-#: src/components/ContentCard.tsx:149
+#: src/components/ContentCard.tsx:155
 msgid "取消星标"
 msgstr "取消星标"
 
-#: src/components/ContentCard.tsx:149
+#: src/components/ContentCard.tsx:155
 msgid "加星标"
 msgstr "加星标"
 
-#: src/components/ContentCard.tsx:168
+#: src/components/ContentCard.tsx:174
 msgid "标记为未读"
 msgstr "标记为未读"
 
-#: src/components/ContentCard.tsx:168
-#: src/constants/ui.tsx:156
+#: src/components/ContentCard.tsx:174
 msgid "标记为已读"
 msgstr "标记为已读"
 
-#: src/components/ContentCard.tsx:185
+#: src/components/ContentCard.tsx:191
 msgid "取消忽略此项"
 msgstr "取消忽略此项"
 
-#: src/components/ContentCard.tsx:185
+#: src/components/ContentCard.tsx:191
 msgid "忽略此项"
 msgstr "忽略此项"
 
-#: src/components/ContentCard.tsx:207
+#: src/components/ContentCard.tsx:213
 msgid "提交作业"
 msgstr "提交作业"
 
-#: src/components/ContentCard.tsx:224
+#: src/components/ContentCard.tsx:230
 msgid "下载文件"
 msgstr "下载文件"
 
-#: src/components/ContentCard.tsx:240
+#: src/components/ContentCard.tsx:246
 msgid "附件：{0}"
 msgstr "附件：{0}"
 
@@ -540,6 +539,10 @@ msgstr "讨论"
 msgid "答疑"
 msgstr "答疑"
 
+#: src/constants/ui.tsx:156
+msgid "全部标记已读"
+msgstr "全部标记已读"
+
 #: src/constants/ui.tsx:163
 msgid "手动刷新"
 msgstr "手动刷新"

yarn.lock

@@ -1394,16 +1394,11 @@
   resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197"
   integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==
 
-"@types/node@*":
+"@types/node@*", "@types/node@^20.7.0":
   version "20.7.0"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-20.7.0.tgz#c03de4572f114a940bc2ca909a33ddb2b925e470"
   integrity sha512-zI22/pJW2wUZOVyguFaUL1HABdmSVxpXrzIqkjsHmyUjNhPoWM1CKfvVuXfetHhIok4RY573cqS0mZ1SJEnoTg==
 
-"@types/node@^18.11.11":
-  version "18.18.0"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.18.0.tgz#bd19d5133a6e5e2d0152ec079ac27c120e7f1763"
-  integrity sha512-3xA4X31gHT1F1l38ATDIL9GpRLdwVhnEFC8Uikv5ZLlXATwrCYyPq7ZWHxzxc3J/30SUiwiYT+bQe0/XvKlWbw==
-
 "@types/parse-json@^4.0.0":
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
@@ -1415,14 +1410,14 @@
   integrity sha512-FbtmBWCcSa2J4zL781Zf1p5YUBXQomPEcep9QZCfRfQgTxz3pJWiDFLebohZ9fFntX5ibzOkSsrJ0TEew8cAog==
 
 "@types/randomstring@^1.1.8":
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/@types/randomstring/-/randomstring-1.1.8.tgz#799ce94adbe162964e655df954bf3dc85576747d"
-  integrity sha512-NPOJcW+TTjT9Qiog0UjSoG3Sj24c7EfzZO39BU9E61D7fQtwNmBNblyQhSsK9+5s9Fm0o31rvX+ZyZkpE/c7jA==
+  version "1.1.9"
+  resolved "https://registry.yarnpkg.com/@types/randomstring/-/randomstring-1.1.9.tgz#807c1dc8d6539fb05c5d326e367d0695f1b03bce"
+  integrity sha512-hSC8/uMCPW0HeTb9psBWgagexhwwqBWV4VVQSsGowIVCl1jE2KTDmeTp1lD9eA3u8a48q3kmH7IcptDaGBmkdQ==
 
 "@types/react-dom@^18.2.7":
-  version "18.2.7"
-  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.2.7.tgz#67222a08c0a6ae0a0da33c3532348277c70abb63"
-  integrity sha512-GRaAEriuT4zp9N4p1i8BDBYmEyfo+xQ3yHjJU4eiK5NDa1RmUZG+unZABUTK4/Ox/M+GaHwb6Ow8rUITrtjszA==
+  version "18.2.8"
+  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.2.8.tgz#338f1b0a646c9f10e0a97208c1d26b9f473dffd6"
+  integrity sha512-bAIvO5lN/U8sPGvs1Xm61rlRHHaq5rp5N3kp9C+NJ/Q41P8iqjkXSu0+/qu8POsjH9pNWb0OYabFez7taP7omw==
   dependencies:
     "@types/react" "*"