diff options
| -rw-r--r-- | database/changelog-3.5.xml | 4 | ||||
| -rw-r--r-- | debug.xml | 2 | ||||
| -rw-r--r-- | src/org/traccar/model/Server.java | 10 | ||||
| -rw-r--r-- | src/org/traccar/model/User.java | 10 | ||||
| -rw-r--r-- | web/app/model/Server.js | 3 | ||||
| -rw-r--r-- | web/app/model/User.js | 3 |
6 files changed, 3 insertions, 29 deletions
diff --git a/database/changelog-3.5.xml b/database/changelog-3.5.xml index 3d1fa6b41..56f4ea65e 100644 --- a/database/changelog-3.5.xml +++ b/database/changelog-3.5.xml @@ -33,8 +33,10 @@ <column name="groupid" type="INT" /> </addColumn> + <dropColumn tableName="users" columnName="language" /> + <dropColumn tableName="server" columnName="language" /> + <dropDefaultValue tableName="users" columnName="map" /> - <dropDefaultValue tableName="users" columnName="language" /> <dropDefaultValue tableName="users" columnName="distanceunit" /> <dropDefaultValue tableName="users" columnName="speedunit" /> @@ -62,7 +62,6 @@ map = :map, bingKey = :bingKey, mapUrl = :mapUrl, - language = :language, distanceUnit = :distanceUnit, speedUnit = :speedUnit, latitude = :latitude, @@ -97,7 +96,6 @@ email = :email, admin = :admin, map = :map, - language = :language, distanceUnit = :distanceUnit, speedUnit = :speedUnit, latitude = :latitude, diff --git a/src/org/traccar/model/Server.java b/src/org/traccar/model/Server.java index f03a0aa60..270fd61fa 100644 --- a/src/org/traccar/model/Server.java +++ b/src/org/traccar/model/Server.java @@ -77,16 +77,6 @@ public class Server { this.mapUrl = mapUrl; } - private String language; - - public String getLanguage() { - return language; - } - - public void setLanguage(String language) { - this.language = language; - } - private String distanceUnit; public String getDistanceUnit() { diff --git a/src/org/traccar/model/User.java b/src/org/traccar/model/User.java index e58311834..f22a2e632 100644 --- a/src/org/traccar/model/User.java +++ b/src/org/traccar/model/User.java @@ -80,16 +80,6 @@ public class User { this.map = map; } - private String language; - - public String getLanguage() { - return language; - } - - public void setLanguage(String language) { - this.language = language; - } - private String distanceUnit; public String getDistanceUnit() { diff --git a/web/app/model/Server.js b/web/app/model/Server.js index 796ff58d6..3f6e466d9 100644 --- a/web/app/model/Server.js +++ b/web/app/model/Server.js @@ -37,9 +37,6 @@ Ext.define('Traccar.model.Server', { name: 'mapUrl', type: 'string' }, { - name: 'language', - type: 'string' - }, { name: 'distanceUnit', type: 'string' }, { diff --git a/web/app/model/User.js b/web/app/model/User.js index 237a4d269..35b849187 100644 --- a/web/app/model/User.js +++ b/web/app/model/User.js @@ -37,9 +37,6 @@ Ext.define('Traccar.model.User', { name: 'map', type: 'string' }, { - name: 'language', - type: 'string' - }, { name: 'distanceUnit', type: 'string' }, { |