diff --git a/assets/layers/tree_node/tree_node.json b/assets/layers/tree_node/tree_node.json
index 2e2eb6d20e..793b679e94 100644
--- a/assets/layers/tree_node/tree_node.json
+++ b/assets/layers/tree_node/tree_node.json
@@ -119,11 +119,11 @@
{
"id": "circumference",
"question": {
- "en": "What is the circumference of the tree trunk?This is measured at a height of 1.30m
",
- "de": "Wie groß ist der Umfang des Baumstammes?Dies wird in einer Höhe von 1,30 m gemessen
",
- "fr": "Quelle est la circonférence du tronc ? La mesure est effectuée à 1.30m de hauteur
",
- "nl": "Wat is de omtrek van de boomstam? Dit wordt 1.30m boven de grond gemeten
",
- "es": "¿Cuál es la circunferencia del tronco del árbol?Se mide a una altura de 1,30 m
"
+ "en": "What is the circumference of the tree trunk?",
+ "de": "Wie groß ist der Umfang des Baumstammes?",
+ "fr": "Quelle est la circonférence du tronc ? ",
+ "nl": "Wat is de omtrek van de boomstam? ",
+ "es": "¿Cuál es la circunferencia del tronco del árbol?"
},
"render": {
"en": "The tree trunk has a circumference of {circumference} meter",
@@ -136,6 +136,13 @@
"key": "circumference",
"inline": true,
"type": "pfloat"
+ },
+ "questionHint": {
+ "en": "This is measured at a height of 1.30m",
+ "de": "Dies wird in einer Höhe von 1,30 m gemessen",
+ "fr": "La mesure est effectuée à 1.30m de hauteur",
+ "nl": "Dit wordt 1.30m boven de grond gemeten",
+ "es": "Se mide a una altura de 1,30 m"
}
},
{
diff --git a/langs/layers/da.json b/langs/layers/da.json
index ba332afaf8..38751824fb 100644
--- a/langs/layers/da.json
+++ b/langs/layers/da.json
@@ -2390,13 +2390,6 @@
}
}
},
- "1": {
- "options": {
- "0": {
- "question": "Har et puslebord"
- }
- }
- },
"2": {
"options": {
"0": {
diff --git a/langs/layers/de.json b/langs/layers/de.json
index 70e1755705..e25b26a84f 100644
--- a/langs/layers/de.json
+++ b/langs/layers/de.json
@@ -8026,13 +8026,6 @@
}
}
},
- "1": {
- "options": {
- "0": {
- "question": "Mit Wickeltisch"
- }
- }
- },
"2": {
"options": {
"0": {
@@ -8351,7 +8344,8 @@
},
"tagRenderings": {
"circumference": {
- "question": "Wie groß ist der Umfang des Baumstammes?Dies wird in einer Höhe von 1,30 m gemessen
",
+ "question": "Wie groß ist der Umfang des Baumstammes?",
+ "questionHint": "Dies wird in einer Höhe von 1,30 m gemessen",
"render": "Der Baumstamm hat einen Umfang von {circumference} Meter"
},
"height": {
diff --git a/langs/layers/en.json b/langs/layers/en.json
index 7984dfc3f3..8c61ac1299 100644
--- a/langs/layers/en.json
+++ b/langs/layers/en.json
@@ -5003,6 +5003,9 @@
}
}
},
+ "icons": {
+ "description": "A layer acting as library for icon-tagrenderings, especially to show as badge next to a POI"
+ },
"indoors": {
"description": "Basic indoor mapping: shows room outlines",
"name": "Indoors",
@@ -8044,13 +8047,6 @@
}
}
},
- "1": {
- "options": {
- "0": {
- "question": "Has a changing table"
- }
- }
- },
"2": {
"options": {
"0": {
@@ -8374,7 +8370,8 @@
},
"tagRenderings": {
"circumference": {
- "question": "What is the circumference of the tree trunk?This is measured at a height of 1.30m
",
+ "question": "What is the circumference of the tree trunk?",
+ "questionHint": "This is measured at a height of 1.30m",
"render": "The tree trunk has a circumference of {circumference} meter"
},
"height": {
diff --git a/langs/layers/es.json b/langs/layers/es.json
index 9bf196bd49..f0b9127edb 100644
--- a/langs/layers/es.json
+++ b/langs/layers/es.json
@@ -3846,13 +3846,6 @@
"question": "Accesible con sillas de ruedas"
}
}
- },
- "1": {
- "options": {
- "0": {
- "question": "Tiene un cambiador"
- }
- }
}
},
"tagRenderings": {
@@ -3912,7 +3905,8 @@
},
"tagRenderings": {
"circumference": {
- "question": "¿Cuál es la circunferencia del tronco del árbol?Se mide a una altura de 1,30 m
",
+ "question": "¿Cuál es la circunferencia del tronco del árbol?",
+ "questionHint": "Se mide a una altura de 1,30 m",
"render": "El tronco del árbol tiene una circunferencia de {circumference} metros"
},
"height": {
diff --git a/langs/layers/fr.json b/langs/layers/fr.json
index 58c87a8628..f870bdbd71 100644
--- a/langs/layers/fr.json
+++ b/langs/layers/fr.json
@@ -4565,13 +4565,6 @@
}
}
},
- "1": {
- "options": {
- "0": {
- "question": "A une table à langer"
- }
- }
- },
"2": {
"options": {
"0": {
@@ -4802,7 +4795,8 @@
},
"tagRenderings": {
"circumference": {
- "question": "Quelle est la circonférence du tronc ? La mesure est effectuée à 1.30m de hauteur
",
+ "question": "Quelle est la circonférence du tronc ? ",
+ "questionHint": "La mesure est effectuée à 1.30m de hauteur",
"render": "Le tronc a une circonférence de {circumference} mètre(s)"
},
"height": {
diff --git a/langs/layers/nl.json b/langs/layers/nl.json
index 6411c6ad11..cc5dbc9f78 100644
--- a/langs/layers/nl.json
+++ b/langs/layers/nl.json
@@ -7812,13 +7812,6 @@
}
}
},
- "1": {
- "options": {
- "0": {
- "question": "Heeft een luiertafel"
- }
- }
- },
"2": {
"options": {
"0": {
@@ -8131,7 +8124,8 @@
},
"tagRenderings": {
"circumference": {
- "question": "Wat is de omtrek van de boomstam? Dit wordt 1.30m boven de grond gemeten
",
+ "question": "Wat is de omtrek van de boomstam? ",
+ "questionHint": "Dit wordt 1.30m boven de grond gemeten",
"render": "De boomstam heeft een omtrek van {circumference} meter"
},
"height": {
diff --git a/langs/themes/ca.json b/langs/themes/ca.json
index 7d7e0bed9e..214105197d 100644
--- a/langs/themes/ca.json
+++ b/langs/themes/ca.json
@@ -688,35 +688,6 @@
"indoors": {
"title": "Interiors"
},
- "mapcomplete-changes": {
- "description": "Aquest mapa mostra tots els canvis fets amb MapComplete",
- "layers": {
- "0": {
- "filter": {
- "0": {
- "options": {
- "0": {
- "question": "Nom del tema conté {search}"
- }
- }
- },
- "5": {
- "options": {
- "0": {
- "question": "Idioma de l'usuari (ISO-code) {search}"
- }
- }
- }
- },
- "name": "Centres del conjunt de canvis",
- "tagRenderings": {
- "host": {
- "render": "Canvi amb {host}"
- }
- }
- }
- }
- },
"maproulette": {
"title": "Tasques de MapRoulette"
},
diff --git a/langs/themes/cs.json b/langs/themes/cs.json
index 1a48e9df2e..db30b7452b 100644
--- a/langs/themes/cs.json
+++ b/langs/themes/cs.json
@@ -670,68 +670,6 @@
"description": "Mapa zobrazující obrubníky a přechody.",
"title": "Obrubníky a přechody"
},
- "mapcomplete-changes": {
- "description": "Tato mapa zobrazuje všechny změny provedené pomocí MapComplete",
- "layers": {
- "0": {
- "description": "Zobrazuje všechny změny MapComplete",
- "filter": {
- "1": {
- "options": {
- "0": {
- "question": "Vytvořil přispěvatel {search}"
- }
- }
- },
- "2": {
- "options": {
- "0": {
- "question": "Nevytvořil přispěvatel {search}"
- }
- }
- },
- "3": {
- "options": {
- "0": {
- "question": "Vytvořeno před {search}"
- }
- }
- },
- "4": {
- "options": {
- "0": {
- "question": "Vytvořeno po {search}"
- }
- }
- }
- },
- "tagRenderings": {
- "contributor": {
- "question": "Jaký přispěvatel provedl tuto změnu?",
- "render": "Změna byla provedena uživatelem {user}"
- },
- "host": {
- "render": "Změnit s {host}"
- },
- "locale": {
- "question": "V jakém prostředí (jazyce) byla tato změna provedena?",
- "render": "Uživatelské prostředí je {locale}"
- }
- }
- },
- "1": {
- "override": {
- "tagRenderings": {
- "link_to_more": {
- "render": "Další statistiky najdete na ."
- }
- }
- }
- }
- },
- "shortDescription": "Zobrazuje změny provedené pomocí MapComplete",
- "title": "Změny provedené pomocí MapComplete"
- },
"maps": {
"description": "Na této mapě najdete všechny mapy, které OpenStreetMap zná - typicky je zde velká mapa na informační tabuli zobrazující oblast, město nebo region, (např. turistická mapa na zadní straně billboardu, mapa přírodní rezervace, mapa cyklistických sítí v regionu, ...).
Pokud mapa chybí, můžete ji snadno zmapovat na OpenStreetMap.",
"title": "Mapa map"
diff --git a/langs/themes/de.json b/langs/themes/de.json
index 6cb09a04df..3aa814ead7 100644
--- a/langs/themes/de.json
+++ b/langs/themes/de.json
@@ -766,108 +766,6 @@
"description": "Eine Karte mit Bordsteinen und Überwegen.",
"title": "Bordsteine und Überwege"
},
- "mapcomplete-changes": {
- "description": "Diese Karte zeigt alle mit MapComplete vorgenommenen Änderungen",
- "layers": {
- "0": {
- "description": "Zeigt alle MapComplete-Änderungen",
- "filter": {
- "0": {
- "options": {
- "0": {
- "question": "Themename enthält {search}"
- }
- }
- },
- "1": {
- "options": {
- "0": {
- "question": "Erstellt vom Mitwirkenden {search}"
- }
- }
- },
- "2": {
- "options": {
- "0": {
- "question": "Nicht von Mitwirkendem {search}"
- }
- }
- },
- "3": {
- "options": {
- "0": {
- "question": "Erstellt vor {search}"
- }
- }
- },
- "4": {
- "options": {
- "0": {
- "question": "Erstellt nach {search}"
- }
- }
- },
- "5": {
- "options": {
- "0": {
- "question": "Benutzersprache (ISO-Code) {search}"
- }
- }
- },
- "6": {
- "options": {
- "0": {
- "question": "Erstellt mit host {search}"
- }
- }
- },
- "7": {
- "options": {
- "0": {
- "question": "Im Änderungssatz wurde mindestens ein Bild hinzugefügt"
- }
- }
- }
- },
- "name": "Zentrum der Änderungssätze",
- "tagRenderings": {
- "contributor": {
- "question": "Welcher Mitwirkende hat diese Änderung vorgenommen?",
- "render": "Änderung vorgenommen von {user}"
- },
- "host": {
- "question": "Über welchen Host (Webseite) wurde diese Änderung vorgenommen?",
- "render": "Geändert über {host}"
- },
- "locale": {
- "question": "In welchem Gebietsschema (Sprache) wurde diese Änderung vorgenommen?",
- "render": "Benutzergebietsschema ist {locale}"
- },
- "show_changeset_id": {
- "render": "Änderungssatz {id}"
- },
- "theme-id": {
- "question": "Welches Thema wurde für diese Änderung verwendet?",
- "render": "Geändert mit Thema {theme}"
- }
- },
- "title": {
- "render": "Änderungssatz für {theme}"
- }
- },
- "1": {
- "override": {
- "tagRenderings": {
- "link_to_more": {
- "render": "Weitere Statistiken hier"
- }
- }
- }
- }
- },
- "shortDescription": "Zeigt Änderungen, die von MapComplete vorgenommen wurden",
- "title": "Mit MapComplete vorgenommene Änderungen"
- },
"maproulette": {
"description": "Thema mit MapRoulette-Aufgaben, die Sie suchen, filtern und beheben können.",
"title": "MapRoulette-Aufgaben"
diff --git a/langs/themes/en.json b/langs/themes/en.json
index 235b94155d..1af038368a 100644
--- a/langs/themes/en.json
+++ b/langs/themes/en.json
@@ -767,7 +767,7 @@
"title": "Kerbs and crossings"
},
"mapcomplete-changes": {
- "description": "This map shows all the changes made with MapComplete",
+ "description": "This maps shows all the changes made with MapComplete",
"layers": {
"0": {
"description": "Shows all MapComplete changes",
@@ -810,7 +810,7 @@
"5": {
"options": {
"0": {
- "question": "User language (ISO-code) {search}"
+ "question": "User language (iso-code) {search}"
}
}
},
@@ -837,7 +837,7 @@
},
"host": {
"question": "What host (website) was this change made with?",
- "render": "Change with {host}"
+ "render": "Change with with {host}"
},
"locale": {
"question": "What locale (language) was this change made in?",
diff --git a/langs/themes/es.json b/langs/themes/es.json
index 3e19c2261c..91e69f5af9 100644
--- a/langs/themes/es.json
+++ b/langs/themes/es.json
@@ -766,108 +766,6 @@
"description": "Un mapa que muestra bordillos y cruces.",
"title": "Bordillos y cruces"
},
- "mapcomplete-changes": {
- "description": "Este mapa muestra todos los cambios realizados con MapComplete",
- "layers": {
- "0": {
- "description": "Muestra todos los cambios de MapComplete",
- "filter": {
- "0": {
- "options": {
- "0": {
- "question": "El nombre contiene {search}"
- }
- }
- },
- "1": {
- "options": {
- "0": {
- "question": "Hecho por colaborador {search}"
- }
- }
- },
- "2": {
- "options": {
- "0": {
- "question": "No hecho por colaborador {search}"
- }
- }
- },
- "3": {
- "options": {
- "0": {
- "question": "Hecho antes de {search}"
- }
- }
- },
- "4": {
- "options": {
- "0": {
- "question": "Hecho después de {search}"
- }
- }
- },
- "5": {
- "options": {
- "0": {
- "question": "Use lenguaje (ISO-code) {search}"
- }
- }
- },
- "6": {
- "options": {
- "0": {
- "question": "Hecho con host {search}"
- }
- }
- },
- "7": {
- "options": {
- "0": {
- "question": "Conjunto de cambios ha añadido al menos una imagen"
- }
- }
- }
- },
- "name": "Centros de cambios",
- "tagRenderings": {
- "contributor": {
- "question": "¿Qué colaborador realizó este cambio?",
- "render": "Cambio realizado por {user}"
- },
- "host": {
- "question": "¿En qué host (sitio web) se realizó este cambio?",
- "render": "Cambio con {host}"
- },
- "locale": {
- "question": "¿En qué configuración regional (idioma) se realizó este cambio?",
- "render": "La configuración regional del usuario es {locale}"
- },
- "show_changeset_id": {
- "render": "Conjunto de cambios {id}"
- },
- "theme-id": {
- "question": "¿Qué tema se utilizó para realizar este cambio?",
- "render": "Cambio con tema {theme}"
- }
- },
- "title": {
- "render": "Conjunto de cambios para {theme}"
- }
- },
- "1": {
- "override": {
- "tagRenderings": {
- "link_to_more": {
- "render": "Más estadísticas en aquí"
- }
- }
- }
- }
- },
- "shortDescription": "Muestra los cambios realizados por MapComplete",
- "title": "Cambios realizados por MapComplete"
- },
"maproulette": {
"description": "Tema que muestra las tareas de MapRoulette, permitiendo buscarlas, filtrarlas y arreglarlas.",
"title": "Tareas de MapRoulette"
diff --git a/langs/themes/fr.json b/langs/themes/fr.json
index 8dbdc8ebe2..a8db4c07e7 100644
--- a/langs/themes/fr.json
+++ b/langs/themes/fr.json
@@ -745,107 +745,6 @@
"description": "Une carte affichant les ressauts et traversées.",
"title": "Ressauts et traversées"
},
- "mapcomplete-changes": {
- "description": "Cette carte montre tous les changements faits avec MapComplete",
- "layers": {
- "0": {
- "description": "Montre tous les changements de MapComplete",
- "filter": {
- "0": {
- "options": {
- "0": {
- "question": "Nom de thème contenant {search}"
- }
- }
- },
- "1": {
- "options": {
- "0": {
- "question": "Fait par le contributeur {search}"
- }
- }
- },
- "2": {
- "options": {
- "0": {
- "question": "Non réalisé par le contributeur{search}"
- }
- }
- },
- "3": {
- "options": {
- "0": {
- "question": "Fait avant {search}"
- }
- }
- },
- "4": {
- "options": {
- "0": {
- "question": "Fait après {search}"
- }
- }
- },
- "5": {
- "options": {
- "0": {
- "question": "Langage utilisateur (code-ISO) {search}"
- }
- }
- },
- "6": {
- "options": {
- "0": {
- "question": "Fait par le serveur {search}"
- }
- }
- },
- "7": {
- "options": {
- "0": {
- "question": "Le groupe de modifications a ajouté au moins une image"
- }
- }
- }
- },
- "name": "Centres de modifications de paramètres",
- "tagRenderings": {
- "contributor": {
- "question": "Quel contributeur a fait ce changement ?",
- "render": "Modification faite par {user}"
- },
- "host": {
- "question": "Depuis quel serveur (site web) ce changement a-t-il été fait ?",
- "render": "Changement avec {host}"
- },
- "locale": {
- "question": "En quelle langue est-ce que ce changement a été fait ?",
- "render": "La langue de l'utilisateur est {locale}"
- },
- "show_changeset_id": {
- "render": "Groupe de modifications {id}"
- },
- "theme-id": {
- "question": "Quel thème a été utilisé pour faire cette modification ?",
- "render": "Modifié avec le thème {theme}"
- }
- },
- "title": {
- "render": "Groupe de modifications pour {theme}"
- }
- },
- "1": {
- "override": {
- "tagRenderings": {
- "link_to_more": {
- "render": "D’autres statistiques sont disponibles ici"
- }
- }
- }
- }
- },
- "title": "Changements faits avec MapComplete"
- },
"maproulette": {
"description": "Thème MapRoulette permettant d’afficher, rechercher, filtrer et résoudre les tâches.",
"title": "Tâches MapRoulette"
diff --git a/langs/themes/nb_NO.json b/langs/themes/nb_NO.json
index 6b0f60db87..c33658efd5 100644
--- a/langs/themes/nb_NO.json
+++ b/langs/themes/nb_NO.json
@@ -496,97 +496,6 @@
"description": "Fortauskanter og fotgjengerfelt.",
"title": "Fortauskanter og fotgjengerfelt."
},
- "mapcomplete-changes": {
- "layers": {
- "0": {
- "description": "Viser alle MapComplete-endringer",
- "filter": {
- "0": {
- "options": {
- "0": {
- "question": "Temanavn inneholder {search}"
- }
- }
- },
- "1": {
- "options": {
- "0": {
- "question": "Laget av bidragsyter {search}"
- }
- }
- },
- "2": {
- "options": {
- "0": {
- "question": "Ikke laget av bidragsyter {search}"
- }
- }
- },
- "3": {
- "options": {
- "0": {
- "question": "Laget før {search}"
- }
- }
- },
- "4": {
- "options": {
- "0": {
- "question": "Laget etter {search}"
- }
- }
- },
- "5": {
- "options": {
- "0": {
- "question": "Brukerspråk (ISO-kode) {search}"
- }
- }
- },
- "6": {
- "options": {
- "0": {
- "question": "Laget med vert {search}"
- }
- }
- },
- "7": {
- "options": {
- "0": {
- "question": "Endringssett la til minst ett bilde"
- }
- }
- }
- },
- "tagRenderings": {
- "contributor": {
- "render": "Endring gjort av {user}"
- },
- "show_changeset_id": {
- "render": "Endringssett {id}"
- },
- "theme-id": {
- "question": "Hvilket tema ble brukt for å utføre denne denne endringen?",
- "render": "Endre med temaet {theme}"
- }
- },
- "title": {
- "render": "Endringssett for {theme}"
- }
- },
- "1": {
- "override": {
- "tagRenderings": {
- "link_to_more": {
- "render": "Mer statistikk å finne her"
- }
- }
- }
- }
- },
- "shortDescription": "Vis endringer laget med MapComplete",
- "title": "Endringer laget med MapComplete"
- },
"maps": {
"title": "Et kart over kart"
},
diff --git a/langs/themes/nl.json b/langs/themes/nl.json
index f7683a3c98..0d9ebed8d1 100644
--- a/langs/themes/nl.json
+++ b/langs/themes/nl.json
@@ -887,108 +887,6 @@
"description": "Een kaart met stoepranden en oversteekplaatsen.",
"title": "Stoepranden en oversteekplaatsen"
},
- "mapcomplete-changes": {
- "description": "Deze kaart toont alle wijzigingen gemaakt met MapComplete",
- "layers": {
- "0": {
- "description": "Toon alle MapComplete wijzigingen",
- "filter": {
- "0": {
- "options": {
- "0": {
- "question": "Themanaam bevat {search}"
- }
- }
- },
- "1": {
- "options": {
- "0": {
- "question": "Gemaakt door {search}"
- }
- }
- },
- "2": {
- "options": {
- "0": {
- "question": "Niet gemaakt door {search}"
- }
- }
- },
- "3": {
- "options": {
- "0": {
- "question": "Gemaakt voor {search}"
- }
- }
- },
- "4": {
- "options": {
- "0": {
- "question": "Gemaakt na {search}"
- }
- }
- },
- "5": {
- "options": {
- "0": {
- "question": "Gebruikerstaal (ISO-code) {search}"
- }
- }
- },
- "6": {
- "options": {
- "0": {
- "question": "Gemaakt met host {search}"
- }
- }
- },
- "7": {
- "options": {
- "0": {
- "question": "Changeset die een of meerdere afbeeldingen toevoegt"
- }
- }
- }
- },
- "name": "Middelpunt van de wijzigingenset",
- "tagRenderings": {
- "contributor": {
- "question": "Welke bijdrager maakte deze wijziging?",
- "render": "Wijziging gemaakt door {user}"
- },
- "host": {
- "question": "Op welk webadres werd deze wijziging gemaakt?",
- "render": "Wijziging met {host}"
- },
- "locale": {
- "question": "In welke taal (en cultuur) werd deze wijziging gemaakt?",
- "render": "De locale van de bijdrager is {locale}"
- },
- "show_changeset_id": {
- "render": "Wijzigingenset {id}"
- },
- "theme-id": {
- "question": "Welk thema is gebruikt voor deze wijziging?",
- "render": "Wijziging met thema {theme}"
- }
- },
- "title": {
- "render": "Changeset voor {theme}"
- }
- },
- "1": {
- "override": {
- "tagRenderings": {
- "link_to_more": {
- "render": "Meer statistieken zijn hier te vinden"
- }
- }
- }
- }
- },
- "shortDescription": "Toont wijzigingen gemaakt met MapComplete",
- "title": "Wijzigingen gemaakt met MapComplete"
- },
"maproulette": {
"description": "Thema met MapRoulette taken, waar je ze kunt zoeken, filteren en ze oplossen.",
"title": "MapRoulette taken"
diff --git a/scripts/fixQuestionHint.ts b/scripts/fixQuestionHint.ts
index 7f52bbab6c..43eee5df2c 100644
--- a/scripts/fixQuestionHint.ts
+++ b/scripts/fixQuestionHint.ts
@@ -4,7 +4,6 @@ import { LayerConfigJson } from "../Models/ThemeConfig/Json/LayerConfigJson"
import { QuestionableTagRenderingConfigJson } from "../Models/ThemeConfig/Json/QuestionableTagRenderingConfigJson"
import * as fakedom from "fake-dom"
import Script from "./Script"
-import Translations from "../UI/i18n/Translations"
import { FixedUiElement } from "../UI/Base/FixedUiElement"
class ExtractQuestionHint extends DesugaringStep {
@@ -45,7 +44,9 @@ class ExtractQuestionHint extends DesugaringStep i > 0
+ ) // note: > 0, not >= : we are not interested in a span starting right away!
if (divStart > 0) {
json.question[language] = q.substring(0, divStart)
hint[language] = new FixedUiElement(