diff --git a/app/assets/javascripts/discourse/lib/keyboard_shortcuts.js b/app/assets/javascripts/discourse/lib/keyboard_shortcuts.js index d1b7cdca0..fd7194730 100644 --- a/app/assets/javascripts/discourse/lib/keyboard_shortcuts.js +++ b/app/assets/javascripts/discourse/lib/keyboard_shortcuts.js @@ -35,9 +35,8 @@ Discourse.KeyboardShortcuts = Ember.Object.createWithMixins({ 'm r': 'div.notification-options li[data-id="1"] a', // mark topic as regular 'm t': 'div.notification-options li[data-id="2"] a', // mark topic as tracking 'm w': 'div.notification-options li[data-id="3"] a', // mark topic as watching - 'd n': '#dismiss-new', // dismiss new + 'd r': '#dismiss-new, #dismiss-posts', // dismiss new/posts 'd t': '#dismiss-topics', // dismiss topics - 'd p': '#dismiss-posts', // dismiss posts 'n': '#user-notifications', // open notifications menu 'o,enter': '.topic-list tr.selected a.title', // open selected topic 'shift+r': '#topic-footer-buttons button.create', // reply to topic diff --git a/app/assets/javascripts/discourse/templates/modal/keyboard_shortcuts_help.js.handlebars b/app/assets/javascripts/discourse/templates/modal/keyboard_shortcuts_help.js.handlebars index 44d08a74c..7077f227c 100644 --- a/app/assets/javascripts/discourse/templates/modal/keyboard_shortcuts_help.js.handlebars +++ b/app/assets/javascripts/discourse/templates/modal/keyboard_shortcuts_help.js.handlebars @@ -28,9 +28,8 @@
  • {{{i18n keyboard_shortcuts_help.application.user_profile_menu}}}
  • {{{i18n keyboard_shortcuts_help.application.search}}}
  • {{{i18n keyboard_shortcuts_help.application.help}}}
  • -
  • {{{i18n keyboard_shortcuts_help.application.dismiss_new}}}
  • +
  • {{{i18n keyboard_shortcuts_help.application.dismiss_new_posts}}}
  • {{{i18n keyboard_shortcuts_help.application.dismiss_topics}}}
  • -
  • {{{i18n keyboard_shortcuts_help.application.dismiss_posts}}}
  • diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 2aab846cd..f53ec58ff 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -2058,9 +2058,8 @@ en: user_profile_menu: 'p Open user profile menu' search: '/ Search' help: '? Open keyboard shortcuts help' - dismiss_new: 'd, n Dismiss New' + dismiss_new_posts: 'd, r Dismiss New/Posts' dismiss_topics: 'd, t Dismiss Topics' - dismiss_posts: 'd, p Dismiss Posts' actions: title: 'Actions' star: 'f Star topic'