diff --git a/app/helpers/site_customization_helper.rb b/app/helpers/site_customization_helper.rb index 8b6fccb31..a8f01038a 100644 --- a/app/helpers/site_customization_helper.rb +++ b/app/helpers/site_customization_helper.rb @@ -7,6 +7,19 @@ module SiteCustomizationHelper site_customization_enable_translation?(locale) ? "" : "display: none;" end + def translation_for_locale(content, locale) + i18n_content = I18nContent.where(key: content.key).first + + if i18n_content.present? + I18nContentTranslation.where( + i18n_content_id: i18n_content.id, + locale: locale + ).first.try(:value) + else + false + end + end + def merge_translatable_field_options(options, locale) options.merge( class: "#{options[:class]} js-globalize-attribute".strip, diff --git a/app/views/admin/site_customization/information_texts/_form_field.html.erb b/app/views/admin/site_customization/information_texts/_form_field.html.erb index 11dc02b20..3c5ae9b5c 100644 --- a/app/views/admin/site_customization/information_texts/_form_field.html.erb +++ b/app/views/admin/site_customization/information_texts/_form_field.html.erb @@ -1,15 +1,6 @@ <% globalize(locale) do %> - - <% i18n_content = I18nContent.where(key: content.key).first %> - <% if i18n_content.present? %> - <% i18n_content_translation = I18nContentTranslation.where(i18n_content_id: i18n_content.id, locale: locale).first.try(:value) %> - <% else %> - <% i18n_content_translation = false %> - <% end %> - <%= hidden_field_tag "contents[content_#{content.key}][id]", content.key %> <%= text_area_tag "contents[content_#{content.key}]values[value_#{locale}]", - i18n_content_translation || - t(content.key, locale: locale), + translation_for_locale(content, locale) || t(content.key, locale: locale), merge_translatable_field_options({rows: 5}, locale) %> <% end %>