Merge pull request #4318 from thematters/feat/blocked-user-restriction

feat(copy): revise copy as blocked users can connect blockers' articles now
thematters · May 3, 2024 · f32a1c9 · f32a1c9
2 parents 3f8da23 + c441f57
commit f32a1c9
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 4 deletions.
diff --git a/lang/default.json b/lang/default.json
@@ -1694,6 +1694,9 @@
     "defaultMessage": "Start writing",
     "description": "src/components/Buttons/StartWriting/index.tsx"
   },
+  "Z39z+x": {
+    "defaultMessage": "{displayName} won't be able to comment your article. Besides, he or she can't @ you and subscribe your circle. You can manage blocked list in settings."
+  },
   "Z7JXlF": {
     "defaultMessage": "Archived for violation.",
     "description": "src/views/ArticleDetail/StickyTopBanner/index.tsx"

diff --git a/lang/en.json b/lang/en.json
@@ -1694,6 +1694,9 @@
     "defaultMessage": "Start writing",
     "description": "src/components/Buttons/StartWriting/index.tsx"
   },
+  "Z39z+x": {
+    "defaultMessage": "{displayName} won't be able to comment your article. Besides, he or she can't @ you and subscribe your circle. You can manage blocked list in settings."
+  },
   "Z7JXlF": {
     "defaultMessage": "Archived for violation.",
     "description": "src/views/ArticleDetail/StickyTopBanner/index.tsx"

diff --git a/lang/zh-Hans.json b/lang/zh-Hans.json
@@ -1694,6 +1694,9 @@
     "defaultMessage": "开始创作",
     "description": "src/components/Buttons/StartWriting/index.tsx"
   },
+  "Z39z+x": {
+    "defaultMessage": "封锁之后，{displayName} 将无法评论你的作品，不能 @ 你，并且不能加入你的围炉。你可以在设置里管理你的封锁用户列表"
+  },
   "Z7JXlF": {
     "defaultMessage": "因违反用户协定而被封存，",
     "description": "src/views/ArticleDetail/StickyTopBanner/index.tsx"

diff --git a/lang/zh-Hant.json b/lang/zh-Hant.json
@@ -1694,6 +1694,9 @@
     "defaultMessage": "開始創作",
     "description": "src/components/Buttons/StartWriting/index.tsx"
   },
+  "Z39z+x": {
+    "defaultMessage": "封鎖之後，{displayName} 將無法評論你的作品，不能 @ 你，並且不能加入你的圍爐。你可以在設置裏管理你的封鎖用戶列表。`"
+  },
   "Z7JXlF": {
     "defaultMessage": "因違反用戶協定而被封存，",
     "description": "src/views/ArticleDetail/StickyTopBanner/index.tsx"

diff --git a/src/components/BlockUser/Dialog/index.tsx b/src/components/BlockUser/Dialog/index.tsx
@@ -64,10 +64,10 @@ const BlockUserDialog = ({ user, children }: BlockUserDialogProps) => {
         <Dialog.Content>
           <Dialog.Content.Message>
             <p>
-              <Translate
-                zh_hant={`封鎖之後，${user.displayName} 將無法評論、關聯你的作品，不能 @ 你，並且不能加入你的圍爐。你可以在設置裏管理你的封鎖用戶列表。`}
-                zh_hans={`封锁之后，${user.displayName} 将无法评论、关联你的作品，不能 @ 你，并且不能加入你的围炉。你可以在设置里管理你的封锁用户列表。`}
-                en={`${user.displayName} won't be able to comment and collect your article. Besides, he or she can't @ you and subscribe your circle. You can manage blocked list in settings.`}
+              <FormattedMessage
+                defaultMessage="{displayName} won't be able to comment your article. Besides, he or she can't @ you and subscribe your circle. You can manage blocked list in settings."
+                id="Z39z+x"
+                values={{ displayName: user.displayName }}
               />
             </p>
           </Dialog.Content.Message>