diff options
author | Harrison Healey <harrisonmhealey@gmail.com> | 2015-09-23 11:31:10 -0400 |
---|---|---|
committer | Harrison Healey <harrisonmhealey@gmail.com> | 2015-09-23 11:31:10 -0400 |
commit | fa312f5b4708ee354cef1e15ac03790f46a3f757 (patch) | |
tree | 37a88a60898aa89991ad30e7c0dbf1a2cd1c9cba /web/react/components/user_settings | |
parent | 7eef5be3596470321df8a7a0c6b07aa9cc6edb07 (diff) | |
parent | f7a32fa38a5c9f33d7fbb3d73d240626211173cc (diff) | |
download | chat-fa312f5b4708ee354cef1e15ac03790f46a3f757.tar.gz chat-fa312f5b4708ee354cef1e15ac03790f46a3f757.tar.bz2 chat-fa312f5b4708ee354cef1e15ac03790f46a3f757.zip |
Merge pull request #760 from chengweiv5/PLT-126
PLT-126: Change 'Private Messages' to 'Direct Messages'
Diffstat (limited to 'web/react/components/user_settings')
-rw-r--r-- | web/react/components/user_settings/user_settings_notifications.jsx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/web/react/components/user_settings/user_settings_notifications.jsx b/web/react/components/user_settings/user_settings_notifications.jsx index fde4970ce..8d364cde7 100644 --- a/web/react/components/user_settings/user_settings_notifications.jsx +++ b/web/react/components/user_settings/user_settings_notifications.jsx @@ -241,7 +241,7 @@ export default class NotificationsTab extends React.Component { checked={notifyActive[1]} onChange={this.handleNotifyRadio.bind(this, 'mention')} > - Only for mentions and private messages + Only for mentions and direct messages </input> </label> <br/> @@ -277,7 +277,7 @@ export default class NotificationsTab extends React.Component { } else { let describe = ''; if (this.state.notifyLevel === 'mention') { - describe = 'Only for mentions and private messages'; + describe = 'Only for mentions and direct messages'; } else if (this.state.notifyLevel === 'none') { describe = 'Never'; } else { @@ -414,7 +414,7 @@ export default class NotificationsTab extends React.Component { </label> <br/> </div> - <div><br/>{'Email notifications are sent for mentions and private messages after you have been away from ' + global.window.config.SiteName + ' for 5 minutes.'}</div> + <div><br/>{'Email notifications are sent for mentions and direct messages after you have been away from ' + global.window.config.SiteName + ' for 5 minutes.'}</div> </div> ); |