EVOgeek
/
Vmeda.Online
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1968 from crazyserver/MOBILE-3039 

MOBILE-3039 scripts: Do not override English local translations
main
Juan Leyva 2019-06-05 16:47:16 +02:00 committed by GitHub
parent ea5daca7bb ec93e1cf17
commit 56ec20b677
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/aot.sh
View File

@ -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

2
scripts/moodle_to_json.php
View File

@ -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.