Fixes where User id in API would return url rather than host

[mediagoblin.git] / mediagoblin / mg_globals.py

diff --git a/mediagoblin/mg_globals.py b/mediagoblin/mg_globals.py
index 4aeefc3239ef7e8eb165c1264066102dd7d20ffa..26ed66fab87eedae3fcfb22210e9efb114457c65 100644 (file)
--- a/mediagoblin/mg_globals.py
+++ b/mediagoblin/mg_globals.py
@@ -1,5 +1,5 @@
 # GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011 MediaGoblin contributors.  See AUTHORS.
+# Copyright (C) 2011, 2012 MediaGoblin contributors.  See AUTHORS.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -19,16 +19,14 @@ In some places, we need to access the database, public_store, queue_store
 
 import gettext
 import pkg_resources
+import threading
 
 
 #############################
 # General mediagoblin globals
 #############################
 
-# mongokit.Connection
-db_connection = None
-
-# mongokit.Connection
+# SQL database engine
 database = None
 
 # should be the same as the 
@@ -38,11 +36,16 @@ queue_store = None
 # A WorkBenchManager
 workbench_manager = None
 
-# gettext
-translations = gettext.find(
+# A thread-local scope
+thread_scope = threading.local()
+
+# 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', 'translations'), ['en'])
+        'mediagoblin', 'i18n'), ['en'], fallback=True)
 
 # app and global config objects
 app_config = None