tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove required field markers from unclearable fields in user preferences (#37291)

Browse Source
This commit is contained in:
diondiondion 2025-12-18 09:58:06 +01:00 committed by GitHub
parent 009275e66b
commit 830ffbe2da
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/views/settings/preferences/appearance/show.html.haml
View File

@ -29,7 +29,8 @@
include_blank: false, include_blank: false,
label_method: ->(theme) { I18n.t("themes.#{theme}", default: theme) }, label_method: ->(theme) { I18n.t("themes.#{theme}", default: theme) },
label: I18n.t('simple_form.labels.defaults.setting_theme'), label: I18n.t('simple_form.labels.defaults.setting_theme'),
wrapper: :with_label wrapper: :with_label,
required: false
.fields-group .fields-group
= f.simple_fields_for :settings, current_user.settings do |ff| = f.simple_fields_for :settings, current_user.settings do |ff|
@ -39,7 +40,8 @@
hint: I18n.t('simple_form.hints.defaults.setting_emoji_style'), hint: I18n.t('simple_form.hints.defaults.setting_emoji_style'),
label: I18n.t('simple_form.labels.defaults.setting_emoji_style'), label: I18n.t('simple_form.labels.defaults.setting_emoji_style'),
label_method: ->(emoji_style) { I18n.t("emoji_styles.#{emoji_style}", default: emoji_style) }, label_method: ->(emoji_style) { I18n.t("emoji_styles.#{emoji_style}", default: emoji_style) },
wrapper: :with_label wrapper: :with_label,
required: false
- unless I18n.locale == :en - unless I18n.locale == :en
.flash-message.translation-prompt .flash-message.translation-prompt
@ -87,7 +89,8 @@
item_wrapper_tag: 'li', item_wrapper_tag: 'li',
label_method: ->(item) { t("simple_form.hints.defaults.setting_display_media_#{item}") }, label_method: ->(item) { t("simple_form.hints.defaults.setting_display_media_#{item}") },
label: I18n.t('simple_form.labels.defaults.setting_display_media'), label: I18n.t('simple_form.labels.defaults.setting_display_media'),
wrapper: :with_floating_label wrapper: :with_floating_label,
required: false
.fields-group .fields-group
= ff.input :'web.use_blurhash', = ff.input :'web.use_blurhash',

3
app/views/settings/preferences/notifications/show.html.haml
View File

@ -40,4 +40,5 @@
include_blank: false, include_blank: false,
label_method: ->(setting) { I18n.t("simple_form.labels.notification_emails.software_updates.#{setting}") }, label_method: ->(setting) { I18n.t("simple_form.labels.notification_emails.software_updates.#{setting}") },
label: I18n.t('simple_form.labels.notification_emails.software_updates.label'), label: I18n.t('simple_form.labels.notification_emails.software_updates.label'),
wrapper: :with_label wrapper: :with_label,
required: false