about summary refs log tree commit diff
path: root/config
diff options
context:
space:
mode:
authorsdukhovni <dukhovni@mit.edu>2017-07-24 22:26:55 +1000
committerEugen Rochko <eugen@zeonfederated.com>2017-07-24 14:26:55 +0200
commit06d905f415f38ed8e13f6390a93a0db928dee6a7 (patch)
treec2a3ff6b6d0ebc34c7c38e5dc35e312d294ec1af /config
parent0ad41be0f314a9ee16cd167620e0636859349cc8 (diff)
Allow domain blocks that only reject media without silencing or suspending (#4325)
* Allow domain blocks to reject media without silencing or suspending

* Fix typo

* Hide 'Reject media' button when superfluous, instead of disabling it

* Properly hide 'reject media' checkbox on page load if needed

This may happen when resubmitting the domain block form after an error.

* Don't ask whether undoing a media-only block should be retroactive

* Rename :media_only block to :noop

* Display :noop block as None in frontend, allow blocks that do nothing

* Remove 'coding' line auto-added by emacs
Diffstat (limited to 'config')
-rw-r--r--config/locales/en.yml4
1 files changed, 3 insertions, 1 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml
index cc2ea0542..1ec727ca7 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -108,13 +108,15 @@ en:
         create: Create block
         hint: The domain block will not prevent creation of account entries in the database, but will retroactively and automatically apply specific moderation methods on those accounts.
         severity:
-          desc_html: "<strong>Silence</strong> will make the account's posts invisible to anyone who isn't following them. <strong>Suspend</strong> will remove all of the account's content, media, and profile data."
+          desc_html: "<strong>Silence</strong> will make the account's posts invisible to anyone who isn't following them. <strong>Suspend</strong> will remove all of the account's content, media, and profile data. Use <strong>None</strong> if you just want to reject media files."
+          noop: None
           silence: Silence
           suspend: Suspend
         title: New domain block
       reject_media: Reject media files
       reject_media_hint: Removes locally stored media files and refuses to download any in the future. Irrelevant for suspensions
       severities:
+        noop: None
         silence: Silence
         suspend: Suspend
       severity: Severity