Merge branch 'add-preferences-clarification' into 'next'

Add hint to clarify Feed settings

See merge request soapbox-pub/soapbox-fe!1128
virtualized-window
Justin 3 years ago
commit 02d65a527c

@ -111,11 +111,17 @@ const Preferences = () => {
return (
<Form>
<List>
<ListItem label={<FormattedMessage id='home.column_settings.show_reblogs' defaultMessage='Show reTRUTHs' />}>
<ListItem
label={<FormattedMessage id='home.column_settings.show_reblogs' defaultMessage='Show reTRUTHs' />}
hint={<FormattedMessage id='preferences.hints.feed' defaultMessage='In your home feed' />}
>
<SettingToggle settings={settings} settingPath={['home', 'shows', 'reblog']} onChange={onToggleChange} />
</ListItem>
<ListItem label={<FormattedMessage id='home.column_settings.show_replies' defaultMessage='Show replies' />}>
<ListItem
label={<FormattedMessage id='home.column_settings.show_replies' defaultMessage='Show replies' />}
hint={<FormattedMessage id='preferences.hints.feed' defaultMessage='In your home feed' />}
>
<SettingToggle settings={settings} settingPath={['home', 'shows', 'reply']} onChange={onToggleChange} />
</ListItem>

@ -713,6 +713,7 @@
"preferences.fields.system_font_label": "Use system's default font",
"preferences.fields.underline_links_label": "Always underline links in posts",
"preferences.fields.unfollow_modal_label": "Show confirmation dialog before unfollowing someone",
"preferences.hints.feed": "In your home feed",
"preferences.hints.content_type_markdown": "Warning: experimental!",
"preferences.hints.demetricator": "Decrease social media anxiety by hiding all numbers from the site.",
"preferences.hints.halloween": "Beware: SPOOKY! Supports light/dark toggle.",

Loading…
Cancel
Save