diff options
| author | David Meza <dmeza@users.noreply.github.com> | 2017-05-30 11:02:44 -0500 |
|---|---|---|
| committer | Harrison Healey <harrisonmhealey@gmail.com> | 2017-05-30 12:02:44 -0400 |
| commit | eab6f7459478d23968466766cbe49185d405a056 (patch) | |
| tree | 3323cfd3c2592177fa9ce6c856cc12283a4e9cf3 /webapp | |
| parent | 23ca4fe69cb4baf0c38666b917eb8307949d8b5b (diff) | |
| download | chat-eab6f7459478d23968466766cbe49185d405a056.tar.gz chat-eab6f7459478d23968466766cbe49185d405a056.tar.bz2 chat-eab6f7459478d23968466766cbe49185d405a056.zip | |
PLT-6485 Add ability to disable `@here` notifications (#6372)
Diffstat (limited to 'webapp')
| -rw-r--r-- | webapp/components/user_settings/user_settings_notifications.jsx | 3 | ||||
| -rwxr-xr-x | webapp/i18n/en.json | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/webapp/components/user_settings/user_settings_notifications.jsx b/webapp/components/user_settings/user_settings_notifications.jsx index b0b4855b2..6cfceb444 100644 --- a/webapp/components/user_settings/user_settings_notifications.jsx +++ b/webapp/components/user_settings/user_settings_notifications.jsx @@ -589,7 +589,7 @@ export default class NotificationsTab extends React.Component { /> <FormattedMessage id='user.settings.notifications.channelWide' - defaultMessage='Channel-wide mentions "@channel", "@all"' + defaultMessage='Channel-wide mentions "@channel", "@all", "@here"' /> </label> </div> @@ -658,6 +658,7 @@ export default class NotificationsTab extends React.Component { if (this.state.channelKey) { keys.push('@channel'); keys.push('@all'); + keys.push('@here'); } if (this.state.customKeys.length > 0) { keys = keys.concat(this.state.customKeys.split(',')); diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index fe2a9ae5a..20fef3c47 100755 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -2257,7 +2257,7 @@ "user.settings.modal.security": "Security", "user.settings.modal.title": "Account Settings", "user.settings.notifications.allActivity": "For all activity", - "user.settings.notifications.channelWide": "Channel-wide mentions \"@channel\", \"@all\"", + "user.settings.notifications.channelWide": "Channel-wide mentions \"@channel\", \"@all\", \"@here\"", "user.settings.notifications.close": "Close", "user.settings.notifications.comments": "Reply notifications", "user.settings.notifications.commentsAny": "Trigger notifications on messages in reply threads that I start or participate in", |