misc: update to use new TEMPLATES settings (#19885)

This commit is contained in:
Thomas NOËL 2017-10-25 23:49:19 +02:00
parent a9a88b6b93
commit 7d770226c3
2 changed files with 26 additions and 10 deletions

1
debian/settings.py vendored
View File

@ -13,7 +13,6 @@
# SECURITY WARNING: don't run with debug turned on in production!
#DEBUG = False
#TEMPLATE_DEBUG = False
#ADMINS = (
# ('User 1', 'poulpe@example.org'),

View File

@ -25,7 +25,6 @@ SECRET_KEY = 'please-change-me-with-a-very-long-random-string'
# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = True
TEMPLATE_DEBUG = True
# See https://docs.djangoproject.com/en/dev/ref/settings/#allowed-hosts
ALLOWED_HOSTS = []
@ -61,9 +60,10 @@ STATICFILES_DIRS = (os.path.join(BASE_DIR, 'passerelle', 'static'),)
# List of finder classes that know how to find static files in
# various locations.
STATICFILES_FINDERS = global_settings.STATICFILES_FINDERS + ('gadjo.finders.XStaticFinder',)
STATICFILES_FINDERS = list(global_settings.STATICFILES_FINDERS) + \
['gadjo.finders.XStaticFinder']
MIDDLEWARE_CLASSES = global_settings.MIDDLEWARE_CLASSES + (
MIDDLEWARE_CLASSES = tuple(global_settings.MIDDLEWARE_CLASSES) + (
'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.locale.LocaleMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
@ -79,12 +79,29 @@ WSGI_APPLICATION = 'passerelle.wsgi.application'
LOCALE_PATHS = (os.path.join(BASE_DIR, 'passerelle', 'locale'),)
LANGUAGE_CODE = 'fr-fr'
TEMPLATE_DIRS = (os.path.join(BASE_DIR, 'passerelle', 'templates'),)
TEMPLATE_CONTEXT_PROCESSORS = global_settings.TEMPLATE_CONTEXT_PROCESSORS + (
'django.core.context_processors.request',
'passerelle.base.context_processors.template_vars',
)
# Templates
TEMPLATES = [
{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
'DIRS': [
os.path.join(BASE_DIR, 'passerelle', 'templates')
],
'APP_DIRS': True,
'OPTIONS': {
'context_processors': [
'django.contrib.auth.context_processors.auth',
'django.template.context_processors.debug',
'django.template.context_processors.i18n',
'django.template.context_processors.media',
'django.template.context_processors.static',
'django.template.context_processors.tz',
'django.contrib.messages.context_processors.messages',
'django.template.context_processors.request',
'passerelle.base.context_processors.template_vars',
],
},
},
]
INSTALLED_APPS = (
# system apps