From 9604ab09f6de37eabe537d76f33ca57a8bfba181 Mon Sep 17 00:00:00 2001 From: dheeyi Date: Thu, 17 Sep 2015 17:08:41 -0400 Subject: [PATCH] =?UTF-8?q?PM-3624=20Completar=20traducci=C3=B3e=20labels?= =?UTF-8?q?=20faltantes=20para=20la=20versi=C3=B3.0.1.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PM-3624 Completar traduccióe labels faltantes para la versió.0.1.5 --- workflow/engine/classes/class.net.php | 6 +-- .../methods/appFolder/appFolderAjax.php | 18 +++---- .../BusinessModel/DataBaseConnection.php | 50 +++++++++---------- workflow/engine/templates/cases/casesList.js | 4 +- 4 files changed, 39 insertions(+), 39 deletions(-) diff --git a/workflow/engine/classes/class.net.php b/workflow/engine/classes/class.net.php index d7901502a..a2a869a9f 100755 --- a/workflow/engine/classes/class.net.php +++ b/workflow/engine/classes/class.net.php @@ -91,7 +91,7 @@ class NET if (! $this->hostname = @gethostbyaddr( $ipHost )) { $this->errno = 2000; $this->errstr = "NET::Host down"; - $this->error = "Destination Host Unreachable"; + $this->error = G::loadTranslation('ID_HOST_UNREACHABLE'); } } else { $ip = @gethostbyname( $ipHost ); @@ -99,7 +99,7 @@ class NET if ($long == - 1 || $long === false) { $this->errno = 2000; $this->errstr = "NET::Host down"; - $this->error = "Destination Host Unreachable"; + $this->error = G::loadTranslation('ID_HOST_UNREACHABLE'); } else { $this->ip = @gethostbyname( $ipHost ); $this->hostname = $pHost; @@ -124,7 +124,7 @@ class NET } else { $this->errno = 9999; $this->errstr = "NET::Port Host Unreachable"; - $this->error = "Destination Port Unreachable"; + $this->error = G::loadTranslation('ID_PORT_UNREACHABLE'); return false; } } diff --git a/workflow/engine/methods/appFolder/appFolderAjax.php b/workflow/engine/methods/appFolder/appFolderAjax.php index 4b7903472..515278fed 100755 --- a/workflow/engine/methods/appFolder/appFolderAjax.php +++ b/workflow/engine/methods/appFolder/appFolderAjax.php @@ -1201,9 +1201,9 @@ function copyMoveAction($type) $copyDialog["modal"] = true; $copyDialog["url"] = "URL_SCRIPT"; if ($type=="copy") { - $copyDialog["dialogtitle"]= "Copy"; + $copyDialog["dialogtitle"]= G::LoadTranslation('ID_COPY'); } else { - $copyDialog["dialogtitle"]= "Move"; + $copyDialog["dialogtitle"]= G::LoadTranslation('ID_MOVE'); } $copyDialog["frame"]= true; @@ -1241,9 +1241,9 @@ function copyMoveAction($type) $itemButton=array(); if ($type == "copy") { - $itemButton["text"]= "Copy"; + $itemButton["text"]= G::LoadTranslation('ID_COPY'); } else { - $itemButton["text"]= "Move"; + $itemButton["text"]= G::LoadTranslation('ID_MOVE'); } $itemButton["handler"]="copyDialogCreateButtonFunction"; $itemButton["id"]="buttonCopy"; @@ -1296,7 +1296,7 @@ function copyMoveAction($type) $copyDialog["buttons"][]=$itemButton; $itemButton=array(); - $itemButton["text"]="Cancel"; + $itemButton["text"]=G::LoadTranslation('ID_CANCEL'); $itemButton["id"]="buttonCancel"; $itemButton["handler"]= "copyDialogCancelButtonFunction"; $functionsToReplace["copyDialogCancelButtonFunction"]="function() { Ext.getCmp('dialog').destroy(); }"; @@ -1724,7 +1724,7 @@ function newFolder() $field=array(); $field["xtype"]= "label"; - $field["fieldLabel"]= "Path"; + $field["fieldLabel"]= G::LoadTranslation('ID_CREATE_FOLDER_PATH_FOLDER'); $field["name"]= "form[FOLDER_PATH]"; $field["id"]= "form[FOLDER_PATH]"; $field["width"]=175; @@ -1755,7 +1755,7 @@ function newFolder() $field=array(); $field["xtype"]= "textfield"; - $field["fieldLabel"]= "Name"; + $field["fieldLabel"]= G::LoadTranslation('ID_CREATE_FOLDER_NAME_FOLDER'); $field["name"]= "form[FOLDER_NAME]"; $field["id"]= "form[FOLDER_NAME]"; $field["width"]=175; @@ -1765,12 +1765,12 @@ function newFolder() $formNewFolder["buttons"]= array(); $button = array(); - $button["text"] = "Create"; + $button["text"] = G::LoadTranslation('ID_CREATE'); $button["handler"] = 'handlerCreate'; $formNewFolder["buttons"][] = $button; $button=array(); - $button["text"]= "Cancel"; + $button["text"]= G::LoadTranslation('ID_CANCEL'); $button["handler"]= 'handlerCancel'; $formNewFolder["buttons"][]= $button; diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/DataBaseConnection.php b/workflow/engine/src/ProcessMaker/BusinessModel/DataBaseConnection.php index 6f71762eb..0dfa0dc71 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/DataBaseConnection.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/DataBaseConnection.php @@ -253,56 +253,56 @@ class DataBaseConnection // STEP 1 : Resolving Host Name $respTest['0'] = array(); - $respTest['0']['test'] = 'Resolving Host Name ' . $dataCon['DBS_SERVER']; + $respTest['0']['test'] = G::loadTranslation('RESOLVING_NAME') . ' ' .$dataCon['DBS_SERVER']; if ($Server->getErrno() != 0) { if ($returnArray) { - $respTest['0']['error'] = "Error Testing Connection: Resolving Host Name FAILED : " . $Server->error; + $respTest['0']['error'] = G::loadTranslation('ID_ERROR_HOST_NAME_FAILED') . ' : ' . $Server->error; } else { - $resp['message'] = "Error Testing Connection: Resolving Host Name FAILED : " . $Server->error; + $resp['message'] = G::loadTranslation('ID_ERROR_HOST_NAME_FAILED') . ' : ' . $Server->error; return $resp; } } // STEP 2 : Checking port $respTest['1'] = array(); - $respTest['1']['test'] = 'Checking port ' . $dataCon['DBS_PORT']; + $respTest['1']['test'] = G::loadTranslation('ID_CHECK_PORT') . ' ' . $dataCon['DBS_PORT']; $Server->scannPort($dataCon['DBS_PORT']); if ($Server->getErrno() != 0) { if ($returnArray) { - $respTest['1']['error'] = "Error Testing Connection: Checking port FAILED : " . $Server->error; + $respTest['1']['error'] = G::loadTranslation('ID_CHECK_PORT_FAILED') . ' : ' . $Server->error; } else { - $resp['message'] = "Error Testing Connection: Checking port FAILED : " . $Server->error; + $resp['message'] = G::loadTranslation('ID_CHECK_PORT_FAILED') . ' : ' . $Server->error; return $resp; } } // STEP 3 : Trying to connect to host $respTest['2'] = array(); - $respTest['2']['test'] = 'Connecting to host ' . $dataCon['DBS_SERVER'] . (($dataCon['DBS_PORT'] != '') ? ':'.$dataCon['DBS_PORT'] : ''); + $respTest['2']['test'] = G::loadTranslation('ID_CONNECTING_TO_HOST') . ' ' . $dataCon['DBS_SERVER'] . (($dataCon['DBS_PORT'] != '') ? ':'.$dataCon['DBS_PORT'] : ''); $Server->loginDbServer($dataCon['DBS_USERNAME'], $dataCon['DBS_PASSWORD']); $Server->setDataBase($dataCon['DBS_DATABASE_NAME'], $dataCon['DBS_PORT']); if ($Server->errno == 0) { $response = $Server->tryConnectServer($dataCon['DBS_TYPE']); if ($response->status != 'SUCCESS') { if ($returnArray) { - $respTest['2']['error'] = "Error Testing Connection: Connecting to host FAILED : " . $Server->error; + $respTest['2']['error'] = G::loadTranslation('ID_CONNECTING_TO_HOST_FAILED') . ' : ' . $Server->error; } else { - $resp['message'] = "Error Testing Connection: Connecting to host FAILED : " . $Server->error; + $resp['message'] = G::loadTranslation('ID_CONNECTING_TO_HOST_FAILED') . ' : ' . $Server->error; return $resp; } } } else { if ($returnArray) { - $respTest['2']['error'] = "Error Testing Connection: Connecting to host FAILED : " . $Server->error; + $respTest['2']['error'] = G::loadTranslation('ID_CONNECTING_TO_HOST_FAILED') . ' : ' . $Server->error; } else { - $resp['message'] = "Error Testing Connection: Connecting to host FAILED : " . $Server->error; + $resp['message'] = G::loadTranslation('ID_CONNECTING_TO_HOST_FAILED') . ' : ' . $Server->error; return $resp; } } // STEP 4 : Trying to open database $respTest['3'] = array(); - $respTest['3']['test'] = 'Opening database [' . $dataCon['DBS_DATABASE_NAME'] . ']'; + $respTest['3']['test'] = G::loadTranslation('ID_OPEN_DATABASE') . ' [' . $dataCon['DBS_DATABASE_NAME'] . ']'; $Server->loginDbServer($dataCon['DBS_USERNAME'], $dataCon['DBS_PASSWORD']); $Server->setDataBase($dataCon['DBS_DATABASE_NAME'], $dataCon['DBS_PORT']); if ($Server->errno == 0) { @@ -311,25 +311,25 @@ class DataBaseConnection $response = $Server->tryOpenDataBase($dataCon['DBS_TYPE']); if ($response->status != 'SUCCESS') { if ($returnArray) { - $respTest['3']['error'] = "Error Testing Connection: Opening database FAILED : " . $Server->error; + $respTest['3']['error'] = G::loadTranslation('ID_CONNECTING_TO_DATABASE_FAILED') . ' : ' . $Server->error; } else { - $resp['message'] = "Error Testing Connection: Opening database FAILED : " . $Server->error; + $resp['message'] = G::loadTranslation('ID_CONNECTING_TO_DATABASE_FAILED') . ' : ' . $Server->error; return $resp; } } } else { if ($returnArray) { - $respTest['3']['error'] = "Error Testing Connection: Opening database FAILED : " . $Server->error; + $respTest['3']['error'] = G::loadTranslation('ID_CONNECTING_TO_DATABASE_FAILED') . ' : ' . $Server->error; } else { - $resp['message'] = "Error Testing Connection: Opening database FAILED : " . $Server->error; + $resp['message'] = G::loadTranslation('ID_CONNECTING_TO_DATABASE_FAILED') . ' : ' . $Server->error; return $resp; } } } else { if ($returnArray) { - $respTest['3']['error'] = "Error Testing Connection: Opening database FAILED : " . $Server->error; + $respTest['3']['error'] = G::loadTranslation('ID_CONNECTING_TO_DATABASE_FAILED') . ' : ' . $Server->error; } else { - $resp['message'] = "Error Testing Connection: Opening database FAILED : " . $Server->error; + $resp['message'] = G::loadTranslation('ID_CONNECTING_TO_DATABASE_FAILED') . ' : ' . $Server->error; return $resp; } } @@ -338,7 +338,7 @@ class DataBaseConnection //STEP 0: Trying to open database type TNS $respTest["0"] = array(); - $respTest["0"]["test"] = "Test TNS: " . $dataCon["DBS_TNS"]; + $respTest["0"]["test"] = G::loadTranslation('ID_TEST_DATABASE_ORACLE_TNS') . ' ' . $dataCon["DBS_TNS"]; $net->loginDbServer($dataCon["DBS_USERNAME"], $dataCon["DBS_PASSWORD"]); @@ -352,9 +352,9 @@ class DataBaseConnection if ($response->status != "SUCCESS") { if ($returnArray) { - $respTest["0"]["error"] = "Error Testing Connection: Opening database type TNS FAILED, " . $net->error; + $respTest["0"]["error"] = G::loadTranslation('ID_TEST_ERROR_ORACLE_TNS') . ', ' . $net->error; } else { - $resp["message"] = "Error Testing Connection: Opening database type TNS FAILED, " . $net->error; + $resp["message"] = G::loadTranslation('ID_TEST_ERROR_ORACLE_TNS') . ', ' . $net->error; //Return return $resp; @@ -362,9 +362,9 @@ class DataBaseConnection } } else { if ($returnArray) { - $respTest["0"]["error"] = "Error Testing Connection: Opening database type TNS FAILED, " . $net->error; + $respTest["0"]["error"] = G::loadTranslation('ID_TEST_ERROR_ORACLE_TNS') . ', ' . $net->error; } else { - $resp["message"] = "Error Testing Connection: Opening database type TNS FAILED, " . $net->error; + $resp["message"] = G::loadTranslation('ID_TEST_ERROR_ORACLE_TNS') . ', ' . $net->error; //Return return $resp; @@ -372,9 +372,9 @@ class DataBaseConnection } } else { if ($returnArray) { - $respTest["0"]["error"] = "Error Testing Connection: Opening database type TNS FAILED, " . $net->error; + $respTest["0"]["error"] = G::loadTranslation('ID_TEST_ERROR_ORACLE_TNS') . ', ' . $net->error; } else { - $resp["message"] = "Error Testing Connection: Opening database type TNS FAILED, " . $net->error; + $resp["message"] = G::loadTranslation('ID_TEST_ERROR_ORACLE_TNS') . ', ' . $net->error; //Return return $resp; diff --git a/workflow/engine/templates/cases/casesList.js b/workflow/engine/templates/cases/casesList.js index 34a6785e4..c5f0433ac 100755 --- a/workflow/engine/templates/cases/casesList.js +++ b/workflow/engine/templates/cases/casesList.js @@ -292,7 +292,7 @@ function pauseCase(date){ buttonAlign: 'center', buttons: [{ - text: 'Ok', + text: _('ID_OK'), handler: function(){ if (Ext.getCmp('noteReason').getValue() != '') { var noteReasonTxt = _('ID_CASE_PAUSE_LABEL_NOTE') + ' ' + Ext.getCmp('noteReason').getValue(); @@ -333,7 +333,7 @@ function pauseCase(date){ }); } },{ - text: 'Cancel', //COCHATRA + text: _('ID_CANCEL'), //COCHATRA handler: function(){ msgPause.close(); }