From 5c1e0bd94951fb16de375526ffaf47a6e71f8928 Mon Sep 17 00:00:00 2001 From: Angel Perez Date: Mon, 23 Jul 2018 10:52:45 -0400 Subject: [PATCH] Don't use hardcoded locale when appending/creating I18n keys --- .../site_customization/information_texts_controller.rb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/controllers/admin/site_customization/information_texts_controller.rb b/app/controllers/admin/site_customization/information_texts_controller.rb index 8ea90382d..278b6a03d 100644 --- a/app/controllers/admin/site_customization/information_texts_controller.rb +++ b/app/controllers/admin/site_customization/information_texts_controller.rb @@ -57,10 +57,15 @@ class Admin::SiteCustomization::InformationTextsController < Admin::SiteCustomiz def append_or_create_keys @content = {} + translations = if params[:locale].present? + I18n.backend.send(:translations)[params[:locale].to_sym] + else + I18n.backend.send(:translations)[I18n.locale.to_sym] + end - I18n.backend.send(:translations)[:en].each do |k, v| + translations.each do |k, v| @content[k.to_s] = flat_hash(v).keys - .map{ |s| @existing_keys["#{k.to_s}.#{s}"].nil? ? + .map { |s| @existing_keys["#{k.to_s}.#{s}"].nil? ? I18nContent.new(key: "#{k.to_s}.#{s}") : @existing_keys["#{k.to_s}.#{s}"] } end