From 0958282bd2bc4d71d6c22d60b62f3b8732550a5d Mon Sep 17 00:00:00 2001
From: shevernitskiy <mahahuha@ya.ru>
Date: Wed, 28 Feb 2024 21:45:38 +0300
Subject: [PATCH] 2-digit locale file

---
 locale/{en-US.json => en.json} | 0
 locale/{ru-RU.json => ru.json} | 0
 src/localization.rs            | 6 +++---
 src/utils.rs                   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename locale/{en-US.json => en.json} (100%)
 rename locale/{ru-RU.json => ru.json} (100%)

diff --git a/locale/en-US.json b/locale/en.json
similarity index 100%
rename from locale/en-US.json
rename to locale/en.json
diff --git a/locale/ru-RU.json b/locale/ru.json
similarity index 100%
rename from locale/ru-RU.json
rename to locale/ru.json
diff --git a/src/localization.rs b/src/localization.rs
index 452cb78..797a304 100644
--- 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
index af13484..78a466f 100644
--- 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> {