fernando/luos
1
0
Fork 0
Code Releases Activity

Merge pull request #2034 from brayanpereyra/master

Browse Source 
Arreglo de label harcodeado
This commit is contained in:
julceslauhub
2013-09-05 11:20:43 -07:00
parent 7ab22b68f7 b47a98ee49
commit 4046dcf490
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/classes/class.processMap.php
View File

@@ -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();

10
workflow/engine/classes/model/CalendarDefinition.php
View File

@@ -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'] ) : "";

4
workflow/engine/methods/events/eventsSetupGraph.php
View File

@@ -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';