Merge remote-tracking branches 'lukas458/patch-3', 'lukas458/patch-4'…

…, 'lukas458/patch-5' and 'lukas458/patch-6' into main
openstreetmap · Sep 23, 2022 · 4670fa0 · 4670fa0
4 parents 4a0ecce + 7abe8c6 + 7c562c5 + de6f41d
commit 4670fa0
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/data/presets/amenity/telephone.json b/data/presets/amenity/telephone.json
@@ -4,17 +4,18 @@
         "operator",
         "phone",
         "payment_multi",
-        "booth"
+        "covered"
     ],
     "moreFields": [
-        "covered",
+        "booth",
         "fee",
         "indoor",
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",
         "level",
         "lit",
+        "model",
         "ref",
         "sms",
         "video_calls",

diff --git a/data/presets/amenity/ticket_validator.json b/data/presets/amenity/ticket_validator.json
@@ -9,6 +9,7 @@
         "covered",
         "indoor",
         "level",
+        "model",
         "support"
     ],
     "geometry": [

diff --git a/data/presets/man_made/street_cabinet.json b/data/presets/man_made/street_cabinet.json
@@ -12,6 +12,9 @@
         "height",
         "colour"
     ],
+    "moreFields": [
+        "model"
+    ],
     "terms": [
         "cable tv",
         "monitoring box",

diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml
@@ -372,6 +372,7 @@ en:
       booth:
         # booth=*
         label: Booth
+        terms: '[translate with synonyms or related terms for ''Booth'', separated by commas]'
       bottle:
         # bottle=*
         label: Bottle Filling
@@ -1871,6 +1872,10 @@ en:
         # minspeed field placeholder
         placeholder: 20, 30, 40...
         terms: '[translate with synonyms or related terms for ''Minimum Speed Limit'', separated by commas]'
+      model:
+        # model=*
+        label: Model
+        terms: '[translate with synonyms or related terms for ''Model'', separated by commas]'
       monitoring_multi:
         # monitoring:=*
         label: Monitoring