X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/0bd2c341a8b55f817c2e193a6c4658d52ef95961..0e9ce396fab5cdfc2f1806bae43f05de77cb1e21:/wolnelektury/settings/__init__.py?ds=sidebyside diff --git a/wolnelektury/settings/__init__.py b/wolnelektury/settings/__init__.py index c40bb366b..58fbc4225 100644 --- 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,10 +90,9 @@ INSTALLED_APPS_CONTRIB = [ 'piston', 'piwik', #'rosetta', - 'south', + #'south', 'sorl.thumbnail', - 'djcelery', - 'djkombu', + 'kombu.transport.django', 'honeypot', #'django_nose', 'fnpdjango', @@ -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