From ed9d0cf3c7f2c822705bfd4a615d3f15c19aecaa Mon Sep 17 00:00:00 2001 From: norahmollo Date: Fri, 3 May 2013 21:36:53 +0000 Subject: [PATCH 1/2] Changes for DocSystem translations Changes for DocSystem translations --- .../classes/class.dashletOpenVSCompleted.php | 33 +++++++++++++------ workflow/engine/controllers/dashboard.php | 2 ++ workflow/engine/methods/controls/varsAjax.php | 18 +++++----- .../dashboard/dashletInstanceForm.js | 2 +- 4 files changed, 35 insertions(+), 20 deletions(-) diff --git a/workflow/engine/classes/class.dashletOpenVSCompleted.php b/workflow/engine/classes/class.dashletOpenVSCompleted.php index b923d7e93..6f8ab0798 100644 --- a/workflow/engine/classes/class.dashletOpenVSCompleted.php +++ b/workflow/engine/classes/class.dashletOpenVSCompleted.php @@ -26,16 +26,29 @@ class dashletOpenVSCompleted implements DashletInterface $contextTimeStore->xtype = 'arraystore'; $contextTimeStore->fields = array ('id','value' ); - $contextTimeStore->data = array (array ('TODAY','Today' - ),array ('YESTERDAY','Yesterday' - ),array ('THIS_WEEK','This week' - ),array ('PREVIOUS_WEEK','Previous Week' - ),array ('THIS_MONTH','This Month' - ),array ('PREVIOUS_MONTH','Previous Month' - ),array ('THIS_YEAR','This Year' - ),array ('PREVIOUS_YEAR','Previous Year' - ) - ); + if (defined('PARTNER_FLAG')) { + $contextTimeStore->data = array (array ('TODAY','Hoje' + ),array ('YESTERDAY','Ontem' + ),array ('THIS_WEEK','Essa semana' + ),array ('PREVIOUS_WEEK','Semana anterior' + ),array ('THIS_MONTH','Este mês' + ),array ('PREVIOUS_MONTH','Mês Anterior' + ),array ('THIS_YEAR','Este ano' + ),array ('PREVIOUS_YEAR','Ano anterior' + ) + ); + } else { + $contextTimeStore->data = array (array ('TODAY','Today' + ),array ('YESTERDAY','Yesterday' + ),array ('THIS_WEEK','This week' + ),array ('PREVIOUS_WEEK','Previous Week' + ),array ('THIS_MONTH','This Month' + ),array ('PREVIOUS_MONTH','Previous Month' + ),array ('THIS_YEAR','This Year' + ),array ('PREVIOUS_YEAR','Previous Year' + ) + ); + } $contextTime = new stdclass(); $contextTime->xtype = 'combo'; diff --git a/workflow/engine/controllers/dashboard.php b/workflow/engine/controllers/dashboard.php index f37f63ecc..694ce8340 100644 --- a/workflow/engine/controllers/dashboard.php +++ b/workflow/engine/controllers/dashboard.php @@ -233,6 +233,8 @@ class Dashboard extends Controller } $dashlets = $this->getDashlets(); $this->setJSVar( 'storeDasUID', $dashlets ); + $this->setJSVar('PARTNER_FLAG', (defined('PARTNER_FLAG')) ? PARTNER_FLAG : false); + if ($data->DAS_INS_UID != '') { $this->pmDashlet->setup( $data->DAS_INS_UID ); $this->setJSVar( 'dashletInstance', $this->pmDashlet->getDashletInstance() ); diff --git a/workflow/engine/methods/controls/varsAjax.php b/workflow/engine/methods/controls/varsAjax.php index 2f2ed1f44..24e076a60 100755 --- a/workflow/engine/methods/controls/varsAjax.php +++ b/workflow/engine/methods/controls/varsAjax.php @@ -39,24 +39,24 @@ $html .= ''; $html .= ''; $html .= ''; -$html .= ''; +$html .= ''; $html .= ''; $html .= ''; -$html .= ''; +$html .= ''; $html .= ''; $html .= ''; -$html .= ''; +$html .= ''; $html .= ''; $html .= ''; $html .= ''; $html .= ''; $html .= '     '; $html .= ''; @@ -78,7 +78,7 @@ $html .= ''; $html .= ''; $html .= ''; $html .= ''; -$html .= ''; +$html .= ''; $html .= ''; $html .= ''; @@ -113,11 +113,11 @@ $html .= ''; $html .= '
'; $html .= ''; $html .= ''; -$html .= ''; +$html .= ''; $html .= ''; $html .= ''; $html .= ''; -$html .= ''; +$html .= ''; $html .= ''; $html .= ''; $html .= '
Result'.G::LoadTranslation('ID_RESULT').'@@SYS_LANG
Description'.G::LoadTranslation('ID_DESCRIPTION').''.G::LoadTranslation('ID_SYSTEM').'
'; diff --git a/workflow/engine/templates/dashboard/dashletInstanceForm.js b/workflow/engine/templates/dashboard/dashletInstanceForm.js index 75e1250a4..004d9df18 100644 --- a/workflow/engine/templates/dashboard/dashletInstanceForm.js +++ b/workflow/engine/templates/dashboard/dashletInstanceForm.js @@ -16,7 +16,7 @@ Ext.onReady(function() { storeDasInsOwnerType = new Ext.data.ArrayStore({ idIndex: 0, fields: ['id', 'value'], - data: [['USER', 'User'], ['DEPARTMENT', 'Department'], ['GROUP', 'Group'], ['EVERYBODY', 'Everybody']] + data: PARTNER_FLAG?[['USER', 'Usuário'], ['DEPARTMENT', 'Departmento'], ['GROUP', 'Grupo'], ['EVERYBODY', 'Todos']]:[['USER', 'User'], ['DEPARTMENT', 'Department'], ['GROUP', 'Group'], ['EVERYBODY', 'Everybody']] }); storeDasInsOwnerUID = new Ext.data.Store({ From e4d66390a43e508cef381c684f11dd52db79f078 Mon Sep 17 00:00:00 2001 From: norahmollo Date: Mon, 6 May 2013 19:36:45 +0000 Subject: [PATCH 2/2] DocSystem translations DocSystem translations --- .../classes/class.dashletOpenVSCompleted.php | 35 ++++++------------- .../engine/classes/model/AppCacheView.php | 27 +++++++------- workflow/engine/controllers/dashboard.php | 3 +- workflow/engine/methods/controls/varsAjax.php | 1 + .../dashboard/dashletInstanceForm.js | 2 +- 5 files changed, 27 insertions(+), 41 deletions(-) diff --git a/workflow/engine/classes/class.dashletOpenVSCompleted.php b/workflow/engine/classes/class.dashletOpenVSCompleted.php index 6f8ab0798..e9788b855 100644 --- a/workflow/engine/classes/class.dashletOpenVSCompleted.php +++ b/workflow/engine/classes/class.dashletOpenVSCompleted.php @@ -26,30 +26,17 @@ class dashletOpenVSCompleted implements DashletInterface $contextTimeStore->xtype = 'arraystore'; $contextTimeStore->fields = array ('id','value' ); - if (defined('PARTNER_FLAG')) { - $contextTimeStore->data = array (array ('TODAY','Hoje' - ),array ('YESTERDAY','Ontem' - ),array ('THIS_WEEK','Essa semana' - ),array ('PREVIOUS_WEEK','Semana anterior' - ),array ('THIS_MONTH','Este mês' - ),array ('PREVIOUS_MONTH','Mês Anterior' - ),array ('THIS_YEAR','Este ano' - ),array ('PREVIOUS_YEAR','Ano anterior' - ) - ); - } else { - $contextTimeStore->data = array (array ('TODAY','Today' - ),array ('YESTERDAY','Yesterday' - ),array ('THIS_WEEK','This week' - ),array ('PREVIOUS_WEEK','Previous Week' - ),array ('THIS_MONTH','This Month' - ),array ('PREVIOUS_MONTH','Previous Month' - ),array ('THIS_YEAR','This Year' - ),array ('PREVIOUS_YEAR','Previous Year' - ) - ); - } - + $contextTimeStore->data = array (array ('TODAY', G::LoadTranslation('ID_TODAY') + ),array ('YESTERDAY', G::LoadTranslation('ID_YESTERDAY') + ),array ('THIS_WEEK', G::LoadTranslation('ID_THIS_WEEK') + ),array ('PREVIOUS_WEEK', G::LoadTranslation('ID_PREVIOUS_WEEK') + ),array ('THIS_MONTH', G::LoadTranslation('ID_THIS_MONTH') + ),array ('PREVIOUS_MONTH', G::LoadTranslation('ID_PREVIOUS_MONTH') + ),array ('THIS_YEAR', G::LoadTranslation('ID_THIS_YEAR') + ),array ('PREVIOUS_YEAR', G::LoadTranslation('ID_PREVIOUS_YEAR') + ) + ); + $contextTime = new stdclass(); $contextTime->xtype = 'combo'; $contextTime->name = 'DAS_INS_CONTEXT_TIME'; diff --git a/workflow/engine/classes/model/AppCacheView.php b/workflow/engine/classes/model/AppCacheView.php index ea90423eb..15fb6d275 100755 --- a/workflow/engine/classes/model/AppCacheView.php +++ b/workflow/engine/classes/model/AppCacheView.php @@ -1207,7 +1207,7 @@ class AppCacheView extends BaseAppCacheView $row = $rs1->getRow(); if (is_array($row = $rs1->getRow())) { - $super = true; + $super = G::LoadTranslation('ID_TRUE'); //true; } return array('user' => $mysqlUser, 'super' => $super); @@ -1244,11 +1244,11 @@ class AppCacheView extends BaseAppCacheView $sql = "SHOW TABLES"; $rs1 = $stmt->executeQuery($sql, ResultSet::FETCHMODE_NUM); $rs1->next(); - $found = false; + $found = G::LoadTranslation('ID_FALSE');//false; while (is_array($row = $rs1->getRow()) && !$found) { if (strtolower($row[0]) == 'app_cache_view') { - $found = true; + $found = G::LoadTranslation('ID_TRUE');//true; } $rs1->next(); @@ -1366,10 +1366,9 @@ class AppCacheView extends BaseAppCacheView $sql = str_replace('{lang}', $lang, $sql); $stmt->executeQuery($sql); - return 'created'; + return G::LoadTranslation('ID_CREATED'); } - - return 'exists'; + return G::LoadTranslation('ID_EXIST'); } /** @@ -1413,10 +1412,10 @@ class AppCacheView extends BaseAppCacheView $sql = str_replace('{lang}', $lang, $sql); $stmt->executeQuery($sql); - return 'created'; + return G::LoadTranslation('ID_CREATED'); } - return 'exists'; + return G::LoadTranslation('ID_EXIST'); } /** @@ -1458,10 +1457,10 @@ class AppCacheView extends BaseAppCacheView $sql = str_replace('{lang}', $lang, $sql); $stmt->executeQuery($sql); - return 'created'; + return G::LoadTranslation('ID_CREATED'); } - return 'exists'; + return G::LoadTranslation('ID_EXIST'); } /** @@ -1503,10 +1502,10 @@ class AppCacheView extends BaseAppCacheView $sql = str_replace('{lang}', $lang, $sql); $stmt->executeQuery($sql); - return 'created'; + return G::LoadTranslation('ID_CREATED'); } - return 'exists'; + return G::LoadTranslation('ID_EXIST'); } public function triggerContentUpdate($lang, $recreate = false) @@ -1542,10 +1541,10 @@ class AppCacheView extends BaseAppCacheView $stmt->executeQuery($sql); - return "created"; + return G::LoadTranslation('ID_CREATED'); } - return "exists"; + return G::LoadTranslation('ID_EXIST'); } /** diff --git a/workflow/engine/controllers/dashboard.php b/workflow/engine/controllers/dashboard.php index 694ce8340..2b4ff1097 100644 --- a/workflow/engine/controllers/dashboard.php +++ b/workflow/engine/controllers/dashboard.php @@ -233,8 +233,7 @@ class Dashboard extends Controller } $dashlets = $this->getDashlets(); $this->setJSVar( 'storeDasUID', $dashlets ); - $this->setJSVar('PARTNER_FLAG', (defined('PARTNER_FLAG')) ? PARTNER_FLAG : false); - + if ($data->DAS_INS_UID != '') { $this->pmDashlet->setup( $data->DAS_INS_UID ); $this->setJSVar( 'dashletInstance', $this->pmDashlet->getDashletInstance() ); diff --git a/workflow/engine/methods/controls/varsAjax.php b/workflow/engine/methods/controls/varsAjax.php index 24e076a60..82bb48166 100755 --- a/workflow/engine/methods/controls/varsAjax.php +++ b/workflow/engine/methods/controls/varsAjax.php @@ -20,6 +20,7 @@ * * For more information, contact Colosa Inc, 2566 Le Jeune Rd., * Coral Gables, FL, 33134, USA, or email info@colosa.com. + * */ $_SERVER["QUERY_STRING"] = isset($_SERVER["QUERY_STRING"])?$_SERVER["QUERY_STRING"]:''; $_REQUEST["sProcess"] = isset($_REQUEST["sProcess"])?$_REQUEST["sProcess"]:''; diff --git a/workflow/engine/templates/dashboard/dashletInstanceForm.js b/workflow/engine/templates/dashboard/dashletInstanceForm.js index 004d9df18..4254e5f6b 100644 --- a/workflow/engine/templates/dashboard/dashletInstanceForm.js +++ b/workflow/engine/templates/dashboard/dashletInstanceForm.js @@ -16,7 +16,7 @@ Ext.onReady(function() { storeDasInsOwnerType = new Ext.data.ArrayStore({ idIndex: 0, fields: ['id', 'value'], - data: PARTNER_FLAG?[['USER', 'Usuário'], ['DEPARTMENT', 'Departmento'], ['GROUP', 'Grupo'], ['EVERYBODY', 'Todos']]:[['USER', 'User'], ['DEPARTMENT', 'Department'], ['GROUP', 'Group'], ['EVERYBODY', 'Everybody']] + data: ['USER', _('ID_USER')], ['DEPARTMENT', _('ID_DEPARTMENT')], ['GROUP', _('ID_GROUP')], ['EVERYBODY', _('ID_ALL')]] }); storeDasInsOwnerUID = new Ext.data.Store({