Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Use new TEMPLATE setting

Roland Geidercc6cb0b79b9f
diff --git a/wger/settings.tpl b/wger/settings.tpl
index f3ec56677..94028d461 100644
--- a/wger/settings.tpl
+++ b/wger/settings.tpl
@@ -5,7 +5,6 @@ from wger.settings_global import *
# Use 'DEBUG = True' to get more details for server errors
DEBUG = True
-TEMPLATE_DEBUG = DEBUG
ADMINS = (
('Your name', '[email protected]'),
diff --git a/wger/settings_global.py b/wger/settings_global.py
index 515b85a46..e79e0fbbf 100644
--- a/wger/settings_global.py
+++ b/wger/settings_global.py
@@ -133,26 +133,40 @@ AUTHENTICATION_BACKENDS = (
'wger.utils.helpers.EmailAuthBackend'
)
-# Set the context processors
-TEMPLATE_CONTEXT_PROCESSORS = (
- 'wger.utils.context_processor.processor',
- 'django.contrib.auth.context_processors.auth',
- 'django.contrib.messages.context_processors.messages',
-
- # Django mobile
- 'django_mobile.context_processors.flavour',
-
- # Breadcrumbs
- 'django.core.context_processors.request'
-)
-
-TEMPLATE_LOADERS = (
- # Django mobile
- 'django_mobile.loader.Loader',
-
- 'django.template.loaders.filesystem.Loader',
- 'django.template.loaders.app_directories.Loader',
-)
+TEMPLATES = [
+ {
+ 'BACKEND': 'django.template.backends.django.DjangoTemplates',
+ # 'APP_DIRS': True,
+ 'OPTIONS': {
+ 'context_processors': [
+ 'wger.utils.context_processor.processor',
+
+ # Django
+ '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 mobile
+ 'django_mobile.context_processors.flavour',
+
+ # Breadcrumbs
+ 'django.core.context_processors.request'
+ ],
+ 'loaders': [
+ # Django mobile
+ 'django_mobile.loader.Loader',
+
+ 'django.template.loaders.filesystem.Loader',
+ 'django.template.loaders.app_directories.Loader',
+ ],
+ 'debug': False
+ },
+ },
+]
# Store the user messages in the session
MESSAGE_STORAGE = 'django.contrib.messages.storage.session.SessionStorage'