From e5ea4dbfa342627d7703f71a776c3ca6bb00947a Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Sat, 15 Apr 2023 02:47:48 +0200 Subject: [PATCH] Fix build --- assets/layers/advertising/advertising.json | 2 +- assets/layers/bench/bench.json | 3 +-- assets/layers/charging_station/charging_station.json | 9 +++++---- assets/layers/gps_location/gps_location.json | 2 +- assets/layers/last_click/last_click.json | 12 +----------- assets/layers/pharmacy/pharmacy.json | 6 +++--- assets/layers/recycling/recycling.json | 2 +- assets/tagRenderings/questions.json | 11 ++++++++--- langs/ca.json | 6 +----- langs/layers/de.json | 3 --- langs/layers/en.json | 2 +- langs/layers/nl.json | 2 +- 12 files changed, 24 insertions(+), 36 deletions(-) diff --git a/assets/layers/advertising/advertising.json b/assets/layers/advertising/advertising.json index 64db86f89..16a6c0032 100644 --- a/assets/layers/advertising/advertising.json +++ b/assets/layers/advertising/advertising.json @@ -1169,4 +1169,4 @@ ] } ] -} +} \ No newline at end of file diff --git a/assets/layers/bench/bench.json b/assets/layers/bench/bench.json index d1b473a73..ad1e38049 100644 --- a/assets/layers/bench/bench.json +++ b/assets/layers/bench/bench.json @@ -82,7 +82,6 @@ "class": "large" } }, - { "if": "backrest=yes", "then": { @@ -1047,4 +1046,4 @@ }, "has_image" ] -} +} \ No newline at end of file diff --git a/assets/layers/charging_station/charging_station.json b/assets/layers/charging_station/charging_station.json index 464722e83..89bf9bf74 100644 --- a/assets/layers/charging_station/charging_station.json +++ b/assets/layers/charging_station/charging_station.json @@ -4590,13 +4590,14 @@ ] } }, - "questions", { - "id": "questions_technical", + "id": "questions" + }, + { + "id": "questions", "render": { "en": "

Technical questions

The questions below are very technical. Feel free to ignore them
{questions(technical)}", - "nl": "

Technische vragen

De vragen hieronder zijn erg technisch - sla deze over indien je hier geen tijd voor hebt
{questions(technical)}", - "de": "

Technische Fragen

Die folgenden Fragen sind sehr technisch. Sie können sie gerne ignorieren
{questions(technical)}" + "nl": "

Technische vragen

De vragen hieronder zijn erg technisch - sla deze over indien je hier geen tijd voor hebt
{questions(technical)}" } } ], diff --git a/assets/layers/gps_location/gps_location.json b/assets/layers/gps_location/gps_location.json index e466f03f5..3c5d8f7ec 100644 --- a/assets/layers/gps_location/gps_location.json +++ b/assets/layers/gps_location/gps_location.json @@ -36,4 +36,4 @@ ] } ] -} +} \ No newline at end of file diff --git a/assets/layers/last_click/last_click.json b/assets/layers/last_click/last_click.json index ef84ed86a..5ff05941c 100644 --- a/assets/layers/last_click/last_click.json +++ b/assets/layers/last_click/last_click.json @@ -54,16 +54,6 @@ "render": { "*": "{open_note()}" } - }, - { - "metacondition": { - "or": [ - "__featureSwitchDebugging=true" - ] - }, - "render": { - "*": "{all_tags()}" - } } ], "mapRendering": [ @@ -168,4 +158,4 @@ ] } ] -} +} \ No newline at end of file diff --git a/assets/layers/pharmacy/pharmacy.json b/assets/layers/pharmacy/pharmacy.json index b2fe1ab39..e80aca337 100644 --- a/assets/layers/pharmacy/pharmacy.json +++ b/assets/layers/pharmacy/pharmacy.json @@ -174,6 +174,6 @@ } } ], -"deletion": true, -"allowMove": true -} + "deletion": true, + "allowMove": true +} \ No newline at end of file diff --git a/assets/layers/recycling/recycling.json b/assets/layers/recycling/recycling.json index c278dfb33..f68994500 100644 --- a/assets/layers/recycling/recycling.json +++ b/assets/layers/recycling/recycling.json @@ -1386,4 +1386,4 @@ "enableRelocation": true, "enableImproveAccuracy": true } -} +} \ No newline at end of file diff --git a/assets/tagRenderings/questions.json b/assets/tagRenderings/questions.json index 986c1327e..f9dce1b11 100644 --- a/assets/tagRenderings/questions.json +++ b/assets/tagRenderings/questions.json @@ -1366,7 +1366,12 @@ }, "last_edit": { "description": "Gives some metainfo about the last edit and who did edit it - rendering only", - "condition": "_last_edit:contributor~*", + "condition": { + "and": [ + "_last_edit:contributor~*", + "_last_edit:changeset" + ] + }, "metacondition": { "or": [ "__featureSwitchIsTesting=true", @@ -1381,7 +1386,7 @@ "href": "{_backend}/changeset/{_last_edit:changeset}", "text": { "en": "Last edited on {_last_edit:timestamp} by {_last_edit:contributor}", - "nl": "Laatst gewijzigd op {_last_edit:timestamp} door {_last_edit:contributor}" + "nl": "Laatst gewijzigd op {_last_edit:timestamp} door {_last_edit:contributor} " }, "class": "subtle font-small" } @@ -2053,4 +2058,4 @@ } ] } -} +} \ No newline at end of file diff --git a/langs/ca.json b/langs/ca.json index c6d9e3e32..164ff7966 100644 --- a/langs/ca.json +++ b/langs/ca.json @@ -695,12 +695,8 @@ "userinfo": { "gotoInbox": "Obre la teva safata d'entrada", "gotoSettings": "Aneu a la vostra configuració a OpenStreetMap.org", - "moveToHome": "Mou el mapa a la vostra ubicació de casa", - "newMessages": "tens missatges nous", "noDescription": "Encara no tens una descripció al teu perfil", - "noDescriptionCallToAction": "Afegeix una descripció del perfil", - "titleNotLoggedIn": "Benvingut", - "welcome": "Benvingut/da {name}" + "noDescriptionCallToAction": "Afegeix una descripció del perfil" }, "validation": { "color": { diff --git a/langs/layers/de.json b/langs/layers/de.json index 416e7e10f..1c66afdd2 100644 --- a/langs/layers/de.json +++ b/langs/layers/de.json @@ -2527,9 +2527,6 @@ "question": "Welche Leistung bietet ein einzelner Stecker vom Typ
Typ 2 mit Kabel (Mennekes)
?", "render": "
Typ 2 mit Kabel (Mennekes)
liefert maximal {socket:type2_cable:output}" }, - "questions_technical": { - "render": "

Technische Fragen

Die folgenden Fragen sind sehr technisch. Sie können sie gerne ignorieren
{questions(technical)}" - }, "ref": { "question": "Welche Kennnummer hat die Ladestation?", "render": "Die Kennziffer ist {ref}" diff --git a/langs/layers/en.json b/langs/layers/en.json index d00a20d2f..70e7ef30d 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -2527,7 +2527,7 @@ "question": "What power output does a single plug of type
Type 2 with cable (mennekes)
offer?", "render": "
Type 2 with cable (mennekes)
outputs at most {socket:type2_cable:output}" }, - "questions_technical": { + "questions": { "render": "

Technical questions

The questions below are very technical. Feel free to ignore them
{questions(technical)}" }, "ref": { diff --git a/langs/layers/nl.json b/langs/layers/nl.json index 7479891b7..e0fa11e9c 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -2319,7 +2319,7 @@ "question": "Welk vermogen levert een enkele stekker van type
Type 2 met kabel (J1772)
?", "render": "
Type 2 met kabel (J1772)
levert een vermogen van maximaal {socket:type2_cable:output}" }, - "questions_technical": { + "questions": { "render": "

Technische vragen

De vragen hieronder zijn erg technisch - sla deze over indien je hier geen tijd voor hebt
{questions(technical)}" }, "ref": {