summaryrefslogtreecommitdiffstats
path: root/webapp/components
diff options
context:
space:
mode:
authorSaturnino Abril <saturnino.abril@gmail.com>2017-09-04 04:12:38 +0800
committerGitHub <noreply@github.com>2017-09-04 04:12:38 +0800
commit967a0df0f87e6fe942e9a7a1183014d299526e94 (patch)
tree897de5f1d0d09781c915009ff4d66322002e0ba1 /webapp/components
parent94c9138c1986cb35b930f6e3e98993b851f69ef9 (diff)
downloadchat-967a0df0f87e6fe942e9a7a1183014d299526e94.tar.gz
chat-967a0df0f87e6fe942e9a7a1183014d299526e94.tar.bz2
chat-967a0df0f87e6fe942e9a7a1183014d299526e94.zip
[PLT-7471] Slight modifications to keyboards dialog (#7325)
* slight modifications to keyboards dialog * Updating shortcuts modal
Diffstat (limited to 'webapp/components')
-rw-r--r--webapp/components/shortcuts_modal.jsx17
1 files changed, 9 insertions, 8 deletions
diff --git a/webapp/components/shortcuts_modal.jsx b/webapp/components/shortcuts_modal.jsx
index 32a3f9c4b..3bbfcb660 100644
--- a/webapp/components/shortcuts_modal.jsx
+++ b/webapp/components/shortcuts_modal.jsx
@@ -12,8 +12,14 @@ import React from 'react';
const allShortcuts = defineMessages({
mainHeader: {
- id: 'shortcuts.header',
- defaultMessage: 'Keyboard Shortcuts'
+ default: {
+ id: 'shortcuts.header',
+ defaultMessage: 'Keyboard Shortcuts\tCtrl|/'
+ },
+ mac: {
+ id: 'shortcuts.header.mac',
+ defaultMessage: 'Keyboard Shortcuts\t⌘|/'
+ }
},
navHeader: {
id: 'shortcuts.nav.header',
@@ -103,10 +109,6 @@ const allShortcuts = defineMessages({
id: 'shortcuts.msgs.header',
defaultMessage: 'Messages'
},
- msgMarkAsRead: {
- id: 'shortcuts.msgs.mark_as_read',
- defaultMessage: 'Mark current channel as read:\tEsc'
- },
msgInputHeader: {
id: 'shortcuts.msgs.input.header',
defaultMessage: 'Works inside an empty input field'
@@ -296,7 +298,7 @@ class ShortcutsModal extends React.PureComponent {
<div className='shortcuts-content'>
<Modal.Header closeButton={true}>
<Modal.Title>
- <strong>{formatMessage(shortcuts.mainHeader)}</strong>
+ <strong>{renderShortcut(formatMessage(shortcuts.mainHeader))}</strong>
</Modal.Title>
</Modal.Header>
<Modal.Body ref='modalBody'>
@@ -320,7 +322,6 @@ class ShortcutsModal extends React.PureComponent {
<div className='section'>
<div>
<h4 className='section-title'><strong>{formatMessage(shortcuts.msgHeader)}</strong></h4>
- {renderShortcut(formatMessage(shortcuts.msgMarkAsRead))}
<span><strong>{formatMessage(shortcuts.msgInputHeader)}</strong></span>
<div className='subsection'>
{renderShortcut(formatMessage(shortcuts.msgEdit))}