From 76f3d5d16be2fb97d2252909589510165ec05e12 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Fri, 9 Feb 2018 00:26:57 +0100 Subject: Add preference to always display sensitive media (#6448) --- config/locales/simple_form.en.yml | 1 + config/settings.yml | 1 + 2 files changed, 2 insertions(+) (limited to 'config') diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index c56334d56..90b97ce0e 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -45,6 +45,7 @@ en: setting_default_privacy: Post privacy setting_default_sensitive: Always mark media as sensitive setting_delete_modal: Show confirmation dialog before deleting a toot + setting_display_sensitive_media: Always show media marked as sensitive setting_noindex: Opt-out of search engine indexing setting_reduce_motion: Reduce motion in animations setting_system_font_ui: Use system's default font diff --git a/config/settings.yml b/config/settings.yml index 32d0687ce..68579ad0f 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -24,6 +24,7 @@ defaults: &defaults boost_modal: false delete_modal: true auto_play_gif: false + display_sensitive_media: false reduce_motion: false system_font_ui: false noindex: false -- cgit From b8efc3fc0b961d356472cf2e56fde69a6589ffaa Mon Sep 17 00:00:00 2001 From: David Yip Date: Fri, 9 Feb 2018 09:41:57 -0600 Subject: Normalize simple_form.en.yml. --- config/locales/simple_form.en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index 48b741186..c958431d3 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -45,8 +45,8 @@ en: setting_default_privacy: Post privacy setting_default_sensitive: Always mark media as sensitive setting_delete_modal: Show confirmation dialog before deleting a toot - setting_favourite_modal: Show confirmation dialog before favouriting setting_display_sensitive_media: Always show media marked as sensitive + setting_favourite_modal: Show confirmation dialog before favouriting setting_noindex: Opt-out of search engine indexing setting_reduce_motion: Reduce motion in animations setting_skin: Skin -- cgit