Merge pull request #3 from eevieapp/feature/fix-android-getLanguageTag

fix: use forLanguageTag to create new Locale
jakex7 · Aug 1, 2023 · 2e43d92 · 2e43d92
2 parents 8471852 + 583d0e6
commit 2e43d92
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/android/src/main/java/com/localizationsettings/LocalizationSettingsModule.kt b/android/src/main/java/com/localizationsettings/LocalizationSettingsModule.kt
@@ -23,10 +23,12 @@ class LocalizationSettingsModule internal constructor(context: ReactApplicationC
    * if country is not available in locale, then use system defaults (even if it's not 100% correct, like "pl-US")
    **/
   private fun getLanguageTag(language: String): String {
-    // if language have format language_COUNTRY, then return it
-    if (Locale(language).country != "") return Locale(language).toLanguageTag()
+    val locale = Locale.forLanguageTag(language);
+
+    // if language has format language-COUNTRY, then return it
+    if (locale.country != "") return locale.toLanguageTag()
     // fallback for system country
-    return "$language-${Locale.getDefault().country}"
+    return Locale(locale.language, Locale.getDefault().country).toLanguageTag()
   }