diff options
| author | Eric Sethna <eric@spinpunch.com> | 2016-09-01 08:02:35 -0600 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2016-09-01 10:02:35 -0400 |
| commit | 38b25a87842feae6576be98fddd4569e79e63baf (patch) | |
| tree | 19e9180a81077897901221da2f5c321f0de9f493 /webapp/components | |
| parent | 26f96b240ddc8cf8c56decea72102b10238e0a43 (diff) | |
| download | chat-38b25a87842feae6576be98fddd4569e79e63baf.tar.gz chat-38b25a87842feae6576be98fddd4569e79e63baf.tar.bz2 chat-38b25a87842feae6576be98fddd4569e79e63baf.zip | |
Update Push and Email Notifications Text (#3924)
* Update user_settings_notifications.jsx
* Update user_settings_notifications.jsx
* Update email_notification_setting.jsx
* Update en.json
* Update user_settings_notifications.jsx
Diffstat (limited to 'webapp/components')
| -rw-r--r-- | webapp/components/user_settings/email_notification_setting.jsx | 2 | ||||
| -rw-r--r-- | webapp/components/user_settings/user_settings_notifications.jsx | 16 |
2 files changed, 16 insertions, 2 deletions
diff --git a/webapp/components/user_settings/email_notification_setting.jsx b/webapp/components/user_settings/email_notification_setting.jsx index 5c0d95d8b..e2519328b 100644 --- a/webapp/components/user_settings/email_notification_setting.jsx +++ b/webapp/components/user_settings/email_notification_setting.jsx @@ -149,7 +149,7 @@ export default class EmailNotificationSetting extends React.Component { batchingInfo = ( <FormattedMessage id='user.settings.notifications.emailBatchingInfo' - defaultMessage='Notifications are combined into a single email and sent at the maximum frequency selected here.' + defaultMessage='Notifications received over the time period selected are combined and sent in a single email.' /> ); } diff --git a/webapp/components/user_settings/user_settings_notifications.jsx b/webapp/components/user_settings/user_settings_notifications.jsx index 09bc26a9b..b49fa3dd6 100644 --- a/webapp/components/user_settings/user_settings_notifications.jsx +++ b/webapp/components/user_settings/user_settings_notifications.jsx @@ -290,6 +290,13 @@ export default class NotificationsTab extends React.Component { pushStatusSettings = ( <div> <hr/> + <label> + <FormattedMessage + id='user.settings.notifications.push_notification.status' + defaultMessage='Trigger push notifications when' + /> + </label> + <br/> <div className='radio'> <label> <input @@ -341,7 +348,7 @@ export default class NotificationsTab extends React.Component { <span> <FormattedMessage id='user.settings.push_notification.status_info' - defaultMessage='Notification alerts are pushed to your mobile device depending on your online status.' + defaultMessage='Notification alerts are only pushed to your mobile device when your online status matches the selection above.' /> </span> ); @@ -349,6 +356,13 @@ export default class NotificationsTab extends React.Component { inputs.push( <div key='userNotificationLevelOption'> + <label> + <FormattedMessage + id='user.settings.push_notification.send' + defaultMessage='Send mobile push notifications' + /> + </label> + <br/> <div className='radio'> <label> <input |