diff --git a/app/assets/javascripts/discourse/templates/discovery/topics.js.handlebars b/app/assets/javascripts/discourse/templates/discovery/topics.js.handlebars index 34708a1ebcd..bd7b9a847ad 100644 --- a/app/assets/javascripts/discourse/templates/discovery/topics.js.handlebars +++ b/app/assets/javascripts/discourse/templates/discovery/topics.js.handlebars @@ -5,11 +5,11 @@ {{#if showDismissAtTop}}
{{#if showDismissRead}} - - + + {{/if}} {{#if showResetNew}} - + {{/if}}
{{/if}} @@ -87,11 +87,11 @@ {{/if}} {{#if allLoaded}} {{#if showDismissRead}} - - + + {{/if}} {{#if showResetNew}} - + {{/if}} {{#if latest}} diff --git a/app/assets/javascripts/discourse/templates/mobile/discovery/topics.js.handlebars b/app/assets/javascripts/discourse/templates/mobile/discovery/topics.js.handlebars index a76edca8621..2dcbabe56f8 100644 --- a/app/assets/javascripts/discourse/templates/mobile/discovery/topics.js.handlebars +++ b/app/assets/javascripts/discourse/templates/mobile/discovery/topics.js.handlebars @@ -29,11 +29,11 @@ {{/if}} {{#if allLoaded}} {{#if showDismissRead}} - - + + {{/if}} {{#if showResetNew}} - + {{/if}} {{#if latest}} 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 76617712dce..692769c4726 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 @@ -10,8 +10,6 @@
  • {{{i18n keyboard_shortcuts_help.jump_to.starred}}}
  • {{{i18n keyboard_shortcuts_help.jump_to.categories}}}
  • - -

    {{i18n keyboard_shortcuts_help.navigation.title}}

    +
    +

    {{i18n keyboard_shortcuts_help.application.title}}

    diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index d9f5e440c86..73ce04c4a88 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -2056,8 +2056,11 @@ en: notifications: 'n Open notifications' site_map_menu: '= Open site map menu' user_profile_menu: 'p Open user profile menu' + show_incoming_updated: '. Show incoming/updated topics' search: '/ Search' help: '? Open keyboard shortcuts help' + dismiss_new_posts: 'x, r Dismiss New/Posts' + dismiss_topics: 'x, t Dismiss Topics' actions: title: 'Actions' star: 'f Star topic' diff --git a/test/javascripts/components/keyboard-shortcuts-test.js.es6 b/test/javascripts/components/keyboard-shortcuts-test.js.es6 index cb290355c95..e08e582cfc9 100644 --- a/test/javascripts/components/keyboard-shortcuts-test.js.es6 +++ b/test/javascripts/components/keyboard-shortcuts-test.js.es6 @@ -46,6 +46,8 @@ module("Discourse.KeyboardShortcuts", { " ", " ", " ", + " ", + " ", "
    ", "", "
    ",