about summary refs log tree commit diff
path: root/config/locales
diff options
context:
space:
mode:
authorEmelia Smith <ThisIsMissEm@users.noreply.github.com>2018-04-23 23:52:58 +0200
committerEugen Rochko <eugen@zeonfederated.com>2018-04-23 23:52:58 +0200
commit60b871d56c554ddb22b7890d803e4ba6650ed286 (patch)
tree7011103a98c5961650cc748f513e80e89350ce9b /config/locales
parent495303d9b86919c72bf1948a714bf8d00b41fa0f (diff)
Implement the ability for instances to define a list of disallowed hashtags (#7176)
The goal here isn't to prevent these hashtags from existing, but just to strongly curtail their usage; The hashtags may still exist in the database via federated status, or from being created prior to this feature.
Diffstat (limited to 'config/locales')
-rw-r--r--config/locales/en.yml3
1 files changed, 3 insertions, 0 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 8b66b91ec..1468d8559 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -684,6 +684,9 @@ en:
         one: "%{count} video"
         other: "%{count} videos"
     content_warning: 'Content warning: %{warning}'
+    disallowed_hashtags:
+      one: 'contained a disallowed hashtag: %{tags}'
+      other: 'contained the disallowed hashtags: %{tags}'
     open_in_web: Open in web
     over_character_limit: character limit of %{max} exceeded
     pin_errors: