techhub/mastodon
2
0
Fork 0
Code Activity

Rearrange posting defaults settings (#35896)

Browse Source
This commit is contained in:
Claire
2025-08-25 17:50:22 +02:00
committed by GitHub
parent 496370801a
commit 3c17ccab37
3 changed files with 32 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
app/views/settings/preferences/other/show.html.haml
View File

@@ -17,38 +17,36 @@
%h4= t 'preferences.posting_defaults'
.fields-row
.fields-group.fields-row__column.fields-row__column-6
= ff.input :default_privacy,
collection: Status.selectable_visibilities,
selected: current_user.setting_default_privacy,
hint: false,
include_blank: false,
label_method: ->(visibility) { safe_join([I18n.t("statuses.visibilities.#{visibility}"), I18n.t("statuses.visibilities.#{visibility}_long")], ' - ') },
label: I18n.t('simple_form.labels.defaults.setting_default_privacy'),
required: false,
wrapper: :with_label
.fields-group
= ff.input :default_privacy,
collection: Status.selectable_visibilities,
selected: current_user.setting_default_privacy,
hint: false,
include_blank: false,
label_method: ->(visibility) { safe_join([I18n.t("statuses.visibilities.#{visibility}"), I18n.t("statuses.visibilities.#{visibility}_long")], ' - ') },
label: I18n.t('simple_form.labels.defaults.setting_default_privacy'),
required: false,
wrapper: :with_label
.fields-group.fields-row__column.fields-row__column-6
= ff.input :default_language,
collection: [nil] + filterable_languages,
hint: false,
include_blank: false,
label_method: ->(locale) { locale.nil? ? I18n.t('statuses.default_language') : native_locale_name(locale) },
label: I18n.t('simple_form.labels.defaults.setting_default_language'),
required: false,
wrapper: :with_label
.fields-group
= ff.input :default_quote_policy,
collection: %w(public followers nobody),
include_blank: false,
label_method: ->(policy) { I18n.t("statuses.quote_policies.#{policy}") },
label: I18n.t('simple_form.labels.defaults.setting_default_quote_policy'),
hint: I18n.t('simple_form.hints.defaults.setting_default_quote_policy'),
required: false,
wrapper: :with_label
.fields-row
.fields-group.fields-row__column.fields-row__column-6
= ff.input :default_quote_policy,
collection: %w(public followers nobody),
include_blank: false,
label_method: ->(policy) { I18n.t("statuses.quote_policies.#{policy}") },
label: I18n.t('simple_form.labels.defaults.setting_default_quote_policy'),
hint: I18n.t('simple_form.hints.defaults.setting_default_quote_policy'),
required: false,
wrapper: :with_label
.fields-group
= ff.input :default_language,
collection: [nil] + filterable_languages,
hint: false,
include_blank: false,
label_method: ->(locale) { locale.nil? ? I18n.t('statuses.default_language') : native_locale_name(locale) },
label: I18n.t('simple_form.labels.defaults.setting_default_language'),
required: false,
wrapper: :with_label
.fields-group
= ff.input :default_sensitive,