about summary refs log tree commit diff
path: root/config/locales
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2019-05-14 19:05:02 +0200
committerEugen Rochko <eugen@zeonfederated.com>2019-05-14 19:05:02 +0200
commit14f6ce2885f7999f2fcbbdda6241a035271076d4 (patch)
treee0db9d9bf95e61cf4c96cd6b94fcc6f2c07daaa1 /config/locales
parent564106c5d6ddd781064bdaeba1994328d7aceeae (diff)
Record account suspend/silence time and keep track of domain blocks (#10660)
* Record account suspend/silence time and keep track of domain blocks

* Also unblock users who were suspended/silenced before dates were recorded

* Add tests

* Keep track of suspending date for users suspended through the CLI

* Show accurate number of accounts that would be affected by unsuspending an instance

* Change migration to set silenced_at and suspended_at

* Revert "Also unblock users who were suspended/silenced before dates were recorded"

This reverts commit a015c65d2d1e28c7b7cfab8b3f8cd5fb48b8b71c.

* Switch from using suspended and silenced to suspended_at and silenced_at

* Add post-deployment migration script to remove `suspended` and `silenced` columns

* Use Account#silence! and Account#suspend! instead of updating the underlying property

* Add silenced_at and suspended_at migration to post-migration

* Change account fabricator to translate suspended and silenced attributes

* Minor fixes

* Make unblocking domains always retroactive
Diffstat (limited to 'config/locales')
-rw-r--r--config/locales/en.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6d59411a5..4acea6dc0 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -293,8 +293,8 @@ en:
           one: One account in the database affected
           other: "%{count} accounts in the database affected"
         retroactive:
-          silence: Unsilence all existing accounts from this domain
-          suspend: Unsuspend all existing accounts from this domain
+          silence: Unsilence existing affected accounts from this domain
+          suspend: Unsuspend existing affected accounts from this domain
         title: Undo domain block for %{domain}
         undo: Undo
       undo: Undo domain block