From 111104047c665b3559691b34de8f3601ddecbb94 Mon Sep 17 00:00:00 2001
From: Huluti <hugo.posnic@protonmail.com>
Date: Sun, 5 Feb 2017 11:15:04 +0100
Subject: [PATCH] Fix language detection

---
 src/manjaro_hello.py   |  7 ++++---
 ui/manjaro-hello.glade | 16 ++++++++--------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/manjaro_hello.py b/src/manjaro_hello.py
index 6dd15d7..d7c8075 100644
--- a/src/manjaro_hello.py
+++ b/src/manjaro_hello.py
@@ -113,7 +113,10 @@ class ManjaroHello():
             sys_locale = locale.getdefaultlocale()[0]
             # If user's locale is supported
             if os.path.isfile(path.format(sys_locale)):
-                return sys_locale
+                if "_" in sys_locale:
+                    return sys_locale.replace("_", "-")
+                else:
+                    return sys_locale
             # If two first letters of user's locale is supported (ex: en_US -> en)
             elif os.path.isfile(path.format(sys_locale[:2])):
                 return sys_locale[:2]
@@ -125,8 +128,6 @@ class ManjaroHello():
         :param locale: locale to use
         :type locale: str
         """
-        if "_" in locale:
-            locale = locale.replace("_", "-")
         try:
             tr = gettext.translation(self.app, self.locale_path, [locale], fallback=True)
             tr.install()
diff --git a/ui/manjaro-hello.glade b/ui/manjaro-hello.glade
index 259f617..9bbec99 100644
--- a/ui/manjaro-hello.glade
+++ b/ui/manjaro-hello.glade
@@ -465,27 +465,27 @@ We, the Manjaro Developers, hope that you will enjoy using Manjaro as much as we
             <items>
               <item id="ar">Arabic</item>
               <item id="ca">Catalan</item>
-              <item id="zh_CN">Chinese (China)</item>
-              <item id="zh_TW">Chinese (Taiwan)</item>
+              <item id="zh-CN">Chinese (China)</item>
+              <item id="zh-TW">Chinese (Taiwan)</item>
               <item id="cs">Czech</item>
               <item id="nl">Dutch</item>
               <item id="en">English</item>
               <item id="fr">French</item>
               <item id="de">German</item>
-              <item id="el_GR">Greek (Greece)</item>
+              <item id="el-GR">Greek (Greece)</item>
               <item id="hu">Hungarian</item>
               <item id="it">Italian</item>
               <item id="lt">Lithuanian</item>
               <item id="pl">Polish</item>
-              <item id="pt_BR">Portuguese (Brazil)</item>
-              <item id="pt_PT">Portuguese (Portugal)</item>
+              <item id="pt-BR">Portuguese (Brazil)</item>
+              <item id="pt-PT">Portuguese (Portugal)</item>
               <item id="ru">Russian</item>
-              <item id="sl_SI">Slovenian (Slovenia)</item>
+              <item id="sl-SI">Slovenian (Slovenia)</item>
               <item id="sl">Slovenian</item>
               <item id="es">Spanish</item>
-              <item id="sr_RS">Serbian (Serbia)</item>
+              <item id="sr-RS">Serbian (Serbia)</item>
               <item id="sr">Serbian</item>
-              <item id="tr_TR">Turkish (Turkey)</item>
+              <item id="tr-TR">Turkish (Turkey)</item>
               <item id="tr">Turkish</item>
             </items>
             <signal name="changed" handler="on_languages_changed" swapped="no"/>