diff options
| author | Mike Linksvayer <ml@gondwanaland.com> | 2012-12-20 12:50:43 -0800 |
|---|---|---|
| committer | Mike Linksvayer <ml@gondwanaland.com> | 2012-12-20 12:50:43 -0800 |
| commit | 1d0148aef1493467dacb6c39c4e080ee4a5246d2 (patch) | |
| tree | 5213418660d4e079eb8dac6bc8ea2e4fdc140088 /mediagoblin/mg_globals.py | |
| parent | 200433dc38a2139462e0331be36ee49a80a81a12 (diff) | |
| parent | 5c99cd01a70f2d597ac7669e8d944ddf79b05281 (diff) | |
| download | mediagoblin-1d0148aef1493467dacb6c39c4e080ee4a5246d2.tar.lz mediagoblin-1d0148aef1493467dacb6c39c4e080ee4a5246d2.tar.xz mediagoblin-1d0148aef1493467dacb6c39c4e080ee4a5246d2.zip | |
Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
Conflicts:
docs/source/siteadmin/media-types.rst
Diffstat (limited to 'mediagoblin/mg_globals.py')
| -rw-r--r-- | mediagoblin/mg_globals.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/mediagoblin/mg_globals.py b/mediagoblin/mg_globals.py index fffa1dda..356a944d 100644 --- a/mediagoblin/mg_globals.py +++ b/mediagoblin/mg_globals.py @@ -45,11 +45,8 @@ workbench_manager = None # A thread-local scope thread_scope = threading.local() -# gettext -thread_scope.translations = gettext.find( - 'mediagoblin', - pkg_resources.resource_filename( - 'mediagoblin', 'translations'), ['en']) +# gettext (this will be populated on demand with gettext.Translations) +thread_scope.translations = None # app and global config objects app_config = None |