switch to fnp-django-pagination

diff --git a/requirements/requirements-test.txt b/requirements/requirements-test.txt
index 063cd78..87aa0fe 100644 (file)
--- a/requirements/requirements-test.txt
+++ b/requirements/requirements-test.txt
@@ -3,5 +3,4 @@
 nose>=1.3.7
 django-nose>=1.4.2,<1.5
 nosexcover
 nose>=1.3.7
 django-nose>=1.4.2,<1.5
 nosexcover

-polib

 mock
 mock

diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index 6c3c280..07a4965 100644 (file)
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -5,7 +5,7 @@ Django>=1.8,<1.9
 fnpdjango>=0.1.15,<0.2
 django-pipeline>=1.6,<1.7
 jsmin
 fnpdjango>=0.1.15,<0.2
 django-pipeline>=1.6,<1.7
 jsmin

-django-pagination>=1.0
+fnp-django-pagination

 django-maintenancemode>=0.10
 django-piston==0.2.2.1.2
 jsonfield>=1.0.3,<1.1
 django-maintenancemode>=0.10
 django-piston==0.2.2.1.2
 jsonfield>=1.0.3,<1.1

diff --git a/src/wolnelektury/settings/__init__.py b/src/wolnelektury/settings/__init__.py
index 13c7466..8190850 100644 (file)
--- a/src/wolnelektury/settings/__init__.py
+++ b/src/wolnelektury/settings/__init__.py
@@ -20,7 +20,7 @@ MIDDLEWARE_CLASSES = [
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.admindocs.middleware.XViewMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.admindocs.middleware.XViewMiddleware',

-    'pagination.middleware.PaginationMiddleware',
+    'fnp_django_pagination.middleware.PaginationMiddleware',

     'ssify.middleware.LocaleMiddleware',
     'maintenancemode.middleware.MaintenanceModeMiddleware',
     'django.middleware.common.CommonMiddleware',
     'ssify.middleware.LocaleMiddleware',
     'maintenancemode.middleware.MaintenanceModeMiddleware',
     'django.middleware.common.CommonMiddleware',


@@ -76,7 +76,7 @@ INSTALLED_APPS_CONTRIB = [
     'django.contrib.admin',
     'django.contrib.admindocs',
     'django.contrib.staticfiles',
     'django.contrib.admin',
     'django.contrib.admindocs',
     'django.contrib.staticfiles',

-    'pagination',
+    'fnp_django_pagination',

     'pipeline',
     'piston',
     'piwik',
     'pipeline',
     'piston',
     'piwik',