From 5bf40eb87fb4dac89ea4c121a21732f064cba88b Mon Sep 17 00:00:00 2001 From: Luis Fernando Saisa Lopez Date: Tue, 7 Oct 2014 16:02:32 -0400 Subject: [PATCH 1/3] BUG 15973 "Multilenguaje en los las variables..." SOLVED - Multilenguaje en los las variables que se guardan en base de datos. - Problema resuelto, las variables TRIGGER e INPUT, que se muestran en las imagenes son traducibles. Disponible para la version 2.8 de ProcessMaker. --- workflow/engine/methods/cases/caseMessageHistory_Ajax.php | 2 ++ workflow/engine/methods/cases/cases_Ajax.php | 1 + 2 files changed, 3 insertions(+) diff --git a/workflow/engine/methods/cases/caseMessageHistory_Ajax.php b/workflow/engine/methods/cases/caseMessageHistory_Ajax.php index 94055d1dc..9750d8827 100755 --- a/workflow/engine/methods/cases/caseMessageHistory_Ajax.php +++ b/workflow/engine/methods/cases/caseMessageHistory_Ajax.php @@ -110,6 +110,8 @@ if ($actionAjax == 'messageHistoryGridList_JXP') { $r->data = $aProcesses; $r->totalCount = $totalCount; + $r->data[0]["APP_MSG_TYPE"] = ($r->data[0]["APP_MSG_TYPE"] == "TRIGGER")? G::LoadTranslation("ID_TRIGGER_DB") : $r->data[0]["APP_MSG_TYPE"]; + echo G::json_encode( $r ); } if ($actionAjax == 'showHistoryMessage') { diff --git a/workflow/engine/methods/cases/cases_Ajax.php b/workflow/engine/methods/cases/cases_Ajax.php index 20a25b77e..c7570ab1e 100755 --- a/workflow/engine/methods/cases/cases_Ajax.php +++ b/workflow/engine/methods/cases/cases_Ajax.php @@ -551,6 +551,7 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) { for ($j = 0; $j < $rs->getRecordCount(); $j ++) { $result = $rs->getRow(); + $result["TYPE"] = ($result["TYPE"] == "INPUT")? G::LoadTranslation("ID_INPUT_DB") : $result["TYPE"]; $aProcesses[] = $result; $rs->next(); $totalCount ++; From a6ed36040cc4f63152ff9be723211cd5ecfc831b Mon Sep 17 00:00:00 2001 From: Luis Fernando Saisa Lopez Date: Wed, 8 Oct 2014 13:38:01 -0400 Subject: [PATCH 2/3] BUG 15973 "Multilenguaje en los las variables..." SOLVED - Multilenguaje en los las variables que se guardan en base de datos. - Problema resuelto, las variables que se muestran en las imagenes son traducibles. --- workflow/engine/methods/cases/caseMessageHistory_Ajax.php | 7 ++++++- workflow/engine/methods/cases/cases_Ajax.php | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/workflow/engine/methods/cases/caseMessageHistory_Ajax.php b/workflow/engine/methods/cases/caseMessageHistory_Ajax.php index 9750d8827..4e01a467f 100755 --- a/workflow/engine/methods/cases/caseMessageHistory_Ajax.php +++ b/workflow/engine/methods/cases/caseMessageHistory_Ajax.php @@ -22,6 +22,11 @@ * Coral Gables, FL, 33134, USA, or email info@colosa.com. */ +$arrayToTranslation = array( + "TRIGGER" => G::LoadTranslation("ID_TRIGGER_DB"), + "DERIVATION" => G::LoadTranslation("ID_DERIVATION_DB") +); + $actionAjax = isset( $_REQUEST['actionAjax'] ) ? $_REQUEST['actionAjax'] : null; if ($actionAjax == 'messageHistoryGridList_JXP') { @@ -110,7 +115,7 @@ if ($actionAjax == 'messageHistoryGridList_JXP') { $r->data = $aProcesses; $r->totalCount = $totalCount; - $r->data[0]["APP_MSG_TYPE"] = ($r->data[0]["APP_MSG_TYPE"] == "TRIGGER")? G::LoadTranslation("ID_TRIGGER_DB") : $r->data[0]["APP_MSG_TYPE"]; + $r->data[0]["APP_MSG_TYPE"] = (array_key_exists($r->data[0]["APP_MSG_TYPE"], $arrayToTranslation))? $arrayToTranslation[$r->data[0]["APP_MSG_TYPE"]] : $r->data[0]["APP_MSG_TYPE"]; echo G::json_encode( $r ); } diff --git a/workflow/engine/methods/cases/cases_Ajax.php b/workflow/engine/methods/cases/cases_Ajax.php index c7570ab1e..3f64e0f27 100755 --- a/workflow/engine/methods/cases/cases_Ajax.php +++ b/workflow/engine/methods/cases/cases_Ajax.php @@ -533,6 +533,11 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) { G::LoadClass( "BasePeer" ); global $G_PUBLISH; + $arrayToTranslation = array( + "OUTPUT" => G::LoadTranslation("ID_OUTPUT_DB"), + "INPUT" => G::LoadTranslation("ID_INPUT_DB") + ); + $oCase = new Cases(); $aProcesses = Array (); $G_PUBLISH = new Publisher(); @@ -551,7 +556,7 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) { for ($j = 0; $j < $rs->getRecordCount(); $j ++) { $result = $rs->getRow(); - $result["TYPE"] = ($result["TYPE"] == "INPUT")? G::LoadTranslation("ID_INPUT_DB") : $result["TYPE"]; + $result["TYPE"] = (array_key_exists($result["TYPE"], $arrayToTranslation))? $arrayToTranslation[$result["TYPE"]] : $result["TYPE"]; $aProcesses[] = $result; $rs->next(); $totalCount ++; From 4f8f609f74df2a58345e384a953695bdf49636b2 Mon Sep 17 00:00:00 2001 From: Luis Fernando Saisa Lopez Date: Wed, 8 Oct 2014 14:31:00 -0400 Subject: [PATCH 3/3] BUG 15973 "Multilenguaje en los las variables..." SOLVED --- workflow/engine/methods/cases/cases_Ajax.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/workflow/engine/methods/cases/cases_Ajax.php b/workflow/engine/methods/cases/cases_Ajax.php index 3f64e0f27..d97fdc197 100755 --- a/workflow/engine/methods/cases/cases_Ajax.php +++ b/workflow/engine/methods/cases/cases_Ajax.php @@ -534,8 +534,9 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) { global $G_PUBLISH; $arrayToTranslation = array( - "OUTPUT" => G::LoadTranslation("ID_OUTPUT_DB"), - "INPUT" => G::LoadTranslation("ID_INPUT_DB") + "INPUT" => G::LoadTranslation("ID_INPUT_DB"), + "OUTPUT" => G::LoadTranslation("ID_OUTPUT_DB"), + "ATTACHED" => G::LoadTranslation("ID_ATTACHED_DB") ); $oCase = new Cases();