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

tiann · Mar 21, 2024 · 3291538 · 3291538
1 parent e38a5e5
commit 3291538
Showing 1 changed file with 5 additions and 0 deletions.
diff --git 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
 }