Merge branch 'languagefixes' into dev

# Conflicts:
#	src-tauri/Cargo.lock
#	src-tauri/Cargo.toml
#	src-tauri/src/core/tray/mod.rs

src-tauri/Cargo.lock

@@ -1041,6 +1041,7 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_yaml",
+ "sys-locale",
  "sysinfo",
  "sysproxy",
  "tauri",
@@ -6364,6 +6365,15 @@ dependencies = [
  "syn 2.0.90",
 ]
 
+[[package]]
+name = "sys-locale"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8eab9a99a024a169fe8a903cf9d4a3b3601109bcc13bd9e3c6fff259138626c4"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "sysinfo"
 version = "0.33.0"

src-tauri/Cargo.toml

@@ -66,6 +66,7 @@ base64 = "0.22.1"
 getrandom = "0.2"
 tokio-tungstenite = "0.26.1"
 futures = "0.3"
+sys-locale = "0.3.1"
 
 [target.'cfg(windows)'.dependencies]
 runas = "=1.2.0"

src-tauri/src/config/verge.rs

@@ -1,6 +1,7 @@
 use crate::config::DEFAULT_PAC;
 use crate::config::{deserialize_encrypted, serialize_encrypted};
 use crate::utils::{dirs, help};
+use crate::utils::i18n;
 use anyhow::Result;
 use log::LevelFilter;
 use serde::{Deserialize, Serialize};
