diff --git a/locales/en-US.yml b/locales/en-US.yml index a70eb2406f..a16bce60f9 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -2146,6 +2146,7 @@ _notification: reacted: "reacted to your post" renoted: "boosted your post" voted: "voted on your poll" + andCountUsers: "and {count} users {acted}" _types: all: "All" follow: "New followers" @@ -2232,3 +2233,5 @@ autocorrectNoteLanguage: "Show a warning if the post language does not match the incorrectLanguageWarning: "It looks like your post is in {detected}, but you selected {current}.\nWould you like to set the language to {detected} instead?" noteEditHistory: "Post edit history" +experimental: "Experimental" +foldNotification: "Collapse notifications of the same type" diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml index 0adb9b4ba1..b65e7c296e 100644 --- a/locales/zh-CN.yml +++ b/locales/zh-CN.yml @@ -1787,6 +1787,7 @@ _notification: reacted: 回应了您的帖子 voted: 在您的问卷调查中投了票 renoted: 转发了您的帖子 + andCountUsers: "等 {count} 名用户{acted}" _deck: alwaysShowMainColumn: "总是显示主列" columnAlign: "列对齐" @@ -2059,3 +2060,5 @@ autocorrectNoteLanguage: 当帖子语言不符合自动检测的结果的时候 incorrectLanguageWarning: "看上去您帖子使用的语言是{detected},但您选择的语言是{current}。\n要改为以{detected}发帖吗?" noteEditHistory: "帖子编辑历史" media: 媒体 +experimental: "实验性" +foldNotification: "折叠同类型通知" diff --git a/packages/client/src/components/MkNotificationFolded.vue b/packages/client/src/components/MkNotificationFolded.vue new file mode 100644 index 0000000000..ad401df9a5 --- /dev/null +++ b/packages/client/src/components/MkNotificationFolded.vue @@ -0,0 +1,246 @@ + + + + + diff --git a/packages/client/src/components/MkNotifications.vue b/packages/client/src/components/MkNotifications.vue index 43669c6607..db00257cf8 100644 --- a/packages/client/src/components/MkNotifications.vue +++ b/packages/client/src/components/MkNotifications.vue @@ -13,13 +13,21 @@