From fa5ea92c68867239864bc87a056ae3aa180ffbb0 Mon Sep 17 00:00:00 2001
From: Roly Gutierrez <roly.gutierrez@processmaker.com>
Date: Thu, 17 Feb 2022 12:46:44 -0400
Subject: [PATCH] PMCORE-3663 [27018] No translation on the left bar on the
 Home Tab - France

---
 gulliver/system/class.bootstrap.php        |  2 +-
 workflow/engine/bin/tasks/cliListIds.php   |  4 ++--
 workflow/engine/classes/WorkspaceTools.php | 24 ++++++++++++++--------
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/gulliver/system/class.bootstrap.php b/gulliver/system/class.bootstrap.php
index c33a86317..ecb9ed15b 100644
--- a/gulliver/system/class.bootstrap.php
+++ b/gulliver/system/class.bootstrap.php
@@ -2633,7 +2633,7 @@ class Bootstrap
                 $langServer = $locale['LOCALE'];
                 $language = explode('-', $langServer);
                 $language = head($language);
-                if ($language === $acceptLanguage) {
+                if ($language === $acceptLanguage || $langServer === $acceptLanguage) {
                     $inLang = true;
                     break;
                 }
diff --git a/workflow/engine/bin/tasks/cliListIds.php b/workflow/engine/bin/tasks/cliListIds.php
index 6bc7fa0c8..3c4f1d5ca 100644
--- a/workflow/engine/bin/tasks/cliListIds.php
+++ b/workflow/engine/bin/tasks/cliListIds.php
@@ -7,8 +7,8 @@ function cliListIds($command, $args)
     $workspaces = get_workspaces_from_args($command);
 
     foreach ($workspaces as $index => $workspace) {
-        $hostPort1 = explode(":", $workspace->dbInfo['DB_HOST']);
-        $hostPort = $hostPort1[0] . (isset($hostPort[1]) ? ";port=" . $hostPort[1] : "");
+        $hostPort = explode(":", $workspace->dbInfo['DB_HOST']);
+        $hostPort = $hostPort[0] . (isset($hostPort[1]) ? ";port=" . $hostPort[1] : "");
         $connectionString = sprintf(
             "%s:host=%s;dbname=%s",
             $workspace->dbInfo['DB_ADAPTER'],
diff --git a/workflow/engine/classes/WorkspaceTools.php b/workflow/engine/classes/WorkspaceTools.php
index 2529080c3..9f8132cfd 100644
--- a/workflow/engine/classes/WorkspaceTools.php
+++ b/workflow/engine/classes/WorkspaceTools.php
@@ -455,9 +455,25 @@ class WorkspaceTools
         $this->dbRbacUser = $values["DB_RBAC_USER"];
         $this->dbRbacPass = $values["DB_RBAC_PASS"];
 
+        $this->setDataBaseConnectionPropertiesForEloquent();
         return $this->dbInfo = $values;
     }
 
+    /**
+     * This used for eloquent model.
+     */
+    public function setDataBaseConnectionPropertiesForEloquent(): void
+    {
+        $dbHost = explode(':', $this->dbHost);
+        config(['database.connections.workflow.host' => $dbHost[0]]);
+        config(['database.connections.workflow.database' => $this->dbName]);
+        config(['database.connections.workflow.username' => $this->dbUser]);
+        config(['database.connections.workflow.password' => $this->dbPass]);
+        if (count($dbHost) > 1) {
+            config(['database.connections.workflow.port' => $dbHost[1]]);
+        }
+    }
+
     private function resetDBInfoCallback($matches)
     {
         /* This function changes the values of defines while keeping their formatting
@@ -5086,14 +5102,6 @@ class WorkspaceTools
     ) {
         // Initialize DB connections
         $this->initPropel();
-        $dbHost = explode(':', $this->dbHost);
-        config(['database.connections.workflow.host' => $dbHost[0]]);
-        config(['database.connections.workflow.database' => $this->dbName]);
-        config(['database.connections.workflow.username' => $this->dbUser]);
-        config(['database.connections.workflow.password' => $this->dbPass]);
-        if (count($dbHost) > 1) {
-            config(['database.connections.workflow.port' => $dbHost[1]]);
-        }
 
         // Get fields and some specific field types
         $fields = [];