2-digit locale file

dfint · Feb 28, 2024 · 0958282 · 0958282
1 parent b61c786
commit 0958282
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/locale/en-US.json → locale/en.json b/locale/en-US.json → locale/en.json
diff --git a/locale/ru-RU.json → locale/ru.json b/locale/ru-RU.json → locale/ru.json
diff --git a/src/localization.rs b/src/localization.rs
@@ -5,7 +5,7 @@ const LOCALES: Dir<'_> = include_dir!("./locale");
 
 #[static_init::dynamic]
 pub static mut LOCALE: Localization = {
-  let locale = sys_locale::get_locale().unwrap_or("en-US".to_owned());
+  let locale = sys_locale::get_locale().unwrap_or("en-US".to_string()).split('-').collect::<Vec<&str>>()[0].to_owned();
   Localization::new(locale)
 };
 
@@ -37,7 +37,7 @@ impl Localization {
   pub fn new(locale: String) -> Self {
     let translation: HashMap<String, String> = match TRANSLATIONS.get(&locale) {
       Some(v) => serde_json::from_str(v).unwrap(),
-      None => serde_json::from_str(TRANSLATIONS.get("en-US").unwrap()).unwrap(),
+      None => serde_json::from_str(TRANSLATIONS.get("en").unwrap()).unwrap(),
     };
 
     Self {
@@ -54,7 +54,7 @@ impl Localization {
     self.locale = s.to_owned();
     self.map = match TRANSLATIONS.get(s) {
       Some(v) => serde_json::from_str(v).unwrap(),
-      None => serde_json::from_str(TRANSLATIONS.get("en-US").unwrap()).unwrap(),
+      None => serde_json::from_str(TRANSLATIONS.get("en").unwrap()).unwrap(),
     };
   }
 

diff --git a/src/utils.rs b/src/utils.rs
@@ -160,7 +160,7 @@ pub fn is_dfhack_installed(df_dir: &Option<PathBuf>) -> bool {
 
 pub fn fetch_manifest<T: for<'de> serde::Deserialize<'de>>(url: &str) -> Result<Vec<T>> {
   let manifests: Vec<T> = ureq::get(url).call()?.into_json()?;
-  return Ok(manifests);
+  Ok(manifests)
 }
 
 pub fn get_manifest_by_df(df_checksum: u32, manifests: Vec<HookManifest>) -> Option<HookManifest> {