X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/5f176bb52a7a59bf88f5728e60a3a62e12fb3d54..0e9ce396fab5cdfc2f1806bae43f05de77cb1e21:/wolnelektury/settings/__init__.py diff --git a/wolnelektury/settings/__init__.py b/wolnelektury/settings/__init__.py index 8d7c00f82..58fbc4225 100644 --- a/wolnelektury/settings/__init__.py +++ b/wolnelektury/settings/__init__.py @@ -30,10 +30,9 @@ 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', - 'piwik.django.middleware.PiwikMiddleware', 'maintenancemode.middleware.MaintenanceModeMiddleware', 'django.middleware.common.CommonMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', @@ -75,6 +74,9 @@ GETPAID_BACKENDS = ( ) INSTALLED_APPS_CONTRIB = [ + # Should be before django.contrib.admin + 'modeltranslation', + # external 'django.contrib.auth', 'django.contrib.contenttypes', @@ -86,12 +88,11 @@ INSTALLED_APPS_CONTRIB = [ 'pagination', 'pipeline', 'piston', - 'piwik.django', + 'piwik', #'rosetta', - 'south', + #'south', 'sorl.thumbnail', - 'djcelery', - 'djkombu', + 'kombu.transport.django', 'honeypot', #'django_nose', 'fnpdjango', @@ -106,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