Commit 7cb7bec1 authored by Joram Wilander's avatar Joram Wilander Committed by GitHub

Fix default text for channel switcher (#6581)

parent 1e55134e
......@@ -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>
......
......@@ -804,8 +804,10 @@ export default class Sidebar extends React.Component {
}
let quickSwitchText = 'sidebar.switch_channels';
let quickSwitchDefault = 'Switch Channels (CTRL + K)';
if (Utils.isMac()) {
quickSwitchText += '.mac';
quickSwitchDefault = 'Switch Channels (CMD + K)';
}
return (
......@@ -916,7 +918,7 @@ export default class Sidebar extends React.Component {
>
<FormattedMessage
id={quickSwitchText}
defaultMessage='Switch Channels (CTRL + K)'
defaultMessage={quickSwitchDefault}
/>
</a>
</div>
......
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