sort langs #2948

src/lang.rs

@@ -1,6 +1,6 @@
-use serde_json::{json, value::Value};
 use std::ops::Deref;
 
+mod ca;
 mod cn;
 mod cs;
 mod da;
@@ -8,69 +8,65 @@ mod de;
 mod en;
 mod eo;
 mod es;
+mod fa;
 mod fr;
+mod gr;
 mod hu;
 mod id;
 mod it;
 mod ja;
 mod ko;
+mod kz;
 mod nl;
 mod pl;
 mod ptbr;
 mod ro;
 mod ru;
 mod sk;
-mod tr;
+mod sl;
-mod tw;
-mod vn;
-mod kz;
-mod ua;
-mod fa;
-mod ca;
-mod gr;
-mod sv;
 mod sq;
 mod sr;
+mod sv;
 mod th;
-mod sl;
+mod tr;
+mod tw;
+mod ua;
+mod vn;
 
-lazy_static::lazy_static! {
+pub const LANGS: &[(&str, &str)] = &[
-    pub static ref LANGS: Value =
+    ("en", "English"),
-        json!(vec![
+    ("it", "Italiano"),
-            ("en", "English"),
+    ("fr", "Français"),
-            ("it", "Italiano"),
+    ("de", "Deutsch"),
-            ("fr", "Français"),
+    ("nl", "Nederlands"),
-            ("de", "Deutsch"),
+    ("cn", "简体中文"),
-            ("nl", "Nederlands"),
+    ("tw", "繁體中文"),
-            ("cn", "简体中文"),
+    ("pt", "Português"),
-            ("tw", "繁體中文"),
+    ("es", "Español"),
-            ("pt", "Português"),
+    ("hu", "Magyar"),
-            ("es", "Español"),
+    ("ru", "Русский"),
-            ("hu", "Magyar"),
+    ("sk", "Slovenčina"),
-            ("ru", "Русский"),
+    ("id", "Indonesia"),
-            ("sk", "Slovenčina"),
+    ("cs", "Čeština"),
-            ("id", "Indonesia"),
+    ("da", "Dansk"),
-            ("cs", "Čeština"),
+    ("eo", "Esperanto"),
-            ("da", "Dansk"),
+    ("tr", "Türkçe"),
-            ("eo", "Esperanto"),
+    ("vn", "Tiếng Việt"),
-            ("tr", "Türkçe"),
+    ("pl", "Polski"),
-            ("vn", "Tiếng Việt"),
+    ("ja", "日本語"),
-            ("pl", "Polski"),
+    ("ko", "한국어"),
-            ("ja", "日本語"),
+    ("kz", "Қазақ"),
-            ("ko", "한국어"),
+    ("ua", "Українська"),
-            ("kz", "Қазақ"),
+    ("fa", "فارسی"),
-            ("ua", "Українська"),
+    ("ca", "Català"),
-            ("fa", "فارسی"),
+    ("gr", "Ελληνικά"),
-            ("ca", "Català"),
+    ("sv", "Svenska"),
-            ("gr", "Ελληνικά"),
+    ("sq", "Shqip"),
-            ("sv", "Svenska"),
+    ("sr", "Srpski"),
-            ("sq", "Shqip"),
+    ("th", "ภาษาไทย"),
-            ("sr", "Srpski"),
+    ("sl", "Slovenščina"),
-            ("th", "ภาษาไทย"),
+    ("ro", "Română"),
-            ("sl", "Slovenščina"),
+];
-            ("ro", "Română"),
-        ]);
-}
 
 #[cfg(not(any(target_os = "android", target_os = "ios")))]
 pub fn translate(name: String) -> String {

src/ui_interface.rs

@@ -636,7 +636,13 @@ pub fn get_async_job_status() -> String {
 
 #[inline]
 pub fn get_langs() -> String {
-    crate::lang::LANGS.to_string()
+    use serde_json::json;
+    let mut x: Vec<(&str, String)> = crate::lang::LANGS
+        .iter()
+        .map(|a| (a.0, format!("{} - {}", a.1, a.0)))
+        .collect();
+    x.sort_by(|a, b| a.0.cmp(b.0));
+    json!(x).to_string()
 }
 
 #[inline]