Change language code region to ISO 3166-1-alpha-2 region code where needed

Author: wmontwe

app-k9mail/build.gradle.kts

@@ -41,7 +41,7 @@ android {
             "de",
             "el",
             "en",
-            "en_GB",
+            "en-rGB",
             "eo",
             "es",
             "et",
@@ -66,8 +66,8 @@ android {
             "nl",
             "nn",
             "pl",
-            "pt_BR",
-            "pt_PT",
+            "pt-rBR",
+            "pt-rPT",
             "ro",
             "ru",
             "sk",
@@ -78,8 +78,8 @@ android {
             "tr",
             "uk",
             "vi",
-            "zh_CN",
-            "zh_TW",
+            "zh-rCN",
+            "zh-rTW",
         )
     }
 

app-thunderbird/build.gradle.kts

@@ -40,7 +40,7 @@ android {
             "de",
             "el",
             "en",
-            "en_GB",
+            "en-rGB",
             "eo",
             "es",
             "et",
@@ -65,8 +65,8 @@ android {
             "nl",
             "nn",
             "pl",
-            "pt_BR",
-            "pt_PT",
+            "pt-rBR",
+            "pt-rPT",
             "ro",
             "ru",
             "sl",
@@ -77,8 +77,8 @@ android {
             "tr",
             "uk",
             "vi",
-            "zh_CN",
-            "zh_TW",
+            "zh-rCN",
+            "zh-rTW",
         )
     }
 

cli/translation-cli/src/main/kotlin/net/thunderbird/cli/translation/AndroidLanguageCodeHelper.kt

@@ -0,0 +1,11 @@
+package net.thunderbird.cli.translation
+
+object AndroidLanguageCodeHelper {
+
+    /**
+     * Fix the language code format to match the Android resource format.
+     */
+    fun fixLanguageCodeFormat(languageCode: String): String {
+        return if (languageCode.contains("-r")) languageCode.replace("-r", "_") else languageCode
+    }
+}

cli/translation-cli/src/main/kotlin/net/thunderbird/cli/translation/LanguageCodeLoader.kt

@@ -27,11 +27,6 @@ class LanguageCodeLoader(
         return languages.filter { it.translatedPercent >= threshold }
             .map {
                 languageCodeLookup[it.code] ?: throw IllegalArgumentException("Language code ${it.code} is not mapped")
-            }.map { fixLanguageCodeFormat(it) }
-            .sorted()
-    }
-
-    private fun fixLanguageCodeFormat(languageCode: String): String {
-        return if (languageCode.contains("-r")) languageCode.replace("-r", "_") else languageCode
+            }.sorted()
     }
 }

cli/translation-cli/src/main/kotlin/net/thunderbird/cli/translation/ResourceConfigurationsFormatter.kt

@@ -3,13 +3,12 @@ package net.thunderbird.cli.translation
 class ResourceConfigurationsFormatter {
     fun format(languageCodes: List<String>) = buildString {
         appendLine("android {")
-        appendLine("    defaultConfig {")
-        appendLine("        resourceConfigurations.addAll(")
-        appendLine("            listOf(")
+        appendLine("    androidResources {")
+        appendLine("        // Keep in sync with the resource string array \"supported_languages\"")
+        appendLine("        localeFilters += listOf(")
         languageCodes.forEach { code ->
-            appendLine("                \"$code\",")
+            appendLine("            \"$code\",")
         }
-        appendLine("            ),")
         appendLine("        )")
         appendLine("    }")
         appendLine("}")

cli/translation-cli/src/main/kotlin/net/thunderbird/cli/translation/TranslationCli.kt

@@ -33,17 +33,23 @@ class TranslationCli(
 
     override fun run() {
         val languageCodes = languageCodeLoader.loadCurrentAndroidLanguageCodes(token, threshold)
+        val androidLanguageCodes = languageCodes.map { AndroidLanguageCodeHelper.fixLanguageCodeFormat(it) }
         val size = languageCodes.size
 
         echo("\nLanguages that are translated above the threshold of ($threshold%): $size")
         echo("--------------------------------------------------------------")
+        echo("For androidResources.localeFilters:")
         echo(languageCodes.joinToString(", "))
+        echo()
+        echo("For array resource supported_languages:")
+        echo(androidLanguageCodes.joinToString(", "))
         if (printAll) {
+            echo()
             echo("--------------------------------------------------------------")
             echo(configurationsFormatter.format(languageCodes))
             echo("--------------------------------------------------------------")
             echo("--------------------------------------------------------------")
-            echo(supportedLanguagesFormatter.format(languageCodes))
+            echo(supportedLanguagesFormatter.format(androidLanguageCodes))
             echo("--------------------------------------------------------------")
             echo("Please read docs/translating.md for more information on how to update language values.")
             echo("--------------------------------------------------------------")