Merge pull request #894 from endlessm/893-loading-screen-tx-loading

Improve loading screen translation loading
endlessm · Oct 23, 2023 · 1013eb6 · 1013eb6
2 parents b2c4cf5 + db6ceb8
commit 1013eb6
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/packages/loading-screen/lang/en-US.json → packages/loading-screen/lang/en.json b/packages/loading-screen/lang/en-US.json → packages/loading-screen/lang/en.json
diff --git a/packages/loading-screen/lang/es-419.json → packages/loading-screen/lang/es.json b/packages/loading-screen/lang/es-419.json → packages/loading-screen/lang/es.json
diff --git a/packages/loading-screen/package.json b/packages/loading-screen/package.json
@@ -7,7 +7,7 @@
     "build": "yarn run compile-messages && vue-cli-service build --no-module && yarn zip",
     "lint": "vue-cli-service lint",
     "zip": "../../scripts/bundle_zip.py loading-screen.zip",
-    "extract-messages": "formatjs extract 'src/**/*.{js,vue}' --format transifex --out-file lang/en-US.json",
+    "extract-messages": "formatjs extract 'src/**/*.{js,vue}' --format transifex --out-file lang/en.json",
     "compile-messages": "formatjs compile-folder --format transifex lang compiled-lang"
   },
   "dependencies": {

diff --git a/packages/loading-screen/src/main.js b/packages/loading-screen/src/main.js
@@ -11,8 +11,8 @@ import LoadingRetry from '@/views/LoadingRetry.vue';
 import store from "@/store";
 
 // Language codes are RFC 5646 (https://datatracker.ietf.org/doc/html/rfc5646)
-const supportedLocales = ['en-US', 'es-419'];
-const defaultLocale = 'en-US';
+const supportedLocales = ['en', 'es'];
+const defaultLocale = 'en';
 const requestedLocales = navigator.languages;
 
 function loadLocaleData(locale) {
@@ -32,6 +32,15 @@ async function loadBestLocaleData(locales) {
     }
   }
 
+  // Try again with only the locale's language.
+  for (const lang of locales.map(l => l.split('-')[0].toLowerCase())) {
+    try {
+      return await loadLocaleData(lang);
+    } catch {
+      continue;
+    }
+  }
+
   return await loadLocaleData(defaultLocale);
 }