From 916c09709044976b54d2c58cc6c48d85b7321c06 Mon Sep 17 00:00:00 2001
From: WatchTheFort <36827423+WatchTheFort@users.noreply.github.com>
Date: Sat, 5 Oct 2024 12:04:57 -0400
Subject: [PATCH] Transifex synchronization source (#34)

* Update transifex_merge.yml

* [Transifex] Translate language/en/ui.json in fr (#30)

100% reviewed source file: 'language/en/ui.json'
on 'fr'.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>

* [Transifex] Translate language/en/ui.json in fr (#31)

100% reviewed source file: 'language/en/ui.json'
on 'fr'.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>

* Update transifex_merge.yml

* [Transifex] Translate language/en/ui.json in fr (#33)

100% reviewed source file: 'language/en/ui.json'
on 'fr'.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>

* Update transifex_merge.yml

---------

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
---
 .github/workflows/transifex_merge.yml | 10 ++++++++++
 language/fr/ui.json                   |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/transifex_merge.yml b/.github/workflows/transifex_merge.yml
index 94a01ab..b773f9f 100644
--- a/.github/workflows/transifex_merge.yml
+++ b/.github/workflows/transifex_merge.yml
@@ -26,14 +26,24 @@ jobs:
 
       - name: Force merge translation directories (excluding English)
         run: |
+          echo "1"
+          git status
           git fetch --unshallow origin transifex-synchronization-source
+          echo "2"
+          git status
           for dir in language/*/; do
+            echo "3"
             echo "$dir"
             echo "$(basename $dir)"
             if [ -d $dir ] && [ "$(basename $dir)" != "en" ]; then
               git checkout transifex-synchronization-source -- language/$dir
               git add language/$dir
+              git status
             fi
           done
+          echo "4"
+          git status
           git commit -m "[Transifex] Update translations on master"
+          echo "5"
+          git status
           git push origin master --force
diff --git a/language/fr/ui.json b/language/fr/ui.json
index b0847c7..7e835cd 100644
--- a/language/fr/ui.json
+++ b/language/fr/ui.json
@@ -1,7 +1,7 @@
 {
 	"interface": {
 		"welcome": "Bienvenue a test du Transifex!",
-		"goodbye2": "Au revoir, Commandante!",
+		"goodbye2": "Au revoir, Commandantes!",
 		"error": "Mon dieu! C'est une catastrophe!"
 	}
 }