From d51d4e4c9c9ddf10aff57bebf1a5a505a70feb33 Mon Sep 17 00:00:00 2001
From: Jason Blais <13119842+jasonblais@users.noreply.github.com>
Date: Mon, 13 May 2019 11:13:39 -0400
Subject: [PATCH] Update help text for at-here, at-channel, at-all (#2790)

* Update help text for at-here, at-channel, at-all

https://community.mattermost.com/core/pl/kqmabdzqb3df7xx5xjsaosozir

* Update at_mention.js
---
 app/components/autocomplete/at_mention/at_mention.js | 6 +++---
 assets/base/i18n/en.json                             | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/components/autocomplete/at_mention/at_mention.js b/app/components/autocomplete/at_mention/at_mention.js
index 80620bb55..7b8fafaee 100644
--- a/app/components/autocomplete/at_mention/at_mention.js
+++ b/app/components/autocomplete/at_mention/at_mention.js
@@ -134,18 +134,18 @@ export default class AtMention extends PureComponent {
         return [{
             completeHandle: 'all',
             id: t('suggestion.mention.all'),
-            defaultMessage: 'Notifies everyone in the channel, use in {townsquare} to notify the whole team',
+            defaultMessage: 'Notifies everyone in this channel',
             values: {
                 townsquare: this.props.defaultChannel.display_name,
             },
         }, {
             completeHandle: 'channel',
             id: t('suggestion.mention.channel'),
-            defaultMessage: 'Notifies everyone in the channel',
+            defaultMessage: 'Notifies everyone in this channel',
         }, {
             completeHandle: 'here',
             id: t('suggestion.mention.here'),
-            defaultMessage: 'Notifies everyone in the channel and online',
+            defaultMessage: 'Notifies everyone online in this channel',
         }];
     };
 
diff --git a/assets/base/i18n/en.json b/assets/base/i18n/en.json
index 6b14123e8..855eacd1b 100644
--- a/assets/base/i18n/en.json
+++ b/assets/base/i18n/en.json
@@ -504,10 +504,10 @@
   "status_dropdown.set_offline": "Offline",
   "status_dropdown.set_online": "Online",
   "status_dropdown.set_ooo": "Out of Office",
-  "suggestion.mention.all": "CAUTION: This mentions everyone in channel",
-  "suggestion.mention.channel": "Notifies everyone in the channel",
+  "suggestion.mention.all": "Notifies everyone in this channel",
+  "suggestion.mention.channel": "Notifies everyone in this channel",
   "suggestion.mention.channels": "My Channels",
-  "suggestion.mention.here": "Notifies everyone in the channel and online",
+  "suggestion.mention.here": "Notifies everyone online in this channel",
   "suggestion.mention.members": "Channel Members",
   "suggestion.mention.morechannels": "Other Channels",
   "suggestion.mention.nonmembers": "Not in Channel",