diff --git a/assets/layers/defibrillator/defibrillator.json b/assets/layers/defibrillator/defibrillator.json index 9702c15cd2..64688c0c38 100644 --- a/assets/layers/defibrillator/defibrillator.json +++ b/assets/layers/defibrillator/defibrillator.json @@ -505,46 +505,19 @@ "id": "defibrillator-phone" }, { - "render": { - "en": "{opening_hours_table(opening_hours)}", - "nl": "{opening_hours_table(opening_hours)}", - "fr": "{opening_hours_table(opening_hours)}", - "it": "{opening_hours_table(opening_hours)}", - "ru": "{opening_hours_table(opening_hours)}", - "de": "{opening_hours_table(opening_hours)}", - "sl": "{opening_hours_table(opening_hours)}", - "ca": "{opening_hours_table(opening_hours)}", - "es": "{opening_hours_table(opening_hours)}" - }, - "question": { - "en": "At what times is this defibrillator available?", - "nl": "Wanneer is deze defibrillator beschikbaar?", - "fr": "À quels horaires ce défibrillateur est-il accessible ?", - "it": "In quali orari è disponibile questo defibrillatore?", - "ru": "В какое время доступен этот дефибриллятор?", - "de": "Zu welchen Zeiten ist der Defibrillator verfügbar?", - "sl": "Ob katerih urah je ta defibrilator na voljo?", - "es": "¿A qué horas está disponible este desfibrilador?" - }, - "freeform": { - "key": "opening_hours", - "type": "opening_hours" - }, - "mappings": [ - { - "if": "opening_hours=24/7", - "then": { - "en": "24/7 opened (including holidays)", - "nl": "24/7 open (inclusief feestdagen)", - "fr": "Ouvert 24/7 (jours feriés inclus)", - "it": "Aperto 24/7 (festivi inclusi)", - "de": "24/7 geöffnet (auch an Feiertagen)", - "sl": "Na voljo 24/7 (tudi za praznike)", - "es": "Abierto 24/7 (incluyendo festivos)" - } + "builtin": "opening_hours_24_7", + "override": { + "question": { + "en": "At what times is this defibrillator available?", + "nl": "Wanneer is deze defibrillator beschikbaar?", + "fr": "À quels horaires ce défibrillateur est-il accessible ?", + "it": "In quali orari è disponibile questo defibrillatore?", + "ru": "В какое время доступен этот дефибриллятор?", + "de": "Zu welchen Zeiten ist der Defibrillator verfügbar?", + "sl": "Ob katerih urah je ta defibrilator na voljo?", + "es": "¿A qué horas está disponible este desfibrilador?" } - ], - "id": "defibrillator-opening_hours" + } }, { "render": { @@ -678,4 +651,4 @@ "has_image", "open_now" ] -} \ No newline at end of file +} diff --git a/langs/layers/ca.json b/langs/layers/ca.json index dff2505aae..78a4278cbf 100644 --- a/langs/layers/ca.json +++ b/langs/layers/ca.json @@ -571,9 +571,6 @@ "question": "A quina planta està el desfibril·lador localitzat?", "render": "Aquest desfibril·lador és a la planta {level}" }, - "defibrillator-opening_hours": { - "render": "{opening_hours_table(opening_hours)}" - }, "defibrillator-survey:date": { "mappings": { "0": { diff --git a/langs/layers/de.json b/langs/layers/de.json index cde5804482..fbfc97a80e 100644 --- a/langs/layers/de.json +++ b/langs/layers/de.json @@ -3189,15 +3189,6 @@ "question": "Auf welcher Etage befindet sich der Defibrillator?", "render": "Dieser Defibrallator befindet sich im {level}. Stockwerk" }, - "defibrillator-opening_hours": { - "mappings": { - "0": { - "then": "24/7 geöffnet (auch an Feiertagen)" - } - }, - "question": "Zu welchen Zeiten ist der Defibrillator verfügbar?", - "render": "{opening_hours_table(opening_hours)}" - }, "defibrillator-phone": { "question": "Wie lautet die Telefonnummer für Fragen zu diesem Defibrillator?", "render": "Telefonnummer für Fragen zu diesem Defibrillator: {phone}" diff --git a/langs/layers/en.json b/langs/layers/en.json index bd90593106..2e494565e6 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -3239,15 +3239,6 @@ "question": "On which floor is this defibrillator located?", "render": "This defibrillator is on floor {level}" }, - "defibrillator-opening_hours": { - "mappings": { - "0": { - "then": "24/7 opened (including holidays)" - } - }, - "question": "At what times is this defibrillator available?", - "render": "{opening_hours_table(opening_hours)}" - }, "defibrillator-phone": { "question": "What is the phone number for questions about this defibrillator?", "render": "Telephone for questions about this defibrillator: {phone}" diff --git a/langs/layers/es.json b/langs/layers/es.json index bf98c53bc0..4b2daff517 100644 --- a/langs/layers/es.json +++ b/langs/layers/es.json @@ -2028,15 +2028,6 @@ "question": "¿En qué planta se encuentra el defibrilador localizado?", "render": "El desfibrilador se encuentra en la planta {level}" }, - "defibrillator-opening_hours": { - "mappings": { - "0": { - "then": "Abierto 24/7 (incluyendo festivos)" - } - }, - "question": "¿A qué horas está disponible este desfibrilador?", - "render": "{opening_hours_table(opening_hours)}" - }, "defibrillator-phone": { "question": "¿Cual es el número de teléfono para preguntas sobre este desfibrilador?" }, diff --git a/langs/layers/fr.json b/langs/layers/fr.json index 9e8bf15a3c..ee823cd1a4 100644 --- a/langs/layers/fr.json +++ b/langs/layers/fr.json @@ -2086,15 +2086,6 @@ "question": "À quel étage est situé ce défibrillateur ?", "render": "Ce défibrillateur est à l'étage {level}" }, - "defibrillator-opening_hours": { - "mappings": { - "0": { - "then": "Ouvert 24/7 (jours feriés inclus)" - } - }, - "question": "À quels horaires ce défibrillateur est-il accessible ?", - "render": "{opening_hours_table(opening_hours)}" - }, "defibrillator-phone": { "question": "Quel est le numéro de téléphone pour questions sur le défibrillateur ?", "render": "Numéro de téléphone pour questions sur le défibrillateur : {phone}" diff --git a/langs/layers/it.json b/langs/layers/it.json index 9c49cbeecd..96b9449920 100644 --- a/langs/layers/it.json +++ b/langs/layers/it.json @@ -1122,15 +1122,6 @@ "question": "A che piano si trova questo defibrillatore?", "render": "Questo defibrillatore è al piano {level}" }, - "defibrillator-opening_hours": { - "mappings": { - "0": { - "then": "Aperto 24/7 (festivi inclusi)" - } - }, - "question": "In quali orari è disponibile questo defibrillatore?", - "render": "{opening_hours_table(opening_hours)}" - }, "defibrillator-phone": { "question": "Qual è il numero di telefono per le domande riguardanti questo defibrillatore?", "render": "Numero di telefono per le domande su questo defibrillatore:{phone}" diff --git a/langs/layers/nl.json b/langs/layers/nl.json index a9c6c24583..6b62db5f4a 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -3186,15 +3186,6 @@ "question": "Op welke verdieping bevindt deze defibrillator zich?", "render": "De defibrillator bevindt zicht op verdieping {level}" }, - "defibrillator-opening_hours": { - "mappings": { - "0": { - "then": "24/7 open (inclusief feestdagen)" - } - }, - "question": "Wanneer is deze defibrillator beschikbaar?", - "render": "{opening_hours_table(opening_hours)}" - }, "defibrillator-phone": { "question": "Wat is het telefoonnummer voor vragen over deze defibrillator", "render": "Telefoonnummer voor vragen over deze defibrillator: {phone}" diff --git a/langs/layers/ru.json b/langs/layers/ru.json index 005fcae6fa..a393874d72 100644 --- a/langs/layers/ru.json +++ b/langs/layers/ru.json @@ -849,10 +849,6 @@ "defibrillator-fixme": { "render": "Дополнительная информация для экспертов OpenStreetMap: {fixme}" }, - "defibrillator-opening_hours": { - "question": "В какое время доступен этот дефибриллятор?", - "render": "{opening_hours_table(opening_hours)}" - }, "defibrillator-survey:date": { "mappings": { "0": { diff --git a/langs/layers/sl.json b/langs/layers/sl.json index cea248a3e7..b0d755a9e3 100644 --- a/langs/layers/sl.json +++ b/langs/layers/sl.json @@ -96,15 +96,6 @@ "question": "V katerem nadstropju je defibrilator?", "render": "Ta defibrilator je v {level}. nadstropju" }, - "defibrillator-opening_hours": { - "mappings": { - "0": { - "then": "Na voljo 24/7 (tudi za praznike)" - } - }, - "question": "Ob katerih urah je ta defibrilator na voljo?", - "render": "{opening_hours_table(opening_hours)}" - }, "defibrillator-phone": { "question": "Kakšna je telefonska številka za vprašanja o tem defibrilatorju?", "render": "Telefonska številka za vprašanja o tem defibrilatorju: {phone}" @@ -127,4 +118,4 @@ "render": "Defibrilator" } } -} \ No newline at end of file +}