Merge branch '65530-add-externalization-and-fix-regression-in-shortcuts-helper-modal' into 'master'

Resolve "Add externalization and fix regression in shortcuts helper modal"

Closes #65530

See merge request gitlab-org/gitlab-ce!31594

4 files changed, 247 insertions, 77 deletions

diff --git a/app/assets/javascripts/behaviors/shortcuts/shortcuts_wiki.js b/app/assets/javascripts/behaviors/shortcuts/shortcuts_wiki.js
index 8b7e6a56d25..208c91a1f08 100644
--- a/app/assets/javascripts/behaviors/shortcuts/shortcuts_wiki.js
+++ b/app/assets/javascripts/behaviors/shortcuts/shortcuts_wiki.js
@@ -6,6 +6,8 @@ export default class ShortcutsWiki extends ShortcutsNavigation {
   constructor() {
     super();
     Mousetrap.bind('e', ShortcutsWiki.editWiki);
+
+    this.enabledHelp.push('.hidden-shortcut.wiki');
   }
 
   static editWiki() {
diff --git a/app/views/help/_shortcuts.html.haml b/app/views/help/_shortcuts.html.haml
index 0624f66b3a5..a996c86a256 100644
--- a/app/views/help/_shortcuts.html.haml
+++ b/app/views/help/_shortcuts.html.haml
@@ -3,9 +3,9 @@
     .modal-content
       .modal-header
         %h4.modal-title
-          Keyboard Shortcuts
+          = _('Keyboard Shortcuts')
           %small
-            = link_to '(Show all)', '#', class: 'js-more-help-button'
+            = link_to _('(Show all)'), '#', class: 'js-more-help-button'
         %button.close{ type: "button", "data-dismiss": "modal", "aria-label" => _('Close') }
           %span{ "aria-hidden": true } ×
       .modal-body
@@ -15,281 +15,281 @@
               %tbody
                 %tr
                   %th
-                  %th Global Shortcuts
+                  %th= _('Global Shortcuts')
                 %tr
                   %td.shortcut
                     %kbd s
-                  %td Focus Search
+                  %td= _('Focus Search')
                 %tr
                   %td.shortcut
                     %kbd f
-                  %td Focus Filter
+                  %td= _('Focus Filter')
                 %tr
                   %td.shortcut
                     %kbd p
                     %kbd b
-                  %td Toggle the Performance Bar
+                  %td= _('Toggle the Performance Bar')
                 %tr
                   %td.shortcut
                     %kbd ?
-                  %td Show/hide this dialog
+                  %td= _('Show/hide this dialog')
                 %tr
                   %td.shortcut
                     - if browser.platform.mac?
                       %kbd ⌘ shift p
                     - else
                       %kbd ctrl shift p
-                  %td Toggle Markdown preview
+                  %td= _('Toggle Markdown preview')
                 %tr
                   %td.shortcut
                     %kbd
                       %i.fa.fa-arrow-up
-                  %td Edit last comment (when focused on an empty textarea)
+                  %td= _('Edit last comment (when focused on an empty textarea)')
                 %tr
                   %td.shortcut
                     %kbd shift t
                   %td
-                    Go to todos
+                    = _('Go to todos')
                 %tr
                   %td.shortcut
                     %kbd shift a
                   %td
-                    Go to the activity feed
+                    = _('Go to the activity feed')
                 %tr
                   %td.shortcut
                     %kbd shift p
                   %td
-                    Go to projects
+                    = _('Go to projects')
                 %tr
                   %td.shortcut
                     %kbd shift i
                   %td
-                    Go to issues
+                    = _('Go to issues')
                 %tr
                   %td.shortcut
                     %kbd shift m
                   %td
-                    Go to merge requests
+                    = _('Go to merge requests')
                 %tr
                   %td.shortcut
                     %kbd shift g
                   %td
-                    Go to groups
+                    = _('Go to groups')
                 %tr
                   %td.shortcut
                     %kbd shift l
                   %td
-                    Go to milestones
+                    = _('Go to milestones')
                 %tr
                   %td.shortcut
                     %kbd shift s
                   %td
-                    Go to snippets
+                    = _('Go to snippets')
               %tbody
                 %tr
                   %th
-                  %th Finding Project File
+                  %th= _('Finding Project File')
                 %tr
                   %td.shortcut
                     %kbd
                       %i.fa.fa-arrow-up
-                  %td Move selection up
+                  %td= _('Move selection up')
                 %tr
                   %td.shortcut
                     %kbd
                       %i.fa.fa-arrow-down
-                  %td Move selection down
+                  %td= _('Move selection down')
                 %tr
                   %td.shortcut
                     %kbd enter
-                  %td Open Selection
+                  %td= _('Open Selection')
                 %tr
                   %td.shortcut
                     %kbd esc
-                  %td Go back
+                  %td= _('Go back')
           .col-lg-4
             %table.shortcut-mappings
               %tbody
                 %tr
                   %th
-                  %th Project
+                  %th= _('Project')
                 %tr
                   %td.shortcut
                     %kbd g
                     %kbd p
                   %td
-                    Go to the project's overview page
+                    = _('Go to the project\'s overview page')
                 %tr
                   %td.shortcut
                     %kbd g
                     %kbd v
                   %td
-                    Go to the project's activity feed
+                    = _('Go to the project\'s activity feed')
                 %tr
                   %td.shortcut
                     %kbd g
                     %kbd f
                   %td
-                    Go to files
+                    = _('Go to files')
                 %tr
                   %td.shortcut
                     %kbd g
                     %kbd c
                   %td
-                    Go to commits
+                    = _('Go to commits')
                 %tr
                   %td.shortcut
                     %kbd g
                     %kbd j
                   %td
-                    Go to jobs
+                    = _('Go to jobs')
                 %tr
                   %td.shortcut
                     %kbd g
                     %kbd n
                   %td
-                    Go to network graph
+                    = _('Go to network graph')
                 %tr
                   %td.shortcut
                     %kbd g
                     %kbd d
                   %td
-                    Go to repository charts
+                    = _('Go to repository charts')
                 %tr
                   %td.shortcut
                     %kbd g
                     %kbd i
                   %td
-                    Go to issues
+                    = _('Go to issues')
                 %tr
                   %td.shortcut
                     %kbd g
                     %kbd b
                   %td
-                    Go to issue boards
+                    = _('Go to issue boards')
                 %tr
                   %td.shortcut
                     %kbd g
                     %kbd m
                   %td
-                    Go to merge requests
+                    = _('Go to merge requests')
                 %tr
                   %td.shortcut
                     %kbd g
                     %kbd e
                   %td
-                    Go to environments
+                    = _('Go to environments')
                 %tr
                   %td.shortcut
                     %kbd g
                     %kbd l
                   %td
-                    Go to metrics
+                    = _('Go to metrics')
                 %tr
                   %td.shortcut
                     %kbd g
                     %kbd k
                   %td
-                    Go to kubernetes
+                    = _('Go to kubernetes')
                 %tr
                   %td.shortcut
                     %kbd g
                     %kbd s
                   %td
-                    Go to snippets
+                    = _('Go to snippets')
                 %tr
                   %td.shortcut
                     %kbd g
                     %kbd w
                   %td
-                    Go to wiki
+                    = _('Go to wiki')
                 %tr
                   %td.shortcut
                     %kbd t
-                  %td Go to finding file
+                  %td= _('Go to finding file')
                 %tr
                   %td.shortcut
                     %kbd i
-                  %td New issue
+                  %td= _('New issue')
 
               %tbody
                 %tr
                   %th
-                  %th Project Files browsing
+                  %th= _('Project Files browsing')
                 %tr
                   %td.shortcut
                     %kbd
                       %i.fa.fa-arrow-up
-                  %td Move selection up
+                  %td= _('Move selection up')
                 %tr
                   %td.shortcut
                     %kbd
                       %i.fa.fa-arrow-down
-                  %td Move selection down
+                  %td= _('Move selection down')
                 %tr
                   %td.shortcut
                     %kbd enter
-                  %td Open Selection
+                  %td= _('Open Selection')
               %tbody
                 %tr
                   %th
-                  %th Project File
+                  %th= _('Project File')
                 %tr
                   %td.shortcut
                     %kbd y
-                  %td Go to file permalink
+                  %td= _('Go to file permalink')
               %tbody
                 %tr
                   %th
-                  %th Web IDE
+                  %th= _('Web IDE')
                 %tr
                   %td.shortcut
                     - if browser.platform.mac?
                       %kbd ⌘ p
                     - else
                       %kbd ctrl p
-                  %td Go to file
+                  %td= _('Go to file')
                 %tr
                   %td.shortcut
                     - if browser.platform.mac?
                       %kbd ⌘ enter
                     - else
                       %kbd ctrl enter
-                  %td Commit (when editing commit message)
+                  %td= _('Commit (when editing commit message)')
           .col-lg-4
             %table.shortcut-mappings
-              %tbody.hidden-shortcut{ style: 'display:none' }
+              %tbody.hidden-shortcut.network{ style: 'display:none' }
                 %tr
                   %th
-                  %th Network Graph
+                  %th= _('Network Graph')
                 %tr
                   %td.shortcut
                     %kbd
                       %i.fa.fa-arrow-left
                     \/
                     %kbd h
-                  %td Scroll left
+                  %td= _('Scroll left')
                 %tr
                   %td.shortcut
                     %kbd
                       %i.fa.fa-arrow-right
                     \/
                     %kbd l
-                  %td Scroll right
+                  %td= _('Scroll right')
                 %tr
                   %td.shortcut
                     %kbd
                       %i.fa.fa-arrow-up
                     \/
                     %kbd k
-                  %td Scroll up
+                  %td= _('Scroll up')
                 %tr
                   %td.shortcut
                     %kbd
                       %i.fa.fa-arrow-down
                     \/
                     %kbd j
-                  %td Scroll down
+                  %td= _('Scroll down')
                 %tr
                   %td.shortcut
                     %kbd
@@ -298,7 +298,7 @@
                     \/
                     %kbd
                       shift k
-                  %td Scroll to top
+                  %td= _('Scroll to top')
                 %tr
                   %td.shortcut
                     %kbd
@@ -307,80 +307,80 @@
                     \/
                     %kbd
                       shift j
-                  %td Scroll to bottom
-              %tbody.hidden-shortcut{ style: 'display:none' }
+                  %td= _('Scroll to bottom')
+              %tbody.hidden-shortcut.issues{ style: 'display:none' }
                 %tr
                   %th
-                  %th Issues
+                  %th= _('Issues')
                 %tr
                   %td.shortcut
                     %kbd a
-                  %td Change assignee
+                  %td= _('Change assignee')
                 %tr
                   %td.shortcut
                     %kbd m
-                  %td Change milestone
+                  %td= _('Change milestone')
                 %tr
                   %td.shortcut
                     %kbd r
-                  %td Reply (quoting selected text)
+                  %td= _('Reply (quoting selected text)')
                 %tr
                   %td.shortcut
                     %kbd e
-                  %td Edit issue
+                  %td= _('Edit issue')
                 %tr
                   %td.shortcut
                     %kbd l
-                  %td Change Label
+                  %td= _('Change Label')
               %tbody.hidden-shortcut.merge_requests{ style: 'display:none' }
                 %tr
                   %th
-                  %th Merge Requests
+                  %th= _('Merge Requests')
                 %tr
                   %td.shortcut
                     %kbd a
-                  %td Change assignee
+                  %td= _('Change assignee')
                 %tr
                   %td.shortcut
                     %kbd m
-                  %td Change milestone
+                  %td= _('Change milestone')
                 %tr
                   %td.shortcut
                     %kbd r
-                  %td Reply (quoting selected text)
+                  %td= _('Reply (quoting selected text)')
                 %tr
                   %td.shortcut
                     %kbd e
-                  %td Edit merge request
+                  %td= _('Edit merge request')
                 %tr
                   %td.shortcut
                     %kbd l
-                  %td Change Label
+                  %td= _('Change Label')
                 %tr
                   %td.shortcut
                     %kbd ]
                     \/
                     %kbd j
-                  %td Move to next file
+                  %td= _('Move to next file')
                 %tr
                   %td.shortcut
                     %kbd [
                     \/
                     %kbd k
-                  %td Move to previous file
+                  %td= _('Move to previous file')
                 %tr
                   %td.shortcut
                     %kbd n
-                  %td= _("Move to next unresolved discussion")
+                  %td= _('Move to next unresolved discussion')
                 %tr
                   %td.shortcut
                     %kbd p
-                  %td= _("Move to previous unresolved discussion")
-              %tbody.hidden-shortcut{ style: 'display:none' }
+                  %td= _('Move to previous unresolved discussion')
+              %tbody.hidden-shortcut.wiki{ style: 'display:none' }
                 %tr
                   %th
-                  %th Wiki pages
+                  %th= _('Wiki pages')
                 %tr
                   %td.shortcut
                     %kbd e
-                  %td Edit wiki page
+                  %td= _('Edit wiki page')
diff --git a/changelogs/unreleased/65530-add-externalization-and-fix-regression-in-shortcuts-helper-modal.yml b/changelogs/unreleased/65530-add-externalization-and-fix-regression-in-shortcuts-helper-modal.yml
new file mode 100644
index 00000000000..fc29a514c42
--- /dev/null
+++ b/changelogs/unreleased/65530-add-externalization-and-fix-regression-in-shortcuts-helper-modal.yml
@@ -0,0 +1,6 @@
+---
+title: Fixed display of some sections and externalized all text in the shortcuts modal
+  overlay
+merge_request: 31594
+author:
+type: fixed
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 8aba22fff14..6cafa9c3947 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -300,6 +300,9 @@ msgstr ""
 msgid "'%{source}' is not a import source"
 msgstr ""
 
+msgid "(Show all)"
+msgstr ""
+
 msgid "(external source)"
 msgstr ""
 
@@ -2008,6 +2011,15 @@ msgstr ""
 msgid "Certificate (PEM)"
 msgstr ""
 
+msgid "Change Label"
+msgstr ""
+
+msgid "Change assignee"
+msgstr ""
+
+msgid "Change milestone"
+msgstr ""
+
 msgid "Change path"
 msgstr ""
 
@@ -2988,6 +3000,9 @@ msgstr[1] ""
 msgid "Commit %{commit_id}"
 msgstr ""
 
+msgid "Commit (when editing commit message)"
+msgstr ""
+
 msgid "Commit Message"
 msgstr ""
 
@@ -4100,12 +4115,24 @@ msgstr ""
 msgid "Edit identity for %{user_name}"
 msgstr ""
 
+msgid "Edit issue"
+msgstr ""
+
 msgid "Edit issues"
 msgstr ""
 
+msgid "Edit last comment (when focused on an empty textarea)"
+msgstr ""
+
+msgid "Edit merge request"
+msgstr ""
+
 msgid "Edit public deploy key"
 msgstr ""
 
+msgid "Edit wiki page"
+msgstr ""
+
 msgid "Email"
 msgstr ""
 
@@ -4957,6 +4984,9 @@ msgstr ""
 msgid "Find the newly extracted <code>Takeout/Google Code Project Hosting/GoogleCodeProjectHosting.json</code> file."
 msgstr ""
 
+msgid "Finding Project File"
+msgstr ""
+
 msgid "Fingerprint"
 msgstr ""
 
@@ -4981,6 +5011,12 @@ msgstr ""
 msgid "FlowdockService|Flowdock is a collaboration web app for technical teams."
 msgstr ""
 
+msgid "Focus Filter"
+msgstr ""
+
+msgid "Focus Search"
+msgstr ""
+
 msgid "FogBugz Email"
 msgstr ""
 
@@ -5200,6 +5236,9 @@ msgstr ""
 msgid "Given access %{time_ago}"
 msgstr ""
 
+msgid "Global Shortcuts"
+msgstr ""
+
 msgid "Global notification settings"
 msgstr ""
 
@@ -5224,12 +5263,81 @@ msgstr ""
 msgid "Go to %{link_to_google_takeout}."
 msgstr ""
 
+msgid "Go to commits"
+msgstr ""
+
+msgid "Go to environments"
+msgstr ""
+
+msgid "Go to file"
+msgstr ""
+
+msgid "Go to file permalink"
+msgstr ""
+
+msgid "Go to files"
+msgstr ""
+
+msgid "Go to finding file"
+msgstr ""
+
+msgid "Go to groups"
+msgstr ""
+
+msgid "Go to issue boards"
+msgstr ""
+
+msgid "Go to issues"
+msgstr ""
+
+msgid "Go to jobs"
+msgstr ""
+
+msgid "Go to kubernetes"
+msgstr ""
+
+msgid "Go to merge requests"
+msgstr ""
+
+msgid "Go to metrics"
+msgstr ""
+
+msgid "Go to milestones"
+msgstr ""
+
+msgid "Go to network graph"
+msgstr ""
+
 msgid "Go to parent"
 msgstr ""
 
 msgid "Go to project"
 msgstr ""
 
+msgid "Go to projects"
+msgstr ""
+
+msgid "Go to repository charts"
+msgstr ""
+
+msgid "Go to snippets"
+msgstr ""
+
+msgid "Go to the activity feed"
+msgstr ""
+
+msgid "Go to the project's activity feed"
+msgstr ""
+
+msgid "Go to the project's overview page"
+msgstr ""
+
+msgid "Go to todos"
+msgstr ""
+
+msgid "Go to wiki"
+msgstr ""
+
 msgid "Go to your fork"
 msgstr ""
 
@@ -6165,6 +6273,9 @@ msgstr ""
 msgid "Key: %{key}"
 msgstr ""
 
+msgid "Keyboard Shortcuts"
+msgstr ""
+
 msgid "Kubernetes"
 msgstr ""
 
@@ -6958,6 +7069,12 @@ msgstr ""
 msgid "Move issue from one column of the board to another"
 msgstr ""
 
+msgid "Move selection down"
+msgstr ""
+
+msgid "Move selection up"
+msgstr ""
+
 msgid "Move this issue failed because target project doesn't exists"
 msgstr ""
 
@@ -6967,9 +7084,15 @@ msgstr ""
 msgid "Move this issue to another project."
 msgstr ""
 
+msgid "Move to next file"
+msgstr ""
+
 msgid "Move to next unresolved discussion"
 msgstr ""
 
+msgid "Move to previous file"
+msgstr ""
+
 msgid "Move to previous unresolved discussion"
 msgstr ""
 
@@ -7033,6 +7156,9 @@ msgstr ""
 msgid "Network"
 msgstr ""
 
+msgid "Network Graph"
+msgstr ""
+
 msgid "Never"
 msgstr ""
 
@@ -7493,6 +7619,9 @@ msgstr ""
 msgid "Open Documentation"
 msgstr ""
 
+msgid "Open Selection"
+msgstr ""
+
 msgid "Open comment type dropdown"
 msgstr ""
 
@@ -8498,6 +8627,12 @@ msgstr ""
 msgid "Project Badges"
 msgstr ""
 
+msgid "Project File"
+msgstr ""
+
+msgid "Project Files browsing"
+msgstr ""
+
 msgid "Project ID"
 msgstr ""
 
@@ -9250,6 +9385,9 @@ msgstr ""
 msgid "Replaced all labels with %{label_references} %{label_text}."
 msgstr ""
 
+msgid "Reply (quoting selected text)"
+msgstr ""
+
 msgid "Reply by email"
 msgstr ""
 
@@ -9612,15 +9750,27 @@ msgstr ""
 msgid "Scopes"
 msgstr ""
 
+msgid "Scroll down"
+msgstr ""
+
 msgid "Scroll down to <strong>Google Code Project Hosting</strong> and enable the switch on the right."
 msgstr ""
 
+msgid "Scroll left"
+msgstr ""
+
+msgid "Scroll right"
+msgstr ""
+
 msgid "Scroll to bottom"
 msgstr ""
 
 msgid "Scroll to top"
 msgstr ""
 
+msgid "Scroll up"
+msgstr ""
+
 msgid "Search"
 msgstr ""
 
@@ -10065,6 +10215,9 @@ msgstr ""
 msgid "Show whitespace changes"
 msgstr ""
 
+msgid "Show/hide this dialog"
+msgstr ""
+
 msgid "Showing %d event"
 msgid_plural "Showing %d events"
 msgstr[0] ""
@@ -11780,6 +11933,9 @@ msgstr ""
 msgid "Today"
 msgstr ""
 
+msgid "Toggle Markdown preview"
+msgstr ""
+
 msgid "Toggle Sidebar"
 msgstr ""
 
@@ -11804,6 +11960,9 @@ msgstr ""
 msgid "Toggle sidebar"
 msgstr ""
 
+msgid "Toggle the Performance Bar"
+msgstr ""
+
 msgid "Toggle thread"
 msgstr ""
 
@@ -12565,6 +12724,9 @@ msgstr ""
 msgid "Wiki"
 msgstr ""
 
+msgid "Wiki pages"
+msgstr ""
+
 msgid "Wiki was successfully updated."
 msgstr ""