Merge branch 'test' into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
gitea/salix/pipeline/head There was a failure building this commit
Details
This commit is contained in:
commit
8e51104e1b
|
@ -54,6 +54,10 @@ pipeline {
|
|||
}
|
||||
}
|
||||
stage('Test') {
|
||||
when { not { anyOf {
|
||||
branch 'test'
|
||||
branch 'master'
|
||||
}}}
|
||||
environment {
|
||||
NODE_ENV = ""
|
||||
}
|
||||
|
|
|
@ -73,7 +73,7 @@ export function config($translateProvider, $translatePartialLoaderProvider, $htt
|
|||
return locale;
|
||||
if (langOptions.langAliases[locale])
|
||||
return langOptions.langAliases[locale];
|
||||
return fallbackLang;
|
||||
return langOptions.fallbackLang;
|
||||
});
|
||||
|
||||
$translatePartialLoaderProvider.addPart(appName);
|
||||
|
|
Loading…
Reference in New Issue