verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 59 Releases Wiki Activity

Merge branch 'test' into dev
gitea/salix/pipeline/head There was a failure building this commit Details

This commit is contained in:
Juan Ferrer 2020-06-17 13:31:54 +02:00
parent 686203db18 032e78664c
commit 8e51104e1b
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Jenkinsfile vendored
View File

@ -54,6 +54,10 @@ pipeline {
} }
} }
stage('Test') { stage('Test') {
when { not { anyOf {
branch 'test'
branch 'master'
}}}
environment { environment {
NODE_ENV = "" NODE_ENV = ""
} }

2
front/salix/module.js
View File

@ -73,7 +73,7 @@ export function config($translateProvider, $translatePartialLoaderProvider, $htt
return locale; return locale;
if (langOptions.langAliases[locale]) if (langOptions.langAliases[locale])
return langOptions.langAliases[locale]; return langOptions.langAliases[locale];
return fallbackLang; return langOptions.fallbackLang;
}); });
$translatePartialLoaderProvider.addPart(appName); $translatePartialLoaderProvider.addPart(appName);