about summary refs log tree commit diff
path: root/config
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2018-02-09 00:26:57 +0100
committerGitHub <noreply@github.com>2018-02-09 00:26:57 +0100
commit76f3d5d16be2fb97d2252909589510165ec05e12 (patch)
treee46a34d048183f23e5d13dbdda9a0922e86a271f /config
parent1167c6dbf8d5b8411d9924350b2b9735da6d9d26 (diff)
Add preference to always display sensitive media (#6448)
Diffstat (limited to 'config')
-rw-r--r--config/locales/simple_form.en.yml1
-rw-r--r--config/settings.yml1
2 files changed, 2 insertions, 0 deletions
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