Show locale name in system default locale
This commit is contained in:
@@ -62,15 +62,14 @@ class SettingsGeneralController : SettingsController() {
|
||||
titleRes = R.string.pref_language
|
||||
|
||||
val langs = mutableListOf<Pair<String, String>>()
|
||||
langs += Pair("", context.getString(R.string.system_default))
|
||||
langs += Pair("", "${context.getString(R.string.system_default)} (${LocaleHelper.getDisplayName("")})")
|
||||
langs += arrayOf(
|
||||
"ar", "bg", "bn", "ca", "cs", "de", "el", "en-US", "en-GB", "es", "fr", "he",
|
||||
"hi", "hu", "in", "it", "ja", "ko", "lv", "ms", "nb-rNO", "nl", "pl", "pt",
|
||||
"pt-BR", "ro", "ru", "sc", "sr", "sv", "th", "tl", "tr", "uk", "vi", "zh-rCN"
|
||||
)
|
||||
.map {
|
||||
val locale = LocaleHelper.getLocaleFromString(it)
|
||||
Pair(it, locale!!.getDisplayName(locale).capitalize())
|
||||
Pair(it, LocaleHelper.getDisplayName(it))
|
||||
}
|
||||
.sortedBy { it.second }
|
||||
|
||||
|
||||
@@ -40,7 +40,7 @@ class SettingsSourcesController : SettingsController() {
|
||||
// Create a preference group and set initial state and change listener
|
||||
switchPreferenceCategory {
|
||||
preferenceScreen.addPreference(this)
|
||||
title = LocaleHelper.getDisplayName(lang, context)
|
||||
title = LocaleHelper.getSourceDisplayName(lang, context)
|
||||
isPersistent = false
|
||||
if (lang in activeLangsCodes) {
|
||||
setChecked(true)
|
||||
|
||||
Reference in New Issue
Block a user