fix: fixes longitude i10n message

javalent · May 4, 2023 · 97adff3 · 97adff3
1 parent 4df1590
commit 97adff3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/src/l10n/locale.ts b/src/l10n/locale.ts
@@ -1,17 +1,16 @@
 import en from "./locales/en";
 import zhCN from "./locales/zh_CN";
 
-
-const lang = window.localStorage.getItem('language');
+const lang = window.localStorage.getItem("language");
 
 const localeMap: { [k: string]: Partial<typeof en> } = {
     en,
-    zh: zhCN,
+    zh: zhCN
 };
-const userLocale = localeMap[lang || 'en'];
+const userLocale = localeMap[lang || "en"];
 
 export default function t(str: keyof typeof en, ...inserts: string[]): string {
-    let localeStr = (userLocale && userLocale[str]) ?? en[str];
+    let localeStr = (userLocale && userLocale[str]) ?? en[str] ?? str;
 
     for (let i = 0; i < inserts.length; i++) {
         localeStr = localeStr.replace(`%${i + 1}`, inserts[i]);

diff --git a/src/l10n/locales/en.ts b/src/l10n/locales/en.ts
@@ -13,10 +13,10 @@ export default {
     "Could not parse GeoJSON file": "Could not parse GeoJSON file",
     "Could not parse overlay radius. Please make sure it is in the format `<length> <unit>`.":
         "Could not parse overlay radius. Please make sure it is in the format `<length> <unit>`.",
-    "There was an error with the provided latitude. Using defaults.":
-        "There was an error with the provided latitude. Using defaults.",
-    "There was an error with the provided longitude. Using defaults.":
-        "There was an error with the provided longitude. Using defaults.",
+    "There was an error with the provided latitude. Using default.":
+        "There was an error with the provided latitude. Using default.",
+    "There was an error with the provided longitude. Using default.":
+        "There was an error with the provided longitude. Using default.",
 
     //loader.ts
     "There was an issue getting the image dimensions.":

diff --git a/src/l10n/locales/zh_CN.ts b/src/l10n/locales/zh_CN.ts
@@ -13,9 +13,9 @@ export default {
     "Could not parse GeoJSON file": "无法解析 GeoJSON 文件",
     "Could not parse overlay radius. Please make sure it is in the format `<length> <unit>`.":
         "无法解析覆盖半径. 请确保格式为 `<长度> <单位>`.",
-    "There was an error with the provided latitude. Using defaults.":
+    "There was an error with the provided latitude. Using default.":
         "提供的纬度有误. 使用默认值.",
-    "There was an error with the provided longitude. Using defaults.":
+    "There was an error with the provided longitude. Using default.":
         "提供的经度有误. 使用默认值.",
 
     //loader.ts