From d65273d8fa414aaacb049216f3c5bcc3179666c4 Mon Sep 17 00:00:00 2001 From: Syer10 Date: Sun, 20 Jun 2021 18:16:08 -0400 Subject: [PATCH] Fix some locale setting issues --- .../ca/gosyer/data/translation/ResourceProvider.kt | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/kotlin/ca/gosyer/data/translation/ResourceProvider.kt b/src/main/kotlin/ca/gosyer/data/translation/ResourceProvider.kt index 5a899633..e4eeefb1 100644 --- 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()) }