Skip to content

G
gitlab-ce
Commit c75194b0 authored by Paul Slaughter's avatar Paul Slaughter
Browse files
Options

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