Explicitly reword some locale names
Avoiding some country names in favour of more generic terminology where appropriate. (cherry picked from commit 0ca14c61c256af770fe31c0d0cc8b7111f4b988b)
This commit is contained in:
parent
fe64a597b1
commit
827fe98211
@ -12,7 +12,7 @@ import java.util.Locale
|
|||||||
object LocaleHelper {
|
object LocaleHelper {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns Display name of a string language code
|
* Returns display name of a string language code.
|
||||||
*/
|
*/
|
||||||
fun getSourceDisplayName(lang: String?, context: Context): String {
|
fun getSourceDisplayName(lang: String?, context: Context): String {
|
||||||
// SY -->
|
// SY -->
|
||||||
@ -30,7 +30,7 @@ object LocaleHelper {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns Display name of a string language code
|
* Returns display name of a string language code.
|
||||||
*
|
*
|
||||||
* @param lang empty for system language
|
* @param lang empty for system language
|
||||||
*/
|
*/
|
||||||
@ -39,10 +39,11 @@ object LocaleHelper {
|
|||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
|
|
||||||
val locale = if (lang.isEmpty()) {
|
val locale = when {
|
||||||
LocaleListCompat.getAdjustedDefault()[0]
|
lang.isEmpty() -> LocaleListCompat.getAdjustedDefault()[0]
|
||||||
} else {
|
lang == "zh-CN" -> Locale.forLanguageTag("zh-Hans")
|
||||||
Locale.forLanguageTag(lang)
|
lang == "zh-TW" -> Locale.forLanguageTag("zh-Hant")
|
||||||
|
else -> Locale.forLanguageTag(lang)
|
||||||
}
|
}
|
||||||
return locale!!.getDisplayName(locale).replaceFirstChar { it.uppercase(locale) }
|
return locale!!.getDisplayName(locale).replaceFirstChar { it.uppercase(locale) }
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user