From 5abdd4c813627650db4a3b3e9023a85b312f073e Mon Sep 17 00:00:00 2001
From: Quincy Morgan <quincy.morgan@icloud.com>
Date: Mon, 7 Oct 2019 11:02:07 +0200
Subject: [PATCH] Removed unused strings and rename string ids to not indicate
 ways only (re: #6843)

---
 data/core.yaml         | 6 ++----
 data/shortcuts.json    | 6 +++---
 dist/locales/en.json   | 6 +++++-
 modules/ui/map_data.js | 2 +-
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/data/core.yaml b/data/core.yaml
index 0f6014a41..77f498283 100644
--- a/data/core.yaml
+++ b/data/core.yaml
@@ -612,9 +612,7 @@ en:
         title: Custom Map Data
         zoom: Zoom to data
     fill_area: Fill Areas
-    highlight_way_edits:
-      description: Highlight edited nodes and segments attached to those nodes in ways
-      tooltip: Highlight unsaved edits.
+    highlight_edits:
       key: G
     map_features: Map Features
     autohidden: "These features have been automatically hidden because too many would be shown on the screen.  You can zoom in to edit them."
@@ -1889,7 +1887,7 @@ en:
         wireframe: "Toggle wireframe mode"
         osm_data: "Toggle OpenStreetMap data"
         minimap: "Toggle minimap"
-        highlight_way_edits: "Highlight unsaved edits"
+        highlight_edits: "Highlight unsaved edits"
       selecting:
         title: "Selecting features"
         select_one: "Select a single feature"
diff --git a/data/shortcuts.json b/data/shortcuts.json
index 5cba3f4c3..e5f10e6d8 100644
--- a/data/shortcuts.json
+++ b/data/shortcuts.json
@@ -82,10 +82,10 @@
             {
               "shortcuts": ["background.minimap.key"],
               "text": "shortcuts.browsing.display_options.minimap"
-            }, 
+            },
             {
-              "shortcuts": ["map_data.highlight_way_edits.key"],
-              "text": "shortcuts.browsing.display_options.highlight_way_edits"
+              "shortcuts": ["map_data.highlight_edits.key"],
+              "text": "shortcuts.browsing.display_options.highlight_edits"
             }
           ]
         },
diff --git a/dist/locales/en.json b/dist/locales/en.json
index e94b4fd7b..6547c26f6 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -758,6 +758,9 @@
                 }
             },
             "fill_area": "Fill Areas",
+            "highlight_edits": {
+                "key": "G"
+            },
             "map_features": "Map Features",
             "autohidden": "These features have been automatically hidden because too many would be shown on the screen.  You can zoom in to edit them.",
             "osmhidden": "These features have been automatically hidden because the OpenStreetMap layer is hidden."
@@ -2310,7 +2313,8 @@
                     "sidebar": "Toggle sidebar",
                     "wireframe": "Toggle wireframe mode",
                     "osm_data": "Toggle OpenStreetMap data",
-                    "minimap": "Toggle minimap"
+                    "minimap": "Toggle minimap",
+                    "highlight_edits": "Highlight unsaved edits"
                 },
                 "selecting": {
                     "title": "Selecting features",
diff --git a/modules/ui/map_data.js b/modules/ui/map_data.js
index 156f3ad8d..4ea27151c 100644
--- a/modules/ui/map_data.js
+++ b/modules/ui/map_data.js
@@ -889,7 +889,7 @@ export function uiMapData(context) {
                 d3_event.stopPropagation();
                 toggleLayer('osm');
             })
-            .on(t('map_data.highlight_way_edits.key'), toggleHighlightEdited);
+            .on(t('map_data.highlight_edits.key'), toggleHighlightEdited);
     };
 
     return uiMapData;