3 files changed, 16 insertions, 7 deletions

diff --git a/scripts/build/client.sh b/scripts/build/client.sh
index 567a6e5e0..5b70b6045 100755
--- a/scripts/build/client.sh
+++ b/scripts/build/client.sh
@@ -31,7 +31,7 @@ post_build_hook
 # Don't build other languages if --light arg is provided
 if [ -z ${1+x} ] || [ "$1" != "--light" ]; then
     # Supported languages
-    languages=("fr_FR" "eu_ES" "ca_ES" "cs_CZ" "eo")
+    languages=("fr_FR" "eu_ES" "ca_ES" "cs_CZ" "eo" "zh_Hant_TW" "de_DE" "es_ES")
 
     for lang in "${languages[@]}"; do
         # TODO: remove when the project will use runtime translations
diff --git a/scripts/i18n/create-custom-files.ts b/scripts/i18n/create-custom-files.ts
index a297fa79c..c4f8411e1 100755
--- a/scripts/i18n/create-custom-files.ts
+++ b/scripts/i18n/create-custom-files.ts
@@ -1,7 +1,14 @@
 import * as jsToXliff12 from 'xliff/jsToXliff12'
 import { writeFile } from 'fs'
 import { join } from 'path'
-import { buildLanguages, VIDEO_CATEGORIES, VIDEO_LICENCES, VIDEO_PRIVACIES } from '../../server/initializers/constants'
+import {
+  buildLanguages,
+  VIDEO_CATEGORIES,
+  VIDEO_IMPORT_STATES,
+  VIDEO_LICENCES,
+  VIDEO_PRIVACIES,
+  VIDEO_STATES
+} from '../../server/initializers/constants'
 import { values } from 'lodash'
 
 type TranslationType = {
@@ -33,6 +40,8 @@ const serverKeys: any = {}
 values(VIDEO_CATEGORIES)
   .concat(values(VIDEO_LICENCES))
   .concat(values(VIDEO_PRIVACIES))
+  .concat(values(VIDEO_STATES))
+  .concat(values(VIDEO_IMPORT_STATES))
   .forEach(v => serverKeys[v] = v)
 
 // More keys
diff --git a/scripts/release.sh b/scripts/release.sh
index b5fa68f42..4b45c959d 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -25,8 +25,8 @@ if [ -z "$GITHUB_TOKEN" ]; then
 fi
 
 branch=$(git symbolic-ref --short -q HEAD)
-if [ "$branch" != "develop" ]; then
-  echo "Need to be on develop branch."
+if [ "$branch" != "develop" ] && [[ "$branch" != feature/* ]]; then
+  echo "Need to be on develop or release branch."
   exit -1
 fi
 
@@ -102,14 +102,14 @@ rm "./client/dist/embed-stats.json"
   github-release upload --user chocobozzz --repo peertube --tag "$version" --name "$tar_name" --file "$tar_name"
   github-release upload --user chocobozzz --repo peertube --tag "$version" --name "$tar_name.asc" --file "$tar_name.asc"
 
-  git push origin develop
+  git push origin "$branch"
 
   # Only update master if it is not a pre release
   if [ -z "$github_prerelease_option" ]; then
       # Update master branch
       git checkout master
-      git rebase develop
+      git merge "$branch"
       git push origin master
-      git checkout develop
+      git checkout "$branch"
   fi
 )