Merge pull request #760 from chengweiv5/PLT-126

PLT-126: Change 'Private Messages' to 'Direct Messages'

6 files changed, 10 insertions, 10 deletions

diff --git a/web/react/components/more_direct_channels.jsx b/web/react/components/more_direct_channels.jsx
index f27b09ecc..b7bce9b34 100644
--- a/web/react/components/more_direct_channels.jsx
+++ b/web/react/components/more_direct_channels.jsx
@@ -114,7 +114,7 @@ export default class MoreDirectChannels extends React.Component {
                                 <span aria-hidden='true'>&times;</span>
                                 <span className='sr-only'>Close</span>
                             </button>
-                            <h4 className='modal-title'>More Private Messages</h4>
+                            <h4 className='modal-title'>More Direct Messages</h4>
                         </div>
                         <div className='modal-body'>
                             <ul className='nav nav-pills nav-stacked'>
diff --git a/web/react/components/post_list.jsx b/web/react/components/post_list.jsx
index 703e548fb..218922b67 100644
--- a/web/react/components/post_list.jsx
+++ b/web/react/components/post_list.jsx
@@ -326,8 +326,8 @@ export default class PostList extends React.Component {
                         <strong><UserProfile userId={teammate.id} /></strong>
                     </div>
                     <p className='channel-intro-text'>
-                        {'This is the start of your private message history with ' + teammateName + '.'}<br/>
-                        {'Private messages and files shared here are not shown to people outside this area.'}
+                        {'This is the start of your direct message history with ' + teammateName + '.'}<br/>
+                        {'Direct messages and files shared here are not shown to people outside this area.'}
                     </p>
                     <a
                         className='intro-links'
@@ -346,7 +346,7 @@ export default class PostList extends React.Component {
 
         return (
             <div className='channel-intro'>
-                <p className='channel-intro-text'>{'This is the start of your private message history with this teammate. Private messages and files shared here are not shown to people outside this area.'}</p>
+                <p className='channel-intro-text'>{'This is the start of your direct message history with this teammate. Direct messages and files shared here are not shown to people outside this area.'}</p>
             </div>
         );
     }
diff --git a/web/react/components/rhs_root_post.jsx b/web/react/components/rhs_root_post.jsx
index 86620a499..e661bdce1 100644
--- a/web/react/components/rhs_root_post.jsx
+++ b/web/react/components/rhs_root_post.jsx
@@ -53,7 +53,7 @@ export default class RhsRootPost extends React.Component {
         var channelName;
         if (channel) {
             if (channel.type === 'D') {
-                channelName = 'Private Message';
+                channelName = 'Direct Message';
             } else {
                 channelName = channel.display_name;
             }
diff --git a/web/react/components/search_results_item.jsx b/web/react/components/search_results_item.jsx
index 0e951f5c6..32b521560 100644
--- a/web/react/components/search_results_item.jsx
+++ b/web/react/components/search_results_item.jsx
@@ -64,7 +64,7 @@ export default class SearchResultsItem extends React.Component {
         if (channel) {
             channelName = channel.display_name;
             if (channel.type === 'D') {
-                channelName = 'Private Message';
+                channelName = 'Direct Message';
             }
         }
 
diff --git a/web/react/components/sidebar.jsx b/web/react/components/sidebar.jsx
index 87007edcc..14664ed4d 100644
--- a/web/react/components/sidebar.jsx
+++ b/web/react/components/sidebar.jsx
@@ -566,7 +566,7 @@ export default class Sidebar extends React.Component {
                         {privateChannelItems}
                     </ul>
                     <ul className='nav nav-pills nav-stacked'>
-                        <li><h4>Private Messages</h4></li>
+                        <li><h4>Direct Messages</h4></li>
                         {directMessageItems}
                         {directMessageMore}
                     </ul>
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>
             );