Fix some locale setting issues

This commit is contained in:
Syer10
2021-06-20 18:16:08 -04:00
parent 5a19604cd1
commit d65273d8fa

View File

@@ -18,13 +18,16 @@ class ResourceProvider @Inject constructor(
val languagePref = uiPreferences.language() val languagePref = uiPreferences.language()
return if (languagePref.isSet()) { return if (languagePref.isSet()) {
languagePref.get().let { languagePref.get().let {
val locale: Locale? = Locale.forLanguageTag(it) if (it.isBlank()) {
if (locale != null) { getDefault()
XmlResourceBundle.forLocale(locale)
} else { } 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())
} }