about summary refs log tree commit diff
path: root/config
diff options
context:
space:
mode:
authorFaye Duxovni <duxovni@duxovni.org>2019-10-24 16:51:41 -0400
committerEugen Rochko <eugen@zeonfederated.com>2019-10-24 22:51:41 +0200
commit48f75b86aed816ef5afaaae64416dbeaa14e4fda (patch)
tree371840035b251cc15daf7ba1a494c2ccddda8ff5 /config
parenta6269b2f83e3eed1a8ab545f5756cd7b582075f5 (diff)
Add setting for whether to crop images in unexpanded toots (#12126)
Diffstat (limited to 'config')
-rw-r--r--config/locales/en.yml1
-rw-r--r--config/locales/simple_form.en.yml1
-rw-r--r--config/settings.yml1
3 files changed, 3 insertions, 0 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 458524c3d..6fc191e1a 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -576,6 +576,7 @@ en:
     confirmation_dialogs: Confirmation dialogs
     discovery: Discovery
     sensitive_content: Sensitive content
+    toot_layout: Toot layout
   application_mailer:
     notification_preferences: Change e-mail preferences
     salutation: "%{name},"
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index dc39ec926..65951b73b 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -113,6 +113,7 @@ en:
         setting_aggregate_reblogs: Group boosts in timelines
         setting_auto_play_gif: Auto-play animated GIFs
         setting_boost_modal: Show confirmation dialog before boosting
+        setting_crop_images: Crop images in non-expanded toots to 16x9
         setting_default_language: Posting language
         setting_default_privacy: Posting privacy
         setting_default_sensitive: Always mark media as sensitive
diff --git a/config/settings.yml b/config/settings.yml
index bd2f65b5e..f66e3922e 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -36,6 +36,7 @@ defaults: &defaults
   use_pending_items: false
   trends: true
   trendable_by_default: false
+  crop_images: true
   notification_emails:
     follow: false
     reblog: false