tweak(locale): merging portuguese languages

tabarra · Dec 30, 2021 · 2f71467 · 2f71467
1 parent f7edb28
commit 2f71467
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 299 deletions.
diff --git a/locale/pt_BR.json → locale/pt.json b/locale/pt_BR.json → locale/pt.json
@@ -1,6 +1,6 @@
 {
     "$meta": {
-        "label": "Portuguese (Brazil)",
+        "label": "Portuguese",
         "humanizer_language": "pt"
     },
     "restarter": {

diff --git a/locale/pt_PT.json b/locale/pt_PT.json
diff --git a/menu/src/utils/getLocale.ts b/menu/src/utils/getLocale.ts
@@ -25,8 +25,7 @@ import lv from "../../../locale/lv.json";
 import nl from "../../../locale/nl.json";
 import no from "../../../locale/no.json";
 import pl from "../../../locale/pl.json";
-import pt_BR from "../../../locale/pt_BR.json";
-import pt_PT from "../../../locale/pt_PT.json";
+import pt from "../../../locale/pt.json";
 import ro from "../../../locale/ro.json";
 import ru from "../../../locale/ru.json";
 import sv from "../../../locale/sv.json";
@@ -53,8 +52,7 @@ const localeMap = {
   nl,
   no,
   pl,
-  pt_BR,
-  pt_PT,
+  pt,
   ro,
   ru,
   sv,

diff --git a/src/components/configVault.js b/src/components/configVault.js
@@ -162,8 +162,14 @@ module.exports = class ConfigVault {
                 quiet: toDefault(cfg.fxRunner.quiet, null),
             };
 
+            //Migrations
             //Removing menu beta convar (v4.9)
             out.fxRunner.commandLine = out.fxRunner.commandLine?.replace(/\+?setr? txEnableMenuBeta true\s?/gi, '');
+
+            //Merging portuguese
+            if (out.global.language === 'pt_PT' || out.global.language === 'pt_BR'){
+                out.global.language = 'pt';
+            }
         } catch (error) {
             if (GlobalData.verbose) dir(error);
             throw new Error(`Malformed configuration file! Make sure your txAdmin is updated!\nOriginal error: ${error.message}`);

diff --git a/src/components/translator.js b/src/components/translator.js
@@ -25,8 +25,7 @@ const languages = {
     nl: require('../../locale/nl.json'),
     no: require('../../locale/no.json'),
     pl: require('../../locale/pl.json'),
-    pt_BR: require('../../locale/pt_BR.json'),
-    pt_PT: require('../../locale/pt_PT.json'),
+    pt: require('../../locale/pt.json'),
     ro: require('../../locale/ro.json'),
     ru: require('../../locale/ru.json'),
     sv: require('../../locale/sv.json'),

diff --git a/web/settings.html b/web/settings.html
@@ -107,8 +107,7 @@ <h2>Settings</h2>
                                     <option value="nl" {{it.global.language=='nl'|isSelected}}>Dutch</option>
                                     <option value="no" {{it.global.language=='no'|isSelected}}>Norwegian</option>
                                     <option value="pl" {{it.global.language=='pl'|isSelected}}>Polish</option>
-                                    <option value="pt_BR" {{it.global.language=='pt_BR'|isSelected}}>Portuguese (Brazil)</option>
-                                    <option value="pt_PT" {{it.global.language=='pt_PT'|isSelected}}>Portuguese (Portugal)</option>
+                                    <option value="pt" {{it.global.language=='pt'|isSelected}}>Portuguese</option>
                                     <option value="ro" {{it.global.language=='ro'|isSelected}}>Romanian</option>
                                     <option value="ru" {{it.global.language=='ru'|isSelected}}>Russian</option>
                                     <option value="sv" {{it.global.language=='sv'|isSelected}}>Swedish</option>