public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-04-13 09:42:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

modify settings.py to use TEMPLATES since other TEMPLATE_* settings were deprecated

Browse source
This commit is contained in:
jmath1 2020-06-11 04:50:15 -04:00
parent 0f9d839a49
commit 0b12f24f3e
1 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
settings.py
View file

@ -7,8 +7,6 @@ import os
CURRENT_DIR = os.path.dirname(__file__) CURRENT_DIR = os.path.dirname(__file__)
NEWSBLUR_DIR = CURRENT_DIR NEWSBLUR_DIR = CURRENT_DIR
TEMPLATE_DIRS = (os.path.join(CURRENT_DIR, 'templates'),
os.path.join(CURRENT_DIR, 'vendor/zebra/templates'))
MEDIA_ROOT = os.path.join(CURRENT_DIR, 'media') MEDIA_ROOT = os.path.join(CURRENT_DIR, 'media')
STATIC_ROOT = os.path.join(CURRENT_DIR, 'static') STATIC_ROOT = os.path.join(CURRENT_DIR, 'static')
UTILS_ROOT = os.path.join(CURRENT_DIR, 'utils') UTILS_ROOT = os.path.join(CURRENT_DIR, 'utils')
@ -95,12 +93,6 @@ PAYPAL_TEST = False
# = Django-specific Modules = # = Django-specific Modules =
# =========================== # ===========================
TEMPLATE_CONTEXT_PROCESSORS = (
"django.contrib.auth.context_processors.auth",
"django.template.context_processors.debug",
"django.template.context_processors.media",
'django.template.context_processors.request',
)
MIDDLEWARE_CLASSES = ( MIDDLEWARE_CLASSES = (
'django.middleware.gzip.GZipMiddleware', 'django.middleware.gzip.GZipMiddleware',
@ -618,7 +610,6 @@ if not DEBUG:
RAVEN_CLIENT = raven.Client(SENTRY_DSN) RAVEN_CLIENT = raven.Client(SENTRY_DSN)
COMPRESS = not DEBUG COMPRESS = not DEBUG
TEMPLATE_DEBUG = DEBUG
ACCOUNT_ACTIVATION_DAYS = 30 ACCOUNT_ACTIVATION_DAYS = 30
AWS_ACCESS_KEY_ID = S3_ACCESS_KEY AWS_ACCESS_KEY_ID = S3_ACCESS_KEY
AWS_SECRET_ACCESS_KEY = S3_SECRET AWS_SECRET_ACCESS_KEY = S3_SECRET
@ -636,18 +627,38 @@ DEBUG_TOOLBAR_CONFIG = {
} }
if DEBUG: if DEBUG:
TEMPLATE_LOADERS = ( template_loaders = (
'django.template.loaders.filesystem.Loader', 'django.template.loaders.filesystem.Loader',
'django.template.loaders.app_directories.Loader', 'django.template.loaders.app_directories.Loader',
) )
else: else:
TEMPLATE_LOADERS = ( template_loaders = (
('django.template.loaders.cached.Loader', ( ('django.template.loaders.cached.Loader', (
'django.template.loaders.filesystem.Loader', 'django.template.loaders.filesystem.Loader',
'django.template.loaders.app_directories.Loader', 'django.template.loaders.app_directories.Loader',
)), )),
) )
BASE_DIR = 'NewsBlur'
TEMPLATES = [
{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
'TEMPLATE_DIRS': [os.path.join(CURRENT_DIR, 'templates'),
os.path.join(CURRENT_DIR, 'vendor/zebra/templates')],
'APP_DIRS': True,
'TEMPLATE_CONTEXT_PROCESSORS': (
"django.contrib.auth.context_processors.auth",
"django.template.context_processors.debug",
"django.template.context_processors.media",
'django.template.context_processors.request',
),
'TEMPLATE_LOADERS': template_loaders,
'TEMPLATE_DEBUG': DEBUG
}
]
# ========= # =========
# = Mongo = # = Mongo =
# ========= # =========