From 827fe98211af5d04a8f0fc4d1559404706d285b8 Mon Sep 17 00:00:00 2001 From: arkon Date: Sat, 1 Oct 2022 23:54:54 -0400 Subject: [PATCH] Explicitly reword some locale names Avoiding some country names in favour of more generic terminology where appropriate. (cherry picked from commit 0ca14c61c256af770fe31c0d0cc8b7111f4b988b) --- .../eu/kanade/tachiyomi/util/system/LocaleHelper.kt | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/system/LocaleHelper.kt b/app/src/main/java/eu/kanade/tachiyomi/util/system/LocaleHelper.kt index 2fdd94197..c44ba82f5 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/system/LocaleHelper.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/system/LocaleHelper.kt @@ -12,7 +12,7 @@ import java.util.Locale 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 { // 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 */ @@ -39,10 +39,11 @@ object LocaleHelper { return "" } - val locale = if (lang.isEmpty()) { - LocaleListCompat.getAdjustedDefault()[0] - } else { - Locale.forLanguageTag(lang) + val locale = when { + lang.isEmpty() -> LocaleListCompat.getAdjustedDefault()[0] + lang == "zh-CN" -> Locale.forLanguageTag("zh-Hans") + lang == "zh-TW" -> Locale.forLanguageTag("zh-Hant") + else -> Locale.forLanguageTag(lang) } return locale!!.getDisplayName(locale).replaceFirstChar { it.uppercase(locale) } }