@@ -202,6 +203,21 @@ pub struct IVergeTheme {
 }
 
 impl IVerge {
+    fn get_system_language() -> String {
+        let sys_lang = sys_locale::get_locale()
+            .unwrap_or_else(|| String::from("en"))
+            .to_lowercase();
+        
+        let lang_code = sys_lang.split(['_', '-']).next().unwrap_or("en");
+        let supported_languages = i18n::get_supported_languages();
+        
+        if supported_languages.contains(&lang_code.to_string()) {
+            lang_code.to_string()
+        } else {
+            String::from("en")
+        }
+    }
+
     pub fn new() -> Self {
         match dirs::verge_path().and_then(|path| help::read_yaml::<IVerge>(&path)) {
             Ok(config) => config,
@@ -215,7 +231,7 @@ impl IVerge {
     pub fn template() -> Self {
         Self {
             clash_core: Some("verge-mihomo".into()),
-            language: Some("zh".into()),
+            language: Some(Self::get_system_language()),
             theme_mode: Some("system".into()),
             #[cfg(not(target_os = "windows"))]
             env_type: Some("bash".into()),

src-tauri/src/core/tray/mod.rs

@@ -2,13 +2,14 @@ use once_cell::sync::OnceCell;
 #[cfg(target_os = "macos")]
 pub mod speed_rate;
 use crate::core::clash_api::Rate;
-use crate::utils::dirs;
 use crate::{
     cmds,
     config::Config,
-    feat, t,
-    utils::resolve::{self, VERSION},
+    feat, resolve,
+    utils::resolve::VERSION,
+    utils::{dirs, i18n::t},
 };
+
 use anyhow::Result;
 #[cfg(target_os = "macos")]
 use futures::StreamExt;
@@ -114,7 +115,6 @@ impl Tray {
         let verge = Config::verge().latest().clone();
         let system_proxy = verge.enable_system_proxy.as_ref().unwrap_or(&false);
         let tun_mode = verge.enable_tun_mode.as_ref().unwrap_or(&false);
-
         let mode = {
             Config::clash()
                 .latest()
@@ -239,7 +239,6 @@ impl Tray {
     /// 更新托盘提示
     pub fn update_tooltip(&self) -> Result<()> {
         let app_handle = handle::Handle::global().app_handle().unwrap();
-        let use_zh = { Config::verge().latest().language == Some("zh".into()) };
         let version = VERSION.get().unwrap();
 
         let verge = Config::verge().latest().clone();
@@ -267,11 +266,11 @@ impl Tray {
         let tray = app_handle.tray_by_id("main").unwrap();
         let _ = tray.set_tooltip(Some(&format!(
             "Clash Verge {version}\n{}: {}\n{}: {}\n{}: {}",
-            t!("SysProxy", "系统代理", use_zh),
+            t("SysProxy"),
             switch_map[system_proxy],
-            t!("TUN", "Tun模式", use_zh),
+            t("TUN"),
             switch_map[tun_mode],
-            t!("Profile", "当前订阅", use_zh),
+            t("Profile"),
             current_profile_name
         )));
         Ok(())
@@ -356,7 +355,6 @@ fn create_tray_menu(
     tun_mode_enabled: bool,
 ) -> Result<tauri::menu::Menu<Wry>> {
     let mode = mode.unwrap_or("");
-    let use_zh = { Config::verge().latest().language == Some("zh".into()) };
     let version = VERSION.get().unwrap();
     let hotkeys = Config::verge()
         .latest()
@@ -378,7 +376,7 @@ fn create_tray_menu(
     let open_window = &MenuItem::with_id(
         app_handle,
         "open_window",
-        t!("Dashboard", "打开面板", use_zh),
+        t("Dashboard"),
         true,
         hotkeys.get("open_or_close_dashboard").map(|s| s.as_str()),
     )
@@ -387,7 +385,7 @@ fn create_tray_menu(
     let rule_mode = &CheckMenuItem::with_id(
         app_handle,
         "rule_mode",
-        t!("Rule Mode", "规则模式", use_zh),
+        t("Rule Mode"),
         true,
         mode == "rule",
         hotkeys.get("clash_mode_rule").map(|s| s.as_str()),
@@ -397,7 +395,7 @@ fn create_tray_menu(
     let global_mode = &CheckMenuItem::with_id(
         app_handle,
         "global_mode",
-        t!("Global Mode", "全局模式", use_zh),
+        t("Global Mode"),
         true,
         mode == "global",
         hotkeys.get("clash_mode_global").map(|s| s.as_str()),
@@ -407,7 +405,7 @@ fn create_tray_menu(
     let direct_mode = &CheckMenuItem::with_id(
         app_handle,
         "direct_mode",
-        t!("Direct Mode", "直连模式", use_zh),
+        t("Direct Mode"),
         true,
         mode == "direct",
         hotkeys.get("clash_mode_direct").map(|s| s.as_str()),
@@ -417,7 +415,7 @@ fn create_tray_menu(
     let system_proxy = &CheckMenuItem::with_id(
         app_handle,
         "system_proxy",
-        t!("System Proxy", "系统代理", use_zh),
+        t("System Proxy"),
         true,
         system_proxy_enabled,
         hotkeys.get("toggle_system_proxy").map(|s| s.as_str()),
@@ -427,26 +425,20 @@ fn create_tray_menu(
     let tun_mode = &CheckMenuItem::with_id(
         app_handle,
         "tun_mode",
-        t!("TUN Mode", "Tun模式", use_zh),
+        t("TUN Mode"),
         true,
         tun_mode_enabled,
         hotkeys.get("toggle_tun_mode").map(|s| s.as_str()),
     )
     .unwrap();
 
-    let copy_env = &MenuItem::with_id(
-        app_handle,
-        "copy_env",
-        t!("Copy Env", "复制环境变量", use_zh),
-        true,
-        None::<&str>,
-    )
-    .unwrap();
+    let copy_env =
+        &MenuItem::with_id(app_handle, "copy_env", t("Copy Env"), true, None::<&str>).unwrap();
 
     let open_app_dir = &MenuItem::with_id(
         app_handle,
         "open_app_dir",
-        t!("Conf Dir", "配置目录", use_zh),
+        t("Conf Dir"),
         true,
         None::<&str>,
     )
@@ -455,7 +447,7 @@ fn create_tray_menu(
     let open_core_dir = &MenuItem::with_id(
         app_handle,
         "open_core_dir",
-        t!("Core Dir", "内核目录", use_zh),
+        t("Core Dir"),
         true,
         None::<&str>,
     )
@@ -464,15 +456,16 @@ fn create_tray_menu(
     let open_logs_dir = &MenuItem::with_id(
         app_handle,
         "open_logs_dir",
-        t!("Logs Dir", "日志目录", use_zh),
+        t("Logs Dir"),
         true,
         None::<&str>,
     )
     .unwrap();
+
     let open_dir = &Submenu::with_id_and_items(
         app_handle,
         "open_dir",
-        t!("Open Dir", "打开目录", use_zh),
+        t("Open Dir"),
         true,
         &[open_app_dir, open_core_dir, open_logs_dir],
     )
@@ -481,7 +474,7 @@ fn create_tray_menu(
     let restart_clash = &MenuItem::with_id(
         app_handle,
         "restart_clash",
-        t!("Restart Clash Core", "重启Clash内核", use_zh),
+        t("Restart Clash Core"),
         true,
         None::<&str>,
     )
@@ -490,7 +483,7 @@ fn create_tray_menu(
     let restart_app = &MenuItem::with_id(
         app_handle,
         "restart_app",
-        t!("Restart App", "重启App", use_zh),
+        t("Restart App"),
         true,
         None::<&str>,
     )
@@ -499,7 +492,7 @@ fn create_tray_menu(
     let app_version = &MenuItem::with_id(
         app_handle,
         "app_version",
-        format!("Version {version}"),
+        format!("{} {version}", t("Verge Version")),
         true,
         None::<&str>,
     )
@@ -508,20 +501,14 @@ fn create_tray_menu(
     let more = &Submenu::with_id_and_items(
         app_handle,
         "more",
-        t!("More", "更多", use_zh),
+        t("More"),
         true,
         &[restart_clash, restart_app, app_version],
     )
     .unwrap();
 
-    let quit = &MenuItem::with_id(
-        app_handle,
-        "quit",
-        t!("Quit", "退出", use_zh),
-        true,
-        Some("CmdOrControl+Q"),
-    )
-    .unwrap();
+    let quit =
+        &MenuItem::with_id(app_handle, "quit", t("Exit"), true, Some("CmdOrControl+Q")).unwrap();
 
     let separator = &PredefinedMenuItem::separator(app_handle).unwrap();
 

src-tauri/src/utils/i18n.rs

@@ -0,0 +1,99 @@
+use crate::config::Config;
+use once_cell::sync::Lazy;
+use serde_json::Value;
+use std::{collections::HashMap, fs, path::Path};
+use sys_locale;
+
+pub fn get_supported_languages() -> Vec<String> {
+    let project_dir = Path::new(env!("CARGO_MANIFEST_DIR")).parent().unwrap();
+    let i18n_path = project_dir.join("src/services/i18n.ts");
+
+    if let Ok(content) = fs::read_to_string(i18n_path) {
+        let mut languages = Vec::new();
+        for line in content.lines() {
+            if line.contains("resources = {") {
+                for line in content.lines() {
+                    if let Some(lang) = line.trim().strip_suffix(": { translation:") {
+                        let lang = lang.trim().trim_matches('"');
+                        if !lang.is_empty() {
+                            languages.push(lang.to_string());
+                        }
+                    }
+                    if line.contains("};") {
+                        break;
+                    }
+                }
+                break;
+            }
+        }
+        if !languages.is_empty() {
+            return languages;
+        }
+    }
+
+    vec![
+        "en".to_string(),
+        "ru".to_string(),
+        "zh".to_string(),
+        "fa".to_string(),
+    ]
+}
+
+static TRANSLATIONS: Lazy<HashMap<String, Value>> = Lazy::new(|| {
+    let project_dir = Path::new(env!("CARGO_MANIFEST_DIR")).parent().unwrap();
+    let locales_dir = project_dir.join("src/locales");
+    let mut translations = HashMap::new();
+
+    for lang in ["en", "ru", "zh", "fa", "tt"] {
+        let file_path = locales_dir.join(format!("{}.json", lang));
+        if let Ok(content) = fs::read_to_string(file_path) {
+            if let Ok(json) = serde_json::from_str(&content) {
+                translations.insert(lang.to_string(), json);
+            }
+        }
+    }
+    translations
+});
+
+pub fn t(key: &str) -> String {
+    let config = Config::verge();
+    let verge = config.latest();
+    let current_lang = verge
+        .language
+        .as_ref()
+        .map_or_else(|| get_system_language(), |lang| lang.to_string());
+
+    if let Some(translations) = TRANSLATIONS.get(&current_lang) {
+        if let Some(text) = translations.get(key) {
+            if let Some(text) = text.as_str() {
+                return text.to_string();
+            }
+        }
+    }
+
+    // Fallback to English
+    if let Some(translations) = TRANSLATIONS.get("en") {
+        if let Some(text) = translations.get(key) {
+            if let Some(text) = text.as_str() {
+                return text.to_string();
+            }
+        }
+    }
+
+    key.to_string()
+}
+
+fn get_system_language() -> String {
+    let sys_lang = sys_locale::get_locale()
+        .unwrap_or_else(|| String::from("en"))
+        .to_lowercase();
+
+    let lang_code = sys_lang.split(['_', '-']).next().unwrap_or("en");
+    let supported_languages = get_supported_languages();
+
+    if supported_languages.contains(&lang_code.to_string()) {
+        lang_code.to_string()
+    } else {
+        String::from("en")
+    }
+}

src-tauri/src/utils/mod.rs

@@ -5,3 +5,4 @@ pub mod init;
 pub mod resolve;
 pub mod server;
 pub mod tmpl;
+pub mod i18n;