Attempt to fix the build

This commit is contained in:
pietervdvn 2022-07-28 10:00:11 +02:00
parent d68486ae73
commit 9216b5a094
9 changed files with 73 additions and 61 deletions

View file

@ -81,7 +81,7 @@ export class SubstitutedTranslation extends VariableUiElement {
/** /**
* *
* // Return empty list on empty input * // Return empty list on empty input
* SubstitutedTranslation.ExtractSpecialComponents("") // => "" * SubstitutedTranslation.ExtractSpecialComponents("") // => []
* *
* // Advanced cases with commas, braces and newlines should be handled without problem * // 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)}") * 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)}")

View file

@ -1,19 +1,13 @@
{ {
"id": "mapcomplete-changes", "id": "mapcomplete-changes",
"title": { "title": {
"en": "Changes made with MapComplete", "en": "Changes made with MapComplete"
"de": "Mit MapComplete vorgenommene Änderungen",
"nl": "Wijzigingen gemaakt met MapComplete"
}, },
"shortDescription": { "shortDescription": {
"en": "Shows changes made by MapComplete", "en": "Shows changes made by MapComplete"
"de": "Zeigt die mit MapComplete vorgenommenen Änderungen",
"nl": "Toont wijzigingen gemaakt met MapComplete"
}, },
"description": { "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",
"nl": "Deze kaart toont alle wijzigingen die met MapComplete werden gemaakt"
}, },
"maintainer": "", "maintainer": "",
"icon": "./assets/svg/logo.svg", "icon": "./assets/svg/logo.svg",
@ -28,8 +22,7 @@
{ {
"id": "mapcomplete-changes", "id": "mapcomplete-changes",
"name": { "name": {
"en": "Changeset centers", "en": "Changeset centers"
"de": "Zentrum der Änderungssätze"
}, },
"minzoom": 0, "minzoom": 0,
"source": { "source": {
@ -43,47 +36,35 @@
], ],
"title": { "title": {
"render": { "render": {
"en": "Changeset for {theme}", "en": "Changeset for {theme}"
"de": "Änderungssatz für {theme}",
"nl": "Wijzigingset voor {theme}"
} }
}, },
"description": { "description": {
"en": "Shows all MapComplete changes", "en": "Shows all MapComplete changes"
"de": "Zeigt alle MapComplete Änderungen",
"nl": "Toont alle wijzigingen met MapComplete"
}, },
"tagRenderings": [ "tagRenderings": [
{ {
"id": "render_id", "id": "render_id",
"render": { "render": {
"en": "Changeset <a href='https://openstreetmap.org/changeset/{id}' target='_blank'>{id}</a>", "en": "Changeset <a href='https://openstreetmap.org/changeset/{id}' target='_blank'>{id}</a>"
"de": "Änderungssatz <a href='https://openstreetmap.org/changeset/{id}' target='_blank'>{id}</a>",
"nl": "Wijzigingset <a href='https://openstreetmap.org/changeset/{id}' target='_blank'>{id}</a>"
} }
}, },
{ {
"id": "contributor", "id": "contributor",
"render": { "render": {
"en": "Change made by <a href='https://openstreetmap.org/user/{_last_edit:contributor}' target='_blank'>{_last_edit:contributor}</a>", "en": "Change made by <a href='https://openstreetmap.org/user/{_last_edit:contributor}' target='_blank'>{_last_edit:contributor}</a>"
"de": "Geändert von <a href='https://openstreetmap.org/user/{_last_edit:contributor}' target='_blank'>{_last_edit:contributor}</a>",
"nl": "Wijziging gemaakt door <a href='https://openstreetmap.org/user/{_last_edit:contributor}' target='_blank'>{_last_edit:contributor}</a>"
} }
}, },
{ {
"id": "theme", "id": "theme",
"render": { "render": {
"en": "Change with theme <a href='https://mapcomplete.osm.be/{theme}'>{theme}</a>", "en": "Change with theme <a href='https://mapcomplete.osm.be/{theme}'>{theme}</a>"
"de": "Änderung mit Thema <a href='https://mapcomplete.osm.be/{theme}'>{theme}</a>",
"nl": "Wijziging met thema <a href='https://mapcomplete.osm.be/{theme}'>{theme}</a>"
}, },
"mappings": [ "mappings": [
{ {
"if": "theme~http.*", "if": "theme~http.*",
"then": { "then": {
"en": "Change with <b>unofficial</b> theme <a href='https://mapcomplete.osm.be/theme.html?userlayout={theme}'>{theme}</a>", "en": "Change with <b>unofficial</b> theme <a href='https://mapcomplete.osm.be/theme.html?userlayout={theme}'>{theme}</a>"
"de": "Änderung mit <b>inoffiziellem</b> Thema <a href='https://mapcomplete.osm.be/theme.html?userlayout={theme}'>{theme}</a>",
"nl": "Wijziging met <b>officieus</b> thema <a href='https://mapcomplete.osm.be/theme.html?userlayout={theme}'>{theme}</a>"
} }
} }
] ]
@ -395,9 +376,7 @@
} }
], ],
"question": { "question": {
"en": "Themename contains {search}", "en": "Themename contains {search}"
"de": "Themenname enthält {search}",
"nl": "Themanaam bevat {search}"
} }
} }
] ]
@ -413,9 +392,7 @@
} }
], ],
"question": { "question": {
"en": "Made by contributor {search}", "en": "Made by contributor {search}"
"de": "Erstellt von {search}",
"nl": "Gemaakt door bijdrager {search}"
} }
} }
] ]
@ -431,9 +408,7 @@
} }
], ],
"question": { "question": {
"en": "<b>Not</b> made by contributor {search}", "en": "<b>Not</b> made by contributor {search}"
"de": "<b>Nicht</b> erstellt von {search}",
"nl": "<b>Niet</b> gemaakt door bijdrager {search}"
} }
} }
] ]
@ -448,9 +423,7 @@
{ {
"id": "link_to_more", "id": "link_to_more",
"render": { "render": {
"en": "More statistics can be found <a href='https://github.com/pietervdvn/MapComplete/tree/develop/Docs/Tools/graphs' target='_blank'>here</a>", "en": "More statistics can be found <a href='https://github.com/pietervdvn/MapComplete/tree/develop/Docs/Tools/graphs' target='_blank'>here</a>"
"de": "Weitere Statistiken finden Sie <a href='https://github.com/pietervdvn/MapComplete/tree/develop/Docs/Tools/graphs' target='_blank'>hier</a>",
"nl": "Meer statistieken kunnen <a href='https://github.com/pietervdvn/MapComplete/tree/develop/Docs/Tools/graphs' target='_blank'>hier</a> gevonden worden"
} }
}, },
{ {

View file

@ -10,7 +10,7 @@
"en": "On this map, publicly weelchair accessible places are shown and can be easily added", "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", "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", "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", "maintainer": "MapComplete",
"icon": "./assets/themes/onwheels/crest.svg", "icon": "./assets/themes/onwheels/crest.svg",
@ -34,6 +34,9 @@
"builtin": "pedestrian_path", "builtin": "pedestrian_path",
"override": { "override": {
"name": null, "name": null,
"tagRendering": null,
"title": "null",
"minzoom": 19,
"shownByDefault": false "shownByDefault": false
} }
}, },

View file

@ -667,9 +667,6 @@
} }
}, },
"tagRenderings": { "tagRenderings": {
"Email maintainer": {
"render": "<a href='mailto:{email}?subject=Cykelpumpe i stykker&body=Hej,%0D%0A%0D%0D%0Med denne e-mail vil jeg gerne oplyse, at cykelpumpen, der befinder sig på https://mapcomplete.osm.be/cyclofix?lat={_lat}%26lon={_lon}%26z=18%23{id} er i stykker.%0D%0A%0D%0D%0A Med venlig hilsen'>Anmeld denne cykelpumpe som værende i stykker</a>"
},
"Operational status": { "Operational status": {
"mappings": { "mappings": {
"0": { "0": {
@ -780,6 +777,15 @@
}, },
"question": "Hvilke ventiler understøttes?", "question": "Hvilke ventiler understøttes?",
"render": "Denne pumpe understøtter følgende ventiler: {valves}" "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": { "title": {

View file

@ -811,9 +811,6 @@
} }
}, },
"tagRenderings": { "tagRenderings": {
"Email maintainer": {
"render": "<a href='mailto:{email}?subject=Fahrradpumpe kaputt&body=Hallo,%0D%0A%0D%0AMit dieser E-Mail möchte ich Ihnen mitteilen, dass die Fahrradpumpe, die sich unter https://mapcomplete.osm.be/cyclofix?lat={_lat}%26lon={_lon}%26z=18%23{id} befindet, kaputt ist.'>Melde diese Fahrradpumpe als kaputt</a>"
},
"Operational status": { "Operational status": {
"mappings": { "mappings": {
"0": { "0": {
@ -938,6 +935,15 @@
}, },
"question": "Welche Ventile werden unterstützt?", "question": "Welche Ventile werden unterstützt?",
"render": "Diese Pumpe unterstützt die folgenden Ventile: {valves}" "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": { "title": {

View file

@ -811,9 +811,6 @@
} }
}, },
"tagRenderings": { "tagRenderings": {
"Email maintainer": {
"render": "<a href='mailto:{email}?subject=Broken bicycle pump&body=Hello,%0D%0A%0D%0AWith this email, I&#39;d like to inform you that the bicycle pump located at https://mapcomplete.osm.be/cyclofix?lat={_lat}%26lon={_lon}%26z=18%23{id} is broken.%0D%0A%0D%0A Kind regards'>Report this bicycle pump as broken</a>"
},
"Operational status": { "Operational status": {
"mappings": { "mappings": {
"0": { "0": {
@ -938,6 +935,15 @@
}, },
"question": "What valves are supported?", "question": "What valves are supported?",
"render": "This pump supports the following valves: {valves}" "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": { "title": {

View file

@ -728,9 +728,6 @@
} }
}, },
"tagRenderings": { "tagRenderings": {
"Email maintainer": {
"render": "<a href='mailto:{email}?subject=Bomba para bicicletas rota&body=Hola,%0D%0A%0D%0ACon este correo, me gustaría informar de que esta bomba para bicicletas situada en https://mapcomplete.osm.be/cyclofix?lat={_lat}%26lon={_lon}%26z=18%23{id} está rota.%0D%0A%0D%0AUn saludo'>Reportar esta bomba para bicicletas como rota</a>"
},
"Operational status": { "Operational status": {
"mappings": { "mappings": {
"0": { "0": {
@ -855,6 +852,15 @@
}, },
"question": "¿Que válvulas se soportan?", "question": "¿Que válvulas se soportan?",
"render": "Esta bomba soporta las siguiente válvulas: {valves}" "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": { "title": {

View file

@ -811,9 +811,6 @@
} }
}, },
"tagRenderings": { "tagRenderings": {
"Email maintainer": {
"render": "<a href='mailto:{email}?subject=Pompe à vélo cassée&body=Bonjour,%0D%0A%0D%0ACe mail pour vous informer que la pompe à vélo située à https://mapcomplete.osm.be/cyclofix?lat={_lat}%26lon={_lon}%26z=18%23{id} est cassée.%0D%0A%0D%0ABien à vous.'>Signaler cette pompe à vélo cassée</a>"
},
"Operational status": { "Operational status": {
"mappings": { "mappings": {
"0": { "0": {
@ -938,6 +935,15 @@
}, },
"question": "Quelles valves sont compatibles ?", "question": "Quelles valves sont compatibles ?",
"render": "Cette pompe est compatible avec les valves suivantes : {valves}" "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": { "title": {

View file

@ -811,9 +811,6 @@
} }
}, },
"tagRenderings": { "tagRenderings": {
"Email maintainer": {
"render": "<a href='mailto:{email}?subject=Kapotte fietspomp&body=Geachte,%0D%0A%0D%0AGraag had ik u gemeld dat een fietspomp defect is. De fietspomp bevindt zich hier: https://mapcomplete.osm.be/cyclofix?lat={_lat}%26lon={_lon}%26z=18%23{id}.%0D%0A%0D%0AMet vriendelijke groeten.'>Rapporteer deze fietspomp als kapot</a>"
},
"Operational status": { "Operational status": {
"mappings": { "mappings": {
"0": { "0": {
@ -938,6 +935,15 @@
}, },
"question": "Welke ventielen werken er met de pomp?", "question": "Welke ventielen werken er met de pomp?",
"render": "Deze pomp werkt met de volgende ventielen: {valves}" "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": { "title": {