From 4850e5094a49a16d3975795fd1f25a81f2e13a5a Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Thu, 9 Mar 2023 23:25:07 +0100 Subject: [PATCH] fix(themes): remove 'unkown' mapping from hydrants, the unkown case is handled by MapComplete --- assets/layers/hydrant/hydrant.json | 39 +--------- .../mapcomplete-changes.json | 72 ++++++++++++------- langs/layers/ca.json | 13 ++-- langs/layers/de.json | 14 ++-- langs/layers/en.json | 14 ++-- langs/layers/es.json | 14 ++-- langs/layers/fr.json | 14 ++-- langs/layers/id.json | 2 +- langs/layers/it.json | 14 ++-- langs/layers/ja.json | 14 ++-- langs/layers/nl.json | 14 ++-- langs/layers/ru.json | 14 ++-- 12 files changed, 87 insertions(+), 151 deletions(-) diff --git a/assets/layers/hydrant/hydrant.json b/assets/layers/hydrant/hydrant.json index 0814661d3..827bf30c6 100644 --- a/assets/layers/hydrant/hydrant.json +++ b/assets/layers/hydrant/hydrant.json @@ -78,25 +78,6 @@ "key": "colour" }, "mappings": [ - { - "if": { - "and": [ - "colour=" - ] - }, - "then": { - "en": "The hydrant color is unknown.", - "ja": "消火栓の色は不明です。", - "ru": "Цвет гидранта не определён.", - "fr": "La borne est de couleur inconnue.", - "de": "Die Farbe des Hydranten ist unbekannt.", - "it": "Il colore dell’idrante è sconosciuto.", - "nl": "De kleur van de brandkraan is onbekend.", - "es": "Se desconoce el color de la boca de incendios.", - "ca": "El color de l'hidrant és desconegut." - }, - "hideInAnswer": true - }, { "if": { "and": [ @@ -162,24 +143,6 @@ "es": " Tipo de boca de incendios: {fire_hydrant:type}" }, "mappings": [ - { - "if": { - "and": [ - "fire_hydrant:type=" - ] - }, - "then": { - "en": "The hydrant type is unknown.", - "ja": "消火栓の種類は不明です。", - "it": "Il tipo di idrante è sconosciuto.", - "ru": "Тип гидранта не определён.", - "fr": "La borne est de type inconnu.", - "de": "Der Typ des Hydranten ist unbekannt.", - "nl": "Het type brandkraan is onbekend.", - "es": "Se desconoce el tipo de la boca de incendios" - }, - "hideInAnswer": true - }, { "if": { "and": [ @@ -569,4 +532,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/assets/themes/mapcomplete-changes/mapcomplete-changes.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.json index b6b71d1cb..fea857dd2 100644 --- a/assets/themes/mapcomplete-changes/mapcomplete-changes.json +++ b/assets/themes/mapcomplete-changes/mapcomplete-changes.json @@ -1,13 +1,16 @@ { "id": "mapcomplete-changes", "title": { - "en": "Changes made with MapComplete" + "en": "Changes made with MapComplete", + "de": "Mit MapComplete vorgenommene Änderungen" }, "shortDescription": { - "en": "Shows changes made by MapComplete" + "en": "Shows changes made by MapComplete", + "de": "Zeigt Änderungen, die von MapComplete vorgenommen wurden" }, "description": { - "en": "This maps shows all the changes made with MapComplete" + "en": "This maps shows all the changes made with MapComplete", + "de": "Diese Karte zeigt alle mit MapComplete vorgenommenen Änderungen" }, "icon": "./assets/svg/logo.svg", "hideFromOverview": true, @@ -20,7 +23,8 @@ { "id": "mapcomplete-changes", "name": { - "en": "Changeset centers" + "en": "Changeset centers", + "de": "Zentrum der Änderungssätze" }, "minzoom": 0, "source": { @@ -31,41 +35,48 @@ }, "title": { "render": { - "en": "Changeset for {theme}" + "en": "Changeset for {theme}", + "de": "Änderungssatz für {theme}" } }, "description": { - "en": "Shows all MapComplete changes" + "en": "Shows all MapComplete changes", + "de": "Zeigt alle MapComplete-Änderungen" }, "tagRenderings": [ { "id": "show_changeset_id", "render": { - "en": "Changeset {id}" + "en": "Changeset {id}", + "de": "Änderungssatz {id}" } }, { "id": "contributor", "question": { - "en": "What contributor did make this change?" + "en": "What contributor did make this change?", + "de": "Welcher Mitwirkende hat diese Änderung vorgenommen?" }, "freeform": { "key": "user" }, "render": { - "en": "Change made by {user}" + "en": "Change made by {user}", + "de": "Änderung vorgenommen von {user}" } }, { "id": "theme-id", "question": { - "en": "What theme was used to make this change?" + "en": "What theme was used to make this change?", + "de": "Welches Thema wurde für diese Änderung verwendet?" }, "freeform": { "key": "theme" }, "render": { - "en": "Change with theme {theme}" + "en": "Change with theme {theme}", + "de": "Geändert mit Thema {theme}" } }, { @@ -74,19 +85,23 @@ "key": "locale" }, "question": { - "en": "What locale (language) was this change made in?" + "en": "What locale (language) was this change made in?", + "de": "In welchem Gebietsschema (Sprache) wurde diese Änderung vorgenommen?" }, "render": { - "en": "User locale is {locale}" + "en": "User locale is {locale}", + "de": "Benutzergebietsschema ist {locale}" } }, { "id": "host", "render": { - "en": "Change with with {host}" + "en": "Change with with {host}", + "de": "Geändert über {host}" }, "question": { - "en": "What host (website) was this change made with?" + "en": "What host (website) was this change made with?", + "de": "Über welchen Host (Webseite) wurde diese Änderung vorgenommen?" }, "freeform": { "key": "host" @@ -431,7 +446,8 @@ } ], "question": { - "en": "Themename contains {search}" + "en": "Themename contains {search}", + "de": "Themename enthält {search}" } } ] @@ -447,7 +463,8 @@ } ], "question": { - "en": "Made by contributor {search}" + "en": "Made by contributor {search}", + "de": "Erstellt von {search}" } } ] @@ -463,7 +480,8 @@ } ], "question": { - "en": "Not made by contributor {search}" + "en": "Not made by contributor {search}", + "de": "Nicht erstellt von {search}" } } ] @@ -480,7 +498,8 @@ } ], "question": { - "en": "Made before {search}" + "en": "Made before {search}", + "de": "Erstellt vor {search}" } } ] @@ -497,7 +516,8 @@ } ], "question": { - "en": "Made after {search}" + "en": "Made after {search}", + "de": "Erstellt nach {search}" } } ] @@ -513,7 +533,8 @@ } ], "question": { - "en": "User language (iso-code) {search}" + "en": "User language (iso-code) {search}", + "de": "Benutzersprache (ISO-Code) {search}" } } ] @@ -529,7 +550,8 @@ } ], "question": { - "en": "Made with host {search}" + "en": "Made with host {search}", + "de": "Erstellt mit host {search}" } } ] @@ -540,7 +562,8 @@ { "osmTags": "add-image>0", "question": { - "en": "Changeset added at least one image" + "en": "Changeset added at least one image", + "de": "Im Änderungssatz wurde mindestens ein Bild hinzugefügt" } } ] @@ -555,7 +578,8 @@ { "id": "link_to_more", "render": { - "en": "More statistics can be found here" + "en": "More statistics can be found here", + "de": "Weitere Statistiken hier" } }, { diff --git a/langs/layers/ca.json b/langs/layers/ca.json index 269e5a9a1..dc0ba2027 100644 --- a/langs/layers/ca.json +++ b/langs/layers/ca.json @@ -1859,12 +1859,9 @@ "hydrant-color": { "mappings": { "0": { - "then": "El color de l'hidrant és desconegut." - }, - "1": { "then": "L'hidrant és de color groc." }, - "2": { + "1": { "then": "L'hidrant és de color roig." } }, @@ -1909,16 +1906,16 @@ }, "hydrant-type": { "mappings": { - "1": { + "0": { "then": "De pilar." }, - "2": { + "1": { "then": "De tuberia." }, - "3": { + "2": { "then": "De paret." }, - "4": { + "3": { "then": "Subterrani." } }, diff --git a/langs/layers/de.json b/langs/layers/de.json index cbc7ffedd..bb96b5f2c 100644 --- a/langs/layers/de.json +++ b/langs/layers/de.json @@ -4907,12 +4907,9 @@ "hydrant-color": { "mappings": { "0": { - "then": "Die Farbe des Hydranten ist unbekannt." - }, - "1": { "then": "Die Farbe des Hydranten ist gelb." }, - "2": { + "1": { "then": "Die Farbe des Hydranten ist rot." } }, @@ -4975,18 +4972,15 @@ "hydrant-type": { "mappings": { "0": { - "then": "Der Typ des Hydranten ist unbekannt." - }, - "1": { "then": "Überflurhydrant." }, - "2": { + "1": { "then": "Druckloses Rohr." }, - "3": { + "2": { "then": "Wandhydrant." }, - "4": { + "3": { "then": "Unterflurhydrant." } }, diff --git a/langs/layers/en.json b/langs/layers/en.json index 6c3bea5b3..c898eaa8f 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -4907,12 +4907,9 @@ "hydrant-color": { "mappings": { "0": { - "then": "The hydrant color is unknown." - }, - "1": { "then": "The hydrant color is yellow." }, - "2": { + "1": { "then": "The hydrant color is red." } }, @@ -4975,18 +4972,15 @@ "hydrant-type": { "mappings": { "0": { - "then": "The hydrant type is unknown." - }, - "1": { "then": "Pillar type." }, - "2": { + "1": { "then": "Pipe type." }, - "3": { + "2": { "then": "Wall type." }, - "4": { + "3": { "then": "Underground type." } }, diff --git a/langs/layers/es.json b/langs/layers/es.json index 9edd0792b..c566851c0 100644 --- a/langs/layers/es.json +++ b/langs/layers/es.json @@ -2617,12 +2617,9 @@ "hydrant-color": { "mappings": { "0": { - "then": "Se desconoce el color de la boca de incendios." - }, - "1": { "then": "La boca de incendios es amarilla." }, - "2": { + "1": { "then": "La boca de incendios es roja." } }, @@ -2646,18 +2643,15 @@ "hydrant-type": { "mappings": { "0": { - "then": "Se desconoce el tipo de la boca de incendios" - }, - "1": { "then": "De pilar." }, - "2": { + "1": { "then": "De tubería." }, - "3": { + "2": { "then": "De pared." }, - "4": { + "3": { "then": "Bajo tierra." } }, diff --git a/langs/layers/fr.json b/langs/layers/fr.json index d7e5b19fe..5cb038397 100644 --- a/langs/layers/fr.json +++ b/langs/layers/fr.json @@ -3193,12 +3193,9 @@ "hydrant-color": { "mappings": { "0": { - "then": "La borne est de couleur inconnue." - }, - "1": { "then": "La borne est jaune." }, - "2": { + "1": { "then": "La borne est rouge." } }, @@ -3222,18 +3219,15 @@ "hydrant-type": { "mappings": { "0": { - "then": "La borne est de type inconnu." - }, - "1": { "then": "Pilier." }, - "2": { + "1": { "then": "Tuyau." }, - "3": { + "2": { "then": "Mural." }, - "4": { + "3": { "then": "Enterré." } }, diff --git a/langs/layers/id.json b/langs/layers/id.json index 5e7a46f29..6180d346d 100644 --- a/langs/layers/id.json +++ b/langs/layers/id.json @@ -349,7 +349,7 @@ "tagRenderings": { "hydrant-type": { "mappings": { - "3": { + "2": { "then": "Jenis dinding." } } diff --git a/langs/layers/it.json b/langs/layers/it.json index 51f6c1445..47593615c 100644 --- a/langs/layers/it.json +++ b/langs/layers/it.json @@ -1354,12 +1354,9 @@ "hydrant-color": { "mappings": { "0": { - "then": "Il colore dell’idrante è sconosciuto." - }, - "1": { "then": "Il colore dell’idrante è giallo." }, - "2": { + "1": { "then": "L'idrante è rosso." } }, @@ -1383,18 +1380,15 @@ "hydrant-type": { "mappings": { "0": { - "then": "Il tipo di idrante è sconosciuto." - }, - "1": { "then": "Soprasuolo." }, - "2": { + "1": { "then": "Tubo." }, - "3": { + "2": { "then": "A muro." }, - "4": { + "3": { "then": "Sottosuolo." } }, diff --git a/langs/layers/ja.json b/langs/layers/ja.json index dc8423c90..a9bb64a41 100644 --- a/langs/layers/ja.json +++ b/langs/layers/ja.json @@ -454,12 +454,9 @@ "hydrant-color": { "mappings": { "0": { - "then": "消火栓の色は不明です。" - }, - "1": { "then": "消火栓の色は黄色です。" }, - "2": { + "1": { "then": "消火栓の色は赤です。" } }, @@ -483,18 +480,15 @@ "hydrant-type": { "mappings": { "0": { - "then": "消火栓の種類は不明です。" - }, - "1": { "then": "ピラー型。" }, - "2": { + "1": { "then": "パイプ型。" }, - "3": { + "2": { "then": "壁型。" }, - "4": { + "3": { "then": "地下式。" } }, diff --git a/langs/layers/nl.json b/langs/layers/nl.json index fb2839720..fa4280fa3 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -4811,12 +4811,9 @@ "hydrant-color": { "mappings": { "0": { - "then": "De kleur van de brandkraan is onbekend." - }, - "1": { "then": "De brandkraan is geel." }, - "2": { + "1": { "then": "De brandkraan is rood." } }, @@ -4879,18 +4876,15 @@ "hydrant-type": { "mappings": { "0": { - "then": "Het type brandkraan is onbekend." - }, - "1": { "then": "Pillaar type." }, - "2": { + "1": { "then": "Buis type." }, - "3": { + "2": { "then": "Muur type." }, - "4": { + "3": { "then": "Ondergronds type." } }, diff --git a/langs/layers/ru.json b/langs/layers/ru.json index fa7d59631..101c250cd 100644 --- a/langs/layers/ru.json +++ b/langs/layers/ru.json @@ -1059,12 +1059,9 @@ "hydrant-color": { "mappings": { "0": { - "then": "Цвет гидранта не определён." - }, - "1": { "then": "Гидрант жёлтого цвета." }, - "2": { + "1": { "then": "Гидрант красного цвета." } }, @@ -1120,18 +1117,15 @@ "hydrant-type": { "mappings": { "0": { - "then": "Тип гидранта не определён." - }, - "1": { "then": "Наземный." }, - "2": { + "1": { "then": "Труба." }, - "3": { + "2": { "then": "Настенный." }, - "4": { + "3": { "then": "Подземный." } },