Trying a new l10n merger.

josephsl · Sep 4, 2024 · a9c926a · a9c926a
1 parent dfcbf48
commit a9c926a
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/.github/workflows/mergeTranslations.yaml b/.github/workflows/mergeTranslations.yaml
@@ -21,16 +21,15 @@ jobs:
         git pull
         git remote add l10n https://github.com/nvdaaddons/addonUpdater
         git fetch l10n
-        git merge -q --ff -m "Translations automerge" l10n/stable
+        git merge --ff -m "Translations automerge" l10n/stable
     - name: Fix problem directories
       run: |
-        for badDir in $(find addon/locale -name '*add-ons'); do
-        echo "Fixing bad directory: $badDir"
-        mkdir "$badDir"/../LC_MESSAGES 2>/dev/null
-        # Have to use real mv not git mv, because git mv won't overwrite
-        mv "$badDir"/LC_MESSAGES/nvda.po "$badDir"/../LC_MESSAGES/
-        git add "$badDir"/../LC_MESSAGES/nvda.po
-        rm -r "$badDir"
+        for badDir in $(find addon/locale -name '*add-ons'); do \
+        echo "Fixing bad directory: $badDir"; \
+        mkdir "$badDir"/../LC_MESSAGES 2>/dev/null; \
+        mv "$badDir"/LC_MESSAGES/nvda.po "$badDir"/../LC_MESSAGES/; \
+        git add "$badDir"/../LC_MESSAGES/nvda.po; \
+        rm -r "$badDir"; \
         done
         git commit -am 'Removing "add-ons" from l10n directories.'
     - name: Pushing updates