diff options
author | Matt Jankowski <mjankowski@thoughtbot.com> | 2017-05-01 11:42:13 -0400 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-05-01 17:42:13 +0200 |
commit | f025cc67827a5b1b1faf10dec9d5a1e14e67fa5f (patch) | |
tree | 8c077d9b08ebbe4088490c5f55e7a5ec806e1176 /app/views/settings | |
parent | 3988f2dade8a75cb642db8c239097bfcf8943a0d (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 'app/views/settings')
-rw-r--r-- | app/views/settings/preferences/show.html.haml | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/app/views/settings/preferences/show.html.haml b/app/views/settings/preferences/show.html.haml index 8a4113ab4..10618ebf6 100644 --- a/app/views/settings/preferences/show.html.haml +++ b/app/views/settings/preferences/show.html.haml @@ -7,6 +7,16 @@ .fields-group = f.input :locale, collection: I18n.available_locales, wrapper: :with_label, include_blank: false, label_method: lambda { |locale| human_locale(locale) } + = f.input :allowed_languages, + collection: I18n.available_locales, + wrapper: :with_label, + include_blank: false, + label_method: lambda { |locale| human_locale(locale) }, + required: false, + as: :check_boxes, + collection_wrapper_tag: 'ul', + item_wrapper_tag: 'li' + = f.input :setting_default_privacy, collection: Status.visibilities.keys - ['direct'], wrapper: :with_label, include_blank: false, label_method: lambda { |visibility| safe_join([I18n.t("statuses.visibilities.#{visibility}"), content_tag(:span, I18n.t("statuses.visibilities.#{visibility}_long"), class: 'hint')]) }, required: false, as: :radio_buttons, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li' .fields-group |