From 7f1558624a201e4044f1cbb4dd10b4788adbd427 Mon Sep 17 00:00:00 2001
From: "Milos Brzakovic (E-Search)" <mbrzakovic@microsoft.com>
Date: Fri, 26 Nov 2021 12:49:58 +0100
Subject: [PATCH] forward, backward (expand, collapse)

---
 data/core.yaml              | 4 ++++
 modules/ui/disclosure.js    | 6 ++++--
 modules/ui/entity_editor.js | 5 ++++-
 modules/ui/preset_list.js   | 9 +++++++--
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/data/core.yaml b/data/core.yaml
index d31bf15ad..8b46f578a 100644
--- a/data/core.yaml
+++ b/data/core.yaml
@@ -13,6 +13,10 @@ en:
     text: text
     deselect: deselect
     close: close
+    forward: forward
+    backward: backward
+    expand: expand
+    collapse: collapse
   toolbar:
     inspect: Inspect
     undo_redo: Undo / Redo
diff --git a/modules/ui/disclosure.js b/modules/ui/disclosure.js
index 463463bdb..652e9afcf 100644
--- a/modules/ui/disclosure.js
+++ b/modules/ui/disclosure.js
@@ -5,7 +5,7 @@ import { svgIcon } from '../svg/icon';
 import { utilFunctor } from '../util';
 import { utilRebind } from '../util/rebind';
 import { uiToggle } from './toggle';
-import { localizer } from '../core/localizer';
+import { t, localizer } from '../core/localizer';
 
 
 export function uiDisclosure(context, key, expandedDefault) {
@@ -45,6 +45,7 @@ export function uiDisclosure(context, key, expandedDefault) {
 
         hideToggle
             .on('click', toggle)
+            .attr('title', t(`icons.${_expanded ? 'collapse' : 'expand'}`))
             .classed('expanded', _expanded);
 
         hideToggle.selectAll('.hide-toggle-text')
@@ -82,7 +83,8 @@ export function uiDisclosure(context, key, expandedDefault) {
             }
 
             hideToggle
-                .classed('expanded', _expanded);
+                .classed('expanded', _expanded)
+                .attr('title', t(`icons.${_expanded ? 'collapse' : 'expand'}`));
 
             hideToggle.selectAll('.hide-toggle-icon')
                 .attr('xlink:href', _expanded ? '#iD-icon-down'
diff --git a/modules/ui/entity_editor.js b/modules/ui/entity_editor.js
index aa966e0bd..dcab31072 100644
--- a/modules/ui/entity_editor.js
+++ b/modules/ui/entity_editor.js
@@ -42,10 +42,13 @@ export function uiEntityEditor(context) {
             .append('div')
             .attr('class', 'header fillL');
 
+        var direction = (localizer.textDirection() === 'rtl') ? 'forward' : 'backward';
+
         headerEnter
             .append('button')
             .attr('class', 'preset-reset preset-choose')
-            .call(svgIcon((localizer.textDirection() === 'rtl') ? '#iD-icon-forward' : '#iD-icon-backward'));
+            .attr('title', t(`icons.${direction}`))
+            .call(svgIcon(`#iD-icon-${direction}`));
 
         headerEnter
             .append('button')
diff --git a/modules/ui/preset_list.js b/modules/ui/preset_list.js
index 84a833c76..4e8714210 100644
--- a/modules/ui/preset_list.js
+++ b/modules/ui/preset_list.js
@@ -37,11 +37,14 @@ export function uiPresetList(context) {
             .append('h3')
             .html(t.html('inspector.choose'));
 
+        var direction = (localizer.textDirection() === 'rtl') ? 'backward' : 'forward';
+
         messagewrap
             .append('button')
             .attr('class', 'preset-choose')
+            .attr('title', direction)
             .on('click', function() { dispatch.call('cancel', this); })
-            .call(svgIcon((localizer.textDirection() === 'rtl') ? '#iD-icon-backward' : '#iD-icon-forward'));
+            .call(svgIcon(`#iD-icon-${direction}`));
 
         function initialKeydown(d3_event) {
             // hack to let delete shortcut work when search is autofocused
@@ -273,7 +276,8 @@ export function uiPresetList(context) {
                 var iconName = isExpanded ?
                     (localizer.textDirection() === 'rtl' ? '#iD-icon-backward' : '#iD-icon-forward') : '#iD-icon-down';
                 d3_select(this)
-                    .classed('expanded', !isExpanded);
+                    .classed('expanded', !isExpanded)
+                    .attr('title', !isExpanded ? t('icons.collapse') : t('icons.expand'));
                 d3_select(this).selectAll('div.label-inner svg.icon use')
                     .attr('href', iconName);
                 item.choose();
@@ -284,6 +288,7 @@ export function uiPresetList(context) {
             var button = wrap
                 .append('button')
                 .attr('class', 'preset-list-button')
+                .attr('title', t('icons.expand'))
                 .classed('expanded', false)
                 .call(uiPresetIcon()
                     .geometry(geometries.length === 1 && geometries[0])