Revert "fix(lang): use INSUFFICIENT_AUTHORITY instead of FORBIDDEN_BY…

…_STATE" This reverts commit ff78179.
thematters · Oct 9, 2023 · 42d158b · 42d158b
1 parent aa6fab1
commit 42d158b
Show file tree

Hide file tree

Showing 17 changed files with 30 additions and 47 deletions.
diff --git a/lang/default.json b/lang/default.json
@@ -534,6 +534,10 @@
     "defaultMessage": "commented broadcast in {circleName}",
     "description": "src/components/Notice/CircleNotice/CircleNewBroadcastComments.tsx"
   },
+  "EoeUjA": {
+    "defaultMessage": "You do not have permission to perform this operation",
+    "description": "FORBIDDEN_BY_STATE"
+  },
   "EwbNbl": {
     "defaultMessage": "Oops！This link has expired",
     "description": "src/views/Callback/GoogleCallback.tsx"
@@ -1165,10 +1169,6 @@
     "defaultMessage": "Unblock",
     "description": "src/components/BlockUser/Button/index.tsx"
   },
-  "bZtfkT": {
-    "defaultMessage": "You do not have permission to perform this operation",
-    "description": "INSUFFICIENT_AUTHORITY"
-  },
   "beLe/F": {
     "defaultMessage": "Broadcast"
   },

diff --git a/lang/en.json b/lang/en.json
@@ -534,6 +534,10 @@
     "defaultMessage": "commented broadcast in {circleName}",
     "description": "src/components/Notice/CircleNotice/CircleNewBroadcastComments.tsx"
   },
+  "EoeUjA": {
+    "defaultMessage": "You do not have permission to perform this operation",
+    "description": "FORBIDDEN_BY_STATE"
+  },
   "EwbNbl": {
     "defaultMessage": "Oops！This link has expired",
     "description": "src/views/Callback/GoogleCallback.tsx"
@@ -1165,10 +1169,6 @@
     "defaultMessage": "Unblock",
     "description": "src/components/BlockUser/Button/index.tsx"
   },
-  "bZtfkT": {
-    "defaultMessage": "You do not have permission to perform this operation",
-    "description": "INSUFFICIENT_AUTHORITY"
-  },
   "beLe/F": {
     "defaultMessage": "Broadcast"
   },

diff --git a/lang/zh-Hans.json b/lang/zh-Hans.json
@@ -534,6 +534,10 @@
     "defaultMessage": "在 {circleName} 的广播中留言 ",
     "description": "src/components/Notice/CircleNotice/CircleNewBroadcastComments.tsx"
   },
+  "EoeUjA": {
+    "defaultMessage": "你无权限进行该操作",
+    "description": "FORBIDDEN_BY_STATE"
+  },
   "EwbNbl": {
     "defaultMessage": "Oops！链接已失效",
     "description": "src/views/Callback/GoogleCallback.tsx"
@@ -1165,10 +1169,6 @@
     "defaultMessage": "取消屏蔽",
     "description": "src/components/BlockUser/Button/index.tsx"
   },
-  "bZtfkT": {
-    "defaultMessage": "你无权限进行该操作",
-    "description": "INSUFFICIENT_AUTHORITY"
-  },
   "beLe/F": {
     "defaultMessage": "广播"
   },
@@ -1835,4 +1835,4 @@
     "defaultMessage": "{subscriber, plural, =1 {人} other {人}}",
     "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
   }
-}
+}
diff --git a/lang/zh-Hant.json b/lang/zh-Hant.json
@@ -534,6 +534,10 @@
     "defaultMessage": "在 {circleName} 的廣播中留言 ",
     "description": "src/components/Notice/CircleNotice/CircleNewBroadcastComments.tsx"
   },
+  "EoeUjA": {
+    "defaultMessage": "你無權限進行該操作",
+    "description": "FORBIDDEN_BY_STATE"
+  },
   "EwbNbl": {
     "defaultMessage": "Oops！連結已失效",
     "description": "src/views/Callback/GoogleCallback.tsx"
@@ -1165,10 +1169,6 @@
     "defaultMessage": "取消封鎖",
     "description": "src/components/BlockUser/Button/index.tsx"
   },
