Merge pull request #576 from itk-dev/feature/6146-translations-cleanup

Translations cleanup

Author: martinyde

.github/workflows/pr.yaml

@@ -186,3 +186,37 @@ jobs:
       - name: Reverse patch
         run: |
           docker compose exec phpfpm patch --strip=1 --verbose --input=${{ matrix.patch }} --reverse
+
+  check-translations:
+    name: Check translation are up to date
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: go-task/setup-task@v1
+
+      - name: Install site
+        run: |
+          docker network create frontend
+          docker compose pull
+          docker compose up --detach
+
+          # Important: Use --no-interaction to make https://getcomposer.org/doc/06-config.md#discard-changes have effect.
+          docker compose exec phpfpm composer install --no-interaction
+
+          # Install the site
+          docker compose exec phpfpm vendor/bin/drush site:install --existing-config --yes
+
+      - run: |
+          task translation:extract
+
+      # https://github.com/mxschmitt/action-tmate?tab=readme-ov-file#manually-triggered-debug
+      # Enable tmate debugging if debug logging is enabled (cf.
+      # https://docs.github.com/en/actions/writing-workflows/choosing-what-your-workflow-does/accessing-contextual-information-about-workflow-runs#runner-context)
+      - name: Setup tmate session
+        uses: mxschmitt/action-tmate@v3
+        with:
+          limit-access-to-actor: false
+        if: 1 == runner.debug
+
+      - run: |
+          task translation:diff

.gitignore

@@ -45,3 +45,4 @@ private-files
 /playwright/.cache/
 
 config/sync/**/webform.webform.*
+*.mo

.woodpecker/prod.yml

@@ -25,6 +25,9 @@ steps:
       pre_up:
         - itkdev-docker-compose-server run --rm phpfpm vendor/bin/drush --yes cache:rebuild
         - itkdev-docker-compose-server run --rm phpfpm vendor/bin/drush --yes deploy
+        - itkdev-docker-compose-server run --rm phpfpm vendor/bin/drush --yes locale:check
+        - itkdev-docker-compose-server run --rm phpfpm vendor/bin/drush --yes locale:update
+        - itkdev-docker-compose-server run --rm phpfpm vendor/bin/drush --yes cache:rebuild
       cron:
         cron:
           minute: "*/5"

.woodpecker/stg.yml

@@ -40,4 +40,7 @@ steps:
         - docker compose run --rm node npm --prefix web/themes/custom/hoeringsportal install
         - docker compose run --rm node npm --prefix web/themes/custom/hoeringsportal run build
         - docker compose run --rm node rm -rf web/themes/custom/hoeringsportal/node_modules
+        # Update translations
+        - itkdev-docker-compose-server exec phpfpm vendor/bin/drush --yes locale:check
+        - itkdev-docker-compose-server exec phpfpm vendor/bin/drush --yes locale:update
         - itkdev-docker-compose-server exec phpfpm vendor/bin/drush --yes cache:rebuild

CHANGELOG.md

