From 0267d520dd6227bff5ed5e9a39e4162cc63d92c3 Mon Sep 17 00:00:00 2001
From: David Lu <david.lu@hotmail.com>
Date: Mon, 27 Jun 2016 07:48:48 -0400
Subject: [PATCH] changed edit header title for DM channels (#3415)

---
 .../components/edit_channel_header_modal.jsx  | 28 ++++++++++++++-----
 webapp/i18n/en.json                           |  1 +
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/webapp/components/edit_channel_header_modal.jsx b/webapp/components/edit_channel_header_modal.jsx
index ea411357d1..d7ef1d81fc 100644
--- a/webapp/components/edit_channel_header_modal.jsx
+++ b/webapp/components/edit_channel_header_modal.jsx
@@ -129,6 +129,26 @@ class EditChannelHeaderModal extends React.Component {
             serverError = <div className='form-group has-error'><br/><label className='control-label'>{this.state.serverError}</label></div>;
         }
 
+        let headerTitle = null;
+        if (this.props.channel.type === Constants.DM_CHANNEL) {
+            headerTitle = (
+                <FormattedMessage
+                    id='edit_channel_header_modal.title_dm'
+                    defaultMessage='Edit Header'
+                />
+            );
+        } else {
+            headerTitle = (
+                <FormattedMessage
+                    id='edit_channel_header_modal.title'
+                    defaultMessage='Edit Header for {channel}'
+                    values={{
+                        channel: this.props.channel.display_name
+                    }}
+                />
+            );
+        }
+
         return (
             <Modal
                 show={this.props.show}
@@ -136,13 +156,7 @@ class EditChannelHeaderModal extends React.Component {
             >
                 <Modal.Header closeButton={true}>
                     <Modal.Title>
-                        <FormattedMessage
-                            id='edit_channel_header_modal.title'
-                            defaultMessage='Edit Header for {channel}'
-                            values={{
-                                channel: this.props.channel.display_name
-                            }}
-                        />
+                        {headerTitle}
                     </Modal.Title>
                 </Modal.Header>
                 <Modal.Body>
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 419721fb94..fcaf3e9e64 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -865,6 +865,7 @@
   "edit_channel_header_modal.error": "This channel header is too long, please enter a shorter one",
   "edit_channel_header_modal.save": "Save",
   "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 {type} should be used. This text appears in the channel list in the \"More...\" menu and helps others decide whether to join.",
   "edit_channel_purpose_modal.cancel": "Cancel",
   "edit_channel_purpose_modal.channel": "Channel",