summaryrefslogtreecommitdiffstats
path: root/webapp/components/quick_switch_modal
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2017-06-06 07:55:26 -0400
committerGitHub <noreply@github.com>2017-06-06 07:55:26 -0400
commit876c5dc9dfede580dfdb8f5d982b8b912958eacc (patch)
treece878a65ca22f423ed5a52671e52059d505ee120 /webapp/components/quick_switch_modal
parentf2151be096c68556567ae5cee5827acc70ae07c7 (diff)
downloadchat-876c5dc9dfede580dfdb8f5d982b8b912958eacc.tar.gz
chat-876c5dc9dfede580dfdb8f5d982b8b912958eacc.tar.bz2
chat-876c5dc9dfede580dfdb8f5d982b8b912958eacc.zip
Fix default text for channel switcher (#6581)
Diffstat (limited to 'webapp/components/quick_switch_modal')
-rw-r--r--webapp/components/quick_switch_modal/quick_switch_modal.jsx8
1 files changed, 6 insertions, 2 deletions
diff --git a/webapp/components/quick_switch_modal/quick_switch_modal.jsx b/webapp/components/quick_switch_modal/quick_switch_modal.jsx
index c3095caf9..779b8aa8b 100644
--- a/webapp/components/quick_switch_modal/quick_switch_modal.jsx
+++ b/webapp/components/quick_switch_modal/quick_switch_modal.jsx
@@ -199,13 +199,17 @@ export default class QuickSwitchModal extends React.PureComponent {
let renderDividers = true;
let channelShortcut = 'quick_switch_modal.channelsShortcut.windows';
+ let defaultChannelShortcut = 'CTRL+K';
if (Utils.isMac()) {
channelShortcut = 'quick_switch_modal.channelsShortcut.mac';
+ defaultChannelShortcut = 'CMD+K';
}
let teamShortcut = 'quick_switch_modal.teamsShortcut.windows';
+ let defaultTeamShortcut = 'CTRL+ALT+K';
if (Utils.isMac()) {
teamShortcut = 'quick_switch_modal.teamsShortcut.mac';
+ defaultTeamShortcut = 'CMD+ALT+K';
}
if (this.props.showTeamSwitcher) {
@@ -238,7 +242,7 @@ export default class QuickSwitchModal extends React.PureComponent {
<span className='small'>
<FormattedMessage
id={channelShortcut}
- defaultMessage='CTRL+K'
+ defaultMessage={defaultChannelShortcut}
/>
</span>
</a>
@@ -260,7 +264,7 @@ export default class QuickSwitchModal extends React.PureComponent {
<span className='small'>
<FormattedMessage
id={teamShortcut}
- defaultMessage='CTRL+ALT+K'
+ defaultMessage={defaultTeamShortcut}
/>
</span>
</a>