Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 3a9b2dc2 authored by Wolf-Martell Montwé's avatar Wolf-Martell Montwé
Browse files

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

parent ff4705ac
Loading
Loading
Loading
Loading
+5 −5
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ android {
            "de",
            "el",
            "en",
            "en_GB",
            "en-rGB",
            "eo",
            "es",
            "et",
@@ -63,8 +63,8 @@ android {
            "nl",
            "nn",
            "pl",
            "pt_BR",
            "pt_PT",
            "pt-rBR",
            "pt-rPT",
            "ro",
            "ru",
            "sk",
@@ -75,8 +75,8 @@ android {
            "tr",
            "uk",
            "vi",
            "zh_CN",
            "zh_TW",
            "zh-rCN",
            "zh-rTW",
        )
    }

+5 −5
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ android {
            "de",
            "el",
            "en",
            "en_GB",
            "en-rGB",
            "eo",
            "es",
            "et",
@@ -62,8 +62,8 @@ android {
            "nl",
            "nn",
            "pl",
            "pt_BR",
            "pt_PT",
            "pt-rBR",
            "pt-rPT",
            "ro",
            "ru",
            "sl",
@@ -74,8 +74,8 @@ android {
            "tr",
            "uk",
            "vi",
            "zh_CN",
            "zh_TW",
            "zh-rCN",
            "zh-rTW",
        )
    }

+11 −0
Original line number Diff line number Diff line
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
    }
}
+1 −6
Original line number Diff line number Diff line
@@ -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()
    }
}
+4 −5
Original line number Diff line number Diff line
@@ -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("            ),")
        appendLine("        )")
        appendLine("    }")
        appendLine("}")
Loading