aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--web/app/store/DeviceAttributes.js14
-rw-r--r--web/app/store/GeofenceAttributes.js2
-rw-r--r--web/app/store/GroupAttributes.js10
-rw-r--r--web/app/store/ServerAttributes.js8
-rw-r--r--web/app/store/UserAttributes.js24
-rw-r--r--web/app/view/dialog/AttributeController.js4
-rw-r--r--web/l10n/en.json40
7 files changed, 51 insertions, 51 deletions
diff --git a/web/app/store/DeviceAttributes.js b/web/app/store/DeviceAttributes.js
index 341a769..a430354 100644
--- a/web/app/store/DeviceAttributes.js
+++ b/web/app/store/DeviceAttributes.js
@@ -22,31 +22,31 @@ Ext.define('Traccar.store.DeviceAttributes', {
data: [{
key: 'speedLimit',
- name: Strings.sharedAttributeSpeedLimit,
+ name: Strings.attributeSpeedLimit,
type: 'number'
}, {
key: 'report.ignoreOdometer',
- name: Strings.sharedAttributeReportIgnoreOdometer,
+ name: Strings.attributeReportIgnoreOdometer,
type: 'boolean'
}, {
key: 'maintenance.start',
- name: Strings.sharedAttributeMaintenanceStart,
+ name: Strings.attributeMaintenanceStart,
type: 'number'
}, {
key: 'maintenance.interval',
- name: Strings.sharedAttributeMaintenanceInterval,
+ name: Strings.attributeMaintenanceInterval,
type: 'number'
}, {
key: 'web.reportColor',
- name: Strings.sharedAttributeWebReportColor,
+ name: Strings.attributeWebReportColor,
type: 'color'
}, {
key: 'devicePassword',
- name: Strings.sharedAttributeDevicePassword,
+ name: Strings.attributeDevicePassword,
type: 'string'
}, {
key: 'processing.copyAttributes',
- name: Strings.sharedAttributeProcessingCopyAttributes,
+ name: Strings.attributeProcessingCopyAttributes,
type: 'string'
}]
});
diff --git a/web/app/store/GeofenceAttributes.js b/web/app/store/GeofenceAttributes.js
index d8c8bb9..9034b3f 100644
--- a/web/app/store/GeofenceAttributes.js
+++ b/web/app/store/GeofenceAttributes.js
@@ -22,7 +22,7 @@ Ext.define('Traccar.store.GeofenceAttributes', {
data: [{
key: 'color',
- name: Strings.sharedAttributeColor,
+ name: Strings.attributeColor,
type: 'color'
}]
});
diff --git a/web/app/store/GroupAttributes.js b/web/app/store/GroupAttributes.js
index 5ef2aa0..35caa8c 100644
--- a/web/app/store/GroupAttributes.js
+++ b/web/app/store/GroupAttributes.js
@@ -22,23 +22,23 @@ Ext.define('Traccar.store.GroupAttributes', {
data: [{
key: 'speedLimit',
- name: Strings.sharedAttributeSpeedLimit,
+ name: Strings.attributeSpeedLimit,
type: 'number'
}, {
key: 'report.ignoreOdometer',
- name: Strings.sharedAttributeReportIgnoreOdometer,
+ name: Strings.attributeReportIgnoreOdometer,
type: 'boolean'
}, {
key: 'maintenance.start',
- name: Strings.sharedAttributeMaintenanceStart,
+ name: Strings.attributeMaintenanceStart,
type: 'number'
}, {
key: 'maintenance.interval',
- name: Strings.sharedAttributeMaintenanceInterval,
+ name: Strings.attributeMaintenanceInterval,
type: 'number'
}, {
key: 'processing.copyAttributes',
- name: Strings.sharedAttributeProcessingCopyAttributes,
+ name: Strings.attributeProcessingCopyAttributes,
type: 'string'
}]
});
diff --git a/web/app/store/ServerAttributes.js b/web/app/store/ServerAttributes.js
index 3443142..71705e0 100644
--- a/web/app/store/ServerAttributes.js
+++ b/web/app/store/ServerAttributes.js
@@ -22,19 +22,19 @@ Ext.define('Traccar.store.ServerAttributes', {
data: [{
key: 'speedLimit',
- name: Strings.sharedAttributeSpeedLimit,
+ name: Strings.attributeSpeedLimit,
type: 'number'
}, {
key: 'maintenance.start',
- name: Strings.sharedAttributeMaintenanceStart,
+ name: Strings.attributeMaintenanceStart,
type: 'number'
}, {
key: 'maintenance.interval',
- name: Strings.sharedAttributeMaintenanceInterval,
+ name: Strings.attributeMaintenanceInterval,
type: 'number'
}, {
key: 'web.liveRouteLength',
- name: Strings.sharedAttributeWebLiveRouteLength,
+ name: Strings.attributeWebLiveRouteLength,
type: 'number',
allowDecimals: false
}]
diff --git a/web/app/store/UserAttributes.js b/web/app/store/UserAttributes.js
index f286d1b..8649eb8 100644
--- a/web/app/store/UserAttributes.js
+++ b/web/app/store/UserAttributes.js
@@ -22,54 +22,54 @@ Ext.define('Traccar.store.UserAttributes', {
data: [{
key: 'mail.smtp.host',
- name: Strings.sharedAttributeMailSmtpHost,
+ name: Strings.attributeMailSmtpHost,
type: 'string'
}, {
key: 'mail.smtp.port',
- name: Strings.sharedAttributeMailSmtpPort,
+ name: Strings.attributeMailSmtpPort,
type: 'number',
allowDecimals: false,
minValue: 1,
maxValue: 65535
}, {
key: 'mail.smtp.starttls.enable',
- name: Strings.sharedAttributeMailSmtpStarttlsEnable,
+ name: Strings.attributeMailSmtpStarttlsEnable,
type: 'boolean'
}, {
key: 'mail.smtp.starttls.required',
- name: Strings.sharedAttributeMailSmtpStarttlsRequired,
+ name: Strings.attributeMailSmtpStarttlsRequired,
type: 'boolean'
}, {
key: 'mail.smtp.ssl.enable',
- name: Strings.sharedAttributeMailSmtpSslEnable,
+ name: Strings.attributeMailSmtpSslEnable,
type: 'boolean'
}, {
key: 'mail.smtp.ssl.trust',
- name: Strings.sharedAttributeMailSmtpSslTrust,
+ name: Strings.attributeMailSmtpSslTrust,
type: 'string'
}, {
key: 'mail.smtp.ssl.protocols',
- name: Strings.sharedAttributeMailSmtpSslProtocols,
+ name: Strings.attributeMailSmtpSslProtocols,
type: 'string'
}, {
key: 'mail.smtp.from',
- name: Strings.sharedAttributeMailSmtpFrom,
+ name: Strings.attributeMailSmtpFrom,
type: 'string'
}, {
key: 'mail.smtp.auth',
- name: Strings.sharedAttributeMailSmtpAuth,
+ name: Strings.attributeMailSmtpAuth,
type: 'boolean'
}, {
key: 'mail.smtp.username',
- name: Strings.sharedAttributeMailSmtpUsername,
+ name: Strings.attributeMailSmtpUsername,
type: 'string'
}, {
key: 'mail.smtp.password',
- name: Strings.sharedAttributeMailSmtpPassword,
+ name: Strings.attributeMailSmtpPassword,
type: 'string'
}, {
key: 'web.liveRouteLength',
- name: Strings.sharedAttributeWebLiveRouteLength,
+ name: Strings.attributeWebLiveRouteLength,
type: 'number',
allowDecimals: false
}]
diff --git a/web/app/view/dialog/AttributeController.js b/web/app/view/dialog/AttributeController.js
index ca1436f..da5205b 100644
--- a/web/app/view/dialog/AttributeController.js
+++ b/web/app/view/dialog/AttributeController.js
@@ -53,8 +53,8 @@ Ext.define('Traccar.view.dialog.AttributeController', {
},
onNameChange: function (combobox, newValue) {
- var type, config, valueField = this.lookupReference('valueField'),
- attribute = combobox.getStore().getById(newValue);
+ var type, config, attribute, valueField = this.lookupReference('valueField');
+ attribute = combobox.getStore().getById(newValue);
if (attribute) {
type = attribute.get('type');
config = Ext.clone(this.defaultFieldConfig);
diff --git a/web/l10n/en.json b/web/l10n/en.json
index 68106e9..18edf52 100644
--- a/web/l10n/en.json
+++ b/web/l10n/en.json
@@ -54,26 +54,26 @@
"sharedPermissions": "Permissions",
"sharedExtra": "Extra",
"sharedTimezone": "Timezone",
- "sharedAttributeSpeedLimit": "Speed Limit",
- "sharedAttributeReportIgnoreOdometer": "Report: Ignore Odometer",
- "sharedAttributeMaintenanceStart": "Maintenance: Start",
- "sharedAttributeMaintenanceInterval": "Maintenance: Interval",
- "sharedAttributeWebReportColor": "Web: Report Color",
- "sharedAttributeDevicePassword": "Device Password",
- "sharedAttributeProcessingCopyAttributes": "Processing: Copy Attributes",
- "sharedAttributeColor": "Color",
- "sharedAttributeWebLiveRouteLength": "Web: Live Route Length",
- "sharedAttributeMailSmtpHost": "Mail: SMTP Host",
- "sharedAttributeMailSmtpPort": "Mail: SMTP Port",
- "sharedAttributeMailSmtpStarttlsEnable": "Mail: SMTP STARTTLS Enable",
- "sharedAttributeMailSmtpStarttlsRequired": "Mail: SMTP STARTTLS Required",
- "sharedAttributeMailSmtpSslEnable": "Mail: SMTP SSL Enable",
- "sharedAttributeMailSmtpSslTrust": "Mail: SMTP SSL Trust",
- "sharedAttributeMailSmtpSslProtocols": "Mail: SMTP SSL Protocols",
- "sharedAttributeMailSmtpFrom": "Mail: SMTP From",
- "sharedAttributeMailSmtpAuth": "Mail: SMTP Auth Enable",
- "sharedAttributeMailSmtpUsername": "Mail: SMTP Username",
- "sharedAttributeMailSmtpPassword": "Mail: SMTP Password",
+ "attributeSpeedLimit": "Speed Limit",
+ "attributeReportIgnoreOdometer": "Report: Ignore Odometer",
+ "attributeMaintenanceStart": "Maintenance: Start",
+ "attributeMaintenanceInterval": "Maintenance: Interval",
+ "attributeWebReportColor": "Web: Report Color",
+ "attributeDevicePassword": "Device Password",
+ "attributeProcessingCopyAttributes": "Processing: Copy Attributes",
+ "attributeColor": "Color",
+ "attributeWebLiveRouteLength": "Web: Live Route Length",
+ "attributeMailSmtpHost": "Mail: SMTP Host",
+ "attributeMailSmtpPort": "Mail: SMTP Port",
+ "attributeMailSmtpStarttlsEnable": "Mail: SMTP STARTTLS Enable",
+ "attributeMailSmtpStarttlsRequired": "Mail: SMTP STARTTLS Required",
+ "attributeMailSmtpSslEnable": "Mail: SMTP SSL Enable",
+ "attributeMailSmtpSslTrust": "Mail: SMTP SSL Trust",
+ "attributeMailSmtpSslProtocols": "Mail: SMTP SSL Protocols",
+ "attributeMailSmtpFrom": "Mail: SMTP From",
+ "attributeMailSmtpAuth": "Mail: SMTP Auth Enable",
+ "attributeMailSmtpUsername": "Mail: SMTP Username",
+ "attributeMailSmtpPassword": "Mail: SMTP Password",
"errorTitle": "Error",
"errorUnknown": "Unknown error",
"errorConnection": "Connection error",
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-01 14:02:44 +0000