Merge 6059d79 into c105171

mattermost · Apr 18, 2017 · 8436dc9 · 8436dc9
2 parents c105171 + 6059d79
commit 8436dc9
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/webapp/components/edit_channel_purpose_modal.jsx b/webapp/components/edit_channel_purpose_modal.jsx
@@ -110,6 +110,21 @@ export default class EditChannelPurposeModal extends React.Component {
             );
         }
 
+        let channelPurposeModal = (
+            <FormattedMessage
+                id='edit_channel_purpose_modal.body'
+                defaultMessage='Describe how this channel should be used. This text appears in the channel list in the "More..." menu and helps others decide whether to join.'
+            />
+        );
+        if (this.props.channel.type === 'P') {
+            channelPurposeModal = (
+                <FormattedMessage
+                    id='edit_channel_private_purpose_modal.body'
+                    defaultMessage='This text appears in the \"View Info\" modal of the private channel.'
+                />
+            );
+        }
+
         return (
             <Modal
                 className='modal-edit-channel-purpose'
@@ -125,10 +140,7 @@ export default class EditChannelPurposeModal extends React.Component {
                 </Modal.Header>
                 <Modal.Body>
                     <p>
-                        <FormattedMessage
-                            id='edit_channel_purpose_modal.body'
-                            defaultMessage='Describe how this channel should be used. This text appears in the channel list in the "More..." menu and helps others decide whether to join.'
-                        />
+                        {channelPurposeModal}
                     </p>
                     <textarea
                         ref='purpose'

diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
@@ -1250,6 +1250,7 @@
   "edit_channel_header_modal.title": "Edit Header for {channel}",
   "edit_channel_header_modal.title_dm": "Edit Header",
   "edit_channel_purpose_modal.body": "Describe how this channel should be used. This text appears in the channel list in the \"More...\" menu and helps others decide whether to join.",
+  "edit_channel_private_purpose_modal.body": "This text appears in the \"View Info\" modal of the private channel.",
   "edit_channel_purpose_modal.cancel": "Cancel",
   "edit_channel_purpose_modal.error": "This channel purpose is too long, please enter a shorter one",
   "edit_channel_purpose_modal.save": "Save",