From 7f4ca91e068240286e634e471f3c720487efb83d Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 18 Nov 2015 16:05:53 -0500
Subject: [PATCH] FIX: I18n overrides should be multisite aware

---
 lib/freedom_patches/translate_accelerator.rb | 2 +-
 lib/i18n/backend/discourse_i18n.rb           | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/freedom_patches/translate_accelerator.rb b/lib/freedom_patches/translate_accelerator.rb
index 77678081499..604b85d04cc 100644
--- a/lib/freedom_patches/translate_accelerator.rb
+++ b/lib/freedom_patches/translate_accelerator.rb
@@ -53,7 +53,7 @@ module I18n
       return translate_no_cache(key, *args) if args.length > 0
 
       @cache ||= LruRedux::ThreadSafeCache.new(LRU_CACHE_SIZE)
-      k = "#{key}#{config.locale}#{config.backend.object_id}"
+      k = "#{key}#{config.locale}#{config.backend.object_id}#{RailsMultisite::ConnectionManagement.current_db}"
 
       @cache.getset(k) do
         translate_no_cache(key).freeze
diff --git a/lib/i18n/backend/discourse_i18n.rb b/lib/i18n/backend/discourse_i18n.rb
index c901601bcc7..8b18e6f4082 100644
--- a/lib/i18n/backend/discourse_i18n.rb
+++ b/lib/i18n/backend/discourse_i18n.rb
@@ -23,15 +23,16 @@ module I18n
 
       def overrides_for(locale)
         @overrides ||= {}
-        return @overrides[locale] if @overrides[locale]
+        site_overrides = @overrides[RailsMultisite::ConnectionManagement.current_db] ||= {}
 
-        @overrides[locale] = {}
+        return site_overrides[locale] if site_overrides[locale]
+        locale_overrides = site_overrides[locale] = {}
 
         TranslationOverride.where(locale: locale).pluck(:translation_key, :value).each do |tuple|
-          @overrides[locale][tuple[0]] = tuple[1]
+          locale_overrides[tuple[0]] = tuple[1]
         end
 
-        @overrides[locale]
+        locale_overrides
       end
 
       # In some environments such as migrations we don't want to use overrides.