fix bug i18n

salvo-rs · Nov 7, 2023 · e0cde27 · e0cde27
1 parent 3cb512e
commit e0cde27
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/src/i18n.rs b/src/i18n.rs
@@ -1,7 +1,9 @@
-use rust_i18n::i18n;
+const SUPPORTED_LANGUAGES: [&str; 17] = [
+    "en", "zh_CN", "zh_TW", "fr", "ja", "es", "de", "ru", 
+    "it", "pt", "ko", "no", "is", "uk", "th", "el", "da"
+];
 
 pub fn set_locale() {
-    i18n!("locales", fallback = "en");
     match get_language() {
         Some(lang) => {
             rust_i18n::set_locale(lang.as_str());
@@ -11,12 +13,17 @@ pub fn set_locale() {
         }
     }
 }
+
 fn get_language() -> Option<String> {
     match std::env::var("LANG") {
         Ok(lang) => {
-            let language = lang.split('.').next();
-            language.map(|s| s.to_string())
+            let language = lang.split('.').next()?.to_string();
+            if SUPPORTED_LANGUAGES.contains(&language.as_str()) {
+                Some(language)
+            } else {
+                None
+            }
         }
         Err(_) => None,
     }
-}
+}
diff --git a/src/main.rs b/src/main.rs
@@ -6,7 +6,7 @@ use i18n::set_locale;
 mod i18n;
 rust_i18n::i18n!("locales");
 #[derive(Parser, Debug)]
-#[clap(version = "0.0.1", author = "Fankai liu <[email protected]>")]
+#[clap(version = "0.1.17", author = "Fankai liu <[email protected]>")]
 struct Opts {
     #[clap(subcommand)]
     subcmd: SubCommand,