From fd23d135630c11967dd46c07e7b220b96325cf64 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Mon, 14 Jan 2019 10:58:40 -0500 Subject: [PATCH] Distinguish between "This highway" and "highway" forms of error parts. (closes #5703) --- data/core.yaml | 46 ++++++++++++++++++++++++------------------ data/keepRight.json | 48 +++++++++++++++++++++++++------------------- dist/locales/en.json | 46 ++++++++++++++++++++++++------------------ 3 files changed, 79 insertions(+), 61 deletions(-) diff --git a/data/core.yaml b/data/core.yaml index f7e7e49d8..be50b7657 100644 --- a/data/core.yaml +++ b/data/core.yaml @@ -669,26 +669,32 @@ en: close_comment: Close and Comment ignore_comment: Ignore and Comment error_parts: - node: 'this node' - way: 'this way' - relation: 'this relation' - oneway: 'this oneway' - highway: 'this highway' - railway: 'this railway' - waterway: 'this waterway' - cycleway: 'this cycleway' - cycleway_footpath: 'this cycleway/footpath' - riverbank: 'this riverbank' - crossing: 'this crossing' - railway_crossing: 'this railway crossing' - bridge: 'this bridge' - tunnel: 'this tunnel' - boundary: 'this boundary' - turn_restriction: 'this turn restriction' - roundabout: 'this roundabout' - mini_roundabout: 'this mini-roundabout' - track: 'this track' - feature: 'this feature' + this_node: 'this node' + this_way: 'this way' + this_relation: 'this relation' + this_oneway: 'this oneway' + this_highway: 'this highway' + this_railway: 'this railway' + this_waterway: 'this waterway' + this_cycleway: 'this cycleway' + this_cycleway_footpath: 'this cycleway/footpath' + this_riverbank: 'this riverbank' + this_crossing: 'this crossing' + this_railway_crossing: 'this railway crossing' + this_bridge: 'this bridge' + this_tunnel: 'this tunnel' + this_boundary: 'this boundary' + this_turn_restriction: 'this turn restriction' + this_roundabout: 'this roundabout' + this_mini_roundabout: 'this mini-roundabout' + this_track: 'this track' + this_feature: 'this feature' + highway: 'highway' + railway: 'railway' + waterway: 'waterway' + cycleway: 'cycleway' + cycleway_footpath: 'cycleway/footpath' + riverbank: 'riverbank' place_of_worship: 'place of worship' pub: 'pub' restaurant: 'restaurant' diff --git a/data/keepRight.json b/data/keepRight.json index 52967eb7a..86419a8a2 100644 --- a/data/keepRight.json +++ b/data/keepRight.json @@ -1,26 +1,32 @@ { "localizeStrings": { - "this node": "node", - "this way": "way", - "this relation": "relation", - "this one-way": "oneway", - "this highway": "highway", - "this railway": "railway", - "this waterway": "waterway", - "this cycleway": "cycleway", - "this footpath": "footpath", - "this cycleway/footpath": "cycleway_footpath", - "this riverbank": "riverbank", - "this crossing": "crossing", - "this railway crossing": "railway_crossing", - "this bridge": "bridge", - "this tunnel": "tunnel", - "this boundary": "boundary", - "this turn-restriction": "turn_restriction", - "this roundabout": "roundabout", - "this mini-roundabout": "mini_roundabout", - "this track": "track", - "this feature": "feature", + "this node": "this_node", + "this way": "this_way", + "this relation": "this_relation", + "this one-way": "this_oneway", + "this highway": "this_highway", + "this railway": "this_railway", + "this waterway": "this_waterway", + "this cycleway": "this_cycleway", + "this footpath": "this_footpath", + "this cycleway/footpath": "this_cycleway_footpath", + "this riverbank": "this_riverbank", + "this crossing": "this_crossing", + "this railway crossing": "this_railway_crossing", + "this bridge": "this_bridge", + "this tunnel": "this_tunnel", + "this boundary": "this_boundary", + "this turn-restriction": "this_turn_restriction", + "this roundabout": "this_roundabout", + "this mini-roundabout": "this_mini_roundabout", + "this track": "this_track", + "this feature": "this_feature", + "highway": "highway", + "railway": "railway", + "waterway": "waterway", + "cycleway": "cycleway", + "cycleway_footpath": "cycleway/footpath", + "riverbank": "riverbank", "place_of_worship": "place_of_worship", "pub": "pub", "restaurant": "restaurant", diff --git a/dist/locales/en.json b/dist/locales/en.json index 7c08de65e..095332406 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -810,26 +810,32 @@ "close_comment": "Close and Comment", "ignore_comment": "Ignore and Comment", "error_parts": { - "node": "this node", - "way": "this way", - "relation": "this relation", - "oneway": "this oneway", - "highway": "this highway", - "railway": "this railway", - "waterway": "this waterway", - "cycleway": "this cycleway", - "cycleway_footpath": "this cycleway/footpath", - "riverbank": "this riverbank", - "crossing": "this crossing", - "railway_crossing": "this railway crossing", - "bridge": "this bridge", - "tunnel": "this tunnel", - "boundary": "this boundary", - "turn_restriction": "this turn restriction", - "roundabout": "this roundabout", - "mini_roundabout": "this mini-roundabout", - "track": "this track", - "feature": "this feature", + "this_node": "this node", + "this_way": "this way", + "this_relation": "this relation", + "this_oneway": "this oneway", + "this_highway": "this highway", + "this_railway": "this railway", + "this_waterway": "this waterway", + "this_cycleway": "this cycleway", + "this_cycleway_footpath": "this cycleway/footpath", + "this_riverbank": "this riverbank", + "this_crossing": "this crossing", + "this_railway_crossing": "this railway crossing", + "this_bridge": "this bridge", + "this_tunnel": "this tunnel", + "this_boundary": "this boundary", + "this_turn_restriction": "this turn restriction", + "this_roundabout": "this roundabout", + "this_mini_roundabout": "this mini-roundabout", + "this_track": "this track", + "this_feature": "this feature", + "highway": "highway", + "railway": "railway", + "waterway": "waterway", + "cycleway": "cycleway", + "cycleway_footpath": "cycleway/footpath", + "riverbank": "riverbank", "place_of_worship": "place of worship", "pub": "pub", "restaurant": "restaurant",