From f87804aa906f839ae1fd9a7e3618235e4f7dcbe3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sen=C3=A9n=20Rodero=20Rodr=C3=ADguez?= Date: Thu, 17 Jan 2019 18:25:37 +0100 Subject: [PATCH] Update helpers after globalize gem version update Globalize has fixed new translations globalized_model initialization so we have to adapt existing code. --- app/helpers/globalize_helper.rb | 2 +- app/helpers/translatable_form_helper.rb | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/helpers/globalize_helper.rb b/app/helpers/globalize_helper.rb index 575e81c8e..92d02b63e 100644 --- a/app/helpers/globalize_helper.rb +++ b/app/helpers/globalize_helper.rb @@ -12,7 +12,7 @@ module GlobalizeHelper def display_translation?(resource, locale) if !resource || resource.translations.blank? || - resource.translations.map(&:locale).include?(I18n.locale) + resource.locales_not_marked_for_destruction.include?(I18n.locale) locale == I18n.locale else locale == resource.translations.first.locale diff --git a/app/helpers/translatable_form_helper.rb b/app/helpers/translatable_form_helper.rb index 01b0dd2a7..a65221b79 100644 --- a/app/helpers/translatable_form_helper.rb +++ b/app/helpers/translatable_form_helper.rb @@ -6,7 +6,13 @@ module TranslatableFormHelper end class TranslatableFormBuilder < FoundationRailsHelper::FormBuilder + attr_accessor :translations + def translatable_fields(&block) + @translations = {} + @object.globalize_locales.map do |locale| + @translations[locale] = translation_for(locale) + end @object.globalize_locales.map do |locale| Globalize.with_locale(locale) { fields_for_locale(locale, &block) } end.join.html_safe @@ -15,7 +21,7 @@ module TranslatableFormHelper private def fields_for_locale(locale, &block) - fields_for_translation(translation_for(locale)) do |translations_form| + fields_for_translation(@translations[locale]) do |translations_form| @template.content_tag :div, translations_options(translations_form.object, locale) do @template.concat translations_form.hidden_field( :_destroy,