From 3b6c1c16a5c4b4006ecf784645fbc931d874e38e Mon Sep 17 00:00:00 2001
From: pietervdvn <pietervdvn@posteo.net>
Date: Mon, 8 Nov 2021 03:11:06 +0100
Subject: [PATCH] Fix translations

---
 assets/layers/toilet/toilet.json | 58 +++++++++++++++++++-------------
 langs/layers/en.json             | 15 +++++++++
 langs/layers/nl.json             | 15 +++++++++
 3 files changed, 64 insertions(+), 24 deletions(-)

diff --git a/assets/layers/toilet/toilet.json b/assets/layers/toilet/toilet.json
index 411029341e..88e144b5b7 100644
--- a/assets/layers/toilet/toilet.json
+++ b/assets/layers/toilet/toilet.json
@@ -302,13 +302,15 @@
         "key": "opening_hours",
         "type": "opening_hours"
       },
-      "mappings": [{
-        "if": "opening_hours=24/7",
-        "then": {
-          "en": "Opened 24/7",
-          "nl": "Altijd open"
+      "mappings": [
+        {
+          "if": "opening_hours=24/7",
+          "then": {
+            "en": "Opened 24/7",
+            "nl": "Altijd open"
+          }
         }
-      }]
+      ]
     },
     {
       "id": "toilets-wheelchair",
@@ -543,28 +545,19 @@
       ],
       "condition": {
         "#": "Urinals normally don't have toilet paper",
-        "and": ["toilets:position!=urinal"]
+        "and": [
+          "toilets:position!=urinal"
+        ]
       }
     }
   ],
-  "iconBadges": [{
-    "if": "opening_hours~*",
-    "then": "isOpen"
-  }],
-  "filter": [
+  "iconBadges": [
     {
-      "id": "is_open",
-      "options": [{
-        "question": {
-          "nl": "Nu geopened",
-          "en": "Opened now"
-        },
-        "osmTags": {
-          "or": ["opening_hours=","_isOpen=yes"]
-        }
-      }
-      ]
-    },
+      "if": "opening_hours~*",
+      "then": "isOpen"
+    }
+  ],
+  "filter": [
     {
       "id": "wheelchair",
       "options": [
@@ -609,6 +602,23 @@
           }
         }
       ]
+    },
+    {
+      "id": "is_open",
+      "options": [
+        {
+          "question": {
+            "nl": "Nu geopened",
+            "en": "Opened now"
+          },
+          "osmTags": {
+            "or": [
+              "opening_hours=",
+              "_isOpen=yes"
+            ]
+          }
+        }
+      ]
     }
   ],
   "deletion": {
diff --git a/langs/layers/en.json b/langs/layers/en.json
index 4f71a399b1..c27398d33f 100644
--- a/langs/layers/en.json
+++ b/langs/layers/en.json
@@ -3198,6 +3198,13 @@
             "question": "Free to use"
           }
         }
+      },
+      "3": {
+        "options": {
+          "0": {
+            "question": "Opened now"
+          }
+        }
       }
     },
     "name": "Toilets",
@@ -3212,6 +3219,14 @@
       }
     },
     "tagRenderings": {
+      "Opening-hours": {
+        "mappings": {
+          "0": {
+            "then": "Opened 24/7"
+          }
+        },
+        "question": "When are these toilets opened?"
+      },
       "toilet-access": {
         "mappings": {
           "0": {
diff --git a/langs/layers/nl.json b/langs/layers/nl.json
index 3e1a4d5cc8..1810374684 100644
--- a/langs/layers/nl.json
+++ b/langs/layers/nl.json
@@ -3583,6 +3583,13 @@
             "question": "Gratis toegankelijk"
           }
         }
+      },
+      "3": {
+        "options": {
+          "0": {
+            "question": "Nu geopened"
+          }
+        }
       }
     },
     "name": "Toiletten",
@@ -3597,6 +3604,14 @@
       }
     },
     "tagRenderings": {
+      "Opening-hours": {
+        "mappings": {
+          "0": {
+            "then": "Altijd open"
+          }
+        },
+        "question": "Wanneer zijn deze toiletten open?"
+      },
       "toilet-access": {
         "mappings": {
           "0": {