-  "bZtfkT": {
-    "defaultMessage": "你無權限進行該操作",
-    "description": "INSUFFICIENT_AUTHORITY"
-  },
   "beLe/F": {
     "defaultMessage": "廣播"
   },
@@ -1835,4 +1835,4 @@
     "defaultMessage": "{subscriber, plural, =1 {人} other {人}}",
     "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
   }
-}
+}
diff --git a/src/common/enums/errorCode.ts b/src/common/enums/errorCode.ts
@@ -20,7 +20,6 @@ export enum ERROR_CODES {
   FORBIDDEN_BY_STATE = 'FORBIDDEN_BY_STATE',
   FORBIDDEN_BY_TARGET_STATE = 'FORBIDDEN_BY_TARGET_STATE',
   TOKEN_INVALID = 'TOKEN_INVALID',
-  INSUFFICIENT_AUTHORITY = 'INSUFFICIENT_AUTHORITY',
 
   // Entity
   ENTITY_NOT_FOUND = 'ENTITY_NOT_FOUND',

diff --git a/src/components/ArticleDigest/DropdownActions/index.tsx b/src/components/ArticleDigest/DropdownActions/index.tsx
@@ -299,9 +299,7 @@ const DropdownActions = (props: DropdownActionsProps) => {
   const forbid = () => {
     toast.error({
       message: (
-        <FormattedMessage
-          {...ERROR_MESSAGES[ERROR_CODES.INSUFFICIENT_AUTHORITY]}
-        />
+        <FormattedMessage {...ERROR_MESSAGES[ERROR_CODES.FORBIDDEN_BY_STATE]} />
       ),
     })
   }

diff --git a/src/components/Buttons/Bookmark/Subscribe.tsx b/src/components/Buttons/Bookmark/Subscribe.tsx
@@ -57,7 +57,7 @@ const Subscribe = ({ articleId, size, disabled, inCard }: SubscribeProps) => {
       toast.error({
         message: (
           <FormattedMessage
-            {...ERROR_MESSAGES[ERROR_CODES.INSUFFICIENT_AUTHORITY]}
+            {...ERROR_MESSAGES[ERROR_CODES.FORBIDDEN_BY_STATE]}
           />
         ),
       })

diff --git a/src/components/Buttons/Bookmark/Unsubscribe.tsx b/src/components/Buttons/Bookmark/Unsubscribe.tsx
@@ -45,7 +45,7 @@ const Unsubscribe = ({
       toast.error({
         message: (
           <FormattedMessage
-            {...ERROR_MESSAGES[ERROR_CODES.INSUFFICIENT_AUTHORITY]}
+            {...ERROR_MESSAGES[ERROR_CODES.FORBIDDEN_BY_STATE]}
           />
         ),
       })

diff --git a/src/components/Buttons/Write/index.tsx b/src/components/Buttons/Write/index.tsx
@@ -85,7 +85,7 @@ export const WriteButton = ({ allowed, authed, forbidden }: Props) => {
           toast.error({
             message: (
               <FormattedMessage
-                {...ERROR_MESSAGES[ERROR_CODES.INSUFFICIENT_AUTHORITY]}
+                {...ERROR_MESSAGES[ERROR_CODES.FORBIDDEN_BY_STATE]}
               />
             ),
           })

diff --git a/src/components/CollectionDigest/DropdownActions/index.tsx b/src/components/CollectionDigest/DropdownActions/index.tsx
@@ -74,9 +74,7 @@ const DropdownActions = (props: DropdownActionsProps) => {
   const forbid = () => {
     toast.error({
       message: (
-        <FormattedMessage
-          {...ERROR_MESSAGES[ERROR_CODES.INSUFFICIENT_AUTHORITY]}
-        />
+        <FormattedMessage {...ERROR_MESSAGES[ERROR_CODES.FORBIDDEN_BY_STATE]} />
       ),
     })
   }

diff --git a/src/components/Comment/DropdownActions/index.tsx b/src/components/Comment/DropdownActions/index.tsx
@@ -216,9 +216,7 @@ const DropdownActions = (props: DropdownActionsProps) => {
   const forbid = () => {
     toast.error({
       message: (
-        <FormattedMessage
-          {...ERROR_MESSAGES[ERROR_CODES.INSUFFICIENT_AUTHORITY]}
-        />
+        <FormattedMessage {...ERROR_MESSAGES[ERROR_CODES.FORBIDDEN_BY_STATE]} />
       ),
     })
   }

diff --git a/src/components/Comment/FooterActions/index.tsx b/src/components/Comment/FooterActions/index.tsx
@@ -112,9 +112,7 @@ const BaseFooterActions = ({
   const forbid = () =>
     toast.error({
       message: (
-        <FormattedMessage
-          {...ERROR_MESSAGES[ERROR_CODES.INSUFFICIENT_AUTHORITY]}
-        />
+        <FormattedMessage {...ERROR_MESSAGES[ERROR_CODES.FORBIDDEN_BY_STATE]} />
       ),
     })
 

diff --git a/src/components/GQL/error.tsx b/src/components/GQL/error.tsx
@@ -76,12 +76,8 @@ export const ERROR_MESSAGES: { [key in ERROR_CODES]: MessageDescriptor } = {
     defaultMessage: 'You do not have permission to perform this operation',
     description: 'FORBIDDEN',
   }),
-  [ERROR_CODES.INSUFFICIENT_AUTHORITY]: defineMessage({
-    defaultMessage: 'You do not have permission to perform this operation',
-    description: 'INSUFFICIENT_AUTHORITY',
-  }),
   [ERROR_CODES.FORBIDDEN_BY_STATE]: defineMessage({
-    defaultMessage: 'Unavailable',
+    defaultMessage: 'You do not have permission to perform this operation',
     description: 'FORBIDDEN_BY_STATE',
   }),
   [ERROR_CODES.FORBIDDEN_BY_TARGET_STATE]: defineMessage({

diff --git a/src/views/ArticleDetail/AppreciationButton/ForbiddenButton.tsx b/src/views/ArticleDetail/AppreciationButton/ForbiddenButton.tsx
@@ -19,7 +19,7 @@ const ForbiddenButton = ({
       toast.error({
         message: (
           <FormattedMessage
-            {...ERROR_MESSAGES[ERROR_CODES.INSUFFICIENT_AUTHORITY]}
+            {...ERROR_MESSAGES[ERROR_CODES.FORBIDDEN_BY_STATE]}
           />
         ),
       })

diff --git a/src/views/ArticleDetail/SupportWidget/SupportButton/index.tsx b/src/views/ArticleDetail/SupportWidget/SupportButton/index.tsx
@@ -45,9 +45,7 @@ const SupportButton = ({
       message: isAuthor ? (
         <Translate zh_hant="去支持其他用戶吧" zh_hans="去支持其他用户吧" />
       ) : (
-        <FormattedMessage
-          {...ERROR_MESSAGES[ERROR_CODES.INSUFFICIENT_AUTHORITY]}
-        />
+        <FormattedMessage {...ERROR_MESSAGES[ERROR_CODES.FORBIDDEN_BY_STATE]} />
       ),
     })
   }

diff --git a/src/views/ArticleDetail/Toolbar/CommentBar/index.tsx b/src/views/ArticleDetail/Toolbar/CommentBar/index.tsx
@@ -143,7 +143,7 @@ const CommentBar = ({ article, disabled }: CommentBarProps) => {
           toast.error({
             message: (
               <FormattedMessage
-                {...ERROR_MESSAGES[ERROR_CODES.INSUFFICIENT_AUTHORITY]}
+                {...ERROR_MESSAGES[ERROR_CODES.FORBIDDEN_BY_STATE]}
               />
             ),
           })

diff --git a/src/views/ArticleDetail/Toolbar/DonationButton/index.tsx b/src/views/ArticleDetail/Toolbar/DonationButton/index.tsx
@@ -58,9 +58,7 @@ const DonationButton = ({
   const forbid = () => {
     toast.error({
       message: (
-        <FormattedMessage
-          {...ERROR_MESSAGES[ERROR_CODES.INSUFFICIENT_AUTHORITY]}
-        />
+        <FormattedMessage {...ERROR_MESSAGES[ERROR_CODES.FORBIDDEN_BY_STATE]} />
       ),
     })
   }