fix bug

enjoyteach · Feb 12, 2022 · 0c1fead · 0c1fead
1 parent 1cfefab
commit 0c1fead
Show file tree

Hide file tree

Showing 10 changed files with 1,360 additions and 341 deletions.
diff --git a/CONTRIBUTING_CN.md b/CONTRIBUTING_CN.md
@@ -9,7 +9,7 @@
 
 ## 翻译指南
 
-您可以通过 Koodo Reader 的[在线翻译工具](https://poeditor.com/join/project?hash=fk4qbQTlsk)，完善现有翻译（尤其是繁体中文，目前大部分翻译都是使用繁简转换工具实现的），也可以添加新的语言。
+您可以通过 Koodo Reader 的[在线翻译工具](https://poeditor.com/join/project?hash=fk4qbQTlsk)，完善现有翻译，也可以添加新的语言。
 
 ## 其他贡献方式
 

diff --git a/README_cn.md b/README_cn.md
@@ -117,4 +117,4 @@ docker-compose up -d
 
 ## 贡献翻译
 
-您可以通过 Koodo Reader 的[在线翻译工具](https://poeditor.com/join/project?hash=fk4qbQTlsk)，完善现有翻译（尤其是繁体中文，目前大部分翻译都是使用繁简转换工具实现的），也可以添加新的语言。
+您可以通过 Koodo Reader 的[在线翻译工具](https://poeditor.com/join/project?hash=fk4qbQTlsk)，完善现有翻译，也可以添加新的语言。
diff --git a/src/assets/locales/es/translation.json b/src/assets/locales/es/translation.json
diff --git a/src/assets/locales/fr/translation.json b/src/assets/locales/fr/translation.json
diff --git a/src/assets/locales/pt-BR/translation.json b/src/assets/locales/pt-BR/translation.json
diff --git a/src/assets/locales/tw/translation.json b/src/assets/locales/tw/translation.json
diff --git a/src/components/dialogs/settingDialog/component.tsx b/src/components/dialogs/settingDialog/component.tsx
@@ -55,22 +55,24 @@ class SettingDialog extends React.Component<
           dropdownList[0].option.indexOf(
             StorageUtil.getReaderConfig("systemFont")
           )
-        ].setAttribute("selected", "selected");
+        ]?.setAttribute("selected", "selected");
     document
       .getElementsByClassName("lang-setting-dropdown")[1]
       ?.children[
-        ["zh", "cht", "en", "ru"].indexOf(
-          StorageUtil.getReaderConfig("lang") ||
-            (navigator.language.indexOf("zh") > -1 ? "zh" : "en")
-        )
-      ].setAttribute("selected", "selected");
+        langList
+          .map((item) => item.value)
+          .indexOf(
+            StorageUtil.getReaderConfig("lang") ||
+              (navigator.language.indexOf("zh") > -1 ? "zh" : "en")
+          )
+      ]?.setAttribute("selected", "selected");
     document.getElementsByClassName("lang-setting-dropdown")[2]?.children[
       _.findLastIndex(searchList, {
         value:
           StorageUtil.getReaderConfig("searchEngine") ||
           (navigator.language === "zh-CN" ? "baidu" : "google"),
       })
-    ].setAttribute("selected", "selected");
+    ]?.setAttribute("selected", "selected");
   }
   handleRest = (bool: boolean) => {
     toast.success(this.props.t("Change Successfully"));

diff --git a/src/constants/settingList.tsx b/src/constants/settingList.tsx
@@ -85,6 +85,9 @@ export const langList = [
   { label: "繁體中文", value: "cht" },
   { label: "English", value: "en" },
   { label: "русский", value: "ru" },
+  { label: "Español", value: "es" },
+  { label: "Français", value: "fr" },
+  { label: "Português", value: "ptBR" },
 ];
 
 export const searchList = [

diff --git a/src/i18n.tsx b/src/i18n.tsx
@@ -4,6 +4,9 @@ import translationEN from "./assets/locales/en/translation.json";
 import translationCN from "./assets/locales/cn/translation.json";
 import translationTW from "./assets/locales/tw/translation.json";
 import translationRU from "./assets/locales/ru/translation.json";
+import translationFR from "./assets/locales/fr/translation.json";
+import translationES from "./assets/locales/es/translation.json";
+import translationPTBR from "./assets/locales/pt-BR/translation.json";
 
 // the translations
 const resources = {
@@ -19,6 +22,15 @@ const resources = {
   ru: {
     translation: translationRU,
   },
+  es: {
+    translation: translationES,
+  },
+  fr: {
+    translation: translationFR,
+  },
+  ptBR: {
+    translation: translationPTBR,
+  },
 };
 
 i18n

diff --git a/src/router/index.tsx b/src/router/index.tsx
@@ -22,8 +22,14 @@ const Router = () => {
         navigator.language === "zh-HK"
       ) {
         i18n.changeLanguage("cht");
-      } else if (navigator.language === "ru") {
+      } else if (navigator.language.startsWith("ru")) {
         i18n.changeLanguage("ru");
+      } else if (navigator.language.startsWith("fr")) {
+        i18n.changeLanguage("fr");
+      } else if (navigator.language.startsWith("es")) {
+        i18n.changeLanguage("es");
+      } else if (navigator.language.startsWith("pt")) {
+        i18n.changeLanguage("ptBR");
       } else {
         i18n.changeLanguage("en");
       }