Merge pull request #15081 from rtibblesbot/issue-15074-dac7e5

Localize Android installer UI through Crowdin

Author: rtibbles

.github/workflows/platform-android-build_apk.yml

@@ -124,16 +124,14 @@ jobs:
           name: ${{ inputs.tar-file-name }}
           path: platforms/android/tar
       # Install the member's Play Store build tooling from the shared workspace
-      # lock into the root .venv that Gradle's buildPython targets, then add the
-      # Chaquopy cext deps (kept out of the lock) that create_strings.py needs.
+      # lock into the root .venv that Gradle's buildPython targets.
       # Pin the venv to Python 3.10 so it matches Chaquopy's embedded runtime
       # (app/build.gradle `python { version = "3.10" }`); buildPython must be the
       # same minor version or `installDebugPythonRequirements` rejects it.
       - name: Install dependencies
         working-directory: ${{ github.workspace }}
         run: |
           uv sync --package kolibri-installer-android --extra build --python 3.10
-          uv pip install -r platforms/android/requirements.txt
       - name: Build the aab
         if: ${{ inputs.release }}
         env:

build_tools/i18n/generate_mapping.py

@@ -1,21 +1,42 @@
 #!/usr/bin/env python3
 """
-Script to generate a mapping from crowdin_code to Django locale code.
-Reads language_info.json and uses our copy of Django's locale utilities
-to convert intl_code to locale format.
+Generate crowdin_code mappings (Django locale, installer, Android qualifier) for crowdin.yml.
 """
 
 from build_tools.i18n.utils import available_languages
 from build_tools.i18n.utils import to_locale
 
+# Script subtags (es-419, zh-hans) can't be derived by to_android_locale's
+# region logic (segment 2 -> -rXX), so list them explicitly here, keyed by
+# intl_code. Add any future script-suffixed intl code here too.
+ANDROID_LOCALE_OVERRIDES = {
+    "es-419": "b+es+419",
+    "zh-hans": "zh",
+}
 
