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
commit 8e51104e1b
3 changed files with 6 additions and 2 deletions

4
Jenkinsfile vendored
View File

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

View File

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

View File

@ -15,4 +15,4 @@ Show Pickup order: Ver orden de recogida
Search claim by id or client name: Buscar reclamaciones por identificador o nombre de cliente
Claim deleted!: Reclamación eliminada!
claim: reclamación
Photos: Fotos
Photos: Fotos