diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2015-08-18 09:11:02 +1200 |
---|---|---|
committer | Anton Tananaev <anton.tananaev@gmail.com> | 2015-08-18 09:11:02 +1200 |
commit | f804916f5842da7150651aa83a58633c02de9523 (patch) | |
tree | f7420ec739a5465d460984c615338aa4efc37a4e | |
parent | 24c04679c356f21d82419d9cb4f2bcd256653132 (diff) | |
parent | e6b9901b9e86b328010716ebcc8303e06d3dd206 (diff) | |
download | traccar-server-f804916f5842da7150651aa83a58633c02de9523.tar.gz traccar-server-f804916f5842da7150651aa83a58633c02de9523.tar.bz2 traccar-server-f804916f5842da7150651aa83a58633c02de9523.zip |
Merge branch 'master' of github.com:tananaev/traccar
-rw-r--r-- | web/app/Resources.js | 4 | ||||
-rw-r--r-- | web/app/view/map/Map.js | 2 | ||||
-rw-r--r-- | web/l10n/dk.js | 86 | ||||
-rw-r--r-- | web/l10n/nl.js | 86 | ||||
-rw-r--r-- | web/locale.js | 2 |
5 files changed, 177 insertions, 3 deletions
diff --git a/web/app/Resources.js b/web/app/Resources.js index 851658646..73cee7b2d 100644 --- a/web/app/Resources.js +++ b/web/app/Resources.js @@ -26,8 +26,8 @@ var styles = { reportTime: 100, reportFormat: 'Y-m-d H:i:s', - mapDefaultLat: -0.1275, - mapDefaultLon: 51.507222, + mapDefaultLat: 51.507222, + mapDefaultLon: -0.1275, mapDefaultZoom: 6, mapMaxZoom: 19, diff --git a/web/app/view/map/Map.js b/web/app/view/map/Map.js index 6b323e555..9d9a92886 100644 --- a/web/app/view/map/Map.js +++ b/web/app/view/map/Map.js @@ -63,7 +63,7 @@ Ext.define('Traccar.view.map.Map', { var zoom = user.get('zoom') || server.get('zoom') || styles.mapDefaultZoom; this.mapView = new ol.View({ - center: ol.proj.fromLonLat([lat, lon]), + center: ol.proj.fromLonLat([ lon, lat ]), zoom: zoom, maxZoom: styles.mapMaxZoom }); diff --git a/web/l10n/dk.js b/web/l10n/dk.js new file mode 100644 index 000000000..c70ec3ef0 --- /dev/null +++ b/web/l10n/dk.js @@ -0,0 +1,86 @@ +var strings = { + sharedLoading: 'Loading...', + sharedSave: 'Gem', + sharedCancel: 'Fortryd', + sharedAdd: 'Tilføj', + sharedEdit: 'Rediger', + sharedRemove: 'Fjern', + sharedRemoveConfirm: 'Fjern enhed?', + sharedKm: 'km', + sharedMi: 'mi', + sharedKmh: 'km/t', + sharedMph: 'mph', + sharedHour: 'Time', + sharedMinute: 'Minut', + sharedSecond: 'Sekund', + + errorTitle: 'Fejl', + errorUnknown: 'Ukendt Fejl', + + userName: 'Navn', + userEmail: 'Email', + userPassword: 'Kodeord', + userAdmin: 'Admin', + + loginTitle: 'Log på', + loginLanguage: 'Sprog', + loginRegister: 'Registrer', + loginLogin: 'Log på', + loginFailed: 'Fejl i email adresse eller kodeord', + loginCreated: 'Ny bruger er registreret', + loginLogout: 'Log af', + + deviceDialog: 'Enhed', + deviceTitle: 'Enheder', + deviceName: 'Navn', + deviceIdentifier: 'Imei nr', + deviceCommand: 'Kommando', + + settingsTitle: 'Indstillinger', + settingsUser: 'Konto', + settingsServer: 'Server', + settingsUsers: 'Brugere', + settingsDistanceUnit: 'Distance', + settingsSpeedUnit: 'Hastighed', + + reportTitle: 'Rapporter', + reportDevice: 'Enhed', + reportFrom: 'Fra', + reportTo: 'Til', + reportShow: 'Vis', + reportClear: 'Ryd', + + positionTime: 'Tid', + positionValid: 'Valid', + positionLatitude: '>Breddegrad', + positionLongitude: 'Længdegrad', + positionAltitude: 'Højde', + positionSpeed: 'Hastighed', + positionCourse: 'Kurs', + positionAddress: 'Addresse', + positionProtocol: 'Protocol', + + serverTitle: 'Server indstillinger', + serverZoom: 'Zoom', + serverRegistration: 'Registrering', + + mapTitle: 'Kort', + mapLayer: 'Kort opsætning', + mapOsm: 'Open Street Map', + mapBingRoad: 'Bing Maps Road', + mapBingAerial: 'Bing Maps Aerial', + + stateTitle: 'Status', + stateName: 'Parameter', + stateValue: 'Værdi', + + commandTitle: 'Kommando', + commandSend: 'Send', + commandType: 'Type', + commandPositionPeriodic: 'Periodisk Rapportering', + commandPositionStop: 'Stop Rapportering', + commandEngineStop: 'Stop motor', + commandEngineResume: 'Genstart motor', + commandFrequency: 'Frekvens', + commandUnit: 'Enhed' +}; diff --git a/web/l10n/nl.js b/web/l10n/nl.js new file mode 100644 index 000000000..5f4571af6 --- /dev/null +++ b/web/l10n/nl.js @@ -0,0 +1,86 @@ +var strings = { + sharedLoading: 'Laden...', + sharedSave: 'Opslaan', + sharedCancel: 'Annuleren', + sharedAdd: 'Toevoegen', + sharedEdit: 'Bewerken', + sharedRemove: 'Verwijderen', + sharedRemoveConfirm: 'Verwijder item?', + sharedKm: 'km', + sharedMi: 'mi', + sharedKmh: 'km/h', + sharedMph: 'mph', + sharedHour: 'Uur', + sharedMinute: 'Minuut', + sharedSecond: 'Seconde', + + errorTitle: 'Fout', + errorUnknown: 'Onbekende fout', + + userName: 'Gebruikersnaam', + userEmail: 'Email', + userPassword: 'WachtwoordPassword', + userAdmin: 'Admin', + + loginTitle: 'Inloggen', + loginLanguage: 'Taal', + loginRegister: 'Registeren', + loginLogin: 'Inloggen', + loginFailed: 'Onjuiste emailadres of wachtwoord', + loginCreated: 'Nieuwe gebruiker is geregistreerd', + loginLogout: 'Uitloggen', + + deviceDialog: 'Apparaat', + deviceTitle: 'Apparaten', + deviceName: 'Naam', + deviceIdentifier: 'Identifier', + deviceCommand: 'Commando', + + settingsTitle: 'Instellingen', + settingsUser: 'Account', + settingsServer: 'Server', + settingsUsers: 'Gebruikers', + settingsDistanceUnit: 'Afstand', + settingsSpeedUnit: 'Snelheid', + + reportTitle: 'Reports', + reportDevice: 'Apparaat', + reportFrom: 'Van', + reportTo: 'Naar', + reportShow: 'Laten zien', + reportClear: 'Leegmaken', + + positionTime: 'Tijd', + positionValid: 'Geldig', + positionLatitude: 'Latitude', + positionLongitude: 'Longitude', + positionAltitude: 'Altitude', + positionSpeed: 'Snelheid', + positionCourse: 'Koers', + positionAddress: 'Adres', + positionProtocol: 'Protocol', + + serverTitle: 'Server Instellingen', + serverZoom: 'Zoom', + serverRegistration: 'Registratie', + + mapTitle: 'Kaart', + mapLayer: 'Kaart laag', + mapOsm: 'Open Street Map', + mapBingRoad: 'Bing Maps Wegen', + mapBingAerial: 'Bing Maps Luchtfoto', + + stateTitle: 'Status', + stateName: 'Parameter', + stateValue: 'Waarde', + + commandTitle: 'Commando', + commandSend: 'Verstuur', + commandType: 'Type', + commandPositionPeriodic: 'Periodic Reporting', + commandPositionStop: 'Stop Reporting', + commandEngineStop: 'Engine Stop', + commandEngineResume: 'Engine Resume', + commandFrequency: 'Frequentie', + commandUnit: 'Eenheid' +}; diff --git a/web/locale.js b/web/locale.js index 37ae0992e..353f47cbc 100644 --- a/web/locale.js +++ b/web/locale.js @@ -20,9 +20,11 @@ Ext.Loader.setConfig({ var availableLanguages = { 'de': { name: 'Deutsch', code: 'de' }, + 'dk': { name: 'Dansk', code: 'dk' }, 'en': { name: 'English', code: 'en' }, 'es': { name: 'Español', code: 'es' }, 'fr': { name: 'Français', code: 'fr' }, + 'nl': { name: 'Nederlands', code: 'nl' }, 'pl': { name: 'Polski', code: 'pl' }, 'pt': { name: 'Português', code: 'pt' }, 'ru': { name: 'Русский', code: 'ru' }, |