Django 1.7, working version.

[wolnelektury.git] / wolnelektury / settings / __init__.py

diff --git a/wolnelektury/settings/__init__.py b/wolnelektury/settings/__init__.py
index bce9bd3..58fbc42 100644 (file)
--- a/wolnelektury/settings/__init__.py
+++ b/wolnelektury/settings/__init__.py
@@ -30,7 +30,7 @@ MIDDLEWARE_CLASSES = [
     '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',
     'maintenancemode.middleware.MaintenanceModeMiddleware',
@@ -74,6 +74,9 @@ GETPAID_BACKENDS = (
 )
 
 INSTALLED_APPS_CONTRIB = [
+    # Should be before django.contrib.admin
+    'modeltranslation',
+
     # external
     'django.contrib.auth',
     'django.contrib.contenttypes',
@@ -87,9 +90,8 @@ INSTALLED_APPS_CONTRIB = [
     'piston',
     'piwik',
     #'rosetta',
-    'south',
+    #'south',
     'sorl.thumbnail',
-    'djcelery',
     'kombu.transport.django',
     'honeypot',
     #'django_nose',
@@ -105,9 +107,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