mirror/fdroidclient
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidclient.git synced 2025-12-23 15:17:44 -05:00
Code Issues Packages Projects Releases Wiki Activity

Resurrect from my 'Elvis' falls' in getBestLocale

Browse Source 
Apparently Elvis' got style
This commit is contained in:
Ray c
2025-11-05 07:10:57 +00:00
parent 5e881ee54a
commit a4ffd9c535
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libs/index/src/androidMain/kotlin/org/fdroid/LocaleChooser.kt
View File

@@ -30,18 +30,20 @@ public object LocaleChooser {
if (firstMatch.script.isNullOrEmpty()) {
ICUCompat.maximizeAndGetScript(firstMatch)?.takeUnless { it.isEmpty() }
?.let { script -> getInRankingOrder(firstMatch, tried + 1, script, tried) }
} else if (tried > 1) {
getInRankingOrder(firstMatch, tried - 1, firstMatch.script, tried)
} else {
null
if (tried > 1) {
getInRankingOrder(firstMatch, tried - 1, firstMatch.script, tried)
} else {
null
}
}
// then language and other countries if script matches
?: if (tried == 0) null else get(firstMatch.language)?.takeIf { _ ->
?: (if (tried == 0) null else get(firstMatch.language)?.takeIf { _ ->
LocaleListCompat.matchesLanguageAndScript(
getLocale(firstMatch.language),
firstMatch
)
} ?: getFirstSameScript(firstMatch)
}) ?: getFirstSameScript(firstMatch)
}
}
// or English and then just take the first of the list
@@ -88,12 +90,12 @@ public object LocaleChooser {
}
}
private fun getLocale(language: String, script: String = "") =
private fun getLocale(language: String, country: String = "") =
if (android.os.Build.VERSION.SDK_INT >= 36) {
Locale.of(language, script)
Locale.of(language, country)
} else {
@Suppress("DEPRECATION")
Locale(language, script)
Locale(language, country)
}
}