diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-04-13 21:00:49 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-04-13 21:00:49 -0400 |
| commit | 7aab774ad05b81eb204774bf17cc613401310f7b (patch) | |
| tree | 812929abb2ae6fae90e6a56d4237738d7ca62a8f /settings.py | |
| parent | 355087ebe2e3fbd5f860e4655888a89d9df52e34 (diff) | |
| parent | c266efc7fc73f94995bffcdf8e0ef7a4aeb563c3 (diff) | |
Merge tag 'release_2014-10-19' into archweb-generic
Jinja2 switch for some templates, exact matches in package search
# Conflicts:
# templates/packages/search.html
Diffstat (limited to 'settings.py')
| -rw-r--r-- | settings.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/settings.py b/settings.py index b511d613..dc93eb1e 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', @@ -204,6 +207,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: |