From 08ec7dfef1f42e236fbfb48724936118495ec959 Mon Sep 17 00:00:00 2001 From: andrekir Date: Mon, 12 Dec 2022 21:51:15 -0300 Subject: [PATCH] clean up language tags parser --- .../main/java/com/geeksville/mesh/util/LanguageUtils.kt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/geeksville/mesh/util/LanguageUtils.kt b/app/src/main/java/com/geeksville/mesh/util/LanguageUtils.kt index 3a85ffaca..60025f6a9 100644 --- a/app/src/main/java/com/geeksville/mesh/util/LanguageUtils.kt +++ b/app/src/main/java/com/geeksville/mesh/util/LanguageUtils.kt @@ -51,16 +51,15 @@ object LanguageUtils : Logging { } catch (e: Exception) { errormsg("Error parsing locale_config.xml ${e.message}") } - fun getDisplayLanguage(tag: String): String { + return languageTags.map { tag -> val loc = Locale(tag) - return when (tag) { + when (tag) { SYSTEM_DEFAULT -> context.getString(R.string.preferences_system_default) "fr-HT" -> context.getString(R.string.fr_HT) "pt-BR" -> context.getString(R.string.pt_BR) else -> loc.getDisplayLanguage(loc) .replaceFirstChar { if (it.isLowerCase()) it.titlecase(loc) else it.toString() } - } + } to tag } - return languageTags.map { getDisplayLanguage(it) to it } } } \ No newline at end of file