techhub/mastodon
2
0
Fork 0
Code Activity

Emoji: Remove final flag (#36409)

Browse Source
This commit is contained in:
Echo
2025-10-28 12:33:27 +01:00
committed by GitHub
parent e4fc18abfd
commit 85d0cdb5f7
37 changed files with 112 additions and 1103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,16 +31,15 @@
label: I18n.t('simple_form.labels.defaults.setting_theme'),
wrapper: :with_label
- if Mastodon::Feature.modern_emojis_enabled?
.fields-group
= f.simple_fields_for :settings, current_user.settings do |ff|
= ff.input :'web.emoji_style',
collection: %w(auto twemoji native),
include_blank: false,
hint: I18n.t('simple_form.hints.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) },
wrapper: :with_label
.fields-group
= f.simple_fields_for :settings, current_user.settings do |ff|
= ff.input :'web.emoji_style',
collection: %w(auto twemoji native),
include_blank: false,
hint: I18n.t('simple_form.hints.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) },
wrapper: :with_label
- unless I18n.locale == :en
.flash-message.translation-prompt