diff --git a/app/helpers/globalize_helper.rb b/app/helpers/globalize_helper.rb
index 8bdef2b7a..cff0b4ccd 100644
--- a/app/helpers/globalize_helper.rb
+++ b/app/helpers/globalize_helper.rb
@@ -6,12 +6,12 @@ module GlobalizeHelper
def locale_options
I18n.available_locales.map do |locale|
- [name_for_locale(locale), neutral_locale(locale)]
+ [name_for_locale(locale), locale]
end
end
def display_translation?(locale)
- same_locale?(neutral_locale(I18n.locale), neutral_locale(locale)) ? "" : "display: none;"
+ same_locale?(I18n.locale, locale) ? "" : "display: none;"
end
def translation_enabled_tag(locale, enabled)
@@ -23,7 +23,7 @@ module GlobalizeHelper
end
def enable_locale?(resource, locale)
- resource.translated_locales.include?(neutral_locale(locale)) || locale == I18n.locale
+ resource.translated_locales.include?(locale) || locale == I18n.locale
end
def highlight_current?(locale)
@@ -34,10 +34,6 @@ module GlobalizeHelper
display_translation?(locale)
end
- def neutral_locale(locale)
- locale.to_s.downcase.underscore.to_sym
- end
-
def globalize(locale, &block)
Globalize.with_locale(locale) do
yield
diff --git a/app/helpers/site_customization_helper.rb b/app/helpers/site_customization_helper.rb
index 911d4f9d5..1b4968b6c 100644
--- a/app/helpers/site_customization_helper.rb
+++ b/app/helpers/site_customization_helper.rb
@@ -1,6 +1,6 @@
module SiteCustomizationHelper
def site_customization_enable_translation?(locale)
- I18nContentTranslation.existing_languages.include?(neutral_locale(locale)) || locale == I18n.locale
+ I18nContentTranslation.existing_languages.include?(locale) || locale == I18n.locale
end
def site_customization_display_translation?(locale)
diff --git a/app/helpers/translatable_form_helper.rb b/app/helpers/translatable_form_helper.rb
index 1c160e69d..41aa1181a 100644
--- a/app/helpers/translatable_form_helper.rb
+++ b/app/helpers/translatable_form_helper.rb
@@ -41,10 +41,13 @@ module TranslatableFormHelper
@template.capture do
@object.globalize_locales.each do |locale|
Globalize.with_locale(locale) do
+ localized_attr_name = @object.localized_attr_name_for(method, locale)
+
label_without_locale = @object.class.human_attribute_name(method)
final_options = @template.merge_translatable_field_options(options, locale)
.reverse_merge(label: label_without_locale)
- @template.concat send(field_type, "#{method}_#{locale}", final_options)
+
+ @template.concat send(field_type, localized_attr_name, final_options)
end
end
end
diff --git a/app/models/banner.rb b/app/models/banner.rb
index 39c9ac2e9..37824d01f 100644
--- a/app/models/banner.rb
+++ b/app/models/banner.rb
@@ -5,7 +5,7 @@ class Banner < ActiveRecord::Base
translates :title, touch: true
translates :description, touch: true
- globalize_accessors locales: I18n.available_locales.map { |l| l.to_s.underscore.to_sym }
+ globalize_accessors
validates :title, presence: true,
length: { minimum: 2 }
diff --git a/app/models/budget/investment/milestone.rb b/app/models/budget/investment/milestone.rb
index f31f990ad..1790f7323 100644
--- a/app/models/budget/investment/milestone.rb
+++ b/app/models/budget/investment/milestone.rb
@@ -8,7 +8,7 @@ class Budget
accepted_content_types: [ "application/pdf" ]
translates :title, :description, touch: true
- globalize_accessors locales: I18n.available_locales.map { |l| l.to_s.underscore.to_sym }
+ globalize_accessors
belongs_to :investment
belongs_to :status, class_name: 'Budget::Investment::Status'
diff --git a/app/views/admin/shared/_globalize_locales.html.erb b/app/views/admin/shared/_globalize_locales.html.erb
index 977fa6d9d..c4a0cf5bc 100644
--- a/app/views/admin/shared/_globalize_locales.html.erb
+++ b/app/views/admin/shared/_globalize_locales.html.erb
@@ -1,9 +1,9 @@
<% I18n.available_locales.each do |locale| %>
<%= link_to t("admin.translations.remove_language"), "#",
- id: "delete-#{neutral_locale(locale)}",
+ id: "delete-#{locale}",
style: show_delete?(locale),
class: 'float-right delete js-delete-language',
- data: { locale: neutral_locale(locale) } %>
+ data: { locale: locale } %>
<% end %>
@@ -13,7 +13,7 @@
<%= link_to name_for_locale(locale), "#",
style: css_to_display_translation?(resource, locale),
class: "js-globalize-locale-link #{highlight_current?(locale)}",
- data: { locale: neutral_locale(locale) },
+ data: { locale: locale },
remote: true %>
<% end %>
diff --git a/app/views/admin/site_customization/information_texts/_globalize_locales.html.erb b/app/views/admin/site_customization/information_texts/_globalize_locales.html.erb
index f69e48897..f472ca263 100644
--- a/app/views/admin/site_customization/information_texts/_globalize_locales.html.erb
+++ b/app/views/admin/site_customization/information_texts/_globalize_locales.html.erb
@@ -1,9 +1,9 @@
<% I18n.available_locales.each do |locale| %>
<%= link_to t("admin.translations.remove_language"), "#",
- id: "delete-#{neutral_locale(locale)}",
+ id: "delete-#{locale}",
style: show_delete?(locale),
class: 'float-right delete js-delete-language',
- data: { locale: neutral_locale(locale) } %>
+ data: { locale: locale } %>
<% end %>
@@ -13,7 +13,7 @@
<%= link_to name_for_locale(locale), "#",
style: site_customization_display_translation?(locale),
class: "js-globalize-locale-link #{highlight_current?(locale)}",
- data: { locale: neutral_locale(locale) },
+ data: { locale: locale },
remote: true %>
<% end %>
diff --git a/app/views/budgets/investments/milestones/_milestone.html.erb b/app/views/budgets/investments/milestones/_milestone.html.erb
index 79c8c05a0..7f71d0f29 100644
--- a/app/views/budgets/investments/milestones/_milestone.html.erb
+++ b/app/views/budgets/investments/milestones/_milestone.html.erb
@@ -24,11 +24,9 @@
<%= image_tag(milestone.image_url(:large), { id: "image_#{milestone.id}", alt: milestone.image.title, class: "margin" }) if milestone.image.present? %>
- <% globalize(neutral_locale(locale)) do %>
-
- <%= text_with_links milestone.description %>
-
- <% end %>
+
+ <%= text_with_links milestone.description %>
+
<% if milestone.documents.present? %>
diff --git a/db/dev_seeds/banners.rb b/db/dev_seeds/banners.rb
index fa2710a06..1717615a2 100644
--- a/db/dev_seeds/banners.rb
+++ b/db/dev_seeds/banners.rb
@@ -10,8 +10,7 @@ section "Creating banners" do
post_ended_at: rand((Time.current - 1.day)..(Time.current + 1.week)),
created_at: rand((Time.current - 1.week)..Time.current))
I18n.available_locales.map do |locale|
- neutral_locale = locale.to_s.downcase.underscore.to_sym
- Globalize.with_locale(neutral_locale) do
+ Globalize.with_locale(locale) do
banner.description = "Description for locale #{locale}"
banner.title = "Title for locale #{locale}"
banner.save!
diff --git a/db/dev_seeds/budgets.rb b/db/dev_seeds/budgets.rb
index 883919962..8a95334e5 100644
--- a/db/dev_seeds/budgets.rb
+++ b/db/dev_seeds/budgets.rb
@@ -143,8 +143,7 @@ section "Creating investment milestones" do
Budget::Investment.all.each do |investment|
milestone = Budget::Investment::Milestone.new(investment_id: investment.id, publication_date: Date.tomorrow)
I18n.available_locales.map do |locale|
- neutral_locale = locale.to_s.downcase.underscore.to_sym
- Globalize.with_locale(neutral_locale) do
+ Globalize.with_locale(locale) do
milestone.description = "Description for locale #{locale}"
milestone.title = I18n.l(Time.current, format: :datetime)
milestone.save!