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

2024-03-21 14:45:25 +08:00
parent e38a5e52d2
commit 3291538446
1 changed files with 5 additions and 0 deletions
--- a/manager/app/src/main/java/me/weishu/kernelsu/ui/viewmodel/TemplateViewModel.kt
+++ b/manager/app/src/main/java/me/weishu/kernelsu/ui/viewmodel/TemplateViewModel.kt
@@ -209,9 +209,14 @@ private fun getLocaleString(json: JSONObject, key: String): String {
    val locale = Locale.getDefault()
    val localeKey = "${locale.language}_${locale.country}"
    json.optJSONObject("locales")?.let {
+        // check locale first
        it.optJSONObject(localeKey)?.let { json->
            return json.optString(key, fallback)
        }
+        // fallback to language
+        it.optJSONObject(locale.language)?.let { json->
+            return json.optString(key, fallback)
+        }
    }
    return fallback
 }