Use OSM tiles in Geolocation plugin #5466

[mediagoblin.git] / mediagoblin / mg_globals.py

diff --git a/mediagoblin/mg_globals.py b/mediagoblin/mg_globals.py
index 739f44eed512c512a731470e7a03788a7bc3c70c..7da316804ea2de42ace6b5479221ce8967b2e874 100644 (file)
--- a/mediagoblin/mg_globals.py
+++ b/mediagoblin/mg_globals.py
@@ -1,39 +1,52 @@
+# GNU MediaGoblin -- federated, autonomous media hosting
+# 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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 In some places, we need to access the database, public_store, queue_store
 """
 
 import gettext
 import pkg_resources
+import threading
 
+import six
 
 #############################
 # General mediagoblin globals
 #############################
 
-# mongokit.Connection
-db_connection = None
-
-# mongokit.Connection
+# SQL database engine
 database = None
 
 # should be the same as the 
 public_store = None
 queue_store = None
 
-# Dump mail to stdout instead of sending it:
-email_debug_mode = False
-
-# Address for sending out mails
-email_sender_address = 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
@@ -52,7 +65,7 @@ def setup_globals(**kwargs):
     """
     from mediagoblin import mg_globals
 
-    for key, value in kwargs.iteritems():
+    for key, value in six.iteritems(kwargs):
         if not hasattr(mg_globals, key):
             raise AssertionError("Global %s not known" % key)
         setattr(mg_globals, key, value)