diff --git a/app/views/settings/preferences/appearance/show.html.haml b/app/views/settings/preferences/appearance/show.html.haml index e6e96f97d55..85337bc7caf 100644 --- a/app/views/settings/preferences/appearance/show.html.haml +++ b/app/views/settings/preferences/appearance/show.html.haml @@ -81,7 +81,7 @@ = ff.input :'web.display_media', as: :radio_buttons, collection_wrapper_tag: 'ul', - collection: %w(default show_all hide_all), + collection: %w(show_all default hide_all), hint: false, item_wrapper_tag: 'li', label_method: ->(item) { t("simple_form.hints.defaults.setting_display_media_#{item}") }, diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index 077f53cbcde..b701393a7b6 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -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_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_hide_all: Hide all 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_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