Merge branch 'master' of https://github.com/CBWhiz/coffin

h-hirokawa · Feb 8, 2012 · cb417a8 · cb417a8
2 parents aaea5d2 + 19586c0
commit cb417a8
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/coffin/common.py b/coffin/common.py
@@ -50,7 +50,8 @@ def _get_loaders(self):
         from coffin.template.loaders import jinja_loader_from_django_loader
 
         from django.conf import settings
-        for loader in settings.TEMPLATE_LOADERS:
+        _loaders = getattr(settings, 'JINJA2_TEMPLATE_LOADERS', settings.TEMPLATE_LOADERS)
+        for loader in _loaders:
             if isinstance(loader, basestring):
                 loader_obj = jinja_loader_from_django_loader(loader)
                 if loader_obj: