Merge remote-tracking branch 'parent/main' into upstream-20240319

This commit is contained in:
KMY 2024-03-19 09:15:20 +09:00
commit 76598bd542
496 changed files with 5795 additions and 3709 deletions

View file

@ -7,9 +7,19 @@
= simple_form_for @policy, url: statuses_cleanup_path, method: :put, html: { id: 'edit_policy' } do |f|
.fields-row
.fields-row__column.fields-row__column-6.fields-group
= f.input :enabled, as: :boolean, wrapper: :with_label, label: t('statuses_cleanup.enabled'), hint: t('statuses_cleanup.enabled_hint')
= f.input :enabled,
as: :boolean,
hint: t('statuses_cleanup.enabled_hint'),
label: t('statuses_cleanup.enabled'),
wrapper: :with_label
.fields-row__column.fields-row__column-6.fields-group
= f.input :min_status_age, wrapper: :with_label, label: t('statuses_cleanup.min_age_label'), collection: AccountStatusesCleanupPolicy::ALLOWED_MIN_STATUS_AGE.map(&:to_i), label_method: ->(i) { t("statuses_cleanup.min_age.#{i}") }, include_blank: false, hint: false
= f.input :min_status_age,
collection: AccountStatusesCleanupPolicy::ALLOWED_MIN_STATUS_AGE.map(&:to_i),
hint: false,
include_blank: false,
label_method: ->(i) { t("statuses_cleanup.min_age.#{i}") },
label: t('statuses_cleanup.min_age_label'),
wrapper: :with_label
.flash-message= t('statuses_cleanup.explanation')
@ -17,21 +27,39 @@
.fields-row
.fields-row__column.fields-row__column-6.fields-group
= f.input :keep_pinned, wrapper: :with_label, label: t('statuses_cleanup.keep_pinned'), hint: t('statuses_cleanup.keep_pinned_hint')
= f.input :keep_pinned,
hint: t('statuses_cleanup.keep_pinned_hint'),
label: t('statuses_cleanup.keep_pinned'),
wrapper: :with_label
.fields-row__column.fields-row__column-6.fields-group
= f.input :keep_direct, wrapper: :with_label, label: t('statuses_cleanup.keep_direct'), hint: t('statuses_cleanup.keep_direct_hint')
= f.input :keep_direct,
hint: t('statuses_cleanup.keep_direct_hint'),
label: t('statuses_cleanup.keep_direct'),
wrapper: :with_label
.fields-row
.fields-row__column.fields-row__column-6.fields-group
= f.input :keep_self_fav, wrapper: :with_label, label: t('statuses_cleanup.keep_self_fav'), hint: t('statuses_cleanup.keep_self_fav_hint')
= f.input :keep_self_fav,
hint: t('statuses_cleanup.keep_self_fav_hint'),
label: t('statuses_cleanup.keep_self_fav'),
wrapper: :with_label
.fields-row__column.fields-row__column-6.fields-group
= f.input :keep_self_bookmark, wrapper: :with_label, label: t('statuses_cleanup.keep_self_bookmark'), hint: t('statuses_cleanup.keep_self_bookmark_hint')
= f.input :keep_self_bookmark,
hint: t('statuses_cleanup.keep_self_bookmark_hint'),
label: t('statuses_cleanup.keep_self_bookmark'),
wrapper: :with_label
.fields-row
.fields-row__column.fields-row__column-6.fields-group
= f.input :keep_polls, wrapper: :with_label, label: t('statuses_cleanup.keep_polls'), hint: t('statuses_cleanup.keep_polls_hint')
= f.input :keep_polls,
hint: t('statuses_cleanup.keep_polls_hint'),
label: t('statuses_cleanup.keep_polls'),
wrapper: :with_label
.fields-row__column.fields-row__column-6.fields-group
= f.input :keep_media, wrapper: :with_label, label: t('statuses_cleanup.keep_media'), hint: t('statuses_cleanup.keep_media_hint')
= f.input :keep_media,
hint: t('statuses_cleanup.keep_media_hint'),
label: t('statuses_cleanup.keep_media'),
wrapper: :with_label
.fields-row
.fields-row__column.fields-row__column-6.fields-group
@ -41,9 +69,17 @@
.fields-row
.fields-row__column.fields-row__column-6.fields-group
= f.input :min_favs, wrapper: :with_label, label: t('statuses_cleanup.min_favs'), hint: t('statuses_cleanup.min_favs_hint'), input_html: { min: 1, placeholder: t('statuses_cleanup.ignore_favs') }
= f.input :min_favs,
hint: t('statuses_cleanup.min_favs_hint'),
input_html: { min: 1, placeholder: t('statuses_cleanup.ignore_favs') },
label: t('statuses_cleanup.min_favs'),
wrapper: :with_label
.fields-row__column.fields-row__column-6.fields-group
= f.input :min_reblogs, wrapper: :with_label, label: t('statuses_cleanup.min_reblogs'), hint: t('statuses_cleanup.min_reblogs_hint'), input_html: { min: 1, placeholder: t('statuses_cleanup.ignore_reblogs') }
= f.input :min_reblogs,
hint: t('statuses_cleanup.min_reblogs_hint'),
input_html: { min: 1, placeholder: t('statuses_cleanup.ignore_reblogs') },
label: t('statuses_cleanup.min_reblogs'),
wrapper: :with_label
.fields-row
.fields-row__column.fields-row__column-6.fields-group