Provide a pass_to_ugettext method and set up gettext to default to English.

diff --git a/mediagoblin/util.py b/mediagoblin/util.py
index d26dc6dc6e7129a59c82410b196767b5ca7b6309..ed7be8411b69bfcc5fac7cd3245a697d164fce48 100644 (file)
--- a/mediagoblin/util.py
+++ b/mediagoblin/util.py
@@ -478,6 +478,22 @@ def setup_gettext(locale):
         translations=this_gettext)
 
 
+# Force en to be setup before anything else so that
+# mg_globals.translations is never None
+setup_gettext('en')
+
+
+def pass_to_ugettext(*args, **kwargs):
+    """
+    Pass a translation on to the appropriate ugettext method.
+
+    The reason we can't have a global ugettext method is because
+    mg_globals gets swapped out by the application per-request.
+    """
+    return mg_globals.translations.ugettext(
+        *args, **kwargs)
+
+
 PAGINATION_DEFAULT_PER_PAGE = 30
 
 class Pagination(object):