diff --git a/app/soapbox/features/public_timeline/index.js b/app/soapbox/features/public_timeline/index.js index 1cf8f5ce1..9173274fb 100644 --- a/app/soapbox/features/public_timeline/index.js +++ b/app/soapbox/features/public_timeline/index.js @@ -6,18 +6,19 @@ import StatusListContainer from '../ui/containers/status_list_container'; import Column from '../../components/column'; import ColumnSettingsContainer from './containers/column_settings_container'; import HomeColumnHeader from '../../components/home_column_header'; -import ExplanationBox from '../ui/components/explanation_box'; +import Accordion from 'soapbox/features/ui/components/accordion'; import { expandPublicTimeline } from '../../actions/timelines'; import { connectPublicStream } from '../../actions/streaming'; import { Link } from 'react-router-dom'; -import { getSettings } from 'soapbox/actions/settings'; +import { changeSetting, getSettings } from 'soapbox/actions/settings'; const messages = defineMessages({ title: { id: 'column.public', defaultMessage: 'Federated timeline' }, }); const mapStateToProps = state => { - const onlyMedia = getSettings(state).getIn(['public', 'other', 'onlyMedia']); + const settings = getSettings(state); + const onlyMedia = settings.getIn(['public', 'other', 'onlyMedia']); const timelineId = 'public'; @@ -26,6 +27,7 @@ const mapStateToProps = state => { onlyMedia, hasUnread: state.getIn(['timelines', `${timelineId}${onlyMedia ? ':media' : ''}`, 'unread']) > 0, siteTitle: state.getIn(['instance', 'title']), + explanationBoxExpanded: settings.get('explanationBox'), }; }; @@ -44,6 +46,7 @@ class CommunityTimeline extends React.PureComponent { onlyMedia: PropTypes.bool, timelineId: PropTypes.string, siteTitle: PropTypes.string, + explanationBoxExpanded: PropTypes.bool, }; componentDidMount() { @@ -69,23 +72,48 @@ class CommunityTimeline extends React.PureComponent { } } + toggleExplanationBox = (setting) => { + this.props.dispatch(changeSetting(['explanationBox'], setting)); + } + handleLoadMore = maxId => { const { dispatch, onlyMedia } = this.props; dispatch(expandPublicTimeline({ maxId, onlyMedia })); } render() { - const { intl, hasUnread, onlyMedia, timelineId, siteTitle } = this.props; + const { intl, hasUnread, onlyMedia, timelineId, siteTitle, explanationBoxExpanded } = this.props; return ( - } - explanation={ }} />} - /> +
+ } + content={( + + + + ), + }} + /> + )} + expanded={explanationBoxExpanded} + onToggle={this.toggleExplanationBox} + /> +
this.setState({ jsonEditorExpanded: value }); + componentDidUpdate(prevProps, prevState) { if (prevProps.soapbox !== this.props.soapbox) { this.putConfig(this.props.soapbox); @@ -202,7 +204,7 @@ class SoapboxConfig extends ImmutablePureComponent { /> -
+ {/*
@@ -214,7 +216,7 @@ class SoapboxConfig extends ImmutablePureComponent { onChange={this.handleFileChange(['banner'])} />
-
+ */}
@@ -226,7 +228,7 @@ class SoapboxConfig extends ImmutablePureComponent { />
- + {/* } hint={} @@ -236,7 +238,7 @@ class SoapboxConfig extends ImmutablePureComponent { ['extensions', 'patron', 'enabled'], (e) => e.checked, )} /> - + */} */} - -
- -
-
+ + + + )} + expanded={this.state.jsonEditorExpanded} + onToggle={this.toggleJSONEditor} + />
+
+ {content} +
+
+ ); + } + +} diff --git a/app/soapbox/features/ui/components/explanation_box.js b/app/soapbox/features/ui/components/explanation_box.js deleted file mode 100644 index f3d84a4f0..000000000 --- a/app/soapbox/features/ui/components/explanation_box.js +++ /dev/null @@ -1,67 +0,0 @@ -import React from 'react'; -import PropTypes from 'prop-types'; -import ImmutablePropTypes from 'react-immutable-proptypes'; -import { connect } from 'react-redux'; -import { defineMessages, injectIntl } from 'react-intl'; -import IconButton from 'soapbox/components/icon_button'; -import { changeSetting, getSettings } from 'soapbox/actions/settings'; - - -const messages = defineMessages({ - collapse: { id: 'explanation_box.collapse', defaultMessage: 'Collapse explanation box' }, - expand: { id: 'explanation_box.expand', defaultMessage: 'Expand explanation box' }, -}); - -const mapStateToProps = state => { - return { - settings: getSettings(state), - }; -}; - -const mapDispatchToProps = (dispatch) => ({ - toggleExplanationBox(setting) { - dispatch(changeSetting(['explanationBox'], setting)); - }, -}); - -export default @connect(mapStateToProps, mapDispatchToProps) -@injectIntl -class ExplanationBox extends React.PureComponent { - - static propTypes = { - title: PropTypes.oneOfType([PropTypes.string, PropTypes.element]), - explanation: PropTypes.oneOfType([PropTypes.string, PropTypes.element]), - dismissable: PropTypes.bool, - intl: PropTypes.object.isRequired, - settings: ImmutablePropTypes.map.isRequired, - toggleExplanationBox: PropTypes.func, - }; - - handleToggleExplanationBox = () => { - this.props.toggleExplanationBox(this.props.settings.get('explanationBox') === true ? false : true); - } - - render() { - const { title, explanation, dismissable, settings, intl } = this.props; - - return ( -
- {title &&
{title} - -
} - {settings.get('explanationBox') && -
- {explanation} - {dismissable && Dismiss} -
- } -
- ); - } - -} diff --git a/app/soapbox/locales/ar.json b/app/soapbox/locales/ar.json index c85ec3160..420904136 100644 --- a/app/soapbox/locales/ar.json +++ b/app/soapbox/locales/ar.json @@ -504,8 +504,8 @@ "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Icon", "soapbox_config.promo_panel.meta_fields.label_placeholder": "Label", "soapbox_config.promo_panel.meta_fields.url_placeholder": "URL", - "soapbox_config.raw_json_hint": "Advanced: Edit the settings data directly.", - "soapbox_config.raw_json_label": "Raw JSON data", + "soapbox_config.raw_json_hint": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.", + "soapbox_config.raw_json_label": "Advanced: Edit raw JSON data", "soapbox_config.save": "Save", "status.admin_account": "افتح الواجهة الإدارية لـ @{name}", "status.admin_status": "افتح هذا المنشور على واجهة الإشراف", diff --git a/app/soapbox/locales/ast.json b/app/soapbox/locales/ast.json index 136587af9..5aef01e25 100644 --- a/app/soapbox/locales/ast.json +++ b/app/soapbox/locales/ast.json @@ -504,8 +504,8 @@ "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Icon", "soapbox_config.promo_panel.meta_fields.label_placeholder": "Label", "soapbox_config.promo_panel.meta_fields.url_placeholder": "URL", - "soapbox_config.raw_json_hint": "Advanced: Edit the settings data directly.", - "soapbox_config.raw_json_label": "Raw JSON data", + "soapbox_config.raw_json_hint": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.", + "soapbox_config.raw_json_label": "Advanced: Edit raw JSON data", "soapbox_config.save": "Save", "status.admin_account": "Open moderation interface for @{name}", "status.admin_status": "Open this post in the moderation interface", diff --git a/app/soapbox/locales/bg.json b/app/soapbox/locales/bg.json index 0384c7b00..fefe4bb47 100644 --- a/app/soapbox/locales/bg.json +++ b/app/soapbox/locales/bg.json @@ -504,8 +504,8 @@ "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Icon", "soapbox_config.promo_panel.meta_fields.label_placeholder": "Label", "soapbox_config.promo_panel.meta_fields.url_placeholder": "URL", - "soapbox_config.raw_json_hint": "Advanced: Edit the settings data directly.", - "soapbox_config.raw_json_label": "Raw JSON data", + "soapbox_config.raw_json_hint": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.", + "soapbox_config.raw_json_label": "Advanced: Edit raw JSON data", "soapbox_config.save": "Save", "status.admin_account": "Open moderation interface for @{name}", "status.admin_status": "Open this post in the moderation interface", diff --git a/app/soapbox/locales/bn.json b/app/soapbox/locales/bn.json index 00f2fbec4..bbed25e85 100644 --- a/app/soapbox/locales/bn.json +++ b/app/soapbox/locales/bn.json @@ -504,8 +504,8 @@ "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Icon", "soapbox_config.promo_panel.meta_fields.label_placeholder": "Label", "soapbox_config.promo_panel.meta_fields.url_placeholder": "URL", - "soapbox_config.raw_json_hint": "Advanced: Edit the settings data directly.", - "soapbox_config.raw_json_label": "Raw JSON data", + "soapbox_config.raw_json_hint": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.", + "soapbox_config.raw_json_label": "Advanced: Edit raw JSON data", "soapbox_config.save": "Save", "status.admin_account": "@{name} র জন্য পরিচালনার ইন্টারফেসে ঢুকুন", "status.admin_status": "যায় লেখাটি পরিচালনার ইন্টারফেসে খুলুন", diff --git a/app/soapbox/locales/br.json b/app/soapbox/locales/br.json index 729a0ef8e..71535b4e3 100644 --- a/app/soapbox/locales/br.json +++ b/app/soapbox/locales/br.json @@ -504,8 +504,8 @@ "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Icon", "soapbox_config.promo_panel.meta_fields.label_placeholder": "Label", "soapbox_config.promo_panel.meta_fields.url_placeholder": "URL", - "soapbox_config.raw_json_hint": "Advanced: Edit the settings data directly.", - "soapbox_config.raw_json_label": "Raw JSON data", + "soapbox_config.raw_json_hint": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.", + "soapbox_config.raw_json_label": "Advanced: Edit raw JSON data", "soapbox_config.save": "Save", "status.admin_account": "Open moderation interface for @{name}", "status.admin_status": "Open this post in the moderation interface", diff --git a/app/soapbox/locales/ca.json b/app/soapbox/locales/ca.json index b4cee2c22..7a60fdc4e 100644 --- a/app/soapbox/locales/ca.json +++ b/app/soapbox/locales/ca.json @@ -504,8 +504,8 @@ "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Icon", "soapbox_config.promo_panel.meta_fields.label_placeholder": "Label", "soapbox_config.promo_panel.meta_fields.url_placeholder": "URL", - "soapbox_config.raw_json_hint": "Advanced: Edit the settings data directly.", - "soapbox_config.raw_json_label": "Raw JSON data", + "soapbox_config.raw_json_hint": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.", + "soapbox_config.raw_json_label": "Advanced: Edit raw JSON data", "soapbox_config.save": "Save", "status.admin_account": "Obre l'interfície de moderació per a @{name}", "status.admin_status": "Obre aquest toot a la interfície de moderació", diff --git a/app/soapbox/locales/co.json b/app/soapbox/locales/co.json index 10ab6a686..12c533f16 100644 --- a/app/soapbox/locales/co.json +++ b/app/soapbox/locales/co.json @@ -504,8 +504,8 @@ "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Icon", "soapbox_config.promo_panel.meta_fields.label_placeholder": "Label", "soapbox_config.promo_panel.meta_fields.url_placeholder": "URL", - "soapbox_config.raw_json_hint": "Advanced: Edit the settings data directly.", - "soapbox_config.raw_json_label": "Raw JSON data", + "soapbox_config.raw_json_hint": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.", + "soapbox_config.raw_json_label": "Advanced: Edit raw JSON data", "soapbox_config.save": "Save", "status.admin_account": "Apre l'interfaccia di muderazione per @{name}", "status.admin_status": "Apre stu statutu in l'interfaccia di muderazione", diff --git a/app/soapbox/locales/cs.json b/app/soapbox/locales/cs.json index b5bcbad8e..02a2983a6 100644 --- a/app/soapbox/locales/cs.json +++ b/app/soapbox/locales/cs.json @@ -504,8 +504,8 @@ "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Icon", "soapbox_config.promo_panel.meta_fields.label_placeholder": "Label", "soapbox_config.promo_panel.meta_fields.url_placeholder": "URL", - "soapbox_config.raw_json_hint": "Advanced: Edit the settings data directly.", - "soapbox_config.raw_json_label": "Raw JSON data", + "soapbox_config.raw_json_hint": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.", + "soapbox_config.raw_json_label": "Advanced: Edit raw JSON data", "soapbox_config.save": "Save", "status.admin_account": "Otevřít moderátorské rozhraní pro uživatele @{name}", "status.admin_status": "Otevřít tento toot v moderátorském rozhraní", diff --git a/app/soapbox/locales/cy.json b/app/soapbox/locales/cy.json index 1fa612045..d1067656d 100644 --- a/app/soapbox/locales/cy.json +++ b/app/soapbox/locales/cy.json @@ -504,8 +504,8 @@ "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Icon", "soapbox_config.promo_panel.meta_fields.label_placeholder": "Label", "soapbox_config.promo_panel.meta_fields.url_placeholder": "URL", - "soapbox_config.raw_json_hint": "Advanced: Edit the settings data directly.", - "soapbox_config.raw_json_label": "Raw JSON data", + "soapbox_config.raw_json_hint": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.", + "soapbox_config.raw_json_label": "Advanced: Edit raw JSON data", "soapbox_config.save": "Save", "status.admin_account": "Agor rhyngwyneb goruwchwylio ar gyfer @{name}", "status.admin_status": "Agor y tŵt yn y rhyngwyneb goruwchwylio", diff --git a/app/soapbox/locales/da.json b/app/soapbox/locales/da.json index b6b45f71a..f515ea170 100644 --- a/app/soapbox/locales/da.json +++ b/app/soapbox/locales/da.json @@ -504,8 +504,8 @@ "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Icon", "soapbox_config.promo_panel.meta_fields.label_placeholder": "Label", "soapbox_config.promo_panel.meta_fields.url_placeholder": "URL", - "soapbox_config.raw_json_hint": "Advanced: Edit the settings data directly.", - "soapbox_config.raw_json_label": "Raw JSON data", + "soapbox_config.raw_json_hint": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.", + "soapbox_config.raw_json_label": "Advanced: Edit raw JSON data", "soapbox_config.save": "Save", "status.admin_account": "Åben modereringsvisning for @{name}", "status.admin_status": "Åben denne status i modereringsvisningen", diff --git a/app/soapbox/locales/de.json b/app/soapbox/locales/de.json index d895ee5c1..a6134ba80 100644 --- a/app/soapbox/locales/de.json +++ b/app/soapbox/locales/de.json @@ -504,8 +504,8 @@ "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Icon", "soapbox_config.promo_panel.meta_fields.label_placeholder": "Label", "soapbox_config.promo_panel.meta_fields.url_placeholder": "URL", - "soapbox_config.raw_json_hint": "Advanced: Edit the settings data directly.", - "soapbox_config.raw_json_label": "Raw JSON data", + "soapbox_config.raw_json_hint": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.", + "soapbox_config.raw_json_label": "Advanced: Edit raw JSON data", "soapbox_config.save": "Save", "status.admin_account": "Öffne Moderationsoberfläche für @{name}", "status.admin_status": "Öffne Beitrag in der Moderationsoberfläche", diff --git a/app/soapbox/locales/defaultMessages.json b/app/soapbox/locales/defaultMessages.json index 5b313cd40..4b37348be 100644 --- a/app/soapbox/locales/defaultMessages.json +++ b/app/soapbox/locales/defaultMessages.json @@ -2845,11 +2845,11 @@ "id": "soapbox_config.custom_css.meta_fields.url_placeholder" }, { - "defaultMessage": "Raw JSON data", + "defaultMessage": "Advanced: Edit raw JSON data", "id": "soapbox_config.raw_json_label" }, { - "defaultMessage": "Advanced: Edit the settings data directly.", + "defaultMessage": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.", "id": "soapbox_config.raw_json_hint" }, { diff --git a/app/soapbox/locales/el.json b/app/soapbox/locales/el.json index 3fc83e00f..fa08863cf 100644 --- a/app/soapbox/locales/el.json +++ b/app/soapbox/locales/el.json @@ -504,8 +504,8 @@ "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Icon", "soapbox_config.promo_panel.meta_fields.label_placeholder": "Label", "soapbox_config.promo_panel.meta_fields.url_placeholder": "URL", - "soapbox_config.raw_json_hint": "Advanced: Edit the settings data directly.", - "soapbox_config.raw_json_label": "Raw JSON data", + "soapbox_config.raw_json_hint": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.", + "soapbox_config.raw_json_label": "Advanced: Edit raw JSON data", "soapbox_config.save": "Save", "status.admin_account": "Άνοιγμα λειτουργίας διαμεσολάβησης για τον/την @{name}", "status.admin_status": "Άνοιγμα αυτής της δημοσίευσης στη λειτουργία διαμεσολάβησης", diff --git a/app/soapbox/locales/en.json b/app/soapbox/locales/en.json index 7003f9bfe..fdfeffffd 100644 --- a/app/soapbox/locales/en.json +++ b/app/soapbox/locales/en.json @@ -504,8 +504,8 @@ "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Icon", "soapbox_config.promo_panel.meta_fields.label_placeholder": "Label", "soapbox_config.promo_panel.meta_fields.url_placeholder": "URL", - "soapbox_config.raw_json_hint": "Advanced: Edit the settings data directly.", - "soapbox_config.raw_json_label": "Raw JSON data", + "soapbox_config.raw_json_hint": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.", + "soapbox_config.raw_json_label": "Advanced: Edit raw JSON data", "soapbox_config.save": "Save", "status.admin_account": "Open moderation interface for @{name}", "status.admin_status": "Open this post in the moderation interface", diff --git a/app/soapbox/locales/eo.json b/app/soapbox/locales/eo.json index 7357fb6b9..46954d77e 100644 --- a/app/soapbox/locales/eo.json +++ b/app/soapbox/locales/eo.json @@ -504,8 +504,8 @@ "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Icon", "soapbox_config.promo_panel.meta_fields.label_placeholder": "Label", "soapbox_config.promo_panel.meta_fields.url_placeholder": "URL", - "soapbox_config.raw_json_hint": "Advanced: Edit the settings data directly.", - "soapbox_config.raw_json_label": "Raw JSON data", + "soapbox_config.raw_json_hint": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.", + "soapbox_config.raw_json_label": "Advanced: Edit raw JSON data", "soapbox_config.save": "Save", "status.admin_account": "Malfermi la kontrolan interfacon por @{name}", "status.admin_status": "Malfermi ĉi tiun mesaĝon en la kontrola interfaco", diff --git a/app/soapbox/locales/es-AR.json b/app/soapbox/locales/es-AR.json index c0c832026..a0eb0e956 100644 --- a/app/soapbox/locales/es-AR.json +++ b/app/soapbox/locales/es-AR.json @@ -504,8 +504,8 @@ "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Icon", "soapbox_config.promo_panel.meta_fields.label_placeholder": "Label", "soapbox_config.promo_panel.meta_fields.url_placeholder": "URL", - "soapbox_config.raw_json_hint": "Advanced: Edit the settings data directly.", - "soapbox_config.raw_json_label": "Raw JSON data", + "soapbox_config.raw_json_hint": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.", + "soapbox_config.raw_json_label": "Advanced: Edit raw JSON data", "soapbox_config.save": "Save", "status.admin_account": "Abrir interface de moderación para @{name}", "status.admin_status": "Abrir este estado en la interface de moderación", diff --git a/app/soapbox/locales/es.json b/app/soapbox/locales/es.json index 15580f2ab..acd93ba09 100644 --- a/app/soapbox/locales/es.json +++ b/app/soapbox/locales/es.json @@ -504,8 +504,8 @@ "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Icon", "soapbox_config.promo_panel.meta_fields.label_placeholder": "Label", "soapbox_config.promo_panel.meta_fields.url_placeholder": "URL", - "soapbox_config.raw_json_hint": "Advanced: Edit the settings data directly.", - "soapbox_config.raw_json_label": "Raw JSON data", + "soapbox_config.raw_json_hint": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.", + "soapbox_config.raw_json_label": "Advanced: Edit raw JSON data", "soapbox_config.save": "Save", "status.admin_account": "Abrir interfaz de moderación para @{name}", "status.admin_status": "Abrir este estado en la interfaz de moderación", diff --git a/app/soapbox/locales/et.json b/app/soapbox/locales/et.json index 507523b16..81e286dd1 100644 --- a/app/soapbox/locales/et.json +++ b/app/soapbox/locales/et.json @@ -504,8 +504,8 @@ "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Icon", "soapbox_config.promo_panel.meta_fields.label_placeholder": "Label", "soapbox_config.promo_panel.meta_fields.url_placeholder": "URL", - "soapbox_config.raw_json_hint": "Advanced: Edit the settings data directly.", - "soapbox_config.raw_json_label": "Raw JSON data", + "soapbox_config.raw_json_hint": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.", + "soapbox_config.raw_json_label": "Advanced: Edit raw JSON data", "soapbox_config.save": "Save", "status.admin_account": "Ava moderaatoriliides kasutajale @{name}", "status.admin_status": "Ava see staatus moderaatoriliites", diff --git a/app/soapbox/locales/eu.json b/app/soapbox/locales/eu.json index f0955c485..f5e0b03df 100644 --- a/app/soapbox/locales/eu.json +++ b/app/soapbox/locales/eu.json @@ -504,8 +504,8 @@ "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Icon", "soapbox_config.promo_panel.meta_fields.label_placeholder": "Label", "soapbox_config.promo_panel.meta_fields.url_placeholder": "URL", - "soapbox_config.raw_json_hint": "Advanced: Edit the settings data directly.", - "soapbox_config.raw_json_label": "Raw JSON data", + "soapbox_config.raw_json_hint": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.", + "soapbox_config.raw_json_label": "Advanced: Edit raw JSON data", "soapbox_config.save": "Save", "status.admin_account": "Ireki @{name} erabiltzailearen moderazio interfazea", "status.admin_status": "Ireki mezu hau moderazio interfazean", diff --git a/app/soapbox/locales/fa.json b/app/soapbox/locales/fa.json index fdd256dc0..61076f03e 100644 --- a/app/soapbox/locales/fa.json +++ b/app/soapbox/locales/fa.json @@ -504,8 +504,8 @@ "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Icon", "soapbox_config.promo_panel.meta_fields.label_placeholder": "Label", "soapbox_config.promo_panel.meta_fields.url_placeholder": "URL", - "soapbox_config.raw_json_hint": "Advanced: Edit the settings data directly.", - "soapbox_config.raw_json_label": "Raw JSON data", + "soapbox_config.raw_json_hint": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.", + "soapbox_config.raw_json_label": "Advanced: Edit raw JSON data", "soapbox_config.save": "Save", "status.admin_account": "محیط مدیریت مربوط به @{name} را باز کن", "status.admin_status": "این نوشته را در محیط مدیریت باز کن", diff --git a/app/soapbox/locales/fi.json b/app/soapbox/locales/fi.json index 2ddaebaac..9bf7a37e0 100644 --- a/app/soapbox/locales/fi.json +++ b/app/soapbox/locales/fi.json @@ -504,8 +504,8 @@ "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Icon", "soapbox_config.promo_panel.meta_fields.label_placeholder": "Label", "soapbox_config.promo_panel.meta_fields.url_placeholder": "URL", - "soapbox_config.raw_json_hint": "Advanced: Edit the settings data directly.", - "soapbox_config.raw_json_label": "Raw JSON data", + "soapbox_config.raw_json_hint": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.", + "soapbox_config.raw_json_label": "Advanced: Edit raw JSON data", "soapbox_config.save": "Save", "status.admin_account": "Avaa moderaattorinäkymä tilistä @{name}", "status.admin_status": "Avaa tilapäivitys moderaattorinäkymässä", diff --git a/app/soapbox/locales/fr.json b/app/soapbox/locales/fr.json index 667e783ad..8b0769eb3 100644 --- a/app/soapbox/locales/fr.json +++ b/app/soapbox/locales/fr.json @@ -504,8 +504,8 @@ "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Icon", "soapbox_config.promo_panel.meta_fields.label_placeholder": "Label", "soapbox_config.promo_panel.meta_fields.url_placeholder": "URL", - "soapbox_config.raw_json_hint": "Advanced: Edit the settings data directly.", - "soapbox_config.raw_json_label": "Raw JSON data", + "soapbox_config.raw_json_hint": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.", + "soapbox_config.raw_json_label": "Advanced: Edit raw JSON data", "soapbox_config.save": "Save", "status.admin_account": "Ouvrir l’interface de modération pour @{name}", "status.admin_status": "Ouvrir ce statut dans l’interface de modération", diff --git a/app/soapbox/locales/ga.json b/app/soapbox/locales/ga.json index ad44ad1b2..0a1965714 100644 --- a/app/soapbox/locales/ga.json +++ b/app/soapbox/locales/ga.json @@ -504,8 +504,8 @@ "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Icon", "soapbox_config.promo_panel.meta_fields.label_placeholder": "Label", "soapbox_config.promo_panel.meta_fields.url_placeholder": "URL", - "soapbox_config.raw_json_hint": "Advanced: Edit the settings data directly.", - "soapbox_config.raw_json_label": "Raw JSON data", + "soapbox_config.raw_json_hint": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.", + "soapbox_config.raw_json_label": "Advanced: Edit raw JSON data", "soapbox_config.save": "Save", "status.admin_account": "Open moderation interface for @{name}", "status.admin_status": "Open this post in the moderation interface", diff --git a/app/soapbox/locales/gl.json b/app/soapbox/locales/gl.json index 54ea94656..b27188cac 100644 --- a/app/soapbox/locales/gl.json +++ b/app/soapbox/locales/gl.json @@ -504,8 +504,8 @@ "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Icon", "soapbox_config.promo_panel.meta_fields.label_placeholder": "Label", "soapbox_config.promo_panel.meta_fields.url_placeholder": "URL", - "soapbox_config.raw_json_hint": "Advanced: Edit the settings data directly.", - "soapbox_config.raw_json_label": "Raw JSON data", + "soapbox_config.raw_json_hint": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.", + "soapbox_config.raw_json_label": "Advanced: Edit raw JSON data", "soapbox_config.save": "Save", "status.admin_account": "Abrir interface de moderación para @{name}", "status.admin_status": "Abrir este estado na interface de moderación", diff --git a/app/soapbox/locales/he.json b/app/soapbox/locales/he.json index 53be2e329..f29e47dc5 100644 --- a/app/soapbox/locales/he.json +++ b/app/soapbox/locales/he.json @@ -504,8 +504,8 @@ "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Icon", "soapbox_config.promo_panel.meta_fields.label_placeholder": "Label", "soapbox_config.promo_panel.meta_fields.url_placeholder": "URL", - "soapbox_config.raw_json_hint": "Advanced: Edit the settings data directly.", - "soapbox_config.raw_json_label": "Raw JSON data", + "soapbox_config.raw_json_hint": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.", + "soapbox_config.raw_json_label": "Advanced: Edit raw JSON data", "soapbox_config.save": "Save", "status.admin_account": "Open moderation interface for @{name}", "status.admin_status": "Open this post in the moderation interface", diff --git a/app/soapbox/locales/hi.json b/app/soapbox/locales/hi.json index 6f8664e23..95664d68c 100644 --- a/app/soapbox/locales/hi.json +++ b/app/soapbox/locales/hi.json @@ -504,8 +504,8 @@ "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Icon", "soapbox_config.promo_panel.meta_fields.label_placeholder": "Label", "soapbox_config.promo_panel.meta_fields.url_placeholder": "URL", - "soapbox_config.raw_json_hint": "Advanced: Edit the settings data directly.", - "soapbox_config.raw_json_label": "Raw JSON data", + "soapbox_config.raw_json_hint": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.", + "soapbox_config.raw_json_label": "Advanced: Edit raw JSON data", "soapbox_config.save": "Save", "status.admin_account": "Open moderation interface for @{name}", "status.admin_status": "Open this post in the moderation interface", diff --git a/app/soapbox/locales/hr.json b/app/soapbox/locales/hr.json index 1e8098c47..e446be168 100644 --- a/app/soapbox/locales/hr.json +++ b/app/soapbox/locales/hr.json @@ -504,8 +504,8 @@ "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Icon", "soapbox_config.promo_panel.meta_fields.label_placeholder": "Label", "soapbox_config.promo_panel.meta_fields.url_placeholder": "URL", - "soapbox_config.raw_json_hint": "Advanced: Edit the settings data directly.", - "soapbox_config.raw_json_label": "Raw JSON data", + "soapbox_config.raw_json_hint": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.", + "soapbox_config.raw_json_label": "Advanced: Edit raw JSON data", "soapbox_config.save": "Save", "status.admin_account": "Open moderation interface for @{name}", "status.admin_status": "Open this post in the moderation interface", diff --git a/app/soapbox/locales/hu.json b/app/soapbox/locales/hu.json index 4eea27c3f..1cda1ffc9 100644 --- a/app/soapbox/locales/hu.json +++ b/app/soapbox/locales/hu.json @@ -504,8 +504,8 @@ "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Icon", "soapbox_config.promo_panel.meta_fields.label_placeholder": "Label", "soapbox_config.promo_panel.meta_fields.url_placeholder": "URL", - "soapbox_config.raw_json_hint": "Advanced: Edit the settings data directly.", - "soapbox_config.raw_json_label": "Raw JSON data", + "soapbox_config.raw_json_hint": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.", + "soapbox_config.raw_json_label": "Advanced: Edit raw JSON data", "soapbox_config.save": "Save", "status.admin_account": "Moderáció megnyitása @{name} felhasználóhoz", "status.admin_status": "Tülk megnyitása moderációra", diff --git a/app/soapbox/locales/hy.json b/app/soapbox/locales/hy.json index 858304ff5..9a74cefaf 100644 --- a/app/soapbox/locales/hy.json +++ b/app/soapbox/locales/hy.json @@ -504,8 +504,8 @@ "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Icon", "soapbox_config.promo_panel.meta_fields.label_placeholder": "Label", "soapbox_config.promo_panel.meta_fields.url_placeholder": "URL", - "soapbox_config.raw_json_hint": "Advanced: Edit the settings data directly.", - "soapbox_config.raw_json_label": "Raw JSON data", + "soapbox_config.raw_json_hint": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.", + "soapbox_config.raw_json_label": "Advanced: Edit raw JSON data", "soapbox_config.save": "Save", "status.admin_account": "Open moderation interface for @{name}", "status.admin_status": "Open this post in the moderation interface", diff --git a/app/soapbox/locales/id.json b/app/soapbox/locales/id.json index 947b2a1fd..ca69e90a4 100644 --- a/app/soapbox/locales/id.json +++ b/app/soapbox/locales/id.json @@ -504,8 +504,8 @@ "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Icon", "soapbox_config.promo_panel.meta_fields.label_placeholder": "Label", "soapbox_config.promo_panel.meta_fields.url_placeholder": "URL", - "soapbox_config.raw_json_hint": "Advanced: Edit the settings data directly.", - "soapbox_config.raw_json_label": "Raw JSON data", + "soapbox_config.raw_json_hint": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.", + "soapbox_config.raw_json_label": "Advanced: Edit raw JSON data", "soapbox_config.save": "Save", "status.admin_account": "Open moderation interface for @{name}", "status.admin_status": "Open this post in the moderation interface", diff --git a/app/soapbox/locales/io.json b/app/soapbox/locales/io.json index be6a481fd..e92b221a0 100644 --- a/app/soapbox/locales/io.json +++ b/app/soapbox/locales/io.json @@ -504,8 +504,8 @@ "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Icon", "soapbox_config.promo_panel.meta_fields.label_placeholder": "Label", "soapbox_config.promo_panel.meta_fields.url_placeholder": "URL", - "soapbox_config.raw_json_hint": "Advanced: Edit the settings data directly.", - "soapbox_config.raw_json_label": "Raw JSON data", + "soapbox_config.raw_json_hint": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.", + "soapbox_config.raw_json_label": "Advanced: Edit raw JSON data", "soapbox_config.save": "Save", "status.admin_account": "Open moderation interface for @{name}", "status.admin_status": "Open this post in the moderation interface", diff --git a/app/soapbox/locales/it.json b/app/soapbox/locales/it.json index ed983f92f..6ff49fb2b 100644 --- a/app/soapbox/locales/it.json +++ b/app/soapbox/locales/it.json @@ -504,8 +504,8 @@ "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Icon", "soapbox_config.promo_panel.meta_fields.label_placeholder": "Label", "soapbox_config.promo_panel.meta_fields.url_placeholder": "URL", - "soapbox_config.raw_json_hint": "Advanced: Edit the settings data directly.", - "soapbox_config.raw_json_label": "Raw JSON data", + "soapbox_config.raw_json_hint": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.", + "soapbox_config.raw_json_label": "Advanced: Edit raw JSON data", "soapbox_config.save": "Save", "status.admin_account": "Apri interfaccia di moderazione per @{name}", "status.admin_status": "Apri questo status nell'interfaccia di moderazione", diff --git a/app/soapbox/locales/ja.json b/app/soapbox/locales/ja.json index a81eae9be..977e8dcfe 100644 --- a/app/soapbox/locales/ja.json +++ b/app/soapbox/locales/ja.json @@ -504,8 +504,8 @@ "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Icon", "soapbox_config.promo_panel.meta_fields.label_placeholder": "Label", "soapbox_config.promo_panel.meta_fields.url_placeholder": "URL", - "soapbox_config.raw_json_hint": "Advanced: Edit the settings data directly.", - "soapbox_config.raw_json_label": "Raw JSON data", + "soapbox_config.raw_json_hint": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.", + "soapbox_config.raw_json_label": "Advanced: Edit raw JSON data", "soapbox_config.save": "Save", "status.admin_account": "@{name} のモデレーション画面を開く", "status.admin_status": "このトゥートをモデレーション画面で開く", diff --git a/app/soapbox/locales/ka.json b/app/soapbox/locales/ka.json index 0f402aa18..ab638a646 100644 --- a/app/soapbox/locales/ka.json +++ b/app/soapbox/locales/ka.json @@ -504,8 +504,8 @@ "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Icon", "soapbox_config.promo_panel.meta_fields.label_placeholder": "Label", "soapbox_config.promo_panel.meta_fields.url_placeholder": "URL", - "soapbox_config.raw_json_hint": "Advanced: Edit the settings data directly.", - "soapbox_config.raw_json_label": "Raw JSON data", + "soapbox_config.raw_json_hint": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.", + "soapbox_config.raw_json_label": "Advanced: Edit raw JSON data", "soapbox_config.save": "Save", "status.admin_account": "Open moderation interface for @{name}", "status.admin_status": "Open this post in the moderation interface", diff --git a/app/soapbox/locales/kk.json b/app/soapbox/locales/kk.json index 0f13a01a2..38c8ef32b 100644 --- a/app/soapbox/locales/kk.json +++ b/app/soapbox/locales/kk.json @@ -504,8 +504,8 @@ "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Icon", "soapbox_config.promo_panel.meta_fields.label_placeholder": "Label", "soapbox_config.promo_panel.meta_fields.url_placeholder": "URL", - "soapbox_config.raw_json_hint": "Advanced: Edit the settings data directly.", - "soapbox_config.raw_json_label": "Raw JSON data", + "soapbox_config.raw_json_hint": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.", + "soapbox_config.raw_json_label": "Advanced: Edit raw JSON data", "soapbox_config.save": "Save", "status.admin_account": "@{name} үшін модерация интерфейсін аш", "status.admin_status": "Бұл жазбаны модерация интерфейсінде аш", diff --git a/app/soapbox/locales/ko.json b/app/soapbox/locales/ko.json index 05c42aef1..f4d3d3747 100644 --- a/app/soapbox/locales/ko.json +++ b/app/soapbox/locales/ko.json @@ -504,8 +504,8 @@ "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Icon", "soapbox_config.promo_panel.meta_fields.label_placeholder": "Label", "soapbox_config.promo_panel.meta_fields.url_placeholder": "URL", - "soapbox_config.raw_json_hint": "Advanced: Edit the settings data directly.", - "soapbox_config.raw_json_label": "Raw JSON data", + "soapbox_config.raw_json_hint": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.", + "soapbox_config.raw_json_label": "Advanced: Edit raw JSON data", "soapbox_config.save": "Save", "status.admin_account": "@{name}에 대한 모더레이션 인터페이스 열기", "status.admin_status": "모더레이션 인터페이스에서 이 게시물 열기", diff --git a/app/soapbox/locales/lt.json b/app/soapbox/locales/lt.json index 5d11fc863..32a8064d2 100644 --- a/app/soapbox/locales/lt.json +++ b/app/soapbox/locales/lt.json @@ -504,8 +504,8 @@ "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Icon", "soapbox_config.promo_panel.meta_fields.label_placeholder": "Label", "soapbox_config.promo_panel.meta_fields.url_placeholder": "URL", - "soapbox_config.raw_json_hint": "Advanced: Edit the settings data directly.", - "soapbox_config.raw_json_label": "Raw JSON data", + "soapbox_config.raw_json_hint": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.", + "soapbox_config.raw_json_label": "Advanced: Edit raw JSON data", "soapbox_config.save": "Save", "status.admin_account": "Open moderation interface for @{name}", "status.admin_status": "Open this post in the moderation interface", diff --git a/app/soapbox/locales/lv.json b/app/soapbox/locales/lv.json index 3ec93b2b0..c5e19c695 100644 --- a/app/soapbox/locales/lv.json +++ b/app/soapbox/locales/lv.json @@ -504,8 +504,8 @@ "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Icon", "soapbox_config.promo_panel.meta_fields.label_placeholder": "Label", "soapbox_config.promo_panel.meta_fields.url_placeholder": "URL", - "soapbox_config.raw_json_hint": "Advanced: Edit the settings data directly.", - "soapbox_config.raw_json_label": "Raw JSON data", + "soapbox_config.raw_json_hint": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.", + "soapbox_config.raw_json_label": "Advanced: Edit raw JSON data", "soapbox_config.save": "Save", "status.admin_account": "Open moderation interface for @{name}", "status.admin_status": "Open this post in the moderation interface", diff --git a/app/soapbox/locales/mk.json b/app/soapbox/locales/mk.json index f7fabd82e..25e4a696f 100644 --- a/app/soapbox/locales/mk.json +++ b/app/soapbox/locales/mk.json @@ -504,8 +504,8 @@ "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Icon", "soapbox_config.promo_panel.meta_fields.label_placeholder": "Label", "soapbox_config.promo_panel.meta_fields.url_placeholder": "URL", - "soapbox_config.raw_json_hint": "Advanced: Edit the settings data directly.", - "soapbox_config.raw_json_label": "Raw JSON data", + "soapbox_config.raw_json_hint": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.", + "soapbox_config.raw_json_label": "Advanced: Edit raw JSON data", "soapbox_config.save": "Save", "status.admin_account": "Open moderation interface for @{name}", "status.admin_status": "Open this post in the moderation interface", diff --git a/app/soapbox/locales/ms.json b/app/soapbox/locales/ms.json index 665e3785e..da929cc84 100644 --- a/app/soapbox/locales/ms.json +++ b/app/soapbox/locales/ms.json @@ -504,8 +504,8 @@ "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Icon", "soapbox_config.promo_panel.meta_fields.label_placeholder": "Label", "soapbox_config.promo_panel.meta_fields.url_placeholder": "URL", - "soapbox_config.raw_json_hint": "Advanced: Edit the settings data directly.", - "soapbox_config.raw_json_label": "Raw JSON data", + "soapbox_config.raw_json_hint": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.", + "soapbox_config.raw_json_label": "Advanced: Edit raw JSON data", "soapbox_config.save": "Save", "status.admin_account": "Open moderation interface for @{name}", "status.admin_status": "Open this post in the moderation interface", diff --git a/app/soapbox/locales/nl.json b/app/soapbox/locales/nl.json index e42ba4155..3f4dc569e 100644 --- a/app/soapbox/locales/nl.json +++ b/app/soapbox/locales/nl.json @@ -504,8 +504,8 @@ "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Icon", "soapbox_config.promo_panel.meta_fields.label_placeholder": "Label", "soapbox_config.promo_panel.meta_fields.url_placeholder": "URL", - "soapbox_config.raw_json_hint": "Advanced: Edit the settings data directly.", - "soapbox_config.raw_json_label": "Raw JSON data", + "soapbox_config.raw_json_hint": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.", + "soapbox_config.raw_json_label": "Advanced: Edit raw JSON data", "soapbox_config.save": "Save", "status.admin_account": "Moderatie-omgeving van @{name} openen", "status.admin_status": "Deze toot in de moderatie-omgeving openen", diff --git a/app/soapbox/locales/nn.json b/app/soapbox/locales/nn.json index 501bd9f0a..5478c9237 100644 --- a/app/soapbox/locales/nn.json +++ b/app/soapbox/locales/nn.json @@ -504,8 +504,8 @@ "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Icon", "soapbox_config.promo_panel.meta_fields.label_placeholder": "Label", "soapbox_config.promo_panel.meta_fields.url_placeholder": "URL", - "soapbox_config.raw_json_hint": "Advanced: Edit the settings data directly.", - "soapbox_config.raw_json_label": "Raw JSON data", + "soapbox_config.raw_json_hint": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.", + "soapbox_config.raw_json_label": "Advanced: Edit raw JSON data", "soapbox_config.save": "Save", "status.admin_account": "Open moderation interface for @{name}", "status.admin_status": "Open this post in the moderation interface", diff --git a/app/soapbox/locales/no.json b/app/soapbox/locales/no.json index 775f00bb2..43734061f 100644 --- a/app/soapbox/locales/no.json +++ b/app/soapbox/locales/no.json @@ -504,8 +504,8 @@ "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Icon", "soapbox_config.promo_panel.meta_fields.label_placeholder": "Label", "soapbox_config.promo_panel.meta_fields.url_placeholder": "URL", - "soapbox_config.raw_json_hint": "Advanced: Edit the settings data directly.", - "soapbox_config.raw_json_label": "Raw JSON data", + "soapbox_config.raw_json_hint": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.", + "soapbox_config.raw_json_label": "Advanced: Edit raw JSON data", "soapbox_config.save": "Save", "status.admin_account": "Open moderation interface for @{name}", "status.admin_status": "Open this post in the moderation interface", diff --git a/app/soapbox/locales/oc.json b/app/soapbox/locales/oc.json index 8b7056395..e6ca3cc03 100644 --- a/app/soapbox/locales/oc.json +++ b/app/soapbox/locales/oc.json @@ -504,8 +504,8 @@ "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Icon", "soapbox_config.promo_panel.meta_fields.label_placeholder": "Label", "soapbox_config.promo_panel.meta_fields.url_placeholder": "URL", - "soapbox_config.raw_json_hint": "Advanced: Edit the settings data directly.", - "soapbox_config.raw_json_label": "Raw JSON data", + "soapbox_config.raw_json_hint": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.", + "soapbox_config.raw_json_label": "Advanced: Edit raw JSON data", "soapbox_config.save": "Save", "status.admin_account": "Dobrir l’interfàcia de moderacion per @{name}", "status.admin_status": "Dobrir aqueste estatut dins l’interfàcia de moderacion", diff --git a/app/soapbox/locales/pl.json b/app/soapbox/locales/pl.json index 9b09236df..4b02801dd 100644 --- a/app/soapbox/locales/pl.json +++ b/app/soapbox/locales/pl.json @@ -504,8 +504,8 @@ "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Icon", "soapbox_config.promo_panel.meta_fields.label_placeholder": "Label", "soapbox_config.promo_panel.meta_fields.url_placeholder": "URL", - "soapbox_config.raw_json_hint": "Advanced: Edit the settings data directly.", - "soapbox_config.raw_json_label": "Raw JSON data", + "soapbox_config.raw_json_hint": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.", + "soapbox_config.raw_json_label": "Advanced: Edit raw JSON data", "soapbox_config.save": "Save", "status.admin_account": "Otwórz interfejs moderacyjny dla @{name}", "status.admin_status": "Otwórz ten wpis w interfejsie moderacyjnym", diff --git a/app/soapbox/locales/pt-BR.json b/app/soapbox/locales/pt-BR.json index cdafe104f..8247bfee7 100644 --- a/app/soapbox/locales/pt-BR.json +++ b/app/soapbox/locales/pt-BR.json @@ -504,8 +504,8 @@ "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Icon", "soapbox_config.promo_panel.meta_fields.label_placeholder": "Label", "soapbox_config.promo_panel.meta_fields.url_placeholder": "URL", - "soapbox_config.raw_json_hint": "Advanced: Edit the settings data directly.", - "soapbox_config.raw_json_label": "Raw JSON data", + "soapbox_config.raw_json_hint": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.", + "soapbox_config.raw_json_label": "Advanced: Edit raw JSON data", "soapbox_config.save": "Save", "status.admin_account": "Abrir interface de moderação para @{name}", "status.admin_status": "Abrir esse status na interface de moderação", diff --git a/app/soapbox/locales/pt.json b/app/soapbox/locales/pt.json index 461e962f6..4ca0b546e 100644 --- a/app/soapbox/locales/pt.json +++ b/app/soapbox/locales/pt.json @@ -504,8 +504,8 @@ "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Icon", "soapbox_config.promo_panel.meta_fields.label_placeholder": "Label", "soapbox_config.promo_panel.meta_fields.url_placeholder": "URL", - "soapbox_config.raw_json_hint": "Advanced: Edit the settings data directly.", - "soapbox_config.raw_json_label": "Raw JSON data", + "soapbox_config.raw_json_hint": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.", + "soapbox_config.raw_json_label": "Advanced: Edit raw JSON data", "soapbox_config.save": "Save", "status.admin_account": "Abrir a interface de moderação para @{name}", "status.admin_status": "Abrir esta publicação na interface de moderação", diff --git a/app/soapbox/locales/ro.json b/app/soapbox/locales/ro.json index 44d0a648c..d35ccf58d 100644 --- a/app/soapbox/locales/ro.json +++ b/app/soapbox/locales/ro.json @@ -504,8 +504,8 @@ "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Icon", "soapbox_config.promo_panel.meta_fields.label_placeholder": "Label", "soapbox_config.promo_panel.meta_fields.url_placeholder": "URL", - "soapbox_config.raw_json_hint": "Advanced: Edit the settings data directly.", - "soapbox_config.raw_json_label": "Raw JSON data", + "soapbox_config.raw_json_hint": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.", + "soapbox_config.raw_json_label": "Advanced: Edit raw JSON data", "soapbox_config.save": "Save", "status.admin_account": "Open moderation interface for @{name}", "status.admin_status": "Open this post in the moderation interface", diff --git a/app/soapbox/locales/ru.json b/app/soapbox/locales/ru.json index 72e08f475..07a97d193 100644 --- a/app/soapbox/locales/ru.json +++ b/app/soapbox/locales/ru.json @@ -504,8 +504,8 @@ "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Icon", "soapbox_config.promo_panel.meta_fields.label_placeholder": "Label", "soapbox_config.promo_panel.meta_fields.url_placeholder": "URL", - "soapbox_config.raw_json_hint": "Advanced: Edit the settings data directly.", - "soapbox_config.raw_json_label": "Raw JSON data", + "soapbox_config.raw_json_hint": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.", + "soapbox_config.raw_json_label": "Advanced: Edit raw JSON data", "soapbox_config.save": "Save", "status.admin_account": "Открыть интерфейс модератора для @{name}", "status.admin_status": "Открыть этот статус в интерфейсе модератора", diff --git a/app/soapbox/locales/sk.json b/app/soapbox/locales/sk.json index 0b8932353..a10f5dc8b 100644 --- a/app/soapbox/locales/sk.json +++ b/app/soapbox/locales/sk.json @@ -504,8 +504,8 @@ "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Icon", "soapbox_config.promo_panel.meta_fields.label_placeholder": "Label", "soapbox_config.promo_panel.meta_fields.url_placeholder": "URL", - "soapbox_config.raw_json_hint": "Advanced: Edit the settings data directly.", - "soapbox_config.raw_json_label": "Raw JSON data", + "soapbox_config.raw_json_hint": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.", + "soapbox_config.raw_json_label": "Advanced: Edit raw JSON data", "soapbox_config.save": "Save", "status.admin_account": "Otvor moderovacie rozhranie užívateľa @{name}", "status.admin_status": "Otvor tento príspevok v moderovacom rozhraní", diff --git a/app/soapbox/locales/sl.json b/app/soapbox/locales/sl.json index b7f1e1c1f..9f3789811 100644 --- a/app/soapbox/locales/sl.json +++ b/app/soapbox/locales/sl.json @@ -504,8 +504,8 @@ "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Icon", "soapbox_config.promo_panel.meta_fields.label_placeholder": "Label", "soapbox_config.promo_panel.meta_fields.url_placeholder": "URL", - "soapbox_config.raw_json_hint": "Advanced: Edit the settings data directly.", - "soapbox_config.raw_json_label": "Raw JSON data", + "soapbox_config.raw_json_hint": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.", + "soapbox_config.raw_json_label": "Advanced: Edit raw JSON data", "soapbox_config.save": "Save", "status.admin_account": "Odpri vmesnik za moderiranje za @{name}", "status.admin_status": "Odpri status v vmesniku za moderiranje", diff --git a/app/soapbox/locales/sq.json b/app/soapbox/locales/sq.json index 2843e032d..0de64d171 100644 --- a/app/soapbox/locales/sq.json +++ b/app/soapbox/locales/sq.json @@ -504,8 +504,8 @@ "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Icon", "soapbox_config.promo_panel.meta_fields.label_placeholder": "Label", "soapbox_config.promo_panel.meta_fields.url_placeholder": "URL", - "soapbox_config.raw_json_hint": "Advanced: Edit the settings data directly.", - "soapbox_config.raw_json_label": "Raw JSON data", + "soapbox_config.raw_json_hint": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.", + "soapbox_config.raw_json_label": "Advanced: Edit raw JSON data", "soapbox_config.save": "Save", "status.admin_account": "Hap ndërfaqe moderimi për @{name}", "status.admin_status": "Hape këtë gjendje te ndërfaqja e moderimit", diff --git a/app/soapbox/locales/sr-Latn.json b/app/soapbox/locales/sr-Latn.json index 0f597a79f..c4c38bc2f 100644 --- a/app/soapbox/locales/sr-Latn.json +++ b/app/soapbox/locales/sr-Latn.json @@ -504,8 +504,8 @@ "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Icon", "soapbox_config.promo_panel.meta_fields.label_placeholder": "Label", "soapbox_config.promo_panel.meta_fields.url_placeholder": "URL", - "soapbox_config.raw_json_hint": "Advanced: Edit the settings data directly.", - "soapbox_config.raw_json_label": "Raw JSON data", + "soapbox_config.raw_json_hint": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.", + "soapbox_config.raw_json_label": "Advanced: Edit raw JSON data", "soapbox_config.save": "Save", "status.admin_account": "Open moderation interface for @{name}", "status.admin_status": "Open this post in the moderation interface", diff --git a/app/soapbox/locales/sr.json b/app/soapbox/locales/sr.json index a2a01a9ee..376eba35f 100644 --- a/app/soapbox/locales/sr.json +++ b/app/soapbox/locales/sr.json @@ -504,8 +504,8 @@ "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Icon", "soapbox_config.promo_panel.meta_fields.label_placeholder": "Label", "soapbox_config.promo_panel.meta_fields.url_placeholder": "URL", - "soapbox_config.raw_json_hint": "Advanced: Edit the settings data directly.", - "soapbox_config.raw_json_label": "Raw JSON data", + "soapbox_config.raw_json_hint": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.", + "soapbox_config.raw_json_label": "Advanced: Edit raw JSON data", "soapbox_config.save": "Save", "status.admin_account": "Open moderation interface for @{name}", "status.admin_status": "Open this post in the moderation interface", diff --git a/app/soapbox/locales/sv.json b/app/soapbox/locales/sv.json index 165e8c2f5..960054f53 100644 --- a/app/soapbox/locales/sv.json +++ b/app/soapbox/locales/sv.json @@ -504,8 +504,8 @@ "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Icon", "soapbox_config.promo_panel.meta_fields.label_placeholder": "Label", "soapbox_config.promo_panel.meta_fields.url_placeholder": "URL", - "soapbox_config.raw_json_hint": "Advanced: Edit the settings data directly.", - "soapbox_config.raw_json_label": "Raw JSON data", + "soapbox_config.raw_json_hint": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.", + "soapbox_config.raw_json_label": "Advanced: Edit raw JSON data", "soapbox_config.save": "Save", "status.admin_account": "Öppet modereringsgränssnitt för @{name}", "status.admin_status": "Öppna denna status i modereringsgränssnittet", diff --git a/app/soapbox/locales/ta.json b/app/soapbox/locales/ta.json index eecb76d69..e023943f8 100644 --- a/app/soapbox/locales/ta.json +++ b/app/soapbox/locales/ta.json @@ -504,8 +504,8 @@ "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Icon", "soapbox_config.promo_panel.meta_fields.label_placeholder": "Label", "soapbox_config.promo_panel.meta_fields.url_placeholder": "URL", - "soapbox_config.raw_json_hint": "Advanced: Edit the settings data directly.", - "soapbox_config.raw_json_label": "Raw JSON data", + "soapbox_config.raw_json_hint": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.", + "soapbox_config.raw_json_label": "Advanced: Edit raw JSON data", "soapbox_config.save": "Save", "status.admin_account": "மிதமான இடைமுகத்தை திறக்க @{name}", "status.admin_status": "மிதமான இடைமுகத்தில் இந்த நிலையை திறக்கவும்", diff --git a/app/soapbox/locales/te.json b/app/soapbox/locales/te.json index ba2a3c790..a88dd5eca 100644 --- a/app/soapbox/locales/te.json +++ b/app/soapbox/locales/te.json @@ -504,8 +504,8 @@ "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Icon", "soapbox_config.promo_panel.meta_fields.label_placeholder": "Label", "soapbox_config.promo_panel.meta_fields.url_placeholder": "URL", - "soapbox_config.raw_json_hint": "Advanced: Edit the settings data directly.", - "soapbox_config.raw_json_label": "Raw JSON data", + "soapbox_config.raw_json_hint": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.", + "soapbox_config.raw_json_label": "Advanced: Edit raw JSON data", "soapbox_config.save": "Save", "status.admin_account": "@{name} కొరకు సమన్వయ వినిమయసీమను తెరువు", "status.admin_status": "సమన్వయ వినిమయసీమలో ఈ స్టేటస్ ను తెరవండి", diff --git a/app/soapbox/locales/th.json b/app/soapbox/locales/th.json index 183d954ac..09c5726a8 100644 --- a/app/soapbox/locales/th.json +++ b/app/soapbox/locales/th.json @@ -504,8 +504,8 @@ "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Icon", "soapbox_config.promo_panel.meta_fields.label_placeholder": "Label", "soapbox_config.promo_panel.meta_fields.url_placeholder": "URL", - "soapbox_config.raw_json_hint": "Advanced: Edit the settings data directly.", - "soapbox_config.raw_json_label": "Raw JSON data", + "soapbox_config.raw_json_hint": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.", + "soapbox_config.raw_json_label": "Advanced: Edit raw JSON data", "soapbox_config.save": "Save", "status.admin_account": "เปิดส่วนติดต่อการควบคุมสำหรับ @{name}", "status.admin_status": "เปิดสถานะนี้ในส่วนติดต่อการควบคุม", diff --git a/app/soapbox/locales/tr.json b/app/soapbox/locales/tr.json index 0a45724b4..6ee720a1d 100644 --- a/app/soapbox/locales/tr.json +++ b/app/soapbox/locales/tr.json @@ -504,8 +504,8 @@ "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Icon", "soapbox_config.promo_panel.meta_fields.label_placeholder": "Label", "soapbox_config.promo_panel.meta_fields.url_placeholder": "URL", - "soapbox_config.raw_json_hint": "Advanced: Edit the settings data directly.", - "soapbox_config.raw_json_label": "Raw JSON data", + "soapbox_config.raw_json_hint": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.", + "soapbox_config.raw_json_label": "Advanced: Edit raw JSON data", "soapbox_config.save": "Save", "status.admin_account": "@{name} için denetim arayüzünü açın", "status.admin_status": "Denetim arayüzünde bu durumu açın", diff --git a/app/soapbox/locales/uk.json b/app/soapbox/locales/uk.json index 63d8cc17b..30e8cb98c 100644 --- a/app/soapbox/locales/uk.json +++ b/app/soapbox/locales/uk.json @@ -504,8 +504,8 @@ "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Icon", "soapbox_config.promo_panel.meta_fields.label_placeholder": "Label", "soapbox_config.promo_panel.meta_fields.url_placeholder": "URL", - "soapbox_config.raw_json_hint": "Advanced: Edit the settings data directly.", - "soapbox_config.raw_json_label": "Raw JSON data", + "soapbox_config.raw_json_hint": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.", + "soapbox_config.raw_json_label": "Advanced: Edit raw JSON data", "soapbox_config.save": "Save", "status.admin_account": "Відкрити інтерфейс модерації для @{name}", "status.admin_status": "Відкрити цей статус в інтерфейсі модерації", diff --git a/app/soapbox/locales/zh-CN.json b/app/soapbox/locales/zh-CN.json index ef6dbd06b..7057e57f1 100644 --- a/app/soapbox/locales/zh-CN.json +++ b/app/soapbox/locales/zh-CN.json @@ -504,8 +504,8 @@ "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Icon", "soapbox_config.promo_panel.meta_fields.label_placeholder": "Label", "soapbox_config.promo_panel.meta_fields.url_placeholder": "URL", - "soapbox_config.raw_json_hint": "Advanced: Edit the settings data directly.", - "soapbox_config.raw_json_label": "Raw JSON data", + "soapbox_config.raw_json_hint": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.", + "soapbox_config.raw_json_label": "Advanced: Edit raw JSON data", "soapbox_config.save": "Save", "status.admin_account": "打开 @{name} 的管理界面", "status.admin_status": "打开这条嘟文的管理界面", diff --git a/app/soapbox/locales/zh-HK.json b/app/soapbox/locales/zh-HK.json index cb7e54d30..c6dc0dffc 100644 --- a/app/soapbox/locales/zh-HK.json +++ b/app/soapbox/locales/zh-HK.json @@ -504,8 +504,8 @@ "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Icon", "soapbox_config.promo_panel.meta_fields.label_placeholder": "Label", "soapbox_config.promo_panel.meta_fields.url_placeholder": "URL", - "soapbox_config.raw_json_hint": "Advanced: Edit the settings data directly.", - "soapbox_config.raw_json_label": "Raw JSON data", + "soapbox_config.raw_json_hint": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.", + "soapbox_config.raw_json_label": "Advanced: Edit raw JSON data", "soapbox_config.save": "Save", "status.admin_account": "Open moderation interface for @{name}", "status.admin_status": "Open this post in the moderation interface", diff --git a/app/soapbox/locales/zh-TW.json b/app/soapbox/locales/zh-TW.json index 8a345beaa..ede1192f2 100644 --- a/app/soapbox/locales/zh-TW.json +++ b/app/soapbox/locales/zh-TW.json @@ -504,8 +504,8 @@ "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Icon", "soapbox_config.promo_panel.meta_fields.label_placeholder": "Label", "soapbox_config.promo_panel.meta_fields.url_placeholder": "URL", - "soapbox_config.raw_json_hint": "Advanced: Edit the settings data directly.", - "soapbox_config.raw_json_label": "Raw JSON data", + "soapbox_config.raw_json_hint": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.", + "soapbox_config.raw_json_label": "Advanced: Edit raw JSON data", "soapbox_config.save": "Save", "status.admin_account": "開啟 @{name} 的管理介面", "status.admin_status": "在管理介面開啟此嘟文", diff --git a/app/styles/application.scss b/app/styles/application.scss index 2e00c036b..d5158761b 100644 --- a/app/styles/application.scss +++ b/app/styles/application.scss @@ -71,6 +71,7 @@ @import 'components/filters'; @import 'components/mfa_form'; @import 'components/snackbar'; +@import 'components/accordion'; // Holiday @import 'holiday/halloween'; diff --git a/app/styles/basics.scss b/app/styles/basics.scss index 4a5c8916b..621c7bbb2 100644 --- a/app/styles/basics.scss +++ b/app/styles/basics.scss @@ -159,33 +159,6 @@ body { color: #ffffff; } -.explanation-box { - color: var(--primary-text-color); - padding: 15px 20px; - font-size: 14px; - background-color: var(--brand-color--faint); - margin: 5px 20px; - border-radius: 8px; - - &__title { - font-weight: bold; - font-size: 16px; - } - - &__explanation { - margin-top: 1em; - } - - a { - color: var(--brand-color--hicontrast); - text-decoration: underline; - - &:hover { - text-decoration: none; - } - } -} - noscript { text-align: center; diff --git a/app/styles/components/accordion.scss b/app/styles/components/accordion.scss new file mode 100644 index 000000000..deeaa7708 --- /dev/null +++ b/app/styles/components/accordion.scss @@ -0,0 +1,62 @@ +.explanation-box { + margin: 5px 20px; +} + +.accordion { + color: var(--primary-text-color); + padding: 15px 20px; + font-size: 14px; + background-color: var(--brand-color--faint); + border-radius: 8px; + margin: 0; + + &__title { + font-weight: bold !important; + font-size: 16px !important; + background: transparent !important; + color: var(--primary-text-color) !important; + padding: 0 !important; + margin: 0 !important; + text-transform: none !important; + text-align: left !important; + display: flex !important; + color: var(--primary-text-color); + border: 0; + width: 100%; + + &::after { + content: ''; + display: block; + font-family: ForkAwesome; + font-size: 20px; + padding-left: 10px; + margin-left: auto; + } + } + + &__content { + height: 0; + overflow: hidden; + } + + &--expanded &__title { + margin-bottom: 10px !important; + + &::after { + content: ''; + } + } + + &--expanded &__content { + height: auto; + } + + a { + color: var(--brand-color--hicontrast); + text-decoration: underline; + + &:hover { + text-decoration: none; + } + } +} diff --git a/app/styles/forms.scss b/app/styles/forms.scss index 5025a5a43..8338f2af3 100644 --- a/app/styles/forms.scss +++ b/app/styles/forms.scss @@ -426,6 +426,28 @@ code { background-color: darken($error-value-color, 5%); } } + + &.accordion__toggle { + display: inline-block; + width: auto; + border: 0; + border-radius: 0; + background: none; + color: var(--primary-text-color--faint); + font-size: 18px; + line-height: inherit; + height: auto; + padding: 0 10px; + text-transform: none; + text-decoration: none; + text-align: center; + box-sizing: border-box; + cursor: pointer; + font-weight: 500; + outline: 0; + margin-bottom: 0; + margin-right: 10px; + } } select { @@ -657,14 +679,24 @@ code { max-height: 100px; } -.code-editor textarea { - font-family: monospace; - white-space: pre; -} +.code-editor { + textarea { + font-family: monospace; + white-space: pre; + } -.code-editor--invalid textarea { - border-color: $error-red !important; - color: $error-red; + &--invalid textarea { + border-color: $error-red !important; + color: $error-red; + } + + .input { + margin-bottom: 0; + } + + .hint { + margin-top: 10px; + } } .input .row .fa-times-circle {