Skip to content
This repository has been archived by the owner on Mar 13, 2024. It is now read-only.

Update Image preview setting label and help text #1265

Merged
merged 3 commits into from
Jun 5, 2018
Merged

Update Image preview setting label and help text #1265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
04c413f
Update user_settings_display.jsx
May 29, 2018
802f4f8
Update en.json
May 29, 2018
cff0b27
update test snapshots
cpanato Jun 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions components/user_settings/display/user_settings_display.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ export default class UserSettingsDisplay extends React.Component {
defaultDisplay: 'false',
title: {
id: 'user.settings.display.collapseDisplay',
message: 'Default appearance of image link previews',
message: 'Default appearance of image previews',
},
firstOption: {
value: 'false',
Expand All @@ -386,7 +386,7 @@ export default class UserSettingsDisplay extends React.Component {
},
description: {
id: 'user.settings.display.collapseDesc',
message: 'Set whether previews of image links show as expanded or collapsed by default. This setting can also be controlled using the slash commands /expand and /collapse.',
message: '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.',
},
});

Expand Down
4 changes: 2 additions & 2 deletions i18n/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3061,8 +3061,8 @@
"user.settings.display.channelDisplayTitle": "Channel Display Mode",
"user.settings.display.channeldisplaymode": "Select the width of the center channel.",
"user.settings.display.clockDisplay": "Clock Display",
"user.settings.display.collapseDesc": "Set whether previews of image links 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 link previews",
"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",
"user.settings.display.collapseOff": "Collapsed",
"user.settings.display.collapseOn": "Expanded",
"user.settings.display.fixedWidthCentered": "Fixed width, centered",
Expand Down
26 changes: 13 additions & 13 deletions tests/components/user_settings/__snapshots__/user_settings_display.test.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ exports[`components/user_settings/display/UserSettingsDisplay should match snaps
section="collapse"
title={
<FormattedMessage
defaultMessage="Default appearance of image link previews"
defaultMessage="Default appearance of image previews"
id="user.settings.display.collapseDisplay"
values={Object {}}
/>
Expand Down Expand Up @@ -458,7 +458,7 @@ exports[`components/user_settings/display/UserSettingsDisplay should match snaps
section="collapse"
title={
<FormattedMessage
defaultMessage="Default appearance of image link previews"
defaultMessage="Default appearance of image previews"
id="user.settings.display.collapseDisplay"
values={Object {}}
/>
Expand Down Expand Up @@ -715,7 +715,7 @@ exports[`components/user_settings/display/UserSettingsDisplay should match snaps
<div>
<br />
<FormattedMessage
defaultMessage="Set whether previews of image links show as expanded or collapsed by default. This setting can also be controlled using the slash commands /expand and /collapse."
defaultMessage="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."
id="user.settings.display.collapseDesc"
values={Object {}}
/>
Expand All @@ -728,7 +728,7 @@ exports[`components/user_settings/display/UserSettingsDisplay should match snaps
submit={[Function]}
title={
<FormattedMessage
defaultMessage="Default appearance of image link previews"
defaultMessage="Default appearance of image previews"
id="user.settings.display.collapseDisplay"
values={Object {}}
/>
Expand Down Expand Up @@ -950,7 +950,7 @@ exports[`components/user_settings/display/UserSettingsDisplay should match snaps
section="collapse"
title={
<FormattedMessage
defaultMessage="Default appearance of image link previews"
defaultMessage="Default appearance of image previews"
id="user.settings.display.collapseDisplay"
values={Object {}}
/>
Expand Down Expand Up @@ -1150,7 +1150,7 @@ exports[`components/user_settings/display/UserSettingsDisplay should match snaps
section="collapse"
title={
<FormattedMessage
defaultMessage="Default appearance of image link previews"
defaultMessage="Default appearance of image previews"
id="user.settings.display.collapseDisplay"
values={Object {}}
/>
Expand Down Expand Up @@ -1420,7 +1420,7 @@ exports[`components/user_settings/display/UserSettingsDisplay should match snaps
section="collapse"
title={
<FormattedMessage
defaultMessage="Default appearance of image link previews"
defaultMessage="Default appearance of image previews"
id="user.settings.display.collapseDisplay"
values={Object {}}
/>
Expand Down Expand Up @@ -1642,7 +1642,7 @@ exports[`components/user_settings/display/UserSettingsDisplay should match snaps
section="collapse"
title={
<FormattedMessage
defaultMessage="Default appearance of image link previews"
defaultMessage="Default appearance of image previews"
id="user.settings.display.collapseDisplay"
values={Object {}}
/>
Expand Down Expand Up @@ -1932,7 +1932,7 @@ exports[`components/user_settings/display/UserSettingsDisplay should match snaps
section="collapse"
title={
<FormattedMessage
defaultMessage="Default appearance of image link previews"
defaultMessage="Default appearance of image previews"
id="user.settings.display.collapseDisplay"
values={Object {}}
/>
Expand Down Expand Up @@ -2154,7 +2154,7 @@ exports[`components/user_settings/display/UserSettingsDisplay should match snaps
section="collapse"
title={
<FormattedMessage
defaultMessage="Default appearance of image link previews"
defaultMessage="Default appearance of image previews"
id="user.settings.display.collapseDisplay"
values={Object {}}
/>
Expand Down Expand Up @@ -2376,7 +2376,7 @@ exports[`components/user_settings/display/UserSettingsDisplay should match snaps
section="collapse"
title={
<FormattedMessage
defaultMessage="Default appearance of image link previews"
defaultMessage="Default appearance of image previews"
id="user.settings.display.collapseDisplay"
values={Object {}}
/>
Expand Down Expand Up @@ -2609,7 +2609,7 @@ exports[`components/user_settings/display/UserSettingsDisplay should match snaps
section="collapse"
title={
<FormattedMessage
defaultMessage="Default appearance of image link previews"
defaultMessage="Default appearance of image previews"
id="user.settings.display.collapseDisplay"
values={Object {}}
/>
Expand Down Expand Up @@ -2831,7 +2831,7 @@ exports[`components/user_settings/display/UserSettingsDisplay should match snaps
section="collapse"
title={
<FormattedMessage
defaultMessage="Default appearance of image link previews"
defaultMessage="Default appearance of image previews"
id="user.settings.display.collapseDisplay"
values={Object {}}
/>
Expand Down