tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to copy and order for media display options (#38731)

Browse Source 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
This commit is contained in:
Matt Jankowski 2026-04-17 09:31:14 -04:00 committed by GitHub
parent b846f88e16
commit 475e6833ff
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/user_settings.rb
View File

@ -35,7 +35,7 @@ class UserSettings
setting :missing_alt_text_modal, default: true
setting :reduce_motion, default: false
setting :expand_content_warnings, default: false
setting :display_media, default: 'default', in: %w(default show_all hide_all)
setting :display_media, default: 'default', in: %w(hide_all default show_all)
setting :auto_play, default: false
setting :emoji_style, default: 'auto', in: %w(auto native twemoji)
setting :color_scheme, default: 'auto', in: %w(auto light dark)

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

@ -61,9 +61,9 @@ en:
setting_default_quote_policy_private: Followers-only posts authored on Mastodon can't be quoted by others.
setting_default_quote_policy_unlisted: When people quote you, their post will also be hidden from trending timelines.
setting_default_sensitive: Sensitive media is hidden by default and can be revealed with a click
setting_display_media_default: Hide media marked as sensitive
setting_display_media_hide_all: Always hide media
setting_display_media_show_all: Always show media
setting_display_media_default: Warn before showing media marked as sensitive
setting_display_media_hide_all: Warn before showing all media
setting_display_media_show_all: Show all media without warning, including media marked as sensitive
setting_emoji_style: How to display emojis. "Auto" will try using native emoji, but falls back to Twemoji for legacy browsers.
setting_quick_boosting_html: When enabled, clicking on the %{boost_icon} Boost icon will immediately boost instead of opening the boost/quote dropdown menu. Relocates the quoting action to the %{options_icon} (Options) menu.
setting_system_scrollbars_ui: Applies only to desktop browsers based on Safari and Chrome