diff --git a/app/src/main/java/net/pokeranalytics/android/util/Preferences.kt b/app/src/main/java/net/pokeranalytics/android/util/Preferences.kt index 149c6062..a0808da5 100644 --- a/app/src/main/java/net/pokeranalytics/android/util/Preferences.kt +++ b/app/src/main/java/net/pokeranalytics/android/util/Preferences.kt @@ -70,9 +70,16 @@ class Preferences { } } - currencyLocale = try { - Locale.getDefault() + val defaultLocale = Locale.getDefault() + val defaultCurrency = try { + Currency.getInstance(defaultLocale) } catch (ex: Exception) { + null + } + + currencyLocale = defaultCurrency?.let { + defaultLocale + } ?: run { when (Locale.getDefault().language) { "en" -> Locale("en", "US") "fr" -> Locale("fr", "FR") @@ -83,6 +90,7 @@ class Preferences { else -> Locale("en", "US") } } + return currencyLocale!! }