diff --git a/app/controllers/admin/site_customization/information_texts_controller.rb b/app/controllers/admin/site_customization/information_texts_controller.rb index 6f2e6777d..6a8ecc1f3 100644 --- a/app/controllers/admin/site_customization/information_texts_controller.rb +++ b/app/controllers/admin/site_customization/information_texts_controller.rb @@ -4,16 +4,21 @@ class Admin::SiteCustomization::InformationTextsController < Admin::SiteCustomiz def index existing_keys = {} @tab = params[:tab] || :debates - I18nContent.begins_with_key(@tab).all. - map{|content| existing_keys[content.key] = content } + + I18nContent.begins_with_key(@tab) + .all + .map{ |content| existing_keys[content.key] = content } + @content = {} + I18n.backend.send(:translations)[:en].each do |k,v| - @content[k.to_s] = flat_hash(v).keys.map{|s| existing_keys["#{k.to_s}.#{s}"].nil? ? + @content[k.to_s] = flat_hash(v).keys + .map{ |s| existing_keys["#{k.to_s}.#{s}"].nil? ? I18nContent.new(key: "#{k.to_s}.#{s}") : existing_keys["#{k.to_s}.#{s}"] } end - @content = @content[@tab.to_s] + @content = @content[@tab.to_s] end def update @@ -25,6 +30,7 @@ class Admin::SiteCustomization::InformationTextsController < Admin::SiteCustomiz text.save end end + redirect_to admin_site_customization_information_texts_path end @@ -48,16 +54,16 @@ class Admin::SiteCustomization::InformationTextsController < Admin::SiteCustomiz end def delete_translations - languages_to_delete = params[:delete_translations].select { |k, v| params[:delete_translations][k] == "1" }.keys + languages_to_delete = params[:delete_translations].select { |k, v| params[:delete_translations][k] == '1' }.keys languages_to_delete.each do |locale| I18nContentTranslation.destroy_all(locale: locale) end end - def flat_hash(h, f=nil, g={}) + def flat_hash(h, f = nil, g = {}) return g.update({ f => h }) unless h.is_a? Hash h.each { |k, r| flat_hash(r, [f,k].compact.join('.'), g) } - g + return g end end diff --git a/app/models/i18n_content.rb b/app/models/i18n_content.rb index 48192d0ef..d7914c83a 100644 --- a/app/models/i18n_content.rb +++ b/app/models/i18n_content.rb @@ -1,11 +1,11 @@ class I18nContent < ActiveRecord::Base scope :by_key, -> (key){ where(key: key) } - scope :begins_with_key, -> (key){ where("key LIKE ?", "#{key}?%") } + scope :begins_with_key, -> (key){ where("key ILIKE ?", "#{key}?%") } validates :key, uniqueness: true translates :value, touch: true globalize_accessors locales: [:en, :es, :fr, :nl, :val, :pt_br] -end \ No newline at end of file +end diff --git a/app/views/admin/site_customization/information_texts/_form.html.erb b/app/views/admin/site_customization/information_texts/_form.html.erb index d3c0489b7..665db0a8c 100644 --- a/app/views/admin/site_customization/information_texts/_form.html.erb +++ b/app/views/admin/site_customization/information_texts/_form.html.erb @@ -8,7 +8,7 @@ <% group.each do |content| %> <%= t(content[:key]) %> <% content.globalize_locales.each do |locale| %> - <%= render 'form_field', content: content, locale: locale %> + <%= render "form_field", content: content, locale: locale %> <% end %> <% end %> <% end %> 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 f247870f4..7ee77299b 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 @@ -2,8 +2,9 @@ <%= hidden_field_tag "contents[content_#{content.key}][id]", content.key %> <%= text_area_tag "contents[content_#{content.key}]values[value_#{locale}]", content.send("value_#{locale}"), - {rows: 5, - class: "js-globalize-attribute", - style: display_translation?(locale), - data: { locale: locale }} %> + { rows: 5, + class: "js-globalize-attribute", + style: display_translation?(locale), + data: { locale: locale } + } %> <% end %> diff --git a/app/views/welcome/welcome.html.erb b/app/views/welcome/welcome.html.erb index abd3c15a0..d647ba8e6 100644 --- a/app/views/welcome/welcome.html.erb +++ b/app/views/welcome/welcome.html.erb @@ -1,9 +1,7 @@

<%= t("welcome.welcome.title") %>

-

<%= t("welcome.welcome.user_permission_info") %>

-1