about summary refs log tree commit diff
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/locales/en.yml3
-rw-r--r--config/settings.yml1
2 files changed, 4 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:
diff --git a/config/settings.yml b/config/settings.yml
index 68579ad0f..dcf655008 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -47,6 +47,7 @@ defaults: &defaults
     - root
     - webmaster
     - administrator
+  disallowed_hashtags: # space separated string or list of hashtags without the hash
   bootstrap_timeline_accounts: ''
   activity_api_enabled: true
   peers_api_enabled: true