diff options
| author | Brandon Invergo <brandon@invergo.net> | 2013-05-19 13:23:17 +0200 |
|---|---|---|
| committer | Brandon Invergo <brandon@invergo.net> | 2013-05-19 13:23:17 +0200 |
| commit | e02b7b6b3bd6b20c65aeb2ca5fd1e0030b631b88 (patch) | |
| tree | 988b9505a649f824f2ea53ac04bdfbc3a0da983a /mediagoblin/mg_globals.py | |
| parent | 60c42337ef7bc9b4aec0d3f1b2cb5f19a09d9a7f (diff) | |
| parent | 041d2fd785f9b3e18f9fd758f91dbfa7715d317c (diff) | |
| download | mediagoblin-e02b7b6b3bd6b20c65aeb2ca5fd1e0030b631b88.tar.lz mediagoblin-e02b7b6b3bd6b20c65aeb2ca5fd1e0030b631b88.tar.xz mediagoblin-e02b7b6b3bd6b20c65aeb2ca5fd1e0030b631b88.zip | |
Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
Diffstat (limited to 'mediagoblin/mg_globals.py')
| -rw-r--r-- | mediagoblin/mg_globals.py | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/mediagoblin/mg_globals.py b/mediagoblin/mg_globals.py index fffa1dda..26ed66fa 100644 --- a/mediagoblin/mg_globals.py +++ b/mediagoblin/mg_globals.py @@ -26,15 +26,9 @@ import threading # General mediagoblin globals ############################# -# mongokit.Connection -db_connection = None - -# mongokit.Connection +# SQL database engine database = None -# beaker's cache manager -cache = None - # should be the same as the public_store = None queue_store = None @@ -45,11 +39,13 @@ workbench_manager = None # A thread-local scope thread_scope = threading.local() -# gettext -thread_scope.translations = gettext.find( +# 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 |