Skip to content

Commit

Permalink
Update 'Channel Display Mode' to 'Channel Display' (mattermost#2113)
Browse files Browse the repository at this point in the history
* Update en.json

* Update user_settings_display.jsx

* Update user_settings_display.test.jsx.snap

* fix snapshots
  • Loading branch information
jasonblais authored and lieut-data committed Nov 30, 2018
1 parent 9e34782 commit 12594f8
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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 {}}
/>
Expand Down Expand Up @@ -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 {}}
/>
Expand Down Expand Up @@ -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 {}}
/>
Expand Down Expand Up @@ -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 {}}
/>
Expand Down Expand Up @@ -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 {}}
/>
Expand Down Expand Up @@ -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 {}}
/>
Expand Down Expand Up @@ -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 {}}
/>
Expand Down Expand Up @@ -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 {}}
/>
Expand Down Expand Up @@ -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 {}}
/>
Expand Down Expand Up @@ -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 {}}
/>
Expand Down Expand Up @@ -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 {}}
/>
Expand Down Expand Up @@ -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 {}}
/>
Expand Down
4 changes: 2 additions & 2 deletions components/user_settings/display/user_settings_display.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -741,4 +741,4 @@ export default class UserSettingsDisplay extends React.Component {
</div>
);
}
}
}
2 changes: 1 addition & 1 deletion i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 12594f8

Please sign in to comment.