From e3c1fe90dc52ff4e358fdfb64f97b5cbf5763848 Mon Sep 17 00:00:00 2001 From: Alexander Brandon Coles Date: Fri, 4 Jul 2025 18:00:00 +0100 Subject: [PATCH] Use Settings::FormHelper in TextSettingComponent --- .../settings/text_setting_component.html.erb | 10 +++++----- app/components/settings/text_setting_component.rb | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/components/settings/text_setting_component.html.erb b/app/components/settings/text_setting_component.html.erb index 9774f600168..534172f4f7e 100644 --- a/app/components/settings/text_setting_component.html.erb +++ b/app/components/settings/text_setting_component.html.erb @@ -31,7 +31,7 @@ See COPYRIGHT and LICENSE files for more details.
<%= styled_label_tag "lang-for-#{name}" do %> - <%= content_tag(:span, t("setting_#{name}"), class: "sr-only") %> + <%= content_tag(:span, setting_label(name), class: "sr-only") %> <% end %>
<%= @@ -50,20 +50,20 @@ See COPYRIGHT and LICENSE files for more details. <%= hidden_field_tag( "settings[#{name}][#{lang}]", - Setting.send(name)[lang], + setting_value(name)[lang], id: "lang-for-#{name}-#{lang}" ) %> <% end %>
- <%= styled_label_tag "settings-#{name}", t("setting_#{name}") %> + <%= styled_label_tag "settings-#{name}", setting_label(name) %>
<%= styled_text_area_tag( "settings[#{name}][#{current_language}]", - Setting.send(name)[current_language.to_s], - disabled: !Setting.send(:"#{name}_writable?"), + setting_value(name)[current_language.to_s], + disabled: setting_disabled?(name), label: false, id: "settings-#{name}", class: "wiki-edit", diff --git a/app/components/settings/text_setting_component.rb b/app/components/settings/text_setting_component.rb index 402e0407f80..6abb1a06778 100644 --- a/app/components/settings/text_setting_component.rb +++ b/app/components/settings/text_setting_component.rb @@ -33,6 +33,7 @@ module Settings # A language switch and text area for updating a localized text setting. class TextSettingComponent < ::ApplicationComponent include OpenProject::FormTagHelper + include Settings::FormHelper options :name # name of setting and tag to differentiate between different language selects