android/SukiSU-Ultra
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

manager: allow to query language if country is unknown. close #1495

Browse Source
This commit is contained in:
weishu
2024-03-21 14:45:25 +08:00
parent e38a5e52d2
commit 3291538446
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
manager/app/src/main/java/me/weishu/kernelsu/ui/viewmodel/TemplateViewModel.kt
View File

@@ -209,9 +209,14 @@ private fun getLocaleString(json: JSONObject, key: String): String {
val locale = Locale.getDefault() val locale = Locale.getDefault()
val localeKey = "${locale.language}_${locale.country}" val localeKey = "${locale.language}_${locale.country}"
json.optJSONObject("locales")?.let { json.optJSONObject("locales")?.let {
// check locale first
it.optJSONObject(localeKey)?.let { json-> it.optJSONObject(localeKey)?.let { json->
return json.optString(key, fallback) return json.optString(key, fallback)
} }
// fallback to language
it.optJSONObject(locale.language)?.let { json->
return json.optString(key, fallback)
}
} }
return fallback return fallback
} }