Changeset d7b4ae in indico

Timestamp:

08/01/11 18:01:56 (22 months ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

master, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, 4c7d4152dff271ba5df5a8606605969cab454080

Children:

0d631e0

Parents:

6c87d3

git-author:

Pedro Ferreira <jose.pedro.ferreira@…> (08/01/11 17:14:22)

git-committer:

Pedro Ferreira <jose.pedro.ferreira@…> (08/01/11 18:01:56)

Message:

[FIX] Lazy translation - no "caching"

• Babel LazyProxy? objects are not stateless and were thus provoking the accidental "caching" of translated strings;
• Added Django-like gettext_lazy, that forces lazy translation if there is already a defined locale;
• Will propose patch upstream (Babel);

Location:

indico/util

Files:

• i18n.py (modified) (1 diff)
• translations.py (modified) (5 diffs)

indico/util/i18n.py

@@ -37 +37 @@
     ngettext = ungettext = lazyTranslations.ungettext
 
-except:
+    gettext_lazy = forceLazyTranslations.ugettext
+
+except ImportError:
     # no Babel
     pass

indico/util/translations.py

@@ -20 +20 @@
 
 
-from babel.support import Translations, LazyProxy
+from babel.support import Translations, LazyProxy as _LazyProxy
 from babel.core import Locale
 from gettext import NullTranslations
@@ -30 +30 @@
 nullTranslations = NullTranslations()
 
+
+class LazyProxy(_LazyProxy):
+    """
+    Stateless version of Babel's LazyProxy
+    """
+    def value(self):
+        # just return
+        return  self._func(*self._args, **self._kwargs)
+    value = property(value)
 
 
@@ -45 +54 @@
 def _tr_eval(func, *args, **kwargs):
     # ok, eval time... is there a translation?
+
     if 'translation' in ContextManager.get():
         # yes? good, let's do it
         tr = ContextManager.get('translation')
     else:
-        # no? too bad, just don't transate anything
+        # no? too bad, just don't translate anything
         tr = nullTranslations
-    return getattr(tr, func)(*args, **kwargs).encode('utf-8')
+    res = getattr(tr, func)(*args, **kwargs).encode('utf-8')
+    return res
 
 
@@ -59 +70 @@
     It will be then done when the value is finally used
     """
+
+    def __init__(self, forceLazy=False):
+        self.force = forceLazy
+        super(LazyTranslations, self).__init__()
+
     def _wrapper(self, func, *args, **kwargs):
-        # if there is a locale already defined
-        if 'translation' in ContextManager.get():
+        # if there is a locale already defined, use it
+        # (unless we have forced "lazy mode")
+        if 'translation' in ContextManager.get() and not self.force:
             # straight translation
             translation = ContextManager.get('translation')
@@ -77 +94 @@
 
 lazyTranslations = LazyTranslations()
+forceLazyTranslations = LazyTranslations(forceLazy=True)
 lazyTranslations.install(unicode=True)