mirror of
https://github.com/funamitech/mastodon
synced 2024-12-15 07:09:03 +09:00
1fbd1fa5c4
Conflicts: - `app/controllers/settings/preferences_controller.rb`: Conflicts due to us having more user settings and upstream dropping `hide_network` (to replace it with an account attribute, properly migrated). Dropped `hide_network` like upstream. - `app/lib/user_settings_decorator.rb`: Conflicts due to us having more user settings and upstream dropping `hide_network` (to replace it with an account attribute, properly migrated). Dropped `hide_network` like upstream. - `app/models/status.rb`: Conflict because of slight change in how glitch-soc handles the scope to filter out local-only posts for anonymous viewers. Took upstream's changes and re-applied glitch-soc's change. - `app/models/user.rb`: Conflicts due to us having more user settings and upstream dropping `hide_network` (to replace it with an account attribute, properly migrated). Dropped `hide_network` like upstream. - `app/views/directories/index.html.haml`: Conflict because upstream redesigned that page while glitch-soc had a minor change to support hiding the number of followers. Ported glitch-soc's change on top of upstream's redesign. Additional changes: - `app/models/account_statuses_filter.rb`: See change to `app/models/status.rb`.
45 lines
2.5 KiB
Plaintext
45 lines
2.5 KiB
Plaintext
- content_for :page_title do
|
|
= t('settings.preferences')
|
|
|
|
- content_for :heading_actions do
|
|
= button_tag t('generic.save_changes'), class: 'button', form: 'edit_preferences'
|
|
|
|
= simple_form_for current_user, url: settings_preferences_other_path, html: { method: :put, id: 'edit_preferences' } 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_aggregate_reblogs, as: :boolean, wrapper: :with_label, recommended: true
|
|
|
|
- unless Setting.hide_followers_count
|
|
.fields-group
|
|
= f.input :setting_hide_followers_count, as: :boolean, wrapper: :with_label
|
|
|
|
%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, wrapper: :with_label, label_method: lambda { |locale| locale.nil? ? I18n.t('statuses.default_language') : native_locale_name(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
|
|
|
|
.fields-group
|
|
= f.input :setting_default_content_type, collection: ['text/plain', 'text/markdown', 'text/html'], wrapper: :with_label, include_blank: false, label_method: lambda { |item| safe_join([t("simple_form.labels.defaults.setting_default_content_type_#{item.split('/')[1]}"), content_tag(:span, t("simple_form.hints.defaults.setting_default_content_type_#{item.split('/')[1]}"), class: 'hint')]) }, required: false, as: :radio_buttons, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li'
|
|
|
|
%h4= t 'preferences.public_timelines'
|
|
|
|
.fields-group
|
|
= f.input :chosen_languages, collection: filterable_languages, wrapper: :with_block_label, include_blank: false, label_method: lambda { |locale| native_locale_name(locale) }, required: false, as: :check_boxes, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li'
|
|
|
|
.actions
|
|
= f.button :button, t('generic.save_changes'), type: :submit
|