diff --git a/Makefile b/Makefile index db60ea1a4..635b485f2 100644 --- a/Makefile +++ b/Makefile @@ -13,6 +13,9 @@ DATA_FILES = $(shell find data -type f -name '*.json' -o -name '*.md') data/data.js: $(DATA_FILES) node build.js +data/locales/en.js: data/core.yaml data/presets.yaml + node build.js + iD.js: \ js/lib/bootstrap-tooltip.js \ js/lib/d3.v3.js \ diff --git a/data/core.yaml b/data/core.yaml index 147006ce0..3823a238b 100644 --- a/data/core.yaml +++ b/data/core.yaml @@ -161,6 +161,7 @@ en: results: "{n} results for {search}" reference: View on OpenStreetMap Wiki back_tooltip: Change feature type + remove: Remove background: title: Background description: Background settings diff --git a/data/locales.js b/data/locales.js index a3ea56d97..d98c78f41 100644 --- a/data/locales.js +++ b/data/locales.js @@ -4273,7 +4273,8 @@ locale.en = { "choose": "Select feature type", "results": "{n} results for {search}", "reference": "View on OpenStreetMap Wiki", - "back_tooltip": "Change feature type" + "back_tooltip": "Change feature type", + "remove": "Remove" }, "background": { "title": "Background", diff --git a/data/locales/en.js b/data/locales/en.js index 2b507e829..9e4656df9 100644 --- a/data/locales/en.js +++ b/data/locales/en.js @@ -198,7 +198,8 @@ locale.en = { "choose": "Select feature type", "results": "{n} results for {search}", "reference": "View on OpenStreetMap Wiki", - "back_tooltip": "Change feature type" + "back_tooltip": "Change feature type", + "remove": "Remove" }, "background": { "title": "Background", @@ -566,8 +567,7 @@ locale.en = { "bridge": "Bridge", "tunnel": "Tunnel", "embankment": "Embankment", - "cutting": "Cutting", - "remove": "Remove" + "cutting": "Cutting" } }, "supervised": { diff --git a/data/presets.yaml b/data/presets.yaml index 0eab7b3f4..2aec85899 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -182,7 +182,6 @@ en: tunnel: Tunnel embankment: Embankment cutting: Cutting - remove: Remove supervised: label: Supervised surface: diff --git a/data/presets/fields.json b/data/presets/fields.json index 70853f841..42baad8cc 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -451,8 +451,7 @@ "bridge": "Bridge", "tunnel": "Tunnel", "embankment": "Embankment", - "cutting": "Cutting", - "remove": "Remove" + "cutting": "Cutting" } } }, diff --git a/data/presets/fields/structure.json b/data/presets/fields/structure.json index a2317db4a..7c65c5390 100644 --- a/data/presets/fields/structure.json +++ b/data/presets/fields/structure.json @@ -12,8 +12,7 @@ "bridge": "Bridge", "tunnel": "Tunnel", "embankment": "Embankment", - "cutting": "Cutting", - "remove": "Remove" + "cutting": "Cutting" } } } diff --git a/js/id/ui/preset/radio.js b/js/id/ui/preset/radio.js index 1beec86c7..453fedf65 100644 --- a/js/id/ui/preset/radio.js +++ b/js/id/ui/preset/radio.js @@ -25,9 +25,9 @@ iD.ui.preset.radio = function(field) { buttons.classed('active', false); change(); }) - .text( field.t('options.remove')) + .text(t('inspector.remove')) .append('span') - .attr('class', 'icon remove'); + .attr('class', 'icon remove'); } function change() {