From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Wed, 27 Feb 2013 19:25:42 +0000 (-0600)
Subject: Fixing translations stuff for command line tools and such.
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=a808364e7f4b5e08e06bcd25c584fe9d956f9bb4;p=mediagoblin.git

Fixing translations stuff for command line tools and such.

We had switched mg_globals to have the default translations set to
None so that it would be set up by the mediagoblin app later.
However, this would mean that things like scripts would try to call
gettext and error out.

Thanks to Tumulte for catching this.

This commit sponsored by Aurimas Fišeras.  Thank you!
---

diff --git a/mediagoblin/mg_globals.py b/mediagoblin/mg_globals.py
index 8c7c64c2..e4b94bdc 100644
--- a/mediagoblin/mg_globals.py
+++ b/mediagoblin/mg_globals.py
@@ -42,8 +42,13 @@ workbench_manager = None
 # A thread-local scope
 thread_scope = threading.local()
 
-# gettext (this will be populated on demand with gettext.Translations)
-thread_scope.translations = None
+# gettext (this needs to default to English so it doesn't break
+#   in case we're running a script without the app like
+#   ./bin/gmg theme assetlink)
+thread_scope.translations = gettext.translation(
+    'mediagoblin',
+    pkg_resources.resource_filename(
+        'mediagoblin', 'i18n'), ['en'], fallback=True)
 
 # app and global config objects
 app_config = None