From fc766b53364e4ff9ffc7435b6af3ec1e8e3a4f56 Mon Sep 17 00:00:00 2001
From: Kaalleen <36401965+kaalleen@users.noreply.github.com>
Date: Fri, 5 Mar 2021 17:19:25 +0100
Subject: update electron translations (#1031)

---
 .github/workflows/translations.yml | 7 ++++---
 Makefile                           | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/translations.yml b/.github/workflows/translations.yml
index b907e52d..2b18f3df 100644
--- a/.github/workflows/translations.yml
+++ b/.github/workflows/translations.yml
@@ -4,7 +4,7 @@ on:
     - cron: '0 0 * * *'
 jobs:
   crowdin:
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
         with:
@@ -16,7 +16,7 @@ jobs:
           git submodule update --init --recursive
       - uses: actions/setup-python@v1
         with:
-          python-version: '2.7.x'
+          python-version: '3.x'
       - env:
           CROWDIN_API_KEY: ${{ secrets.CROWDIN_API_KEY }}
         run: |
@@ -41,7 +41,8 @@ jobs:
           # files when a new translation string is added but we don't need to
           # commit those until folks actually translate the new strings.
           if git diff translations | grep -qE '^[-+]msgstr ".+"$'; then
-            git add translations
+            make electron/src/renderer/assets/translations.json
+            git add translations electron/src/renderer/assets/translations.json
             git commit -m "new translations from Crowdin"
             git push https://github.com/inkstitch/inkstitch main
           fi
diff --git a/Makefile b/Makefile
index 3253a570..277b47f2 100644
--- a/Makefile
+++ b/Makefile
@@ -23,8 +23,8 @@ messages.po:
 	find electron/src -name '*.html' -o -name '*.js' -o -name '*.vue' | xargs electron/node_modules/.bin/gettext-extract --quiet --attribute v-translate --output messages-vue.po
 	msgcat -o messages.po messages-babel.po messages-vue.po
 
-electron/src/renderer/assets/translations.json: $(addsuffix /LC_MESSAGES/inkstitch.po,$(wildcard locales/*))
-	find locales -name '*.po' -a ! -empty | \
+electron/src/renderer/assets/translations.json: $(wildcard translations/messages_*.po)
+	find translations -name '*.po' -a ! -empty | \
 		xargs electron/node_modules/.bin/gettext-compile --output electron/src/renderer/assets/translations.json
 
 %.po: %.mo
-- 
cgit v1.2.3