From 529bdfdc32d73362eff95e9dce2264e9869a68d5 Mon Sep 17 00:00:00 2001 From: Brayan Osmar Pereyra Suxo Date: Thu, 5 Sep 2013 12:18:14 -0400 Subject: [PATCH 1/2] Arreglo de lables --- workflow/engine/classes/class.processMap.php | 2 +- workflow/engine/methods/events/eventsSetupGraph.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/workflow/engine/classes/class.processMap.php b/workflow/engine/classes/class.processMap.php index 6bce55528..04e394d65 100755 --- a/workflow/engine/classes/class.processMap.php +++ b/workflow/engine/classes/class.processMap.php @@ -4549,7 +4549,7 @@ class processMap { try { $oTask = new Task(); - $oNewTask->label = 'Sub-Process'; //G::LoadTranslation('ID_TASK'); + $oNewTask->label = G::LoadTranslation('ID_SUBPROCESS'); $oNewTask->uid = $oTask->create(array('PRO_UID' => $sProcessUID, 'TAS_TITLE' => $oNewTask->label, 'TAS_POSX' => $iX, 'TAS_POSY' => $iY, 'TAS_TYPE' => 'SUBPROCESS' )); //$oJSON = new Services_JSON(); diff --git a/workflow/engine/methods/events/eventsSetupGraph.php b/workflow/engine/methods/events/eventsSetupGraph.php index 00f57d2b0..3da2a7356 100755 --- a/workflow/engine/methods/events/eventsSetupGraph.php +++ b/workflow/engine/methods/events/eventsSetupGraph.php @@ -22,7 +22,7 @@ if ($s != 'a') { } //timeUnit -$timeunit = isset( $_GET['t'] ) ? $_GET['t'] : 'Days'; +$timeunit = isset( $_GET['t'] ) ? $_GET['t'] : G::LoadTranslation('ID_DAYS'); $timeunit = ucfirst( strtolower( $timeunit ) ); //estimated @@ -151,7 +151,7 @@ function drawTimerEvent ($im, $x1, $y1, $h) imageline( $im, 15, $h - 19, $w - 15, $h - 19, $red ); imageline( $im, $w - 23, $h - 23, $w - 15, $h - 19, $red ); imageline( $im, $w - 23, $h - 15, $w - 15, $h - 19, $red ); -imagestring( $im, 2, $w - 30, $h - 37, 'Days', $red ); +imagestring( $im, 2, $w - 30, $h - 37, G::LoadTranslation('ID_DAYS'), $red ); if ($estimated == 0) { $s = 'i'; From b47a98ee497d285e399265b3fc4c50c3aec1ae6d Mon Sep 17 00:00:00 2001 From: Brayan Osmar Pereyra Suxo Date: Thu, 5 Sep 2013 12:26:44 -0400 Subject: [PATCH 2/2] Arreglo de labels --- workflow/engine/classes/model/CalendarDefinition.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/workflow/engine/classes/model/CalendarDefinition.php b/workflow/engine/classes/model/CalendarDefinition.php index cea5801dc..37d3e29bf 100755 --- a/workflow/engine/classes/model/CalendarDefinition.php +++ b/workflow/engine/classes/model/CalendarDefinition.php @@ -106,10 +106,10 @@ class CalendarDefinition extends BaseCalendarDefinition $tr = CalendarDefinitionPeer::retrieveByPK( $CalendarUid ); $defaultCalendar['CALENDAR_UID'] = "00000000000000000000000000000001"; - $defaultCalendar['CALENDAR_NAME'] = "Default"; + $defaultCalendar['CALENDAR_NAME'] = G::LoadTranslation('ID_DEFAULT_CALENDAR'); $defaultCalendar['CALENDAR_CREATE_DATE'] = date( "Y-m-d" ); $defaultCalendar['CALENDAR_UPDATE_DATE'] = date( "Y-m-d" ); - $defaultCalendar['CALENDAR_DESCRIPTION'] = "Default"; + $defaultCalendar['CALENDAR_DESCRIPTION'] = G::LoadTranslation('ID_DEFAULT_CALENDAR'); $defaultCalendar['CALENDAR_STATUS'] = "ACTIVE"; $defaultCalendar['CALENDAR_WORK_DAYS'] = "1|2|3|4|5"; $defaultCalendar['CALENDAR_WORK_DAYS'] = explode( "|", "1|2|3|4|5" ); @@ -151,10 +151,10 @@ class CalendarDefinition extends BaseCalendarDefinition //if exists the row in the database propel will update it, otherwise will insert. $tr = CalendarDefinitionPeer::retrieveByPK( $CalendarUid ); $defaultCalendar['CALENDAR_UID'] = "00000000000000000000000000000001"; - $defaultCalendar['CALENDAR_NAME'] = "Default"; + $defaultCalendar['CALENDAR_NAME'] = G::LoadTranslation('ID_DEFAULT_CALENDAR'); $defaultCalendar['CALENDAR_CREATE_DATE'] = date( "Y-m-d" ); $defaultCalendar['CALENDAR_UPDATE_DATE'] = date( "Y-m-d" ); - $defaultCalendar['CALENDAR_DESCRIPTION'] = "Default"; + $defaultCalendar['CALENDAR_DESCRIPTION'] = G::LoadTranslation('ID_DEFAULT_CALENDAR'); $defaultCalendar['CALENDAR_STATUS'] = "ACTIVE"; $defaultCalendar['CALENDAR_WORK_DAYS'] = "1|2|3|4|5"; $defaultCalendar['CALENDAR_WORK_DAYS'] = explode( "|", "1|2|3|4|5" ); @@ -244,7 +244,7 @@ class CalendarDefinition extends BaseCalendarDefinition $defaultCalendars[] = '00000000000000000000000000000001'; if (in_array( $aData['CALENDAR_UID'], $defaultCalendars )) { $CalendarStatus = 'ACTIVE'; - $CalendarName = 'Default'; + $CalendarName = G::LoadTranslation('ID_DEFAULT_CALENDAR'); } $CalendarWorkDays = isset( $aData['CALENDAR_WORK_DAYS'] ) ? implode( "|", $aData['CALENDAR_WORK_DAYS'] ) : "";