From ebb3ea7731f71742c44f78873d21e2b4fac2e17c Mon Sep 17 00:00:00 2001
From: machiav3lli <antonios.hazim@tutanota.com>
Date: Fri, 25 Mar 2022 15:43:55 +0100
Subject: [PATCH] Fix: Applying main locale language

---
 src/main/kotlin/com/looker/droidify/utility/Utils.kt | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/kotlin/com/looker/droidify/utility/Utils.kt b/src/main/kotlin/com/looker/droidify/utility/Utils.kt
index bf3edd66..046f2cda 100644
--- a/src/main/kotlin/com/looker/droidify/utility/Utils.kt
+++ b/src/main/kotlin/com/looker/droidify/utility/Utils.kt
@@ -123,7 +123,7 @@ object Utils {
         }
         val config = resources.configuration
         val sysLocale = if (Android.sdk(24)) config.locales[0] else config.locale
-        if (setLocalCode != sysLocale.language || setLocalCode != "${sysLocale.language}-r${sysLocale.country}") {
+        if (setLocalCode != sysLocale.toString() || setLocalCode != "${sysLocale.language}-r${sysLocale.country}") {
             val newLocale = getLocaleOfCode(setLocalCode)
             Locale.setDefault(newLocale)
             config.setLocale(newLocale)
@@ -156,6 +156,10 @@ object Utils {
             localeCode.substring(0, 2),
             localeCode.substring(4)
         )
+        localeCode.contains("_") -> Locale(
+            localeCode.substring(0, 2),
+            localeCode.substring(3)
+        )
         else -> Locale(localeCode)
     }