diff --git a/Jenkinsfile b/Jenkinsfile index 9af09b3060..2848ea59b8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -54,6 +54,10 @@ pipeline { } } stage('Test') { + when { not { anyOf { + branch 'test' + branch 'master' + }}} environment { NODE_ENV = "" } diff --git a/front/salix/module.js b/front/salix/module.js index c3e8dcb8ad..2c61af4d1d 100644 --- a/front/salix/module.js +++ b/front/salix/module.js @@ -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); diff --git a/modules/claim/front/locale/es.yml b/modules/claim/front/locale/es.yml index 8dae332724..5570896c17 100644 --- a/modules/claim/front/locale/es.yml +++ b/modules/claim/front/locale/es.yml @@ -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 \ No newline at end of file +Photos: Fotos