From: Radek Czajka Date: Wed, 25 Sep 2019 23:55:22 +0000 (+0200) Subject: Django 1.11 X-Git-Url: https://git.mdrn.pl/prawokultury.git/commitdiff_plain/497f18297d675a7a4a5ecd0824f70f066388cb9e Django 1.11 --- diff --git a/prawokultury/settings.d/20-basic.py b/prawokultury/settings.d/20-basic.py index 0409be1..315c804 100644 --- a/prawokultury/settings.d/20-basic.py +++ b/prawokultury/settings.d/20-basic.py @@ -22,13 +22,13 @@ TEMPLATES = [ 'OPTIONS': { 'context_processors': [ "django.contrib.auth.context_processors.auth", - "django.core.context_processors.debug", - "django.core.context_processors.i18n", - "django.core.context_processors.media", - "django.core.context_processors.static", - "django.core.context_processors.tz", + "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.core.context_processors.request', + 'django.template.context_processors.request', 'prawokultury.context_processors.registration_url', ], }, diff --git a/prawokultury/settings.d/30-locale.py b/prawokultury/settings.d/30-locale.py index cafb273..e160512 100644 --- a/prawokultury/settings.d/30-locale.py +++ b/prawokultury/settings.d/30-locale.py @@ -16,7 +16,7 @@ LOCALE_PATHS = [ # timezone as the operating system. # If running in a Windows environment this must be set to the same as your # system time zone. -TIME_ZONE = None +TIME_ZONE = 'Europe/Warsaw' # Language code for this installation. All choices can be found here: # http://www.i18nguy.com/unicode/language-identifiers.html diff --git a/prawokultury/urls.py b/prawokultury/urls.py index 57697ef..679ac4e 100644 --- a/prawokultury/urls.py +++ b/prawokultury/urls.py @@ -18,7 +18,6 @@ urlpatterns = [ url(r'^accounts/login/$', django_cas.views.login), url(r'^accounts/logout/$', django_cas.views.logout), ] + i18n_patterns( - url(r'^comments/', include('django_comments_xtd.urls')), url(r'^contact/', include('contact.urls')), ) + migdal_urlpatterns diff --git a/requirements.txt b/requirements.txt index eaf038f..ad19874 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ -i https://py.mdrn.pl/simple -Django>=1.9,<1.10 +Django>=1.11,<2 fnpdjango==0.3 django_cas>=2.1,<2.2 Pillow