From e301d477ee95c0ae7f3d06f0950368cb5d8fe226 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Mon, 3 Aug 2015 10:59:20 +1200 Subject: Rename string properties --- web/app/view/admin/ServerDialog.js | 20 +++++++++--------- web/app/view/command/CommandDialog.js | 12 +++++------ web/app/view/command/CommandDialogController.js | 2 +- web/app/view/device/Device.js | 24 ++++++++++----------- web/app/view/device/DeviceController.js | 10 ++++----- web/app/view/device/DeviceDialog.js | 10 ++++----- web/app/view/login/Login.js | 12 +++++------ web/app/view/login/LoginController.js | 4 ++-- web/app/view/login/Register.js | 12 +++++------ web/app/view/login/RegisterController.js | 2 +- web/app/view/map/Map.js | 2 +- web/app/view/report/Report.js | 28 ++++++++++++------------- web/app/view/state/State.js | 6 +++--- web/app/view/state/StateController.js | 18 ++++++++-------- web/app/view/user/User.js | 12 +++++------ web/app/view/user/UserController.js | 8 +++---- web/app/view/user/UserDialog.js | 26 +++++++++++------------ 17 files changed, 104 insertions(+), 104 deletions(-) (limited to 'web/app/view') diff --git a/web/app/view/admin/ServerDialog.js b/web/app/view/admin/ServerDialog.js index de3efd6fa..9357f8874 100644 --- a/web/app/view/admin/ServerDialog.js +++ b/web/app/view/admin/ServerDialog.js @@ -25,7 +25,7 @@ Ext.define('Traccar.view.admin.ServerDialog', { controller: 'serverdialog', bodyPadding: styles.panel_padding, - title: strings.server_title, + title: strings.serverTitle, resizable: false, modal: true, @@ -34,49 +34,49 @@ Ext.define('Traccar.view.admin.ServerDialog', { items: [{ xtype: 'checkboxfield', name: 'registration', - fieldLabel: strings.server_registration, + fieldLabel: strings.serverRegistration, allowBlank: false }, { xtype: 'combobox', name: 'map', - fieldLabel: strings.map_layer, + fieldLabel: strings.mapLayer, store: 'MapTypes', displayField: 'name', valueField: 'key' }, { xtype: 'combobox', name: 'distanceUnit', - fieldLabel: strings.settings_distance_unit, + fieldLabel: strings.settingsDistanceUnit, store: 'DistanceUnits', displayField: 'name', valueField: 'key' }, { xtype: 'combobox', name: 'speedUnit', - fieldLabel: strings.settings_speed_unit, + fieldLabel: strings.settingsSpeedUnit, store: 'SpeedUnits', displayField: 'name', valueField: 'key' }, { xtype: 'numberfield', name: 'latitude', - fieldLabel: strings.position_latitude + fieldLabel: strings.positionLatitude }, { xtype: 'numberfield', name: 'longitude', - fieldLabel: strings.position_longitude + fieldLabel: strings.positionLongitude }, { xtype: 'numberfield', name: 'zoom', - fieldLabel: strings.server_zoom + fieldLabel: strings.serverZoom }] }, buttons: [{ - text: strings.shared_save, + text: strings.sharedSave, handler: 'onSaveClick' }, { - text: strings.shared_cancel, + text: strings.sharedCancel, handler: 'onCancelClick' }] diff --git a/web/app/view/command/CommandDialog.js b/web/app/view/command/CommandDialog.js index a8da68380..ae88add21 100644 --- a/web/app/view/command/CommandDialog.js +++ b/web/app/view/command/CommandDialog.js @@ -25,7 +25,7 @@ Ext.define('Traccar.view.command.CommandDialog', { controller: 'commanddialog', bodyPadding: styles.panel_padding, - title: strings.command_title, + title: strings.commandTitle, resizable: false, modal: true, @@ -34,7 +34,7 @@ Ext.define('Traccar.view.command.CommandDialog', { items: [{ xtype: 'combobox', name: 'type', - fieldLabel: strings.command_type, + fieldLabel: strings.commandType, store: 'CommandTypes', displayField: 'name', valueField: 'key', @@ -49,11 +49,11 @@ Ext.define('Traccar.view.command.CommandDialog', { items: [{ xtype: 'numberfield', - fieldLabel: strings.command_frequency, + fieldLabel: strings.commandFrequency, name: 'frequency' }, { xtype: 'combobox', - fieldLabel: strings.command_unit, + fieldLabel: strings.commandUnit, name: 'unit', store: 'TimeUnits', displayField: 'name', @@ -63,10 +63,10 @@ Ext.define('Traccar.view.command.CommandDialog', { }, buttons: [{ - text: strings.command_send, + text: strings.commandSend, handler: 'onSendClick' }, { - text: strings.shared_cancel, + text: strings.sharedCancel, handler: 'onCancelClick' }] diff --git a/web/app/view/command/CommandDialogController.js b/web/app/view/command/CommandDialogController.js index c5e98450f..84004e2aa 100644 --- a/web/app/view/command/CommandDialogController.js +++ b/web/app/view/command/CommandDialogController.js @@ -50,7 +50,7 @@ Ext.define('Traccar.view.command.CommandDialogController', { onSendReturn: function(options, success, response) { if (Traccar.ErrorManager.check(success, response)) { this.closeView(); - //TODO toast Ext.toast(strings.login_created); + //TODO toast Ext.toast(strings.loginCreated); } }, diff --git a/web/app/view/device/Device.js b/web/app/view/device/Device.js index ef225ff31..1435dcaf1 100644 --- a/web/app/view/device/Device.js +++ b/web/app/view/device/Device.js @@ -25,56 +25,56 @@ Ext.define('Traccar.view.device.Device', { controller: 'device', store: 'Devices', - title: strings.device_title, + title: strings.deviceTitle, selType: 'rowmodel', tbar: [{ handler: 'onAddClick', reference: 'deviceAddButton', glyph: 'xf067@FontAwesome', - tooltip: strings.shared_add, + tooltip: strings.sharedAdd, tooltipType: 'title' }, { disabled: true, handler: 'onEditClick', reference: 'deviceEditButton', glyph: 'xf040@FontAwesome', - tooltip: strings.shared_edit, + tooltip: strings.sharedEdit, tooltipType: 'title' }, { disabled: true, handler: 'onRemoveClick', reference: 'deviceRemoveButton', glyph: 'xf00d@FontAwesome', - tooltip: strings.shared_remove, + tooltip: strings.sharedRemove, tooltipType: 'title' }, { disabled: true, handler: 'onCommandClick', reference: 'deviceCommandButton', glyph: 'xf093@FontAwesome', - tooltip: strings.device_command, + tooltip: strings.deviceCommand, tooltipType: 'title' }, { xtype: 'tbfill' }, { - text: strings.settings_title, + text: strings.settingsTitle, menu: [{ - text: strings.settings_user, + text: strings.settingsUser, handler: 'onUserClick' }, { - text: strings.settings_server, + text: strings.settingsServer, disabled: true, handler: 'onServerClick', reference: 'settingsServerButton' }, { - text: strings.settings_users, + text: strings.settingsUsers, disabled: true, handler: 'onUsersClick', reference: 'settingsUsersButton' }] }, { - text: strings.login_logout, + text: strings.loginLogout, handler: 'onLogoutClick' }], @@ -83,8 +83,8 @@ Ext.define('Traccar.view.device.Device', { }, columns: [ - { text: strings.device_name, dataIndex: 'name', flex: 1 }, - { text: strings.device_identifier, dataIndex: 'uniqueId', flex: 1 } + { text: strings.deviceName, dataIndex: 'name', flex: 1 }, + { text: strings.deviceIdentifier, dataIndex: 'uniqueId', flex: 1 } ] }); diff --git a/web/app/view/device/DeviceController.js b/web/app/view/device/DeviceController.js index f5577f156..ae4abf4a7 100644 --- a/web/app/view/device/DeviceController.js +++ b/web/app/view/device/DeviceController.js @@ -64,12 +64,12 @@ Ext.define('Traccar.view.device.DeviceController', { onRemoveClick: function() { var device = this.getView().getSelectionModel().getSelection()[0]; Ext.Msg.show({ - title: strings.device_dialog, - message: strings.shared_remove_confirm, + title: strings.deviceDialog, + message: strings.sharedRemoveConfirm, buttons: Ext.Msg.YESNO, buttonText: { - yes: strings.shared_remove, - no: strings.shared_cancel + yes: strings.sharedRemove, + no: strings.sharedCancel }, fn: function(btn) { if (btn === 'yes') { @@ -116,7 +116,7 @@ Ext.define('Traccar.view.device.DeviceController', { onUsersClick: function() { Ext.create('Ext.window.Window', { - title: strings.settings_users, + title: strings.settingsUsers, width: styles.window_width, height: styles.window_height, layout: 'fit', diff --git a/web/app/view/device/DeviceDialog.js b/web/app/view/device/DeviceDialog.js index 5d2b30ddc..b5f29782b 100644 --- a/web/app/view/device/DeviceDialog.js +++ b/web/app/view/device/DeviceDialog.js @@ -25,7 +25,7 @@ Ext.define('Traccar.view.device.DeviceDialog', { controller: 'devicedialog', bodyPadding: styles.panel_padding, - title: strings.device_dialog, + title: strings.deviceDialog, resizable: false, modal: true, @@ -34,21 +34,21 @@ Ext.define('Traccar.view.device.DeviceDialog', { items: [{ xtype: 'textfield', name: 'name', - fieldLabel: strings.device_name, + fieldLabel: strings.deviceName, allowBlank: false }, { xtype: 'textfield', name: 'uniqueId', - fieldLabel: strings.device_identifier, + fieldLabel: strings.deviceIdentifier, allowBlank: false }] }, buttons: [{ - text: strings.shared_save, + text: strings.sharedSave, handler: 'onSaveClick' }, { - text: strings.shared_cancel, + text: strings.sharedCancel, handler: 'onCancelClick' }] diff --git a/web/app/view/login/Login.js b/web/app/view/login/Login.js index f49857644..f468edaa0 100644 --- a/web/app/view/login/Login.js +++ b/web/app/view/login/Login.js @@ -24,7 +24,7 @@ Ext.define('Traccar.view.login.Login', { controller: 'login', bodyPadding: styles.panel_padding, - title: strings.login_title, + title: strings.loginTitle, closable: false, resizable: false, @@ -35,7 +35,7 @@ Ext.define('Traccar.view.login.Login', { items: [{ xtype: 'combobox', name: 'language', - fieldLabel: strings.login_language, + fieldLabel: strings.loginLanguage, store: 'Languages', displayField: 'name', valueField: 'code', @@ -47,7 +47,7 @@ Ext.define('Traccar.view.login.Login', { }, { xtype: 'textfield', name: 'email', - fieldLabel: strings.user_email, + fieldLabel: strings.userEmail, allowBlank: false, enableKeyEvents: true, listeners: { @@ -57,7 +57,7 @@ Ext.define('Traccar.view.login.Login', { }, { xtype: 'textfield', name: 'password', - fieldLabel: strings.user_password, + fieldLabel: strings.userPassword, inputType: 'password', allowBlank: false, enableKeyEvents: true, @@ -68,11 +68,11 @@ Ext.define('Traccar.view.login.Login', { }, buttons: [{ - text: strings.login_register, + text: strings.loginRegister, handler: 'onRegisterClick', reference: 'registerButton' }, { - text: strings.login_login, + text: strings.loginLogin, handler: 'onLoginClick' }] diff --git a/web/app/view/login/LoginController.js b/web/app/view/login/LoginController.js index 95b5900c9..2cc72caf2 100644 --- a/web/app/view/login/LoginController.js +++ b/web/app/view/login/LoginController.js @@ -67,7 +67,7 @@ Ext.define('Traccar.view.login.LoginController', { doLogin: function() { var form = this.lookupReference('form'); if (form.isValid()) { - Ext.getBody().mask(strings.shared_loading); + Ext.getBody().mask(strings.sharedLoading); Traccar.LoginManager.login({ data: form.getValues(), @@ -82,7 +82,7 @@ Ext.define('Traccar.view.login.LoginController', { if (success) { this.fireViewEvent('login'); } else { - Traccar.ErrorManager.error(strings.login_failed); + Traccar.ErrorManager.error(strings.loginFailed); } }, diff --git a/web/app/view/login/Register.js b/web/app/view/login/Register.js index 909ed2fba..9be588be1 100644 --- a/web/app/view/login/Register.js +++ b/web/app/view/login/Register.js @@ -24,7 +24,7 @@ Ext.define('Traccar.view.login.Register', { controller: 'register', bodyPadding: styles.panel_padding, - title: strings.login_register, + title: strings.loginRegister, resizable: false, modal: true, @@ -36,28 +36,28 @@ Ext.define('Traccar.view.login.Register', { items: [{ xtype: 'textfield', name: 'name', - fieldLabel: strings.user_name, + fieldLabel: strings.userName, allowBlank: false }, { xtype: 'textfield', name: 'email', - fieldLabel: strings.user_email, + fieldLabel: strings.userEmail, vtype: 'email', allowBlank: false }, { xtype: 'textfield', name: 'password', - fieldLabel: strings.user_password, + fieldLabel: strings.userPassword, inputType: 'password', allowBlank: false }] }, buttons: [{ - text: strings.shared_save, + text: strings.sharedSave, handler: 'onCreateClick' }, { - text: strings.shared_cancel, + text: strings.sharedCancel, handler: 'closeView' }] diff --git a/web/app/view/login/RegisterController.js b/web/app/view/login/RegisterController.js index e690b56e8..b1957ba8f 100644 --- a/web/app/view/login/RegisterController.js +++ b/web/app/view/login/RegisterController.js @@ -33,7 +33,7 @@ Ext.define('Traccar.view.login.RegisterController', { onCreateReturn: function(options, success, response) { if (Traccar.ErrorManager.check(success, response)) { this.closeView(); - Ext.toast(strings.login_created); + Ext.toast(strings.loginCreated); } } diff --git a/web/app/view/map/Map.js b/web/app/view/map/Map.js index 57ecebe7d..00daa774c 100644 --- a/web/app/view/map/Map.js +++ b/web/app/view/map/Map.js @@ -24,7 +24,7 @@ Ext.define('Traccar.view.map.Map', { controller: 'map', - title: strings.map_title, + title: strings.mapTitle, layout: 'fit', listeners: { diff --git a/web/app/view/report/Report.js b/web/app/view/report/Report.js index 320d336fa..8e6fe0397 100644 --- a/web/app/view/report/Report.js +++ b/web/app/view/report/Report.js @@ -25,11 +25,11 @@ Ext.define('Traccar.view.report.Report', { controller: 'report', store: 'Positions', - title: strings.report_title, + title: strings.reportTitle, tbar: [{ xtype: 'tbtext', - html: strings.report_device + html: strings.reportDevice }, { xtype: 'combobox', reference: 'deviceField', @@ -40,7 +40,7 @@ Ext.define('Traccar.view.report.Report', { queryMode: 'local' }, '-', { xtype: 'tbtext', - html: strings.report_from + html: strings.reportFrom }, { xtype: 'datefield', reference: 'fromDateField', @@ -52,7 +52,7 @@ Ext.define('Traccar.view.report.Report', { value: new Date() }, '-', { xtype: 'tbtext', - html: strings.report_to + html: strings.reportTo }, { xtype: 'datefield', reference: 'toDateField', @@ -63,10 +63,10 @@ Ext.define('Traccar.view.report.Report', { maxWidth: styles.report_time, value: new Date() }, '-', { - text: strings.report_show, + text: strings.reportShow, handler: 'onShowClick' }, { - text: strings.report_clear, + text: strings.reportClear, handler: 'onClearClick' }], @@ -75,13 +75,13 @@ Ext.define('Traccar.view.report.Report', { }, columns: [ - { text: strings.position_valid, dataIndex: 'valid', flex: 1 }, - { text: strings.position_time, dataIndex: 'fixTime', flex: 1, xtype: 'datecolumn', format: styles.report_format }, - { text: strings.position_latitude, dataIndex: 'latitude', flex: 1 }, - { text: strings.position_longitude, dataIndex: 'longitude', flex: 1 }, - { text: strings.position_altitude, dataIndex: 'altitude', flex: 1 }, + { text: strings.positionValid, dataIndex: 'valid', flex: 1 }, + { text: strings.positionTime, dataIndex: 'fixTime', flex: 1, xtype: 'datecolumn', format: styles.report_format }, + { text: strings.positionLatitude, dataIndex: 'latitude', flex: 1 }, + { text: strings.positionLongitude, dataIndex: 'longitude', flex: 1 }, + { text: strings.positionAltitude, dataIndex: 'altitude', flex: 1 }, { - text: strings.position_speed, + text: strings.positionSpeed, dataIndex: 'speed', flex: 1, renderer: function(value) { @@ -90,8 +90,8 @@ Ext.define('Traccar.view.report.Report', { return speedUnits.convert(value, unit) + ' ' + speedUnits.getUnitName(unit); } }, - { text: strings.position_course, dataIndex: 'course', flex: 1 }, - { text: strings.position_address, dataIndex: 'address', flex: 1 } + { text: strings.positionCourse, dataIndex: 'course', flex: 1 }, + { text: strings.positionAddress, dataIndex: 'address', flex: 1 } ] }); diff --git a/web/app/view/state/State.js b/web/app/view/state/State.js index 595d845a2..39460dc52 100644 --- a/web/app/view/state/State.js +++ b/web/app/view/state/State.js @@ -25,11 +25,11 @@ Ext.define('Traccar.view.state.State', { controller: 'state', store: 'Parameters', - title: strings.state_title, + title: strings.stateTitle, columns: [ - { text: strings.state_name, dataIndex: 'name', flex: 1 }, - { text: strings.state_value, dataIndex: 'value', flex: 1 } + { text: strings.stateName, dataIndex: 'name', flex: 1 }, + { text: strings.stateValue, dataIndex: 'value', flex: 1 } ] }); diff --git a/web/app/view/state/StateController.js b/web/app/view/state/StateController.js index 66b1c48ac..58b63120b 100644 --- a/web/app/view/state/StateController.js +++ b/web/app/view/state/StateController.js @@ -37,39 +37,39 @@ Ext.define('Traccar.view.state.StateController', { keys: { 'fixTime': { priority: 1, - name: strings.position_time + name: strings.positionTime }, 'latitude': { priority: 2, - name: strings.position_latitude + name: strings.positionLatitude }, 'longitude': { priority: 3, - name: strings.position_longitude + name: strings.positionLongitude }, 'valid': { priority: 4, - name: strings.position_valid + name: strings.positionValid }, 'altitude': { priority: 5, - name: strings.position_altitude + name: strings.positionAltitude }, 'speed': { priority: 6, - name: strings.position_speed + name: strings.positionSpeed }, 'course': { priority: 7, - name: strings.position_course + name: strings.positionCourse }, 'address': { priority: 8, - name: strings.position_address + name: strings.positionAddress }, 'protocol': { priority: 9, - name: strings.position_protocol + name: strings.positionProtocol } }, diff --git a/web/app/view/user/User.js b/web/app/view/user/User.js index 76779ef79..a355bbe2f 100644 --- a/web/app/view/user/User.js +++ b/web/app/view/user/User.js @@ -28,16 +28,16 @@ Ext.define('Traccar.view.user.User', { selType: 'rowmodel', tbar: [{ - text: strings.shared_add, + text: strings.sharedAdd, handler: 'onAddClick', reference: 'deviceAddButton' }, { - text: strings.shared_edit, + text: strings.sharedEdit, disabled: true, handler: 'onEditClick', reference: 'userEditButton' }, { - text: strings.shared_remove, + text: strings.sharedRemove, disabled: true, handler: 'onRemoveClick', reference: 'userRemoveButton' @@ -48,9 +48,9 @@ Ext.define('Traccar.view.user.User', { }, columns: [ - { text: strings.user_name, dataIndex: 'name', flex: 1 }, - { text: strings.user_email, dataIndex: 'email', flex: 1 }, - { text: strings.user_admin, 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/user/UserController.js b/web/app/view/user/UserController.js index 510a7d6c8..c4fa04ff3 100644 --- a/web/app/view/user/UserController.js +++ b/web/app/view/user/UserController.js @@ -47,12 +47,12 @@ Ext.define('Traccar.view.user.UserController', { onRemoveClick: function() { var user = this.getView().getSelectionModel().getSelection()[0]; Ext.Msg.show({ - title: strings.settings_user, - message: strings.shared_remove_confirm, + title: strings.settingsUser, + message: strings.sharedRemoveConfirm, buttons: Ext.Msg.YESNO, buttonText: { - yes: strings.shared_remove, - no: strings.shared_cancel + yes: strings.sharedRemove, + no: strings.sharedCancel }, fn: function(btn) { if (btn === 'yes') { diff --git a/web/app/view/user/UserDialog.js b/web/app/view/user/UserDialog.js index 67bf2ccf1..ff624f9bb 100644 --- a/web/app/view/user/UserDialog.js +++ b/web/app/view/user/UserDialog.js @@ -25,7 +25,7 @@ Ext.define('Traccar.view.user.UserDialog', { controller: 'userdialog', bodyPadding: styles.panel_padding, - title: strings.settings_user, + title: strings.settingsUser, resizable: false, modal: true, @@ -34,66 +34,66 @@ Ext.define('Traccar.view.user.UserDialog', { items: [{ xtype: 'textfield', name: 'name', - fieldLabel: strings.user_name + fieldLabel: strings.userName }, { xtype: 'textfield', name: 'email', - fieldLabel: strings.user_email, + fieldLabel: strings.userEmail, allowBlank: false }, { xtype: 'textfield', name: 'password', - fieldLabel: strings.user_password, + fieldLabel: strings.userPassword, inputType: 'password', allowBlank: false }, { xtype: 'checkboxfield', name: 'admin', - fieldLabel: strings.user_admin, + fieldLabel: strings.userAdmin, allowBlank: false, disabled: true, reference: 'adminField' }, { xtype: 'combobox', name: 'map', - fieldLabel: strings.map_layer, + fieldLabel: strings.mapLayer, store: 'MapTypes', displayField: 'name', valueField: 'key' }, { xtype: 'combobox', name: 'distanceUnit', - fieldLabel: strings.settings_distance_unit, + fieldLabel: strings.settingsDistanceUnit, store: 'DistanceUnits', displayField: 'name', valueField: 'key' }, { xtype: 'combobox', name: 'speedUnit', - fieldLabel: strings.settings_speed_unit, + fieldLabel: strings.settingsSpeedUnit, store: 'SpeedUnits', displayField: 'name', valueField: 'key' }, { xtype: 'numberfield', name: 'latitude', - fieldLabel: strings.position_latitude + fieldLabel: strings.positionLatitude }, { xtype: 'numberfield', name: 'longitude', - fieldLabel: strings.position_longitude + fieldLabel: strings.positionLongitude }, { xtype: 'numberfield', name: 'zoom', - fieldLabel: strings.server_zoom + fieldLabel: strings.serverZoom }] }, buttons: [{ - text: strings.shared_save, + text: strings.sharedSave, handler: 'onSaveClick' }, { - text: strings.shared_cancel, + text: strings.sharedCancel, handler: 'onCancelClick' }] -- cgit v1.2.3