From 12594f8eb1cf3d343587d1a553c4273523495182 Mon Sep 17 00:00:00 2001
From: Jason Blais <13119842+jasonblais@users.noreply.github.com>
Date: Fri, 30 Nov 2018 18:20:57 -0500
Subject: [PATCH] Update 'Channel Display Mode' to 'Channel Display' (#2113)

* Update en.json

* Update user_settings_display.jsx

* Update user_settings_display.test.jsx.snap

* fix snapshots
---
 .../user_settings_display.test.jsx.snap       | 24 +++++++++----------
 .../display/user_settings_display.jsx         |  4 ++--
 i18n/en.json                                  |  2 +-
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/components/user_settings/display/__snapshots__/user_settings_display.test.jsx.snap b/components/user_settings/display/__snapshots__/user_settings_display.test.jsx.snap
index 68f1ee903629..a71addab0cc9 100644
--- a/components/user_settings/display/__snapshots__/user_settings_display.test.jsx.snap
+++ b/components/user_settings/display/__snapshots__/user_settings_display.test.jsx.snap
@@ -209,7 +209,7 @@ exports[`components/user_settings/display/UserSettingsDisplay should match snaps
         submit={[Function]}
         title={
           <FormattedMessage
-            defaultMessage="Channel Display Mode"
+            defaultMessage="Channel Display"
             id="user.settings.display.channelDisplayTitle"
             values={Object {}}
           />
@@ -452,7 +452,7 @@ exports[`components/user_settings/display/UserSettingsDisplay should match snaps
         section="channel_display_mode"
         title={
           <FormattedMessage
-            defaultMessage="Channel Display Mode"
+            defaultMessage="Channel Display"
             id="user.settings.display.channelDisplayTitle"
             values={Object {}}
           />
@@ -695,7 +695,7 @@ exports[`components/user_settings/display/UserSettingsDisplay should match snaps
         section="channel_display_mode"
         title={
           <FormattedMessage
-            defaultMessage="Channel Display Mode"
+            defaultMessage="Channel Display"
             id="user.settings.display.channelDisplayTitle"
             values={Object {}}
           />
@@ -883,7 +883,7 @@ exports[`components/user_settings/display/UserSettingsDisplay should match snaps
         section="channel_display_mode"
         title={
           <FormattedMessage
-            defaultMessage="Channel Display Mode"
+            defaultMessage="Channel Display"
             id="user.settings.display.channelDisplayTitle"
             values={Object {}}
           />
@@ -1056,7 +1056,7 @@ exports[`components/user_settings/display/UserSettingsDisplay should match snaps
         section="channel_display_mode"
         title={
           <FormattedMessage
-            defaultMessage="Channel Display Mode"
+            defaultMessage="Channel Display"
             id="user.settings.display.channelDisplayTitle"
             values={Object {}}
           />
@@ -1299,7 +1299,7 @@ exports[`components/user_settings/display/UserSettingsDisplay should match snaps
         section="channel_display_mode"
         title={
           <FormattedMessage
-            defaultMessage="Channel Display Mode"
+            defaultMessage="Channel Display"
             id="user.settings.display.channelDisplayTitle"
             values={Object {}}
           />
@@ -1562,7 +1562,7 @@ exports[`components/user_settings/display/UserSettingsDisplay should match snaps
         section="channel_display_mode"
         title={
           <FormattedMessage
-            defaultMessage="Channel Display Mode"
+            defaultMessage="Channel Display"
             id="user.settings.display.channelDisplayTitle"
             values={Object {}}
           />
@@ -1750,7 +1750,7 @@ exports[`components/user_settings/display/UserSettingsDisplay should match snaps
         section="channel_display_mode"
         title={
           <FormattedMessage
-            defaultMessage="Channel Display Mode"
+            defaultMessage="Channel Display"
             id="user.settings.display.channelDisplayTitle"
             values={Object {}}
           />
@@ -1938,7 +1938,7 @@ exports[`components/user_settings/display/UserSettingsDisplay should match snaps
         section="channel_display_mode"
         title={
           <FormattedMessage
-            defaultMessage="Channel Display Mode"
+            defaultMessage="Channel Display"
             id="user.settings.display.channelDisplayTitle"
             values={Object {}}
           />
@@ -2126,7 +2126,7 @@ exports[`components/user_settings/display/UserSettingsDisplay should match snaps
         section="channel_display_mode"
         title={
           <FormattedMessage
-            defaultMessage="Channel Display Mode"
+            defaultMessage="Channel Display"
             id="user.settings.display.channelDisplayTitle"
             values={Object {}}
           />
@@ -2325,7 +2325,7 @@ exports[`components/user_settings/display/UserSettingsDisplay should match snaps
         section="channel_display_mode"
         title={
           <FormattedMessage
-            defaultMessage="Channel Display Mode"
+            defaultMessage="Channel Display"
             id="user.settings.display.channelDisplayTitle"
             values={Object {}}
           />
@@ -2513,7 +2513,7 @@ exports[`components/user_settings/display/UserSettingsDisplay should match snaps
         section="channel_display_mode"
         title={
           <FormattedMessage
-            defaultMessage="Channel Display Mode"
+            defaultMessage="Channel Display"
             id="user.settings.display.channelDisplayTitle"
             values={Object {}}
           />
diff --git a/components/user_settings/display/user_settings_display.jsx b/components/user_settings/display/user_settings_display.jsx
index d61749a254f8..0c22ac8c86ed 100644
--- a/components/user_settings/display/user_settings_display.jsx
+++ b/components/user_settings/display/user_settings_display.jsx
@@ -601,7 +601,7 @@ export default class UserSettingsDisplay extends React.Component {
             defaultDisplay: Preferences.CHANNEL_DISPLAY_MODE_FULL_SCREEN,
             title: {
                 id: t('user.settings.display.channelDisplayTitle'),
-                message: 'Channel Display Mode',
+                message: 'Channel Display',
             },
             firstOption: {
                 value: Preferences.CHANNEL_DISPLAY_MODE_FULL_SCREEN,
@@ -741,4 +741,4 @@ export default class UserSettingsDisplay extends React.Component {
             </div>
         );
     }
-}
\ No newline at end of file
+}
diff --git a/i18n/en.json b/i18n/en.json
index 5b4042e2da92..8e20f7dd1f65 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -2728,7 +2728,7 @@
   "user.settings.custom_theme.sidebarTitle": "Sidebar Styles",
   "user.settings.custom_theme.sidebarUnreadText": "Sidebar Unread Text",
   "user.settings.display.channeldisplaymode": "Select the width of the center channel.",
-  "user.settings.display.channelDisplayTitle": "Channel Display Mode",
+  "user.settings.display.channelDisplayTitle": "Channel Display",
   "user.settings.display.clockDisplay": "Clock Display",
   "user.settings.display.collapseDesc": "Set whether previews of image links and image attachment thumbnails show as expanded or collapsed by default. This setting can also be controlled using the slash commands /expand and /collapse.",
   "user.settings.display.collapseDisplay": "Default appearance of image previews",