Cleanup mediagoblin._compat and fix translation tests.

2 files changed, 14 insertions, 6 deletions

diff --git a/mediagoblin/tools/template.py b/mediagoblin/tools/template.py
index 359ddd38..b01196fd 100644
--- a/mediagoblin/tools/template.py
+++ b/mediagoblin/tools/template.py
@@ -14,6 +14,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import six
 
 import jinja2
 from jinja2.ext import Extension
@@ -33,8 +34,6 @@ 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 = {}
 
 
@@ -67,7 +66,12 @@ def get_jinja_env(template_loader, locale):
             'jinja2.ext.i18n', 'jinja2.ext.autoescape',
             TemplateHookExtension] + local_exts)
 
-    template_env.install_gettext_callables(ugettext, ungettext)
+    if six.PY2:
+        template_env.install_gettext_callables(mg_globals.thread_scope.translations.ugettext,
+                                           mg_globals.thread_scope.translations.ungettext)
+    else:
+        template_env.install_gettext_callables(mg_globals.thread_scope.translations.gettext,
+                                           mg_globals.thread_scope.translations.ngettext)
 
     # All templates will know how to ...
     # ... fetch all waiting messages and remove them from the queue
diff --git a/mediagoblin/tools/translate.py b/mediagoblin/tools/translate.py
index e6df612d..f8a59aee 100644
--- a/mediagoblin/tools/translate.py
+++ b/mediagoblin/tools/translate.py
@@ -17,12 +17,12 @@
 import gettext
 import pkg_resources
 
+import six
 
 from babel import localedata
 from babel.support import LazyProxy
 
 from mediagoblin import mg_globals
-from mediagoblin._compat import ugettext, ungettext
 
 ###################
 # Translation tools
@@ -147,7 +147,9 @@ def pass_to_ugettext(*args, **kwargs):
     The reason we can't have a global ugettext method is because
     mg_globals gets swapped out by the application per-request.
     """
-    return ugettext(*args, **kwargs)
+    if six.PY2:
+        return mg_globals.thread_scope.translations.ugettext(*args, **kwargs)
+    return mg_globals.thread_scope.translations.gettext(*args, **kwargs)
 
 def pass_to_ungettext(*args, **kwargs):
     """
@@ -156,7 +158,9 @@ def pass_to_ungettext(*args, **kwargs):
     The reason we can't have a global ugettext method is because
     mg_globals gets swapped out by the application per-request.
     """
-    return ungettext(*args, **kwargs)
+    if six.PY2:
+        return mg_globals.thread_scope.translations.ungettext(*args, **kwargs)
+    return mg_globals.thread_scope.translations.ngettext(*args, **kwargs)
 
 
 def lazy_pass_to_ugettext(*args, **kwargs):