Merge pull request #1968 from crazyserver/MOBILE-3039

MOBILE-3039 scripts: Do not override English local translations

Author: jleyva

scripts/aot.sh

@@ -6,7 +6,7 @@ if [ $TRAVIS_BRANCH == 'integration' ] || [ $TRAVIS_BRANCH == 'master' ] || [ $T
     ./build_lang.sh
     cd ..
 
-    if [ $TRAVIS_BRANCH == 'master' ] && [ ! -z $GIT_TOKEN ] ; then
+    if [ "$TRAVIS_BRANCH" == 'master' ] && [ ! -z $GIT_TOKEN ] ; then
         git remote set-url origin https://$GIT_TOKEN@github.com/$TRAVIS_REPO_SLUG.git
         git fetch -q origin
         git add src/assets/lang

scripts/moodle_to_json.php

@@ -171,7 +171,7 @@ function build_lang($lang, $keys, $total) {
         $string = [];
         include($file);
 
-        if (!isset($string[$value->string])) {
+        if (!isset($string[$value->string]) || ($lang == 'en' && $value->file == 'local_moodlemobileapp')) {
             // Not yet translated. Do not override.
             if (!$langFile) {
                 // Load lang files just once.