From 88da0c51eea04b0567fc138aaf83736e8af41156 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Tue, 12 Nov 2019 11:34:34 +0100 Subject: [PATCH] Rename Network Type `network` fields to Network Class to avoid colliding with `network:type` field (re: #6992) --- data/presets.yaml | 6 +++--- data/presets/fields.json | 6 +++--- data/presets/fields/network_bicycle.json | 4 ++-- data/presets/fields/network_foot.json | 4 ++-- data/presets/fields/network_horse.json | 2 +- data/taginfo.json | 24 ++++++++++++------------ dist/locales/en.json | 6 +++--- 7 files changed, 26 insertions(+), 26 deletions(-) diff --git a/data/presets.yaml b/data/presets.yaml index e8adf0044..3e2cadbbc 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -1367,7 +1367,7 @@ en: terms: '[translate with synonyms or related terms for ''Network Type'', separated by commas]' network_bicycle: # network=* - label: Network Type + label: Network Class options: # network=icn icn: International @@ -1381,7 +1381,7 @@ en: placeholder: 'Local, Regional, National, International' network_foot: # network=* - label: Network Type + label: Network Class options: # network=iwn iwn: International @@ -1395,7 +1395,7 @@ en: placeholder: 'Local, Regional, National, International' network_horse: # network=* - label: Network Type + label: Network Class options: # network=ihn ihn: International diff --git a/data/presets/fields.json b/data/presets/fields.json index b2c676d74..9614afe36 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -244,9 +244,9 @@ "mtb/scale/uphill": {"key": "mtb:scale:uphill", "type": "combo", "label": "Mountain Biking Uphill Difficulty", "placeholder": "0, 1, 2, 3...", "strings": {"options": {"0": "0: Avg. incline <10%, gravel/packed earth, no obstacles", "1": "1: Avg. incline <15%, gravel/packed earth, few small objects", "2": "2: Avg. incline <20%, stable surface, fistsize rocks/roots", "3": "3: Avg. incline <25%, variable surface, fistsize rocks/branches", "4": "4: Avg. incline <30%, poor condition, big rocks/branches", "5": "5: Very steep, bike generally needs to be pushed or carried"}}}, "name": {"key": "name", "type": "localized", "label": "Name", "universal": true, "placeholder": "Common name (if any)", "terms": ["label", "title"]}, "natural": {"key": "natural", "type": "typeCombo", "label": "Natural"}, - "network_bicycle": {"key": "network", "type": "combo", "label": "Network Type", "placeholder": "Local, Regional, National, International", "strings": {"options": {"lcn": "Local", "rcn": "Regional", "ncn": "National", "icn": "International"}}}, - "network_foot": {"key": "network", "type": "combo", "label": "Network Type", "placeholder": "Local, Regional, National, International", "strings": {"options": {"lwn": "Local", "rwn": "Regional", "nwn": "National", "iwn": "International"}}}, - "network_horse": {"key": "network", "type": "combo", "label": "Network Type", "placeholder": "Local, Regional, National, International", "strings": {"options": {"lhn": "Local", "rhn": "Regional", "nhn": "National", "ihn": "International"}}}, + "network_bicycle": {"key": "network", "type": "combo", "label": "Network Class", "placeholder": "Local, Regional, National, International", "strings": {"options": {"lcn": "Local", "rcn": "Regional", "ncn": "National", "icn": "International"}}}, + "network_foot": {"key": "network", "type": "combo", "label": "Network Class", "placeholder": "Local, Regional, National, International", "strings": {"options": {"lwn": "Local", "rwn": "Regional", "nwn": "National", "iwn": "International"}}}, + "network_horse": {"key": "network", "type": "combo", "label": "Network Class", "placeholder": "Local, Regional, National, International", "strings": {"options": {"lhn": "Local", "rhn": "Regional", "nhn": "National", "ihn": "International"}}}, "network_road": {"key": "network", "type": "networkCombo", "label": "Network"}, "network": {"key": "network", "type": "text", "label": "Network"}, "network/type": {"key": "network:type", "type": "combo", "label": "Network Type", "prerequisiteTag": {"key": "network"}}, diff --git a/data/presets/fields/network_bicycle.json b/data/presets/fields/network_bicycle.json index 79125bc0c..05795a625 100644 --- a/data/presets/fields/network_bicycle.json +++ b/data/presets/fields/network_bicycle.json @@ -1,7 +1,7 @@ { "key": "network", "type": "combo", - "label": "Network Type", + "label": "Network Class", "placeholder": "Local, Regional, National, International", "strings": { "options": { @@ -11,4 +11,4 @@ "icn": "International" } } -} \ No newline at end of file +} diff --git a/data/presets/fields/network_foot.json b/data/presets/fields/network_foot.json index ec0131060..2c084a1ba 100644 --- a/data/presets/fields/network_foot.json +++ b/data/presets/fields/network_foot.json @@ -1,7 +1,7 @@ { "key": "network", "type": "combo", - "label": "Network Type", + "label": "Network Class", "placeholder": "Local, Regional, National, International", "strings": { "options": { @@ -11,4 +11,4 @@ "iwn": "International" } } -} \ No newline at end of file +} diff --git a/data/presets/fields/network_horse.json b/data/presets/fields/network_horse.json index cee101376..450c54921 100644 --- a/data/presets/fields/network_horse.json +++ b/data/presets/fields/network_horse.json @@ -1,7 +1,7 @@ { "key": "network", "type": "combo", - "label": "Network Type", + "label": "Network Class", "placeholder": "Local, Regional, National, International", "strings": { "options": { diff --git a/data/taginfo.json b/data/taginfo.json index 5d27b6e4f..7ca3a6ebc 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -1567,18 +1567,18 @@ {"key": "mtb:scale:uphill", "value": "4", "description": "🄵 Mountain Biking Uphill Difficulty"}, {"key": "mtb:scale:uphill", "value": "5", "description": "🄵 Mountain Biking Uphill Difficulty"}, {"key": "name", "description": "🄵 Name"}, - {"key": "network", "value": "lcn", "description": "🄵 Network Type"}, - {"key": "network", "value": "rcn", "description": "🄵 Network Type"}, - {"key": "network", "value": "ncn", "description": "🄵 Network Type"}, - {"key": "network", "value": "icn", "description": "🄵 Network Type"}, - {"key": "network", "value": "lwn", "description": "🄵 Network Type"}, - {"key": "network", "value": "rwn", "description": "🄵 Network Type"}, - {"key": "network", "value": "nwn", "description": "🄵 Network Type"}, - {"key": "network", "value": "iwn", "description": "🄵 Network Type"}, - {"key": "network", "value": "lhn", "description": "🄵 Network Type"}, - {"key": "network", "value": "rhn", "description": "🄵 Network Type"}, - {"key": "network", "value": "nhn", "description": "🄵 Network Type"}, - {"key": "network", "value": "ihn", "description": "🄵 Network Type"}, + {"key": "network", "value": "lcn", "description": "🄵 Network Class"}, + {"key": "network", "value": "rcn", "description": "🄵 Network Class"}, + {"key": "network", "value": "ncn", "description": "🄵 Network Class"}, + {"key": "network", "value": "icn", "description": "🄵 Network Class"}, + {"key": "network", "value": "lwn", "description": "🄵 Network Class"}, + {"key": "network", "value": "rwn", "description": "🄵 Network Class"}, + {"key": "network", "value": "nwn", "description": "🄵 Network Class"}, + {"key": "network", "value": "iwn", "description": "🄵 Network Class"}, + {"key": "network", "value": "lhn", "description": "🄵 Network Class"}, + {"key": "network", "value": "rhn", "description": "🄵 Network Class"}, + {"key": "network", "value": "nhn", "description": "🄵 Network Class"}, + {"key": "network", "value": "ihn", "description": "🄵 Network Class"}, {"key": "network", "description": "🄵 Network"}, {"key": "network:type", "description": "🄵 Network Type"}, {"key": "not:name", "description": "🄵 Incorrect Names"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 8f149a1a3..438f96800 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -3639,7 +3639,7 @@ "label": "Natural" }, "network_bicycle": { - "label": "Network Type", + "label": "Network Class", "placeholder": "Local, Regional, National, International", "options": { "lcn": "Local", @@ -3649,7 +3649,7 @@ } }, "network_foot": { - "label": "Network Type", + "label": "Network Class", "placeholder": "Local, Regional, National, International", "options": { "lwn": "Local", @@ -3659,7 +3659,7 @@ } }, "network_horse": { - "label": "Network Type", + "label": "Network Class", "placeholder": "Local, Regional, National, International", "options": { "lhn": "Local",