From 8ece348b304ceda0e1b7763839bad17d0b977dbc Mon Sep 17 00:00:00 2001
From: Juan Ferrer Toribio <juan@verdnatura.es>
Date: Wed, 17 Jun 2020 13:09:40 +0200
Subject: [PATCH 1/3] Language bug fix

---
 front/salix/module.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

From fa882ebde614ddcd7ac2187bef96e7a87498b7f7 Mon Sep 17 00:00:00 2001
From: Juan Ferrer Toribio <juan@verdnatura.es>
Date: Wed, 17 Jun 2020 13:14:28 +0200
Subject: [PATCH 2/3] Skip tests on master/test

---
 Jenkinsfile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Jenkinsfile b/Jenkinsfile
index 9af09b3060..4ede8d22e3 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -54,6 +54,10 @@ pipeline {
             }
         }
         stage('Test') {
+            when { not { anyOf {
+                branch 'test'
+                branch 'master'
+            }}
             environment {
                 NODE_ENV = ""
             }

From 063571cb3cd48711685ee5909daec68eef7db0d8 Mon Sep 17 00:00:00 2001
From: Juan Ferrer Toribio <juan@verdnatura.es>
Date: Wed, 17 Jun 2020 13:14:59 +0200
Subject: [PATCH 3/3] Jenkins fix

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 4ede8d22e3..2848ea59b8 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -57,7 +57,7 @@ pipeline {
             when { not { anyOf {
                 branch 'test'
                 branch 'master'
-            }}
+            }}}
             environment {
                 NODE_ENV = ""
             }