From 3ae26c6c59c8f9bfaabc3241495194a119026c78 Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Wed, 25 Mar 2020 17:11:33 +0200
Subject: [PATCH] FEATURE: List search menu shortcuts in instructions modal
 (#9273)

---
 .../discourse/controllers/keyboard-shortcuts-help.js   | 10 ++++++++++
 .../templates/modal/keyboard-shortcuts-help.hbs        |  7 +++++++
 config/locales/client.en.yml                           |  4 ++++
 3 files changed, 21 insertions(+)

diff --git a/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js b/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js
index 1c2d8f42218..62feb5b4048 100644
--- a/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js
+++ b/app/assets/javascripts/discourse/controllers/keyboard-shortcuts-help.js
@@ -172,6 +172,16 @@ export default Controller.extend(ModalFunctionality, {
         keys1: [SHIFT, "a"],
         keysDelimiter: PLUS
       })
+    },
+    search_menu: {
+      prev_next: buildShortcut("search_menu.prev_next", {
+        keys1: ["&uarr;"],
+        keys2: ["&darr;"],
+        shortcutsDelimiter: "slash"
+      }),
+      insert_url: buildShortcut("search_menu.insert_url", {
+        keys1: ["a"]
+      })
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs b/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
index 2203c901748..cfa90cb67ef 100644
--- a/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
@@ -78,5 +78,12 @@
         <li>{{html-safe shortcuts.actions.topic_admin_actions}}</li>
       </ul>
     </section>
+    <section>
+      <h4>{{i18n "keyboard_shortcuts_help.search_menu.title"}}</h4>
+      <ul>
+        <li>{{html-safe shortcuts.search_menu.prev_next}}</li>
+        <li>{{html-safe shortcuts.search_menu.insert_url}}</li>
+      </ul>
+    </section>
   </div>
 {{/d-modal-body}}
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index e9ad9aac7ce..a793ae920d0 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -3091,6 +3091,10 @@ en:
         print: "%{shortcut} Print topic"
         defer: "%{shortcut} Defer topic"
         topic_admin_actions: "%{shortcut} Open topic admin actions"
+      search_menu:
+        title: "Search Menu"
+        prev_next: "%{shortcut} Move selection up and down"
+        insert_url: "%{shortcut} Insert selection into open composer"
 
     badges:
       earned_n_times: