From 82d2284ce6282262f2f36c9c79538409b2c05ad2 Mon Sep 17 00:00:00 2001
From: Roman Rizzi <rizziromanalejandro@gmail.com>
Date: Wed, 20 Jan 2021 17:43:00 -0300
Subject: [PATCH] FIX: I18n couldn't find translations. (#11774)

"I18n.t(key, locale: locale)" fails to find the correct translation in some cases. We should always wrap it with the "I18n.with_locale(locale)" method.

Also, reverting an override wasn't always possible because the serializer always used "I18n.locale" as the locale.
---
 app/controllers/admin/site_texts_controller.rb | 15 +++++++++------
 app/serializers/site_text_serializer.rb        |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/controllers/admin/site_texts_controller.rb b/app/controllers/admin/site_texts_controller.rb
index ca13e68895e..313b578a83f 100644
--- a/app/controllers/admin/site_texts_controller.rb
+++ b/app/controllers/admin/site_texts_controller.rb
@@ -80,7 +80,7 @@ class Admin::SiteTextsController < Admin::AdminController
     site_text = find_site_text(locale)
     value = site_text[:value] = params.dig(:site_text, :value)
     id = site_text[:id]
-    old_value = I18n.t(id, locale: locale)
+    old_value = I18n.with_locale(locale) { I18n.t(id) }
 
     translation_override = TranslationOverride.upsert!(locale, id, value)
 
@@ -108,7 +108,7 @@ class Admin::SiteTextsController < Admin::AdminController
 
     site_text = find_site_text(locale)
     id = site_text[:id]
-    old_text = I18n.t(id, locale: locale)
+    old_text = I18n.with_locale(locale) { I18n.t(id) }
     TranslationOverride.revert!(locale, id)
 
     site_text = find_site_text(locale)
@@ -162,8 +162,8 @@ class Admin::SiteTextsController < Admin::AdminController
       value = override&.first
     end
 
-    value ||= I18n.t(key, locale: locale)
-    { id: key, value: value }
+    value ||= I18n.with_locale(locale) { I18n.t(key) }
+    { id: key, value: value, locale: locale }
   end
 
   PLURALIZED_REGEX = /(.*)\.(zero|one|two|few|many|other)$/
@@ -187,8 +187,11 @@ class Admin::SiteTextsController < Admin::AdminController
 
   def find_translations(query, overridden, locale)
     translations = Hash.new { |hash, key| hash[key] = {} }
+    search_results = I18n.with_locale(locale) do
+      I18n.search(query, overridden: overridden)
+    end
 
-    I18n.search(query, overridden: overridden, locale: locale).each do |key, value|
+    search_results.each do |key, value|
       if PLURALIZED_REGEX.match(key)
         translations[$1][$2] = value
       else
@@ -220,7 +223,7 @@ class Admin::SiteTextsController < Admin::AdminController
 
   def fix_plural_keys(key, value, locale)
     value = value.with_indifferent_access
-    plural_keys = I18n.t('i18n.plural.keys', locale: locale)
+    plural_keys = I18n.with_locale(locale) { I18n.t('i18n.plural.keys') }
     return value if value.keys.size == plural_keys.size && plural_keys.all? { |k| value.key?(k) }
 
     fallback_value = I18n.t(key, locale: :en, default: {})
diff --git a/app/serializers/site_text_serializer.rb b/app/serializers/site_text_serializer.rb
index 8415bc5bc3c..0946eb2fb73 100644
--- a/app/serializers/site_text_serializer.rb
+++ b/app/serializers/site_text_serializer.rb
@@ -15,7 +15,7 @@ class SiteTextSerializer < ApplicationSerializer
     if options[:overridden_keys]
       options[:overridden_keys].include?(object[:id])
     else
-      TranslationOverride.exists?(locale: I18n.locale, translation_key: object[:id])
+      TranslationOverride.exists?(locale: object[:locale], translation_key: object[:id])
     end
   end