Ticket #14894: trans_multithreading_fix.diff

django/utils/translation/trans_real.py

@@ -4 +4 @@
 import os
 import re
 import sys
+import threading
 import warnings
 import gettext as gettext_module
 from cStringIO import StringIO
@@ -17 +18 @@
 _translations = {}
 _active = {}
 
+_translations_lock = threading.Lock()
+
 # The default translation is based on the settings file.
 _default = None
 
@@ -144 +147 @@
         # the same translation object (thus, merging en-us with a local update
         # doesn't affect en-gb), even though they will both use the core "en"
         # translation. So we have to subvert Python's internal gettext caching.
+        _translations_lock.acquire()
         base_lang = lambda x: x.split('-', 1)[0]
         if base_lang(lang) in [base_lang(trans) for trans in _translations]:
             res._info = res._info.copy()
@@ -176 +180 @@
             if fallback is not None:
                 res = fallback
             else:
+                _translations_lock.release()
                 return gettext_module.NullTranslations()
         _translations[lang] = res
+        _translations_lock.release()
         return res
 
     default_translation = _fetch(settings.LANGUAGE_CODE)