Merge pull request #344 from nickago/MM-1646

MM-1646 Changes the word channel to group for priavte groups

web/react/components/channel_header.jsx

@@ -175,6 +175,11 @@ module.exports = React.createClass({
             }
         }
 
+        var channelTerm = 'Channel';
+        if (channel.type === 'P') {
+            channelTerm = 'Group';
+        }
+
         return (
             <table className='channel-header alt'>
                 <tr>
@@ -196,18 +201,18 @@ module.exports = React.createClass({
                                         <li role='presentation'><a role='menuitem' data-toggle='modal' data-target='#channel_members' href='#'>Manage Members</a></li>
                                         : null
                                     }
-                                    <li role='presentation'><a role='menuitem' href='#' data-toggle='modal' data-target='#edit_channel' data-desc={channel.description} data-title={channel.display_name} data-channelid={channel.id}>Set Channel Description...</a></li>
+                                    <li role='presentation'><a role='menuitem' href='#' data-toggle='modal' data-target='#edit_channel' data-desc={channel.description} data-title={channel.display_name} data-channelid={channel.id}>Set {channelTerm} Description...</a></li>
                                     <li role='presentation'><a role='menuitem' href='#' data-toggle='modal' data-target='#channel_notifications' data-title={channel.display_name} data-channelid={channel.id}>Notification Preferences</a></li>
                                     {isAdmin && !ChannelStore.isDefault(channel) ?
-                                        <li role='presentation'><a role='menuitem' href='#' data-toggle='modal' data-target='#rename_channel' data-display={channel.display_name} data-name={channel.name} data-channelid={channel.id}>Rename Channel...</a></li>
+                                        <li role='presentation'><a role='menuitem' href='#' data-toggle='modal' data-target='#rename_channel' data-display={channel.display_name} data-name={channel.name} data-channelid={channel.id}>Rename {channelTerm}...</a></li>
                                         : null
                                     }
                                     {isAdmin && !ChannelStore.isDefault(channel) ?
-                                        <li role='presentation'><a role='menuitem' href='#' data-toggle='modal' data-target='#delete_channel' data-title={channel.display_name} data-channelid={channel.id}>Delete Channel...</a></li>
+                                        <li role='presentation'><a role='menuitem' href='#' data-toggle='modal' data-target='#delete_channel' data-title={channel.display_name} data-channelid={channel.id}>Delete {channelTerm}...</a></li>
                                         : null
                                     }
                                     {!ChannelStore.isDefault(channel) ?
-                                        <li role='presentation'><a role='menuitem' href='#' onClick={this.handleLeave}>Leave Channel</a></li>
+                                        <li role='presentation'><a role='menuitem' href='#' onClick={this.handleLeave}>Leave {channelTerm}</a></li>
                                         : null
                                     }
                                 </ul>

web/react/components/new_channel.jsx

@@ -107,6 +107,11 @@ module.exports = React.createClass({
             serverError = <div className='form-group has-error'><label className='control-label'>{this.state.serverError}</label></div>;
         }
 
+        var channelTerm = 'Channel';
+        if (this.state.channelType === 'P') {
+            channelTerm = 'Group';
+        }
+
         return (
             <div className='modal fade' id='new_channel' ref='modal' tabIndex='-1' role='dialog' aria-hidden='true'>
                 <div className='modal-dialog'>
@@ -116,7 +121,7 @@ module.exports = React.createClass({
                                 <span aria-hidden='true'>&times;</span>
                                 <span className='sr-only'>Cancel</span>
                             </button>
-                            <h4 className='modal-title'>New Channel</h4>
+                            <h4 className='modal-title'>New {channelTerm}</h4>
                         </div>
                         <form role='form'>
                             <div className='modal-body'>