From bffecf3833724b46d58e6f0fd1792b455773df5d Mon Sep 17 00:00:00 2001 From: arkon Date: Sun, 18 Sep 2022 11:07:10 -0400 Subject: [PATCH] Avoid invalid locales in language picker (fixes #7950) We should probably prune the translations though. (cherry picked from commit 877ae041a419be60d2f094130cf58096dc7f0120) --- .../kanade/tachiyomi/ui/setting/SettingsGeneralController.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt index 0ce607208..9d78e50ec 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt @@ -61,7 +61,10 @@ class SettingsGeneralController : SettingsController() { for (i in 0 until parser.attributeCount) { if (parser.getAttributeName(i) == "name") { val langTag = parser.getAttributeValue(i) - langs.add(Pair(langTag, LocaleHelper.getDisplayName(langTag))) + val displayName = LocaleHelper.getDisplayName(langTag) + if (displayName.isNotEmpty()) { + langs.add(Pair(langTag, displayName)) + } } } }