Use update i18n command instead of generate

diff --git a/package.json b/package.json
index 02c456e82536edb8b0e013bd5b04bc71620c4944..946b53018489fab7bdff05c46a1d7c0e2231d2da 100644 (file)
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
     "danger:clean:dev": "scripty",
     "danger:clean:prod": "scripty",
     "danger:clean:modules": "scripty",
-    "i18n:generate": "scripty",
+    "i18n:update": "scripty",
     "plugin:install": "node ./dist/scripts/plugin/install.js",
     "plugin:uninstall": "node ./dist/scripts/plugin/uninstall.js",
     "i18n:create-custom-files": "node ./dist/scripts/i18n/create-custom-files.js",

diff --git a/scripts/i18n/generate.sh b/scripts/i18n/update.sh
similarity index 90%
rename from scripts/i18n/generate.sh
rename to scripts/i18n/update.sh
index 0d1cd35c0ea15d5b13ee339c55cc9d7ff93f4220..916918f84c789780ebd3d65077950a77f2d4097e 100755 (executable)
--- a/scripts/i18n/generate.sh
+++ b/scripts/i18n/update.sh
@@ -2,6 +2,8 @@
 
 set -eu
 
+git fetch weblate && git merge weblate/develop
+
 npm run build -- --i18n
 
 cd client

diff --git a/support/doc/development/localization.md b/support/doc/development/localization.md
index 626c0ff9f4616e7ebd0c0496ce1da6629242da47..3d09bbecbe018599ca1fe470015f34d57ff3c34f 100644 (file)
--- a/support/doc/development/localization.md
+++ b/support/doc/development/localization.md
@@ -8,10 +8,8 @@ Source files are in `client/src/locale` and translated files merged from [Weblat
 Will generate XLIFF base files for Angular (`angular.xlf`) and JSON files for the player (`player.en-US.json`) and the server (`server.en-US.json`).
 Then, it will merge new translation keys into localized Angular files (`angular.fr-FR.xlf` etc).
 
-**Only generate new translations after a Weblate pull to avoid conflicts**
-
 ```
-$ npm run i18n:generate
+$ npm run i18n:update
 ```