diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2016-09-06 17:51:42 -0400 |
|---|---|---|
| committer | enahum <nahumhbl@gmail.com> | 2016-09-06 18:51:42 -0300 |
| commit | 73692f010e1a0bf62f0a502797aca94f99012385 (patch) | |
| tree | cee41dd48ec51c904bf29ad81c1d5a4a2dddb009 /webapp | |
| parent | 024a72b440345709692d46f2b15d5cb958926359 (diff) | |
| download | chat-73692f010e1a0bf62f0a502797aca94f99012385.tar.gz chat-73692f010e1a0bf62f0a502797aca94f99012385.tar.bz2 chat-73692f010e1a0bf62f0a502797aca94f99012385.zip | |
PLT-3775/PLT-4067 Fixes for email notifications for 3.4
Diffstat (limited to 'webapp')
| -rw-r--r-- | webapp/components/user_settings/email_notification_setting.jsx | 6 | ||||
| -rw-r--r-- | webapp/i18n/en.json | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/webapp/components/user_settings/email_notification_setting.jsx b/webapp/components/user_settings/email_notification_setting.jsx index c45872a82..e10fd5154 100644 --- a/webapp/components/user_settings/email_notification_setting.jsx +++ b/webapp/components/user_settings/email_notification_setting.jsx @@ -159,6 +159,12 @@ export default class EmailNotificationSetting extends React.Component { title={localizeMessage('user.settings.notifications.emailNotifications', 'Email notifications')} inputs={[ <div key='userNotificationEmailOptions'> + <label> + <FormattedMessage + id='user.settings.notifications.email.send' + defaultMessage='Send email notifications' + /> + </label> <div className='radio'> <label> <input diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 6cb66bd58..78496eb77 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -1899,6 +1899,7 @@ "user.settings.notifications.email.everyXMinutes": "Every {count, plural, one {minute} other {{count, number} minutes}}", "user.settings.notifications.email.immediately": "Immediately", "user.settings.notifications.email.never": "Never", + "user.settings.notifications.email.send": "Send email notifications", "user.settings.notifications.emailBatchingInfo": "Notifications received over the time period selected are combined and sent in a single email.", "user.settings.notifications.emailInfo": "Email notifications are sent for mentions and direct messages when you are offline or away from {siteName} for more than 5 minutes.", "user.settings.notifications.emailNotifications": "Email notifications", |