hamptonmoore
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Regroup CW unfolding settings in their own section

rebase/4.0.0rc1
Claire 2022-07-24 17:28:47 +02:00
parent 82f1e0945e
commit eacde1a130
1 changed files with 35 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
app/javascript/flavours/glitch/features/local_settings/page/index.js
View File

@ -312,38 +312,41 @@ class LocalSettingsPage extends React.PureComponent {
<FormattedMessage id='settings.content_warnings_media_outside' defaultMessage='Display media attachments outside content warnings' /> <FormattedMessage id='settings.content_warnings_media_outside' defaultMessage='Display media attachments outside content warnings' />
<span className='hint'><FormattedMessage id='settings.content_warnings_media_outside_hint' defaultMessage='Reproduce upstream Mastodon behavior by having the Content Warning toggle not affect media attachments' /></span> <span className='hint'><FormattedMessage id='settings.content_warnings_media_outside_hint' defaultMessage='Reproduce upstream Mastodon behavior by having the Content Warning toggle not affect media attachments' /></span>
</LocalSettingsPageItem> </LocalSettingsPageItem>
<DeprecatedLocalSettingsPageItem <section>
id='mastodon-settings--content_warnings-auto_unfold' <h2><FormattedMessage id='settings.content_warnings_unfold_opts' defaultMessage='Auto-unfolding options' /></h2>
value={expandSpoilers} <DeprecatedLocalSettingsPageItem
> id='mastodon-settings--content_warnings-auto_unfold'
<FormattedMessage id='settings.enable_content_warnings_auto_unfold' defaultMessage='Automatically unfold content-warnings' /> value={expandSpoilers}
<span className='hint'> >
<FormattedMessage <FormattedMessage id='settings.enable_content_warnings_auto_unfold' defaultMessage='Automatically unfold content-warnings' />
id='settings.deprecated_setting' <span className='hint'>
defaultMessage="This setting is now controlled from Mastodon's {settings_page_link}" <FormattedMessage
values={{ id='settings.deprecated_setting'
settings_page_link: ( defaultMessage="This setting is now controlled from Mastodon's {settings_page_link}"
<a href={preferenceLink('user_setting_expand_spoilers')}> values={{
<FormattedMessage settings_page_link: (
id='settings.shared_settings_link' <a href={preferenceLink('user_setting_expand_spoilers')}>
defaultMessage='user preferences' <FormattedMessage
/> id='settings.shared_settings_link'
</a> defaultMessage='user preferences'
) />
}} </a>
/> )
</span> }}
</DeprecatedLocalSettingsPageItem> />
<LocalSettingsPageItem </span>
settings={settings} </DeprecatedLocalSettingsPageItem>
item={['content_warnings', 'filter']} <LocalSettingsPageItem
id='mastodon-settings--content_warnings-auto_unfold' settings={settings}
onChange={onChange} item={['content_warnings', 'filter']}
placeholder={intl.formatMessage(messages.regexp)} id='mastodon-settings--content_warnings-auto_unfold'
disabled={!expandSpoilers} onChange={onChange}
> placeholder={intl.formatMessage(messages.regexp)}
<FormattedMessage id='settings.content_warnings_filter' defaultMessage='Content warnings to not automatically unfold:' /> disabled={!expandSpoilers}
</LocalSettingsPageItem> >
<FormattedMessage id='settings.content_warnings_filter' defaultMessage='Content warnings to not automatically unfold:' />
</LocalSettingsPageItem>
</section>
</div> </div>
), ),
({ intl, onChange, settings }) => ( ({ intl, onChange, settings }) => (