From 7068307a1c12d7e045f68e73448ab728fc2b10c7 Mon Sep 17 00:00:00 2001
From: joannekoong <joannekoong@college.harvard.edu>
Date: Mon, 20 Feb 2017 19:07:50 -0500
Subject: Add help text for 'Words that trigger mentions' (#5459)

---
 .../user_settings/user_settings_notifications.jsx         | 15 ++++++++++++++-
 webapp/i18n/en.json                                       |  1 +
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/webapp/components/user_settings/user_settings_notifications.jsx b/webapp/components/user_settings/user_settings_notifications.jsx
index 672f8d6b7..7c82488f6 100644
--- a/webapp/components/user_settings/user_settings_notifications.jsx
+++ b/webapp/components/user_settings/user_settings_notifications.jsx
@@ -608,6 +608,18 @@ export default class NotificationsTab extends React.Component {
                 </div>
             );
 
+            const extraInfo = (
+                <span>
+                    <FormattedMessage
+                        id='user.settings.notifications.mentionsInfo'
+                        defaultMessage='Mentions trigger when someone sends a message that includes your username (@{username}) or any of the options selected above.'
+                        values={{
+                            username: user.username
+                        }}
+                    />
+                </span>
+            );
+
             keysSection = (
                 <SettingItemMax
                     title={Utils.localizeMessage('user.settings.notifications.wordsTrigger', 'Words that trigger mentions')}
@@ -615,10 +627,11 @@ export default class NotificationsTab extends React.Component {
                     submit={this.handleSubmit}
                     server_error={serverError}
                     updateSection={this.handleCancel}
+                    extraInfo={extraInfo}
                 />
             );
         } else {
-            let keys = [];
+            let keys = ['@' + user.username];
             if (this.state.firstNameKey) {
                 keys.push(user.first_name);
             }
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index f68763cc7..5416cde93 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -2128,6 +2128,7 @@
   "user.settings.notifications.emailNotifications": "Email notifications",
   "user.settings.notifications.header": "Notifications",
   "user.settings.notifications.info": "Desktop notifications are available on Edge, Firefox, Safari, Chrome and Mattermost Desktop Apps.",
+  "user.settings.notifications.mentionsInfo": "Mentions trigger when someone sends a message that includes your username (\"@{username}\") or any of the options selected above.",
   "user.settings.notifications.never": "Never",
   "user.settings.notifications.noWords": "No words configured",
   "user.settings.notifications.off": "Off",
-- 
cgit v1.2.3-1-g7c22