consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update helpers after globalize gem version update

Browse Source 
Globalize has fixed new translations globalized_model initialization
so we have to adapt existing code.
This commit is contained in:
Senén Rodero Rodríguez
2019-01-17 18:25:37 +01:00
committed by Julian Herrero
parent 596ef8d1ed
commit f87804aa90
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/helpers/globalize_helper.rb
View File

@@ -12,7 +12,7 @@ module GlobalizeHelper
def display_translation?(resource, locale) def display_translation?(resource, locale)
if !resource || resource.translations.blank? || if !resource || resource.translations.blank? ||
resource.translations.map(&:locale).include?(I18n.locale) resource.locales_not_marked_for_destruction.include?(I18n.locale)
locale == I18n.locale locale == I18n.locale
else else
locale == resource.translations.first.locale locale == resource.translations.first.locale

8
app/helpers/translatable_form_helper.rb
View File

@@ -6,7 +6,13 @@ module TranslatableFormHelper
end end
class TranslatableFormBuilder < FoundationRailsHelper::FormBuilder class TranslatableFormBuilder < FoundationRailsHelper::FormBuilder
attr_accessor :translations
def translatable_fields(&block) def translatable_fields(&block)
@translations = {}
@object.globalize_locales.map do |locale|
@translations[locale] = translation_for(locale)
end
@object.globalize_locales.map do |locale| @object.globalize_locales.map do |locale|
Globalize.with_locale(locale) { fields_for_locale(locale, &block) } Globalize.with_locale(locale) { fields_for_locale(locale, &block) }
end.join.html_safe end.join.html_safe
@@ -15,7 +21,7 @@ module TranslatableFormHelper
private private
def fields_for_locale(locale, &block) 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.content_tag :div, translations_options(translations_form.object, locale) do
@template.concat translations_form.hidden_field( @template.concat translations_form.hidden_field(
:_destroy, :_destroy,