X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/9203d27cee887569ad260dd91d798df68a1d3ada..08433423130c027b64c87c13c1bb4d2390694263:/wolnelektury/settings/__init__.py diff --git a/wolnelektury/settings/__init__.py b/wolnelektury/settings/__init__.py index 4300aafa5..7c3787c83 100644 --- a/wolnelektury/settings/__init__.py +++ b/wolnelektury/settings/__init__.py @@ -33,7 +33,6 @@ MIDDLEWARE_CLASSES = [ 'django.middleware.doc.XViewMiddleware', 'pagination.middleware.PaginationMiddleware', 'django.middleware.locale.LocaleMiddleware', - 'piwik.django.middleware.PiwikMiddleware', 'maintenancemode.middleware.MaintenanceModeMiddleware', 'django.middleware.common.CommonMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', @@ -66,7 +65,8 @@ INSTALLED_APPS_OUR = [ 'search', 'oai', 'funding', - 'polls' + 'polls', + 'libraries', ] GETPAID_BACKENDS = ( @@ -74,6 +74,9 @@ GETPAID_BACKENDS = ( ) INSTALLED_APPS_CONTRIB = [ + # Should be before django.contrib.admin + 'modeltranslation', + # external 'django.contrib.auth', 'django.contrib.contenttypes', @@ -85,12 +88,12 @@ INSTALLED_APPS_CONTRIB = [ 'pagination', 'pipeline', 'piston', - 'piwik.django', + 'piwik', #'rosetta', - 'south', + #'south', 'sorl.thumbnail', 'djcelery', - 'djkombu', + 'kombu.transport.django', 'honeypot', #'django_nose', 'fnpdjango', @@ -105,9 +108,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