gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-09-05 17:31:12 +00:00
Code Issues Actions 34 Packages Projects Releases Wiki 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
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 32 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,8 +17,7 @@
%h4= t 'preferences.posting_defaults' %h4= t 'preferences.posting_defaults'
.fields-row .fields-group
.fields-group.fields-row__column.fields-row__column-6
= ff.input :default_privacy, = ff.input :default_privacy,
collection: Status.selectable_visibilities, collection: Status.selectable_visibilities,
selected: current_user.setting_default_privacy, selected: current_user.setting_default_privacy,
@ -29,18 +28,7 @@
required: false, required: false,
wrapper: :with_label wrapper: :with_label
.fields-group.fields-row__column.fields-row__column-6 .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-row
.fields-group.fields-row__column.fields-row__column-6
= ff.input :default_quote_policy, = ff.input :default_quote_policy,
collection: %w(public followers nobody), collection: %w(public followers nobody),
include_blank: false, include_blank: false,
@ -50,6 +38,16 @@
required: false, required: false,
wrapper: :with_label 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 .fields-group
= ff.input :default_sensitive, = ff.input :default_sensitive,
hint: I18n.t('simple_form.hints.defaults.setting_default_sensitive'), hint: I18n.t('simple_form.hints.defaults.setting_default_sensitive'),

6
config/locales/en.yml
View File

@ -367,7 +367,7 @@ en:
title: Custom emojis title: Custom emojis
uncategorized: Uncategorized uncategorized: Uncategorized
unlist: Unlist unlist: Unlist
unlisted: Unlisted unlisted: Quiet public
update_failed_msg: Could not update that emoji update_failed_msg: Could not update that emoji
updated_msg: Emoji successfully updated! updated_msg: Emoji successfully updated!
upload: Upload upload: Upload
@ -1919,9 +1919,9 @@ en:
private: Followers-only private: Followers-only
private_long: Only show to followers private_long: Only show to followers
public: Public public: Public
public_long: Everyone can see public_long: Anyone on and off Mastodon
unlisted: Unlisted unlisted: Unlisted
unlisted_long: Everyone can see, but not listed on public timelines unlisted_long: Hidden from Mastodon search results, trending, and public timelines
statuses_cleanup: statuses_cleanup:
enabled: Automatically delete old posts enabled: Automatically delete old posts
enabled_hint: Automatically deletes your posts once they reach a specified age threshold, unless they match one of the exceptions below enabled_hint: Automatically deletes your posts once they reach a specified age threshold, unless they match one of the exceptions below

2
config/locales/simple_form.en.yml
View File

@ -236,7 +236,7 @@ en:
setting_auto_play_gif: Auto-play animated GIFs setting_auto_play_gif: Auto-play animated GIFs
setting_boost_modal: Show confirmation dialog before boosting setting_boost_modal: Show confirmation dialog before boosting
setting_default_language: Posting language setting_default_language: Posting language
setting_default_privacy: Posting privacy setting_default_privacy: Posting visibility
setting_default_quote_policy: Who can quote setting_default_quote_policy: Who can quote
setting_default_sensitive: Always mark media as sensitive setting_default_sensitive: Always mark media as sensitive
setting_delete_modal: Show confirmation dialog before deleting a post setting_delete_modal: Show confirmation dialog before deleting a post