Merge pull request #644 from mensfeld/master

Make translations loading thread-safe
ruby-i18n · Dec 5, 2022 · 75fc49b · 75fc49b
2 parents fbc9b2b + 6db0531
commit 75fc49b
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/lib/i18n/backend/simple.rb b/lib/i18n/backend/simple.rb
@@ -21,6 +21,9 @@ module Backend
     class Simple
       module Implementation
         include Base
+
+        # Mutex to ensure that concurrent translations loading will be thread-safe
+        MUTEX = Mutex.new
 
         def initialized?
           @initialized ||= false
@@ -68,7 +71,11 @@ def translations(do_init: false)
           # call `init_translations`
           init_translations if do_init && !initialized?
 
-          @translations ||= Concurrent::Hash.new { |h, k| h[k] = Concurrent::Hash.new }
+          @translations ||= Concurrent::Hash.new do |h, k|
+            MUTEX.synchronize do
+              h[k] = Concurrent::Hash.new
+            end
+          end
         end
 
       protected