aboutsummaryrefslogtreecommitdiff
path: root/web/app/view
diff options
context:
space:
mode:
Diffstat (limited to 'web/app/view')
-rw-r--r--web/app/view/admin/ServerDialog.js8
-rw-r--r--web/app/view/device/Device.js23
-rw-r--r--web/app/view/device/DeviceController.js8
-rw-r--r--web/app/view/device/DeviceDialog.js4
-rw-r--r--web/app/view/login/Login.js4
-rw-r--r--web/app/view/login/Register.js10
-rw-r--r--web/app/view/report/Report.js16
-rw-r--r--web/app/view/state/StateController.js16
-rw-r--r--web/app/view/user/User.js12
-rw-r--r--web/app/view/user/UserController.js8
-rw-r--r--web/app/view/user/UserDialog.js14
11 files changed, 62 insertions, 61 deletions
diff --git a/web/app/view/admin/ServerDialog.js b/web/app/view/admin/ServerDialog.js
index d3cbc3492..cc1fe2918 100644
--- a/web/app/view/admin/ServerDialog.js
+++ b/web/app/view/admin/ServerDialog.js
@@ -39,11 +39,11 @@ Ext.define('Traccar.view.admin.ServerDialog', {
}, {
xtype: 'numberfield',
name: 'latitude',
- fieldLabel: strings.server_latitude
+ fieldLabel: strings.position_latitude
}, {
xtype: 'numberfield',
name: 'longitude',
- fieldLabel: strings.server_longitude
+ fieldLabel: strings.position_longitude
}, {
xtype: 'numberfield',
name: 'zoom',
@@ -52,10 +52,10 @@ Ext.define('Traccar.view.admin.ServerDialog', {
},
buttons: [{
- text: strings.dialog_save,
+ text: strings.shared_save,
handler: 'onSaveClick'
}, {
- text: strings.dialog_cancel,
+ text: strings.shared_cancel,
handler: 'onCancelClick'
}]
diff --git a/web/app/view/device/Device.js b/web/app/view/device/Device.js
index 25c067242..0f8cb876e 100644
--- a/web/app/view/device/Device.js
+++ b/web/app/view/device/Device.js
@@ -29,39 +29,40 @@ Ext.define('Traccar.view.device.Device', {
selType: 'rowmodel',
tbar: [{
- text: strings.device_add,
+ text: strings.shared_add,
handler: 'onAddClick',
- reference: 'deviceAddButton'
+ reference: 'deviceAddButton',
+ glyph: 'xf067@FontAwesome'
}, {
- text: strings.device_edit,
disabled: true,
handler: 'onEditClick',
- reference: 'deviceEditButton'
+ reference: 'deviceEditButton',
+ glyph: 'xf040@FontAwesome'
}, {
- text: strings.device_remove,
disabled: true,
handler: 'onRemoveClick',
- reference: 'deviceRemoveButton'
+ reference: 'deviceRemoveButton',
+ glyph: 'xf00d@FontAwesome'
}, {
xtype: 'tbfill'
}, {
- text: strings.device_settings,
+ text: strings.settings_title,
menu: [{
- text: strings.device_settings_user,
+ text: strings.settings_user,
handler: 'onUserClick'
}, {
- text: strings.device_settings_server,
+ text: strings.settings_server,
disabled: true,
handler: 'onServerClick',
reference: 'settingsServerButton'
}, {
- text: strings.device_settings_users,
+ text: strings.settings_users,
disabled: true,
handler: 'onUsersClick',
reference: 'settingsUsersButton'
}]
}, {
- text: strings.device_logout,
+ text: strings.login_logout,
handler: 'onLogoutClick'
}],
diff --git a/web/app/view/device/DeviceController.js b/web/app/view/device/DeviceController.js
index ba9eabb5a..c85ac731a 100644
--- a/web/app/view/device/DeviceController.js
+++ b/web/app/view/device/DeviceController.js
@@ -64,11 +64,11 @@ Ext.define('Traccar.view.device.DeviceController', {
var device = this.getView().getSelectionModel().getSelection()[0];
Ext.Msg.show({
title: strings.device_dialog,
- message: strings.device_remove_confirm,
+ message: strings.shared_remove_confirm,
buttons: Ext.Msg.YESNO,
buttonText: {
- yes: strings.dialog_delete,
- no: strings.dialog_cancel
+ yes: strings.shared_remove,
+ no: strings.shared_cancel
},
fn: function(btn) {
if (btn === 'yes') {
@@ -105,7 +105,7 @@ Ext.define('Traccar.view.device.DeviceController', {
onUsersClick: function() {
Ext.create('Ext.window.Window', {
- title: strings.login_users_title,
+ title: strings.settings_users,
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 7a5a192bd..5d2b30ddc 100644
--- a/web/app/view/device/DeviceDialog.js
+++ b/web/app/view/device/DeviceDialog.js
@@ -45,10 +45,10 @@ Ext.define('Traccar.view.device.DeviceDialog', {
},
buttons: [{
- text: strings.dialog_save,
+ text: strings.shared_save,
handler: 'onSaveClick'
}, {
- text: strings.dialog_cancel,
+ text: strings.shared_cancel,
handler: 'onCancelClick'
}]
diff --git a/web/app/view/login/Login.js b/web/app/view/login/Login.js
index b1d3f34a7..fdaaadcfb 100644
--- a/web/app/view/login/Login.js
+++ b/web/app/view/login/Login.js
@@ -35,7 +35,7 @@ Ext.define('Traccar.view.login.Login', {
items: [{
xtype: 'textfield',
name: 'email',
- fieldLabel: strings.login_email,
+ fieldLabel: strings.user_email,
allowBlank: false,
enableKeyEvents: true,
listeners: {
@@ -45,7 +45,7 @@ Ext.define('Traccar.view.login.Login', {
}, {
xtype: 'textfield',
name: 'password',
- fieldLabel: strings.login_password,
+ fieldLabel: strings.user_password,
inputType: 'password',
allowBlank: false,
enableKeyEvents: true,
diff --git a/web/app/view/login/Register.js b/web/app/view/login/Register.js
index b6b570efe..909ed2fba 100644
--- a/web/app/view/login/Register.js
+++ b/web/app/view/login/Register.js
@@ -36,28 +36,28 @@ Ext.define('Traccar.view.login.Register', {
items: [{
xtype: 'textfield',
name: 'name',
- fieldLabel: strings.login_name,
+ fieldLabel: strings.user_name,
allowBlank: false
}, {
xtype: 'textfield',
name: 'email',
- fieldLabel: strings.login_email,
+ fieldLabel: strings.user_email,
vtype: 'email',
allowBlank: false
}, {
xtype: 'textfield',
name: 'password',
- fieldLabel: strings.login_password,
+ fieldLabel: strings.user_password,
inputType: 'password',
allowBlank: false
}]
},
buttons: [{
- text: strings.dialog_save,
+ text: strings.shared_save,
handler: 'onCreateClick'
}, {
- text: strings.dialog_cancel,
+ text: strings.shared_cancel,
handler: 'closeView'
}]
diff --git a/web/app/view/report/Report.js b/web/app/view/report/Report.js
index df8843a55..d52243139 100644
--- a/web/app/view/report/Report.js
+++ b/web/app/view/report/Report.js
@@ -75,14 +75,14 @@ Ext.define('Traccar.view.report.Report', {
},
columns: [
- { text: strings.report_valid, dataIndex: 'valid', flex: 1 },
- { text: strings.report_time, dataIndex: 'fixTime', flex: 1, xtype: 'datecolumn', format: styles.report_format },
- { text: strings.report_latitude, dataIndex: 'latitude', flex: 1 },
- { text: strings.report_longitude, dataIndex: 'longitude', flex: 1 },
- { text: strings.report_altitude, dataIndex: 'altitude', flex: 1 },
- { text: strings.report_speed, dataIndex: 'speed', flex: 1 },
- { text: strings.report_course, dataIndex: 'course', flex: 1 },
- { text: strings.report_address, dataIndex: 'address', flex: 1 }
+ { 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.position_speed, dataIndex: 'speed', flex: 1 },
+ { text: strings.position_course, dataIndex: 'course', flex: 1 },
+ { text: strings.position_address, dataIndex: 'address', flex: 1 }
]
});
diff --git a/web/app/view/state/StateController.js b/web/app/view/state/StateController.js
index 466b0ee5b..6f0c18b08 100644
--- a/web/app/view/state/StateController.js
+++ b/web/app/view/state/StateController.js
@@ -37,35 +37,35 @@ Ext.define('Traccar.view.state.StateController', {
keys: {
'fixTime': {
priority: 1,
- name: strings.report_time
+ name: strings.position_time
},
'latitude': {
priority: 2,
- name: strings.report_latitude
+ name: strings.position_latitude
},
'longitude': {
priority: 3,
- name: strings.report_longitude
+ name: strings.position_longitude
},
'valid': {
priority: 4,
- name: strings.report_valid
+ name: strings.position_valid
},
'altitude': {
priority: 5,
- name: strings.report_altitude
+ name: strings.position_altitude
},
'speed': {
priority: 6,
- name: strings.report_speed
+ name: strings.position_speed
},
'course': {
priority: 7,
- name: strings.report_course
+ name: strings.position_course
},
'protocol': {
priority: 8,
- name: strings.state_protocol
+ name: strings.position_protocol
}
},
diff --git a/web/app/view/user/User.js b/web/app/view/user/User.js
index fa9c9201a..76779ef79 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.device_add,
+ text: strings.shared_add,
handler: 'onAddClick',
reference: 'deviceAddButton'
}, {
- text: strings.device_edit,
+ text: strings.shared_edit,
disabled: true,
handler: 'onEditClick',
reference: 'userEditButton'
}, {
- text: strings.device_remove,
+ text: strings.shared_remove,
disabled: true,
handler: 'onRemoveClick',
reference: 'userRemoveButton'
@@ -48,9 +48,9 @@ Ext.define('Traccar.view.user.User', {
},
columns: [
- { text: strings.login_name, dataIndex: 'name', flex: 1 },
- { text: strings.login_email, dataIndex: 'email', flex: 1 },
- { text: strings.login_admin, dataIndex: 'admin', flex: 1 }
+ { text: strings.user_name, dataIndex: 'name', flex: 1 },
+ { text: strings.user_email, dataIndex: 'email', flex: 1 },
+ { text: strings.user_admin, dataIndex: 'admin', flex: 1 }
]
});
diff --git a/web/app/view/user/UserController.js b/web/app/view/user/UserController.js
index 2b587b3d3..510a7d6c8 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.login_user_title,
- message: strings.user_remove_confirm,
+ title: strings.settings_user,
+ message: strings.shared_remove_confirm,
buttons: Ext.Msg.YESNO,
buttonText: {
- yes: strings.dialog_delete,
- no: strings.dialog_cancel
+ yes: strings.shared_remove,
+ no: strings.shared_cancel
},
fn: function(btn) {
if (btn === 'yes') {
diff --git a/web/app/view/user/UserDialog.js b/web/app/view/user/UserDialog.js
index fba182eb1..3db21de6c 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.login_user_title,
+ title: strings.settings_user,
resizable: false,
modal: true,
@@ -34,22 +34,22 @@ Ext.define('Traccar.view.user.UserDialog', {
items: [{
xtype: 'textfield',
name: 'name',
- fieldLabel: strings.login_name
+ fieldLabel: strings.user_name
}, {
xtype: 'textfield',
name: 'email',
- fieldLabel: strings.login_email,
+ fieldLabel: strings.user_email,
allowBlank: false
}, {
xtype: 'textfield',
name: 'password',
- fieldLabel: strings.login_password,
+ fieldLabel: strings.user_password,
inputType: 'password',
allowBlank: false
}, {
xtype: 'checkboxfield',
name: 'admin',
- fieldLabel: strings.login_admin,
+ fieldLabel: strings.user_admin,
allowBlank: false,
disabled: true,
reference: 'adminField'
@@ -57,10 +57,10 @@ Ext.define('Traccar.view.user.UserDialog', {
},
buttons: [{
- text: strings.dialog_save,
+ text: strings.shared_save,
handler: 'onSaveClick'
}, {
- text: strings.dialog_cancel,
+ text: strings.shared_cancel,
handler: 'onCancelClick'
}]
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-11 06:26:27 +0000