Merge pull request #548 from jonian/thread_safe_fallbacks

[WIP] Thread safe fallbacks
ruby-i18n · Jan 6, 2021 · 63a79cb · 63a79cb
2 parents ae0c6df + 45bbb7d
commit 63a79cb
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/lib/i18n/backend/fallbacks.rb b/lib/i18n/backend/fallbacks.rb
@@ -16,11 +16,13 @@ class << self
     # Returns the current fallbacks implementation. Defaults to +I18n::Locale::Fallbacks+.
     def fallbacks
       @@fallbacks ||= I18n::Locale::Fallbacks.new
+      Thread.current[:i18n_fallbacks] || @@fallbacks
     end
 
     # Sets the current fallbacks implementation. Use this to set a different fallbacks implementation.
     def fallbacks=(fallbacks)
       @@fallbacks = fallbacks.is_a?(Array) ? I18n::Locale::Fallbacks.new(fallbacks) : fallbacks
+      Thread.current[:i18n_fallbacks] = @@fallbacks
     end
   end
 

diff --git a/test/backend/fallbacks_test.rb b/test/backend/fallbacks_test.rb
@@ -109,8 +109,18 @@ def setup
   end
 
   test "multi-threaded fallbacks" do
-    Thread.new do
+    I18n.fallbacks = [:en]
 
+    thread = Thread.new do
+      I18n.fallbacks = [:de]
+    end
+
+    begin
+      thread.join
+      assert_equal 'Bar in :en', I18n.t(:bar, :locale => :'pt-BR')
+    ensure
+      thread.exit
+      I18n.fallbacks = I18n::Locale::Fallbacks.new
     end
   end
 end