-def get_language_mapping():
-    """
-    Read language_info.json and return a mapping from crowdin_code to Django locale code.
 
-    Returns:
-        dict: Mapping from crowdin_code to locale code (underscore format)
-    """
+def to_android_locale(intl_code):
+    """Convert a Kolibri intl code to an Android values-<code> qualifier."""
+    if intl_code in ANDROID_LOCALE_OVERRIDES:
+        return ANDROID_LOCALE_OVERRIDES[intl_code]
+    parts = intl_code.split("-")
+    if len(parts) == 1:
+        return intl_code
+    if len(parts) == 2:
+        return f"{parts[0]}-r{parts[1].upper()}"
+    raise ValueError(f"Invalid intl code: {intl_code}")
+
+
+def get_android_language_mapping():
+    """Map each crowdin_code to its Android values-<code> qualifier."""
+    return {
+        lang["crowdin_code"]: to_android_locale(lang["intl_code"])
+        for lang in available_languages()
+    }
+
+
+def get_language_mapping():
+    """Map each crowdin_code to its Django locale code (underscore format)."""
     # to_locale handles script suffixes like 'hans' correctly
     return {
         lang["crowdin_code"]: to_locale(lang["intl_code"])
@@ -30,15 +51,19 @@ def get_installer_language_mapping():
 
 
 def main():
-    """Print the underscore and installer (hyphen-lowercase) mappings for crowdin.yml."""
-    mapping = get_language_mapping()
-
+    """Print the Django-locale, Android, and installer mappings for crowdin.yml."""
     print("# Generated mapping from crowdin_code to Django locale code")  # noqa: T201
     print("# Generated by build_tools/i18n/generate_mapping.py")  # noqa: T201
-
-    for crowdin_code, locale_code in sorted(mapping.items()):
+    for crowdin_code, locale_code in sorted(get_language_mapping().items()):
         print(f'  "{crowdin_code}": "{locale_code}",')  # noqa: T201
 
+    print()  # noqa: T201
+    print("# Generated mapping from crowdin_code to Android values-<code> qualifier")  # noqa: T201
+    print("# Generated by build_tools/i18n/generate_mapping.py")  # noqa: T201
+    print('  "android_code":')  # noqa: T201
+    for crowdin_code, android_code in sorted(get_android_language_mapping().items()):
+        print(f'    "{crowdin_code}": "{android_code}",')  # noqa: T201
+
     print("  # Installer (hyphen-lowercase) mapping — %locale% placeholder")  # noqa: T201
     for crowdin_code, intl_code in sorted(get_installer_language_mapping().items()):
         print(f'  "{crowdin_code}": "{intl_code}",')  # noqa: T201

crowdin.yml

@@ -54,4 +54,13 @@ files: [
   # inline hyphen-lowercase %locale% map because installer/translations/definitions.py
   # keys the locale definitions by hyphen-lowercase codes (es-es, zh-hans). Both
   # maps derive from the same language_info.json via generate_mapping.py.
-  {"source": "/platforms/desktop-app/src/kolibri_app/locales/en/LC_MESSAGES/wxapp.po", "update_option": "update_as_unapproved", "translation": "/platforms/desktop-app/src/kolibri_app/locales/%locale_with_underscore%/LC_MESSAGES/wxapp.po", "languages_mapping": *language_mapping}, {"source": "/platforms/desktop-app/installer/translations/locale/en/messages.po", "update_option": "update_as_unapproved", "translation": "/platforms/desktop-app/installer/translations/locale/%locale%/messages.po", "languages_mapping": {"locale": {"ach": "ach-ug", "ar": "ar", "bg": "bg-bg", "bn": "bn-bd", "de": "de", "el": "el", "en": "en", "es-ES": "es-es", "fa": "fa", "fr": "fr-fr", "fv": "ff-cm", "gu-IN": "gu-in", "ha": "ha", "hi": "hi-in", "ht": "ht", "id": "id", "it": "it", "ka": "ka", "km": "km", "ko": "ko", "la": "es-419", "mr": "mr", "my": "my", "ny": "ny", "pa-IN": "pa", "pt-BR": "pt-br", "pt-mz": "pt-mz", "sw-TZ": "sw-tz", "te": "te", "uk": "uk", "ur-PK": "ur-pk", "vi": "vi", "yo": "yo", "zh-CN": "zh-hans"}}}]
+  {"source": "/platforms/desktop-app/src/kolibri_app/locales/en/LC_MESSAGES/wxapp.po", "update_option": "update_as_unapproved", "translation": "/platforms/desktop-app/src/kolibri_app/locales/%locale_with_underscore%/LC_MESSAGES/wxapp.po", "languages_mapping": *language_mapping}, {"source": "/platforms/desktop-app/installer/translations/locale/en/messages.po", "update_option": "update_as_unapproved", "translation": "/platforms/desktop-app/installer/translations/locale/%locale%/messages.po", "languages_mapping": {"locale": {"ach": "ach-ug", "ar": "ar", "bg": "bg-bg", "bn": "bn-bd", "de": "de", "el": "el", "en": "en", "es-ES": "es-es", "fa": "fa", "fr": "fr-fr", "fv": "ff-cm", "gu-IN": "gu-in", "ha": "ha", "hi": "hi-in", "ht": "ht", "id": "id", "it": "it", "ka": "ka", "km": "km", "ko": "ko", "la": "es-419", "mr": "mr", "my": "my", "ny": "ny", "pa-IN": "pa", "pt-BR": "pt-br", "pt-mz": "pt-mz", "sw-TZ": "sw-tz", "te": "te", "uk": "uk", "ur-PK": "ur-pk", "vi": "vi", "yo": "yo", "zh-CN": "zh-hans"}}},
+  # Android installer UI strings (issue #15074). type: android forces Crowdin's
+  # Android-resource parser (not .xml auto-detect), which honours
+  # translatable="false" (so task_worker_process is not uploaded) and
+  # Android-encodes downloads. %android_code% expands to the values-<code>
+  # qualifier; the android_code mapping (generated by
+  # build_tools/i18n/generate_mapping.py) overrides Crowdin's defaults so folders
+  # match Kolibri's language set. dest keeps the flattened basename unique on
+  # Crowdin under preserve_hierarchy: false.
+  {"source": "/platforms/android/app/src/main/res/values/strings.xml", "type": "android", "dest": "/android_strings.xml", "translation": "/platforms/android/app/src/main/res/values-%android_code%/strings.xml", "update_option": "update_as_unapproved", "languages_mapping": {"android_code": {"ach": "ach-rUG", "ar": "ar", "bg": "bg-rBG", "bn": "bn-rBD", "de": "de", "el": "el", "en": "en", "es-ES": "es-rES", "fa": "fa", "fr": "fr-rFR", "fv": "ff-rCM", "gu-IN": "gu-rIN", "ha": "ha", "hi": "hi-rIN", "ht": "ht", "id": "id", "it": "it", "ka": "ka", "km": "km", "ko": "ko", "la": "b+es+419", "mr": "mr", "my": "my", "ny": "ny", "pa-IN": "pa", "pt-BR": "pt-rBR", "pt-mz": "pt-rMZ", "sw-TZ": "sw-rTZ", "te": "te", "uk": "uk", "ur-PK": "ur-rPK", "vi": "vi", "yo": "yo", "zh-CN": "zh"}}}]

