From 83d1a4cdf8f70845d79dd20e4aafa9155c4c985c Mon Sep 17 00:00:00 2001
From: Observer KRypt0n_ <suimin.tu.mu.ga.mi@gmail.com>
Date: Sat, 23 Jul 2022 22:32:45 +0200
Subject: [PATCH] Fixed wine lang preference

---
 src/lib/config/wine_lang.rs | 25 +++++++++++++------------
 src/lib/game.rs             |  4 ++--
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/lib/config/wine_lang.rs b/src/lib/config/wine_lang.rs
index 05ac31e..0f5ad70 100644
--- a/src/lib/config/wine_lang.rs
+++ b/src/lib/config/wine_lang.rs
@@ -62,17 +62,18 @@ impl Into<u32> for WineLang {
 impl WineLang {
     /// Get environment variables corresponding to used wine language
     pub fn get_env_vars(&self) -> HashMap<&str, &str> {
-        match self {
-            WineLang::System     => HashMap::new(),
-            WineLang::English    => HashMap::from([("LANG", "en_us.utf8")]),
-            WineLang::German     => HashMap::from([("LANG", "de_de.utf8")]),
-            WineLang::Russian    => HashMap::from([("LANG", "ru_ru.utf8")]),
-            WineLang::Portuguese => HashMap::from([("LANG", "pt_pt.utf8")]),
-            WineLang::French     => HashMap::from([("LANG", "fr_fr.utf8")]),
-            WineLang::Chinese    => HashMap::from([("LANG", "zh_cn.utf8")]),
-            WineLang::Spanish    => HashMap::from([("LANG", "es_es.utf8")]),
-            WineLang::Japanese   => HashMap::from([("LANG", "ja_jp.utf8")]),
-            WineLang::Korean     => HashMap::from([("LANG", "ko_kr.utf8")])
-        }
+        HashMap::from([("LANG", match self {
+            WineLang::System => return HashMap::new(),
+
+            WineLang::English    => "en_US.UTF8",
+            WineLang::German     => "de_DE.UTF8",
+            WineLang::Russian    => "ru_RU.UTF8",
+            WineLang::Portuguese => "pt_PT.UTF8",
+            WineLang::French     => "fr_FR.UTF8",
+            WineLang::Chinese    => "zh_CN.UTF8",
+            WineLang::Spanish    => "es_ES.UTF8",
+            WineLang::Japanese   => "ja_JP.UTF8",
+            WineLang::Korean     => "ko_KR.UTF8"
+        })])
     }
 }
diff --git a/src/lib/game.rs b/src/lib/game.rs
index 03409c2..d75ac12 100644
--- a/src/lib/game.rs
+++ b/src/lib/game.rs
@@ -81,14 +81,14 @@ pub fn run(debug: bool) -> Result<(), Error> {
         // which is kinda difficult
         todo!();
 
-        match try_get_terminal() {
+        /*match try_get_terminal() {
             Some(terminal) => {
                 command = Command::new(terminal.get_command());
 
                 command.args(terminal.get_args("launcher.bat"));
             },
             None => return Err(Error::new(ErrorKind::Other, "Couldn't find terminal application"))
-        }
+        }*/
     }
 
     else {