From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Tue, 9 Aug 2011 03:51:03 +0000 (-0500)
Subject: Provide a pass_to_ugettext method and set up gettext to default to English.
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=03e5bd6d352f9479eefd3c7ad1f39137bd9ba17d;p=mediagoblin.git

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 d26dc6dc..ed7be841 100644
--- 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):