diff --git a/app/components/admin/site_customization/information_texts/form_field_component.html.erb b/app/components/admin/site_customization/information_texts/form_field_component.html.erb index 95f9fedc3..dc0e18a3f 100644 --- a/app/components/admin/site_customization/information_texts/form_field_component.html.erb +++ b/app/components/admin/site_customization/information_texts/form_field_component.html.erb @@ -1,7 +1,7 @@ <% globalize(locale) do %> <%= hidden_field_tag "contents[content_#{i18n_content.key}][id]", i18n_content.key %> <%= text_area_tag "contents[content_#{i18n_content.key}]values[value_#{locale}]", - text || t(i18n_content.key, locale: locale), + text, rows: 5, class: "js-globalize-attribute", style: site_customization_display_translation_style(locale), diff --git a/app/components/admin/site_customization/information_texts/form_field_component.rb b/app/components/admin/site_customization/information_texts/form_field_component.rb index f292b1edf..8c2233504 100644 --- a/app/components/admin/site_customization/information_texts/form_field_component.rb +++ b/app/components/admin/site_customization/information_texts/form_field_component.rb @@ -10,10 +10,16 @@ class Admin::SiteCustomization::InformationTexts::FormFieldComponent < Applicati private def text + database_text || i18n_text + end + + def database_text if i18n_content.present? - I18nContentTranslation.find_by(i18n_content_id: i18n_content.id, locale: locale)&.value - else - false + i18n_content.translations.find_by(locale: locale)&.value end end + + def i18n_text + t(i18n_content.key, locale: locale) + end end