@@ -6,6 +6,8 @@ Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+* [PR-576](https://github.com/itk-dev/deltag.aarhus.dk/pull/576)
+  Updates translations and added translations handling to deployment
 * [PR-584](https://github.com/itk-dev/deltag.aarhus.dk/pull/584)
   Removed field_deskpro_department_id from public_meeting content type
 

Taskfile.yml

@@ -3,6 +3,45 @@ version: "3"
 # https://taskfile.dev/usage/#env-files
 dotenv: [".env.local", ".env"]
 
+includes:
+  translation:
+    taskfile: ./task/Taskfile.translation.yml
+    vars:
+      TRANSLATION_MODULES:
+        # - aarhus_hero
+
+        - hoeringsportal_anonymous_edit
+        # - hoeringsportal_audit_log
+        # - hoeringsportal_base_fixtures
+        - hoeringsportal_citizen_proposal
+        - hoeringsportal_citizen_proposal_archiving
+        # - hoeringsportal_config_settings
+        # - hoeringsportal_content_access
+        # - hoeringsportal_content_blocks
+        # - hoeringsportal_data
+        # - hoeringsportal_deskpro
+        - hoeringsportal_dialogue
+        # - hoeringsportal_forms
+        - hoeringsportal_hearing
+        # - hoeringsportal_misc
+        # - hoeringsportal_openid_connect
+        # - hoeringsportal_project
+        - hoeringsportal_project_timeline
+        - hoeringsportal_public_meeting
+        - hoeringsportal_quicklinks
+        # - hoeringsportal_test_delta_sync_fixtures
+
+        - itk_admin
+        - itk_admin_links
+        # - itk_media_entity
+
+      TRANSLATION_THEMES:
+        - hoeringsportal
+        # - hoeringsportal_admin
+
+      TRANSLATION_LANGUAGES:
+        - da
+
 vars:
   # https://taskfile.dev/reference/templating/
   BASE_URL: '{{.TASK_BASE_URL | default .COMPOSE_SERVER_DOMAIN | default .COMPOSE_DOMAIN | default "https://deltag.local.itkdev.dk"}}'
@@ -314,18 +353,9 @@ tasks:
   translations:import:
     cmds:
       - task compose -- exec phpfpm bash -c '(cd web && ../vendor/bin/drush locale:import --type=customized --override=all da ../translations/custom-translations.da.po)'
-      - task drush -- php:eval "var_export(\Drupal::state()->get('locale.translation.formulae', []))"
-      - 'task drush -- php:eval "var_export(array_map(static fn (\$count) => (new \Drupal\Core\StringTranslation\PluralTranslatableMarkup(\$count, ''1 item'', ''@count items'', options: [''langcode'' => ''da'']))->render(), range(0, 5)));"'
-      - 'task drush -- php:eval "var_export(array_map(static fn (\$count) => (new \Drupal\Core\StringTranslation\PluralTranslatableMarkup(\$count, ''1 item'', ''@count items'', options: [''langcode'' => ''en'']))->render(), range(0, 5)));"'
-    silent: true
-
-  translations:export:
-    cmds:
-      - task compose -- exec phpfpm bash -c '(cd web && ../vendor/bin/drush locale:export da --types=customized > ../translations/custom-translations.da.po)'
-      # Fix plurals spec in PO file
-      # https://drupalsun.com/eelke/2020/08/17/tale-mistranslated-plurals
-      # https://www.drupal.org/project/drupal/issues/3496223
-      - 'task compose -- exec phpfpm sed -i "s/Plural-Forms: nplurals=2; plural=(n > 1);/Plural-Forms: nplurals=2; plural=(n != 1);/" translations/custom-translations.da.po'
+      - task drush -- locale:check
+      - task drush -- locale:update
+      - task drush -- cache:rebuild
     silent: true
 
   # Development settings tasks (`/admin/config/development/settings`) (cf. https://www.drupal.org/docs/develop/development-tools/disabling-and-debugging-caching).

composer.json

@@ -96,6 +96,7 @@
         "drupal/masquerade": "^2.0",
         "drupal/webprofiler": "^10.3",
         "ergebnis/composer-normalize": "^2.44",
+        "itk-dev/drupal_translation_extractor": "dev-itk_translation_extractor",
         "mglaman/phpstan-drupal": "^1.1",
         "phpstan/extension-installer": "^1.2",
         "phpstan/phpstan-deprecation-rules": "^1.1",
@@ -187,6 +188,10 @@
                 }
             }
         },
+        "itk-dev/drupal_translation_extractor": {
+            "type": "vcs",
+            "url": "https://github.com/itk-dev/drupal_translation_extractor"
+        },
         "// @see web/modules/contrib/search_autocomplete/readme.md": {
             "type": "package",
             "package": {
@@ -317,6 +322,9 @@
             },
             "drupal/site_status_message": {
                 "Add cache support (https://www.drupal.org/project/site_status_message/issues/3497218)": "https://git.drupalcode.org/project/site_status_message/-/merge_requests/8.diff"
+            },
+            "vincentlanglet/twig-cs-fixer": {
+                "Drupal's trans tag has an optional plural tag which conflicts with the trans tag from Symfony's Twig bridge (cf. https://github.com/VincentLanglet/Twig-CS-Fixer/pull/134#issuecomment-1756924889)": "patches/vincentlanglet/twig-cs-fixer/token-parser.patch"
             }
         },
         "scripts": {