Merge pull request #2776 from thematters/fix/i18n-component

fix(i18): fallback to zh_hant only if en is nullish
thematters · Sep 14, 2022 · 6ba9e70 · 6ba9e70 · vercel · Sep 14, 2022
2 parents c947d3f + aa330f3
commit 6ba9e70
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/src/common/utils/translate.ts b/src/common/utils/translate.ts
@@ -52,5 +52,7 @@ export const translate = ({ lang, ...props }: TranslateArgs): string => {
     translations = { zh_hant, zh_hans, en }
   }
 
-  return translations[lang || 'zh_hant'] || translations.zh_hant
+  const translation = translations[lang || 'zh_hant']
+
+  return typeof translation === 'string' ? translation : translations.zh_hant
 }
diff --git a/src/components/Dialogs/ReviseArticleDialog/index.tsx b/src/components/Dialogs/ReviseArticleDialog/index.tsx
@@ -55,7 +55,7 @@ export const ReviseArticleDialog = ({ children, revisionCountLeft }: Props) => {
           </p>
           <p>
             <b>
-              <Translate zh_hant="你還可以修訂" zh_hans="你还可以修订" en=" " />
+              <Translate zh_hant="你還可以修訂" zh_hans="你还可以修订" en="" />
               <span className="count"> {revisionCountLeft} </span>
               <Translate
                 zh_hant="版"

diff --git a/src/components/Notice/CommentNotice/CircleNewBroadcastNotice.tsx b/src/components/Notice/CommentNotice/CircleNewBroadcastNotice.tsx
@@ -59,7 +59,7 @@ const CircleNewBroadcastNotice = ({ notice }: { notice: NoticeType }) => {
           <Translate
             zh_hant={` 發布了新廣播`}
             zh_hans={` 发布了新广播`}
-            en=" "
+            en=""
           />
         </NoticeHead>
 

diff --git a/src/views/ArticleDetail/EditMode/Header/index.tsx b/src/views/ArticleDetail/EditMode/Header/index.tsx
@@ -114,7 +114,7 @@ const EditModeHeader = ({
       <Translate
         zh_hant="正文及作品管理剩 "
         zh_hans="正文及作品管理剩 "
-        en=" "
+        en=""
       />
       {revisionCountLeft}
       <Translate