From 38b25a87842feae6576be98fddd4569e79e63baf Mon Sep 17 00:00:00 2001
From: Eric Sethna <eric@spinpunch.com>
Date: Thu, 1 Sep 2016 08:02:35 -0600
Subject: 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
---
 .../user_settings/email_notification_setting.jsx         |  2 +-
 .../user_settings/user_settings_notifications.jsx        | 16 +++++++++++++++-
 webapp/i18n/en.json                                      |  6 ++++--
 3 files changed, 20 insertions(+), 4 deletions(-)

(limited to 'webapp')

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
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 8d1cfb3c7..9f01f6251 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -1885,7 +1885,7 @@
   "user.settings.notifications.desktop.duration": "Notification duration",
   "user.settings.notifications.desktop.sound": "Notification sound",
   "user.settings.notifications.desktopSounds": "Desktop notification sounds",
-  "user.settings.notifications.emailBatchingInfo": "Notifications are combined into a single email and sent at the maximum frequency selected here.",
+  "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",
   "user.settings.notifications.everyHour": "Every hour",
@@ -1921,7 +1921,9 @@
   "user.settings.push_notification.onlyMentionsAway": "For mentions and direct messages when away or offline",
   "user.settings.push_notification.onlyMentionsOffline": "For mentions and direct messages when offline",
   "user.settings.push_notification.onlyMentionsOnline": "For mentions and direct messages when online, away or offline",
-  "user.settings.push_notification.status_info": "Notification alerts are pushed to your mobile device depending on your online status.",
+  "user.settings.push_notification.send": "Send mobile push notifications",
+  "user.settings.push_notification.status": "Trigger push notifications when",
+  "user.settings.push_notification.status_info": "Notification alerts are only pushed to your mobile device when your online status matches the selection above.",
   "user.settings.security.close": "Close",
   "user.settings.security.currentPassword": "Current Password",
   "user.settings.security.currentPasswordError": "Please enter your current password.",
-- 
cgit v1.2.3-1-g7c22