From 1c708c28f65af4e0f7cb45812ea4d67df843cba8 Mon Sep 17 00:00:00 2001 From: Brayan Osmar Pereyra Suxo Date: Wed, 29 Jan 2014 10:57:57 -0400 Subject: [PATCH] Correcciones de labels para DocSystem --- workflow/engine/classes/class.configuration.php | 4 ++-- workflow/engine/methods/cases/ajaxListener.php | 5 +++-- workflow/engine/methods/cases/cases_Derivate.php | 4 ++-- workflow/engine/methods/setup/appCacheViewAjax.php | 6 +++--- workflow/engine/methods/users/usersAjax.php | 2 +- workflow/engine/templates/cases/main.js | 4 ++-- workflow/engine/templates/groups/groupsList.js | 4 ++-- 7 files changed, 15 insertions(+), 14 deletions(-) diff --git a/workflow/engine/classes/class.configuration.php b/workflow/engine/classes/class.configuration.php index 9045f07d0..54105f2d6 100755 --- a/workflow/engine/classes/class.configuration.php +++ b/workflow/engine/classes/class.configuration.php @@ -597,8 +597,8 @@ class Configurations // extends Configuration } } - setlocale(LC_TIME, $langLocate . ".utf8"); - $dateTime = strftime($newCreation, mktime($h, $i, $s, $m, $d, $y)); + setlocale(LC_TIME, $langLocate); + $dateTime = utf8_encode(strftime($newCreation, mktime($h, $i, $s, $m, $d, $y))); if (strpos($dateTime, ' ') !== false) { $dateTime = ucwords($dateTime); diff --git a/workflow/engine/methods/cases/ajaxListener.php b/workflow/engine/methods/cases/ajaxListener.php index bc66b38e3..07d057483 100755 --- a/workflow/engine/methods/cases/ajaxListener.php +++ b/workflow/engine/methods/cases/ajaxListener.php @@ -334,8 +334,9 @@ class Ajax $processData['PRO_AUTHOR'] = '(USER DELETED)'; } - $processData['PRO_CREATE_DATE'] = date('F j, Y', strtotime($processData['PRO_CREATE_DATE'])); - + $conf = new Configurations(); + $conf->getFormats(); + $processData['PRO_CREATE_DATE'] = $conf->getSystemDate($processData['PRO_CREATE_DATE']); print (G::json_encode($processData)); } diff --git a/workflow/engine/methods/cases/cases_Derivate.php b/workflow/engine/methods/cases/cases_Derivate.php index be0e388d3..5855894c5 100755 --- a/workflow/engine/methods/cases/cases_Derivate.php +++ b/workflow/engine/methods/cases/cases_Derivate.php @@ -75,7 +75,7 @@ try { //save trigger variables for debugger $_SESSION['TRIGGER_DEBUG']['info'][0]['NUM_TRIGGERS'] = sizeof( $triggers ); - $_SESSION['TRIGGER_DEBUG']['info'][0]['TIME'] = 'BEFORE'; + $_SESSION['TRIGGER_DEBUG']['info'][0]['TIME'] = G::toUpper(G::loadTranslation('ID_BEFORE')); $_SESSION['TRIGGER_DEBUG']['info'][0]['TRIGGERS_NAMES'] = $oCase->getTriggerNames( $triggers ); $_SESSION['TRIGGER_DEBUG']['info'][0]['TRIGGERS_VALUES'] = $triggers; } @@ -104,7 +104,7 @@ try { $_SESSION['TRIGGER_DEBUG']['info'][1]['NUM_TRIGGERS'] = sizeof( $triggers ); - $_SESSION['TRIGGER_DEBUG']['info'][1]['TIME'] = 'AFTER'; + $_SESSION['TRIGGER_DEBUG']['info'][1]['TIME'] = G::toUpper(G::loadTranslation('ID_AFTER')); $_SESSION['TRIGGER_DEBUG']['info'][1]['TRIGGERS_NAMES'] = $oCase->getTriggerNames( $triggers ); $_SESSION['TRIGGER_DEBUG']['info'][1]['TRIGGERS_VALUES'] = $triggers; } diff --git a/workflow/engine/methods/setup/appCacheViewAjax.php b/workflow/engine/methods/setup/appCacheViewAjax.php index e9ed60072..7c82744c1 100755 --- a/workflow/engine/methods/setup/appCacheViewAjax.php +++ b/workflow/engine/methods/setup/appCacheViewAjax.php @@ -138,15 +138,15 @@ switch ($request) { if (! $currentUserIsSuper && ! $result->error) { $res = $appCache->checkGrantsForUser( true ); if (! isset( $res['error'] )) { - $result->info[] = array ('name' => 'Root User','value' => $res['user']); - $result->info[] = array ('name' => 'Root User has SUPER privilege','value' => $res['super']); + $result->info[] = array ('name' => G::LoadTranslation ( 'ID_ROOT_USER' ), 'value' => $res['user']); + $result->info[] = array ('name' => G::LoadTranslation ( 'ID_ROOT_USER_SUPER' ), 'value' => $res['super']); } else { $result->info[] = array ('name' => 'Error','value' => $res['msg']); } $res = $appCache->setSuperForUser( $currentUser ); if (! isset( $res['error'] )) { - $result->info[] = array ('name' => 'Setting SUPER privilege','value' => 'Successfully'); + $result->info[] = array ('name' => G::LoadTranslation ( 'ID_SETTING_SUPER' ), 'value' => G::LoadTranslation ( 'ID_SUCCESSFULLY' )); } else { $result->error = true; $result->errorMsg = $res['msg']; diff --git a/workflow/engine/methods/users/usersAjax.php b/workflow/engine/methods/users/usersAjax.php index 954343b0f..a05ccf4f9 100755 --- a/workflow/engine/methods/users/usersAjax.php +++ b/workflow/engine/methods/users/usersAjax.php @@ -88,7 +88,7 @@ switch ($_POST['action']) { G::LoadClass('calendar'); $calendar = new Calendar(); $calendarObj = $calendar->getCalendarList(true, true); - $oData[] = array('CALENDAR_UID' => '', 'CALENDAR_NAME' => '- None -'); + $oData[] = array('CALENDAR_UID' => '', 'CALENDAR_NAME' => '- ' . G::LoadTranslation('ID_NONE') . ' -'); foreach ($calendarObj['array'] as $rowid => $row) { if ($rowid > 0) { $oData[] = array('CALENDAR_UID' => $row['CALENDAR_UID'], 'CALENDAR_NAME' => $row['CALENDAR_NAME']); diff --git a/workflow/engine/templates/cases/main.js b/workflow/engine/templates/cases/main.js index ae66d9928..e9dd0ac25 100755 --- a/workflow/engine/templates/cases/main.js +++ b/workflow/engine/templates/cases/main.js @@ -359,8 +359,8 @@ Ext.onReady(function(){ store: triggerStore, columns: [ - {id:'name',header: "Name", width: 60, sortable: true, dataIndex: 'name'}, - {header: "Execution", width: 30, sortable: true, dataIndex: 'execution_time'}, + {id:'name',header: _('ID_NAME'), width: 60, sortable: true, dataIndex: 'name'}, + {header: _('ID_EXECUTION'), width: 30, sortable: true, dataIndex: 'execution_time'}, {header: "Code", width: 30, sortable: false, dataIndex: 'code', hidden: true} ], diff --git a/workflow/engine/templates/groups/groupsList.js b/workflow/engine/templates/groups/groupsList.js index 4b4ec287d..820edfa47 100755 --- a/workflow/engine/templates/groups/groupsList.js +++ b/workflow/engine/templates/groups/groupsList.js @@ -145,7 +145,7 @@ Ext.onReady(function(){ comboStatusStore = new Ext.data.SimpleStore({ fields: ['id','value'], - data: [['1','ACTIVE'],['0','INACTIVE']] + data: [['1',_('ID_ACTIVE').toUpperCase()],['0', _('ID_INACTIVE').toUpperCase()]] }); newForm = new Ext.FormPanel({ @@ -164,7 +164,7 @@ Ext.onReady(function(){ store: comboStatusStore, listeners : { beforerender: function(status){ - status.setValue('ACTIVE'); + status.setValue(_('ID_ACTIVE').toUpperCase()); } }, displayField: 'value',