mirror of
https://github.com/funamitech/mastodon
synced 2024-12-14 22:59:46 +09:00
ec49aa8175
Conflicts:
- `.github/dependabot.yml`:
Updated upstream, we deleted it to not be flooded by Depandabot.
Kept deleted.
- `Gemfile.lock`:
Puma updated on both sides, went for the most recent version.
- `app/controllers/api/v1/mutes_controller.rb`:
Upstream updated the serializer to support timed mutes, while
glitch-soc added a custom API ages ago to get information that
is already available elsewhere.
Dropped the glitch-soc-specific API, went with upstream changes.
- `app/javascript/core/admin.js`:
Conflict due to changing how assets are loaded. Went with upstream.
- `app/javascript/packs/public.js`:
Conflict due to changing how assets are loaded. Went with upstream.
- `app/models/mute.rb`:
🤷
- `app/models/user.rb`:
New user setting added upstream while we have glitch-soc-specific
user settings. Added upstream's user setting.
- `config/settings.yml`:
Upstream added a new user setting close to a user setting we had
changed the defaults for. Added the new upstream setting.
- `package.json`:
Upstream dependency updated “too close” to a glitch-soc-specific
dependency. No real conflict. Updated the dependency.
65 lines
2.7 KiB
Plaintext
65 lines
2.7 KiB
Plaintext
- content_for :page_title do
|
|
= t('settings.appearance')
|
|
|
|
- content_for :heading_actions do
|
|
= button_tag t('generic.save_changes'), class: 'button', form: 'edit_user'
|
|
|
|
= simple_form_for current_user, url: settings_preferences_appearance_path, html: { method: :put, id: 'edit_user' } do |f|
|
|
.fields-group
|
|
= f.input :locale, collection: I18n.available_locales, wrapper: :with_label, include_blank: false, label_method: lambda { |locale| human_locale(locale) }, selected: I18n.locale, hint: false
|
|
|
|
- unless I18n.locale == :en
|
|
.flash-message.translation-prompt
|
|
#{t 'appearance.localization.body'} #{content_tag(:a, t('appearance.localization.guide_link_text'), href: t('appearance.localization.guide_link'), target: "_blank", rel: "noopener")}
|
|
|
|
%h4= t 'appearance.advanced_web_interface'
|
|
|
|
%p.hint= t 'appearance.advanced_web_interface_hint'
|
|
|
|
.fields-group
|
|
= f.input :setting_advanced_layout, as: :boolean, wrapper: :with_label, hint: false
|
|
|
|
%h4= t 'appearance.animations_and_accessibility'
|
|
|
|
.fields-group
|
|
= f.input :setting_use_pending_items, as: :boolean, wrapper: :with_label
|
|
|
|
.fields-group
|
|
= f.input :setting_auto_play_gif, as: :boolean, wrapper: :with_label, recommended: true
|
|
= f.input :setting_reduce_motion, as: :boolean, wrapper: :with_label
|
|
= f.input :setting_disable_swiping, as: :boolean, wrapper: :with_label
|
|
= f.input :setting_system_font_ui, as: :boolean, wrapper: :with_label
|
|
= f.input :setting_system_emoji_font, as: :boolean, wrapper: :with_label
|
|
|
|
%h4= t 'appearance.toot_layout'
|
|
|
|
.fields-group
|
|
= f.input :setting_crop_images, as: :boolean, wrapper: :with_label
|
|
|
|
%h4= t 'appearance.discovery'
|
|
|
|
.fields-group
|
|
= f.input :setting_trends, as: :boolean, wrapper: :with_label
|
|
|
|
%h4= t 'appearance.confirmation_dialogs'
|
|
|
|
.fields-group
|
|
= f.input :setting_unfollow_modal, as: :boolean, wrapper: :with_label
|
|
= f.input :setting_boost_modal, as: :boolean, wrapper: :with_label
|
|
= f.input :setting_favourite_modal, as: :boolean, wrapper: :with_label
|
|
= f.input :setting_delete_modal, as: :boolean, wrapper: :with_label
|
|
|
|
%h4= t 'appearance.sensitive_content'
|
|
|
|
.fields-group
|
|
= f.input :setting_display_media, collection: ['default', 'show_all', 'hide_all'],label_method: lambda { |item| t("simple_form.hints.defaults.setting_display_media_#{item}") }, hint: false, as: :radio_buttons, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li', wrapper: :with_floating_label
|
|
|
|
.fields-group
|
|
= f.input :setting_use_blurhash, as: :boolean, wrapper: :with_label
|
|
|
|
.fields-group
|
|
= f.input :setting_expand_spoilers, as: :boolean, wrapper: :with_label
|
|
|
|
.actions
|
|
= f.button :button, t('generic.save_changes'), type: :submit
|