diff options
| author | José Padilla | 2015-03-12 11:52:43 -0400 | 
|---|---|---|
| committer | José Padilla | 2015-03-12 11:52:43 -0400 | 
| commit | 36e30c8f912a2c2ffb7612cd5cdc2c3a777e5774 (patch) | |
| tree | 020850fa8a7f279410ec2d6f1424cce4c8260c13 | |
| parent | ff35b971d344646ecb7f2590ab3adfa409f7f538 (diff) | |
| parent | 6c1d0d7ed05941c7a673d1bb3f0e1b56a4b6ab44 (diff) | |
| download | django-rest-framework-36e30c8f912a2c2ffb7612cd5cdc2c3a777e5774.tar.bz2 | |
Merge pull request #2678 from vikingco/fix/ugettext-in-pagination
Fixed problem with imporing rest_framework.views in apps.py
| -rw-r--r-- | rest_framework/pagination.py | 2 | 
1 files changed, 1 insertions, 1 deletions
| diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py index f41a9ae1..5e60448d 100644 --- a/rest_framework/pagination.py +++ b/rest_framework/pagination.py @@ -10,7 +10,7 @@ from django.core.paginator import InvalidPage, Paginator as DjangoPaginator  from django.template import Context, loader  from django.utils import six  from django.utils.six.moves.urllib import parse as urlparse -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy as _  from rest_framework.compat import OrderedDict  from rest_framework.exceptions import NotFound  from rest_framework.response import Response | 
