fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correcciones de labels para DocSystem

Browse Source
This commit is contained in:
Brayan Osmar Pereyra Suxo
2014-01-29 10:57:57 -04:00
parent 87fec1014a
commit 1c708c28f6
7 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
workflow/engine/classes/class.configuration.php
View File

@@ -597,8 +597,8 @@ class Configurations // extends Configuration
} }
} }
setlocale(LC_TIME, $langLocate . ".utf8"); setlocale(LC_TIME, $langLocate);
$dateTime = strftime($newCreation, mktime($h, $i, $s, $m, $d, $y)); $dateTime = utf8_encode(strftime($newCreation, mktime($h, $i, $s, $m, $d, $y)));
if (strpos($dateTime, ' ') !== false) { if (strpos($dateTime, ' ') !== false) {
$dateTime = ucwords($dateTime); $dateTime = ucwords($dateTime);

5
workflow/engine/methods/cases/ajaxListener.php
View File

@@ -334,8 +334,9 @@ class Ajax
$processData['PRO_AUTHOR'] = '(USER DELETED)'; $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)); print (G::json_encode($processData));
} }

4
workflow/engine/methods/cases/cases_Derivate.php
View File

@@ -75,7 +75,7 @@ try {
//save trigger variables for debugger //save trigger variables for debugger
$_SESSION['TRIGGER_DEBUG']['info'][0]['NUM_TRIGGERS'] = sizeof( $triggers ); $_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_NAMES'] = $oCase->getTriggerNames( $triggers );
$_SESSION['TRIGGER_DEBUG']['info'][0]['TRIGGERS_VALUES'] = $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]['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_NAMES'] = $oCase->getTriggerNames( $triggers );
$_SESSION['TRIGGER_DEBUG']['info'][1]['TRIGGERS_VALUES'] = $triggers; $_SESSION['TRIGGER_DEBUG']['info'][1]['TRIGGERS_VALUES'] = $triggers;
} }

6
workflow/engine/methods/setup/appCacheViewAjax.php
View File

@@ -138,15 +138,15 @@ switch ($request) {
if (! $currentUserIsSuper && ! $result->error) { if (! $currentUserIsSuper && ! $result->error) {
$res = $appCache->checkGrantsForUser( true ); $res = $appCache->checkGrantsForUser( true );
if (! isset( $res['error'] )) { if (! isset( $res['error'] )) {
$result->info[] = array ('name' => 'Root User','value' => $res['user']); $result->info[] = array ('name' => G::LoadTranslation ( 'ID_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_SUPER' ), 'value' => $res['super']);
} else { } else {
$result->info[] = array ('name' => 'Error','value' => $res['msg']); $result->info[] = array ('name' => 'Error','value' => $res['msg']);
} }
$res = $appCache->setSuperForUser( $currentUser ); $res = $appCache->setSuperForUser( $currentUser );
if (! isset( $res['error'] )) { 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 { } else {
$result->error = true; $result->error = true;
$result->errorMsg = $res['msg']; $result->errorMsg = $res['msg'];

2
workflow/engine/methods/users/usersAjax.php
View File

@@ -88,7 +88,7 @@ switch ($_POST['action']) {
G::LoadClass('calendar'); G::LoadClass('calendar');
$calendar = new Calendar(); $calendar = new Calendar();
$calendarObj = $calendar->getCalendarList(true, true); $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) { foreach ($calendarObj['array'] as $rowid => $row) {
if ($rowid > 0) { if ($rowid > 0) {
$oData[] = array('CALENDAR_UID' => $row['CALENDAR_UID'], 'CALENDAR_NAME' => $row['CALENDAR_NAME']); $oData[] = array('CALENDAR_UID' => $row['CALENDAR_UID'], 'CALENDAR_NAME' => $row['CALENDAR_NAME']);

4
workflow/engine/templates/cases/main.js
View File

@@ -359,8 +359,8 @@ Ext.onReady(function(){
store: triggerStore, store: triggerStore,
columns: [ columns: [
{id:'name',header: "Name", width: 60, sortable: true, dataIndex: 'name'}, {id:'name',header: _('ID_NAME'), width: 60, sortable: true, dataIndex: 'name'},
{header: "Execution", width: 30, sortable: true, dataIndex: 'execution_time'}, {header: _('ID_EXECUTION'), width: 30, sortable: true, dataIndex: 'execution_time'},
{header: "Code", width: 30, sortable: false, dataIndex: 'code', hidden: true} {header: "Code", width: 30, sortable: false, dataIndex: 'code', hidden: true}
], ],

4
workflow/engine/templates/groups/groupsList.js
View File

@@ -145,7 +145,7 @@ Ext.onReady(function(){
comboStatusStore = new Ext.data.SimpleStore({ comboStatusStore = new Ext.data.SimpleStore({
fields: ['id','value'], fields: ['id','value'],
data: [['1','ACTIVE'],['0','INACTIVE']] data: [['1',_('ID_ACTIVE').toUpperCase()],['0', _('ID_INACTIVE').toUpperCase()]]
}); });
newForm = new Ext.FormPanel({ newForm = new Ext.FormPanel({
@@ -164,7 +164,7 @@ Ext.onReady(function(){
store: comboStatusStore, store: comboStatusStore,
listeners : { listeners : {
beforerender: function(status){ beforerender: function(status){
status.setValue('ACTIVE'); status.setValue(_('ID_ACTIVE').toUpperCase());
} }
}, },
displayField: 'value', displayField: 'value',