From e2b3910afebbc0f147e515724d53b2173c6c707b Mon Sep 17 00:00:00 2001
From: pietervdvn <pietervdvn@posteo.net>
Date: Thu, 6 Jan 2022 15:38:43 +0100
Subject: [PATCH] Translation sync

---
 assets/layers/barrier/barrier.json       |  3 ++-
 assets/layers/conflation/conflation.json |  2 +-
 assets/layers/etymology/etymology.json   |  2 +-
 assets/layers/food/food.json             |  5 +++--
 assets/tagRenderings/questions.json      | 12 +++++++++---
 assets/themes/grb_import/grb.json        |  6 +++---
 langs/layers/en.json                     | 10 ++++++++++
 langs/layers/nl.json                     |  7 +++++++
 8 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/assets/layers/barrier/barrier.json b/assets/layers/barrier/barrier.json
index 0d784972f..eb2ba836b 100644
--- a/assets/layers/barrier/barrier.json
+++ b/assets/layers/barrier/barrier.json
@@ -133,7 +133,8 @@
           "then": {
             "en": "This is a single bollard in the road"
           }
-        },{
+        },
+        {
           "if": "barrier=cycle_barrier",
           "then": {
             "en": "This is a cycle barrier slowing down cyclists",
diff --git a/assets/layers/conflation/conflation.json b/assets/layers/conflation/conflation.json
index 6e47729b3..ffafc9bca 100644
--- a/assets/layers/conflation/conflation.json
+++ b/assets/layers/conflation/conflation.json
@@ -46,7 +46,7 @@
     {
       "location": "start",
       "icon": {
-        "render":"square:#f00",
+        "render": "square:#f00",
         "mappings": [
           {
             "if": "reprojection=yes",
diff --git a/assets/layers/etymology/etymology.json b/assets/layers/etymology/etymology.json
index 5db0aa059..b0087cf8d 100644
--- a/assets/layers/etymology/etymology.json
+++ b/assets/layers/etymology/etymology.json
@@ -196,4 +196,4 @@
       }
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/assets/layers/food/food.json b/assets/layers/food/food.json
index ae6b71081..605413cfe 100644
--- a/assets/layers/food/food.json
+++ b/assets/layers/food/food.json
@@ -543,7 +543,8 @@
       "condition": "cuisine=friture"
     },
     "service:electricity",
-    "dog-access","reviews"
+    "dog-access",
+    "reviews"
   ],
   "filter": [
     {
@@ -679,4 +680,4 @@
   "description": {
     "en": "A layer showing restaurants and fast-food amenities (with a special rendering for friteries)"
   }
-}
+}
\ No newline at end of file
diff --git a/assets/tagRenderings/questions.json b/assets/tagRenderings/questions.json
index f43b36ad0..187f5c806 100644
--- a/assets/tagRenderings/questions.json
+++ b/assets/tagRenderings/questions.json
@@ -81,7 +81,9 @@
     "freeform": {
       "key": "phone",
       "type": "phone",
-      "addExtraTags": ["contact:phone="]
+      "addExtraTags": [
+        "contact:phone="
+      ]
     }
   },
   "osmlink": {
@@ -158,7 +160,9 @@
     "freeform": {
       "key": "email",
       "type": "email",
-      "addExtraTags": ["contact:email="]
+      "addExtraTags": [
+        "contact:email="
+      ]
     }
   },
   "website": {
@@ -185,7 +189,9 @@
     "freeform": {
       "key": "website",
       "type": "url",
-      "addExtraTags": ["contact:website="]
+      "addExtraTags": [
+        "contact:website="
+      ]
     },
     "mappings": [
       {
diff --git a/assets/themes/grb_import/grb.json b/assets/themes/grb_import/grb.json
index e2ad53409..ea65e7282 100644
--- a/assets/themes/grb_import/grb.json
+++ b/assets/themes/grb_import/grb.json
@@ -479,7 +479,6 @@
         "_osm_obj:addr:street=(feat.get('_overlaps_with')?.feat?.properties ?? {})['addr:street']",
         "_osm_obj:addr:housenumber=(feat.get('_overlaps_with')?.feat?.properties ?? {})['addr:housenumber']",
         "_osm_obj:surface=(feat.get('_overlaps_with')?.feat?.properties ?? {})['_surface:strict']",
-
         "_overlap_absolute=feat.get('_overlaps_with')?.overlap",
         "_reverse_overlap_percentage=Math.round(100 * feat.get('_overlap_absolute') / feat.get('_surface'))",
         "_overlap_percentage=Math.round(100 * feat.get('_overlap_absolute') / feat.get('_osm_obj:surface'))",
@@ -515,10 +514,11 @@
             },
             {
               "if": {
-                "and":[
+                "and": [
                   "_overlap_percentage>50",
                   "_reverse_overlap_percentage>50",
-                  "_overlaps_with!="]
+                  "_overlaps_with!="
+                ]
               },
               "then": "{conflate_button(osm-buildings,building=$_target_building_type; source:geometry:date=$_grb_date; source:geometry:ref=$_grb_ref, Replace the geometry in OpenStreetMap,,_osm_obj:id)}"
             }
diff --git a/langs/layers/en.json b/langs/layers/en.json
index 59d75cc71..9bf448acf 100644
--- a/langs/layers/en.json
+++ b/langs/layers/en.json
@@ -213,6 +213,16 @@
                 "question": "How wide is the smallest opening next to the barriers?",
                 "render": "Width of opening: {width:opening} m"
             },
+            "barrier_type": {
+                "mappings": {
+                    "0": {
+                        "then": "This is a single bollard in the road"
+                    },
+                    "1": {
+                        "then": "This is a cycle barrier slowing down cyclists"
+                    }
+                }
+            },
             "bicycle=yes/no": {
                 "mappings": {
                     "0": {
diff --git a/langs/layers/nl.json b/langs/layers/nl.json
index 03a8e7a83..0b49ddb23 100644
--- a/langs/layers/nl.json
+++ b/langs/layers/nl.json
@@ -151,6 +151,13 @@
                 "question": "Hoe breed is de smalste opening naast de barrières?",
                 "render": "Breedte van de opening: {width:opening} m"
             },
+            "barrier_type": {
+                "mappings": {
+                    "1": {
+                        "then": "Dit zijn fietshekjes die fietsers afremmen"
+                    }
+                }
+            },
             "bicycle=yes/no": {
                 "mappings": {
                     "0": {