Skip to content

Commit c72e3e4

Browse files
committed
refactor LocaleUtils to extract findSupportedLocale method
1 parent 0da39a1 commit c72e3e4

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

app/src/main/kotlin/com/vrem/util/LocaleUtils.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,10 @@ private val chineseCountryToLocale: Map<String, Locale> =
9595
fun 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

118120
fun toLanguageTag(locale: Locale): String = locale.toLanguageTag()
119121

120-
fun Locale.toSupportedLocaleTag(): String = findByLanguageTag(this.toLanguageTag()).toLanguageTag()
122+
fun Locale.toSupportedLocaleTag(): String = findSupportedLocale(this).toLanguageTag()

0 commit comments

Comments
 (0)