From 8416025e932669550c166cfc4263d55c149eed89 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sat, 3 Oct 2015 21:39:38 +1300 Subject: Rename strings global variable --- web/app/view/BaseEditDialog.js | 4 ++-- web/app/view/CommandDialog.js | 12 ++++++------ web/app/view/CommandDialogController.js | 2 +- web/app/view/Device.js | 24 ++++++++++++------------ web/app/view/DeviceController.js | 10 +++++----- web/app/view/DeviceDialog.js | 6 +++--- web/app/view/Login.js | 10 +++++----- web/app/view/LoginController.js | 4 ++-- web/app/view/Map.js | 2 +- web/app/view/Register.js | 10 +++++----- web/app/view/RegisterController.js | 2 +- web/app/view/Report.js | 26 +++++++++++++------------- web/app/view/ServerDialog.js | 20 ++++++++++---------- web/app/view/State.js | 6 +++--- web/app/view/StateController.js | 18 +++++++++--------- web/app/view/User.js | 14 +++++++------- web/app/view/UserController.js | 10 +++++----- web/app/view/UserDialog.js | 22 +++++++++++----------- 18 files changed, 101 insertions(+), 101 deletions(-) (limited to 'web/app/view') diff --git a/web/app/view/BaseEditDialog.js b/web/app/view/BaseEditDialog.js index 81831e2fb..bf1e52749 100644 --- a/web/app/view/BaseEditDialog.js +++ b/web/app/view/BaseEditDialog.js @@ -20,10 +20,10 @@ extend: 'Traccar.view.BaseDialog', buttons: [{ - text: strings.sharedSave, + text: Strings.sharedSave, handler: 'onSaveClick' }, { - text: strings.sharedCancel, + text: Strings.sharedCancel, handler: 'closeView' }] }); diff --git a/web/app/view/CommandDialog.js b/web/app/view/CommandDialog.js index 388c0afce..36024a172 100644 --- a/web/app/view/CommandDialog.js +++ b/web/app/view/CommandDialog.js @@ -24,14 +24,14 @@ ], controller: 'commandDialog', - title: strings.commandTitle, + title: Strings.commandTitle, items: { xtype: 'form', items: [{ xtype: 'combobox', name: 'type', - fieldLabel: strings.commandType, + fieldLabel: Strings.commandType, store: 'CommandTypes', displayField: 'name', valueField: 'key', @@ -46,11 +46,11 @@ items: [{ xtype: 'numberfield', - fieldLabel: strings.commandFrequency, + fieldLabel: Strings.commandFrequency, name: 'frequency' }, { xtype: 'combobox', - fieldLabel: strings.commandUnit, + fieldLabel: Strings.commandUnit, name: 'unit', store: 'TimeUnits', displayField: 'name', @@ -60,10 +60,10 @@ }, buttons: [{ - text: strings.commandSend, + text: Strings.commandSend, handler: 'onSendClick' }, { - text: strings.sharedCancel, + text: Strings.sharedCancel, handler: 'closeView' }] }); diff --git a/web/app/view/CommandDialogController.js b/web/app/view/CommandDialogController.js index 1c6b361a7..39149c5a5 100644 --- a/web/app/view/CommandDialogController.js +++ b/web/app/view/CommandDialogController.js @@ -52,7 +52,7 @@ onSendResult: function (options, success, response) { if (Traccar.ErrorManager.check(success, response)) { - Ext.toast(strings.commandSent); + Ext.toast(Strings.commandSent); this.closeView(); } } diff --git a/web/app/view/Device.js b/web/app/view/Device.js index ce9d24659..3feb008a2 100644 --- a/web/app/view/Device.js +++ b/web/app/view/Device.js @@ -27,56 +27,56 @@ controller: 'device', store: 'Devices', - title: strings.deviceTitle, + title: Strings.deviceTitle, selType: 'rowmodel', tbar: [{ handler: 'onAddClick', reference: 'deviceAddButton', glyph: 'xf067@FontAwesome', - tooltip: strings.sharedAdd, + tooltip: Strings.sharedAdd, tooltipType: 'title' }, { disabled: true, handler: 'onEditClick', reference: 'deviceEditButton', glyph: 'xf040@FontAwesome', - tooltip: strings.sharedEdit, + tooltip: Strings.sharedEdit, tooltipType: 'title' }, { disabled: true, handler: 'onRemoveClick', reference: 'deviceRemoveButton', glyph: 'xf00d@FontAwesome', - tooltip: strings.sharedRemove, + tooltip: Strings.sharedRemove, tooltipType: 'title' }, { disabled: true, handler: 'onCommandClick', reference: 'deviceCommandButton', glyph: 'xf093@FontAwesome', - tooltip: strings.deviceCommand, + tooltip: Strings.deviceCommand, tooltipType: 'title' }, { xtype: 'tbfill' }, { - text: strings.settingsTitle, + text: Strings.settingsTitle, menu: [{ - text: strings.settingsUser, + text: Strings.settingsUser, handler: 'onUserClick' }, { - text: strings.settingsServer, + text: Strings.settingsServer, hidden: true, handler: 'onServerClick', reference: 'settingsServerButton' }, { - text: strings.settingsUsers, + text: Strings.settingsUsers, hidden: true, handler: 'onUsersClick', reference: 'settingsUsersButton' }] }, { - text: strings.loginLogout, + text: Strings.loginLogout, handler: 'onLogoutClick' }], @@ -85,10 +85,10 @@ }, columns: [{ - text: strings.deviceName, + text: Strings.deviceName, dataIndex: 'name', flex: 1 }, { - text: strings.deviceIdentifier, + text: Strings.deviceIdentifier, dataIndex: 'uniqueId', flex: 1 }] diff --git a/web/app/view/DeviceController.js b/web/app/view/DeviceController.js index 045ac426f..4d26f799f 100644 --- a/web/app/view/DeviceController.js +++ b/web/app/view/DeviceController.js @@ -69,12 +69,12 @@ onRemoveClick: function () { var device = this.getView().getSelectionModel().getSelection()[0]; Ext.Msg.show({ - title: strings.deviceDialog, - message: strings.sharedRemoveConfirm, + title: Strings.deviceDialog, + message: Strings.sharedRemoveConfirm, buttons: Ext.Msg.YESNO, buttonText: { - yes: strings.sharedRemove, - no: strings.sharedCancel + yes: Strings.sharedRemove, + no: Strings.sharedCancel }, fn: function (btn) { var store; @@ -121,7 +121,7 @@ onUsersClick: function () { Ext.create('Ext.window.Window', { - title: strings.settingsUsers, + title: Strings.settingsUsers, width: Traccar.Style.windowWidth, height: Traccar.Style.windowHeight, layout: 'fit', diff --git a/web/app/view/DeviceDialog.js b/web/app/view/DeviceDialog.js index 012048b8a..2349676b1 100644 --- a/web/app/view/DeviceDialog.js +++ b/web/app/view/DeviceDialog.js @@ -24,19 +24,19 @@ ], controller: 'baseEditDialog', - title: strings.deviceDialog, + title: Strings.deviceDialog, items: { xtype: 'form', items: [{ xtype: 'textfield', name: 'name', - fieldLabel: strings.deviceName, + fieldLabel: Strings.deviceName, allowBlank: false }, { xtype: 'textfield', name: 'uniqueId', - fieldLabel: strings.deviceIdentifier, + fieldLabel: Strings.deviceIdentifier, allowBlank: false }] } diff --git a/web/app/view/Login.js b/web/app/view/Login.js index b68f80b07..7f34c51cb 100644 --- a/web/app/view/Login.js +++ b/web/app/view/Login.js @@ -42,7 +42,7 @@ items: [{ xtype: 'combobox', name: 'language', - fieldLabel: strings.loginLanguage, + fieldLabel: Strings.loginLanguage, store: 'Languages', displayField: 'name', valueField: 'code', @@ -54,7 +54,7 @@ }, { xtype: 'textfield', name: 'email', - fieldLabel: strings.userEmail, + fieldLabel: Strings.userEmail, allowBlank: false, enableKeyEvents: true, listeners: { @@ -65,7 +65,7 @@ }, { xtype: 'textfield', name: 'password', - fieldLabel: strings.userPassword, + fieldLabel: Strings.userPassword, inputType: 'password', allowBlank: false, enableKeyEvents: true, @@ -83,11 +83,11 @@ }, buttons: [{ - text: strings.loginRegister, + text: Strings.loginRegister, handler: 'onRegisterClick', reference: 'registerButton' }, { - text: strings.loginLogin, + text: Strings.loginLogin, handler: 'onLoginClick' }] }); diff --git a/web/app/view/LoginController.js b/web/app/view/LoginController.js index 05118b170..f6a0414dd 100644 --- a/web/app/view/LoginController.js +++ b/web/app/view/LoginController.js @@ -33,7 +33,7 @@ login: function () { var form = this.lookupReference('form'); if (form.isValid()) { - Ext.getBody().mask(strings.sharedLoading); + Ext.getBody().mask(Strings.sharedLoading); Ext.Ajax.request({ scope: this, url: '/api/login', @@ -46,7 +46,7 @@ Traccar.app.setUser(result.data); this.fireViewEvent('login'); } else { - Traccar.ErrorManager.error(strings.loginFailed); + Traccar.ErrorManager.error(Strings.loginFailed); } } diff --git a/web/app/view/Map.js b/web/app/view/Map.js index 92cab1421..7165bfb56 100644 --- a/web/app/view/Map.js +++ b/web/app/view/Map.js @@ -26,7 +26,7 @@ controller: 'map', - title: strings.mapTitle, + title: Strings.mapTitle, layout: 'fit', listeners: { diff --git a/web/app/view/Register.js b/web/app/view/Register.js index c8fbf0722..04975c74e 100644 --- a/web/app/view/Register.js +++ b/web/app/view/Register.js @@ -33,28 +33,28 @@ items: [{ xtype: 'textfield', name: 'name', - fieldLabel: strings.userName, + fieldLabel: Strings.userName, allowBlank: false }, { xtype: 'textfield', name: 'email', - fieldLabel: strings.userEmail, + fieldLabel: Strings.userEmail, vtype: 'email', allowBlank: false }, { xtype: 'textfield', name: 'password', - fieldLabel: strings.userPassword, + fieldLabel: Strings.userPassword, inputType: 'password', allowBlank: false }] }, buttons: [{ - text: strings.sharedSave, + text: Strings.sharedSave, handler: 'onCreateClick' }, { - text: strings.sharedCancel, + text: Strings.sharedCancel, handler: 'closeView' }] }); diff --git a/web/app/view/RegisterController.js b/web/app/view/RegisterController.js index 94238acf3..36a423a30 100644 --- a/web/app/view/RegisterController.js +++ b/web/app/view/RegisterController.js @@ -35,7 +35,7 @@ onCreateReturn: function (options, success, response) { if (Traccar.ErrorManager.check(success, response)) { this.closeView(); - Ext.toast(strings.loginCreated); + Ext.toast(Strings.loginCreated); } } diff --git a/web/app/view/Report.js b/web/app/view/Report.js index b930dd3b0..93f2ca1ee 100644 --- a/web/app/view/Report.js +++ b/web/app/view/Report.js @@ -27,11 +27,11 @@ controller: 'report', store: 'Positions', - title: strings.reportTitle, + title: Strings.reportTitle, tbar: [{ xtype: 'tbtext', - html: strings.reportDevice + html: Strings.reportDevice }, { xtype: 'combobox', reference: 'deviceField', @@ -42,7 +42,7 @@ queryMode: 'local' }, '-', { xtype: 'tbtext', - html: strings.reportFrom + html: Strings.reportFrom }, { xtype: 'datefield', reference: 'fromDateField', @@ -56,7 +56,7 @@ value: new Date(new Date().getTime() - 30 * 60 * 1000) }, '-', { xtype: 'tbtext', - html: strings.reportTo + html: Strings.reportTo }, { xtype: 'datefield', reference: 'toDateField', @@ -69,10 +69,10 @@ format: Traccar.Style.timeFormat, value: new Date() }, '-', { - text: strings.reportShow, + text: Strings.reportShow, handler: 'onShowClick' }, { - text: strings.reportClear, + text: Strings.reportClear, handler: 'onClearClick' }], @@ -81,38 +81,38 @@ }, columns: [{ - text: strings.positionValid, + text: Strings.positionValid, dataIndex: 'valid', flex: 1, renderer: Traccar.AttributeFormatter.getFormatter('valid') }, { - text: strings.positionTime, + text: Strings.positionTime, dataIndex: 'fixTime', flex: 1, xtype: 'datecolumn', renderer: Traccar.AttributeFormatter.getFormatter('fixTime') }, { - text: strings.positionLatitude, + text: Strings.positionLatitude, dataIndex: 'latitude', flex: 1, renderer: Traccar.AttributeFormatter.getFormatter('latitude') }, { - text: strings.positionLongitude, + text: Strings.positionLongitude, dataIndex: 'longitude', flex: 1, renderer: Traccar.AttributeFormatter.getFormatter('latitude') }, { - text: strings.positionAltitude, + text: Strings.positionAltitude, dataIndex: 'altitude', flex: 1, renderer: Traccar.AttributeFormatter.getFormatter('altitude') }, { - text: strings.positionSpeed, + text: Strings.positionSpeed, dataIndex: 'speed', flex: 1, renderer: Traccar.AttributeFormatter.getFormatter('speed') }, { - text: strings.positionAddress, + text: Strings.positionAddress, dataIndex: 'address', flex: 1, renderer: Traccar.AttributeFormatter.getFormatter('address') diff --git a/web/app/view/ServerDialog.js b/web/app/view/ServerDialog.js index a9751d647..fa5ede524 100644 --- a/web/app/view/ServerDialog.js +++ b/web/app/view/ServerDialog.js @@ -24,56 +24,56 @@ ], controller: 'baseEditDialog', - title: strings.serverTitle, + title: Strings.serverTitle, items: { xtype: 'form', items: [{ xtype: 'checkboxfield', name: 'registration', - fieldLabel: strings.serverRegistration, + fieldLabel: Strings.serverRegistration, allowBlank: false }, { xtype: 'combobox', name: 'map', - fieldLabel: strings.mapLayer, + fieldLabel: Strings.mapLayer, store: 'MapTypes', displayField: 'name', valueField: 'key' }, { xtype: 'textfield', name: 'bingKey', - fieldLabel: strings.mapBingKey + fieldLabel: Strings.mapBingKey }, { xtype: 'textfield', name: 'mapUrl', - fieldLabel: strings.mapCustom + fieldLabel: Strings.mapCustom }, { xtype: 'combobox', name: 'distanceUnit', - fieldLabel: strings.settingsDistanceUnit, + fieldLabel: Strings.settingsDistanceUnit, store: 'DistanceUnits', displayField: 'name', valueField: 'key' }, { xtype: 'combobox', name: 'speedUnit', - fieldLabel: strings.settingsSpeedUnit, + fieldLabel: Strings.settingsSpeedUnit, store: 'SpeedUnits', displayField: 'name', valueField: 'key' }, { xtype: 'numberfield', name: 'latitude', - fieldLabel: strings.positionLatitude + fieldLabel: Strings.positionLatitude }, { xtype: 'numberfield', name: 'longitude', - fieldLabel: strings.positionLongitude + fieldLabel: Strings.positionLongitude }, { xtype: 'numberfield', name: 'zoom', - fieldLabel: strings.serverZoom + fieldLabel: Strings.serverZoom }] } }); diff --git a/web/app/view/State.js b/web/app/view/State.js index 5cb31c676..b67c9a46f 100644 --- a/web/app/view/State.js +++ b/web/app/view/State.js @@ -27,14 +27,14 @@ controller: 'state', store: 'Attributes', - title: strings.stateTitle, + title: Strings.stateTitle, columns: [{ - text: strings.stateName, + text: Strings.stateName, dataIndex: 'name', flex: 1 }, { - text: strings.stateValue, + text: Strings.stateValue, dataIndex: 'value', flex: 1 }] diff --git a/web/app/view/StateController.js b/web/app/view/StateController.js index c0b3c1056..ad44d7ac7 100644 --- a/web/app/view/StateController.js +++ b/web/app/view/StateController.js @@ -39,39 +39,39 @@ keys: { fixTime: { priority: 1, - name: strings.positionTime + name: Strings.positionTime }, latitude: { priority: 2, - name: strings.positionLatitude + name: Strings.positionLatitude }, longitude: { priority: 3, - name: strings.positionLongitude + name: Strings.positionLongitude }, valid: { priority: 4, - name: strings.positionValid + name: Strings.positionValid }, altitude: { priority: 5, - name: strings.positionAltitude + name: Strings.positionAltitude }, speed: { priority: 6, - name: strings.positionSpeed + name: Strings.positionSpeed }, course: { priority: 7, - name: strings.positionCourse + name: Strings.positionCourse }, address: { priority: 8, - name: strings.positionAddress + name: Strings.positionAddress }, protocol: { priority: 9, - name: strings.positionProtocol + name: Strings.positionProtocol } }, diff --git a/web/app/view/User.js b/web/app/view/User.js index 61ff01ab5..9eb0232f7 100644 --- a/web/app/view/User.js +++ b/web/app/view/User.js @@ -30,21 +30,21 @@ selType: 'rowmodel', tbar: [{ - text: strings.sharedAdd, + text: Strings.sharedAdd, handler: 'onAddClick', reference: 'deviceAddButton' }, { - text: strings.sharedEdit, + text: Strings.sharedEdit, disabled: true, handler: 'onEditClick', reference: 'userEditButton' }, { - text: strings.sharedRemove, + text: Strings.sharedRemove, disabled: true, handler: 'onRemoveClick', reference: 'userRemoveButton' }, { - text: strings.deviceTitle, + text: Strings.deviceTitle, disabled: true, handler: 'onDevicesClick', reference: 'userDevicesButton' @@ -55,9 +55,9 @@ }, columns: [ - {text: strings.userName, dataIndex: 'name', flex: 1}, - {text: strings.userEmail, dataIndex: 'email', flex: 1}, - {text: strings.userAdmin, dataIndex: 'admin', flex: 1} + {text: Strings.userName, dataIndex: 'name', flex: 1}, + {text: Strings.userEmail, dataIndex: 'email', flex: 1}, + {text: Strings.userAdmin, dataIndex: 'admin', flex: 1} ] }); diff --git a/web/app/view/UserController.js b/web/app/view/UserController.js index cd0a4bd0b..d5535bce3 100644 --- a/web/app/view/UserController.js +++ b/web/app/view/UserController.js @@ -45,12 +45,12 @@ onRemoveClick: function () { var user = this.getView().getSelectionModel().getSelection()[0]; Ext.Msg.show({ - title: strings.settingsUser, - message: strings.sharedRemoveConfirm, + title: Strings.settingsUser, + message: Strings.sharedRemoveConfirm, buttons: Ext.Msg.YESNO, buttonText: { - yes: strings.sharedRemove, - no: strings.sharedCancel + yes: Strings.sharedRemove, + no: Strings.sharedCancel }, fn: function (btn) { if (btn === 'yes') { @@ -65,7 +65,7 @@ onDevicesClick: function () { // TODO show devices /*Ext.create('Ext.window.Window', { - title: strings.settingsUsers, + title: Strings.settingsUsers, width: Traccar.Style.windowWidth, height: Traccar.Style.windowHeight, layout: 'fit', diff --git a/web/app/view/UserDialog.js b/web/app/view/UserDialog.js index 2048051be..f66c5af02 100644 --- a/web/app/view/UserDialog.js +++ b/web/app/view/UserDialog.js @@ -25,65 +25,65 @@ controller: 'userDialog', - title: strings.settingsUser, + title: Strings.settingsUser, items: { xtype: 'form', items: [{ xtype: 'textfield', name: 'name', - fieldLabel: strings.userName + fieldLabel: Strings.userName }, { xtype: 'textfield', name: 'email', - fieldLabel: strings.userEmail, + fieldLabel: Strings.userEmail, allowBlank: false }, { xtype: 'textfield', name: 'password', - fieldLabel: strings.userPassword, + fieldLabel: Strings.userPassword, inputType: 'password', allowBlank: false }, { xtype: 'checkboxfield', name: 'admin', - fieldLabel: strings.userAdmin, + fieldLabel: Strings.userAdmin, allowBlank: false, disabled: true, reference: 'adminField' }, { xtype: 'combobox', name: 'map', - fieldLabel: strings.mapLayer, + fieldLabel: Strings.mapLayer, store: 'MapTypes', displayField: 'name', valueField: 'key' }, { xtype: 'combobox', name: 'distanceUnit', - fieldLabel: strings.settingsDistanceUnit, + fieldLabel: Strings.settingsDistanceUnit, store: 'DistanceUnits', displayField: 'name', valueField: 'key' }, { xtype: 'combobox', name: 'speedUnit', - fieldLabel: strings.settingsSpeedUnit, + fieldLabel: Strings.settingsSpeedUnit, store: 'SpeedUnits', displayField: 'name', valueField: 'key' }, { xtype: 'numberfield', name: 'latitude', - fieldLabel: strings.positionLatitude + fieldLabel: Strings.positionLatitude }, { xtype: 'numberfield', name: 'longitude', - fieldLabel: strings.positionLongitude + fieldLabel: Strings.positionLongitude }, { xtype: 'numberfield', name: 'zoom', - fieldLabel: strings.serverZoom + fieldLabel: Strings.serverZoom }] } }); -- cgit v1.2.3