create a normalized_app_language that will return the normalized loca…

…le that we are using for the app
CruGlobal · Oct 4, 2023 · 430724f · 430724f
1 parent 6f86c3b
commit 430724f
Show file tree

Hide file tree

Showing 14 changed files with 53 additions and 1 deletion.
diff --git a/library/base/src/main/kotlin/org/cru/godtools/base/Settings.kt b/library/base/src/main/kotlin/org/cru/godtools/base/Settings.kt
@@ -62,7 +62,7 @@ class Settings internal constructor(private val context: Context, coroutineScope
 
     // region Language Settings
     var appLanguage: Locale
-        get() = AppCompatDelegate.getApplicationLocales()[0] ?: Locale.getDefault()
+        get() = Locale.forLanguageTag(context.getString(R.string.normalized_app_language))
         set(value) {
             AppCompatDelegate.setApplicationLocales(LocaleListCompat.create(value))
         }

diff --git a/library/base/src/main/res/values-ar/values.xml b/library/base/src/main/res/values-ar/values.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="normalized_app_language">ar</string>
+</resources>
diff --git a/library/base/src/main/res/values-es/values.xml b/library/base/src/main/res/values-es/values.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="normalized_app_language">es</string>
+</resources>
diff --git a/library/base/src/main/res/values-fr/values.xml b/library/base/src/main/res/values-fr/values.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="normalized_app_language">fr</string>
+</resources>
diff --git a/library/base/src/main/res/values-hi/values.xml b/library/base/src/main/res/values-hi/values.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="normalized_app_language">hi</string>
+</resources>
diff --git a/library/base/src/main/res/values-id/values.xml b/library/base/src/main/res/values-id/values.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="normalized_app_language">id</string>
+</resources>
diff --git a/library/base/src/main/res/values-in/values.xml b/library/base/src/main/res/values-in/values.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="normalized_app_language">id</string>
+</resources>
diff --git a/library/base/src/main/res/values-lv/values.xml b/library/base/src/main/res/values-lv/values.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="normalized_app_language">lv</string>
+</resources>
diff --git a/library/base/src/main/res/values-pt/values.xml b/library/base/src/main/res/values-pt/values.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="normalized_app_language">pt</string>
+</resources>
diff --git a/library/base/src/main/res/values-ru/values.xml b/library/base/src/main/res/values-ru/values.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="normalized_app_language">ru</string>
+</resources>
diff --git a/library/base/src/main/res/values-vi/values.xml b/library/base/src/main/res/values-vi/values.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="normalized_app_language">vi</string>
+</resources>
diff --git a/library/base/src/main/res/values-zh-rCN/values.xml b/library/base/src/main/res/values-zh-rCN/values.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="normalized_app_language">zh-Hans</string>
+</resources>
diff --git a/library/base/src/main/res/values-zh-rTW/values.xml b/library/base/src/main/res/values-zh-rTW/values.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="normalized_app_language">zh-Hant</string>
+</resources>
diff --git a/library/base/src/main/res/values/values.xml b/library/base/src/main/res/values/values.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="normalized_app_language">en</string>
+</resources>