Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixed #1405 some translations and added german flag #1407

Merged
merged 2 commits into from
Jan 26, 2017
Merged

fixed #1405 some translations and added german flag #1407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
061936a
fixed some translations and added german flag
MV88 Jan 25, 2017
1118bd9
fixed test for default languages
MV88 Jan 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion web/client/components/I18N/__tests__/LangSelector-test.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ describe('LangSelector', () => {

const select = cmpDom.getElementsByTagName("select").item(0);
const opts = select.childNodes;
const langs = {'Italiano': 'it-IT', 'English': 'en-US', 'Français': 'fr-FR'};
const langs = {'Italiano': 'it-IT', 'English': 'en-US', 'Français': 'fr-FR', 'Deutsch': 'de-DE'};

for (let i = 0; i < opts.length; i++) {
lbl = opts[i].innerHTML;
Expand Down
Binary file added web/client/components/I18N/images/flags/de-DE.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 3 additions & 2 deletions web/client/translations/data.de-DE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
"openInANewTab":"Karte öffnen",
"deleteMap":"Karte löschen",
"deleteMapMessage": "Möchtest du wirklich diese Karte löschen?",
"editMapMetadata":"Karten Metadaten bearbeiten",
"editMapMetadata":"Bearbeite die Eigenschaften der Karte",
"mapTypes_combo": "Wähle einen Karten-Viewer: ",
"maps_title": "Karten",
"locales_combo": "Sprache:"
Expand Down Expand Up @@ -353,7 +353,6 @@
"zoomIn": "Das ist die Hilfe für ZoomIn",
"zoomOut": "Das ist die Hilfe für ZoomOut",
"searchBar": "Gib eine Adresse eines Ortes ein bspw. 'Brandenburger Tor, Berlin'. Du kannst auch Koordinaten im folgenden Format eingeben: 43.87, 10.20",
"layerSwitcher": "Das ist die Hilfe für den LayerSwitcher",
"metadataExplorer": "Das ist die Hilfe für den MetadataExplorer",
"settingsPanel": "Das ist die Hilfe für das SettingsPanel",
"gohome": "Das ist die Hilfe für Home",
Expand Down Expand Up @@ -484,6 +483,8 @@
"usergroups": {
"searchGroups": "Suche Gruppen...",
"groups": "Gruppen",
"nameLimit": "Der Name ist auf 255 Zeichen limitiert.",
"descLimit": "Die Beschreibung ist auf 255 Zeichen limitiert.",
"editGroup": "Gruppe bearbeiten",
"deleteGroup": "Gruppe löschen",
"removeUser": "Benutzer löschen",
Expand Down
3 changes: 1 addition & 2 deletions web/client/translations/data.en-US
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
"openInANewTab":"Open map",
"deleteMap":"Delete Map",
"deleteMapMessage": "Do you really want to delete this map?",
"editMapMetadata":"Edit Map Metadata",
"editMapMetadata":"Edit Map Properties",
"mapTypes_combo": "Select Map Viewer: ",
"maps_title": "Maps",
"locales_combo": "Language:"
Expand Down Expand Up @@ -353,7 +353,6 @@
"zoomIn": "This is the helptext for the ZoomIn",
"zoomOut": "This is the helptext for the ZoomOut",
"searchBar": "Write the address of a place to find. e.g. '1st avenue, new york'. You can even insert coordinates in this format: 43.87,10.20",
"layerSwitcher": "This is the helptext for the LayerSwitcher",
"metadataExplorer": "This is the helptext for the MetadataExplorer",
"settingsPanel": "This is the helptext for the SettingsPanel",
"gohome": "This is the helptext for Home",
Expand Down
3 changes: 1 addition & 2 deletions web/client/translations/data.fr-FR
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
"openInANewTab":"Ouvrir la carte",
"deleteMap":"Supprimer la carte",
"deleteMapMessage": "Voulez-vous supprimer cette carte?",
"editMapMetadata":"Modifier les metadonnées de la carte",
"editMapMetadata":"Modifier les propriétés de la carte",
"mapTypes_combo": "Selectionner le viewer de carte: ",
"maps_title": "Cartes",
"locales_combo": "Langue:"
Expand Down Expand Up @@ -355,7 +355,6 @@
"zoomIn": "This is the helptext for the ZoomIn",
"zoomOut": "This is the helptext for the ZoomOut",
"searchBar": "Tapez l'adresse à rechercher. p. ex. '1st avenue, new york'. Vous pouvez aussi entrer des coordonnées au format suivant: 43.87,10.20",
"layerSwitcher": "This is the helptext for the LayerSwitcher",
"metadataExplorer": "This is the helptext for the MetadataExplorer",
"settingsPanel": "This is the helptext for the SettingsPanel",
"gohome": "This is the helptext for Home",
Expand Down
3 changes: 1 addition & 2 deletions web/client/translations/data.it-IT
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
"openInANewTab":"Apri mappa",
"deleteMap":"Elimina Mappa",
"deleteMapMessage": "Vuoi eliminare questa mappa?",
"editMapMetadata":"Modifica Metadati",
"editMapMetadata":"Modifica Proprietà",
"mapTypes_combo": "Seleziona il visualizzatore di mappa:",
"maps_title": "Mappe",
"locales_combo": "Lingua:"
Expand Down Expand Up @@ -353,7 +353,6 @@
"zoomIn": "Questo è il testo di aiuto per ZoomIn",
"zoomOut": "Questo è il testo di aiuto per ZoomOut",
"searchBar": "Scrivi un indirizzo di un luogo per trovarlo. esempio: '1st avenue, new york'. Puoi anche digitare le coordinate in questo formato: 43.87,10.20",
"layerSwitcher": "Questo è il testo di aiuto per LayerSwitcher",
"metadataExplorer": "Questo è il testo di aiuto per MetadataExplorer",
"settingsPanel": "Questo è il testo di aiuto per SettingsPanel",
"gohome": "Questo è il testo di aiuto per Home",
Expand Down
7 changes: 6 additions & 1 deletion web/client/utils/LocaleUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,21 @@ let supportedLocales = {
"fr": {
code: "fr-FR",
description: "Français"
},
"de": {
code: "de-DE",
description: "Deutsch"
}
};

var LocaleUtils = {
ensureIntl(callback) {
require.ensure(['intl', 'intl/locale-data/jsonp/en.js', 'intl/locale-data/jsonp/it.js', 'intl/locale-data/jsonp/fr.js'], (require) => {
require.ensure(['intl', 'intl/locale-data/jsonp/en.js', 'intl/locale-data/jsonp/it.js', 'intl/locale-data/jsonp/fr.js', 'intl/locale-data/jsonp/de.js'], (require) => {
global.Intl = require('intl');
require('intl/locale-data/jsonp/en.js');
require('intl/locale-data/jsonp/it.js');
require('intl/locale-data/jsonp/fr.js');
require('intl/locale-data/jsonp/de.js');
if (callback) {
callback();
}
Expand Down