From 7a6ec3603e5fe9e9a6448b126ae7a8467984da73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?KMY=EF=BC=88=E9=9B=AA=E3=81=82=E3=81=99=E3=81=8B=EF=BC=89?= Date: Wed, 2 Oct 2024 08:12:27 +0900 Subject: [PATCH] =?UTF-8?q?Change:=20#845=20=E7=B5=B5=E6=96=87=E5=AD=97?= =?UTF-8?q?=E3=83=AA=E3=82=A2=E3=82=AF=E3=82=B7=E3=83=A7=E3=83=B3=E3=81=AE?= =?UTF-8?q?=E3=82=B9=E3=83=88=E3=83=AA=E3=83=BC=E3=83=9F=E3=83=B3=E3=82=B0?= =?UTF-8?q?=E3=82=92=E6=AD=A2=E3=82=81=E3=82=8B=E8=A8=AD=E5=AE=9A=E3=82=92?= =?UTF-8?q?=E3=81=9D=E3=81=AE=E4=BB=96=E8=A8=AD=E5=AE=9A=E3=81=AB=E7=A7=BB?= =?UTF-8?q?=E5=8B=95=20(#861)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/settings/preferences/notifications/show.html.haml | 5 ----- app/views/settings/preferences/other/show.html.haml | 4 ++++ 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/views/settings/preferences/notifications/show.html.haml b/app/views/settings/preferences/notifications/show.html.haml index 7c5715b845..26111374f9 100644 --- a/app/views/settings/preferences/notifications/show.html.haml +++ b/app/views/settings/preferences/notifications/show.html.haml @@ -41,8 +41,3 @@ label_method: ->(setting) { I18n.t("simple_form.labels.notification_emails.software_updates.#{setting}") }, label: I18n.t('simple_form.labels.notification_emails.software_updates.label'), wrapper: :with_label - - - if Setting.enable_emoji_reaction - = f.simple_fields_for :settings, current_user.settings do |ff| - .fields-group - = ff.input :stop_emoji_reaction_streaming, as: :boolean, wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.setting_stop_emoji_reaction_streaming'), hint: I18n.t('simple_form.hints.defaults.setting_stop_emoji_reaction_streaming') diff --git a/app/views/settings/preferences/other/show.html.haml b/app/views/settings/preferences/other/show.html.haml index 895c29788d..e6a6db766f 100644 --- a/app/views/settings/preferences/other/show.html.haml +++ b/app/views/settings/preferences/other/show.html.haml @@ -37,6 +37,10 @@ label: I18n.t('simple_form.labels.defaults.setting_default_sensitive'), wrapper: :with_label + - if Setting.enable_emoji_reaction + .fields-group + = ff.input :stop_emoji_reaction_streaming, as: :boolean, wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.setting_stop_emoji_reaction_streaming'), hint: I18n.t('simple_form.hints.defaults.setting_stop_emoji_reaction_streaming') + - if @dtl_enabled %h4= t 'preferences.dtl'