4 files changed, 17 insertions, 12 deletions

diff --git a/scripts/build/client.sh b/scripts/build/client.sh
index be3eef802..d409d0594 100755
--- a/scripts/build/client.sh
+++ b/scripts/build/client.sh
@@ -41,7 +41,7 @@ if [ -z ${1+x} ] || [ "$1" != "--light" ]; then
         languages=("fr_FR")
     else
         # Supported languages
-        languages=("pl_PL" "it_IT" "ru_RU" "fr_FR" "pt_BR" "sv_SE" "eu_ES" "ca_ES" "cs_CZ" "eo" "zh_Hant_TW" "de_DE" "es_ES" "oc" "zh_Hans_CN")
+        languages=("nl_NL" "es_ES" "oc" "pt_BR" "pt_PT" "sv_SE" "pl_PL" "ru_RU" "zh_Hans_CN" "zh_Hant_TW" "fr_FR" "ja_JP" "eu_ES" "ca_ES" "cs_CZ" "eo" "de_DE" "it_IT")
     fi
 
     for lang in "${languages[@]}"; do
@@ -51,7 +51,7 @@ if [ -z ${1+x} ] || [ "$1" != "--light" ]; then
         npm run ng build -- --prod --i18n-file "./src/locale/target/angular_$lang.xml" --i18n-format xlf --i18n-locale "$lang" \
             --output-path "dist/$lang/" --deploy-url "/client/$lang/"
 
-        # Do no duplicate assets
+        # Do not duplicate assets
         rm -r "./dist/$lang/assets"
 
         # TODO: remove when the project will use runtime translations
diff --git a/scripts/generate-code-contributors.ts b/scripts/generate-code-contributors.ts
index 96110307a..0d6266056 100755
--- a/scripts/generate-code-contributors.ts
+++ b/scripts/generate-code-contributors.ts
@@ -35,8 +35,12 @@ async function run () {
 
   {
     console.log('\n\n# Design\n')
-    console.log('By [Olivier Massain](https://twitter.com/omassain)\n')
-    console.log('Icons from [Robbie Pearce](https://robbiepearce.com/softies/)')
+    console.log(' * [Olivier Massain](https://twitter.com/omassain)')
+
+    console.log('\n\n# Icons\n')
+    console.log(' * [Robbie Pearce](https://robbiepearce.com/softies/)')
+    console.log(' * [Fork-Awesome](https://github.com/ForkAwesome/Fork-Awesome)')
+    console.log(' * playlist add by Google')
   }
 }
 
diff --git a/scripts/i18n/pull-hook.sh b/scripts/i18n/pull-hook.sh
index b0668436d..2d728fef5 100755
--- a/scripts/i18n/pull-hook.sh
+++ b/scripts/i18n/pull-hook.sh
@@ -2,12 +2,13 @@
 
 set -eu
 
-# Zanata does not support inner elements in <source>, so we hack these special elements
-# This regex translate the converted elements to initial Angular elements
-
 for i in 1 2 3; do
+    # Angular does not like when there is not target element, so we create it with the same content than the source element
+    perl -0pi -e 's#<source>([^<]+)</source>\s*<context-group #<source>\1</source><target>\1</target><context-group #g' client/src/locale/target/angular_*.xml
+
+    # Zanata does not support inner elements in <source>, so we hack these special elements
+    # This regex translate the converted elements to initial Angular elements
     perl -pi -e 's|&lt;x id=(.+?)/&gt;([^"])|<x id=\1/>\2|g' client/src/locale/target/*.xml
-    perl -0pi -e 's|<source>(.+?)</source>\s*<context-group |<source>\1</source><target>\1</target><context-group |g' client/src/locale/target/angular_*.xml
 done
 
 npm run i18n:xliff2json
diff --git a/scripts/travis.sh b/scripts/travis.sh
index 3557816c8..c38bd2cab 100755
--- a/scripts/travis.sh
+++ b/scripts/travis.sh
@@ -20,16 +20,16 @@ elif [ "$1" = "cli" ]; then
     mocha --timeout 5000 --exit --require ts-node/register --bail server/tests/cli/index.ts
 elif [ "$1" = "api-1" ]; then
     npm run build:server
-    mocha --timeout 5000 --exit --require ts-node/register --bail server/tests/api/index-1.ts
+    sh ./server/tests/api/travis-1.sh 2
 elif [ "$1" = "api-2" ]; then
     npm run build:server
-    mocha --timeout 5000 --exit --require ts-node/register --bail server/tests/api/index-2.ts
+    sh ./server/tests/api/travis-2.sh 2
 elif [ "$1" = "api-3" ]; then
     npm run build:server
-    mocha --timeout 5000 --exit --require ts-node/register --bail server/tests/api/index-3.ts
+    sh ./server/tests/api/travis-3.sh 2
 elif [ "$1" = "api-4" ]; then
     npm run build:server
-    mocha --timeout 5000 --exit --require ts-node/register --bail server/tests/api/index-4.ts
+    sh ./server/tests/api/travis-4.sh 2
 elif [ "$1" = "lint" ]; then
     npm run tslint -- --project ./tsconfig.json -c ./tslint.json server.ts "server/**/*.ts" "shared/**/*.ts"