From 20a80830fed49cbf141f2d2a8833add3caa36c71 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Wed, 9 Dec 2015 13:46:53 -0800 Subject: [PATCH] Change maxstay to combo with options, no placeholder (closes #2866) --- data/presets.yaml | 2 -- data/presets/fields.json | 17 +++++++++++++++-- data/presets/fields/maxstay.json | 17 +++++++++++++++-- dist/locales/en.json | 3 +-- 4 files changed, 31 insertions(+), 8 deletions(-) diff --git a/data/presets.yaml b/data/presets.yaml index 7b0cb6cea..261b39fe3 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -566,8 +566,6 @@ en: maxstay: # 'maxstay=*' label: Max Stay - # maxstay field placeholder - placeholder: '30 minutes, 1 hour, 2 hours...' mtb/scale: # 'mtb:scale=*' label: Mountain Biking Difficulty diff --git a/data/presets/fields.json b/data/presets/fields.json index b2af1ebcc..6ae44fcbc 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -762,8 +762,21 @@ "maxstay": { "key": "maxstay", "type": "combo", - "placeholder": "30 minutes, 1 hour, 2 hours...", - "label": "Max Stay" + "label": "Max Stay", + "options": [ + "15 min", + "30 min", + "45 min", + "1 hr", + "1.5 hr", + "2 hr", + "2.5 hr", + "3 hr", + "4 hr", + "1 day", + "2 day" + ], + "snake_case": false }, "mtb/scale": { "key": "mtb:scale", diff --git a/data/presets/fields/maxstay.json b/data/presets/fields/maxstay.json index 30b172408..2924d372a 100644 --- a/data/presets/fields/maxstay.json +++ b/data/presets/fields/maxstay.json @@ -1,6 +1,19 @@ { "key": "maxstay", "type": "combo", - "placeholder": "30 minutes, 1 hour, 2 hours...", - "label": "Max Stay" + "label": "Max Stay", + "options": [ + "15 min", + "30 min", + "45 min", + "1 hr", + "1.5 hr", + "2 hr", + "2.5 hr", + "3 hr", + "4 hr", + "1 day", + "2 day" + ], + "snake_case": false } diff --git a/dist/locales/en.json b/dist/locales/en.json index e01347f1a..3d9c46bc7 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -1072,8 +1072,7 @@ "placeholder": "40, 50, 60..." }, "maxstay": { - "label": "Max Stay", - "placeholder": "30 minutes, 1 hour, 2 hours..." + "label": "Max Stay" }, "mtb/scale": { "label": "Mountain Biking Difficulty",