From 36c74d7b47253249ec83aedacf409a93de1d182f Mon Sep 17 00:00:00 2001
From: Harrison Healey <harrisonmhealey@gmail.com>
Date: Mon, 3 Apr 2017 08:42:05 -0400
Subject: PLT-5873 Renamed private groups to private channels (#5924)

* PLT-5873 Renamed private groups to private channels in web app

* PLT-5873 Renamed private groups to private channels in server
---
 webapp/components/new_channel_modal.jsx | 33 ++++++---------------------------
 1 file changed, 6 insertions(+), 27 deletions(-)

(limited to 'webapp/components/new_channel_modal.jsx')

diff --git a/webapp/components/new_channel_modal.jsx b/webapp/components/new_channel_modal.jsx
index f16b4596f..b515d5469 100644
--- a/webapp/components/new_channel_modal.jsx
+++ b/webapp/components/new_channel_modal.jsx
@@ -135,7 +135,7 @@ export default class NewChannelModal extends React.Component {
             >
                 <FormattedMessage
                     id='channel_modal.privateGroup2'
-                    defaultMessage='Create a private group'
+                    defaultMessage='Create a private channel'
                 />
             </a>
         );
@@ -151,33 +151,20 @@ export default class NewChannelModal extends React.Component {
             createPrivateChannelLink = null;
         }
 
-        var channelTerm = '';
         var channelSwitchText = '';
         switch (this.props.channelType) {
         case 'P':
-            channelTerm = (
-                <FormattedMessage
-                    id='channel_modal.group'
-                    defaultMessage='Group'
-                />
-            );
             channelSwitchText = (
                 <div className='modal-intro'>
                     <FormattedMessage
                         id='channel_modal.privateGroup1'
-                        defaultMessage='Create a new private group with restricted membership. '
+                        defaultMessage='Create a new private channel with restricted membership. '
                     />
                     {createPublicChannelLink}
                 </div>
             );
             break;
         case 'O':
-            channelTerm = (
-                <FormattedMessage
-                    id='channel_modal.channel'
-                    defaultMessage='Channel'
-                />
-            );
             channelSwitchText = (
                 <div className='modal-intro'>
                     <FormattedMessage
@@ -205,9 +192,8 @@ export default class NewChannelModal extends React.Component {
                         <Modal.Title>
                             <FormattedMessage
                                 id='channel_modal.modalTitle'
-                                defaultMessage='New '
+                                defaultMessage='New Channel'
                             />
-                            {channelTerm}
                         </Modal.Title>
                     </Modal.Header>
                     <form
@@ -282,10 +268,7 @@ export default class NewChannelModal extends React.Component {
                                     <p className='input__help'>
                                         <FormattedMessage
                                             id='channel_modal.descriptionHelp'
-                                            defaultMessage='Describe how this {term} should be used.'
-                                            values={{
-                                                term: (channelTerm)
-                                            }}
+                                            defaultMessage='Describe how this channel should be used.'
                                         />
                                     </p>
                                 </div>
@@ -319,10 +302,7 @@ export default class NewChannelModal extends React.Component {
                                     <p className='input__help'>
                                         <FormattedMessage
                                             id='channel_modal.headerHelp'
-                                            defaultMessage='Set text that will appear in the header of the {term} beside the {term} name. For example, include frequently used links by typing [Link Title](http://example.com).'
-                                            values={{
-                                                term: (channelTerm)
-                                            }}
+                                            defaultMessage='Set text that will appear in the header of the channel beside the channel name. For example, include frequently used links by typing [Link Title](http://example.com).'
                                         />
                                     </p>
                                     {serverError}
@@ -348,9 +328,8 @@ export default class NewChannelModal extends React.Component {
                             >
                                 <FormattedMessage
                                     id='channel_modal.createNew'
-                                    defaultMessage='Create New '
+                                    defaultMessage='Create New Channel'
                                 />
-                                {channelTerm}
                             </button>
                         </Modal.Footer>
                     </form>
-- 
cgit v1.2.3-1-g7c22