fix(i18n): tauri's locale data seems to be wrong

Fabulously-Optimized · Feb 13, 2024 · 925549b · 925549b
1 parent 07e08c8
commit 925549b
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 60 deletions.
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
@@ -15,7 +15,7 @@ tauri-build = { version = "1.3.0", features = [] }
 [dependencies]
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
-tauri = { version = "1.3.0", features = [ "os-all", "shell-open", "dialog-confirm", "http-api", "window-close"] }
+tauri = { version = "1.3.0", features = [ "shell-open", "dialog-confirm", "http-api", "window-close"] }
 zip = "0.6.6"
 tokio = { version = "1", features = [ "fs" ] }
 sha2 = "0.10.6"

diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -22,9 +22,6 @@
       },
       "shell": {
         "open": "^https://fabulously-optimized.gitbook.io/modpack/readme/"
-      },
-      "os": {
-        "all": true
       }
     },
     "bundle": {

diff --git a/src/lib/i18n.ts b/src/lib/i18n.ts
@@ -1,13 +1,8 @@
-import { locale as getLocale } from '@tauri-apps/api/os';
 import { langs } from './lang';
 
-let locale = navigator.language.split('-')[0];
+const locale = navigator.language.split('-')[0];
 const defaultLocale = 'en';
 
-getLocale().then((systemLocale) => {
-	if (systemLocale) locale = systemLocale.split('-')[0];
-});
-
 export function trans(id: string, data?: Record<string, string | number | undefined>) {
 	if (locale && langs[locale] && langs[locale][id]) {
 		let text = langs[locale][id];