summaryrefslogtreecommitdiff
path: root/settings.py
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2015-04-13 20:25:24 -0400
committerLuke Shumaker <lukeshu@sbcglobal.net>2015-04-13 20:25:24 -0400
commitc266efc7fc73f94995bffcdf8e0ef7a4aeb563c3 (patch)
tree2b96d2ff0f7e0a0d164a28b152b51fbb2f87b76f /settings.py
parentea00a099dffd7157c93af54b5817734348d2bbc6 (diff)
parent9589a7eadeb05e82c2d63f6fe128316fdb6dcc8a (diff)
Merge tag 'release_2014-10-19' into archweb-generic
Jinja2 switch for some templates, exact matches in package search
Diffstat (limited to 'settings.py')
-rw-r--r--settings.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/settings.py b/settings.py
index 8ab95421..c3ffcdce 100644
--- a/settings.py
+++ b/settings.py
@@ -61,11 +61,13 @@ TEMPLATE_DIRS = (
)
TEMPLATE_LOADERS = (
- 'django.template.loaders.filesystem.Loader',
- 'django.template.loaders.eggs.Loader',
- 'django.template.loaders.app_directories.Loader',
+ 'django_jinja.loaders.FileSystemLoader',
+ 'django_jinja.loaders.AppLoader',
)
+# Send templates matching the following to the Jinja2 engine
+DEFAULT_JINJA2_TEMPLATE_EXTENSION = '.jinja'
+
MIDDLEWARE_CLASSES = (
'django.middleware.common.CommonMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
@@ -116,6 +118,7 @@ INSTALLED_APPS = (
'django.contrib.admin',
'django.contrib.staticfiles',
'django_countries',
+ 'django_jinja',
'main',
'mirrors',
@@ -203,6 +206,7 @@ if not TEMPLATE_DEBUG:
TEMPLATE_LOADERS = (
('django.template.loaders.cached.Loader', TEMPLATE_LOADERS),
)
+ JINJA2_BYTECODE_CACHE_ENABLE = True
# Enable the debug toolbar if requested
if DEBUG_TOOLBAR: