mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-02 17:25:19 +00:00
077183a121
Conflicts: - `app/controllers/settings/preferences_controller.rb`: Upstream dropping `digest` from notifications emails while we have more notification emails settings. Removed `digest` from our list while keeping our extra settings. - `app/javascript/packs/admin.js`: Conflicts caused by glitch-soc's theming system. Applied the changes to `app/javascript/core/admin.js`. - `app/views/settings/preferences/other/show.html.haml`: Upstream removed a setting close to a glitch-soc-only setting. Applied upstream's change.
38 lines
2 KiB
Plaintext
38 lines
2 KiB
Plaintext
- content_for :page_title do
|
|
= t('settings.notifications')
|
|
|
|
- content_for :heading_actions do
|
|
= button_tag t('generic.save_changes'), class: 'button', form: 'edit_notification'
|
|
|
|
= simple_form_for current_user, url: settings_preferences_notifications_path, html: { method: :put, id: 'edit_notification' } do |f|
|
|
= render 'shared/error_messages', object: current_user
|
|
|
|
%h4= t 'notifications.email_events'
|
|
|
|
%p.hint= t 'notifications.email_events_hint'
|
|
|
|
.fields-group
|
|
= f.simple_fields_for :notification_emails, hash_to_object(current_user.settings.notification_emails) do |ff|
|
|
= ff.input :follow, as: :boolean, wrapper: :with_label
|
|
= ff.input :follow_request, as: :boolean, wrapper: :with_label
|
|
= ff.input :reblog, as: :boolean, wrapper: :with_label
|
|
= ff.input :favourite, as: :boolean, wrapper: :with_label
|
|
= ff.input :mention, as: :boolean, wrapper: :with_label
|
|
= ff.input :report, as: :boolean, wrapper: :with_label if current_user.can?(:manage_reports)
|
|
= ff.input :appeal, as: :boolean, wrapper: :with_label if current_user.can?(:manage_appeals)
|
|
= ff.input :pending_account, as: :boolean, wrapper: :with_label if current_user.can?(:manage_users)
|
|
= ff.input :trending_tag, as: :boolean, wrapper: :with_label if current_user.can?(:manage_taxonomies)
|
|
= ff.input :trending_link, as: :boolean, wrapper: :with_label if current_user.can?(:manage_taxonomies)
|
|
= ff.input :trending_status, as: :boolean, wrapper: :with_label if current_user.can?(:manage_taxonomies)
|
|
|
|
.fields-group
|
|
= f.input :setting_always_send_emails, as: :boolean, wrapper: :with_label
|
|
|
|
%h4= t 'notifications.other_settings'
|
|
|
|
.fields-group
|
|
= f.simple_fields_for :interactions, hash_to_object(current_user.settings.interactions) do |ff|
|
|
= ff.input :must_be_follower, as: :boolean, wrapper: :with_label
|
|
= ff.input :must_be_following, as: :boolean, wrapper: :with_label
|
|
= ff.input :must_be_following_dm, as: :boolean, wrapper: :with_label
|