Fix some locale setting issues

Suwayomi · Jun 20, 2021 · d65273d · d65273d
1 parent 5a19604
commit d65273d
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/src/main/kotlin/ca/gosyer/data/translation/ResourceProvider.kt b/src/main/kotlin/ca/gosyer/data/translation/ResourceProvider.kt
@@ -18,13 +18,16 @@ class ResourceProvider @Inject constructor(
         val languagePref = uiPreferences.language()
         return if (languagePref.isSet()) {
             languagePref.get().let {
-                val locale: Locale? = Locale.forLanguageTag(it)
-                if (locale != null) {
-                    XmlResourceBundle.forLocale(locale)
+                if (it.isBlank()) {
+                    getDefault()
                 } else {
-                    XmlResourceBundle.forTag(it)
+                    val locale: Locale = Locale.forLanguageTag(it)
+                    Locale.setDefault(locale)
+                    XmlResourceBundle.forLocale(locale)
                 }
             }
-        } else XmlResourceBundle.forLocale(Locale.getDefault())
+        } else getDefault()
     }
+
+    private fun getDefault() = XmlResourceBundle.forLocale(Locale.getDefault())
 }