diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2019-06-07 16:51:08 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-07 16:51:08 +0200 |
commit | 560ec24e585face30ee99d5bba39a02948fd118f (patch) | |
tree | 7e2739d163f9318b9e8defd27c93fbd31d472766 /app/views/settings/preferences/show.html.haml | |
parent | cdb420862eb54f6fbfde3b8485a61e0c052ff9f4 (diff) |
Change /settings/preferences to redirect to appearance, add /settings/preferences/other (#10988)
Diffstat (limited to 'app/views/settings/preferences/show.html.haml')
-rw-r--r-- | app/views/settings/preferences/show.html.haml | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/app/views/settings/preferences/show.html.haml b/app/views/settings/preferences/show.html.haml deleted file mode 100644 index c966a16bc..000000000 --- a/app/views/settings/preferences/show.html.haml +++ /dev/null @@ -1,37 +0,0 @@ -- content_for :page_title do - = t('settings.preferences') - -= simple_form_for current_user, url: settings_preferences_path, html: { method: :put } do |f| - = render 'shared/error_messages', object: current_user - - .fields-group - = f.input :setting_noindex, as: :boolean, wrapper: :with_label - - .fields-group - = f.input :setting_hide_network, as: :boolean, wrapper: :with_label - - .fields-group - = f.input :setting_aggregate_reblogs, as: :boolean, wrapper: :with_label, recommended: true - - %h4= t 'preferences.posting_defaults' - - .fields-row - .fields-group.fields-row__column.fields-row__column-6 - = f.input :setting_default_privacy, collection: Status.selectable_visibilities, wrapper: :with_label, include_blank: false, label_method: lambda { |visibility| safe_join([I18n.t("statuses.visibilities.#{visibility}"), I18n.t("statuses.visibilities.#{visibility}_long")], ' - ') }, required: false, hint: false - - .fields-group.fields-row__column.fields-row__column-6 - = f.input :setting_default_language, collection: [nil] + filterable_languages.sort, wrapper: :with_label, label_method: lambda { |locale| locale.nil? ? I18n.t('statuses.language_detection') : human_locale(locale) }, required: false, include_blank: false, hint: false - - .fields-group - = f.input :setting_default_sensitive, as: :boolean, wrapper: :with_label - - .fields-group - = f.input :setting_show_application, as: :boolean, wrapper: :with_label, recommended: true - - %h4= t 'preferences.public_timelines' - - .fields-group - = f.input :chosen_languages, collection: filterable_languages.sort, wrapper: :with_block_label, include_blank: false, label_method: lambda { |locale| human_locale(locale) }, required: false, as: :check_boxes, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li' - - .actions - = f.button :button, t('generic.save_changes'), type: :submit |