Add ugettext and ungettext helpers to mediagoblin._compat.

diff --git a/mediagoblin/_compat.py b/mediagoblin/_compat.py
index 38c71524d372c0e8a7e8ebe5d30807e823a89f7e..a6b775fc4e4f2eeae930de0b6009780a2d15bc40 100644 (file)
--- a/mediagoblin/_compat.py
+++ b/mediagoblin/_compat.py
@@ -2,9 +2,15 @@ import sys
 
 from six import PY3, iteritems
 
+from mediagoblin import mg_globals
+
 if PY3:
     from email.mime.text import MIMEText
     from urllib import parse as urlparse
+    ugettext = mg_globals.thread_scope.translations.gettext
+    ungettext = mg_globals.thread_scope.translations.ngettext
 else:
     from email.MIMEText import MIMEText
     import urlparse
+    ugettext = mg_globals.thread_scope.translations.ugettext
+    ungettext = mg_globals.thread_scope.translations.ungettext

diff --git a/mediagoblin/tools/template.py b/mediagoblin/tools/template.py
index e5acdf459f839ea4f1a1f48bb19fb2453ea9882d..359ddd380f4207e698cd525af20b8ab2b2a6d163 100644 (file)
--- a/mediagoblin/tools/template.py
+++ b/mediagoblin/tools/template.py
@@ -33,6 +33,7 @@ from mediagoblin.tools.pluginapi import get_hook_templates, hook_transform
 from mediagoblin.tools.timesince import timesince
 from mediagoblin.meddleware.csrf import render_csrf_form_token
 
+from mediagoblin._compat import ugettext, ungettext
 
 SETUP_JINJA_ENVS = {}
 
@@ -66,9 +67,7 @@ def get_jinja_env(template_loader, locale):
             'jinja2.ext.i18n', 'jinja2.ext.autoescape',
             TemplateHookExtension] + local_exts)
 
-    template_env.install_gettext_callables(
-        mg_globals.thread_scope.translations.ugettext,
-        mg_globals.thread_scope.translations.ungettext)
+    template_env.install_gettext_callables(ugettext, ungettext)
 
     # All templates will know how to ...
     # ... fetch all waiting messages and remove them from the queue