summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--webapp/components/suggestion/at_mention_provider.jsx6
-rwxr-xr-xwebapp/i18n/en.json2
2 files changed, 2 insertions, 6 deletions
diff --git a/webapp/components/suggestion/at_mention_provider.jsx b/webapp/components/suggestion/at_mention_provider.jsx
index 4d55e9db6..09cc1ec03 100644
--- a/webapp/components/suggestion/at_mention_provider.jsx
+++ b/webapp/components/suggestion/at_mention_provider.jsx
@@ -4,7 +4,6 @@
import Suggestion from './suggestion.jsx';
import Provider from './provider.jsx';
-import ChannelStore from 'stores/channel_store.jsx';
import UserStore from 'stores/user_store.jsx';
import {autocompleteUsersInChannel} from 'actions/user_actions.jsx';
@@ -31,10 +30,7 @@ class AtMentionSuggestion extends Suggestion {
description = (
<FormattedMessage
id='suggestion.mention.all'
- defaultMessage='Notifies everyone in the channel, use in {townsquare} to notify the whole team'
- values={{
- townsquare: ChannelStore.getByName('town-square').display_name
- }}
+ defaultMessage='CAUTION: This mentions everyone in channel'
/>
);
icon = <i className='mention__image fa fa-users fa-2x'/>;
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 02dc7cd0a..2a9a5cf3f 100755
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -2000,7 +2000,7 @@
"sso_signup.length_error": "Name must be 3 or more characters up to a maximum of 15",
"sso_signup.teamName": "Enter name of new team",
"sso_signup.team_error": "Please enter a team name",
- "suggestion.mention.all": "Notifies everyone in the channel, use in {townsquare} to notify the whole team",
+ "suggestion.mention.all": "CAUTION: This mentions everyone in channel",
"suggestion.mention.channel": "Notifies everyone in the channel",
"suggestion.mention.channels": "My Channels",
"suggestion.mention.here": "Notifies everyone in the channel and online",