diff --git a/app/helpers/globalize_helper.rb b/app/helpers/globalize_helper.rb index 6a637d8e0..5ef04361d 100644 --- a/app/helpers/globalize_helper.rb +++ b/app/helpers/globalize_helper.rb @@ -10,16 +10,16 @@ module GlobalizeHelper def locale_options I18n.available_locales.map do |locale| - [name_for_locale(locale), locale] + [name_for_locale(locale), neutral_locale(locale)] end end def display_translation?(locale) - I18n.locale == locale ? "" : "display: none" + neutral_locale(I18n.locale) == neutral_locale(locale) ? "" : "display: none" end def css_to_display_translation?(resource, locale) - resource.translated_locales.include?(locale) || locale == I18n.locale ? "" : "display: none" + resource.translated_locales.include?(neutral_locale(locale)) || locale == I18n.locale ? "" : "display: none" end def disable_translation?(locale) @@ -38,4 +38,8 @@ module GlobalizeHelper I18n.locale == locale ? '' : 'display: none' end + def neutral_locale(locale) + locale.to_s.downcase.underscore.to_sym + end + end diff --git a/app/models/budget/investment/milestone.rb b/app/models/budget/investment/milestone.rb index 5553476ea..3f8ba4f3a 100644 --- a/app/models/budget/investment/milestone.rb +++ b/app/models/budget/investment/milestone.rb @@ -7,8 +7,8 @@ class Budget max_file_size: 3.megabytes, accepted_content_types: [ "application/pdf" ] - translates :description, touch: true - globalize_accessors locales: [:en, :es, :fr, :nl, :val] + translates :title, :description, touch: true + globalize_accessors locales: [:en, :es, :fr, :nl, :val, :pt_br] belongs_to :investment diff --git a/app/views/budgets/investments/_milestones.html.erb b/app/views/budgets/investments/_milestones.html.erb index afada7fc2..4a17b066f 100644 --- a/app/views/budgets/investments/_milestones.html.erb +++ b/app/views/budgets/investments/_milestones.html.erb @@ -24,7 +24,7 @@ class: "margin", id: "image_#{milestone.id}" }) if milestone.image.present? %>

- <% Globalize.with_locale(locale) do %> + <% Globalize.with_locale(neutral_locale(locale)) do %> <%= text_with_links milestone.description %> <% end %>

@@ -49,4 +49,4 @@ - \ No newline at end of file + diff --git a/app/views/budgets/investments/milestones/_globalize_locales.html.erb b/app/views/budgets/investments/milestones/_globalize_locales.html.erb index bacc1cd6d..17aca653d 100644 --- a/app/views/budgets/investments/milestones/_globalize_locales.html.erb +++ b/app/views/budgets/investments/milestones/_globalize_locales.html.erb @@ -3,13 +3,13 @@ <%= link_to name_for_locale(locale), "#", style: css_to_display_translation?(@milestone, locale), class: "js-globalize-locale-link #{highlight_current?(locale)}", - data: { locale: locale }, + data: { locale: neutral_locale(locale) }, remote: true %> <%= link_to t("admin.milestones.form.remove_language"), "#", id: "delete-#{locale}", - style: show_delete?(locale), + style: show_delete?(neutral_locale(locale)), class: 'float-right delete-language', - data: { locale: locale } %> + data: { locale: neutral_locale(locale) } %> <% end %> diff --git a/app/views/budgets/investments/milestones/_milestone.html.erb b/app/views/budgets/investments/milestones/_milestone.html.erb index 2113fd06e..86adb26df 100644 --- a/app/views/budgets/investments/milestones/_milestone.html.erb +++ b/app/views/budgets/investments/milestones/_milestone.html.erb @@ -11,18 +11,18 @@ <% end %> <% if milestone.image.present? %> - <%= image_tag(milestone.image_url(:large), + <%= image_tag(milestone.image_url(:large), { id: "image_#{milestone.id}", - alt: milestone.image.title, + alt: milestone.image.title, class: "margin" }) %> <% end %> - +

- <% Globalize.with_locale(locale) do %> + <% Globalize.with_locale(neutral_locale(locale)) do %> <%= text_with_links milestone.description %> <% end %>

- + <% if milestone.documents.present? %> - \ No newline at end of file +