File tree Expand file tree Collapse file tree
app/src/main/kotlin/com/vrem/util Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -95,8 +95,10 @@ private val chineseCountryToLocale: Map<String, Locale> =
9595fun findByLanguageTag (languageTag : String ): Locale {
9696 val normalizedLanguageTag = normalizeLanguageTag(languageTag)
9797 if (normalizedLanguageTag.isEmpty()) return currentLocale
98+ return findSupportedLocale(Locale .forLanguageTag(normalizedLanguageTag))
99+ }
98100
99- val target = Locale .forLanguageTag(normalizedLanguageTag)
101+ fun findSupportedLocale ( target : Locale ): Locale {
100102 if (target.language.isEmpty()) return currentLocale
101103
102104 if (target.language == " zh" && target.script.isEmpty()) {
@@ -117,4 +119,4 @@ fun currentLanguageTag(): String = currentLocale.toLanguageTag()
117119
118120fun toLanguageTag (locale : Locale ): String = locale.toLanguageTag()
119121
120- fun Locale.toSupportedLocaleTag (): String = findByLanguageTag (this .toLanguageTag() ).toLanguageTag()
122+ fun Locale.toSupportedLocaleTag (): String = findSupportedLocale (this ).toLanguageTag()
You can’t perform that action at this time.
0 commit comments