Move get_jinja_loader to init submodule.

[mediagoblin.git] / mediagoblin / util.py

diff --git a/mediagoblin/util.py b/mediagoblin/util.py
index 91fbee0a10a60d4ddd7d98465c46de3f34abac13..ab219df034e9c0d0ee0c36e8330d3512fa94108f 100644 (file)
--- a/mediagoblin/util.py
+++ b/mediagoblin/util.py
@@ -32,6 +32,7 @@ from lxml.html.clean import Cleaner
 import markdown
 
 from mediagoblin import mg_globals
+from mediagoblin import messages
 from mediagoblin.db.util import ObjectId
 
 TESTS_ENABLED = False
@@ -63,22 +64,6 @@ def clear_test_buckets():
     clear_test_template_context()
 
 
-def get_jinja_loader(user_template_path=None):
-    """
-    Set up the Jinja template loaders, possibly allowing for user
-    overridden templates.
-
-    (In the future we may have another system for providing theming;
-    for now this is good enough.)
-    """
-    if user_template_path:
-        return jinja2.ChoiceLoader(
-            [jinja2.FileSystemLoader(user_template_path),
-             jinja2.PackageLoader('mediagoblin', 'templates')])
-    else:
-        return jinja2.PackageLoader('mediagoblin', 'templates')
-
-
 SETUP_JINJA_ENVS = {}
 
 
@@ -104,6 +89,10 @@ def get_jinja_env(template_loader, locale):
         mg_globals.translations.gettext,
         mg_globals.translations.ngettext)
 
+    # All templates will know how to ...
+    # ... fetch all waiting messages and remove them from the queue
+    template_env.globals['fetch_messages'] = messages.fetch_messages
+
     if exists(locale):
         SETUP_JINJA_ENVS[locale] = template_env