More unicode fixes in the test suite

[mediagoblin.git] / mediagoblin / mg_globals.py

diff --git a/mediagoblin/mg_globals.py b/mediagoblin/mg_globals.py
index 4aeefc3239ef7e8eb165c1264066102dd7d20ffa..356a944d981cfa86efa941207ec528d2cb0b7d1c 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,6 +19,7 @@ In some places, we need to access the database, public_store, queue_store
 
 import gettext
 import pkg_resources
+import threading
 
 
 #############################
@@ -31,6 +32,9 @@ db_connection = None
 # mongokit.Connection
 database = None
 
+# beaker's cache manager
+cache = None
+
 # should be the same as the 
 public_store = None
 queue_store = None
@@ -38,11 +42,11 @@ queue_store = None
 # A WorkBenchManager
 workbench_manager = None
 
-# gettext
-translations = gettext.find(
-    'mediagoblin',
-    pkg_resources.resource_filename(
-    'mediagoblin', 'translations'), ['en'])
+# A thread-local scope
+thread_scope = threading.local()
+
+# gettext (this will be populated on demand with gettext.Translations)
+thread_scope.translations = None
 
 # app and global config objects
 app_config = None