X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/cda147aa999b09a14dacb097d91638f6b9cca236..ccf1868db403f603a87db2194a8ced22a05766f1:/wolnelektury/settings/__init__.py?ds=inline

diff --git a/wolnelektury/settings/__init__.py b/wolnelektury/settings/__init__.py
index b3950fccb..4f6194096 100644
--- a/wolnelektury/settings/__init__.py
+++ b/wolnelektury/settings/__init__.py
@@ -26,18 +26,21 @@ TEMPLATE_CONTEXT_PROCESSORS = (
 )
 
 MIDDLEWARE_CLASSES = [
+    'django.middleware.csrf.CsrfViewMiddleware',
+    'ssify.middleware.SsiMiddleware',
+    'django.middleware.cache.UpdateCacheMiddleware',
+    'ssify.middleware.PrepareForCacheMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.middleware.doc.XViewMiddleware',
+    'django.contrib.admindocs.middleware.XViewMiddleware',
     'pagination.middleware.PaginationMiddleware',
-    'django.middleware.locale.LocaleMiddleware',
-    'piwik.django.middleware.PiwikMiddleware',
+    'ssify.middleware.LocaleMiddleware',
     'maintenancemode.middleware.MaintenanceModeMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'fnpdjango.middleware.SetRemoteAddrFromXRealIP',
+    'django.middleware.cache.FetchFromCacheMiddleware',
 ]
 
 ROOT_URLCONF = 'wolnelektury.urls'
@@ -66,6 +69,8 @@ INSTALLED_APPS_OUR = [
     'search',
     'oai',
     'funding',
+    'polls',
+    'libraries',
     ]
 
 GETPAID_BACKENDS = (
@@ -73,6 +78,9 @@ GETPAID_BACKENDS = (
 )
 
 INSTALLED_APPS_CONTRIB = [
+    # Should be before django.contrib.admin
+    'modeltranslation',
+
     # external
     'django.contrib.auth',
     'django.contrib.contenttypes',
@@ -84,17 +92,14 @@ INSTALLED_APPS_CONTRIB = [
     'pagination',
     'pipeline',
     'piston',
-    'piwik.django',
-    #'rosetta',
-    'south',
+    'piwik',
     'sorl.thumbnail',
-    'djcelery',
-    'djkombu',
+    'kombu.transport.django',
     'honeypot',
-    #'django_nose',
     'fnpdjango',
     'getpaid',
     'getpaid.backends.payu',
+    'ssify',
 
     #allauth stuff
     'uni_form',
@@ -104,9 +109,6 @@ INSTALLED_APPS_CONTRIB = [
     'allauth.socialaccount.providers.openid',
     'allauth.socialaccount.providers.facebook',
     #'allauth.socialaccount.providers.twitter',
-
-    # included
-    'modeltranslation',
     ]
 
 INSTALLED_APPS = INSTALLED_APPS_OUR + INSTALLED_APPS_CONTRIB