diff --git a/workflow/engine/controllers/appProxy.php b/workflow/engine/controllers/appProxy.php index c01763047..8a2df08fc 100644 --- a/workflow/engine/controllers/appProxy.php +++ b/workflow/engine/controllers/appProxy.php @@ -38,15 +38,15 @@ class AppProxy extends HttpProxyController if (!isset($_SESSION['PROCESS']) && !isset($httpData->pro)) { $caseLoad = $case->loadCase($appUid); $httpData->pro = $caseLoad['PRO_UID']; - } - + } + if(!isset($httpData->pro) || empty($httpData->pro) ) { $proUid = $_SESSION['PROCESS']; } else { $proUid = $httpData->pro; } - + if(!isset($httpData->tas) || empty($httpData->tas)) { $tasUid = $_SESSION['TASK']; @@ -56,7 +56,7 @@ class AppProxy extends HttpProxyController //$proUid = (!isset($httpData->pro)) ? $_SESSION['PROCESS'] : $httpData->pro; //$tasUid = (!isset($httpData->tas)) ? ((isset($_SESSION['TASK'])) ? $_SESSION['TASK'] : '') : $httpData->tas; $usrUid = $_SESSION['USER_LOGGED']; - + $respView = $case->getAllObjectsFrom( $proUid, $appUid, $tasUid, $usrUid, 'VIEW' ); $respBlock = $case->getAllObjectsFrom( $proUid, $appUid, $tasUid, $usrUid, 'BLOCK' ); @@ -68,7 +68,7 @@ class AppProxy extends HttpProxyController //require_once ("classes/model/AppNotes.php"); if (! isset( $appUid )) { - throw new Exception( 'Can\'t resolve the Apllication ID for this request.' ); + throw new Exception( G::LoadTranslation('ID_RESOLVE_APPLICATION_ID' ) ); } $usrUid = isset( $_SESSION['USER_LOGGED'] ) ? $_SESSION['USER_LOGGED'] : ""; @@ -108,7 +108,7 @@ class AppProxy extends HttpProxyController //Disabling the controller response because we handle a special behavior $this->setSendResponse(false); - + //Add note case $appNote = new AppNotes(); $response = $appNote->addCaseNote($appUid, $usrUid, $noteContent, intval($httpData->swSendMail)); @@ -193,7 +193,7 @@ class AppProxy extends HttpProxyController function getSummary ($httpData) { $labels = array (); - $form = new Form( 'cases/cases_Resume', PATH_XMLFORM, SYS_LANG ); + $form = new Form( 'cases/cases_Resume', PATH_XMLFORM, SYS_LANG ); //este es el problema!!!!! G::LoadClass( 'case' ); $case = new Cases(); @@ -231,41 +231,26 @@ class AppProxy extends HttpProxyController $taskData = $task->load( $applicationFields['TAS_UID'] ); $currentUser = $applicationFields['CURRENT_USER'] != '' ? $applicationFields['CURRENT_USER'] : '[' . G::LoadTranslation( 'ID_UNASSIGNED' ) . ']'; - $data[] = array ('label' => $labels['PRO_TITLE'],'value' => $processData['PRO_TITLE'],'section' => $labels['TITLE1'] - ); - $data[] = array ('label' => $labels['TITLE'],'value' => $applicationFields['TITLE'],'section' => $labels['TITLE1'] - ); - $data[] = array ('label' => $labels['APP_NUMBER'],'value' => $applicationFields['APP_NUMBER'],'section' => $labels['TITLE1'] - ); - $data[] = array ('label' => $labels['STATUS'],'value' => $applicationFields['STATUS'],'section' => $labels['TITLE1'] - ); - $data[] = array ('label' => $labels['APP_UID'],'value' => $applicationFields['APP_UID'],'section' => $labels['TITLE1'] - ); - $data[] = array ('label' => $labels['CREATOR'],'value' => $applicationFields['CREATOR'],'section' => $labels['TITLE1'] - ); - $data[] = array ('label' => $labels['CREATE_DATE'],'value' => $applicationFields['CREATE_DATE'],'section' => $labels['TITLE1'] - ); - $data[] = array ('label' => $labels['UPDATE_DATE'],'value' => $applicationFields['UPDATE_DATE'],'section' => $labels['TITLE1'] - ); - $data[] = array ('label' => $labels['DESCRIPTION'],'value' => $applicationFields['DESCRIPTION'],'section' => $labels['TITLE1'] - ); + $data[] = array ('label' => $labels['PRO_TITLE'],'value' => $processData['PRO_TITLE'],'section' => $labels['TITLE1']); + $data[] = array ('label' => $labels['TITLE'],'value' => $applicationFields['TITLE'],'section' => $labels['TITLE1']); + $data[] = array ('label' => $labels['APP_NUMBER'],'value' => $applicationFields['APP_NUMBER'],'section' => $labels['TITLE1']); + $data[] = array ('label' => $labels['STATUS'],'value' => $applicationFields['STATUS'],'section' => $labels['TITLE1']); + $data[] = array ('label' => $labels['APP_UID'],'value' => $applicationFields['APP_UID'],'section' => $labels['TITLE1']); + $data[] = array ('label' => $labels['CREATOR'],'value' => $applicationFields['CREATOR'],'section' => $labels['TITLE1']); + $data[] = array ('label' => $labels['CREATE_DATE'],'value' => $applicationFields['CREATE_DATE'],'section' => $labels['TITLE1']); + $data[] = array ('label' => $labels['UPDATE_DATE'],'value' => $applicationFields['UPDATE_DATE'],'section' => $labels['TITLE1']); + $data[] = array ('label' => $labels['DESCRIPTION'],'value' => $applicationFields['DESCRIPTION'],'section' => $labels['TITLE1']); // note added by krlos pacha carlos[at]colosa[dot]com //getting this field if it doesn't exist. Related 7994 bug $taskData['TAS_TITLE'] = (array_key_exists( 'TAS_TITLE', $taskData )) ? $taskData['TAS_TITLE'] : Content::Load( "TAS_TITLE", "", $applicationFields['TAS_UID'], SYS_LANG ); - $data[] = array ('label' => $labels['TAS_TITLE'],'value' => $taskData['TAS_TITLE'],'section' => $labels['TITLE2'] - ); - $data[] = array ('label' => $labels['CURRENT_USER'],'value' => $currentUser,'section' => $labels['TITLE2'] - ); - $data[] = array ('label' => $labels['DEL_DELEGATE_DATE'],'value' => $applicationFields['DEL_DELEGATE_DATE'],'section' => $labels['TITLE2'] - ); - $data[] = array ('label' => $labels['DEL_INIT_DATE'],'value' => $applicationFields['DEL_INIT_DATE'],'section' => $labels['TITLE2'] - ); - $data[] = array ('label' => $labels['DEL_TASK_DUE_DATE'],'value' => $applicationFields['DEL_TASK_DUE_DATE'],'section' => $labels['TITLE2'] - ); - $data[] = array ('label' => $labels['DEL_FINISH_DATE'],'value' => $applicationFields['DEL_FINISH_DATE'],'section' => $labels['TITLE2'] - ); + $data[] = array ('label' => $labels['TAS_TITLE'],'value' => $taskData['TAS_TITLE'],'section' => $labels['TITLE2']); + $data[] = array ('label' => $labels['CURRENT_USER'],'value' => $currentUser,'section' => $labels['TITLE2']); + $data[] = array ('label' => $labels['DEL_DELEGATE_DATE'],'value' => $applicationFields['DEL_DELEGATE_DATE'],'section' => $labels['TITLE2']); + $data[] = array ('label' => $labels['DEL_INIT_DATE'],'value' => $applicationFields['DEL_INIT_DATE'],'section' => $labels['TITLE2']); + $data[] = array ('label' => $labels['DEL_TASK_DUE_DATE'],'value' => $applicationFields['DEL_TASK_DUE_DATE'],'section' => $labels['TITLE2']); + $data[] = array ('label' => $labels['DEL_FINISH_DATE'],'value' => $applicationFields['DEL_FINISH_DATE'],'section' => $labels['TITLE2']); //$data[] = array('label'=>$labels['DYN_UID'] , 'value' => $processData['PRO_DYNAFORMS']['PROCESS'];, 'section'=>$labels['DYN_UID']); return $data; } diff --git a/workflow/engine/controllers/dashboard.php b/workflow/engine/controllers/dashboard.php index 55762255e..2a74544d3 100644 --- a/workflow/engine/controllers/dashboard.php +++ b/workflow/engine/controllers/dashboard.php @@ -173,7 +173,7 @@ class Dashboard extends Controller { try { if (! isset( $_SESSION['USER_LOGGED'] )) { - throw new Exception( 'The session has expired.' ); + throw new Exception( G::LoadTranslation('ID_SESSION_EXPIRED') ); } return $this->pmDashlet->getDashletsInstancesForUser( $_SESSION['USER_LOGGED'] ); } catch (Exception $error) { diff --git a/workflow/engine/controllers/main.php b/workflow/engine/controllers/main.php index f04cf1c97..3f1dda2d2 100644 --- a/workflow/engine/controllers/main.php +++ b/workflow/engine/controllers/main.php @@ -323,9 +323,8 @@ class Main extends Controller $this->setVar( 'logo_company', $this->getCompanyLogo() ); $this->setVar( 'pmos_version', System::getVersion() ); - $footerText = 'Copyright © 2003-' . date( 'Y' ) . ' Colosa, Inc. All rights reserved.'; - $adviseText = 'Supplied free of charge with no support, certification, warranty, - maintenance nor indemnity by Colosa and its Certified Partners. '; + $footerText = G::LoadTranslation('ID_COPYRIGHT_FROM') . date( 'Y' ) . G::LoadTranslation('ID_COPYRIGHT_COL'); + $adviseText = G::LoadTranslation('ID_COLOSA_AND_CERTIFIED_PARTNERS'); $this->setVar( 'footer_text', $footerText ); $this->setVar( 'advise_text', $adviseText ); diff --git a/workflow/engine/controllers/pmTablesProxy.php b/workflow/engine/controllers/pmTablesProxy.php index 25707f3f3..0a6ccf585 100755 --- a/workflow/engine/controllers/pmTablesProxy.php +++ b/workflow/engine/controllers/pmTablesProxy.php @@ -366,7 +366,7 @@ class pmTablesProxy extends HttpProxyController $rtOld = new ReportTable(); $existReportTableOld = $rtOld->load( $row->id ); if (count($existReportTableOld) == 0) { - throw new Exception( "Table does not exist... skipped!\n" ); + throw new Exception( G::LoadTranslation('ID_TABLE_NOT_EXIST_SKIPPED') ); } } @@ -388,10 +388,10 @@ class pmTablesProxy extends HttpProxyController if ($errors == '') { $result->success = true; - $result->message = "$count tables removed Successfully."; + $result->message = $count.G::LoadTranslation( 'ID_TABLES_REMOVED_SUCCESSFULLY' ); } else { $result->success = false; - $result->message = "$count tables removed but with errors.\n$errors"; + $result->message = $count. G::LoadTranslation( 'ID_TABLES_REMOVED_WITH_ERRORS' ) .$errors; } $result->errors = $errors; @@ -486,7 +486,7 @@ class pmTablesProxy extends HttpProxyController foreach ($obj->getValidationFailures() as $objValidationFailure) { $msg .= $objValidationFailure->getMessage() . "\n"; } - throw new Exception( 'Error trying insert into "' . $table['ADD_TAB_NAME'] . "\"\n" . $msg ); + throw new Exception( G::LoadTranslation('ID_ERROR_TRYING_INSERT'). '"' . $table['ADD_TAB_NAME'] . "\"\n" . $msg ); } $index = G::encrypt( implode( ',', $primaryKeysValues ), 'pmtable' ); @@ -496,7 +496,7 @@ class pmTablesProxy extends HttpProxyController if ($toSave) { $result->success = true; - $result->message = 'Record saved successfully'; + $result->message = G::LoadTranslation('ID_RECORD_SAVED_SUCCESFULLY'); $result->rows = $obj->toArray( BasePeer::TYPE_FIELDNAME ); $result->rows['__index__'] = $index; } else { @@ -1374,8 +1374,7 @@ class pmTablesProxy extends HttpProxyController $excludeFieldsList = array ('title','subtitle','link','file','button','reset','submit','listbox','checkgroup','grid','javascript', '' ); - $labelFieldsTypeList = array ('dropdown','radiogroup' - ); + $labelFieldsTypeList = array ('dropdown','radiogroup'); G::loadSystem( 'dynaformhandler' ); $index = 0; diff --git a/workflow/engine/methods/appFolder/appFolderAjax.php b/workflow/engine/methods/appFolder/appFolderAjax.php index 09779adfe..748ae55dd 100755 --- a/workflow/engine/methods/appFolder/appFolderAjax.php +++ b/workflow/engine/methods/appFolder/appFolderAjax.php @@ -944,8 +944,8 @@ function copyMoveAction($type) $itemField["displayField"] = "FOLDER_NAME"; $itemField["selectOnFocus"] = true; $itemField["tpl"] = '
{field2}
'; - $itemField["fieldLabel"] = "Destination"; - $itemField["emptyText"] = "Select a directory..."; + $itemField["fieldLabel"] = G::LoadTranslation('ID_DESTINATION'); + $itemField["emptyText"] = G::LoadTranslation('ID_SELECT_DIRECTORY'); $itemField["width"] = 390; $itemField["allowBlank"]=false; $copyDialog["items"][]=$itemField; @@ -1359,11 +1359,11 @@ function uploadExternalDocument() $response['message']=$err_msg; $response['success']=false; } elseif ($emptyInstances==$uploadedInstances) { - $response['error']="You may upload at least one file"; - $response['message']="You may upload at least one file"; + $response['error']= G::LoadTranslation('ID_UPLOAD_LEAST_FILE'); + $response['message']= G::LoadTranslation('ID_UPLOAD_LEAST_FILE'); $response['success']=false; } else { - $response['error']="Upload complete"; + $response['error']= G::LoadTranslation('ID_UPLOAD_COMPLETE'); $response['message']="Upload complete"; $response['success']=true; } @@ -1409,7 +1409,7 @@ function newFolder() $formNewFolder["id"]= "simpleform"; $formNewFolder["labelWidth"]=125; $formNewFolder["url"]="../appFolder/appFolderAjax.php"; - $formNewFolder["dialogtitle"]= "Create New Folder"; + $formNewFolder["dialogtitle"]= G::LoadTranslation('ID_CREATE_FOLDER'); $formNewFolder["frame"]= true; $formNewFolder["items"]= array(); diff --git a/workflow/engine/methods/authSources/authSources_Ajax.php b/workflow/engine/methods/authSources/authSources_Ajax.php index 636220835..3d7f41487 100755 --- a/workflow/engine/methods/authSources/authSources_Ajax.php +++ b/workflow/engine/methods/authSources/authSources_Ajax.php @@ -45,7 +45,7 @@ try { $dataset->next(); } - $aFields = $RBAC->getAuthSource( $_POST['sUID'] ); + $aFields = $RBAC->getAuthSource( $_POST['sUID'] ); //G::LoadThirdParty( 'pear/json', 'class.json' ); //$oJSON = new Services_JSON(); $i = 0; diff --git a/workflow/engine/methods/cases/casesDemo.php b/workflow/engine/methods/cases/casesDemo.php index 615eb92cd..4d9a9f98c 100755 --- a/workflow/engine/methods/cases/casesDemo.php +++ b/workflow/engine/methods/cases/casesDemo.php @@ -96,7 +96,7 @@ try { $oUser->load( $val['USR_UID'] ); $delegations[$key]['USR_NAME'] = $oUser->getUsrFirstname() . ' ' . $oUser->getUsrLastname(); } else { - $delegations[$key]['USR_NAME'] = 'Unknow user (Sub-Process User)'; + $delegations[$key]['USR_NAME'] = G::LoadTranslation('ID_UNKNOW_USER') . G::LoadTranslation('ID_SUBPROCESS_USER'); } } $Fields['CANT_DELEGATIONS'] = count( $delegations ); diff --git a/workflow/engine/methods/cases/casesStartPage_Ajax.php b/workflow/engine/methods/cases/casesStartPage_Ajax.php index 96dd1f237..cde40bc7f 100755 --- a/workflow/engine/methods/cases/casesStartPage_Ajax.php +++ b/workflow/engine/methods/cases/casesStartPage_Ajax.php @@ -1,13 +1,13 @@ getProcessData( $localPath . $newfilename ); if (is_null( $oData )) { - throw new Exception( 'Error' ); + throw new Exception( G::LoadTranslation( 'ID_ERROR' ) ); } $Fields['IMPORT_OPTION'] = 2; $Fields['PRO_FILENAME'] = $newfilename; diff --git a/workflow/engine/methods/processes/processes_Export.php b/workflow/engine/methods/processes/processes_Export.php index f9c1ae7b8..9b1c0c93c 100755 --- a/workflow/engine/methods/processes/processes_Export.php +++ b/workflow/engine/methods/processes/processes_Export.php @@ -54,7 +54,7 @@ try { if (isset( $stdObj->pro_uid )) $sProUid = $stdObj->pro_uid; else - throw (new Exception( 'the process uid is not defined!.' )); + throw (new Exception( G::LoadTranslation('ID_PROCESS_UID_NOT_DEFINED') )); /* Includes */ G::LoadClass( 'processes' ); diff --git a/workflow/engine/methods/processes/processes_Import_Ajax.php b/workflow/engine/methods/processes/processes_Import_Ajax.php index be6de20d9..59e843234 100644 --- a/workflow/engine/methods/processes/processes_Import_Ajax.php +++ b/workflow/engine/methods/processes/processes_Import_Ajax.php @@ -275,7 +275,7 @@ if ($action == "uploadFileNewProcessExist") { //krumo ($oData); die; $sNewProUid = $oProcess->getUnusedProcessGUID(); $oProcess->setProcessGuid( $oData, $sNewProUid ); - $oData->process['PRO_TITLE'] = "Copy of - " . $oData->process['PRO_TITLE'] . ' - ' . date( 'M d, H:i' ); + $oData->process['PRO_TITLE'] = G::LoadTranslation('ID_COPY_OF'). ' - ' . $oData->process['PRO_TITLE'] . ' - ' . date( 'M d, H:i' ); $oProcess->renewAll( $oData ); if ($processFileType == "pm") { diff --git a/workflow/engine/methods/processes/processes_webEntryGenerate.php b/workflow/engine/methods/processes/processes_webEntryGenerate.php index 983aae414..67497b339 100755 --- a/workflow/engine/methods/processes/processes_webEntryGenerate.php +++ b/workflow/engine/methods/processes/processes_webEntryGenerate.php @@ -29,7 +29,7 @@ try { $user = $oTask->assignUsertoTask( $sTASKS ); if ($user == 0) { - throw (new Exception( "The task '" . $TaskFields['TAS_TITLE'] . "' doesn't have users." )); + throw (new Exception( G::LoadTranslation('ID_TASK') . "'" . $TaskFields['TAS_TITLE'] . "'" . G::LoadTranslation('ID_NOT_HAVE_USERS'))); } if (G::is_https()) diff --git a/workflow/engine/methods/reportTables/reportTables_Ajax.php b/workflow/engine/methods/reportTables/reportTables_Ajax.php index c9c4e8bb0..b320aa384 100755 --- a/workflow/engine/methods/reportTables/reportTables_Ajax.php +++ b/workflow/engine/methods/reportTables/reportTables_Ajax.php @@ -201,7 +201,7 @@ switch ($action) { } if (in_array( strtoupper( $data['REP_TAB_NAME'] ), $aReservedWords )) { - throw new Exception( 'Could not create the table with the name "' . $data['REP_TAB_NAME'] . '" because it is a reserved word.' ); + throw new Exception( G::LoadTranslation('ID_NOT_CREATE_TABLE') . '"' . $data['REP_TAB_NAME'] . '"' . G::LoadTranslation('ID_RESERVED_WORD') ); } //create record $addTabUid = $oAdditionalTables->create( $repTabData ); diff --git a/workflow/engine/methods/services/soap.php b/workflow/engine/methods/services/soap.php index 8543d917c..c0e0f4ec4 100755 --- a/workflow/engine/methods/services/soap.php +++ b/workflow/engine/methods/services/soap.php @@ -60,8 +60,7 @@ function RoleList ($params) { $x = ifPermission( $params->sessionId, 'PM_USERS' ); if ($x == 0) { - $result[] = array ('guid' => 24,'name' => 'You do not have privileges' - ); + $result[] = array ('guid' => 24,'name' => G::LoadTranslation('ID_NOT_PRIVILEGES')); return $result; } @@ -76,8 +75,7 @@ function GroupList ($params) { $x = ifPermission( $params->sessionId, 'PM_USERS' ); if ($x == 0) { - $result[] = array ('guid' => 24,'name' => 'You do not have privileges' - ); + $result[] = array ('guid' => 24,'name' => G::LoadTranslation('ID_NOT_PRIVILEGES')); return $result; } @@ -94,7 +92,7 @@ function CaseList ($params) $x = ifPermission( $params->sessionId, 'PM_CASES' ); if ($x == 0) { G::LoadClass( 'wsResponse' ); - return new wsResponse( 9, 'Session expired' ); + return new wsResponse( 9, G::LoadTranslation('ID_SESSION_EXPIRED') ); } G::LoadClass( 'sessions' ); @@ -113,8 +111,7 @@ function UserList ($params) { $x = ifPermission( $params->sessionId, 'PM_USERS' ); if ($x == 0) { - $result[] = array ('guid' => 24,'name' => 'You do not have privileges' - ); + $result[] = array ('guid' => 24,'name' => G::LoadTranslation('ID_NOT_PRIVILEGES') ); return $result; } @@ -131,7 +128,7 @@ function SendMessage ($params) $x = ifPermission( $params->sessionId, 'PM_CASES' ); if ($x == 0) { G::LoadClass( 'wsResponse' ); - $result = new wsResponse( 24, "You do not have privileges" ); + $result = new wsResponse( 24, G::LoadTranslation('ID_NOT_PRIVILEGES') ); return $result; } G::LoadClass( 'wsBase' ); @@ -161,7 +158,7 @@ function SendVariables ($params) $x = ifPermission( $params->sessionId, 'PM_CASES' ); if ($x == 0) { G::LoadClass( 'wsResponse' ); - $result = new wsResponse( 24, "You do not have privileges" ); + $result = new wsResponse( 24, G::LoadTranslation('ID_NOT_PRIVILEGES') ); return $result; } G::LoadClass( 'wsBase' ); @@ -189,7 +186,7 @@ function GetVariables ($params) $x = ifPermission( $params->sessionId, 'PM_CASES' ); if ($x == 0) { G::LoadClass( 'wsResponse' ); - $result = new wsResponse( 24, "You do not have privileges" ); + $result = new wsResponse( 24, G::LoadTranslation('ID_NOT_PRIVILEGES') ); return $result; } @@ -207,7 +204,7 @@ function DerivateCase ($params) $x = ifPermission( $params->sessionId, 'PM_CASES' ); if ($x == 0) { G::LoadClass( 'wsResponse' ); - $result = new wsResponse( 24, "You do not have privileges" ); + $result = new wsResponse( 24, G::LoadTranslation('ID_NOT_PRIVILEGES') ); return $result; } @@ -228,7 +225,7 @@ function executeTrigger ($params) $x = ifPermission( $params->sessionId, 'PM_CASES' ); if ($x == 0) { G::LoadClass( 'wsResponse' ); - $result = new wsResponse( 24, "You do not have privileges" ); + $result = new wsResponse( 24, G::LoadTranslation('ID_NOT_PRIVILEGES') ); return $result; } @@ -248,7 +245,7 @@ function NewCaseImpersonate ($params) $x = ifPermission( $params->sessionId, 'PM_CASES' ); if ($x == 0) { G::LoadClass( 'wsResponse' ); - $result = new wsResponse( 24, "You do not have privileges" ); + $result = new wsResponse( 24, G::LoadTranslation('ID_NOT_PRIVILEGES') ); return $result; } G::LoadClass( 'wsBase' ); @@ -272,7 +269,7 @@ function NewCase ($params) $x = ifPermission( $params->sessionId, 'PM_CASES' ); if ($x == 0) { G::LoadClass( 'wsResponse' ); - $result = new wsResponse( 24, "You do not have privileges" ); + $result = new wsResponse( 24, G::LoadTranslation('ID_NOT_PRIVILEGES') ); return $result; } @@ -333,7 +330,7 @@ function AssignUserToGroup ($params) $x = ifPermission( $params->sessionId, 'PM_USERS' ); if ($x == 0) { G::LoadClass( 'wsResponse' ); - $result = new wsResponse( 24, "You do not have privileges" ); + $result = new wsResponse( 24, G::LoadTranslation('ID_NOT_PRIVILEGES') ); return $result; } G::LoadClass( 'sessions' ); @@ -341,7 +338,7 @@ function AssignUserToGroup ($params) $user = $sessions->getSessionUser( $params->sessionId ); if (! is_array( $user )) { G::LoadClass( 'wsResponse' ); - return new wsResponse( 3, 'User not registered in the system' ); + return new wsResponse( 3, G::LoadTranslation('ID_USER_NOT_REGISTERED_SYSTEM') ); } G::LoadClass( 'wsBase' ); @@ -356,7 +353,7 @@ function CreateUser ($params) $x = ifPermission( $params->sessionId, 'PM_USERS' ); if ($x == 0) { G::LoadClass( 'wsResponse' ); - $result = new wsResponse( 24, "You do not have privileges" ); + $result = new wsResponse( 24, G::LoadTranslation('ID_NOT_PRIVILEGES') ); return $result; } G::LoadClass( 'wsBase' ); @@ -369,8 +366,7 @@ function TaskList ($params) { $x = ifPermission( $params->sessionId, 'PM_CASES' ); if ($x == 0) { - $result[] = array ('guid' => 24,'name' => 'You do not have privileges' - ); + $result[] = array ('guid' => 24,'name' => G::LoadTranslation('ID_NOT_PRIVILEGES') ); return $result; } G::LoadClass( 'wsBase' ); @@ -389,8 +385,7 @@ function TaskCase ($params) ifSessionExpiredBreakThis( $params->sessionId ); $x = ifPermission( $params->sessionId, 'PM_CASES' ); if ($x == 0) { - $result[] = array ('guid' => 24,'name' => 'You do not have privileges' - ); + $result[] = array ('guid' => 24,'name' => G::LoadTranslation('ID_NOT_PRIVILEGES') ); return $result; } G::LoadClass( 'wsBase' ); @@ -418,7 +413,7 @@ function ifSessionExpiredBreakThis ($sessionId) $session = $oSessions->verifySession( $sessionId ); if ($session == '') { G::LoadClass( 'wsResponse' ); - return new wsResponse( 9, 'Session expired' ); + return new wsResponse( 9, G::LoadTranslation('ID_SESSION_EXPIRED') ); } } diff --git a/workflow/engine/methods/services/soap2.php b/workflow/engine/methods/services/soap2.php index 8b908d577..4da58fadf 100755 --- a/workflow/engine/methods/services/soap2.php +++ b/workflow/engine/methods/services/soap2.php @@ -61,7 +61,7 @@ function ProcessList ($params) } if (ifPermission( $params->sessionId, 'PM_FACTORY' ) == 0) { - $o->guid = "2 Insufficient privileges to execute this function"; + $o->guid = "2" . G::LoadTranslation('ID_INSUFFICIENT_PRIVILEGES_FUNCTION'); $o->name = ''; return array ("processes" => $o @@ -105,7 +105,7 @@ function RoleList ($params) } if (ifPermission( $params->sessionId, 'PM_USERS' ) == 0) { - $o->guid = "2 Insufficient privileges to execute this function"; + $o->guid = "2".G::LoadTranslation('ID_INSUFFICIENT_PRIVILEGES_FUNCTION'); $o->name = ''; return array ("roles" => $o @@ -132,7 +132,7 @@ function GroupList ($params) } if (ifPermission( $params->sessionId, 'PM_USERS' ) == 0) { - $o->guid = "2 Insufficient privileges to execute this function"; + $o->guid = "2".G::LoadTranslation('ID_INSUFFICIENT_PRIVILEGES_FUNCTION'); $o->name = ''; return array ("groups" => $o @@ -159,7 +159,7 @@ function DepartmentList ($params) } if (ifPermission( $params->sessionId, 'PM_USERS' ) == 0) { - $o->guid = "2 Insufficient privileges to execute this function"; + $o->guid = "2".G::LoadTranslation('ID_INSUFFICIENT_PRIVILEGES_FUNCTION'); $o->name = ''; return array ("departments" => $o @@ -189,7 +189,7 @@ function CaseList ($params) } if (ifPermission( $params->sessionId, 'PM_CASES' ) == 0) { - $o->guid = "2 Insufficient privileges to execute this function"; + $o->guid = "2".G::LoadTranslation('ID_INSUFFICIENT_PRIVILEGES_FUNCTION'); $o->name = ''; $o->status = ''; $o->delIndex = ''; @@ -259,7 +259,7 @@ function UserList ($params) } if (ifPermission( $params->sessionId, 'PM_USERS' ) == 0) { - $o->guid = "2 Insufficient privileges to execute this function"; + $o->guid = "2".G::LoadTranslation('ID_INSUFFICIENT_PRIVILEGES_FUNCTION'); $o->name = ''; return array ("users" => $o @@ -287,7 +287,7 @@ function triggerList ($params) } if (ifPermission( $params->sessionId, 'PM_CASES' ) == 0) { - $o->guid = "2 Insufficient privileges to execute this function"; + $o->guid = "2".G::LoadTranslation('ID_INSUFFICIENT_PRIVILEGES_FUNCTION'); $o->name = ''; $o->processId = ''; @@ -322,7 +322,7 @@ function outputDocumentList ($params) } if (ifPermission( $params->sessionId, 'PM_CASES' ) == 0) { - $o->guid = "2 Insufficient privileges to execute this function"; + $o->guid = "2".G::LoadTranslation('ID_INSUFFICIENT_PRIVILEGES_FUNCTION'); $o->filename = ''; $o->docId = ''; $o->version = ''; @@ -369,7 +369,7 @@ function inputDocumentList ($params) } if (ifPermission( $params->sessionId, 'PM_CASES' ) == 0) { - $o->guid = "2 Insufficient privileges to execute this function"; + $o->guid = "2".G::LoadTranslation('ID_INSUFFICIENT_PRIVILEGES_FUNCTION'); $o->filename = ''; $o->docId = ''; $o->version = ''; @@ -410,7 +410,7 @@ function inputDocumentProcessList ($params) } if (ifPermission( $params->sessionId, 'PM_CASES' ) == 0) { - $o->guid = "2 Insufficient privileges to execute this function"; + $o->guid = "2".G::LoadTranslation('ID_INSUFFICIENT_PRIVILEGES_FUNCTION'); $o->name = ''; $o->description = ''; @@ -434,7 +434,7 @@ function removeDocument ($params) } if (ifPermission( $params->sessionId, 'PM_CASES' ) == 0) { - $result = new wsResponse( 2, "Insufficient privileges to execute this function" ); + $result = new wsResponse( 2, G::LoadTranslation('ID_INSUFFICIENT_PRIVILEGES_FUNCTION') ); return $result; } @@ -454,7 +454,7 @@ function SendMessage ($params) } if (ifPermission( $params->sessionId, 'PM_CASES' ) == 0) { - $result = new wsResponse( 2, "You do not have privileges" ); + $result = new wsResponse( 2, G::LoadTranslation('ID_NOT_PRIVILEGES') ); return $result->getPayloadArray(); } @@ -474,7 +474,7 @@ function getCaseInfo ($params) } if (ifPermission( $params->sessionId, 'PM_CASES' ) == 0) { - $result = new wsResponse( 2, "You do not have privileges" ); + $result = new wsResponse( 2, G::LoadTranslation('ID_NOT_PRIVILEGES') ); return $result; } @@ -494,7 +494,7 @@ function SendVariables ($params) } if (ifPermission( $params->sessionId, 'PM_CASES' ) == 0) { - $result = new wsResponse( 2, "You do not have privileges" ); + $result = new wsResponse( 2, G::LoadTranslation('ID_NOT_PRIVILEGES') ); return $result; } @@ -533,7 +533,7 @@ function GetVariables ($params) } if (ifPermission( $params->sessionId, 'PM_CASES' ) == 0) { - $result = new wsGetVariableResponse( 2, "You do not have privileges", null ); + $result = new wsGetVariableResponse( 2, G::LoadTranslation('ID_NOT_PRIVILEGES'), null ); return $result; } @@ -555,7 +555,7 @@ function GetVariablesNames ($params) } if (ifPermission( $params->sessionId, 'PM_CASES' ) == 0) { - $result = new wsGetVariableResponse( 2, "You do not have privileges", null ); + $result = new wsGetVariableResponse( 2, G::LoadTranslation('ID_NOT_PRIVILEGES'), null ); return $result; } @@ -578,7 +578,7 @@ function DerivateCase ($params) } if (ifPermission( $params->sessionId, 'PM_CASES' ) == 0) { - $result = new wsResponse( 2, "You do not have privileges" ); + $result = new wsResponse( 2, G::LoadTranslation('ID_NOT_PRIVILEGES') ); return $result; } @@ -605,7 +605,7 @@ function RouteCase ($params) } if (ifPermission( $params->sessionId, 'PM_CASES' ) == 0) { - $result = new wsResponse( 2, "You do not have privileges" ); + $result = new wsResponse( 2, G::LoadTranslation('ID_NOT_PRIVILEGES') ); return $result; } @@ -631,7 +631,7 @@ function executeTrigger ($params) } if (ifPermission( $params->sessionId, 'PM_CASES' ) == 0) { - $result = new wsResponse( 2, "You do not have privileges" ); + $result = new wsResponse( 2, G::LoadTranslation('ID_NOT_PRIVILEGES') ); return $result; } @@ -655,7 +655,7 @@ function NewCaseImpersonate ($params) } if (ifPermission( $params->sessionId, "PM_CASES" ) == 0) { - $result = new wsResponse( 2, "You do not have privileges" ); + $result = new wsResponse( 2, G::LoadTranslation('ID_NOT_PRIVILEGES') ); return $result; } @@ -697,7 +697,7 @@ function NewCase ($params) } if (ifPermission( $params->sessionId, "PM_CASES" ) == 0) { - $result = new wsResponse( 2, "You do not have privileges" ); + $result = new wsResponse( 2, G::LoadTranslation('ID_NOT_PRIVILEGES') ); return $result; } @@ -782,7 +782,7 @@ function AssignUserToGroup ($params) } if (ifPermission( $params->sessionId, 'PM_USERS' ) == 0) { - $result = new wsResponse( 2, "You do not have privileges" ); + $result = new wsResponse( 2, G::LoadTranslation('ID_NOT_PRIVILEGES') ); return $result->getPayloadArray(); } @@ -811,7 +811,7 @@ function AssignUserToDepartment ($params) } if (ifPermission( $params->sessionId, 'PM_USERS' ) == 0) { - $result = new wsResponse( 2, "You do not have privileges" ); + $result = new wsResponse( 2, G::LoadTranslation('ID_NOT_PRIVILEGES') ); return $result->getPayloadArray(); } @@ -822,7 +822,7 @@ function AssignUserToDepartment ($params) $user = $sessions->getSessionUser( $params->sessionId ); if (! is_array( $user )) { - return new wsResponse( 3, 'User not registered in the system' ); + return new wsResponse( 3, G::LoadTranslation('ID_USER_NOT_REGISTERED_SYSTEM') ); } $ws = new wsBase(); @@ -840,7 +840,7 @@ function CreateUser ($params) } if (ifPermission( $params->sessionId, 'PM_USERS' ) == 0) { - $result = new wsCreateUserResponse( 2, "You do not have privileges" ); + $result = new wsCreateUserResponse( 2, G::LoadTranslation('ID_NOT_PRIVILEGES') ); return $result; } @@ -861,7 +861,7 @@ function updateUser ($params) } if (ifPermission( $params->sessionId, "PM_USERS" ) == 0) { - $result = new wsResponse( 2, "You do not have privileges" ); + $result = new wsResponse( 2, G::LoadTranslation('ID_NOT_PRIVILEGES') ); return $result; } @@ -882,7 +882,7 @@ function informationUser($params) } if (ifPermission($params->sessionId, "PM_USERS") == 0) { - $result = new wsResponse(2, "You do not have privileges"); + $result = new wsResponse(2, G::LoadTranslation('ID_NOT_PRIVILEGES')); return $result; } @@ -904,7 +904,7 @@ function CreateGroup ($params) } if (ifPermission( $params->sessionId, 'PM_USERS' ) == 0) { - $result = new wsCreateGroupResponse( 2, "You do not have privileges", '' ); + $result = new wsCreateGroupResponse( 2, G::LoadTranslation('ID_NOT_PRIVILEGES'), '' ); return $result; } @@ -924,7 +924,7 @@ function CreateDepartment ($params) } if (ifPermission( $params->sessionId, 'PM_USERS' ) == 0) { - $result = new wsCreateUserResponse( 2, "You do not have privileges" ); + $result = new wsCreateUserResponse( 2, G::LoadTranslation('ID_NOT_PRIVILEGES') ); return $result; } @@ -948,7 +948,7 @@ function TaskList ($params) } if (ifPermission( $params->sessionId, 'PM_CASES' ) == 0) { - $o->guid = "2 Insufficient privileges to execute this function"; + $o->guid = "2" . G::LoadTranslation('ID_INSUFFICIENT_PRIVILEGES_FUNCTION'); $o->name = ''; return array ("tasks" => $o @@ -980,7 +980,7 @@ function TaskCase ($params) } if (ifPermission( $params->sessionId, 'PM_CASES' ) == 0) { - $o->guid = "2 Insufficient privileges to execute this function"; + $o->guid = "2".G::LoadTranslation('ID_INSUFFICIENT_PRIVILEGES_FUNCTION'); $o->name = ''; return array ("taskCases" => $o @@ -1062,9 +1062,9 @@ function isValidSession ($sessionId) $session = $oSessions->verifySession( $sessionId ); if (is_array( $session )) { - return new wsResponse( 0, 'Session active' ); + return new wsResponse( 0, G::LoadTranslation('ID_SESSION_ACTIVE') ); } else { - return new wsResponse( 9, 'Session expired' ); + return new wsResponse( 9, G::LoadTranslation('ID_SESSION_EXPIRED') ); } } @@ -1118,7 +1118,7 @@ function deleteCase ($params) } if (ifPermission( $params->sessionId, "PM_CASES" ) == 0) { - $result = new wsResponse( 2, "You do not have privileges" ); + $result = new wsResponse( 2, G::LoadTranslation('ID_NOT_PRIVILEGES') ); return $result; } @@ -1138,7 +1138,7 @@ function cancelCase ($params) } if (ifPermission( $params->sessionId, "PM_CASES" ) == 0) { - $result = new wsResponse( 2, "You do not have privileges" ); + $result = new wsResponse( 2, G::LoadTranslation('ID_NOT_PRIVILEGES') ); return $result; } @@ -1158,7 +1158,7 @@ function pauseCase ($params) } if (ifPermission( $params->sessionId, "PM_CASES" ) == 0) { - $result = new wsResponse( 2, "You do not have privileges" ); + $result = new wsResponse( 2, G::LoadTranslation('ID_NOT_PRIVILEGES') ); return $result; } @@ -1179,7 +1179,7 @@ function unpauseCase ($params) } if (ifPermission( $params->sessionId, "PM_CASES" ) == 0) { - $result = new wsResponse( 2, "You do not have privileges" ); + $result = new wsResponse( 2, G::LoadTranslation('ID_NOT_PRIVILEGES') ); return $result; } @@ -1199,7 +1199,7 @@ function addCaseNote($params) } if (ifPermission($params->sessionId, "PM_CASES") == 0) { - $result = new wsResponse(2, "You do not have privileges"); + $result = new wsResponse(2, G::LoadTranslation('ID_NOT_PRIVILEGES') ); return $result; } diff --git a/workflow/engine/methods/setup/appCacheViewAjax.php b/workflow/engine/methods/setup/appCacheViewAjax.php index aaf633f32..2902acc0f 100755 --- a/workflow/engine/methods/setup/appCacheViewAjax.php +++ b/workflow/engine/methods/setup/appCacheViewAjax.php @@ -36,6 +36,7 @@ switch ($request) { $appCache->setPathToAppCacheFiles( PATH_METHODS . 'setup' . PATH_SEP . 'setupSchemas' . PATH_SEP ); $res = $appCache->getMySQLVersion(); + //load translations G::LoadTranslation $result->info[] = array ('name' => G::LoadTranslation ( 'ID_CACHE_BUILDER_MYSQL_VERSION' ) ,'value' => $res ); diff --git a/workflow/engine/methods/setup/skin_Ajax.php b/workflow/engine/methods/setup/skin_Ajax.php index e5a3c312c..4297d325b 100755 --- a/workflow/engine/methods/setup/skin_Ajax.php +++ b/workflow/engine/methods/setup/skin_Ajax.php @@ -2,14 +2,14 @@ if (! isset( $_REQUEST['action'] )) { $res['success'] = false; - $res['error'] = $res['message'] = 'You may request an action'; + $res['error'] = $res['message'] = G::LoadTranslation('ID_REQUEST_ACTION'); print G::json_encode( $res ); die(); } if (! function_exists( $_REQUEST['action'] )) { $res['success'] = false; - $res['error'] = $res['message'] = 'The requested action does not exist'; + $res['error'] = $res['message'] = G::LoadTranslation('ID_REQUEST_ACTION_NOT_EXIST'); print G::json_encode( $res ); die(); @@ -18,7 +18,7 @@ $restrictedFunctions = array ('copy_skin_folder','addTarFolder' ); if (in_array( $_REQUEST['action'], $restrictedFunctions )) { $res['success'] = false; - $res['error'] = $res['message'] = 'The requested action does not exist *'; + $res['error'] = $res['message'] = G::LoadTranslation('ID_REQUEST_ACTION_NOT_EXIST'); print G::json_encode( $res ); die(); } diff --git a/workflow/engine/methods/setup/upgrade_System.php b/workflow/engine/methods/setup/upgrade_System.php index fdc4d9e6c..56671baf1 100755 --- a/workflow/engine/methods/setup/upgrade_System.php +++ b/workflow/engine/methods/setup/upgrade_System.php @@ -53,7 +53,7 @@ $oSystem = new System(); try { if (! $oSystem->verifyFileForUpgrade()) { - throw (new Exception( "There was an error uploading the file, probably the file size if greater than upload_max_filesize parameter in php.ini, please check this parameter and try again." )); + throw (new Exception( G::LoadTranslation( 'ID_ERROR_UPLOADING_FILENAME')) ); } $oSystem->cleanupUpgradeDirectory(); $oSystem->getUpgradedFilesList(); diff --git a/workflow/engine/methods/setup/upgrade_SystemAjax.php b/workflow/engine/methods/setup/upgrade_SystemAjax.php index 74c928e88..ba760dd99 100755 --- a/workflow/engine/methods/setup/upgrade_SystemAjax.php +++ b/workflow/engine/methods/setup/upgrade_SystemAjax.php @@ -171,7 +171,7 @@ function processSchemaFile () $oDataBase = new database( $DB_ADAPTER, $DB_HOST, $DB_USER, $DB_PASS, $DB_NAME ); if (! $oDataBase->isConnected()) { - $oDataBase->logQuery( 'Does not exist an available connection!' ); + $oDataBase->logQuery( G::LoadTranslation('ID_DOES_NOT_EXIST_AVAILABLE_CONNECTION') ); return null; } diff --git a/workflow/engine/services/rest/crud/Application.php b/workflow/engine/services/rest/crud/Application.php index d2314e57a..c227502ac 100644 --- a/workflow/engine/services/rest/crud/Application.php +++ b/workflow/engine/services/rest/crud/Application.php @@ -41,7 +41,7 @@ class Services_Rest_Application $criteria->addSelectColumn(ApplicationPeer::APP_UPDATE_DATE); $criteria->addSelectColumn(ApplicationPeer::APP_DATA); $criteria->addSelectColumn(ApplicationPeer::APP_PIN); - + $dataset = AppEventPeer::doSelectRS($criteria); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); @@ -104,7 +104,7 @@ class Services_Rest_Application $obj->setAppUpdateDate($appUpdateDate); $obj->setAppData($appData); $obj->setAppPin($appPin); - + $obj->save(); } catch (Exception $e) { throw new RestException(412, $e->getMessage()); @@ -139,7 +139,7 @@ class Services_Rest_Application $obj->setAppUpdateDate($appUpdateDate); $obj->setAppData($appData); $obj->setAppPin($appPin); - + $obj->save(); } catch (Exception $e) { throw new RestException(412, $e->getMessage()); @@ -157,16 +157,16 @@ class Services_Rest_Application protected function delete($appUid) { $conn = Propel::getConnection(ApplicationPeer::DATABASE_NAME); - + try { $conn->begin(); - + $obj = ApplicationPeer::retrieveByPK($appUid); if (! is_object($obj)) { - throw new RestException(412, 'Record does not exist.'); + throw new RestException(412, G::LoadTranslation('ID_RECORD_DOES_NOT_EXIST')); } $obj->delete(); - + $conn->commit(); } catch (Exception $e) { $conn->rollback(); diff --git a/workflow/engine/services/rest/crud/Content.php b/workflow/engine/services/rest/crud/Content.php index 88608ba8b..89c199402 100644 --- a/workflow/engine/services/rest/crud/Content.php +++ b/workflow/engine/services/rest/crud/Content.php @@ -30,7 +30,7 @@ class Services_Rest_Content $criteria->addSelectColumn(ContentPeer::CON_ID); $criteria->addSelectColumn(ContentPeer::CON_LANG); $criteria->addSelectColumn(ContentPeer::CON_VALUE); - + $dataset = AppEventPeer::doSelectRS($criteria); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); @@ -82,7 +82,7 @@ class Services_Rest_Content $obj->setConId($conId); $obj->setConLang($conLang); $obj->setConValue($conValue); - + $obj->save(); } catch (Exception $e) { throw new RestException(412, $e->getMessage()); @@ -103,7 +103,7 @@ class Services_Rest_Content $obj = ContentPeer::retrieveByPK($conCategory, $conParent, $conId, $conLang); $obj->setConValue($conValue); - + $obj->save(); } catch (Exception $e) { throw new RestException(412, $e->getMessage()); @@ -121,16 +121,16 @@ class Services_Rest_Content protected function delete($conCategory, $conParent, $conId, $conLang) { $conn = Propel::getConnection(ContentPeer::DATABASE_NAME); - + try { $conn->begin(); - + $obj = ContentPeer::retrieveByPK($conCategory, $conParent, $conId, $conLang); if (! is_object($obj)) { - throw new RestException(412, 'Record does not exist.'); + throw new RestException(412, G::LoadTranslation('ID_RECORD_DOES_NOT_EXIST') ) ; } $obj->delete(); - + $conn->commit(); } catch (Exception $e) { $conn->rollback(); diff --git a/workflow/engine/services/rest/crud/Holiday.php b/workflow/engine/services/rest/crud/Holiday.php index f4ea59ce4..da46d4bba 100644 --- a/workflow/engine/services/rest/crud/Holiday.php +++ b/workflow/engine/services/rest/crud/Holiday.php @@ -28,7 +28,7 @@ class Services_Rest_Holiday $criteria->addSelectColumn(HolidayPeer::HLD_UID); $criteria->addSelectColumn(HolidayPeer::HLD_DATE); $criteria->addSelectColumn(HolidayPeer::HLD_DESCRIPTION); - + $dataset = AppEventPeer::doSelectRS($criteria); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); @@ -78,7 +78,7 @@ class Services_Rest_Holiday $obj->setHldUid($hldUid); $obj->setHldDate($hldDate); $obj->setHldDescription($hldDescription); - + $obj->save(); } catch (Exception $e) { throw new RestException(412, $e->getMessage()); @@ -100,7 +100,7 @@ class Services_Rest_Holiday $obj->setHldDate($hldDate); $obj->setHldDescription($hldDescription); - + $obj->save(); } catch (Exception $e) { throw new RestException(412, $e->getMessage()); @@ -118,16 +118,16 @@ class Services_Rest_Holiday protected function delete($hldUid) { $conn = Propel::getConnection(HolidayPeer::DATABASE_NAME); - + try { $conn->begin(); - + $obj = HolidayPeer::retrieveByPK($hldUid); if (! is_object($obj)) { - throw new RestException(412, 'Record does not exist.'); + throw new RestException(412, G::LoadTranslation('ID_RECORD_DOES_NOT_EXIST')); } $obj->delete(); - + $conn->commit(); } catch (Exception $e) { $conn->rollback(); diff --git a/workflow/engine/services/rest/crud/Session.php b/workflow/engine/services/rest/crud/Session.php index cb722ae05..767cd021b 100644 --- a/workflow/engine/services/rest/crud/Session.php +++ b/workflow/engine/services/rest/crud/Session.php @@ -32,7 +32,7 @@ class Services_Rest_Session $criteria->addSelectColumn(SessionPeer::SES_INIT_DATE); $criteria->addSelectColumn(SessionPeer::SES_DUE_DATE); $criteria->addSelectColumn(SessionPeer::SES_END_DATE); - + $dataset = AppEventPeer::doSelectRS($criteria); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); @@ -86,7 +86,7 @@ class Services_Rest_Session $obj->setSesInitDate($sesInitDate); $obj->setSesDueDate($sesDueDate); $obj->setSesEndDate($sesEndDate); - + $obj->save(); } catch (Exception $e) { throw new RestException(412, $e->getMessage()); @@ -112,7 +112,7 @@ class Services_Rest_Session $obj->setSesInitDate($sesInitDate); $obj->setSesDueDate($sesDueDate); $obj->setSesEndDate($sesEndDate); - + $obj->save(); } catch (Exception $e) { throw new RestException(412, $e->getMessage()); @@ -130,16 +130,16 @@ class Services_Rest_Session protected function delete($sesUid) { $conn = Propel::getConnection(SessionPeer::DATABASE_NAME); - + try { $conn->begin(); - + $obj = SessionPeer::retrieveByPK($sesUid); if (! is_object($obj)) { - throw new RestException(412, 'Record does not exist.'); + throw new RestException(412, G::LoadTranslation('ID_RECORD_DOES_NOT_EXIST')); } $obj->delete(); - + $conn->commit(); } catch (Exception $e) { $conn->rollback(); diff --git a/workflow/engine/services/rest/crud/Step.php b/workflow/engine/services/rest/crud/Step.php index 359a98da6..2bbf38a14 100644 --- a/workflow/engine/services/rest/crud/Step.php +++ b/workflow/engine/services/rest/crud/Step.php @@ -33,7 +33,7 @@ class Services_Rest_Step $criteria->addSelectColumn(StepPeer::STEP_CONDITION); $criteria->addSelectColumn(StepPeer::STEP_POSITION); $criteria->addSelectColumn(StepPeer::STEP_MODE); - + $dataset = AppEventPeer::doSelectRS($criteria); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); @@ -88,7 +88,7 @@ class Services_Rest_Step $obj->setStepCondition($stepCondition); $obj->setStepPosition($stepPosition); $obj->setStepMode($stepMode); - + $obj->save(); } catch (Exception $e) { throw new RestException(412, $e->getMessage()); @@ -115,7 +115,7 @@ class Services_Rest_Step $obj->setStepCondition($stepCondition); $obj->setStepPosition($stepPosition); $obj->setStepMode($stepMode); - + $obj->save(); } catch (Exception $e) { throw new RestException(412, $e->getMessage()); @@ -133,16 +133,16 @@ class Services_Rest_Step protected function delete($stepUid) { $conn = Propel::getConnection(StepPeer::DATABASE_NAME); - + try { $conn->begin(); - + $obj = StepPeer::retrieveByPK($stepUid); if (! is_object($obj)) { - throw new RestException(412, 'Record does not exist.'); + throw new RestException(412, G::LoadTranslation('ID_RECORD_DOES_NOT_EXIST')); } $obj->delete(); - + $conn->commit(); } catch (Exception $e) { $conn->rollback(); diff --git a/workflow/engine/services/rest/crud/SubProcess.php b/workflow/engine/services/rest/crud/SubProcess.php index cafa897a1..5d9ad9106 100644 --- a/workflow/engine/services/rest/crud/SubProcess.php +++ b/workflow/engine/services/rest/crud/SubProcess.php @@ -37,7 +37,7 @@ class Services_Rest_SubProcess $criteria->addSelectColumn(SubProcessPeer::SP_VARIABLES_OUT); $criteria->addSelectColumn(SubProcessPeer::SP_VARIABLES_IN); $criteria->addSelectColumn(SubProcessPeer::SP_GRID_IN); - + $dataset = AppEventPeer::doSelectRS($criteria); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); @@ -96,7 +96,7 @@ class Services_Rest_SubProcess $obj->setSpVariablesOut($spVariablesOut); $obj->setSpVariablesIn($spVariablesIn); $obj->setSpGridIn($spGridIn); - + $obj->save(); } catch (Exception $e) { throw new RestException(412, $e->getMessage()); @@ -127,7 +127,7 @@ class Services_Rest_SubProcess $obj->setSpVariablesOut($spVariablesOut); $obj->setSpVariablesIn($spVariablesIn); $obj->setSpGridIn($spGridIn); - + $obj->save(); } catch (Exception $e) { throw new RestException(412, $e->getMessage()); @@ -145,16 +145,16 @@ class Services_Rest_SubProcess protected function delete($spUid) { $conn = Propel::getConnection(SubProcessPeer::DATABASE_NAME); - + try { $conn->begin(); - + $obj = SubProcessPeer::retrieveByPK($spUid); if (! is_object($obj)) { - throw new RestException(412, 'Record does not exist.'); + throw new RestException(412, G::LoadTranslation('ID_RECORD_DOES_NOT_EXIST')); } $obj->delete(); - + $conn->commit(); } catch (Exception $e) { $conn->rollback(); diff --git a/workflow/engine/services/rest/crud/Translation.php b/workflow/engine/services/rest/crud/Translation.php index 1c571a36d..996eb2569 100644 --- a/workflow/engine/services/rest/crud/Translation.php +++ b/workflow/engine/services/rest/crud/Translation.php @@ -30,7 +30,7 @@ class Services_Rest_Translation $criteria->addSelectColumn(TranslationPeer::TRN_LANG); $criteria->addSelectColumn(TranslationPeer::TRN_VALUE); $criteria->addSelectColumn(TranslationPeer::TRN_UPDATE_DATE); - + $dataset = AppEventPeer::doSelectRS($criteria); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); @@ -82,7 +82,7 @@ class Services_Rest_Translation $obj->setTrnLang($trnLang); $obj->setTrnValue($trnValue); $obj->setTrnUpdateDate($trnUpdateDate); - + $obj->save(); } catch (Exception $e) { throw new RestException(412, $e->getMessage()); @@ -104,7 +104,7 @@ class Services_Rest_Translation $obj->setTrnValue($trnValue); $obj->setTrnUpdateDate($trnUpdateDate); - + $obj->save(); } catch (Exception $e) { throw new RestException(412, $e->getMessage()); @@ -122,16 +122,16 @@ class Services_Rest_Translation protected function delete($trnCategory, $trnId, $trnLang) { $conn = Propel::getConnection(TranslationPeer::DATABASE_NAME); - + try { $conn->begin(); - + $obj = TranslationPeer::retrieveByPK($trnCategory, $trnId, $trnLang); if (! is_object($obj)) { - throw new RestException(412, 'Record does not exist.'); + throw new RestException(412, G::LoadTranslation('ID_RECORD_DOES_NOT_EXIST')); } $obj->delete(); - + $conn->commit(); } catch (Exception $e) { $conn->rollback(); diff --git a/workflow/engine/services/rest/crud/Users.php b/workflow/engine/services/rest/crud/Users.php index 3744d77db..1a310a203 100644 --- a/workflow/engine/services/rest/crud/Users.php +++ b/workflow/engine/services/rest/crud/Users.php @@ -51,7 +51,7 @@ class Services_Rest_Users $criteria->addSelectColumn(UsersPeer::USR_REPORTS_TO); $criteria->addSelectColumn(UsersPeer::USR_REPLACED_BY); $criteria->addSelectColumn(UsersPeer::USR_UX); - + $dataset = AppEventPeer::doSelectRS($criteria); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); @@ -124,7 +124,7 @@ class Services_Rest_Users $obj->setUsrReportsTo($usrReportsTo); $obj->setUsrReplacedBy($usrReplacedBy); $obj->setUsrUx($usrUx); - + $obj->save(); } catch (Exception $e) { throw new RestException(412, $e->getMessage()); @@ -169,7 +169,7 @@ class Services_Rest_Users $obj->setUsrReportsTo($usrReportsTo); $obj->setUsrReplacedBy($usrReplacedBy); $obj->setUsrUx($usrUx); - + $obj->save(); } catch (Exception $e) { throw new RestException(412, $e->getMessage()); @@ -187,16 +187,16 @@ class Services_Rest_Users protected function delete($usrUid) { $conn = Propel::getConnection(UsersPeer::DATABASE_NAME); - + try { $conn->begin(); - + $obj = UsersPeer::retrieveByPK($usrUid); if (! is_object($obj)) { - throw new RestException(412, 'Record does not exist.'); + throw new RestException(412, G::LoadTranslation('ID_RECORD_DOES_NOT_EXIST')); } $obj->delete(); - + $conn->commit(); } catch (Exception $e) { $conn->rollback(); diff --git a/workflow/engine/templates/admin/calendarEdit.js b/workflow/engine/templates/admin/calendarEdit.js index 8ed6de8ed..c4fc512b2 100644 --- a/workflow/engine/templates/admin/calendarEdit.js +++ b/workflow/engine/templates/admin/calendarEdit.js @@ -80,7 +80,7 @@ { xtype: 'textfield', width: 70, - fieldLabel: 'Name', + fieldLabel: _('ID_NAME'), name : 'td1', allowBlank: true }, @@ -92,7 +92,7 @@ { xtype: 'textfield', width: 70, - fieldLabel: 'Name', + fieldLabel: _('ID_NAME'), name : 'td2', allowBlank: true }, @@ -103,7 +103,7 @@ }, { xtype: 'box', - fieldLabel: 'Filename', + fieldLabel: _('ID_FILENAME'), name: 'filename', autoEl: { style: 'margin-top:5px', @@ -909,7 +909,7 @@ Ext.onReady( function() { items : [ { xtype : 'compositefield', - hideLabel : true, + hideLabel : true, layout : 'fit', labelWidth : 100, items : [ diff --git a/workflow/engine/templates/admin/emails.js b/workflow/engine/templates/admin/emails.js index f7171d5e2..828039bc2 100644 --- a/workflow/engine/templates/admin/emails.js +++ b/workflow/engine/templates/admin/emails.js @@ -264,7 +264,7 @@ Ext.onReady(function(){ boxLabel: _('REQUIRE_AUTHENTICATION'),//'Require authentication', id:'RequireAuthentication', name:'RequireAuthentication', - validateMessage: 'You really should do it.', + validateMessage: _('ID_REALLY_SHOULD'), validateField: true, disabled : true, handler: function() { @@ -756,8 +756,8 @@ var testMethod = function() ( Ext.getCmp('eMailto').getValue() == '' || /^[0-9a-z_\-\.]+@[0-9a-z\-\.]+\.[a-z]{2,4}$/i.test(Ext.getCmp('eMailto').getValue()) != true ) ) { Ext.MessageBox.show({ - title: 'Error', - msg: '"Mail to" does not contain a valid email address format.', + title: _('ID_ERROS'), + msg: _('ID_MAIL_TO_NOT_VALID_ADDRESS'), buttons: Ext.MessageBox.OK, animEl: 'mb9', icon: Ext.MessageBox.ERROR diff --git a/workflow/engine/templates/admin/pmLogo.js b/workflow/engine/templates/admin/pmLogo.js index 160f0300a..4f426d220 100644 --- a/workflow/engine/templates/admin/pmLogo.js +++ b/workflow/engine/templates/admin/pmLogo.js @@ -66,11 +66,11 @@ Ext.onReady(function() { }); } else { - PMExt.notify('Notice', _('ID_YOU_ARE_NOT_CAN_SELECT_PHOTO')); + PMExt.notify( _('ID_NOTICE'), _('ID_YOU_ARE_NOT_CAN_SELECT_PHOTO')); } } else { - PMExt.notify('Notice', _('ID_SELECT_AN_IMAGE')); + PMExt.notify( _('ID_NOTICE'), _('ID_SELECT_AN_IMAGE')); } } }); @@ -117,10 +117,10 @@ Ext.onReady(function() { store.load(); oResponse = Ext.decode( response.responseText ); if (oResponse.success == true) { - PMExt.notify('Notice', _('ID_SELECTED_IMAGE_DELETED')); + PMExt.notify( _('ID_NOTICE'), _('ID_SELECTED_IMAGE_DELETED')); } else { - PMExt.notify('Notice', _('ID_SELECTED_IMAGE_IS_LOGO')); + PMExt.notify( _('ID_NOTICE'), _('ID_SELECTED_IMAGE_IS_LOGO')); } } }); @@ -133,11 +133,11 @@ Ext.onReady(function() { } } else { - PMExt.notify('Notice', _('ID_YOU_ARE_NOT_CAN_SELECT_PHOTO')); + PMExt.notify( _('ID_NOTICE'), _('ID_YOU_ARE_NOT_CAN_SELECT_PHOTO')); } } else { - PMExt.notify('Notice', _('ID_SELECT_AN_IMAGE')); + PMExt.notify( _('ID_NOTICE'), _('ID_SELECT_AN_IMAGE')); } } }); diff --git a/workflow/engine/templates/admin/uxUsersList.js b/workflow/engine/templates/admin/uxUsersList.js index e4b250faf..b49173f7c 100755 --- a/workflow/engine/templates/admin/uxUsersList.js +++ b/workflow/engine/templates/admin/uxUsersList.js @@ -156,7 +156,7 @@ Ext.onReady(function(){ {header: _('ID_ROLE'), dataIndex: 'USR_ROLE', width: 50, hidden:false, align:'left'}, {header: _('ID_STATUS'), dataIndex: 'USR_STATUS', width: 50, hidden: true, align: 'center', renderer: render_status}, { - header: 'User experience', + header: _('ID_USER_EXPERIENCE'), dataIndex: 'USR_UX', width: 50, editor: new Ext.form.ComboBox({ @@ -188,7 +188,7 @@ Ext.onReady(function(){ }); usersGrid = new Ext.grid.EditorGridPanel({ - title: 'Users', + title: _('ID_USERS'), //region: 'center', layout: 'fit', id: 'usersGrid', @@ -264,8 +264,7 @@ Ext.onReady(function(){ {id:'GRP_UID', dataIndex: 'USR_UID', hidden:true, hideable:false}, {header: _('ID_GROUP_NAME'), dataIndex: 'CON_VALUE', width: 100, align:'left'}, {header: _('ID_STATUS'), dataIndex: 'GRP_STATUS', width: 100, align:'center', renderer: render_status}, - { - header: 'User experience', + {header: _('ID_USER_EXPERIENCE'), dataIndex: 'GRP_UX', width: 50, editor: new Ext.form.ComboBox({ diff --git a/workflow/engine/templates/app/main.js b/workflow/engine/templates/app/main.js index 6ff3f006e..15a657649 100644 --- a/workflow/engine/templates/app/main.js +++ b/workflow/engine/templates/app/main.js @@ -17,7 +17,7 @@ function openCaseNotesWindow(appUid1, modalSw, appTitle, proUid, taskUid) { Ext.MessageBox.show({ msg: _('ID_CASE_NOTES_LOADING'), - progressText: 'Saving...', + progressText: _('ID_SAVING'), width:300, wait:true, waitConfig: {interval:200}, @@ -385,7 +385,7 @@ function statusBarMessage( msg, isLoading, success ) { }); } else { statusBar.setStatus({ - text: 'Error: ' + msg, + text: _('ID_ERROR') + ': ' + msg, iconCls: 'x-status-error', clear: true }); diff --git a/workflow/engine/templates/authSources/authSourcesList.js b/workflow/engine/templates/authSources/authSourcesList.js index 3b60194dc..a441e4d7d 100755 --- a/workflow/engine/templates/authSources/authSourcesList.js +++ b/workflow/engine/templates/authSources/authSourcesList.js @@ -15,7 +15,7 @@ new Ext.KeyMap(document, [ e.stopEvent(); document.location = document.location; }else{ - Ext.Msg.alert('Refresh', 'You clicked: CTRL-F5'); + Ext.Msg.alert( _('ID_REFRESH_LABEL'), _('ID_REFRESH_MESSAGE')); } } }, diff --git a/workflow/engine/templates/authSources/authSourcesListNew.js b/workflow/engine/templates/authSources/authSourcesListNew.js index 719f543ad..1f65752de 100755 --- a/workflow/engine/templates/authSources/authSourcesListNew.js +++ b/workflow/engine/templates/authSources/authSourcesListNew.js @@ -30,7 +30,7 @@ var cboxAuthSourse = new Ext.form.ComboBox({ store: storeAuthSources, valueField: 'sType', displayField: 'sLabel', - emptyText: 'Choose an option...', + emptyText: _('ID_CHOOSE_OPTION') + '...', width: 160, editable: false, //value: _('ID_ALL'), @@ -100,7 +100,7 @@ var cboxAuthSourse = new Ext.form.ComboBox({ optionAuthS: formAuthSourceOptoins.getForm().findField('AUTH_SOURCE_PROVIDER').getValue() }, method: 'POST', - waitMsg : 'loading...', + waitMsg : _('ID_LOADING_GRID'), timeout : 500, success: function(f,a){ resp = Ext.util.JSON.decode(a.response.responseText); @@ -117,10 +117,10 @@ var cboxAuthSourse = new Ext.form.ComboBox({ }, failure: function(f,a){ if (a.failureType === Ext.form.Action.CONNECT_FAILURE){ - Ext.Msg.alert('Failure', 'Server reported:'+a.response.status+' '+a.response.statusText); + Ext.Msg.alert( _('ID_FAILURE'), _('ID_SERVER_REPORTED')+':'+a.response.status+' '+a.response.statusText); } if (a.failureType === Ext.form.Action.SERVER_INVALID){ - Ext.Msg.alert('Warning', 'you have an error'); + Ext.Msg.alert( _('ID_WARNING'), _('ID_YOU_HAVE_ERROR')); } } }); diff --git a/workflow/engine/templates/authSources/authSourceskindof.js b/workflow/engine/templates/authSources/authSourceskindof.js index e7e360500..0155d4161 100644 --- a/workflow/engine/templates/authSources/authSourceskindof.js +++ b/workflow/engine/templates/authSources/authSourceskindof.js @@ -53,7 +53,7 @@ Ext.onReady(function(){ typeAhead: true, mode: 'local', triggerAction: 'all', - emptyText:'Choose an option...', + emptyText: _('ID_CHOOSE_OPTION') + '...', editable: false, selectOnFocus:true, listeners:{ @@ -111,7 +111,7 @@ Ext.onReady(function(){ typeAhead: true, mode: 'local', triggerAction: 'all', - emptyText:'Choose an option...', + emptyText: _('ID_CHOOSE_OPTION') + '...', editable: false, selectOnFocus:true }); @@ -130,7 +130,7 @@ Ext.onReady(function(){ typeAhead: true, mode: 'local', triggerAction: 'all', - emptyText:'Choose an option...', + emptyText: _('ID_CHOOSE_OPTION') + '...', editable: false, selectOnFocus:true }); @@ -165,7 +165,7 @@ Ext.onReady(function(){ mode: 'local', allowBlank: false, triggerAction: 'all', - emptyText:'Choose an option...', + emptyText: _('ID_CHOOSE_OPTION') + '...', editable: false, selectOnFocus:true, // width: 110, diff --git a/workflow/engine/templates/cases/caseHistory.js b/workflow/engine/templates/cases/caseHistory.js index 39e0939c4..2d43ef91d 100644 --- a/workflow/engine/templates/cases/caseHistory.js +++ b/workflow/engine/templates/cases/caseHistory.js @@ -34,7 +34,7 @@ } } if (!http_request){ - alert('This browser is not supported.'); + alert( _('ID_BROWSER_NOT_SUPPORTED') ); return false; } @@ -81,7 +81,7 @@ document.location = document.location; } else{ - Ext.Msg.alert('Refresh', 'You clicked: CTRL-F5'); + Ext.Msg.alert( _('ID_REFRESH_LABEL'), _('ID_REFRESH_MESSAGE')); } } @@ -334,7 +334,7 @@ listeners: { rowdblclick: emptyReturn, render: function(){ - this.loadMask = new Ext.LoadMask(this.body, {msg:'Loading...'}); + this.loadMask = new Ext.LoadMask(this.body, {msg: _('ID_LOADING_GRID') }); processesGrid.getSelectionModel().on('rowselect', function(){ var rowSelected = processesGrid.getSelectionModel().getSelected(); diff --git a/workflow/engine/templates/cases/caseHistoryDynaformPage.js b/workflow/engine/templates/cases/caseHistoryDynaformPage.js index 85a144b62..8b6ecfcea 100644 --- a/workflow/engine/templates/cases/caseHistoryDynaformPage.js +++ b/workflow/engine/templates/cases/caseHistoryDynaformPage.js @@ -168,7 +168,7 @@ } } if (!http_request){ - alert('This browser is not supported.'); + alert( _('ID_BROWSER_NOT_SUPPORTED') ); return false; } @@ -215,7 +215,7 @@ document.location = document.location; } else{ - Ext.Msg.alert('Refresh', 'You clicked: CTRL-F5'); + Ext.Msg.alert( _('ID_REFRESH_LABEL'), _('ID_REFRESH_MESSAGE') ); } } @@ -503,7 +503,7 @@ listeners: { rowdblclick: emptyReturn, render: function(){ - this.loadMask = new Ext.LoadMask(this.body, {msg:'Loading...'}); + this.loadMask = new Ext.LoadMask(this.body, {msg: _('ID_LOADING_GRID') }); processesGrid.getSelectionModel().on('rowselect', function(){ var rowSelected = processesGrid.getSelectionModel().getSelected(); diff --git a/workflow/engine/templates/cases/caseMessageHistory.js b/workflow/engine/templates/cases/caseMessageHistory.js index 70bd423d5..ea316f326 100644 --- a/workflow/engine/templates/cases/caseMessageHistory.js +++ b/workflow/engine/templates/cases/caseMessageHistory.js @@ -136,7 +136,7 @@ } } if (!http_request){ - alert('This browser is not supported.'); + alert(_('ID_BROWSER_NOT_SUPPORTED')); return false; } @@ -183,7 +183,7 @@ var ActionTabFrameGlobal = ''; document.location = document.location; } else{ - Ext.Msg.alert('Refresh', 'You clicked: CTRL-F5'); + Ext.Msg.alert( _('ID_REFRESH_LABEL'), _('ID_REFRESH_MESSAGE')); } } @@ -326,7 +326,7 @@ var ActionTabFrameGlobal = ''; {name : 'APP_MSG_FROM'}, {name : 'APP_MSG_TO'}, {name : 'APP_MSG_STATUS'}, - {name : 'APP_MSG_BODY'} + {name : 'APP_MSG_BODY'} ] } diff --git a/workflow/engine/templates/cases/casesDocuments.js b/workflow/engine/templates/cases/casesDocuments.js index 1c201a22f..23dc09abe 100755 --- a/workflow/engine/templates/cases/casesDocuments.js +++ b/workflow/engine/templates/cases/casesDocuments.js @@ -60,13 +60,13 @@ streamFilefromPM=function(fileStream) { }); }else{ - msgbox = Ext.Msg.alert('Error', results.message); + msgbox = Ext.Msg.alert( _('ID_ERROR'), results.message); msgbox.setIcon( Ext.MessageBox.ERROR ); } }, failure: function() { if (results.message) { - Ext.Msg.alert('Infomation',results.message); + Ext.Msg.alert( _('ID_INFORMATION'),results.message); } } @@ -350,16 +350,16 @@ function openActionDialog(caller, action, dataAux) if( json.error && typeof json.error != 'xml' ) { if (typeof(json.login) != 'undefined') { - msgbox = Ext.Msg.alert( "error", json.error, function(){try{parent.parent.window.location = '../login/login';} catch(e){}} ); + msgbox = Ext.Msg.alert( _('ID_ERROR') , json.error, function(){try{parent.parent.window.location = '../login/login';} catch(e){}} ); } else { - msgbox = Ext.Msg.alert( "error", json.error ); + msgbox = Ext.Msg.alert( _('ID_ERROR') , json.error ); } msgbox.setIcon( Ext.MessageBox.ERROR ); dialog.destroy(); return false; } } catch(e) { - msgbox = Ext.Msg.alert( "error", "JSON Decode Error: " + e.message ); + msgbox = Ext.Msg.alert( _('ID_ERROR') , "JSON Decode Error: " + e.message ); msgbox.setIcon( Ext.MessageBox.ERROR ); return false; } @@ -436,7 +436,7 @@ function openActionDialog(caller, action, dataAux) dialog.center(); } } else if( !response || !oResponse.responseText) { - msgbox = Ext.Msg.alert( "error", "Received an empty response"); + msgbox = Ext.Msg.alert( _('ID_ERROR') , _('ID_RECEIVED_EMPTY_RESPONSE') ); msgbox.setIcon( Ext.MessageBox.ERROR ); } @@ -554,7 +554,7 @@ function handleCallback(requestParams, node) { } } else { - Ext.Msg.alert( 'Error', 'Failed to connect to the server.'); + Ext.Msg.alert( _('ID_ERROR'), _('ID_SERVER_COMMUNICATION_ERROR')); } } @@ -714,11 +714,11 @@ function statusBarMessage( msg, isLoading, success ) { Ext.msgBoxSlider.msg('', msg ); } else { statusBar.setStatus({ - text: 'Error: ' + msg, + text: _('ID_ERROR') +': ' + msg, iconCls: 'error', clear: true }); - Ext.msgBoxSlider.msg('Error', msg ); + Ext.msgBoxSlider.msg(_('ID_ERROR'), msg ); } diff --git a/workflow/engine/templates/cases/casesGenerateDocumentPage.js b/workflow/engine/templates/cases/casesGenerateDocumentPage.js index ce63a4c92..ff3fdcabf 100644 --- a/workflow/engine/templates/cases/casesGenerateDocumentPage.js +++ b/workflow/engine/templates/cases/casesGenerateDocumentPage.js @@ -61,7 +61,7 @@ } } if (!http_request){ - alert('This browser is not supported.'); + alert( _('ID_BROWSER_NOT_SUPPORTED') ); return false; } @@ -108,7 +108,7 @@ } } if (!http_request){ - alert('This browser is not supported.'); + alert( _('ID_BROWSER_NOT_SUPPORTED') ); return false; } @@ -146,7 +146,7 @@ document.location = document.location; } else{ - Ext.Msg.alert('Refresh', 'You clicked: CTRL-F5'); + Ext.Msg.alert( _('ID_REFRESH_LABEL'), _('ID_REFRESH_MESSAGE') ); } } @@ -505,7 +505,7 @@ generateDocumentGridDownload(); }, render: function(){ - this.loadMask = new Ext.LoadMask(this.body, {msg:'Loading...'}); + this.loadMask = new Ext.LoadMask(this.body, {msg: _('ID_LOADING_GRID') }); processesGrid.getSelectionModel().on('rowselect', function(){ var rowSelected = processesGrid.getSelectionModel().getSelected(); diff --git a/workflow/engine/templates/cases/casesList.js b/workflow/engine/templates/cases/casesList.js index ba1d341ac..47af27fd5 100644 --- a/workflow/engine/templates/cases/casesList.js +++ b/workflow/engine/templates/cases/casesList.js @@ -1013,7 +1013,7 @@ Ext.onReady ( function() { text: _('ID_SUBMIT'), handler:function(){ Ext.Msg.alert('OK','save ?'); - Ext.Msg.prompt('Name','please enter your name: ',function(btn,text){ + Ext.Msg.prompt(_('ID_NAME'),'please enter your name: ',function(btn,text){ if(btn=='ok') { alert('ok'); } diff --git a/workflow/engine/templates/cases/casesSchedulerLog.js b/workflow/engine/templates/cases/casesSchedulerLog.js index a62e322ad..4f069dae7 100755 --- a/workflow/engine/templates/cases/casesSchedulerLog.js +++ b/workflow/engine/templates/cases/casesSchedulerLog.js @@ -16,7 +16,7 @@ new Ext.KeyMap(document, { e.stopEvent(); document.location = document.location; }else{ - Ext.Msg.alert('Refresh', 'You clicked: CTRL-F5'); + Ext.Msg.alert(_('ID_REFRESH_LABEL'), _('ID_REFRESH_MESSAGE')); } } }); diff --git a/workflow/engine/templates/cases/casesStartPage.js b/workflow/engine/templates/cases/casesStartPage.js index f9399b193..4dd78f918 100755 --- a/workflow/engine/templates/cases/casesStartPage.js +++ b/workflow/engine/templates/cases/casesStartPage.js @@ -144,7 +144,7 @@ Ext.extend( }, failure : function() { dashboardTabPanels.activateDefaultTab(); - Ext.Msg.alert('Status', 'Unable to get Dashboards'); + Ext.Msg.alert( _('ID_STATUS'), _('ID_UNABLE_GET_DASHBOARDS')); } }); } diff --git a/workflow/engine/templates/cases/casesToRevisePanel.js b/workflow/engine/templates/cases/casesToRevisePanel.js index ed739b915..c120fcb62 100755 --- a/workflow/engine/templates/cases/casesToRevisePanel.js +++ b/workflow/engine/templates/cases/casesToRevisePanel.js @@ -20,7 +20,7 @@ var tree = new Ext.tree.TreePanel({ dataUrl: casesPanelUrl, root: { nodeType : 'async', - text : 'To Revise', + text : _('ID_TO_REVISE'), id : 'node-root' }, listeners: { diff --git a/workflow/engine/templates/cases/casesUploadedDocumentsPage.js b/workflow/engine/templates/cases/casesUploadedDocumentsPage.js index 7aa1d23cb..494da7e2d 100644 --- a/workflow/engine/templates/cases/casesUploadedDocumentsPage.js +++ b/workflow/engine/templates/cases/casesUploadedDocumentsPage.js @@ -168,7 +168,7 @@ } } if (!http_request){ - alert('This browser is not supported.'); + alert( _('ID_BROWSER_NOT_SUPPORTED') ); return false; } @@ -215,7 +215,7 @@ } } if (!http_request){ - alert('This browser is not supported.'); + alert( _('ID_BROWSER_NOT_SUPPORTED') ); return false; } @@ -253,7 +253,7 @@ document.location = document.location; } else{ - Ext.Msg.alert('Refresh', 'You clicked: CTRL-F5'); + Ext.Msg.alert(_('ID_REFRESH_LABEL'), _('ID_REFRESH_MESSAGE')); } } @@ -474,7 +474,7 @@ uploadDocumentGridDownload(); }, render: function(){ - this.loadMask = new Ext.LoadMask(this.body, {msg:'Loading...'}); + this.loadMask = new Ext.LoadMask(this.body, {msg:_('ID_LOADING')}); processesGrid.getSelectionModel().on('rowselect', function() { var rowSelected = processesGrid.getSelectionModel().getSelected(); }); diff --git a/workflow/engine/templates/cases/main.js b/workflow/engine/templates/cases/main.js index 5aca56529..5ad3f6b51 100755 --- a/workflow/engine/templates/cases/main.js +++ b/workflow/engine/templates/cases/main.js @@ -33,7 +33,8 @@ Ext.onReady(function(){ updateCasesTree(); } else - Ext.Msg.alert('Refresh', 'You clicked: CTRL-F5'); + //Ext.Msg.alert('Refresh', 'You clicked: CTRL-F5'); + Ext.Msg.alert(_('ID_REFRESH_LABEL'),_('ID_REFRESH_MESSAGE')); } }); @@ -131,7 +132,7 @@ Ext.onReady(function(){ }, render: function(){ - this.loadMask = new Ext.LoadMask(this.body, { msg:'Loading...' }); + this.loadMask = new Ext.LoadMask(this.body, { msg:_('ID_LOADING_GRID') }); } } }); @@ -398,7 +399,7 @@ Ext.onReady(function(){ items: [], listeners:{ show:function() { - this.loadMask = new Ext.LoadMask(this.body, { msg:'Loading. Please wait...' }); + this.loadMask = new Ext.LoadMask(this.body, { msg:_('ID_LOADING') }); } } }); diff --git a/workflow/engine/templates/cases/open.js b/workflow/engine/templates/cases/open.js index 1c20dffec..1ddef4aec 100755 --- a/workflow/engine/templates/cases/open.js +++ b/workflow/engine/templates/cases/open.js @@ -251,7 +251,7 @@ Ext.onReady(function(){ title: _('ID_CASE') +' ' + _APP_NUM, frameConfig:{name:'openCaseFrame', id:'openCaseFrame'}, defaultSrc : uri, - loadMask:{msg:_('ID_LOADING_GRID')+'...'}, + loadMask:{msg: _('ID_LOADING_GRID') }, bodyStyle:{height: (PMExt.getBrowser().screen.height-60) + 'px', overflow:'auto'}, width:screenWidth @@ -390,7 +390,7 @@ Ext.onReady(function(){ win.show(); }, failure: function ( result, request) { - Ext.MessageBox.alert('Failed', result.responseText); + Ext.MessageBox.alert( _('ID_FAILED') , result.responseText); } }); } @@ -449,7 +449,7 @@ Ext.onReady(function(){ win.show(); }, failure: function ( result, request) { - Ext.MessageBox.alert('Failed', result.responseText); + Ext.MessageBox.alert( _('ID_FAILED'), result.responseText); } }); } @@ -538,12 +538,12 @@ Ext.onReady(function(){ location.href = 'casesListExtJs'; }, failure: function ( result, request) { - Ext.MessageBox.alert('Failed', result.responseText); + Ext.MessageBox.alert( _('ID_FAILED'), result.responseText); } }); } },{ - text: 'Cancel', + text: _('ID_CANCEL'), handler: function(){ msgCancel.close(); } @@ -655,7 +655,7 @@ Ext.onReady(function(){ } }, failure: function ( result, request) { - Ext.MessageBox.alert('Failed', result.responseText); + Ext.MessageBox.alert( _('ID_FAILED') , result.responseText); } }); }); @@ -686,7 +686,7 @@ Ext.onReady(function(){ new Ext.form.DateField({ id: 'unpauseDate', format: 'Y-m-d', - fieldLabel: 'Unpause Date', + fieldLabel: _('ID_UNPAUSE_DATE'), name: 'unpauseDate', allowBlank: false, value: filterDate, @@ -714,7 +714,7 @@ Ext.onReady(function(){ handler : Actions.pauseCase, disabled:false },{ - text : 'Cancel', + text : _('ID_CANCEL'), handler : function() { win.close(); } @@ -732,7 +732,7 @@ Ext.onReady(function(){ var win = new Ext.Window({ - title: 'Pause Case', + title: _('ID_PAUSE_CASE'), width: 370, height: 230, layout:'fit', @@ -772,18 +772,18 @@ Ext.onReady(function(){ NOTE_REASON: noteReasonTxt, NOTIFY_PAUSE: notifyReasonVal }, - waitMsg:'Pausing Case '+parent._CASE_TITLE+'...', + waitMsg: _('ID_PAUSING_CASE')+parent._CASE_TITLE+'...', timeout : 36000, success : function(res, req) { if(req.result.success) { try { - parent.notify('PAUSE CASE', req.result.msg); + parent.notify( _('ID_PAUSE_CASE') , req.result.msg); } catch (e) { } location.href = 'casesListExtJs'; } else { - PMExt.error(_('ID_ERROR'), req.result.msg); + PMExt.error( _('ID_ERROR'), req.result.msg); } } }); @@ -792,7 +792,7 @@ Ext.onReady(function(){ Actions.unpauseCase = function() { PMExt.confirm(_('ID_CONFIRM'), _('ID_CONFIRM_UNPAUSE_CASE'), function(){ - var loadMask = new Ext.LoadMask(document.body, {msg:'Unpausing case...'}); + var loadMask = new Ext.LoadMask(document.body, {msg: _('ID_UNPAUSING_CASE') }); loadMask.show(); Ext.Ajax.request({ @@ -813,7 +813,7 @@ Ext.onReady(function(){ } }, failure: function ( result, request) { - Ext.MessageBox.alert('Failed', result.responseText); + Ext.MessageBox.alert( _('ID_FAILED') , result.responseText); } }); }); @@ -822,7 +822,7 @@ Ext.onReady(function(){ Actions.deleteCase = function() { PMExt.confirm(_('ID_CONFIRM'), _('ID_CONFIRM_DELETE_CASE'), function(){ - var loadMask = new Ext.LoadMask(document.body, {msg:'Deleting case...'}); + var loadMask = new Ext.LoadMask(document.body, {msg: _('ID_DELETING_CASE') }); loadMask.show(); Ext.Ajax.request({ url : '../adhocUserProxy/deleteCase', @@ -841,7 +841,7 @@ Ext.onReady(function(){ } }, failure: function ( result, request) { - Ext.MessageBox.alert('Failed', result.responseText); + Ext.MessageBox.alert( _('ID_FAILED'), result.responseText); } }); }); @@ -850,7 +850,7 @@ Ext.onReady(function(){ Actions.reactivateCase = function() { PMExt.confirm(_('ID_CONFIRM'), _('ID_CONFIRM_REACTIVATE_CASE'), function(){ - var loadMask = new Ext.LoadMask(document.body, {msg:'Reactivating case...'}); + var loadMask = new Ext.LoadMask(document.body, {msg: _('ID_REACTIVATING_CASE') }); loadMask.show(); Ext.Ajax.request({ url : 'ajaxListener' , @@ -870,7 +870,7 @@ Ext.onReady(function(){ } }, failure: function ( result, request) { - Ext.MessageBox.alert('Failed', result.responseText); + Ext.MessageBox.alert( _('ID_FAILED'), result.responseText); } }); }); @@ -1007,7 +1007,7 @@ Ext.onReady(function(){ title: menuSelectedTitle[name], frameConfig:{name: name + 'Frame', id: name + 'Frame'}, defaultSrc : uri, - loadMask:{msg:_('ID_LOADING_GRID')+'...'}, + loadMask:{msg:_('ID_LOADING_GRID')}, autoWidth: true, closable:true, autoScroll: true, @@ -1054,7 +1054,7 @@ Ext.onReady(function(){ pageSize: 8, store: store, displayInfo: true, - displayMsg: 'Displaying Users {0} - {1} of {2}', + displayMsg: _('ID_GRID_PAGE_DISPLAYING_USERS_MESSAGE'), emptyMsg: "", items:[] }); @@ -1107,7 +1107,7 @@ Ext.onReady(function(){ { rowSelected = adHocUserGrid.getSelectionModel().getSelected(); PMExt.confirm(_('ID_CONFIRM'), _('ID_CONFIRM_ADHOCUSER_CASE'), function(){ - var loadMask = new Ext.LoadMask(document.body, {msg:'Assignment case...'}); + var loadMask = new Ext.LoadMask(document.body, {msg:_('ID_ASSIGNMENT_CASE')}); loadMask.show(); Ext.Ajax.request({ url : '../adhocUserProxy/reassignCase' , @@ -1125,7 +1125,7 @@ Ext.onReady(function(){ } }, failure: function ( result, request) { - Ext.MessageBox.alert('Failed', result.responseText); + Ext.MessageBox.alert(_('ID_FAILED'), result.responseText); } }); }); diff --git a/workflow/engine/templates/dashboard/dashletInstanceForm.js b/workflow/engine/templates/dashboard/dashletInstanceForm.js index 00ffabee9..75e1250a4 100644 --- a/workflow/engine/templates/dashboard/dashletInstanceForm.js +++ b/workflow/engine/templates/dashboard/dashletInstanceForm.js @@ -123,7 +123,7 @@ Ext.onReady(function() { }, failure: function (result, request) { myMask.hide(); - Ext.MessageBox.alert('Alert', 'Ajax communication failed'); + Ext.MessageBox.alert(_('ID_ALERT'), _('ID_AJAX_COMMUNICATION_FAILED')); } }); } @@ -208,7 +208,7 @@ Ext.onReady(function() { text: _('ID_SAVE'), handler: function () { if (dashletInstanceFrm.getForm().isValid()) { - var myMask = new Ext.LoadMask(Ext.getBody(), {msg: 'Saving. Please wait...'}); + var myMask = new Ext.LoadMask(Ext.getBody(), {msg: _('ID_SAVING_LABEL') + '.' + _('ID_PLEASE_WAIT') }); myMask.show(); Ext.Ajax.request({ url: 'saveDashletInstance', diff --git a/workflow/engine/templates/dashboard/dashletsList.js b/workflow/engine/templates/dashboard/dashletsList.js index bd3e3f56f..e44fa3bb0 100644 --- a/workflow/engine/templates/dashboard/dashletsList.js +++ b/workflow/engine/templates/dashboard/dashletsList.js @@ -9,7 +9,7 @@ new Ext.KeyMap(document, [{ document.location = document.location; } else { - Ext.Msg.alert('Refresh', 'You clicked: CTRL-F5'); + Ext.Msg.alert(_('ID_REFRESH_LABEL'), _('ID_REFRESH_MESSAGE')); } } }, diff --git a/workflow/engine/templates/dashboard/index.js b/workflow/engine/templates/dashboard/index.js index 714c89990..179b42b73 100644 --- a/workflow/engine/templates/dashboard/index.js +++ b/workflow/engine/templates/dashboard/index.js @@ -50,7 +50,7 @@ Ext.onReady(function(){ var tools = [{ id:'gear', handler: function(){ - Ext.Msg.alert('Message', 'The Settings tool was clicked.'); + Ext.Msg.alert(_('ID_MESSAGE'), _('ID_SETTING_MESSAGE')); } },{ id:'close', diff --git a/workflow/engine/templates/departments/departmentList.js b/workflow/engine/templates/departments/departmentList.js index 7e6f0533d..1fad94584 100755 --- a/workflow/engine/templates/departments/departmentList.js +++ b/workflow/engine/templates/departments/departmentList.js @@ -37,7 +37,7 @@ new Ext.KeyMap(document, e.stopEvent(); document.location = document.location; }else{ - Ext.Msg.alert('Refresh', 'You clicked: CTRL-F5'); + Ext.Msg.alert(_('ID_REFRESH_LABEL'), _('ID_REFRESH_MESSAGE')); } } }, @@ -182,8 +182,8 @@ Ext.onReady(function() { , { xtype: 'combo', - fieldLabel: 'Manager', - hiddenName: 'manager', + fieldLabel: _('ID_MANAGER'), + hiddenName: _('ID_MANAGER'), typeAhead: true, mode: 'local', store: comboDepManager, @@ -203,7 +203,7 @@ Ext.onReady(function() { }); rootNode = new Ext.tree.AsyncTreeNode({ - text:'Departments' + text: _('ID_DEPARTMENTS') }); treePanel = new Ext.ux.tree.TreeGrid({ diff --git a/workflow/engine/templates/departments/departmentUsers.js b/workflow/engine/templates/departments/departmentUsers.js index c2c2d2069..76833d68d 100755 --- a/workflow/engine/templates/departments/departmentUsers.js +++ b/workflow/engine/templates/departments/departmentUsers.js @@ -15,7 +15,7 @@ new Ext.KeyMap(document, { e.stopEvent(); document.location = document.location; }else{ - Ext.Msg.alert('Refresh', 'You clicked: CTRL-F5'); + Ext.Msg.alert(_('ID_REFRESH_LABEL'), _('ID_REFRESH_MESSAGE')); } } }); @@ -200,12 +200,12 @@ Ext.onReady(function(){ }); availableGrid = new Ext.grid.GridPanel({ - layout : 'fit', + layout : 'fit', title : _('ID_AVAILABLE_USERS'), - region : 'center', - ddGroup : 'assignedGridDDGroup', - store : storeA, - cm : cmodelP, + region : 'center', + ddGroup : 'assignedGridDDGroup', + store : storeA, + cm : cmodelP, sm : smodelA, enableDragDrop : true, stripeRows : true, @@ -305,8 +305,6 @@ Ext.onReady(function(){ tbar: [''+_('ID_DEPARTMENT') + ' : ' + DEPARTMENT.DEP_TITLE + '',{xtype: 'tbfill'},backButton] }); - - //LOAD ALL PANELS viewport = new Ext.Viewport({ layout: 'border', @@ -534,7 +532,7 @@ UpdateSupervisor = function(){ render_status = function(v){ switch(v){ case 'ACTIVE': return '' + _('ID_ACTIVE') + ''; break; - case 'INACTIVE': return '' + _('ID_INACTIVE') + '';; break; - case 'VACATION': return '' + _('ID_VACATION') + '';; break; + case 'INACTIVE': return '' + _('ID_INACTIVE') + ''; break; + case 'VACATION': return '' + _('ID_VACATION') + ''; break; } }; \ No newline at end of file diff --git a/workflow/engine/templates/events/eventList.js b/workflow/engine/templates/events/eventList.js index bac4cb99f..238b5c899 100644 --- a/workflow/engine/templates/events/eventList.js +++ b/workflow/engine/templates/events/eventList.js @@ -14,7 +14,7 @@ new Ext.KeyMap(document, [{ e.stopEvent(); document.location = document.location; } else { - Ext.Msg.alert('Refresh', 'You clicked: CTRL-F5'); + Ext.Msg.alert(_('ID_REFRESH_LABEL'), _('ID_REFRESH_MESSAGE')); } } } @@ -64,10 +64,10 @@ Ext.onReady(function(){ boxMaxWidth : 90, editable : false, mode : 'local', - emptyText: _('ID_SELECT_STATUS'), + emptyText : _('ID_SELECT_STATUS'), store : new Ext.data.ArrayStore({ - fields: ['id', 'value'], - data : statusValues + fields : ['id', 'value'], + data : statusValues }), valueField : 'id', displayField : 'value', @@ -91,7 +91,7 @@ Ext.onReady(function(){ boxMaxWidth : 150, editable : false, mode : 'local', - emptyText: _('ID_EMPTY_TYPE'), + emptyText : _('ID_EMPTY_TYPE'), store : new Ext.data.ArrayStore({ fields: ['id', 'value'], data : typeValues diff --git a/workflow/engine/templates/groups/groupsList.js b/workflow/engine/templates/groups/groupsList.js index 5c555d21e..157290fa4 100755 --- a/workflow/engine/templates/groups/groupsList.js +++ b/workflow/engine/templates/groups/groupsList.js @@ -18,7 +18,7 @@ new Ext.KeyMap(document, e.stopEvent(); document.location = document.location; }else{ - Ext.Msg.alert('Refresh', 'You clicked: CTRL-F5'); + Ext.Msg.alert(_('ID_REFRESH_LABEL'), _('ID_REFRESH_MESSAGE')); } } } diff --git a/workflow/engine/templates/groups/groupsMembers.js b/workflow/engine/templates/groups/groupsMembers.js index 0ba67ad6b..249c3c7a2 100755 --- a/workflow/engine/templates/groups/groupsMembers.js +++ b/workflow/engine/templates/groups/groupsMembers.js @@ -16,7 +16,7 @@ new Ext.KeyMap(document, { e.stopEvent(); document.location = document.location; }else{ - Ext.Msg.alert('Refresh', 'You clicked: CTRL-F5'); + Ext.Msg.alert(_('ID_REFRESH_LABEL'), _('ID_REFRESH_MESSAGE')); } } }); @@ -209,7 +209,7 @@ Ext.onReady(function(){ store : storeA, displayInfo : true, displayMsg : '{0} - {1} of {2}', - emptyMsg : 'No records', + emptyMsg : _('ID_NO_RECORDS_FOUND') , items: ['-', _('ID_PAGE_SIZE')+':', comboPageSizeAvailable ] }); @@ -270,7 +270,7 @@ Ext.onReady(function(){ store : storeP, displayInfo : true, displayMsg : '{0} - {1} of {2}', - emptyMsg : 'No records', + emptyMsg : _('ID_NO_RECORDS_FOUND'), items: ['-', _('ID_PAGE_SIZE')+':', comboPageSizeAssigned ] }); diff --git a/workflow/engine/templates/installer/newSite.js b/workflow/engine/templates/installer/newSite.js index 36c249cb4..046070000 100644 --- a/workflow/engine/templates/installer/newSite.js +++ b/workflow/engine/templates/installer/newSite.js @@ -95,7 +95,7 @@ Ext.onReady(function(){ url: 'newSite', success: function(response){ var existMsg = '(Exists)'; - var noExistsMsg = '(No exists)'; + var noExistsMsg = '(Not Exist)'; var response = Ext.util.JSON.decode(response.responseText); Ext.get('wfDatabaseSpan').dom.innerHTML = (response.wfDatabaseExists ? existMsg : noExistsMsg); Ext.get('rbDatabaseSpan').dom.innerHTML = (response.rbDatabaseExists ? existMsg : noExistsMsg); @@ -139,12 +139,12 @@ Ext.onReady(function(){ }); steps[setIndex++] = new Ext.ux.Wiz.Card({ - title: 'Database Configuration', + title: 'Database Configuration' , monitorValid: false, items: [ { border: false, - html: 'Database Configuration', + html: 'Database Configuration' , bodyStyle: 'background:none;padding-top:0px;padding-bottom:5px;font-weight:bold;font-size:1.3em;' }, { @@ -255,7 +255,7 @@ Ext.onReady(function(){ id: 'db_message' }, new Ext.Button({ - text: ' Test Connection', + text: 'Test Connection', handler: testConnection, scope: this }) @@ -392,7 +392,7 @@ Ext.onReady(function(){ }), { xtype: 'textfield', - fieldLabel: 'Workflow Database Name ', + fieldLabel: 'Workflow Database Name' + '', id: 'wfDatabase', value:'wf_workflow', allowBlank: false, @@ -442,7 +442,7 @@ Ext.onReady(function(){ }} }, new Ext.form.Checkbox({ - boxLabel: "Delete Databases if exists", + boxLabel: 'Delete Databases if exists', id: 'deleteDB', handler: function() { wizard.onClientValidation(2, false); @@ -454,7 +454,7 @@ Ext.onReady(function(){ }, new Ext.Button({ id: 'checkWSConfiguration', - text: ' Check Workspace Configuration', + text: 'Check Workspace Configuration', handler: checkWorkspaceConfiguration, scope: this }) @@ -509,7 +509,7 @@ Ext.onReady(function(){ 'action': 'createWorkspace', 'db_engine': Ext.getCmp('db_engine').getValue(), 'db_hostname': Ext.getCmp('db_hostname').getValue(), - 'db_username': Ext.getCmp('db_username').getValue(), + 'db_username': Ext.getCmp('db_username').getValue(), 'db_password': Ext.getCmp('db_password').getValue(), 'db_port': Ext.getCmp('db_port').getValue(), 'pathConfig': pathConfig, diff --git a/workflow/engine/templates/mails/emailList.js b/workflow/engine/templates/mails/emailList.js index eb2a0b2b1..05d3f0bf2 100644 --- a/workflow/engine/templates/mails/emailList.js +++ b/workflow/engine/templates/mails/emailList.js @@ -14,7 +14,7 @@ new Ext.KeyMap(document, [{ e.stopEvent(); document.location = document.location; } else { - Ext.Msg.alert('Refresh', 'You clicked: CTRL-F5'); + Ext.Msg.alert(_('ID_REFRESH_LABEL'), _('ID_REFRESH_MESSAGE')); } } } diff --git a/workflow/engine/templates/main/login.js b/workflow/engine/templates/main/login.js index ee2121609..0c20b8a23 100644 --- a/workflow/engine/templates/main/login.js +++ b/workflow/engine/templates/main/login.js @@ -62,7 +62,7 @@ var Login = function() { Ext.getCmp('userTxt').focus(true, 1000); if (typeof errMsg != 'undefined') { - Ext.msgBoxSlider.msgTopCenter('alert', 'ERROR', errMsg, 10); + Ext.msgBoxSlider.msgTopCenter('alert', _('ID_ERROR') , errMsg, 10); } if (typeof flyNotify != 'undefined') { @@ -369,7 +369,7 @@ Login.initComponents = function() { xtype: 'iframepanel', defaultSrc : '../services/login_getStarted.php', - loadMask:{msg:_('ID_LOADING')+'...'}, + loadMask:{msg:_('ID_LOADING')}, bodyStyle:{height: (PMExt.getBrowser().screen.height-60) + 'px', overflow:'auto'}, width:588 } @@ -419,7 +419,7 @@ Login.sendFpRequest = function() Login.forgotPasswordForm.getForm().submit({ method: 'POST', waitTitle: '', - waitMsg: 'Sending Request...', + waitMsg: _('ID_SENDING_REQUEST'), success: function(form, action) { serverResponse = Ext.util.JSON.decode(action.response.responseText); diff --git a/workflow/engine/templates/main/sysLogin.js b/workflow/engine/templates/main/sysLogin.js index 17373a7ba..e6d67fe2f 100644 --- a/workflow/engine/templates/main/sysLogin.js +++ b/workflow/engine/templates/main/sysLogin.js @@ -325,7 +325,7 @@ Login.submit = function() //Ext.msgBoxSlider.msgTopCenter('alert', 'LOGIN ERROR', serverResponse.message, 10); } else { - Ext.Msg.alert('ERROR', _('ID_SERVER_PROBLEM') + ' ' + action.response.responseText); + Ext.Msg.alert( _('ID_ERROR'), _('ID_SERVER_PROBLEM') + ' ' + action.response.responseText); } //Login.form.getForm().reset(); } diff --git a/workflow/engine/templates/pmTables/data.js b/workflow/engine/templates/pmTables/data.js index 59232f8f2..eb7ffacd6 100755 --- a/workflow/engine/templates/pmTables/data.js +++ b/workflow/engine/templates/pmTables/data.js @@ -58,7 +58,7 @@ Ext.onReady(function(){ }); genDataReportButton = new Ext.Action({ - text: 'Regenerate Data Report', + text: _('ID_REGENERATE_DATA_REPORT'), iconCls: 'silk-add', icon: '/images/database-tool.png', handler: genDataReport, @@ -464,8 +464,8 @@ ImportPMTableCSV = function(){ items : [{ xtype : 'fileuploadfield', id : 'csv-file', - emptyText : 'Select a file', - fieldLabel : 'CSV File', + emptyText : _('ID_SELECT_FILE'), + fieldLabel : _('ID_CSV_FILE'), name : 'form[CSV_FILE]', buttonText : '', buttonCfg : { @@ -474,7 +474,7 @@ ImportPMTableCSV = function(){ }, { xtype : 'combo', id : 'csv-delimiter', - fieldLabel : 'Delimited by', + fieldLabel : _('ID_DELIMITED_BY'), hiddenName : 'form[CSV_DELIMITER]', mode : 'local', store : comboDelimiter, @@ -501,7 +501,7 @@ ImportPMTableCSV = function(){ if(uploader.getForm().isValid()){ uploader.getForm().submit({ url : '../pmTablesProxy/importCSV', - waitMsg : 'Uploading file...', + waitMsg : _('ID_UPLOADING_FILE'), success : function(o, resp){ w.close(); infoGrid.store.reload(); @@ -576,7 +576,7 @@ ExportPMTableCSV = function(){ items : [{ xtype : 'combo', id : 'csv_delimiter', - fieldLabel : 'Delimited by', + fieldLabel : _('ID_DELIMITED_BY'), hiddenName : 'form[CSV_DELIMITER]', mode : 'local', store : comboDelimiter, diff --git a/workflow/engine/templates/pmTables/edit.js b/workflow/engine/templates/pmTables/edit.js index 0030798a6..1e4bb7074 100755 --- a/workflow/engine/templates/pmTables/edit.js +++ b/workflow/engine/templates/pmTables/edit.js @@ -212,8 +212,8 @@ Ext.onReady(function(){ dataIndex: 'field_null', align: 'center', width: 50, - trueText: 'Yes', - falseText: 'No', + trueText: _('ID_YES'), + falseText: _('ID_NO'), editor: { xtype: 'checkbox' } @@ -223,8 +223,8 @@ Ext.onReady(function(){ dataIndex: 'field_key', align: 'center', width: 80, - trueText: 'Yes', - falseText: 'No', + trueText: _('ID_YES'), + falseText: _('ID_NO'), editor: { xtype: 'checkbox' } @@ -234,8 +234,8 @@ Ext.onReady(function(){ dataIndex: 'field_autoincrement', align: 'center', width: 80, - trueText: 'Yes', - falseText: 'No', + trueText: _('ID_YES'), + falseText: _('ID_NO'), editor: { xtype: 'checkbox' } @@ -250,8 +250,8 @@ Ext.onReady(function(){ dataIndex: 'field_filter', align: 'center', width: 50, - trueText: 'Yes', - falseText: 'No', + trueText: _('ID_YES'), + falseText: _('ID_NO'), editor: { xtype: 'checkbox' } @@ -786,7 +786,7 @@ function createReportTable() if (dbg) { _showDebugWin(resp.responseText); } else { - PMExt.error('ERROR', 'Something was wrong.'); + PMExt.error( _('ID_ERROR'), _('ID_SOMETHING_WRONG')); } } }, @@ -1003,8 +1003,8 @@ var DDLoadFields = function(){ var meta = mapPMFieldType(records[i].data['FIELD_UID']); var row = new PMRow({ uid : '', - field_uid : records[i].data['FIELD_UID'], - field_dyn : records[i].data['FIELD_NAME'], + field_uid : records[i].data['FIELD_UID'], + field_dyn : records[i].data['FIELD_NAME'], field_name : records[i].data['FIELD_NAME'].toUpperCase(), field_label : records[i].data['FIELD_NAME'].toUpperCase(), field_type : meta.type, diff --git a/workflow/engine/templates/pmTables/editReport.js b/workflow/engine/templates/pmTables/editReport.js index 378cfa521..9c67d77b7 100755 --- a/workflow/engine/templates/pmTables/editReport.js +++ b/workflow/engine/templates/pmTables/editReport.js @@ -17,11 +17,11 @@ var removeButton; var removeAllButton; var tmp1 = new Array(); var pageSize = 50; -var mainMask = new Ext.LoadMask(Ext.getBody(), {msg:"Please wait..."}); +var mainMask = new Ext.LoadMask(Ext.getBody(), {msg: _('ID_PLEASE_WAIT') }); var bbarpaging; //main Ext.onReady(function(){ - mainMask = new Ext.LoadMask(Ext.getBody(), {msg:"Please wait..."}); + mainMask = new Ext.LoadMask(Ext.getBody(), {msg: _('ID_PLEASE_WAIT') }); var fm = Ext.form; var fieldsCount = 0; @@ -135,7 +135,7 @@ Ext.onReady(function(){ store: storeA, displayInfo: true, displayMsg: '{0} - {1} of {2}', - emptyMsg: 'No records'/*, + emptyMsg: _('ID_NO_RECORDS')/*, items: ['-',_('ID_PAGE_SIZE')+':',comboPageSize]*/ }); @@ -339,8 +339,8 @@ Ext.onReady(function(){ dataIndex: 'field_autoincrement', align: 'center', width: 100, - trueText: 'Yes', - falseText: 'No', + trueText: _('ID_YES'), + falseText: _('ID_NO'), editor: { xtype: 'checkbox' } @@ -355,8 +355,8 @@ Ext.onReady(function(){ dataIndex: 'field_filter', align: 'center', width: 50, - trueText: 'Yes', - falseText: 'No', + trueText: _('ID_YES'), + falseText: _('ID_NO'), editor: { xtype: 'checkbox' } @@ -424,7 +424,7 @@ Ext.onReady(function(){ sm : sm, store : store, plugins : [editor, checkColumn], - loadMask: {message:'Loading...'}, + loadMask: {message: _('ID_LOADING_GRID')}, tbar : [ { icon: '/images/add-row-after.png', @@ -893,7 +893,6 @@ Ext.onReady(function(){ if(TABLE.ADD_TAB_TYPE != 'GRID') loadFieldNormal(); } - } DDLoadFields(); diff --git a/workflow/engine/templates/pmTables/export.js b/workflow/engine/templates/pmTables/export.js index 35811ab92..ecebdf675 100755 --- a/workflow/engine/templates/pmTables/export.js +++ b/workflow/engine/templates/pmTables/export.js @@ -166,7 +166,7 @@ Export.submit = function() if (result.success) { location.href = result.link; } else { - PMExt.error(_('ID_ERROR', result.message)); + PMExt.error(_('ID_ERROR'), result.message)); } }, failure: function(obj, resp){ diff --git a/workflow/engine/templates/pmTables/list.js b/workflow/engine/templates/pmTables/list.js index 41f5a2bb5..c2b8e3849 100755 --- a/workflow/engine/templates/pmTables/list.js +++ b/workflow/engine/templates/pmTables/list.js @@ -31,7 +31,7 @@ Ext.onReady(function(){ document.location = document.location; } else{ - Ext.Msg.alert('Refresh', 'You clicked: CTRL-F5'); + Ext.Msg.alert( _('ID_REFRESH_LABEL') , _('ID_REFRESH_MESSAGE') ); } } }); @@ -262,7 +262,7 @@ Ext.onReady(function(){ cmodelColumns.push({id:'ADD_TAB_UID', dataIndex: 'ADD_TAB_UID', hidden:true, hideable:false}); cmodelColumns.push({dataIndex: 'ADD_TAB_TAG', hidden:true, hideable:false}); cmodelColumns.push({header: _('ID_NAME'), dataIndex: 'ADD_TAB_NAME', width: 300, align:'left', renderer: function(v,p,r){ - return r.get('TYPE') == 'CLASSIC'? v + ' (old version)' : v; + return r.get('TYPE') == 'CLASSIC'? v + ' ('+ _('ID_OLD_VERSION') +')' : v; }}); cmodelColumns.push({header: _('ID_DESCRIPTION'), dataIndex: 'ADD_TAB_DESCRIPTION', width: 400, hidden:false, align:'left', renderer: function(v,p,r){ if (r.get('ADD_TAB_TAG')) { @@ -285,7 +285,7 @@ Ext.onReady(function(){ cmodelColumns.push({dataIndex: "DBS_UID", hidden: true, hideable: false}); - cmodelColumns.push({header: 'Records', dataIndex: 'NUM_ROWS', width: 90, align:'left'}); + cmodelColumns.push({header: _('ID_RECORDS'), dataIndex: 'NUM_ROWS', width: 90, align:'left'}); if (PRO_UID === false) { cmodelColumns.push({header: _('ID_PROCESS'), dataIndex: 'PRO_TITLE', width: 180, align:'left'}); @@ -345,7 +345,7 @@ Ext.onReady(function(){ listeners: { rowdblclick: EditPMTable, render: function(){ - this.loadMask = new Ext.LoadMask(this.body, {msg:'loading'}); + this.loadMask = new Ext.LoadMask(this.body, {msg: _('ID_LOADING_GRID')}); } }, view: new Ext.grid.GroupingView({ diff --git a/workflow/engine/templates/processCategory/processCategoryList.js b/workflow/engine/templates/processCategory/processCategoryList.js index b9d93cc2f..3f95a7dfb 100755 --- a/workflow/engine/templates/processCategory/processCategoryList.js +++ b/workflow/engine/templates/processCategory/processCategoryList.js @@ -17,7 +17,7 @@ new Ext.KeyMap(document, [ e.stopEvent(); document.location = document.location; }else{ - Ext.Msg.alert('Refresh', 'You clicked: CTRL-F5'); + Ext.Msg.alert( _('ID_REFRESH_LABEL') , _('ID_REFRESH_MESSAGE') ); } } }, diff --git a/workflow/engine/templates/processes/main.js b/workflow/engine/templates/processes/main.js index e4e521a03..0bacbb63d 100755 --- a/workflow/engine/templates/processes/main.js +++ b/workflow/engine/templates/processes/main.js @@ -26,7 +26,7 @@ new Ext.KeyMap(document, { document.location = document.location; } else - Ext.Msg.alert('Refresh', 'You clicked: CTRL-F5'); + Ext.Msg.alert( _('ID_REFRESH_LABEL') , _('ID_REFRESH_MESSAGE') ); } }); @@ -627,7 +627,7 @@ deleteProcess = function(){ errMsg += e + '
'; } Ext.MessageBox.show({ - title: 'Error', + title: _('ID_ERROR'), msg: errMsg, buttons: Ext.MessageBox.OK, icon: Ext.MessageBox.ERROR diff --git a/workflow/engine/templates/reportTables/edit.js b/workflow/engine/templates/reportTables/edit.js index eee498403..80183d033 100755 --- a/workflow/engine/templates/reportTables/edit.js +++ b/workflow/engine/templates/reportTables/edit.js @@ -221,12 +221,12 @@ Ext.onReady(function(){ if (TABLE !== false && TABLE.ADD_TAB_TAG == 'plugin@simplereport') { cmColumns.push({ xtype: 'booleancolumn', - header: 'Filter', + header: _('ID_FILTER'), dataIndex: 'field_filter', align: 'center', width: 50, - trueText: 'Yes', - falseText: 'No', + trueText: _('ID_YES'), + falseText: _('ID_NO'), editor: { xtype: 'checkbox' } @@ -739,9 +739,6 @@ Ext.onReady(function(){ }); - - - ////////////////////////////////////////////////////////////////////////////////////////// function createReportTable() @@ -769,12 +766,12 @@ function createReportTable() //row.data['FIELD_FILTER'] = typeof(row.data['FIELD_FILTER']) != 'undefined' && row.data['FIELD_FILTER'] ? true : false; if(row.data['field_name'].trim() == '') { - PMExt.error(_('ID_ERROR'), 'Field Name for "'+row.data['field_dyn']+'" is required.'); + PMExt.error(_('ID_ERROR'), _('ID_FIELD_NAME_FOR')+'"'+row.data['field_dyn']+'"'+ _('ID_IS_REQUIRED')); return false; } if((row.data['field_type'] == 'VARCHAR' || row.data['field_type'] == 'INT') && row.data['field_name'] == '') { - PMExt.error(_('ID_ERROR'), 'Field size for "'+row.data['field_type']+'": '+row.data['field_name']+'" please.'); + PMExt.error(_('ID_ERROR'), _('ID_FIELD_SIZE_FOR')+'"'+row.data['field_type']+'": '+row.data['field_name']+'"'+ _('ID_PLEASE')); return false; } @@ -928,12 +925,12 @@ saveReportTables = function(){ row.data['FIELD_FILTER'] = typeof(row.data['FIELD_FILTER']) != 'undefined' && row.data['FIELD_FILTER'] ? true : false; if(row.data['FIELD_NAME'].trim() == '') { - PMExt.error(_('ID_ERROR'), 'Set a Phisical Field Name for "'+row.data['FIELD_DYNAFORM']+'" dynaform field please.'); + PMExt.error(_('ID_ERROR'), _('ID_PMTABLES_ALERT8') + '"'+row.data['FIELD_DYNAFORM']+'"'+_('ID_DYNAFORM_FIELD')+' '+ _('ID_PLEASE')); return false; } if((row.data['FIELD_TYPE'] == 'VARCHAR' || row.data['FIELD_TYPE'] == 'INT') && row.data['FIELD_SIZE'] == '') { - PMExt.error(_('ID_ERROR'), 'Set a field size for "'+row.data['FIELD_TYPE']+'": '+row.data['FIELD_NAME']+'" please.'); + PMExt.error(_('ID_ERROR'), _('ID_PMTABLES_ALERT5') + '"'+row.data['FIELD_TYPE']+'": '+row.data['FIELD_NAME'] + '"' + _('ID_PLEASE')); return false; } @@ -955,7 +952,7 @@ saveReportTables = function(){ data: Ext.util.JSON.encode(data) }, success: function(obj, resp){ - PMExt.notify('DONE', 'Report table saved Successfully'); + PMExt.notify( _('ID_DONE') , _('ID_REPORT_SAVE') ); Ext.getCmp('reportTableGrid').getStore().reload(); Ext.getCmp('newRepTab').close(); Ext.getCmp('winEditFields').close(); @@ -1046,7 +1043,7 @@ FailureFields = function(){ SaveFieldsReportTable = function(arr_avail, function_success, function_failure){ var sw_response; //Ext.MessageBox.show({ msg: 'Match Fields', wait:true,waitConfig: {interval:200} }); - lmask = new Ext.LoadMask(Ext.getBody(),{msg:'Processing...'}); + lmask = new Ext.LoadMask(Ext.getBody(),{msg:_('ID_PROCESSING')}); lmask.show(); Ext.Ajax.request({ diff --git a/workflow/engine/templates/reportTables/main.js b/workflow/engine/templates/reportTables/main.js index 9c0980403..ce7565bc2 100755 --- a/workflow/engine/templates/reportTables/main.js +++ b/workflow/engine/templates/reportTables/main.js @@ -16,7 +16,7 @@ new Ext.KeyMap(document, { e.stopEvent(); document.location = document.location; }else{ - Ext.Msg.alert('Refresh', 'You clicked: CTRL-F5'); + Ext.Msg.alert( _('ID_REFRESH_LABEL') , _('ID_REFRESH_MESSAGE') ); } } }); @@ -27,6 +27,7 @@ var editButton; var deleteButton; var importButton; var exportButton; + var dataButton; var store; diff --git a/workflow/engine/templates/roles/rolesList.js b/workflow/engine/templates/roles/rolesList.js index c7f9e37a7..a740677e0 100755 --- a/workflow/engine/templates/roles/rolesList.js +++ b/workflow/engine/templates/roles/rolesList.js @@ -18,7 +18,7 @@ new Ext.KeyMap(document, e.stopEvent(); document.location = document.location; }else{ - Ext.Msg.alert('Refresh', 'You clicked: CTRL-F5'); + Ext.Msg.alert( _('ID_REFRESH_LABEL') , _('ID_REFRESH_MESSAGE') ); } } }, diff --git a/workflow/engine/templates/roles/rolesUsersPermission.js b/workflow/engine/templates/roles/rolesUsersPermission.js index db7b0dcc6..55987347d 100755 --- a/workflow/engine/templates/roles/rolesUsersPermission.js +++ b/workflow/engine/templates/roles/rolesUsersPermission.js @@ -16,7 +16,7 @@ new Ext.KeyMap(document, { e.stopEvent(); document.location = document.location; }else{ - Ext.Msg.alert('Refresh', 'You clicked: CTRL-F5'); + Ext.Msg.alert( _('ID_REFRESH_LABEL'), _('ID_REFRESH_MESSAGE')); } } }); @@ -411,9 +411,9 @@ Ext.onReady(function(){ }); availableUGrid = new Ext.grid.GridPanel({ - layout : 'fit', - title: _('ID_AVAILABLE_USERS'), - region : 'center', + layout : 'fit', + title : _('ID_AVAILABLE_USERS'), + region : 'center', ddGroup : 'assignedUGridDDGroup', store : storeX, cm : cmodelU, @@ -439,9 +439,9 @@ Ext.onReady(function(){ }); assignedUGrid = new Ext.grid.GridPanel({ - layout : 'fit', - title: _('ID_ASSIGNED_USERS'), - ddGroup : 'availableUGridDDGroup', + layout : 'fit', + title : _('ID_ASSIGNED_USERS'), + ddGroup : 'availableUGridDDGroup', store : storeU, cm : cmodelU, sm : smodelU, diff --git a/workflow/engine/templates/setup/calendarList.js b/workflow/engine/templates/setup/calendarList.js index f37754e15..d7594108d 100755 --- a/workflow/engine/templates/setup/calendarList.js +++ b/workflow/engine/templates/setup/calendarList.js @@ -17,7 +17,7 @@ new Ext.KeyMap(document, [ e.stopEvent(); document.location = document.location; }else{ - Ext.Msg.alert('Refresh', 'You clicked: CTRL-F5'); + Ext.Msg.alert( _('ID_REFRESH_LABEL'), _('ID_REFRESH_MESSAGE')); } } } diff --git a/workflow/engine/templates/setup/clearCompiled.js b/workflow/engine/templates/setup/clearCompiled.js index 1eaaadf51..1276c488b 100644 --- a/workflow/engine/templates/setup/clearCompiled.js +++ b/workflow/engine/templates/setup/clearCompiled.js @@ -6,7 +6,7 @@ Ext.onReady(function() { { xtype : 'checkbox', name : 'javascriptCache', - fieldLabel : 'Terms of Use', + fieldLabel : _('ID_TERMS_USE'), hideLabel : true, id : 'javascriptCache', boxLabel : _('ID_JAVASCRIPT_CACHE'), @@ -17,7 +17,7 @@ Ext.onReady(function() { { xtype : 'checkbox', name : 'metadataCache', - fieldLabel : 'Terms of Use', + fieldLabel : _('ID_TERMS_USE'), hideLabel : true, id : 'metadataCache', boxLabel : _('ID_FORMS_METADATA_CACHE'), @@ -28,7 +28,7 @@ Ext.onReady(function() { { xtype : 'checkbox', name : 'htmlCache', - fieldLabel : 'Terms of Use', + fieldLabel : _('ID_TERMS_USE'), hideLabel : true, id : 'htmlCache', boxLabel : _('ID_FORMS_HTML_CACHE'), diff --git a/workflow/engine/templates/setup/loginSettings.js b/workflow/engine/templates/setup/loginSettings.js index bcd431634..a2870fbae 100755 --- a/workflow/engine/templates/setup/loginSettings.js +++ b/workflow/engine/templates/setup/loginSettings.js @@ -16,7 +16,7 @@ Ext.onReady(function(){ }), valueField : 'LAN_ID', displayField : 'LAN_NAME', - emptyText : 'Select', + emptyText : _('ID_SELECT'), selectOnFocus : true, editable : false, allowBlank : false, diff --git a/workflow/engine/templates/setup/main.js b/workflow/engine/templates/setup/main.js index f9715e707..e5da078c5 100755 --- a/workflow/engine/templates/setup/main.js +++ b/workflow/engine/templates/setup/main.js @@ -160,7 +160,7 @@ new Ext.KeyMap(document, { document.getElementById('setup-frame').src = document.getElementById('setup-frame').src; } else - Ext.Msg.alert('Refresh', 'You clicked: CTRL-F5'); + Ext.Msg.alert( _('ID_REFRESH_LABEL'), _('ID_REFRESH_MESSAGE')); } }); diff --git a/workflow/engine/templates/setup/pluginsMain.js b/workflow/engine/templates/setup/pluginsMain.js index 0768f3615..709948394 100755 --- a/workflow/engine/templates/setup/pluginsMain.js +++ b/workflow/engine/templates/setup/pluginsMain.js @@ -15,7 +15,7 @@ new Ext.KeyMap(document, { document.location = document.location; } else - Ext.Msg.alert('Refresh', 'You clicked: CTRL-F5'); + Ext.Msg.alert( _('ID_REFRESH_LABEL'), _('ID_REFRESH_MESSAGE') ); } }); @@ -140,7 +140,7 @@ Ext.onReady(function(){ ], listeners: { render: function(){ - this.loadMask = new Ext.LoadMask(this.body, {msg:'Loading...'}); + this.loadMask = new Ext.LoadMask(this.body, {msg: _('ID_LOADING_GRID')}); //this.ownerCt.doLayout(); Grid.getSelectionModel().on('rowselect', function(){ diff --git a/workflow/engine/templates/setup/processHeartBeatConfig.js b/workflow/engine/templates/setup/processHeartBeatConfig.js index 8fe62948b..f53d05768 100644 --- a/workflow/engine/templates/setup/processHeartBeatConfig.js +++ b/workflow/engine/templates/setup/processHeartBeatConfig.js @@ -7,7 +7,7 @@ Ext.onReady(function() { xtype : 'checkbox', checked : heartBeatChecked, name : 'acceptHB', - fieldLabel : 'Terms of Use', + fieldLabel : _('ID_TERMS_USE'), hideLabel : true, id : 'ch_ii', style : 'margin-top:15px', diff --git a/workflow/engine/templates/setup/skinList.js b/workflow/engine/templates/setup/skinList.js index 79e168ff4..cdf40f906 100755 --- a/workflow/engine/templates/setup/skinList.js +++ b/workflow/engine/templates/setup/skinList.js @@ -180,9 +180,9 @@ Ext.onReady(function(){ name : 'SKIN_NAME' }, - { - name : 'SKIN_WORKSPACE' - }, + { + name : 'SKIN_WORKSPACE' + }, { name : 'SKIN_DESCRIPTION' @@ -531,10 +531,10 @@ newSkin = function(){ } else { Ext.getCmp("newDialog").destroy(); if( !action.result ) { - Ext.MessageBox.alert("error", action.response.responseText); + Ext.MessageBox.alert( _('ID_ERROR') , action.response.responseText); return; } - Ext.MessageBox.alert("error", action.result.error); + Ext.MessageBox.alert( _('ID_ERROR') , action.result.error); } }, scope: Ext.getCmp("newform"), @@ -651,10 +651,10 @@ importSkin = function(){ Ext.getCmp("importDialog").destroy(); if( !action.result ) { - Ext.MessageBox.alert("error", _('ID_ERROR')); - return; + Ext.MessageBox.alert( _('ID_ERROR') , _('ID_ERROR')); + return; } - Ext.MessageBox.alert("error", action.result.error); + Ext.MessageBox.alert( _('ID_ERROR') , action.result.error); }, scope: Ext.getCmp("uploadform"), @@ -721,7 +721,7 @@ exportSkin = function(){ viewport.getEl().unmask(); }else{ viewport.getEl().unmask(); - Ext.Msg.alert('Alert', resp.message); + Ext.Msg.alert( _('ID_ALERT') , resp.message); //PMExt.error(_('ID_SKINS'),_('ID_MSG_CANNOT_EXPORT_SKIN')); } }, diff --git a/workflow/engine/templates/tools/main.js b/workflow/engine/templates/tools/main.js index d2f7b3eae..5f1bf15d0 100755 --- a/workflow/engine/templates/tools/main.js +++ b/workflow/engine/templates/tools/main.js @@ -143,7 +143,7 @@ Ext.onReady(function(){ pageSize: 15, store: store, displayInfo: true, - displayMsg: 'Displaying items {0} - {1} of {2}', + displayMsg: _('ID_GRID_PAGE_DISPLAYING_ITEMS'), emptyMsg: "", items:[ ] @@ -206,7 +206,7 @@ Ext.onReady(function(){ readOnly: true })], bbar: [{ - text: 'Save', + text: _('ID_SAVE'), iconCls: 'ss_sprite ss_disk', handler: saveEdit }] @@ -233,7 +233,7 @@ var edit = function(){ activator.setIcon(''); }, failure: function ( result, request) { - Ext.MessageBox.alert('Failed', result.responseText); + Ext.MessageBox.alert( _('ID_FAILED') , result.responseText); } }); } @@ -265,7 +265,7 @@ var frm = new Ext.FormPanel( { width: 350 }, { id: 'label', - fieldLabel: 'Label', + fieldLabel: _('ID_LABEL'), xtype:'textarea', width: 350, height: 50 @@ -283,7 +283,7 @@ var frm = new Ext.FormPanel( { }); newLabelWin = new Ext.Window({ - title: 'New Translation', + title: _('ID_NEW_TRANSLATION'), layout:'fit', title: _('ID_NEW'), width: 490, @@ -308,7 +308,7 @@ function saveNew() Ext.getCmp('formNew').getForm().submit( { url : 'ajaxListener?action=save&id'+id+'&label='+label, - waitMsg : 'Saving...', + waitMsg : _('ID_SAVING'), timeout : 36000, success : function(obj, resp) { Ext.getCmp('grid').store.reload(); @@ -339,12 +339,12 @@ function saveEdit() grid.store.reload(); setTimeout('selectRow()', 1100); } else - PMExt.error('Error', result.msg); + PMExt.error( _('ID_ERROR'), result.msg); }, params: {action:'save', id: rows[0].get('TRN_ID'), label: Ext.getCmp('editValue').getValue()} }); - } else PMExt.error('ERROR', 'Just select one item from the list to edit!'); + } else PMExt.error( _('ID_ERROR'), _('ID_SELECT_ONE_ITEM_FROM_LIST')); } function removeLabel() @@ -357,12 +357,10 @@ function removeLabel() IDS = ids.join(','); - Ext.Msg.confirm( - 'Delete', - 'Delete the selected translations?', + Ext.Msg.confirm( _('ID_DELETE'), _('ID_DELETE_TRANSLATIONS'), function(btn, text){ if ( btn == 'yes' ){ - Ext.MessageBox.show({ msg:'Deleting elements...', wait:true,waitConfig: {interval:200} }); + Ext.MessageBox.show({ msg: _('ID_DELETING_ELEMENTS') , wait:true,waitConfig: {interval:200} }); Ext.Ajax.request({ url: 'ajaxListener', success: function(response) { @@ -372,7 +370,7 @@ function removeLabel() PMExt.notify('REMOVE', result.msg); Ext.getCmp('grid').store.reload(); } else - PMExt.error('Error', result.msg); + PMExt.error( _('ID_ERROR'), result.msg); }, params: {action:'delete', IDS: IDS} }); @@ -380,14 +378,14 @@ function removeLabel() } ); } else { - PMExt.error('ERROR', 'Select a item from list please'); + PMExt.error( _('ID_ERROR'), _('ID_NO_SELECTION_WARNING')); } } function rebuild() { - Ext.MessageBox.show({ msg: 'Rebuilding translations..', wait:true,waitConfig: {interval:200} }); + Ext.MessageBox.show({ msg: _('ID_REBUILDING_TRANSLATIONS') + '...' , wait:true,waitConfig: {interval:200} }); Ext.Ajax.request({ url: 'ajaxListener', params: {action:'rebuild'}, @@ -396,15 +394,15 @@ function rebuild() result = Ext.util.JSON.decode(response.responseText); if(result.success){ - var text = 'Cache file: ' + result.cacheFile + '
'; + var text = _('ID_CACHE_FILE') + result.cacheFile + '
'; //text += 'JS Cache file: ' + result.cacheFileJS + '
'; - text += 'Rows: ' + result.rows + '
'; + text += _('ID_ROWS')+': ' + result.rows + '
'; //text += 'JS ROws: ' + result.rowsJS + '
'; //PMExt.info('Result', text); PMExt.notify('REBUILD SUCCESS', text); } else - PMExt.error('Error', result.msg); + PMExt.error( _('ID_ERROR'), result.msg); } }); } diff --git a/workflow/engine/templates/users/users.js b/workflow/engine/templates/users/users.js index 291c5371e..900a617fa 100644 --- a/workflow/engine/templates/users/users.js +++ b/workflow/engine/templates/users/users.js @@ -544,8 +544,8 @@ Ext.onReady(function () { }, failure: function () { Ext.MessageBox.show({ - title: 'Error', - msg: 'Failed to store data', + title: _('ID_ERROR'), + msg: _('ID_FAILED_STORE_DATA'), buttons: Ext.MessageBox.OK, animEl: 'mb9', icon: Ext.MessageBox.ERROR @@ -1015,8 +1015,8 @@ function validateUserName() { }, failure: function () { Ext.MessageBox.show({ - title: 'Error', - msg: 'Failed to store data', + title: _('ID_ERROR'), + msg: _('ID_FAILED_STORE_DATA'), buttons: Ext.MessageBox.OK, animEl: 'mb9', icon: Ext.MessageBox.ERROR diff --git a/workflow/engine/templates/users/usersGroups.js b/workflow/engine/templates/users/usersGroups.js index b7eb2c6a9..7049d921c 100755 --- a/workflow/engine/templates/users/usersGroups.js +++ b/workflow/engine/templates/users/usersGroups.js @@ -16,7 +16,7 @@ new Ext.KeyMap(document, { e.stopEvent(); document.location = document.location; }else{ - Ext.Msg.alert('Refresh', 'You clicked: CTRL-F5'); + Ext.Msg.alert( _('ID_REFRESH_LABEL'), _('ID_REFRESH_MESSAGE')); } } }); diff --git a/workflow/engine/templates/users/usersList.js b/workflow/engine/templates/users/usersList.js index f4aca6de7..28aad0ed9 100755 --- a/workflow/engine/templates/users/usersList.js +++ b/workflow/engine/templates/users/usersList.js @@ -17,7 +17,7 @@ new Ext.KeyMap(document, [ e.stopEvent(); document.location = document.location; }else{ - Ext.Msg.alert('Refresh', 'You clicked: CTRL-F5'); + Ext.Msg.alert( _('ID_REFRESH_LABEL'), _('ID_REFRESH_MESSAGE') ); } } },