gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-11-27 18:10:58 +00:00
Code Issues Actions 17 Packages Projects Releases Wiki Activity

Merge 5ed70fcfec into 002632c3bb

Browse Source
This commit is contained in:
Christian Schmidt 2025-11-26 17:03:11 +00:00 committed by GitHub
commit 9e701bf08e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/settings/preferences/appearance/show.html.haml
View File

@ -81,7 +81,7 @@
= ff.input :'web.display_media', = ff.input :'web.display_media',
as: :radio_buttons, as: :radio_buttons,
collection_wrapper_tag: 'ul', collection_wrapper_tag: 'ul',
collection: %w(default show_all hide_all), collection: %w(show_all default hide_all),
hint: false, hint: false,
item_wrapper_tag: 'li', item_wrapper_tag: 'li',
label_method: ->(item) { t("simple_form.hints.defaults.setting_display_media_#{item}") }, label_method: ->(item) { t("simple_form.hints.defaults.setting_display_media_#{item}") },

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

@ -62,8 +62,8 @@ en:
setting_default_quote_policy_unlisted: When people quote you, their post will also be hidden from trending timelines. 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_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_default: Hide media marked as sensitive
setting_display_media_hide_all: Always hide media setting_display_media_hide_all: Hide all media
setting_display_media_show_all: Always show media setting_display_media_show_all: Show all media
setting_emoji_style: How to display emojis. "Auto" will try using native emoji, but falls back to Twemoji for legacy browsers. 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_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 setting_system_scrollbars_ui: Applies only to desktop browsers based on Safari and Chrome