diff --git a/UI/SubstitutedTranslation.ts b/UI/SubstitutedTranslation.ts index 514d946d7..8fcac61be 100644 --- a/UI/SubstitutedTranslation.ts +++ b/UI/SubstitutedTranslation.ts @@ -81,7 +81,7 @@ export class SubstitutedTranslation extends VariableUiElement { /** * * // Return empty list on empty input - * SubstitutedTranslation.ExtractSpecialComponents("") // => "" + * SubstitutedTranslation.ExtractSpecialComponents("") // => [] * * // Advanced cases with commas, braces and newlines should be handled without problem * const templates = SubstitutedTranslation.ExtractSpecialComponents("{send_email(&LBRACEemail&RBRACE,Broken bicycle pump,Hello&COMMA\n\nWith this email&COMMA I'd like to inform you that the bicycle pump located at https://mapcomplete.osm.be/cyclofix?lat=&LBRACE_lat&RBRACE&lon=&LBRACE_lon&RBRACE&z=18#&LBRACEid&RBRACE is broken.\n\n Kind regards,Report this bicycle pump as broken)}") diff --git a/assets/themes/mapcomplete-changes/mapcomplete-changes.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.json index aa5e2aabd..d21921d33 100644 --- a/assets/themes/mapcomplete-changes/mapcomplete-changes.json +++ b/assets/themes/mapcomplete-changes/mapcomplete-changes.json @@ -1,19 +1,13 @@ { "id": "mapcomplete-changes", "title": { - "en": "Changes made with MapComplete", - "de": "Mit MapComplete vorgenommene Änderungen", - "nl": "Wijzigingen gemaakt met MapComplete" + "en": "Changes made with MapComplete" }, "shortDescription": { - "en": "Shows changes made by MapComplete", - "de": "Zeigt die mit MapComplete vorgenommenen Änderungen", - "nl": "Toont wijzigingen gemaakt met MapComplete" + "en": "Shows changes made by MapComplete" }, "description": { - "en": "This maps shows all the changes made with MapComplete", - "de": "Diese Karte zeigt alle mit MapComplete vorgenommenen Änderungen", - "nl": "Deze kaart toont alle wijzigingen die met MapComplete werden gemaakt" + "en": "This maps shows all the changes made with MapComplete" }, "maintainer": "", "icon": "./assets/svg/logo.svg", @@ -28,8 +22,7 @@ { "id": "mapcomplete-changes", "name": { - "en": "Changeset centers", - "de": "Zentrum der Änderungssätze" + "en": "Changeset centers" }, "minzoom": 0, "source": { @@ -43,47 +36,35 @@ ], "title": { "render": { - "en": "Changeset for {theme}", - "de": "Änderungssatz für {theme}", - "nl": "Wijzigingset voor {theme}" + "en": "Changeset for {theme}" } }, "description": { - "en": "Shows all MapComplete changes", - "de": "Zeigt alle MapComplete Änderungen", - "nl": "Toont alle wijzigingen met MapComplete" + "en": "Shows all MapComplete changes" }, "tagRenderings": [ { "id": "render_id", "render": { - "en": "Changeset {id}", - "de": "Änderungssatz {id}", - "nl": "Wijzigingset {id}" + "en": "Changeset {id}" } }, { "id": "contributor", "render": { - "en": "Change made by {_last_edit:contributor}", - "de": "Geändert von {_last_edit:contributor}", - "nl": "Wijziging gemaakt door {_last_edit:contributor}" + "en": "Change made by {_last_edit:contributor}" } }, { "id": "theme", "render": { - "en": "Change with theme {theme}", - "de": "Änderung mit Thema {theme}", - "nl": "Wijziging met thema {theme}" + "en": "Change with theme {theme}" }, "mappings": [ { "if": "theme~http.*", "then": { - "en": "Change with unofficial theme {theme}", - "de": "Änderung mit inoffiziellem Thema {theme}", - "nl": "Wijziging met officieus thema {theme}" + "en": "Change with unofficial theme {theme}" } } ] @@ -395,9 +376,7 @@ } ], "question": { - "en": "Themename contains {search}", - "de": "Themenname enthält {search}", - "nl": "Themanaam bevat {search}" + "en": "Themename contains {search}" } } ] @@ -413,9 +392,7 @@ } ], "question": { - "en": "Made by contributor {search}", - "de": "Erstellt von {search}", - "nl": "Gemaakt door bijdrager {search}" + "en": "Made by contributor {search}" } } ] @@ -431,9 +408,7 @@ } ], "question": { - "en": "Not made by contributor {search}", - "de": "Nicht erstellt von {search}", - "nl": "Niet gemaakt door bijdrager {search}" + "en": "Not made by contributor {search}" } } ] @@ -448,9 +423,7 @@ { "id": "link_to_more", "render": { - "en": "More statistics can be found here", - "de": "Weitere Statistiken finden Sie hier", - "nl": "Meer statistieken kunnen hier gevonden worden" + "en": "More statistics can be found here" } }, { diff --git a/assets/themes/onwheels/onwheels.json b/assets/themes/onwheels/onwheels.json index 286e185aa..bbb0e60ef 100644 --- a/assets/themes/onwheels/onwheels.json +++ b/assets/themes/onwheels/onwheels.json @@ -10,7 +10,7 @@ "en": "On this map, publicly weelchair accessible places are shown and can be easily added", "de": "Auf dieser Karte werden öffentlich zugängliche Orte für Rollstuhlfahrer angezeigt und können leicht hinzugefügt werden", "fr": "Sur cette carte nous pouvons voir et ajouter les différents endroits publiques accessibles aux chaises roulantes", - "nl": "Op deze kaart kan je informatie rond rolstoeltoegankelijkheid zien, zoals toegangsdeuren met hun breedte en drempelhoogte, toiletten met toegankelijkheidsinformatie, recepties maar ook winkels, cafés en restaurants." + "nl": "Op deze kaart kan je informatie rond rolstoeltoegankelijkheid zien, zoals toegangsdeuren met hun breedte en drempelhoogte, toiletten met toegankelijkheidsinformatie, recepties maar ook winkels, cafés en restaurants." }, "maintainer": "MapComplete", "icon": "./assets/themes/onwheels/crest.svg", @@ -34,6 +34,9 @@ "builtin": "pedestrian_path", "override": { "name": null, + "tagRendering": null, + "title": "null", + "minzoom": 19, "shownByDefault": false } }, diff --git a/langs/layers/da.json b/langs/layers/da.json index 15ecec5d1..e0a890e81 100644 --- a/langs/layers/da.json +++ b/langs/layers/da.json @@ -667,9 +667,6 @@ } }, "tagRenderings": { - "Email maintainer": { - "render": "Anmeld denne cykelpumpe som værende i stykker" - }, "Operational status": { "mappings": { "0": { @@ -780,6 +777,15 @@ }, "question": "Hvilke ventiler understøttes?", "render": "Denne pumpe understøtter følgende ventiler: {valves}" + }, + "send_email_about_broken_pump": { + "render": { + "special": { + "body": "Hej,\n\nMed denne e-mail vil jeg gerne oplyse, at cykelpumpen, der befinder sig på https://mapcomplete.osm.be/cyclofix?lat={_lat}&lon={_lon}&z=18#{id} er i stykker.\n\n Med venlig hilse", + "button_text": "Anmeld denne cykelpumpe som værende i stykker", + "subject": "Cykelpumpe i stykker" + } + } } }, "title": { diff --git a/langs/layers/de.json b/langs/layers/de.json index 4269b5494..2a464a54d 100644 --- a/langs/layers/de.json +++ b/langs/layers/de.json @@ -811,9 +811,6 @@ } }, "tagRenderings": { - "Email maintainer": { - "render": "Melde diese Fahrradpumpe als kaputt" - }, "Operational status": { "mappings": { "0": { @@ -938,6 +935,15 @@ }, "question": "Welche Ventile werden unterstützt?", "render": "Diese Pumpe unterstützt die folgenden Ventile: {valves}" + }, + "send_email_about_broken_pump": { + "render": { + "special": { + "body": "Hallo,\n\nMit dieser E-Mail möchte ich Ihnen mitteilen, dass die Fahrradpumpe, die sich unter https://mapcomplete.osm.be/cyclofix?lat={_lat}&lon={_lon}&z=18#{id} befindet, kaputt ist.", + "button_text": "Melde diese Fahrradpumpe als kaputt", + "subject": "Fahrradpumpe kaputt" + } + } } }, "title": { diff --git a/langs/layers/en.json b/langs/layers/en.json index 25fd6ab44..c1ab8980c 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -811,9 +811,6 @@ } }, "tagRenderings": { - "Email maintainer": { - "render": "Report this bicycle pump as broken" - }, "Operational status": { "mappings": { "0": { @@ -938,6 +935,15 @@ }, "question": "What valves are supported?", "render": "This pump supports the following valves: {valves}" + }, + "send_email_about_broken_pump": { + "render": { + "special": { + "body": "Hello,\n\nWith this email, I'd like to inform you that the bicycle pump located at https://mapcomplete.osm.be/cyclofix?lat={_lat}&lon={_lon}&z=18#{id} is broken.\n\n Kind regards", + "button_text": "Report this bicycle pump as broken", + "subject": "Broken bicycle pump" + } + } } }, "title": { diff --git a/langs/layers/es.json b/langs/layers/es.json index 475b942ad..713b3e018 100644 --- a/langs/layers/es.json +++ b/langs/layers/es.json @@ -728,9 +728,6 @@ } }, "tagRenderings": { - "Email maintainer": { - "render": "Reportar esta bomba para bicicletas como rota" - }, "Operational status": { "mappings": { "0": { @@ -855,6 +852,15 @@ }, "question": "¿Que válvulas se soportan?", "render": "Esta bomba soporta las siguiente válvulas: {valves}" + }, + "send_email_about_broken_pump": { + "render": { + "special": { + "body": "Hola,\n\nCon este correo, me gustaría informar de que esta bomba para bicicletas situada en https://mapcomplete.osm.be/cyclofix?lat={_lat}&lon={_lon}&z=18#{id} está rota.\n\nUn saludo", + "button_text": "Reportar esta bomba para bicicletas como rota", + "subject": "Bomba para bicicletas rota" + } + } } }, "title": { diff --git a/langs/layers/fr.json b/langs/layers/fr.json index 375e62897..9aec75e2d 100644 --- a/langs/layers/fr.json +++ b/langs/layers/fr.json @@ -811,9 +811,6 @@ } }, "tagRenderings": { - "Email maintainer": { - "render": "Signaler cette pompe à vélo cassée" - }, "Operational status": { "mappings": { "0": { @@ -938,6 +935,15 @@ }, "question": "Quelles valves sont compatibles ?", "render": "Cette pompe est compatible avec les valves suivantes : {valves}" + }, + "send_email_about_broken_pump": { + "render": { + "special": { + "body": "Bonjour,\n\nCe mail pour vous informer que la pompe à vélo située à https://mapcomplete.osm.be/cyclofix?lat={_lat}&lon={_lon}&z=18#{id} est cassée.\n\nBien à vous.", + "button_text": "Signaler cette pompe à vélo cassée", + "subject": "Pompe à vélo cassée" + } + } } }, "title": { diff --git a/langs/layers/nl.json b/langs/layers/nl.json index ab545a686..069d0654e 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -811,9 +811,6 @@ } }, "tagRenderings": { - "Email maintainer": { - "render": "Rapporteer deze fietspomp als kapot" - }, "Operational status": { "mappings": { "0": { @@ -938,6 +935,15 @@ }, "question": "Welke ventielen werken er met de pomp?", "render": "Deze pomp werkt met de volgende ventielen: {valves}" + }, + "send_email_about_broken_pump": { + "render": { + "special": { + "body": "Geachte\n\nGraag had ik u gemeld dat een fietspomp defect is. De fietspomp bevindt zich hier: https://mapcomplete.osm.be/cyclofix?lat={_lat}&lon={_lon}&z=18#{id}.\n\nMet vriendelijke groeten.", + "button_text": "Rapporteer deze fietspomp als kapot", + "subject": "Kapotte fietspomp" + } + } } }, "title": {