summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2017-06-06 18:29:36 -0400
committerGitHub <noreply@github.com>2017-06-06 18:29:36 -0400
commitc831e14ed058bb78f58d5716cdbf1d3826674df9 (patch)
treefae914b6dac26c08e717da0f5d978e024bb48d34 /webapp
parentcc1feddb5f130cf0d766cdde0af98835ce016429 (diff)
downloadchat-c831e14ed058bb78f58d5716cdbf1d3826674df9.tar.gz
chat-c831e14ed058bb78f58d5716cdbf1d3826674df9.tar.bz2
chat-c831e14ed058bb78f58d5716cdbf1d3826674df9.zip
Update help text for quick switcher (#6599)
Diffstat (limited to 'webapp')
-rw-r--r--webapp/components/quick_switch_modal/quick_switch_modal.jsx8
-rwxr-xr-xwebapp/i18n/en.json4
2 files changed, 7 insertions, 5 deletions
diff --git a/webapp/components/quick_switch_modal/quick_switch_modal.jsx b/webapp/components/quick_switch_modal/quick_switch_modal.jsx
index 5ee074c31..24eb8fcba 100644
--- a/webapp/components/quick_switch_modal/quick_switch_modal.jsx
+++ b/webapp/components/quick_switch_modal/quick_switch_modal.jsx
@@ -274,18 +274,20 @@ export default class QuickSwitchModal extends React.PureComponent {
}
let help;
- if (this.props.showTeamSwitcher) {
+ if (Utils.isMobile()) {
+ help = null;
+ } else if (this.props.showTeamSwitcher) {
help = (
<FormattedMessage
id='quick_switch_modal.help'
- defaultMessage='Use TAB to toggle between teams/channels, ↑↓ to browse, ↵ to confirm, ESC to dismiss'
+ defaultMessage='Start typing then use TAB to toggle channels/teams, ↑↓ to browse, ↵ to select, and ESC to dismiss.'
/>
);
} else {
help = (
<FormattedMessage
id='quick_switch_modal.help_no_team'
- defaultMessage='Type a channel name. Use ↑↓ to browse, ↵ to confirm, ESC to dismiss'
+ defaultMessage='Start typing then use ↑↓ to browse, ↵ to select, and ESC to dismiss.'
/>
);
}
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 25c671f47..9c223bb34 100755
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -1169,8 +1169,8 @@
"channel_select.placeholder": "--- Select a channel ---",
"channel_switch_modal.dm": "(Direct Message)",
"channel_switch_modal.failed_to_open": "Failed to open channel.",
- "quick_switch_modal.help": "Use TAB to toggle between teams/channels, ↑↓ to browse, ↵ to confirm, ESC to dismiss",
- "quick_switch_modal.help_no_team": "Type a channel name. Use ↑↓ to browse, ↵ to confirm, ESC to dismiss",
+ "quick_switch_modal.help": "Start typing then use TAB to toggle channels/teams, ↑↓ to browse, ↵ to select, and ESC to dismiss.",
+ "quick_switch_modal.help_no_team": "Start typing then use ↑↓ to browse, ↵ to select, and ESC to dismiss.",
"quick_switch_modal.channels": "Channels",
"quick_switch_modal.teams": "Teams",
"quick_switch_modal.teamsShortcut.mac": "- ⌘⌥K",