about summary refs log tree commit diff
path: root/config/locales
diff options
context:
space:
mode:
authorMatt Jankowski <mjankowski@thoughtbot.com>2017-05-01 11:42:13 -0400
committerEugen Rochko <eugen@zeonfederated.com>2017-05-01 17:42:13 +0200
commitf025cc67827a5b1b1faf10dec9d5a1e14e67fa5f (patch)
tree8c077d9b08ebbe4088490c5f55e7a5ec806e1176 /config/locales
parent3988f2dade8a75cb642db8c239097bfcf8943a0d (diff)
Filter on allowed user language preferences (#2361)
* Naive approached to timeline filtering

* Convert allowed_languages into a db column

* Allow users to choose languages to see statuses in

* Style list items as two columns

* Add a hint to explain language filtering preference
Diffstat (limited to 'config/locales')
-rw-r--r--config/locales/simple_form.en.yml2
1 files changed, 2 insertions, 0 deletions
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index 4aa3818fd..941d83a47 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -12,6 +12,8 @@ en:
         data: CSV file exported from another Mastodon instance
       sessions:
         otp: Enter the Two-factor code from your phone or use one of your recovery codes.
+      user:
+        allowed_languages: These languages will be allowed in your public timelines. Languages that are not selected will be filtered out.
     labels:
       defaults:
         avatar: Avatar