platforms/android/.gitignore

@@ -1,7 +1,3 @@
-# Generated source files
-app/src/main/python/strings.py
-app/src/main/res/values-*/strings.xml
-
 # Temporary files
 tmpenv
 tmphome/

platforms/android/app/build.gradle

@@ -142,43 +142,6 @@ if (extractedKolibriDir.exists() && extractedKolibriDir.isDirectory()) {
 	println "Using default version (build Kolibri tar first for correct version)"
 }
 
-// Task to generate Android resource strings from Kolibri translations
-abstract class GenerateKolibriStringsTask extends DefaultTask {
-	@InputFile
-	abstract RegularFileProperty getScriptFile()
-
-	@Input
-	abstract Property<String> getPythonExecutable()
-
-	@OutputDirectory
-	abstract DirectoryProperty getResDir()
-
-	@Inject
-	abstract ExecOperations getExecOperations()
-
-	@TaskAction
-	void generateStrings() {
-		println "Generating Kolibri strings..."
-
-		def projectRoot = getScriptFile().get().asFile.parentFile.parentFile
-		def pythonExe = getPythonExecutable().get()
-
-		execOperations.exec {
-			workingDir projectRoot
-			commandLine pythonExe, 'scripts/create_strings.py'
-		}
-
-		println "Kolibri strings generated successfully"
-	}
-}
-
-tasks.register('generateKolibriStrings', GenerateKolibriStringsTask) {
-	dependsOn streamlineKolibriTar
-	getScriptFile().set(file('../scripts/create_strings.py'))
-	getResDir().set(file('src/main/res'))
-	getPythonExecutable().set(buildPythonExecutable)
-}
-
 // Make sure Kolibri is extracted before Python requirements are generated
 afterEvaluate {
 	tasks.matching { task ->
@@ -187,20 +150,6 @@ afterEvaluate {
 	}.all { task ->
 		task.dependsOn streamlineKolibriTar
 	}
-
-	// Generate strings before resources are processed or mapped
-	tasks.matching { task ->
-		task.name.contains('generateDebugResources') ||
-				task.name.contains('generateReleaseResources') ||
-				task.name.contains('mergeDebugResources') ||
-				task.name.contains('mergeReleaseResources') ||
-				task.name.contains('mapDebugSourceSetPaths') ||
-				task.name.contains('mapReleaseSourceSetPaths') ||
-				task.name.contains('extractDeepLinksDebug') ||
-				task.name.contains('extractDeepLinksRelease')
-	}.all { task ->
-		task.dependsOn generateKolibriStrings
-	}
 }
 
 android {

platforms/android/pyproject.toml

@@ -43,9 +43,6 @@ known-first-party = ["kolibri"]
 # on sys.path) that must precede `import zeroconf`, so it is neither unused (F401)
 # nor safe to reorder (I001).
 "app/src/main/python/monkey_patch_zeroconf.py" = ["F401", "I001"]
-# create_resource_files walks the locale tree inline; splitting it up would not
-# make the string-generation flow any clearer.
-"scripts/create_strings.py" = ["C901"]
 
 [tool.pytest.ini_options]
 testpaths = ["scripts/tests"]