make media_manager a property of MediaEntry in mixin.py

[mediagoblin.git] / mediagoblin / app.py

diff --git a/mediagoblin/app.py b/mediagoblin/app.py
index 3a2d00f0663ad0d8f904015d0161fe8968e926d7..876ded4ef2f35d3a3d5b028f3321923ce9cbc75c 100644 (file)
--- a/mediagoblin/app.py
+++ b/mediagoblin/app.py
@@ -31,7 +31,7 @@ from mediagoblin.mg_globals import setup_globals
 from mediagoblin.init.celery import setup_celery_from_config
 from mediagoblin.init.plugins import setup_plugins
 from mediagoblin.init import (get_jinja_loader, get_staticdirector,
-    setup_global_and_app_config, setup_workbench, setup_database,
+    setup_global_and_app_config, setup_locales, setup_workbench, setup_database,
     setup_storage, setup_beaker_cache)
 from mediagoblin.tools.pluginapi import PluginManager
 
@@ -68,6 +68,9 @@ class MediaGoblinApp(object):
         # Setup other connections / useful objects
         ##########################################
 
+        # load all available locales
+        setup_locales()
+
         # Set up plugins -- need to do this early so that plugins can
         # affect startup.
         _log.info("Setting up plugins.")
@@ -134,7 +137,6 @@ class MediaGoblinApp(object):
 
         ## Compatibility webob -> werkzeug
         request.GET = request.args
-        request.accept_language = request.accept_languages
         request.accept = request.accept_mimetypes
 
         ## Routing / controller loading stuff