From f025cc67827a5b1b1faf10dec9d5a1e14e67fa5f Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Mon, 1 May 2017 11:42:13 -0400 Subject: 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 --- config/locales/simple_form.en.yml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'config/locales') 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 -- cgit