diff --git a/gulliver/js/ext/pmos-common.js b/gulliver/js/ext/pmos-common.js index 59529bfc2..dc0427e09 100755 --- a/gulliver/js/ext/pmos-common.js +++ b/gulliver/js/ext/pmos-common.js @@ -3,6 +3,12 @@ PMExtJSCommon = function() { this.confirm = function(title, msg, fnYes, fnNo) { + if (typeof(_) != 'undefined') { + Ext.MessageBox.buttonText = { + yes : _('ID_YES'), + no : _('ID_NO') + }; + } Ext.MessageBox.confirm(title, msg, function(btn, text){ if ( btn == 'yes' ) setTimeout(fnYes, 0) diff --git a/workflow/engine/classes/class.derivation.php b/workflow/engine/classes/class.derivation.php index 1ea8f0a7e..184b4ed15 100755 --- a/workflow/engine/classes/class.derivation.php +++ b/workflow/engine/classes/class.derivation.php @@ -427,7 +427,7 @@ class Derivation // if there is no report_to user info, throw an exception indicating this if (!isset($userFields) || $userFields['USR_UID'] == '') { - throw ( new Exception("The current user does not have a valid Reports To user. Please contact administrator.") ) ; + throw ( new Exception(G::LoadTranslation('ID_MSJ_REPORSTO')));// "The current user does not have a valid Reports To user. Please contact administrator.") ) ; } break; diff --git a/workflow/engine/js/dynaforms/dynaforms_conditionalShowHide.js b/workflow/engine/js/dynaforms/dynaforms_conditionalShowHide.js index d8db3acd5..301952cbd 100755 --- a/workflow/engine/js/dynaforms/dynaforms_conditionalShowHide.js +++ b/workflow/engine/js/dynaforms/dynaforms_conditionalShowHide.js @@ -389,7 +389,7 @@ var Conditional = function(DYN_UID){ oResultDiv.style.display = 'block'; oResultDiv.style.backgroundColor = '#BFCCC5'; oResultDiv.style.color = '#000000'; - oResultDiv.innerHTML = '[Success] Evaluation result: '+bResult; + oResultDiv.innerHTML = _('ID_EVALUATION_RESULT')+": "+bResult; fade('ResultMessageTD', 'inOut'); var o = new input(oResultDiv); var oF = new input(getField('FCD_CONDITION')); diff --git a/workflow/engine/methods/setup/languages.php b/workflow/engine/methods/setup/languages.php index eb3d2cd4a..9e0f235bd 100755 --- a/workflow/engine/methods/setup/languages.php +++ b/workflow/engine/methods/setup/languages.php @@ -29,9 +29,9 @@ $oHeadPublisher->addContent('setup/languages'); //adding a html file .html. $labels = G::getTranslations(Array( 'ID_LAN_PREDETERMINED', 'ID_LANG_INSTALL_UPDATE', 'ID_LAN_LANGUAGE', 'ID_LAN_COUNTRY', 'ID_LAN_UPDATE_DATE', - 'ID_LAN_REV_DATE', 'ID_LAN_FILE', 'ID_LAN_REV_DATE', 'ID_LAN_VERSION', 'ID_LAN_GRID_TITLE', 'ID_LAN_UPLOAD_TITLE', + 'ID_LAN_REV_DATE', 'ID_LAN_FILE', 'ID_LAN_REV_DATE', 'ID_LAN_VERSION', 'ID_LAN_GRID_TITLE', 'ID_LAN_UPLOAD_TITLE', 'ID_LAN_FILE_WATER_LABEL', 'ID_EXPORT', 'ID_UPLOAD', 'ID_CANCEL', 'ID_DELETE_LANGUAGE', 'ID_DELETE_LANGUAGE_CONFIRM', - 'ID_DELETE_LANGUAGE_WARNING', 'ID_ACTIONS', 'ID_LAN_LOCALE', 'ID_LAN_TRANSLATOR', 'ID_LAN_NUM_RECORDS' + 'ID_DELETE_LANGUAGE_WARNING', 'ID_ACTIONS', 'ID_LAN_LOCALE', 'ID_LAN_TRANSLATOR', 'ID_LAN_NUM_RECORDS', 'ID_UPLOADING_TRANSLATION_FILE' )); $oHeadPublisher->assign('TRANSLATIONS', $labels); diff --git a/workflow/engine/templates/app/main.js b/workflow/engine/templates/app/main.js index 414ef1221..630cd3a5a 100644 --- a/workflow/engine/templates/app/main.js +++ b/workflow/engine/templates/app/main.js @@ -175,7 +175,7 @@ function openCaseNotesWindow(appUid1, modalSw, appTitle) ' ', { id: 'sendBtn', - text: 'Send', + text: _('ID_SEND'), cls: 'x-toolbar1', handler: sendNote }, ' ', @@ -393,7 +393,7 @@ var openSummaryWindow = function(appUid, delIndex) onload: '' }}); } - tabs.push({title: Ext.util.Format.capitalize('Uploaded Documents'), bodyCfg: { + tabs.push({title: Ext.util.Format.capitalize(_('ID_UPLOADED_DOCUMENTS')), bodyCfg: { tag: 'iframe', id: 'summaryIFrame', src: '../cases/ajaxListener?action=uploadedDocumentsSummary', @@ -401,7 +401,7 @@ var openSummaryWindow = function(appUid, delIndex) onload: '' }}); - tabs.push({title: Ext.util.Format.capitalize('Generated Documents'), bodyCfg: { + tabs.push({title: Ext.util.Format.capitalize(_('ID_GENERATED_DOCUMENTS')), bodyCfg: { tag: 'iframe', id: 'summaryIFrame', src: '../cases/ajaxListener?action=generatedDocumentsSummary', diff --git a/workflow/engine/templates/cases/open.js b/workflow/engine/templates/cases/open.js index 7b02c2d69..6743bb1cb 100755 --- a/workflow/engine/templates/cases/open.js +++ b/workflow/engine/templates/cases/open.js @@ -334,11 +334,11 @@ Ext.onReady(function(){ style: 'font-weight: bold' }, items : [ - {fieldLabel: 'Title', text: data.PRO_TITLE}, - {fieldLabel: 'Description', text: data.PRO_DESCRIPTION}, - {fieldLabel: 'Category', text: data.PRO_CATEGORY_LABEL}, - {fieldLabel: 'Author', text: data.PRO_AUTHOR}, - {fieldLabel: 'Create date', text: data.PRO_CREATE_DATE} + {fieldLabel: _('ID_TITLE'), text: data.PRO_TITLE}, + {fieldLabel: _('ID_DESCRIPTION'), text: data.PRO_DESCRIPTION}, + {fieldLabel: _('ID_CATEGORY'), text: data.PRO_CATEGORY_LABEL}, + {fieldLabel: _('ID_AUTHOR'), text: data.PRO_AUTHOR}, + {fieldLabel: _('ID_CREATE_DATE'), text: data.PRO_CREATE_DATE} ] } @@ -392,12 +392,12 @@ Ext.onReady(function(){ style: 'font-weight: bold' }, items : [ - {fieldLabel: 'Title', text: data.TAS_TITLE}, - {fieldLabel: 'Description', text: data.TAS_DESCRIPTION}, - {fieldLabel: 'Init Date', text: data.INIT_DATE}, - {fieldLabel: 'Due Date', text: data.DUE_DATE}, - {fieldLabel: 'Finish Date', text: data.FINISH}, - {fieldLabel: 'Duration', text: data.DURATION} + {fieldLabel: _('ID_TITLE'), text: data.TAS_TITLE}, + {fieldLabel: _('ID_DESCRIPTION'), text: data.TAS_DESCRIPTION}, + {fieldLabel: _('ID_INIT_DATE'), text: data.INIT_DATE}, + {fieldLabel: _('ID_DUE_DATE'), text: data.DUE_DATE}, + {fieldLabel: _('ID_FINISH_DATE'), text: data.FINISH}, + {fieldLabel: _('ID_TASK_DURATION'), text: data.DURATION} ] } @@ -608,7 +608,7 @@ Ext.onReady(function(){ {fieldLabel: 'Case', text: parent._CASE_TITLE}, {fieldLabel: 'Pause Date', text: _ENV_CURRENT_DATE}, new Ext.form.DateField({ - id: 'unpauseDate', + id: 'unpauseDate', format: 'Y-m-d', fieldLabel: 'Unpause Date', name: 'unpauseDate', @@ -870,30 +870,30 @@ Ext.onReady(function(){ var uri = 'casesHistoryDynaformPage_Ajax?actionAjax=dynaformChangeLogViewHistory'; uri += '&DYN_UID='+dynUID+'&HISTORY_ID='+tablename; menuSelectedTitle[name] = tabTitle; - } + } - if (name.indexOf("historyDynaformGridPreview") != -1) { + if (name.indexOf("historyDynaformGridPreview") != -1) { var historyDynaformGridPreviewGlobal = Ext.util.JSON.decode(ActionTabFrameGlobal.tabData); - var tabTitle = ActionTabFrameGlobal.tabTitle; - var DYN_UID = historyDynaformGridPreviewGlobal.DYN_UID; + var tabTitle = ActionTabFrameGlobal.tabTitle; + var DYN_UID = historyDynaformGridPreviewGlobal.DYN_UID; var uri = 'casesHistoryDynaformPage_Ajax?actionAjax=historyDynaformGridPreview'; - uri += '&DYN_UID='+DYN_UID; - menuSelectedTitle[name] = tabTitle; + uri += '&DYN_UID='+DYN_UID; + menuSelectedTitle[name] = tabTitle } if (name == "uploadDocumentGridDownload") { - var uploadDocumentGridDownloadGlobal = Ext.util.JSON.decode(ActionTabFrameGlobal.tabData); + var uploadDocumentGridDownloadGlobal = Ext.util.JSON.decode(ActionTabFrameGlobal.tabData); var APP_DOC_UID = uploadDocumentGridDownloadGlobal.APP_DOC_UID; var DOWNLOAD_LINK = uploadDocumentGridDownloadGlobal.DOWNLOAD_LINK; - var TITLE = uploadDocumentGridDownloadGlobal.TITLE; + var TITLE = uploadDocumentGridDownloadGlobal.TITLE; var uri = DOWNLOAD_LINK; - menuSelectedTitle[name] = ActionTabFrameGlobal.tabTitle; + menuSelectedTitle[name] = ActionTabFrameGlobal.tabTitle; } if (name == "generatedDocuments") { var uri = 'casesGenerateDocumentPage_Ajax.php?actionAjax=casesGenerateDocumentPage'; } - + if( tab ) { TabPanel.setActiveTab(tabId); } @@ -941,8 +941,8 @@ Ext.onReady(function(){ }, columns: [ { id:'USR_UID', dataIndex: 'USR_UID', hidden:true, hideable:false}, - { header : "First Name", dataIndex : 'USR_FIRSTNAME', sortable : true, width: 130, align:'center'}, - { header : "Last Name", dataIndex : 'USR_LASTNAME', sortable : true,width: 130, align:'center' } + { header : _('ID_FIRST_NAME'), dataIndex : 'USR_FIRSTNAME', sortable : true, width: 130, align:'center'}, + { header : _('ID_LAST_NAME'), dataIndex : 'USR_LASTNAME', sortable : true,width: 130, align:'center' } ] }); @@ -955,7 +955,7 @@ Ext.onReady(function(){ items:[] }); - var adHocUserGrid = new Ext.grid.GridPanel( { + var adHocUserGrid = new Ext.grid.GridPanel( { region: 'center', layout: 'fit', id: 'adHocUserGrid', @@ -978,9 +978,9 @@ Ext.onReady(function(){ { text:_('ID_ASSIGN'), iconCls: 'silk-add', - icon: '/images/cases-selfservice.png', + icon: '/images/cases-selfservice.png', handler: assignAdHocUser - } + } ], bbar: '', listeners:{ @@ -997,7 +997,7 @@ Ext.onReady(function(){ id: 'w' }); adHocUserGrid.store.load(); - w.show(); + w.show(); function assignAdHocUser() { diff --git a/workflow/engine/templates/setup/languages.js b/workflow/engine/templates/setup/languages.js index bd0954a95..05faa4657 100755 --- a/workflow/engine/templates/setup/languages.js +++ b/workflow/engine/templates/setup/languages.js @@ -78,7 +78,7 @@ Ext.onReady(function(){ if(uploader.getForm().isValid()){ uploader.getForm().submit({ url: 'languages_Import', - waitMsg: 'Uploading the translation file...', + waitMsg: _('ID_UPLOADING_TRANSLATION_FILE'), success: function(o, resp){ w.close(); infoGrid.store.reload(); diff --git a/workflow/engine/templates/setup/skinList.js b/workflow/engine/templates/setup/skinList.js index e49dd7b25..2a5bfda0d 100755 --- a/workflow/engine/templates/setup/skinList.js +++ b/workflow/engine/templates/setup/skinList.js @@ -558,17 +558,18 @@ importSkin = function(){ //}, { xtype:"fileuploadfield", - fieldLabel:"File ", - id:"uploadedFile", - name:"uploadedFile", - width:190, - buttonOnly:false + fieldLabel: _('ID_FILE'), + id: "uploadedFile", + name: "uploadedFile", + width: 190, + buttonText: _('ID_BROWSE'), + buttonOnly: false }, { - xtype:"checkbox", - fieldLabel:"Overwrite", - name:"overwrite_files", - checked:true + xtype: "checkbox", + fieldLabel: _('ID_OVERWRITE'), + name: "overwrite_files", + checked: true } ], buttons:[ diff --git a/workflow/engine/xmlform/cases/cases_Scheduler_List.xml b/workflow/engine/xmlform/cases/cases_Scheduler_List.xml index 6d800bd40..e3d34dfba 100755 --- a/workflow/engine/xmlform/cases/cases_Scheduler_List.xml +++ b/workflow/engine/xmlform/cases/cases_Scheduler_List.xml @@ -21,7 +21,7 @@ Last run time - + @@ -33,5 +33,4 @@ - \ No newline at end of file