about summary refs log tree commit diff
path: root/config
diff options
context:
space:
mode:
authorMatt Sweetman <webroo@gmail.com>2018-09-24 04:44:01 +0100
committerEugen Rochko <eugen@zeonfederated.com>2018-09-24 05:44:01 +0200
commit1889526e23ce41a37395fdcf89bd415bb2f7546f (patch)
tree0f8f33d2f0502041855db7b943a28250a97196be /config
parentc39183cc628ea9556db53af5059656d6b63609ba (diff)
Add user preference to always expand toots marked with content warnings (#8762)
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 c2e572997..5b1a07a4a 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -73,6 +73,7 @@ en:
         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_expand_spoilers: Always expand toots marked with content warnings
         setting_hide_network: Hide your network
         setting_noindex: Opt-out of search engine indexing
         setting_reduce_motion: Reduce motion in animations
diff --git a/config/settings.yml b/config/settings.yml
index 78a801406..e2214b4b7 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -27,6 +27,7 @@ defaults: &defaults
   delete_modal: true
   auto_play_gif: false
   display_sensitive_media: false
+  expand_spoilers: false
   preview_sensitive_media: false
   reduce_motion: false
   system_font_ui: false