From: Chocobozzz <me@florianbigard.com>
Date: Mon, 24 Aug 2020 07:35:27 +0000 (+0200)
Subject: Use update i18n command instead of generate
X-Git-Tag: v2.4.0-rc.1~41
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=49a56c72031802addffcaa8d6c374720d17e4d14;p=github%2FChocobozzz%2FPeerTube.git

Use update i18n command instead of generate
---

diff --git a/package.json b/package.json
index 02c456e82..946b53018 100644
--- 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 0d1cd35c0..916918f84 100755
--- 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 626c0ff9f..3d09bbecb 100644
--- 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
 ```