Merge master

.gitignore

@@ -14,3 +14,4 @@ MANIFEST
 
 !.gitignore
 !.travis.yml
+!.isort.cfg

.isort.cfg

+[settings]
+skip=.tox
+atomic=true
+multi_line_output=5
+known_third_party=pytest,django
+known_first_party=rest_framework

.travis.yml

@@ -3,7 +3,7 @@ language: python
 sudo: false
 
 env:
-    - TOX_ENV=py27-flake8
+    - TOX_ENV=py27-lint
     - TOX_ENV=py27-docs
     - TOX_ENV=py34-django18
     - TOX_ENV=py33-django18

CONTRIBUTING.md

@@ -38,7 +38,7 @@ Some tips on good issue reporting:
 
 ## Triaging issues
 
-Getting involved in triaging incoming issues is a good way to start contributing.  Every single ticket that comes into the ticket tracker needs to be reviewed in order to determine what the next steps should be.  Anyone can help out with this, you just need to be willing to
+Getting involved in triaging incoming issues is a good way to start contributing.  Every single ticket that comes into the ticket tracker needs to be reviewed in order to determine what the next steps should be.  Anyone can help out with this, you just need to be willing to:
 
 * Read through the ticket - does it make sense, is it missing any context that would help explain it better?
 * Is the ticket reported in the correct place, would it be better suited as a discussion on the discussion group?

README.md

@@ -159,7 +159,7 @@ Send a description of the issue via email to [rest-framework-security@googlegrou
 
 [build-status-image]: https://secure.travis-ci.org/tomchristie/django-rest-framework.svg?branch=master
 [travis]: http://travis-ci.org/tomchristie/django-rest-framework?branch=master
-[pypi-version]: https://pypip.in/version/djangorestframework/badge.svg
+[pypi-version]: https://img.shields.io/pypi/v/djangorestframework.svg
 [pypi]: https://pypi.python.org/pypi/djangorestframework
 [twitter]: https://twitter.com/_tomchristie
 [group]: https://groups.google.com/forum/?fromgroups#!forum/django-rest-framework

docs/api-guide/authentication.md

@@ -247,6 +247,10 @@ Unauthenticated responses that are denied permission will result in an `HTTP 403
 
 If you're using an AJAX style API with SessionAuthentication, you'll need to make sure you include a valid CSRF token for any "unsafe" HTTP method calls, such as `PUT`, `PATCH`, `POST` or `DELETE` requests.  See the [Django CSRF documentation][csrf-ajax] for more details.
 
+**Warning**: Always use Django's standard login view when creating login pages. This will ensure your login views are properly protected.
+
+CSRF validation in REST framework works slightly differently to standard Django due to the need to support both session and non-session based authentication to the same views. This means that only authenticated requests require CSRF tokens, and anonymous requests may be sent without CSRF tokens. This behaviour is not suitable for login views, which should always have CSRF validation applied.
+
 # Custom authentication
 
 To implement a custom authentication scheme, subclass `BaseAuthentication` and override the `.authenticate(self, request)` method.  The method should return a two-tuple of `(user, auth)` if authentication succeeds, or `None` otherwise.

docs/api-guide/fields.md

@@ -20,6 +20,8 @@ Each serializer field class constructor takes at least these arguments.  Some Fi
 
 ### `read_only`
 
+Read-only fields are included in the API output, but should not be included in the input during create or update operations. Any 'read_only' fields that are incorrectly included in the serializer input will be ignored. 
+
 Set this to `True` to ensure that the field is used when serializing a representation, but is not used when creating or updating an instance during deserialization.
 
 Defaults to `False`
@@ -183,6 +185,26 @@ A field that ensures the input is a valid UUID string. The `to_internal_value` m
 
     "de305d54-75b4-431b-adb2-eb6b9e546013"
 
+**Signature:** `UUIDField(format='hex_verbose')`
+
+- `format`: Determines the representation format of the uuid value
+    - `'hex_verbose'` - The cannoncical hex representation, including hyphens: `"5ce0e9a5-5ffa-654b-cee0-1238041fb31a"`
+    - `'hex'` - The compact hex representation of the UUID, not including hyphens: `"5ce0e9a55ffa654bcee01238041fb31a"`
+    - `'int'` - A 128 bit integer representation of the UUID: `"123456789012312313134124512351145145114"`
+    - `'urn'` - RFC 4122 URN representation of the UUID: `"urn:uuid:5ce0e9a5-5ffa-654b-cee0-1238041fb31a"`
+  Changing the `format` parameters only affects representation values. All formats are accepted by `to_internal_value`
+
+## IPAddressField
+
+A field that ensures the input is a valid IPv4 or IPv6 string.
+
+Corresponds to `django.forms.fields.IPAddressField` and `django.forms.fields.GenericIPAddressField`.
+
+**Signature**: `IPAddressField(protocol='both', unpack_ipv4=False, **options)`
+
+- `protocol` Limits valid inputs to the specified protocol. Accepted values are 'both' (default), 'IPv4' or 'IPv6'. Matching is case insensitive.
+- `unpack_ipv4` Unpacks IPv4 mapped addresses like ::ffff:192.0.2.1. If this option is enabled that address would be unpacked to 192.0.2.1. Default is disabled. Can only be used when protocol is set to 'both'.
+
 ---
 
 # Numeric fields
@@ -302,6 +324,18 @@ Corresponds to `django.db.models.fields.TimeField`
 
 Format strings may either be [Python strftime formats][strftime] which explicitly specify the format, or the special string `'iso-8601'`, which indicates that [ISO 8601][iso8601] style times should be used. (eg `'12:34:56.000000'`)
 
+## DurationField
+
+A Duration representation.
+Corresponds to `django.db.models.fields.DurationField`
+
+The `validated_data` for these fields will contain a `datetime.timedelta` instance.
+The representation is a string following this format `'[DD] [HH:[MM:]]ss[.uuuuuu]'`.
+
+**Note:** This field is only available with Django versions >= 1.8.
+
+**Signature:** `DurationField()`
+
 ---
 
 # Choice selection fields

docs/api-guide/filtering.md

@@ -149,6 +149,7 @@ If all you need is simple equality-based filtering, you can set a `filter_fields
     class ProductList(generics.ListAPIView):
         queryset = Product.objects.all()
         serializer_class = ProductSerializer
+        filter_backends = (filters.DjangoFilterBackend,)
         filter_fields = ('category', 'in_stock')
 
 This will automatically create a `FilterSet` class for the given fields, and will allow you to make requests such as:
@@ -174,6 +175,7 @@ For more advanced filtering requirements you can specify a `FilterSet` class tha
     class ProductList(generics.ListAPIView):
         queryset = Product.objects.all()
         serializer_class = ProductSerializer
+        filter_backends = (filters.DjangoFilterBackend,)
         filter_class = ProductFilter
 
 

docs/api-guide/generic-views.md

@@ -124,21 +124,24 @@ For example:
 
 Note that if your API doesn't include any object level permissions, you may optionally exclude the `self.check_object_permissions`, and simply return the object from the `get_object_or_404` lookup.
 
-#### `get_filter_backends(self)`
-
-Returns the classes that should be used to filter the queryset. Defaults to returning the `filter_backends` attribute.
-
-May be overridden to provide more complex behavior with filters, such as using different (or even exclusive) lists of filter_backends depending on different criteria.
-
-For example:
-
-    def get_filter_backends(self):
-        if "geo_route" in self.request.query_params:
-            return (GeoRouteFilter, CategoryFilter)
-        elif "geo_point" in self.request.query_params:
-            return (GeoPointFilter, CategoryFilter)
-
-        return (CategoryFilter,)
+#### `filter_queryset(self, queryset)`       
+       
+Given a queryset, filter it with whichever filter backends are in use, returning a new queryset.   
+        
+For example:       
+       
+    def filter_queryset(self, queryset):
+        filter_backends = (CategoryFilter,)
+        
+        if 'geo_route' in self.request.query_params:
+            filter_backends = (GeoRouteFilter, CategoryFilter)
+        elif 'geo_point' in self.request.query_params:
+            filter_backends = (GeoPointFilter, CategoryFilter)
+        
+        for backend in list(filter_backends):
+            queryset = backend().filter_queryset(self.request, queryset, view=self)
+        
+        return queryset
 
 #### `get_serializer_class(self)`
 
@@ -192,7 +195,7 @@ These override points are also particularly useful for adding behavior that occu
 You won't typically need to override the following methods, although you might need to call into them if you're writing custom views using `GenericAPIView`.
 
 * `get_serializer_context(self)` - Returns a dictionary containing any extra context that should be supplied to the serializer.  Defaults to including `'request'`, `'view'` and `'format'` keys.
-* `get_serializer(self, instance=None, data=None, files=None, many=False, partial=False, allow_add_remove=False)` - Returns a serializer instance.
+* `get_serializer(self, instance=None, data=None, many=False, partial=False)` - Returns a serializer instance.
 * `get_paginated_response(self, data)` - Returns a paginated style `Response` object.
 * `paginate_queryset(self, queryset)` - Paginate a queryset if required, either returning a page object, or `None` if pagination is not configured for this view.
 * `filter_queryset(self, queryset)` - Given a queryset, filter it with whichever filter backends are in use, returning a new queryset.
@@ -391,6 +394,10 @@ The following third party packages provide additional generic view implementatio
 
 The [django-rest-framework-bulk package][django-rest-framework-bulk] implements generic view mixins as well as some common concrete generic views to allow to apply bulk operations via API requests.
 
+## Django Rest Multiple Models
+
+[Django Rest Multiple Models][django-rest-multiple-models] provides a generic view (and mixin) for sending multiple serialized models and/or querysets via a single API request.
+
 
 [cite]: https://docs.djangoproject.com/en/dev/ref/class-based-views/#base-vs-generic-views
 [GenericAPIView]: #genericapiview
@@ -400,3 +407,6 @@ The [django-rest-framework-bulk package][django-rest-framework-bulk] implements
 [UpdateModelMixin]: #updatemodelmixin
 [DestroyModelMixin]: #destroymodelmixin
 [django-rest-framework-bulk]: https://github.com/miki725/django-rest-framework-bulk
+[django-rest-multiple-models]: https://github.com/Axiologue/DjangoRestMultipleModels
+
+

docs/api-guide/metadata.md

@@ -98,6 +98,12 @@ The following class could be used to limit the information that is returned to `
                 'description': view.get_view_description()
             }
 
+Then configure your settings to use this custom class:
+
+    REST_FRAMEWORK = {
+        'DEFAULT_METADATA_CLASS': 'myproject.apps.core.MinimalMetadata'
+    }
+
 [cite]: http://tools.ietf.org/html/rfc7231#section-4.3.7
 [no-options]: https://www.mnot.net/blog/2012/10/29/NO_OPTIONS
 [json-schema]: http://json-schema.org/

docs/api-guide/pagination.md

@@ -246,11 +246,11 @@ Let's modify the built-in `PageNumberPagination` style, so that instead of inclu
             previous_url = self.get_previous_link()
 
             if next_url is not None and previous_url is not None:
-                link = '<{next_url}; rel="next">, <{previous_url}; rel="prev">'
+                link = '<{next_url}>; rel="next", <{previous_url}>; rel="prev"'
             elif next_url is not None:
-                link = '<{next_url}; rel="next">'
+                link = '<{next_url}>; rel="next"'
             elif previous_url is not None:
-                link = '<{previous_url}; rel="prev">'
+                link = '<{previous_url}>; rel="prev"'
             else:
                 link = ''
 

docs/api-guide/parsers.md

@@ -144,17 +144,16 @@ By default this will include the following keys: `view`, `request`, `args`, `kwa
 The following is an example plaintext parser that will populate the `request.data` property with a string representing the body of the request.
 
     class PlainTextParser(BaseParser):
-    """
-    Plain text parser.
-    """
-
-    media_type = 'text/plain'
-
-    def parse(self, stream, media_type=None, parser_context=None):
         """
-        Simply return a string representing the body of the request.
+        Plain text parser.
         """
-        return stream.read()
+        media_type = 'text/plain'
+
+        def parse(self, stream, media_type=None, parser_context=None):
+            """
+            Simply return a string representing the body of the request.
+            """
+            return stream.read()
 
 ---
 

docs/api-guide/permissions.md

@@ -150,7 +150,7 @@ Similar to `DjangoModelPermissions`, but also allows unauthenticated users to ha
 
 This permission class ties into Django's standard [object permissions framework][objectpermissions] that allows per-object permissions on models.  In order to use this permission class, you'll also need to add a permission backend that supports object-level permissions, such as [django-guardian][guardian].
 
-As with `DjangoModelPermissions`, this permission must only be applied to views that have a `.queryset` property. Authorization will only be granted if the user *is authenticated* and has the *relevant per-object permissions* and *relevant model permissions* assigned.
+As with `DjangoModelPermissions`, this permission must only be applied to views that have a `.queryset` property or `.get_queryset()` method. Authorization will only be granted if the user *is authenticated* and has the *relevant per-object permissions* and *relevant model permissions* assigned.
 
 * `POST` requests require the user to have the `add` permission on the model instance.
 * `PUT` and `PATCH` requests require the user to have the `change` permission on the model instance.
@@ -190,6 +190,16 @@ If you need to test if a request is a read operation or a write operation, you s
 
 ---
 
+Custom permissions will raise a `PermissionDenied` exception if the test fails. To change the error message associated with the exception, implement a `message` attribute directly on your custom permission. Otherwise the `default_detail` attribute from `PermissionDenied` will be used.
+    
+    from rest_framework import permissions
+
+    class CustomerAccessPermission(permissions.BasePermission):
+        message = 'Adding customers not allowed.'
+        
+        def has_permission(self, request, view):
+             ...
+        
 ## Examples
 
 The following is an example of a permission class that checks the incoming request's IP address against a blacklist, and denies the request if the IP has been blacklisted.
@@ -233,10 +243,6 @@ Also note that the generic views will only check the object-level permissions fo
 
 The following third party packages are also available.
 
-## DRF Any Permissions
-
-The [DRF Any Permissions][drf-any-permissions] packages provides a different permission behavior in contrast to REST framework.  Instead of all specified permissions being required, only one of the given permissions has to be true in order to get access to the view.
-
 ## Composed Permissions
 
 The [Composed Permissions][composed-permissions] package provides a simple way to define complex and multi-depth (with logic operators) permission objects, using small and reusable components.

docs/api-guide/relations.md

@@ -116,6 +116,8 @@ By default this field is read-write, although you can change this behavior using
 * `queryset` - The queryset used for model instance lookups when validating the field input. Relationships must either set a queryset explicitly, or set `read_only=True`.
 * `many` - If applied to a to-many relationship, you should set this argument to `True`.
 * `allow_null` - If set to `True`, the field will accept values of `None` or the empty string for nullable relationships. Defaults to `False`.
+* `pk_field` - Set to a field to control serialization/deserialization of the primary key's value. For example, `pk_field=UUIDField(format='hex')` would serialize a UUID primary key into its compact hex representation.
+
 
 ## HyperlinkedRelatedField
 
@@ -254,17 +256,64 @@ For example, the following serializer:
 
 Would serialize to a nested representation like this:
 
+    >>> album = Album.objects.create(album_name="The Grey Album", artist='Danger Mouse')
+    >>> Track.objects.create(album=album, order=1, title='Public Service Announcement', duration=245)
+    <Track: Track object>
+    >>> Track.objects.create(album=album, order=2, title='What More Can I Say', duration=264)
+    <Track: Track object>
+    >>> Track.objects.create(album=album, order=3, title='Encore', duration=159)
+    <Track: Track object>
+    >>> serializer = AlbumSerializer(instance=album)
+    >>> serializer.data
     {
         'album_name': 'The Grey Album',
         'artist': 'Danger Mouse',
         'tracks': [
-            {'order': 1, 'title': 'Public Service Announcement'},
-            {'order': 2, 'title': 'What More Can I Say'},
-            {'order': 3, 'title': 'Encore'},
+            {'order': 1, 'title': 'Public Service Announcement', 'duration': 245},
+            {'order': 2, 'title': 'What More Can I Say', 'duration': 264},
+            {'order': 3, 'title': 'Encore', 'duration': 159},
             ...
         ],
     }
 
+# Writable nested serializers
+
+Be default nested serializers are read-only. If you want to to support write-operations to a nested serializer field you'll need to create either or both of the `create()` and/or `update()` methods, in order to explicitly specify how the child relationships should be saved.
+
+    class TrackSerializer(serializers.ModelSerializer):
+        class Meta:
+            model = Track
+            fields = ('order', 'title')
+
+    class AlbumSerializer(serializers.ModelSerializer):
+        tracks = TrackSerializer(many=True)
+
+        class Meta:
+            model = Album
+            fields = ('album_name', 'artist', 'tracks')
+
+        def create(self, validated_data):
+            tracks_data = validated_data.pop('tracks')
+            album = Album.objects.create(**validated_data)
+            for track_data in tracks_data:
+                Track.objects.create(album=album, **track_data)
+            return album
+
+    >>> data = {
+        'album_name': 'The Grey Album',
+        'artist': 'Danger Mouse',
+        'tracks': [
+            {'order': 1, 'title': 'Public Service Announcement', 'duration': 245},
+            {'order': 2, 'title': 'What More Can I Say', 'duration': 264},
+            {'order': 3, 'title': 'Encore', 'duration': 159},
+        ],
+    }
+    >>> serializer = AlbumSerializer(data=data)
+    >>> serializer.is_valid()
+    True
+    >>> serializer.save()
+    <Album: Album object>
+
 # Custom relational fields
 
 To implement a custom relational field, you should override `RelatedField`, and implement the `.to_representation(self, value)` method. This method takes the target of the field as the `value` argument, and should return the representation that should be used to serialize the target. The `value` argument will typically be a model instance.

docs/api-guide/renderers.md

@@ -157,7 +157,7 @@ See also: `TemplateHTMLRenderer`
 
 Renders data returned by a serializer into an HTML form.  The output of this renderer does not include the enclosing `<form>` tags or an submit actions, as you'll probably need those to include the desired method and URL.  Also note that the `HTMLFormRenderer` does not yet support including field error messages.
 
-Note that the template used by the `HTMLFormRenderer` class, and the context submitted to it **may be subject to change**.  If you need to use this renderer class it is advised that you either make a local copy of the class and templates, or follow the release note on REST framework upgrades closely.
+**Note**: The `HTMLFormRenderer` class is intended for internal use with the browsable API. It should not be considered a fully documented or stable API. The template used by the `HTMLFormRenderer` class, and the context submitted to it **may be subject to change**.  If you need to use this renderer class it is advised that you either make a local copy of the class and templates, or follow the release note on REST framework upgrades closely.
 
 **.media_type**: `text/html`
 
@@ -181,7 +181,7 @@ Renders data into HTML for the Browsable API.  This renderer will determine whic
 
 #### Customizing BrowsableAPIRenderer
 
-By default the response content will be rendered with the highest priority renderer apart from `BrowseableAPIRenderer`.  If you need to customize this behavior, for example to use HTML as the default return format, but use JSON in the browsable API, you can do so by overriding the `get_default_renderer()` method.  For example:
+By default the response content will be rendered with the highest priority renderer apart from `BrowsableAPIRenderer`.  If you need to customize this behavior, for example to use HTML as the default return format, but use JSON in the browsable API, you can do so by overriding the `get_default_renderer()` method.  For example:
 
     class CustomBrowsableAPIRenderer(BrowsableAPIRenderer):
         def get_default_renderer(self, view):

docs/api-guide/serializers.md

@@ -565,7 +565,7 @@ Typically we would recommend *not* using inheritance on inner Meta classes, but
 
 The ModelSerializer class also exposes an API that you can override in order to alter how serializer fields are automatically determined when instantiating the serializer.
 
-Normally if a `ModelSerializer` does not generate the fields you need by default the you should either add them to the class explicitly, or simply use a regular `Serializer` class instead. However in some cases you may want to create a new base class that defines how the serializer fields are created for any given model.
+Normally if a `ModelSerializer` does not generate the fields you need by default then you should either add them to the class explicitly, or simply use a regular `Serializer` class instead. However in some cases you may want to create a new base class that defines how the serializer fields are created for any given model.
 
 ### `.serializer_field_mapping`
 

docs/api-guide/settings.md

@@ -119,6 +119,14 @@ Default: `None`
 
 #### PAGINATE_BY_PARAM
 
+---
+
+**This setting is pending deprecation.**
+
+See the pagination documentation for further guidance on [setting the pagination style](pagination.md#modifying-the-pagination-style).
+
+---
+
 The name of a query parameter, which can be used by the client to override the default page size to use for pagination.  If set to `None`, clients may not override the default page size.
 
 For example, given the following settings:
@@ -136,6 +144,14 @@ Default: `None`
 
 #### MAX_PAGINATE_BY
 
+---
+
+**This setting is pending deprecation.**
+
+See the pagination documentation for further guidance on [setting the pagination style](pagination.md#modifying-the-pagination-style).
+
+---
+
 The maximum page size to allow when the page size is specified by the client.  If set to `None`, then no maximum limit is applied.
 
 For example, given the following settings:
@@ -273,6 +289,8 @@ Default: `'accept'`
 
 The name of a URL parameter that may be used to override the default `Accept` header based content negotiation.
 
+If the value of this setting is `None` then URL format overloading will be disabled.
+
 Default: `'format'`
 
 ---

docs/api-guide/validators.md

@@ -204,12 +204,12 @@ A validator may be any callable that raises a `serializers.ValidationError` on f
 
 To write a class based validator, use the `__call__` method. Class based validators are useful as they allow you to parameterize and reuse behavior.
 
-    class MultipleOf:
+    class MultipleOf(object):
         def __init__(self, base):
             self.base = base
 
         def __call__(self, value):
-            if value % self.base != 0
+            if value % self.base != 0:
                 message = 'This field must be a multiple of %d.' % self.base
                 raise serializers.ValidationError(message)
 

docs/api-guide/versioning.md

@@ -3,7 +3,7 @@ source: versioning.py
 # Versioning
 
 > Versioning an interface is just a "polite" way to kill deployed clients.
-> 
+>
 > — [Roy Fielding][cite].
 
 API versioning allows you to alter behavior between different clients. REST framework provides for a number of different versioning schemes.
@@ -71,9 +71,22 @@ You can also set the versioning scheme on an individual view. Typically you won'
 The following settings keys are also used to control versioning:
 
 * `DEFAULT_VERSION`. The value that should be used for `request.version` when no versioning information is present. Defaults to `None`.
-* `ALLOWED_VERSIONS`. If set, this value will restrict the set of versions that may be returned by the versioning scheme, and will raise an error if the provided version if not in this set. Defaults to `None`.
+* `ALLOWED_VERSIONS`. If set, this value will restrict the set of versions that may be returned by the versioning scheme, and will raise an error if the provided version if not in this set. Note that the value used for the `DEFAULT_VERSION` setting is always considered to be part of the `ALLOWED_VERSIONS` set. Defaults to `None`.
 * `VERSION_PARAMETER`. The string that should used for any versioning parameters, such as in the media type or URL query parameters. Defaults to `'version'`.
 
+You can also set your versioning class plus those three values on a per-view or a per-viewset basis by defining your own versioning scheme and using the `default_version`, `allowed_versions` and `version_param` class variables. For example, if you want to use `URLPathVersioning`:
+
+    from rest_framework.versioning import URLPathVersioning
+    from rest_framework.views import APIView
+
+    class ExampleVersioning(URLPathVersioning):
+        default_version = ...
+        allowed_versions = ...
+        version_param = ...
+
+    class ExampleView(APIVIew):
+        versioning_class = ExampleVersioning
+
 ---
 
 # API Reference
@@ -117,12 +130,12 @@ Your URL conf must include a pattern that matches the version with a `'version'`
 
     urlpatterns = [
         url(
-            r'^(?P<version>{v1,v2})/bookings/$',
+            r'^(?P<version>[v1|v2]+)/bookings/$',
             bookings_list,
             name='bookings-list'
         ),
         url(
-            r'^(?P<version>{v1,v2})/bookings/(?P<pk>[0-9]+)/$',
+            r'^(?P<version>[v1|v2]+)/bookings/(?P<pk>[0-9]+)/$',
             bookings_detail,
             name='bookings-detail'
         )

docs/api-guide/viewsets.md

@@ -27,7 +27,7 @@ Let's define a simple viewset that can be used to list or retrieve all the users
 
     class UserViewSet(viewsets.ViewSet):
         """
-        A simple ViewSet that for listing or retrieving users.
+        A simple ViewSet for listing or retrieving users.
         """
         def list(self, request):
             queryset = User.objects.all()

docs/index.md

 <p class="badges" height=20px>
-<iframe src="http://ghbtns.com/github-btn.html?user=tomchristie&amp;repo=django-rest-framework&amp;type=watch&amp;count=true" class="github-star-button" allowtransparency="true" frameborder="0" scrolling="0" width="110px" height="20px"></iframe>
+    <iframe src="http://ghbtns.com/github-btn.html?user=tomchristie&amp;repo=django-rest-framework&amp;type=watch&amp;count=true" class="github-star-button" allowtransparency="true" frameborder="0" scrolling="0" width="110px" height="20px"></iframe>
 
-<a href="https://twitter.com/share" class="twitter-share-button" data-url="django-rest-framework.org" data-text="Checking out the totally awesome Django REST framework! http://www.django-rest-framework.org" data-count="none"></a>
-<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="http://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
+    <a href="http://travis-ci.org/tomchristie/django-rest-framework?branch=master">
+        <img src="https://secure.travis-ci.org/tomchristie/django-rest-framework.svg?branch=master" class="status-badge">
+    </a>
 
-<img src="https://secure.travis-ci.org/tomchristie/django-rest-framework.svg?branch=master" class="travis-build-image">
+    <a href="https://pypi.python.org/pypi/djangorestframework">
+        <img src="https://img.shields.io/pypi/v/djangorestframework.svg" class="status-badge">
+    </a>
 </p>
 
 ---
@@ -248,8 +251,6 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-[travis]: http://travis-ci.org/tomchristie/django-rest-framework?branch=master
-[travis-build-image]: https://secure.travis-ci.org/tomchristie/django-rest-framework.png?branch=master
 [mozilla]: http://www.mozilla.org/en-US/about/
 [eventbrite]: https://www.eventbrite.co.uk/about/
 [markdown]: http://pypi.python.org/pypi/Markdown/

docs/topics/3.0-announcement.md

@@ -940,7 +940,7 @@ The default JSON renderer will return float objects for un-coerced `Decimal` ins
 * The serializer `ChoiceField` does not currently display nested choices, as was the case in 2.4. This will be address as part of 3.1.
 * Due to the new templated form rendering, the 'widget' option is no longer valid. This means there's no easy way of using third party "autocomplete" widgets for rendering select inputs that contain a large number of choices. You'll either need to use a regular select or a plain text input. We may consider addressing this in 3.1 or 3.2 if there's sufficient demand.
 * Some of the default validation error messages were rewritten and might no longer be pre-translated. You can still [create language files with Django][django-localization] if you wish to localize them.
-* `APIException` subclasses could previously take could previously take any arbitrary type in the `detail` argument. These exceptions now use translatable text strings, and as a result call `force_text` on the `detail` argument, which *must be a string*. If you need complex arguments to an `APIException` class, you should subclass it and override the `__init__()` method. Typically you'll instead want to use a custom exception handler to provide for non-standard error responses.
+* `APIException` subclasses could previously take any arbitrary type in the `detail` argument. These exceptions now use translatable text strings, and as a result call `force_text` on the `detail` argument, which *must be a string*. If you need complex arguments to an `APIException` class, you should subclass it and override the `__init__()` method. Typically you'll instead want to use a custom exception handler to provide for non-standard error responses.
 
 ---
 

docs/topics/browsable-api.md

@@ -35,7 +35,7 @@ To replace the default theme, add a `bootstrap_theme` block to your `api.html` a
         <link rel="stylesheet" href="/path/to/my/bootstrap.css" type="text/css">
     {% endblock %}
 
-A suitable replacement theme can be generated using Bootstrap's [Customize Tool][bcustomize].  There are also pre-made themes available at [Bootswatch][bswatch].  To use any of the Bootswatch themes, simply download the theme's `bootstrap.min.css` file, add it to your project, and replace the default one as described above.
+Suitable pre-made replacement themes are available at [Bootswatch][bswatch].  To use any of the Bootswatch themes, simply download the theme's `bootstrap.min.css` file, add it to your project, and replace the default one as described above.
 
 You can also change the navbar variant, which by default is `navbar-inverse`, using the `bootstrap_navbar_variant` block.  The empty `{% block bootstrap_navbar_variant %}{% endblock %}` will use the original Bootstrap navbar style.
 

docs/topics/project-management.md

@@ -97,9 +97,15 @@ The following template should be used for the description of the issue, and serv
     Release manager is @***.
     Pull request is #***.
 
+    During development cycle:
+
+    - [ ] Upload the new content to be translated to [transifex](http://www.django-rest-framework.org/topics/project-management/#translations).
+
+
     Checklist:
 
     - [ ] Create pull request for [release notes](https://github.com/tomchristie/django-rest-framework/blob/master/docs/topics/release-notes.md) based on the [*.*.* milestone](https://github.com/tomchristie/django-rest-framework/milestones/***).
+    - [ ] Update the translations from [transifex](http://www.django-rest-framework.org/topics/project-management/#translations).
     - [ ] Ensure the pull request increments the version to `*.*.*` in [`restframework/__init__.py`](https://github.com/tomchristie/django-rest-framework/blob/master/rest_framework/__init__.py).
     - [ ] Confirm with @tomchristie that release is finalized and ready to go.
     - [ ] Ensure that release date is included in pull request.

docs/topics/release-notes.md

@@ -40,13 +40,52 @@ You can determine your currently installed version using `pip freeze`:
 
 ## 3.1.x series
 
+### 3.1.3
+
+**Date**: [4th June 2015][3.1.3-milestone].
+
+* Add `DurationField`. ([#2481][gh2481], [#2989][gh2989])
+* Add `format` argument to `UUIDField`. ([#2788][gh2788], [#3000][gh3000])
+* `MultipleChoiceField` empties incorrectly on a partial update using multipart/form-data ([#2993][gh2993], [#2894][gh2894])
+* Fix a bug in options related to read-only `RelatedField`. ([#2981][gh2981], [#2811][gh2811])
+* Fix nested serializers with `unique_together` relations. ([#2975][gh2975])
+* Allow unexpected values for `ChoiceField`/`MultipleChoiceField` representations. ([#2839][gh2839], [#2940][gh2940])
+* Rollback the transaction on error if `ATOMIC_REQUESTS` is set. ([#2887][gh2887], [#2034][gh2034])
+* Set the action on a view when override_method regardless of its None-ness. ([#2933][gh2933])
+* `DecimalField` accepts `2E+2` as 200 and validates decimal place correctly. ([#2948][gh2948], [#2947][gh2947])
+* Support basic authentication with custom `UserModel` that change `username`. ([#2952][gh2952])
+* `IPAddressField` improvements. ([#2747][gh2747], [#2618][gh2618], [#3008][gh3008])
+* Improve `DecimalField` for easier subclassing. ([#2695][gh2695])
+
+
+### 3.1.2
+
+**Date**: [13rd May 2015][3.1.2-milestone].
+
+* `DateField.to_representation` can handle str and empty values. ([#2656][gh2656], [#2687][gh2687], [#2869][gh2869])
+* Use default reason phrases from HTTP standard. ([#2764][gh2764], [#2763][gh2763])
+* Raise error when `ModelSerializer` used with abstract model. ([#2757][gh2757], [#2630][gh2630])
+* Handle reversal of non-API view_name in `HyperLinkedRelatedField` ([#2724][gh2724], [#2711][gh2711])
+* Dont require pk strictly for related fields. ([#2745][gh2745], [#2754][gh2754])
+* Metadata detects null boolean field type. ([#2762][gh2762])
+* Proper handling of depth in nested serializers. ([#2798][gh2798])
+* Display viewset without paginator. ([#2807][gh2807])
+* Don't check for deprecated `.model` attribute in permissions ([#2818][gh2818])
+* Restrict integer field to integers and strings. ([#2835][gh2835], [#2836][gh2836])
+* Improve `IntegerField` to use compiled decimal regex. ([#2853][gh2853])
+* Prevent empty `queryset` to raise AssertionError. ([#2862][gh2862])
+* `DjangoModelPermissions` rely on `get_queryset`. ([#2863][gh2863])
+* Check `AcceptHeaderVersioning` with content negotiation in place. ([#2868][gh2868])
+* Allow `DjangoObjectPermissions` to use views that define `get_queryset`. ([#2905][gh2905])
+
+
 ### 3.1.1
 
 **Date**: [23rd March 2015][3.1.1-milestone].
 
 * **Security fix**: Escape tab switching cookie name in browsable API.
-* Display input forms in browsable API if `serializer_class` is used, even when `get_serializer` method does not exist on the view. ([#2743](gh2743))
-* Use a password input for the AuthTokenSerializer. ([#2741](gh2741))
+* Display input forms in browsable API if `serializer_class` is used, even when `get_serializer` method does not exist on the view. ([#2743][gh2743])
+* Use a password input for the AuthTokenSerializer. ([#2741][gh2741])
 * Fix missing anchor closing tag after next button. ([#2691][gh2691])
 * Fix `lookup_url_kwarg` handling in viewsets. ([#2685][gh2685], [#2591][gh2591])
 * Fix problem with importing `rest_framework.views` in `apps.py` ([#2678][gh2678])
@@ -184,6 +223,8 @@ For older release notes, [please see the version 2.x documentation][old-release-
 [3.0.5-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.0.5+Release%22
 [3.1.0-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.1.0+Release%22
 [3.1.1-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.1.1+Release%22
+[3.1.2-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.1.2+Release%22
+[3.1.3-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.1.3+Release%22
 
 <!-- 3.0.1 -->
 [gh2013]: https://github.com/tomchristie/django-rest-framework/issues/2013
@@ -296,3 +337,48 @@ For older release notes, [please see the version 2.x documentation][old-release-
 [gh2631]: https://github.com/tomchristie/django-rest-framework/issues/2631
 [gh2741]: https://github.com/tomchristie/django-rest-framework/issues/2641
 [gh2743]: https://github.com/tomchristie/django-rest-framework/issues/2643
+<!-- 3.1.2 -->
+[gh2656]: https://github.com/tomchristie/django-rest-framework/issues/2656
+[gh2687]: https://github.com/tomchristie/django-rest-framework/issues/2687
+[gh2869]: https://github.com/tomchristie/django-rest-framework/issues/2869
+[gh2764]: https://github.com/tomchristie/django-rest-framework/issues/2764
+[gh2763]: https://github.com/tomchristie/django-rest-framework/issues/2763
+[gh2757]: https://github.com/tomchristie/django-rest-framework/issues/2757
+[gh2630]: https://github.com/tomchristie/django-rest-framework/issues/2630
+[gh2724]: https://github.com/tomchristie/django-rest-framework/issues/2724
+[gh2711]: https://github.com/tomchristie/django-rest-framework/issues/2711
+[gh2745]: https://github.com/tomchristie/django-rest-framework/issues/2745
+[gh2754]: https://github.com/tomchristie/django-rest-framework/issues/2754
+[gh2762]: https://github.com/tomchristie/django-rest-framework/issues/2762
+[gh2798]: https://github.com/tomchristie/django-rest-framework/issues/2798
+[gh2807]: https://github.com/tomchristie/django-rest-framework/issues/2807
+[gh2818]: https://github.com/tomchristie/django-rest-framework/issues/2818
+[gh2835]: https://github.com/tomchristie/django-rest-framework/issues/2835
+[gh2836]: https://github.com/tomchristie/django-rest-framework/issues/2836
+[gh2853]: https://github.com/tomchristie/django-rest-framework/issues/2853
+[gh2862]: https://github.com/tomchristie/django-rest-framework/issues/2862
+[gh2863]: https://github.com/tomchristie/django-rest-framework/issues/2863
+[gh2868]: https://github.com/tomchristie/django-rest-framework/issues/2868
+[gh2905]: https://github.com/tomchristie/django-rest-framework/issues/2905
+<!-- 3.1.3 -->
+[gh2481]: https://github.com/tomchristie/django-rest-framework/issues/2481
+[gh2989]: https://github.com/tomchristie/django-rest-framework/issues/2989
+[gh2788]: https://github.com/tomchristie/django-rest-framework/issues/2788
+[gh3000]: https://github.com/tomchristie/django-rest-framework/issues/3000
+[gh2993]: https://github.com/tomchristie/django-rest-framework/issues/2993
+[gh2894]: https://github.com/tomchristie/django-rest-framework/issues/2894
+[gh2981]: https://github.com/tomchristie/django-rest-framework/issues/2981
+[gh2811]: https://github.com/tomchristie/django-rest-framework/issues/2811
+[gh2975]: https://github.com/tomchristie/django-rest-framework/issues/2975
+[gh2839]: https://github.com/tomchristie/django-rest-framework/issues/2839
+[gh2940]: https://github.com/tomchristie/django-rest-framework/issues/2940
+[gh2887]: https://github.com/tomchristie/django-rest-framework/issues/2887
+[gh2034]: https://github.com/tomchristie/django-rest-framework/issues/2034
+[gh2933]: https://github.com/tomchristie/django-rest-framework/issues/2933
+[gh2948]: https://github.com/tomchristie/django-rest-framework/issues/2948
+[gh2947]: https://github.com/tomchristie/django-rest-framework/issues/2947
+[gh2952]: https://github.com/tomchristie/django-rest-framework/issues/2952
+[gh2747]: https://github.com/tomchristie/django-rest-framework/issues/2747
+[gh2618]: https://github.com/tomchristie/django-rest-framework/issues/2618
+[gh3008]: https://github.com/tomchristie/django-rest-framework/issues/3008
+[gh2695]: https://github.com/tomchristie/django-rest-framework/issues/2695

docs/topics/rest-hypermedia-hateoas.md

@@ -32,7 +32,7 @@ REST framework also includes [serialization] and [parser]/[renderer] components
 
 ## What REST framework doesn't provide.
 
-What REST framework doesn't do is give you is machine readable hypermedia formats such as [HAL][hal], [Collection+JSON][collection], [JSON API][json-api] or HTML [microformats] by default, or the ability to auto-magically create fully HATEOAS style APIs that include hypermedia-based form descriptions and semantically labelled hyperlinks. Doing so would involve making opinionated choices about API design that should really remain outside of the framework's scope.
+What REST framework doesn't do is give you machine readable hypermedia formats such as [HAL][hal], [Collection+JSON][collection], [JSON API][json-api] or HTML [microformats] by default, or the ability to auto-magically create fully HATEOAS style APIs that include hypermedia-based form descriptions and semantically labelled hyperlinks. Doing so would involve making opinionated choices about API design that should really remain outside of the framework's scope.
 
 [cite]: http://vimeo.com/channels/restfest/page:2
 [dissertation]: http://www.ics.uci.edu/~fielding/pubs/dissertation/top.htm

docs/topics/third-party-resources.md

@@ -211,6 +211,7 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque
 ### Views
 
 * [djangorestframework-bulk][djangorestframework-bulk] - Implements generic view mixins as well as some common concrete generic views to allow to apply bulk operations via API requests.
+* [django-rest-multiple-models][django-rest-multiple-models] - Provides a generic view (and mixin) for sending multiple serialized models and/or querysets via a single API request.
 
 ### Routers
 
@@ -237,10 +238,12 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque
 * [djangorestrelationalhyperlink][djangorestrelationalhyperlink] - A hyperlinked serialiser that can can be used to alter relationships via hyperlinks, but otherwise like a hyperlink model serializer.
 * [django-rest-swagger][django-rest-swagger] - An API documentation generator for Swagger UI.
 * [django-rest-framework-proxy][django-rest-framework-proxy] - Proxy to redirect incoming request to another API server.
-* [gaiarestframework][gaiarestframework] - Utils for django-rest-framewok
+* [gaiarestframework][gaiarestframework] - Utils for django-rest-framework
 * [drf-extensions][drf-extensions] - A collection of custom extensions
 * [ember-django-adapter][ember-django-adapter] - An adapter for working with Ember.js
 * [django-versatileimagefield][django-versatileimagefield] - Provides a drop-in replacement for Django's stock `ImageField` that makes it easy to serve images in multiple sizes/renditions from a single field. For DRF-specific implementation docs, [click here][django-versatileimagefield-drf-docs].
+* [drf-tracking][drf-tracking] - Utilities to track requests to DRF API views.
+* [django-rest-framework-braces][django-rest-framework-braces] - Collection of utilities for working with Django Rest Framework. The most notable ones are [FormSerializer](https://django-rest-framework-braces.readthedocs.org/en/latest/overview.html#formserializer) and [SerializerForm](https://django-rest-framework-braces.readthedocs.org/en/latest/overview.html#serializerform), which are adapters between DRF serializers and Django forms.
 
 ## Other Resources
 
@@ -267,6 +270,9 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque
 * [Web API performance: profiling Django REST framework][web-api-performance-profiling-django-rest-framework]
 * [API Development with Django and Django REST Framework][api-development-with-django-and-django-rest-framework]
 
+### Documentations
+* [Classy Django REST Framework][cdrf.co]
+
 [cite]: http://www.software-ecosystems.com/Software_Ecosystems/Ecosystems.html
 [cookiecutter]: https://github.com/jpadilla/cookiecutter-django-rest-framework
 [new-repo]: https://github.com/new
@@ -299,6 +305,7 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque
 [drf-compound-fields]: https://github.com/estebistec/drf-compound-fields
 [django-extra-fields]: https://github.com/Hipo/drf-extra-fields
 [djangorestframework-bulk]: https://github.com/miki725/django-rest-framework-bulk
+[django-rest-multiple-models]: https://github.com/Axiologue/DjangoRestMultipleModels
 [drf-nested-routers]: https://github.com/alanjds/drf-nested-routers
 [wq.db.rest]: http://wq.io/docs/about-rest
 [djangorestframework-msgpack]: https://github.com/juanriaza/django-rest-framework-msgpack
@@ -330,3 +337,6 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque
 [django-rest-auth]: https://github.com/Tivix/django-rest-auth/
 [django-versatileimagefield]: https://github.com/WGBH/django-versatileimagefield
 [django-versatileimagefield-drf-docs]:http://django-versatileimagefield.readthedocs.org/en/latest/drf_integration.html
+[cdrf.co]:http://www.cdrf.co
+[drf-tracking]: https://github.com/aschn/drf-tracking
+[django-rest-framework-braces]: https://github.com/dealertrack/django-rest-framework-braces

docs/tutorial/1-serialization.md

@@ -89,7 +89,6 @@ We'll also need to create an initial migration for our snippet model, and sync t
 
 The first thing we need to get started on our Web API is to provide a way of serializing and deserializing the snippet instances into representations such as `json`.  We can do this by declaring serializers that work very similar to Django's forms.  Create a file in the `snippets` directory named `serializers.py` and add the following.
 
-    from django.forms import widgets
     from rest_framework import serializers
     from snippets.models import Snippet, LANGUAGE_CHOICES, STYLE_CHOICES
 

docs/tutorial/2-requests-and-responses.md

@@ -108,7 +108,7 @@ and
 
 Now update the `urls.py` file slightly, to append a set of `format_suffix_patterns` in addition to the existing URLs.
 
-    from django.conf.urls import patterns, url
+    from django.conf.urls import url
     from rest_framework.urlpatterns import format_suffix_patterns
     from snippets import views
 

docs/tutorial/quickstart.md

@@ -83,8 +83,6 @@ Rather than write multiple views we're grouping together all the common behavior
 
 We can easily break these down into individual views if we need to, but using viewsets keeps the view logic nicely organized as well as being very concise.
 
-For trivial cases you can simply set a `model` attribute on the `ViewSet` class and the serializer and queryset will be automatically generated for you.  Setting the `queryset` and/or `serializer_class` attributes gives you more explicit control of the API behaviour, and is the recommended style for most applications.
-
 ## URLs
 
 Okay, now let's wire up the API URLs.  On to `tutorial/urls.py`...

docs_theme/base.html

@@ -4,11 +4,11 @@
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   <meta charset="utf-8">
-  <title>{{ page_title }}</title>
+  <title>{% if page_title %}{{ page_title }} - {% endif %}{{ site_name }}</title>
   <link href="{{ base_url }}/img/favicon.ico" rel="icon" type="image/x-icon">
   <link rel="canonical" href="{{ canonical_url }}" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <meta name="description" content="Django, API, REST, {{ current_page.title }}">
+  <meta name="description" content="Django, API, REST{% if current_page %}, {{ current_page.title }}{% endif %}">
   <meta name="author" content="Tom Christie">
 
   <!-- Le styles -->
@@ -54,37 +54,27 @@
     }
   </style>
 </head>
-<body onload="prettyPrint()" class="{% if current_page.is_homepage %}index{% endif %}-page">
+<body onload="prettyPrint()" class="{% if current_page and current_page.is_homepage %}index{% endif %}-page">
 
   <div class="wrapper">
-
     {% include "nav.html" %}
 
     <div class="body-content">
       <div class="container-fluid">
-
         <!-- Search Modal -->
-        <div id="searchModal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+        <div id="mkdocs_search_modal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
           <div class="modal-header">
             <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
             <h3 id="myModalLabel">Documentation search</h3>
           </div>
 
           <div class="modal-body">
-            <!-- Custom google search -->
-            <script>
-              (function() {
-                var cx = '015016005043623903336:rxraeohqk6w';
-                var gcse = document.createElement('script');
-                gcse.type = 'text/javascript';
-                gcse.async = true;
-                gcse.src = (document.location.protocol == 'https:' ? 'https:' : 'http:') +
-                  '//www.google.com/cse/cse.js?cx=' + cx;
-                var s = document.getElementsByTagName('script')[0];
-                s.parentNode.insertBefore(gcse, s);
-              })();
-            </script>
-            <gcse:search></gcse:search>
+            <form role="form">
+              <div class="form-group">
+                <input type="text" name="q" class="form-control" placeholder="Search..." id="mkdocs-search-query">
+              </div>
+            </form>
+            <div id="mkdocs-search-results"></div>
           </div>
 
           <div class="modal-footer">
@@ -93,26 +83,17 @@
         </div>
 
         <div class="row-fluid">
-
           <div class="span3">
-            <!-- TODO
-            <p style="margin-top: -12px">
-              <a class="btn btn-mini btn-primary" style="width: 60px">&laquo; previous</a>
-              <a class="btn btn-mini btn-primary" style="float: right; margin-right: 8px; width: 60px;">next &raquo;</a>
-            </p>
-          -->
             <div id="table-of-contents">
               <ul class="nav nav-list side-nav well sidebar-nav-fixed">
-
-                {% if current_page.is_homepage %}
-                    <li class="main">
-                        <a href="#">Django REST framework</a>
-                    </li>
+                {% if current_page and current_page.is_homepage %}
+                  <li class="main">
+                    <a href="#">Django REST framework</a>
+                  </li>
                 {% endif %}
 
                 {% for toc_item in toc %}
-
-                  <li class="{% if not current_page.is_homepage %}main{% endif %}">
+                  <li class="{% if current_page and not current_page.is_homepage %}main{% endif %}">
                     <a href="{{ toc_item.url }}">{{ toc_item.title }}</a>
                   </li>
 
@@ -121,42 +102,38 @@
                       <a href="{{ toc_item.url }}">{{ toc_item.title }}</a>
                     </li>
                   {% endfor %}
-
                 {% endfor %}
 
-                {% if current_page.is_homepage %}
-                <div class="promo">
-                  <hr/>
-                  <script type="text/javascript" src="//cdn.fusionads.net/fusion.js?zoneid=1332&serve=C6SDP2Y&placement=djangorestframework" id="_fusionads_js"></script>
-                </div>
+                {% if current_page and current_page.is_homepage %}
+                  <div class="promo">
+                    <hr/>
+                    <script type="text/javascript" src="//cdn.fusionads.net/fusion.js?zoneid=1332&serve=C6SDP2Y&placement=djangorestframework" id="_fusionads_js"></script>
+                  </div>
                 {% endif %}
-
               </ul>
 
             </div>
           </div>
 
           <div id="main-content" class="span9">
-            {% if meta.source %}
-              {% for filename in meta.source %}
-                <a class="github" href="https://github.com/tomchristie/django-rest-framework/tree/master/rest_framework/{{ filename }}">
-                  <span class="label label-info">{{ filename }}</span>
-                </a>
-              {% endfor %}
-            {% endif %}
-
-            {{ content }}
-          </div>
-          <!--/span-->
-        </div>
-        <!--/row-->
-      </div>
-      <!--/.fluid-container-->
-    </div>
-    <!--/.body content-->
+            {% block content %}
+              {% if meta.source %}
+                {% for filename in meta.source %}
+                  <a class="github" href="https://github.com/tomchristie/django-rest-framework/tree/master/rest_framework/{{ filename }}">
+                    <span class="label label-info">{{ filename }}</span>
+                  </a>
+                {% endfor %}
+              {% endif %}
+
+              {{ content }}
+            {% endblock %}
+
+          </div> <!--/span-->
+        </div> <!--/row-->
+      </div> <!--/.fluid-container-->
+    </div> <!--/.body content-->
     <div id="push"></div>
-  </div>
-  <!--/.wrapper -->
+  </div> <!--/.wrapper -->
 
   <footer class="span12">
     <p>Documentation built with <a href="http://www.mkdocs.org/">MkDocs</a>.</a>
@@ -169,13 +146,15 @@
   <script src="{{ base_url }}/js/jquery-1.8.1-min.js"></script>
   <script src="{{ base_url }}/js/prettify-1.0.js"></script>
   <script src="{{ base_url }}/js/bootstrap-2.1.1-min.js"></script>
+  <script>var base_url = '{{ base_url }}';</script>
+  <script src="{{ base_url }}/mkdocs/js/require.js"></script>
   <script src="{{ base_url }}/js/theme.js"></script>
 
   <script>
-    //$('.side-nav').scrollspy()
     var shiftWindow = function() {
       scrollBy(0, -50)
     };
+
     if (location.hash) shiftWindow();
     window.addEventListener("hashchange", shiftWindow);
 
@@ -183,12 +162,12 @@
       event.stopPropagation();
     });
 
-    // Dynamically force sidenav to no higher than browser window
-    $('.side-nav').css('max-height', window.innerHeight - 130);
+    // Dynamically force sidenav/dropdown to no higher than browser window
+    $('.side-nav, .dropdown-menu').css('max-height', window.innerHeight - 130);
 
     $(function() {
       $(window).resize(function() {
-        $('.side-nav').css('max-height', window.innerHeight - 130);
+        $('.side-nav, .dropdown-menu').css('max-height', window.innerHeight - 130);
       });
     });
   </script>

docs_theme/css/default.css

@@ -5,11 +5,12 @@ pre {
 }
 
 .dropdown .dropdown-menu {
-    display: none;
+  display: none;
+  overflow-y: scroll;
 }
 
 .dropdown.open .dropdown-menu {
-    display: block;
+  display: block;
 }
 
 @media (max-width: 480px) {
@@ -36,15 +37,8 @@ body.index-page #main-content iframe.github-star-button {
     margin-right: -15px;
 }
 
-/* Tweet button */
-body.index-page #main-content iframe.twitter-share-button {
-    float: right;
-    margin-top: -12px;
-    margin-right: 8px;
-}
-
-/* Travis CI badge */
-body.index-page #main-content img.travis-build-image {
+/* Travis CI and PyPI badge */
+body.index-page #main-content img.status-badge {
     float: right;
     margin-right: 8px;
     margin-top: -11px;
@@ -415,3 +409,7 @@ ul.sponsor {
     list-style: none;
     display: block;
 }
+
+#mkdocs_search_modal article p{
+  word-wrap: break-word;
+}

docs_theme/js/theme.js

-$(function(){
+function getSearchTerm()
+{
+    var sPageURL = window.location.search.substring(1);
+    var sURLVariables = sPageURL.split('&');
+    for (var i = 0; i < sURLVariables.length; i++)
+    {
+        var sParameterName = sURLVariables[i].split('=');
+        if (sParameterName[0] == 'q')
+        {
+            return sParameterName[1];
+        }
+    }
+}
+
+$(function() {
+
+    var initialise_search = function(){
+        require.config({"baseUrl":"/mkdocs/js"});
+        require(["search",]);
+    }
+
+    var search_term = getSearchTerm();
+    if(search_term){
+        $('#mkdocs_search_modal').modal();
+    }
 
     $('pre code').parent().addClass('prettyprint well');
 
+    $(document).on("submit", "#mkdocs_search_modal form", function (e) {
+        $("#mkdocs-search-results").html("Searching...");
+        initialise_search();
+        return false;
+    });
+
 });

docs_theme/nav.html

@@ -8,7 +8,7 @@
           <a class="repo-link btn btn-inverse btn-small {% if not previous_page %}disabled{% endif %}" rel="next" {% if previous_page %}href="{{ previous_page.url }}"{% endif %}>
             <i class="icon-arrow-left icon-white"></i> Previous
           </a>
-          <a class="repo-link btn btn-inverse btn-small" href="#searchModal" data-toggle="modal"><i class="icon-search icon-white"></i> Search</a>
+          <a id="search_modal_show" class="repo-link btn btn-inverse btn-small" href="#mkdocs_search_modal" data-toggle="modal" data-target="#mkdocs_search_modal"><i class="icon-search icon-white"></i> Search</a>
           <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
@@ -19,7 +19,6 @@
             {% if include_nav %}
             <!-- Main navigation -->
             <ul class="nav navbar-nav">
-              <li {% if current_page.is_homepage %}class="active"{% endif %}><a href="/">Home</a></li>
               {% for nav_item in nav %} {% if nav_item.children %}
               <li class="dropdown{% if nav_item.active %} active{% endif %}">
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ nav_item.title }} <b class="caret"></b></a>

mkdocs.yml

@@ -7,50 +7,53 @@ repo_url: https://github.com/tomchristie/django-rest-framework
 theme_dir: docs_theme
 
 pages:
- - ['index.md', 'Home']
- - ['tutorial/quickstart.md', 'Tutorial', 'Quickstart']
- - ['tutorial/1-serialization.md', 'Tutorial', '1 - Serialization']
- - ['tutorial/2-requests-and-responses.md', 'Tutorial', '2 - Requests and responses']
- - ['tutorial/3-class-based-views.md', 'Tutorial', '3 - Class based views']
- - ['tutorial/4-authentication-and-permissions.md', 'Tutorial', '4 - Authentication and permissions']
- - ['tutorial/5-relationships-and-hyperlinked-apis.md', 'Tutorial', '5 - Relationships and hyperlinked APIs']
- - ['tutorial/6-viewsets-and-routers.md', 'Tutorial', '6 - Viewsets and routers']
- - ['api-guide/requests.md', 'API Guide', 'Requests']
- - ['api-guide/responses.md', 'API Guide', 'Responses']
- - ['api-guide/views.md', 'API Guide', 'Views']
- - ['api-guide/generic-views.md', 'API Guide', 'Generic views']
- - ['api-guide/viewsets.md', 'API Guide', 'Viewsets']
- - ['api-guide/routers.md', 'API Guide', 'Routers']
- - ['api-guide/parsers.md', 'API Guide', 'Parsers']
- - ['api-guide/renderers.md', 'API Guide', 'Renderers']
- - ['api-guide/serializers.md', 'API Guide', 'Serializers']
- - ['api-guide/fields.md', 'API Guide', 'Serializer fields']
- - ['api-guide/relations.md', 'API Guide', 'Serializer relations']
- - ['api-guide/validators.md', 'API Guide', 'Validators']
- - ['api-guide/authentication.md', 'API Guide', 'Authentication']
- - ['api-guide/permissions.md', 'API Guide', 'Permissions']
- - ['api-guide/throttling.md', 'API Guide', 'Throttling']
- - ['api-guide/filtering.md', 'API Guide', 'Filtering']
- - ['api-guide/pagination.md', 'API Guide', 'Pagination']
- - ['api-guide/versioning.md', 'API Guide', 'Versioning']
- - ['api-guide/content-negotiation.md', 'API Guide', 'Content negotiation']
- - ['api-guide/metadata.md', 'API Guide', 'Metadata']
- - ['api-guide/format-suffixes.md', 'API Guide', 'Format suffixes']
- - ['api-guide/reverse.md', 'API Guide', 'Returning URLs']
- - ['api-guide/exceptions.md', 'API Guide', 'Exceptions']
- - ['api-guide/status-codes.md', 'API Guide', 'Status codes']
- - ['api-guide/testing.md', 'API Guide', 'Testing']
- - ['api-guide/settings.md', 'API Guide', 'Settings']
- - ['topics/documenting-your-api.md', 'Topics', 'Documenting your API']
- - ['topics/internationalization.md', 'Topics', 'Internationalization']
- - ['topics/ajax-csrf-cors.md', 'Topics', 'AJAX, CSRF & CORS']
- - ['topics/browser-enhancements.md', 'Topics',]
- - ['topics/browsable-api.md', 'Topics', 'The Browsable API']
- - ['topics/rest-hypermedia-hateoas.md', 'Topics', 'REST, Hypermedia & HATEOAS']
- - ['topics/third-party-resources.md', 'Topics', 'Third Party Resources']
- - ['topics/contributing.md', 'Topics', 'Contributing to REST framework']
- - ['topics/project-management.md', 'Topics', 'Project management']
- - ['topics/3.0-announcement.md', 'Topics', '3.0 Announcement']
- - ['topics/3.1-announcement.md', 'Topics', '3.1 Announcement']
- - ['topics/kickstarter-announcement.md', 'Topics', 'Kickstarter Announcement']
- - ['topics/release-notes.md', 'Topics', 'Release Notes']
+ - Home: 'index.md'
+ - Tutorial:
+    - 'Quickstart': 'tutorial/quickstart.md'
+    - '1 - Serialization': 'tutorial/1-serialization.md'
+    - '2 - Requests and responses': 'tutorial/2-requests-and-responses.md'
+    - '3 - Class based views': 'tutorial/3-class-based-views.md'
+    - '4 - Authentication and permissions': 'tutorial/4-authentication-and-permissions.md'
+    - '5 - Relationships and hyperlinked APIs': 'tutorial/5-relationships-and-hyperlinked-apis.md'
+    - '6 - Viewsets and routers': 'tutorial/6-viewsets-and-routers.md'
+ - API Guide:
+    - 'Requests': 'api-guide/requests.md'
+    - 'Responses': 'api-guide/responses.md'
+    - 'Views': 'api-guide/views.md'
+    - 'Generic views': 'api-guide/generic-views.md'
+    - 'Viewsets': 'api-guide/viewsets.md'
+    - 'Routers': 'api-guide/routers.md'
+    - 'Parsers': 'api-guide/parsers.md'
+    - 'Renderers': 'api-guide/renderers.md'
+    - 'Serializers': 'api-guide/serializers.md'
+    - 'Serializer fields': 'api-guide/fields.md'
+    - 'Serializer relations': 'api-guide/relations.md'
+    - 'Validators': 'api-guide/validators.md'
+    - 'Authentication': 'api-guide/authentication.md'
+    - 'Permissions': 'api-guide/permissions.md'
+    - 'Throttling': 'api-guide/throttling.md'
+    - 'Filtering': 'api-guide/filtering.md'
+    - 'Pagination': 'api-guide/pagination.md'
+    - 'Versioning': 'api-guide/versioning.md'
+    - 'Content negotiation': 'api-guide/content-negotiation.md'
+    - 'Metadata': 'api-guide/metadata.md'
+    - 'Format suffixes': 'api-guide/format-suffixes.md'
+    - 'Returning URLs': 'api-guide/reverse.md'
+    - 'Exceptions': 'api-guide/exceptions.md'
+    - 'Status codes': 'api-guide/status-codes.md'
+    - 'Testing': 'api-guide/testing.md'
+    - 'Settings': 'api-guide/settings.md'
+ - Topics:
+     - 'Documenting your API': 'topics/documenting-your-api.md'
+     - 'Internationalization': 'topics/internationalization.md'
+     - 'AJAX, CSRF & CORS': 'topics/ajax-csrf-cors.md'
+     - 'Browser Enhancements': 'topics/browser-enhancements.md'
+     - 'The Browsable API': 'topics/browsable-api.md'
+     - 'REST, Hypermedia & HATEOAS': 'topics/rest-hypermedia-hateoas.md'
+     - 'Third Party Resources': 'topics/third-party-resources.md'
+     - 'Contributing to REST framework': 'topics/contributing.md'
+     - 'Project management': 'topics/project-management.md'
+     - '3.0 Announcement': 'topics/3.0-announcement.md'
+     - '3.1 Announcement': 'topics/3.1-announcement.md'
+     - 'Kickstarter Announcement': 'topics/kickstarter-announcement.md'
+     - 'Release Notes': 'topics/release-notes.md'

requirements/requirements-codestyle.txt

 # PEP8 code linting, which we run on all commits.
 flake8==2.4.0
 pep8==1.5.7
+
+# Sort and lint imports
+isort==3.9.6

requirements/requirements-documentation.txt

 # MkDocs to build our documentation.
-mkdocs==0.11.1
+mkdocs==0.13.2

requirements/requirements-optionals.txt

 # Optional packages which may be used with REST framework.
 markdown==2.5.2
-django-guardian==1.2.5
-django-filter==0.9.2
+django-guardian==1.3.0
+django-filter==0.10.0

requirements/requirements-testing.txt

 # PyTest for running the tests.
 pytest==2.6.4
 pytest-django==2.8.0
+pytest-cov==1.8.1

rest_framework/__init__.py

@@ -8,7 +8,7 @@ ______ _____ _____ _____    __
 """
 
 __title__ = 'Django REST framework'
-__version__ = '3.1.1'
+__version__ = '3.1.3'
 __author__ = 'Tom Christie'
 __license__ = 'BSD 2-Clause'
 __copyright__ = 'Copyright 2011-2015 Tom Christie'

rest_framework/authentication.py

@@ -2,12 +2,16 @@
 Provides various authentication policies.
 """
 from __future__ import unicode_literals
+
 import base64
+
 from django.contrib.auth import authenticate
 from django.middleware.csrf import CsrfViewMiddleware
 from django.utils.translation import ugettext_lazy as _
-from rest_framework import exceptions, HTTP_HEADER_ENCODING
+
+from rest_framework import HTTP_HEADER_ENCODING, exceptions
 from rest_framework.authtoken.models import Token
+from rest_framework.compat import get_user_model
 
 
 def get_authorization_header(request):
@@ -85,7 +89,12 @@ class BasicAuthentication(BaseAuthentication):
         """
         Authenticate the userid and password against username and password.
         """
-        user = authenticate(username=userid, password=password)
+        username_field = getattr(get_user_model(), 'USERNAME_FIELD', 'username')
+        credentials = {
+            username_field: userid,
+            'password': password
+        }
+        user = authenticate(**credentials)
 
         if user is None:
             raise exceptions.AuthenticationFailed(_('Invalid username/password.'))
@@ -164,7 +173,13 @@ class TokenAuthentication(BaseAuthentication):
             msg = _('Invalid token header. Token string should not contain spaces.')
             raise exceptions.AuthenticationFailed(msg)
 
-        return self.authenticate_credentials(auth[1])
+        try:
+            token = auth[1].decode()
+        except UnicodeError:
+            msg = _('Invalid token header. Token string should not contain invalid characters.')
+            raise exceptions.AuthenticationFailed(msg)
+
+        return self.authenticate_credentials(token)
 
     def authenticate_credentials(self, key):
         try:

rest_framework/authtoken/admin.py

 from django.contrib import admin
+
 from rest_framework.authtoken.models import Token
 
 

rest_framework/authtoken/migrations/0001_initial.py

 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
 from django.conf import settings
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

rest_framework/authtoken/models.py

@@ -5,7 +5,6 @@ from django.conf import settings
 from django.db import models
 from django.utils.encoding import python_2_unicode_compatible
 
-
 # Prior to Django 1.5, the AUTH_USER_MODEL setting does not exist.
 # Note that we don't perform this code in the compat module due to
 # bug report #1297

rest_framework/authtoken/views.py

-from rest_framework.views import APIView
-from rest_framework import parsers
-from rest_framework import renderers
-from rest_framework.response import Response
+from rest_framework import parsers, renderers
 from rest_framework.authtoken.models import Token
 from rest_framework.authtoken.serializers import AuthTokenSerializer
+from rest_framework.response import Response
+from rest_framework.views import APIView
 
 
 class ObtainAuthToken(APIView):

rest_framework/compat.py

@@ -5,13 +5,18 @@ versions of django/python, and compatibility wrappers around optional packages.
 
 # flake8: noqa
 from __future__ import unicode_literals
-from django.core.exceptions import ImproperlyConfigured
+
+import inspect
+
+import django
 from django.conf import settings
+from django.core.exceptions import ImproperlyConfigured
+from django.db import connection, transaction
+from django.test.client import FakePayload
+from django.utils import six
 from django.utils.encoding import force_text
 from django.utils.six.moves.urllib.parse import urlparse as _urlparse
-from django.utils import six
-import django
-import inspect
+
 try:
     import importlib
 except ImportError:
@@ -119,6 +124,14 @@ def get_model_name(model_cls):
         return model_cls._meta.module_name
 
 
+# Support custom user models in Django 1.5+
+try:
+    from django.contrib.auth import get_user_model
+except ImportError:
+    from django.contrib.auth.models import User
+    get_user_model = lambda: User
+
+
 # View._allowed_methods only present from 1.5 onwards
 if django.VERSION >= (1, 5):
     from django.views.generic import View
@@ -190,9 +203,6 @@ if 'patch' not in View.http_method_names:
     View.http_method_names = View.http_method_names + ['patch']
 
 
-# RequestFactory only provides `generic` from 1.5 onwards
-from django.test.client import RequestFactory as DjangoRequestFactory
-from django.test.client import FakePayload
 
 try:
     # In 1.5 the test client uses force_bytes
@@ -202,24 +212,30 @@ except ImportError:
     from django.utils.encoding import smart_str as force_bytes_or_smart_bytes
 
 
-class RequestFactory(DjangoRequestFactory):
-    def generic(self, method, path,
-            data='', content_type='application/octet-stream', **extra):
-        parsed = _urlparse(path)
-        data = force_bytes_or_smart_bytes(data, settings.DEFAULT_CHARSET)
-        r = {
-            'PATH_INFO': self._get_path(parsed),
-            'QUERY_STRING': force_text(parsed[4]),
-            'REQUEST_METHOD': six.text_type(method),
-        }
-        if data:
-            r.update({
-                'CONTENT_LENGTH': len(data),
-                'CONTENT_TYPE': six.text_type(content_type),
-                'wsgi.input': FakePayload(data),
-            })
-        r.update(extra)
-        return self.request(**r)
+# RequestFactory only provides `generic` from 1.5 onwards
+if django.VERSION >= (1, 5):
+    from django.test.client import RequestFactory
+else:
+    from django.test.client import RequestFactory as DjangoRequestFactory
+
+    class RequestFactory(DjangoRequestFactory):
+        def generic(self, method, path,
+                data='', content_type='application/octet-stream', **extra):
+            parsed = _urlparse(path)
+            data = force_bytes_or_smart_bytes(data, settings.DEFAULT_CHARSET)
+            r = {
+                'PATH_INFO': self._get_path(parsed),
+                'QUERY_STRING': force_text(parsed[4]),
+                'REQUEST_METHOD': six.text_type(method),
+            }
+            if data:
+                r.update({
+                    'CONTENT_LENGTH': len(data),
+                    'CONTENT_TYPE': six.text_type(content_type),
+                    'wsgi.input': FakePayload(data),
+                })
+            r.update(extra)
+            return self.request(**r)
 
 
 # Markdown is optional
@@ -250,3 +266,28 @@ else:
     SHORT_SEPARATORS = (b',', b':')
     LONG_SEPARATORS = (b', ', b': ')
     INDENT_SEPARATORS = (b',', b': ')
+
+
+if django.VERSION >= (1, 8):
+    from django.db.models import DurationField
+    from django.utils.dateparse import parse_duration
+    from django.utils.duration import duration_string
+else:
+    DurationField = duration_string = parse_duration = None
+
+
+def set_rollback():
+    if hasattr(transaction, 'set_rollback'):
+        if connection.settings_dict.get('ATOMIC_REQUESTS', False):
+            # If running in >=1.6 then mark a rollback as required,
+            # and allow it to be handled by Django.
+            if connection.in_atomic_block:
+                transaction.set_rollback(True)
+    elif transaction.is_managed():
+        # Otherwise handle it explicitly if in managed mode.
+        if transaction.is_dirty():
+            transaction.rollback()
+        transaction.leave_transaction_management()
+    else:
+        # transaction not managed
+        pass

rest_framework/decorators.py

@@ -7,9 +7,12 @@ based views, as well as the `@detail_route` and `@list_route` decorators, which
 used to annotate methods on viewsets that should be included by routers.
 """
 from __future__ import unicode_literals
+
+import types
+
 from django.utils import six
+
 from rest_framework.views import APIView
-import types
 
 
 def api_view(http_method_names=None):

rest_framework/exceptions.py

@@ -5,11 +5,16 @@ In addition Django's built in 403 and 404 exceptions are handled.
 (`django.http.Http404` and `django.core.exceptions.PermissionDenied`)
 """
 from __future__ import unicode_literals
+
+import math
+
 from django.utils import six
 from django.utils.encoding import force_text
-from django.utils.translation import ugettext_lazy as _, ungettext
+from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import ungettext
+
 from rest_framework import status
-import math
+from rest_framework.utils.serializer_helpers import ReturnDict, ReturnList
 
 
 def _force_text_recursive(data):
@@ -18,14 +23,20 @@ def _force_text_recursive(data):
     lazy translation strings into plain text.
     """
     if isinstance(data, list):
-        return [
+        ret = [
             _force_text_recursive(item) for item in data
         ]
+        if isinstance(data, ReturnList):
+            return ReturnList(ret, serializer=data.serializer)
+        return data
     elif isinstance(data, dict):
-        return dict([
+        ret = dict([
             (key, _force_text_recursive(value))
             for key, value in data.items()
         ])
+        if isinstance(data, ReturnDict):
+            return ReturnDict(ret, serializer=data.serializer)
+        return data
     return force_text(data)
 
 

rest_framework/filters.py

@@ -4,13 +4,16 @@ returned by list views.
 """
 from __future__ import unicode_literals
 
+import operator
+from functools import reduce
+
+from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
 from django.db import models
 from django.utils import six
-from rest_framework.compat import django_filters, guardian, get_model_name
+
+from rest_framework.compat import django_filters, get_model_name, guardian
 from rest_framework.settings import api_settings
-from functools import reduce
-import operator
 
 FilterSet = django_filters and django_filters.FilterSet or None
 
@@ -57,6 +60,7 @@ class DjangoFilterBackend(BaseFilterBackend):
                 class Meta:
                     model = queryset.model
                     fields = filter_fields
+
             return AutoFilterSet
 
         return None
@@ -98,13 +102,20 @@ class SearchFilter(BaseFilterBackend):
         if not search_fields:
             return queryset
 
+        original_queryset = queryset
         orm_lookups = [self.construct_search(six.text_type(search_field))
                        for search_field in search_fields]
 
         for search_term in self.get_search_terms(request):
             or_queries = [models.Q(**{orm_lookup: search_term})
                           for orm_lookup in orm_lookups]
-            queryset = queryset.filter(reduce(operator.or_, or_queries)).distinct()
+            queryset = queryset.filter(reduce(operator.or_, or_queries))
+
+        if settings.DATABASES[queryset.db]["ENGINE"] == "django.db.backends.oracle":
+            # distinct analogue for Oracle users
+            queryset = original_queryset.filter(pk__in=set(queryset.values_list('pk', flat=True)))
+        else:
+            queryset = queryset.distinct()
 
         return queryset
 
@@ -187,4 +198,7 @@ class DjangoObjectPermissionsFilter(BaseFilterBackend):
             'model_name': get_model_name(model_cls)
         }
         permission = self.perm_format % kwargs
-        return guardian.shortcuts.get_objects_for_user(user, permission, queryset)
+        if guardian.VERSION >= (1, 3):
+            # Maintain behavior compatibility with versions prior to 1.3
+            extra = {'accept_global_perms': False}
+        return guardian.shortcuts.get_objects_for_user(user, permission, queryset, **extra)

rest_framework/generics.py

@@ -2,10 +2,12 @@
 Generic views that provide commonly needed behaviour.
 """
 from __future__ import unicode_literals
+
 from django.db.models.query import QuerySet
 from django.http import Http404
 from django.shortcuts import get_object_or_404 as _get_object_or_404
-from rest_framework import views, mixins
+
+from rest_framework import mixins, views
 from rest_framework.settings import api_settings
 
 

rest_framework/locale/be/LC_MESSAGES/django.po

+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Django REST framework\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-06-03 17:30+0100\n"
+"PO-Revision-Date: 2015-06-03 16:30+0000\n"
+"Last-Translator: Xavier Ordoquy <xordoquy@linovia.com>\n"
+"Language-Team: Belarusian (http://www.transifex.com/projects/p/django-rest-framework/language/be/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: be\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
+
+#: authentication.py:70
+msgid "Invalid basic header. No credentials provided."
+msgstr ""
+
+#: authentication.py:73
+msgid "Invalid basic header. Credentials string should not contain spaces."
+msgstr ""
+
+#: authentication.py:79
+msgid "Invalid basic header. Credentials not correctly base64 encoded."
+msgstr ""
+
+#: authentication.py:97
+msgid "Invalid username/password."
+msgstr ""
+
+#: authentication.py:100 authentication.py:182
+msgid "User inactive or deleted."
+msgstr ""
+
+#: authentication.py:167
+msgid "Invalid token header. No credentials provided."
+msgstr ""
+
+#: authentication.py:170
+msgid "Invalid token header. Token string should not contain spaces."
+msgstr ""
+
+#: authentication.py:179
+msgid "Invalid token."
+msgstr ""
+
+#: authtoken/serializers.py:20
+msgid "User account is disabled."
+msgstr ""
+
+#: authtoken/serializers.py:23
+msgid "Unable to log in with provided credentials."
+msgstr ""
+
+#: authtoken/serializers.py:26
+msgid "Must include \"username\" and \"password\"."
+msgstr ""
+
+#: exceptions.py:38
+msgid "A server error occurred."
+msgstr ""
+
+#: exceptions.py:73
+msgid "Malformed request."
+msgstr ""
+
+#: exceptions.py:78
+msgid "Incorrect authentication credentials."
+msgstr ""
+
+#: exceptions.py:83
+msgid "Authentication credentials were not provided."
+msgstr ""
+
+#: exceptions.py:88
+msgid "You do not have permission to perform this action."
+msgstr ""
+
+#: exceptions.py:93 views.py:78
+msgid "Not found."
+msgstr ""
+
+#: exceptions.py:98
+#, python-brace-format
+msgid "Method \"{method}\" not allowed."
+msgstr ""
+
+#: exceptions.py:109
+msgid "Could not satisfy the request Accept header."
+msgstr ""
+
+#: exceptions.py:121
+#, python-brace-format
+msgid "Unsupported media type \"{media_type}\" in request."
+msgstr ""
+
+#: exceptions.py:134
+msgid "Request was throttled."
+msgstr ""
+
+#: fields.py:162 relations.py:132 relations.py:156 validators.py:77
+#: validators.py:160
+msgid "This field is required."
+msgstr ""
+
+#: fields.py:163
+msgid "This field may not be null."
+msgstr ""
+
+#: fields.py:496 fields.py:524
+#, python-brace-format
+msgid "\"{input}\" is not a valid boolean."
+msgstr ""
+
+#: fields.py:559
+msgid "This field may not be blank."
+msgstr ""
+
+#: fields.py:560 fields.py:1386
+#, python-brace-format
+msgid "Ensure this field has no more than {max_length} characters."
+msgstr ""
+
+#: fields.py:561
+#, python-brace-format
+msgid "Ensure this field has at least {min_length} characters."
+msgstr ""
+
+#: fields.py:598
+msgid "Enter a valid email address."
+msgstr ""
+
+#: fields.py:609
+msgid "This value does not match the required pattern."
+msgstr ""
+
+#: fields.py:620
+msgid ""
+"Enter a valid \"slug\" consisting of letters, numbers, underscores or "
+"hyphens."
+msgstr ""
+
+#: fields.py:632
+msgid "Enter a valid URL."
+msgstr ""
+
+#: fields.py:645
+#, python-brace-format
+msgid "\"{value}\" is not a valid UUID."
+msgstr ""
+
+#: fields.py:679
+msgid "A valid integer is required."
+msgstr ""
+
+#: fields.py:680 fields.py:715 fields.py:748
+#, python-brace-format
+msgid "Ensure this value is less than or equal to {max_value}."
+msgstr ""
+
+#: fields.py:681 fields.py:716 fields.py:749
+#, python-brace-format
+msgid "Ensure this value is greater than or equal to {min_value}."
+msgstr ""
+
+#: fields.py:682 fields.py:717 fields.py:753
+msgid "String value too large."
+msgstr ""
+
+#: fields.py:714 fields.py:747
+msgid "A valid number is required."
+msgstr ""
+
+#: fields.py:750
+#, python-brace-format
+msgid "Ensure that there are no more than {max_digits} digits in total."
+msgstr ""
+
+#: fields.py:751
+#, python-brace-format
+msgid ""
+"Ensure that there are no more than {max_decimal_places} decimal places."
+msgstr ""
+
+#: fields.py:752
+#, python-brace-format
+msgid ""
+"Ensure that there are no more than {max_whole_digits} digits before the "
+"decimal point."
+msgstr ""
+
+#: fields.py:842
+#, python-brace-format
+msgid "Datetime has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:843
+msgid "Expected a datetime but got a date."
+msgstr ""
+
+#: fields.py:907
+#, python-brace-format
+msgid "Date has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:908
+msgid "Expected a date but got a datetime."
+msgstr ""
+
+#: fields.py:971
+#, python-brace-format
+msgid "Time has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:1025
+#, python-brace-format
+msgid "Duration has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:1050 fields.py:1094
+#, python-brace-format
+msgid "\"{input}\" is not a valid choice."
+msgstr ""
+
+#: fields.py:1095 fields.py:1213 serializers.py:487
+#, python-brace-format
+msgid "Expected a list of items but got type \"{input_type}\"."
+msgstr ""
+
+#: fields.py:1129
+msgid "No file was submitted."
+msgstr ""
+
+#: fields.py:1130
+msgid ""
+"The submitted data was not a file. Check the encoding type on the form."
+msgstr ""
+
+#: fields.py:1131
+msgid "No filename could be determined."
+msgstr ""
+
+#: fields.py:1132
+msgid "The submitted file is empty."
+msgstr ""
+
+#: fields.py:1133
+#, python-brace-format
+msgid ""
+"Ensure this filename has at most {max_length} characters (it has {length})."
+msgstr ""
+
+#: fields.py:1175
+msgid ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
+msgstr ""
+
+#: fields.py:1250
+#, python-brace-format
+msgid "Expected a dictionary of items but got type \"{input_type}\"."
+msgstr ""
+
+#: pagination.py:231
+#, python-brace-format
+msgid "Invalid page \"{page_number}\": {message}."
+msgstr ""
+
+#: pagination.py:492
+msgid "Invalid cursor"
+msgstr ""
+
+#: relations.py:133
+#, python-brace-format
+msgid "Invalid pk \"{pk_value}\" - object does not exist."
+msgstr ""
+
+#: relations.py:134
+#, python-brace-format
+msgid "Incorrect type. Expected pk value, received {data_type}."
+msgstr ""
+
+#: relations.py:157
+msgid "Invalid hyperlink - No URL match."
+msgstr ""
+
+#: relations.py:158
+msgid "Invalid hyperlink - Incorrect URL match."
+msgstr ""
+
+#: relations.py:159
+msgid "Invalid hyperlink - Object does not exist."
+msgstr ""
+
+#: relations.py:160
+#, python-brace-format
+msgid "Incorrect type. Expected URL string, received {data_type}."
+msgstr ""
+
+#: relations.py:302
+#, python-brace-format
+msgid "Object with {slug_name}={value} does not exist."
+msgstr ""
+
+#: relations.py:303
+msgid "Invalid value."
+msgstr ""
+
+#: serializers.py:304
+#, python-brace-format
+msgid "Invalid data. Expected a dictionary, but got {datatype}."
+msgstr ""
+
+#: templates/rest_framework/horizontal/radio.html:2
+#: templates/rest_framework/inline/radio.html:2
+#: templates/rest_framework/vertical/radio.html:2
+msgid "None"
+msgstr ""
+
+#: templates/rest_framework/horizontal/select_multiple.html:2
+#: templates/rest_framework/inline/select_multiple.html:2
+#: templates/rest_framework/vertical/select_multiple.html:2
+msgid "No items to select."
+msgstr ""
+
+#: validators.py:22
+msgid "This field must be unique."
+msgstr ""
+
+#: validators.py:76
+#, python-brace-format
+msgid "The fields {field_names} must make a unique set."
+msgstr ""
+
+#: validators.py:224
+#, python-brace-format
+msgid "This field must be unique for the \"{date_field}\" date."
+msgstr ""
+
+#: validators.py:239
+#, python-brace-format
+msgid "This field must be unique for the \"{date_field}\" month."
+msgstr ""
+
+#: validators.py:252
+#, python-brace-format
+msgid "This field must be unique for the \"{date_field}\" year."
+msgstr ""
+
+#: versioning.py:39
+msgid "Invalid version in \"Accept\" header."
+msgstr ""
+
+#: versioning.py:70 versioning.py:112
+msgid "Invalid version in URL path."
+msgstr ""
+
+#: versioning.py:141
+msgid "Invalid version in hostname."
+msgstr ""
+
+#: versioning.py:163
+msgid "Invalid version in query parameter."
+msgstr ""
+
+#: views.py:85
+msgid "Permission denied."
+msgstr ""

rest_framework/locale/en_US/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-30 16:40+0000\n"
+"POT-Creation-Date: 2015-06-03 17:30+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,36 +17,48 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: authentication.py:69
+#: authentication.py:70
 msgid "Invalid basic header. No credentials provided."
 msgstr ""
 
-#: authentication.py:72
+#: authentication.py:73
 msgid "Invalid basic header. Credentials string should not contain spaces."
 msgstr ""
 
-#: authentication.py:78
+#: authentication.py:79
 msgid "Invalid basic header. Credentials not correctly base64 encoded."
 msgstr ""
 
-#: authentication.py:90
+#: authentication.py:97
 msgid "Invalid username/password."
 msgstr ""
 
-#: authentication.py:156
+#: authentication.py:100 authentication.py:182
+msgid "User inactive or deleted."
+msgstr ""
+
+#: authentication.py:167
 msgid "Invalid token header. No credentials provided."
 msgstr ""
 
-#: authentication.py:159
+#: authentication.py:170
 msgid "Invalid token header. Token string should not contain spaces."
 msgstr ""
 
-#: authentication.py:168
+#: authentication.py:179
 msgid "Invalid token."
 msgstr ""
 
-#: authentication.py:171
-msgid "User inactive or deleted."
+#: authtoken/serializers.py:20
+msgid "User account is disabled."
+msgstr ""
+
+#: authtoken/serializers.py:23
+msgid "Unable to log in with provided credentials."
+msgstr ""
+
+#: authtoken/serializers.py:26
+msgid "Must include \"username\" and \"password\"."
 msgstr ""
 
 #: exceptions.py:38
@@ -69,11 +81,12 @@ msgstr ""
 msgid "You do not have permission to perform this action."
 msgstr ""
 
-#: exceptions.py:93 views.py:77
+#: exceptions.py:93 views.py:78
 msgid "Not found."
 msgstr ""
 
 #: exceptions.py:98
+#, python-brace-format
 msgid "Method \"{method}\" not allowed."
 msgstr ""
 
@@ -82,6 +95,7 @@ msgid "Could not satisfy the request Accept header."
 msgstr ""
 
 #: exceptions.py:121
+#, python-brace-format
 msgid "Unsupported media type \"{media_type}\" in request."
 msgstr ""
 
@@ -89,159 +103,183 @@ msgstr ""
 msgid "Request was throttled."
 msgstr ""
 
-#: fields.py:153 relations.py:132 relations.py:156 validators.py:77
-#: validators.py:155
+#: fields.py:162 relations.py:132 relations.py:156 validators.py:77
+#: validators.py:160
 msgid "This field is required."
 msgstr ""
 
-#: fields.py:154
+#: fields.py:163
 msgid "This field may not be null."
 msgstr ""
 
-#: fields.py:487 fields.py:515
+#: fields.py:496 fields.py:524
+#, python-brace-format
 msgid "\"{input}\" is not a valid boolean."
 msgstr ""
 
-#: fields.py:550
+#: fields.py:559
 msgid "This field may not be blank."
 msgstr ""
 
-#: fields.py:551 fields.py:1324
+#: fields.py:560 fields.py:1386
+#, python-brace-format
 msgid "Ensure this field has no more than {max_length} characters."
 msgstr ""
 
-#: fields.py:552
+#: fields.py:561
+#, python-brace-format
 msgid "Ensure this field has at least {min_length} characters."
 msgstr ""
 
-#: fields.py:587
+#: fields.py:598
 msgid "Enter a valid email address."
 msgstr ""
 
-#: fields.py:604
+#: fields.py:609
 msgid "This value does not match the required pattern."
 msgstr ""
 
-#: fields.py:615
+#: fields.py:620
 msgid ""
 "Enter a valid \"slug\" consisting of letters, numbers, underscores or "
 "hyphens."
 msgstr ""
 
-#: fields.py:627
+#: fields.py:632
 msgid "Enter a valid URL."
 msgstr ""
 
-#: fields.py:638
+#: fields.py:645
+#, python-brace-format
 msgid "\"{value}\" is not a valid UUID."
 msgstr ""
 
-#: fields.py:657
+#: fields.py:679
 msgid "A valid integer is required."
 msgstr ""
 
-#: fields.py:658 fields.py:692 fields.py:725
+#: fields.py:680 fields.py:715 fields.py:748
+#, python-brace-format
 msgid "Ensure this value is less than or equal to {max_value}."
 msgstr ""
 
-#: fields.py:659 fields.py:693 fields.py:726
+#: fields.py:681 fields.py:716 fields.py:749
+#, python-brace-format
 msgid "Ensure this value is greater than or equal to {min_value}."
 msgstr ""
 
-#: fields.py:660 fields.py:694 fields.py:730
+#: fields.py:682 fields.py:717 fields.py:753
 msgid "String value too large."
 msgstr ""
 
-#: fields.py:691 fields.py:724
+#: fields.py:714 fields.py:747
 msgid "A valid number is required."
 msgstr ""
 
-#: fields.py:727
+#: fields.py:750
+#, python-brace-format
 msgid "Ensure that there are no more than {max_digits} digits in total."
 msgstr ""
 
-#: fields.py:728
+#: fields.py:751
+#, python-brace-format
 msgid "Ensure that there are no more than {max_decimal_places} decimal places."
 msgstr ""
 
-#: fields.py:729
+#: fields.py:752
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_whole_digits} digits before the "
 "decimal point."
 msgstr ""
 
-#: fields.py:813
+#: fields.py:842
+#, python-brace-format
 msgid "Datetime has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:814
+#: fields.py:843
 msgid "Expected a datetime but got a date."
 msgstr ""
 
-#: fields.py:878
+#: fields.py:907
+#, python-brace-format
 msgid "Date has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:879
+#: fields.py:908
 msgid "Expected a date but got a datetime."
 msgstr ""
 
-#: fields.py:936
+#: fields.py:971
+#, python-brace-format
 msgid "Time has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:992 fields.py:1036
+#: fields.py:1025
+#, python-brace-format
+msgid "Duration has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:1050 fields.py:1094
+#, python-brace-format
 msgid "\"{input}\" is not a valid choice."
 msgstr ""
 
-#: fields.py:1037 fields.py:1151 serializers.py:482
+#: fields.py:1095 fields.py:1213 serializers.py:487
+#, python-brace-format
 msgid "Expected a list of items but got type \"{input_type}\"."
 msgstr ""
 
-#: fields.py:1067
+#: fields.py:1129
 msgid "No file was submitted."
 msgstr ""
 
-#: fields.py:1068
+#: fields.py:1130
 msgid "The submitted data was not a file. Check the encoding type on the form."
 msgstr ""
 
-#: fields.py:1069
+#: fields.py:1131
 msgid "No filename could be determined."
 msgstr ""
 
-#: fields.py:1070
+#: fields.py:1132
 msgid "The submitted file is empty."
 msgstr ""
 
-#: fields.py:1071
+#: fields.py:1133
+#, python-brace-format
 msgid ""
 "Ensure this filename has at most {max_length} characters (it has {length})."
 msgstr ""
 
-#: fields.py:1113
+#: fields.py:1175
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr ""
 
-#: fields.py:1188
+#: fields.py:1250
+#, python-brace-format
 msgid "Expected a dictionary of items but got type \"{input_type}\"."
 msgstr ""
 
-#: pagination.py:221
+#: pagination.py:231
+#, python-brace-format
 msgid "Invalid page \"{page_number}\": {message}."
 msgstr ""
 
-#: pagination.py:442
+#: pagination.py:492
 msgid "Invalid cursor"
 msgstr ""
 
 #: relations.py:133
+#, python-brace-format
 msgid "Invalid pk \"{pk_value}\" - object does not exist."
 msgstr ""
 
 #: relations.py:134
+#, python-brace-format
 msgid "Incorrect type. Expected pk value, received {data_type}."
 msgstr ""
 
@@ -258,38 +296,57 @@ msgid "Invalid hyperlink - Object does not exist."
 msgstr ""
 
 #: relations.py:160
+#, python-brace-format
 msgid "Incorrect type. Expected URL string, received {data_type}."
 msgstr ""
 
-#: relations.py:295
+#: relations.py:302
+#, python-brace-format
 msgid "Object with {slug_name}={value} does not exist."
 msgstr ""
 
-#: relations.py:296
+#: relations.py:303
 msgid "Invalid value."
 msgstr ""
 
-#: serializers.py:299
+#: serializers.py:304
+#, python-brace-format
 msgid "Invalid data. Expected a dictionary, but got {datatype}."
 msgstr ""
 
+#: templates/rest_framework/horizontal/radio.html:2
+#: templates/rest_framework/inline/radio.html:2
+#: templates/rest_framework/vertical/radio.html:2
+msgid "None"
+msgstr ""
+
+#: templates/rest_framework/horizontal/select_multiple.html:2
+#: templates/rest_framework/inline/select_multiple.html:2
+#: templates/rest_framework/vertical/select_multiple.html:2
+msgid "No items to select."
+msgstr ""
+
 #: validators.py:22
 msgid "This field must be unique."
 msgstr ""
 
 #: validators.py:76
+#, python-brace-format
 msgid "The fields {field_names} must make a unique set."
 msgstr ""
 
-#: validators.py:219
+#: validators.py:224
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" date."
 msgstr ""
 
-#: validators.py:234
+#: validators.py:239
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" month."
 msgstr ""
 
-#: validators.py:247
+#: validators.py:252
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" year."
 msgstr ""
 
@@ -301,26 +358,14 @@ msgstr ""
 msgid "Invalid version in URL path."
 msgstr ""
 
-#: versioning.py:138
+#: versioning.py:141
 msgid "Invalid version in hostname."
 msgstr ""
 
-#: versioning.py:160
+#: versioning.py:163
 msgid "Invalid version in query parameter."
 msgstr ""
 
-#: views.py:81
+#: views.py:85
 msgid "Permission denied."
 msgstr ""
-
-#: authtoken/serializers.py:20
-msgid "User account is disabled."
-msgstr ""
-
-#: authtoken/serializers.py:23
-msgid "Unable to log in with provided credentials."
-msgstr ""
-
-#: authtoken/serializers.py:26
-msgid "Must include \"username\" and \"password\"."
-msgstr ""

rest_framework/locale/gl/LC_MESSAGES/django.po

+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Django REST framework\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-06-03 17:30+0100\n"
+"PO-Revision-Date: 2015-06-03 16:30+0000\n"
+"Last-Translator: Xavier Ordoquy <xordoquy@linovia.com>\n"
+"Language-Team: Galician (http://www.transifex.com/projects/p/django-rest-framework/language/gl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: gl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: authentication.py:70
+msgid "Invalid basic header. No credentials provided."
+msgstr ""
+
+#: authentication.py:73
+msgid "Invalid basic header. Credentials string should not contain spaces."
+msgstr ""
+
+#: authentication.py:79
+msgid "Invalid basic header. Credentials not correctly base64 encoded."
+msgstr ""
+
+#: authentication.py:97
+msgid "Invalid username/password."
+msgstr ""
+
+#: authentication.py:100 authentication.py:182
+msgid "User inactive or deleted."
+msgstr ""
+
+#: authentication.py:167
+msgid "Invalid token header. No credentials provided."
+msgstr ""
+
+#: authentication.py:170
+msgid "Invalid token header. Token string should not contain spaces."
+msgstr ""
+
+#: authentication.py:179
+msgid "Invalid token."
+msgstr ""
+
+#: authtoken/serializers.py:20
+msgid "User account is disabled."
+msgstr ""
+
+#: authtoken/serializers.py:23
+msgid "Unable to log in with provided credentials."
+msgstr ""
+
+#: authtoken/serializers.py:26
+msgid "Must include \"username\" and \"password\"."
+msgstr ""
+
+#: exceptions.py:38
+msgid "A server error occurred."
+msgstr ""
+
+#: exceptions.py:73
+msgid "Malformed request."
+msgstr ""
+
+#: exceptions.py:78
+msgid "Incorrect authentication credentials."
+msgstr ""
+
+#: exceptions.py:83
+msgid "Authentication credentials were not provided."
+msgstr ""
+
+#: exceptions.py:88
+msgid "You do not have permission to perform this action."
+msgstr ""
+
+#: exceptions.py:93 views.py:78
+msgid "Not found."
+msgstr ""
+
+#: exceptions.py:98
+#, python-brace-format
+msgid "Method \"{method}\" not allowed."
+msgstr ""
+
+#: exceptions.py:109
+msgid "Could not satisfy the request Accept header."
+msgstr ""
+
+#: exceptions.py:121
+#, python-brace-format
+msgid "Unsupported media type \"{media_type}\" in request."
+msgstr ""
+
+#: exceptions.py:134
+msgid "Request was throttled."
+msgstr ""
+
+#: fields.py:162 relations.py:132 relations.py:156 validators.py:77
+#: validators.py:160
+msgid "This field is required."
+msgstr ""
+
+#: fields.py:163
+msgid "This field may not be null."
+msgstr ""
+
+#: fields.py:496 fields.py:524
+#, python-brace-format
+msgid "\"{input}\" is not a valid boolean."
+msgstr ""
+
+#: fields.py:559
+msgid "This field may not be blank."
+msgstr ""
+
+#: fields.py:560 fields.py:1386
+#, python-brace-format
+msgid "Ensure this field has no more than {max_length} characters."
+msgstr ""
+
+#: fields.py:561
+#, python-brace-format
+msgid "Ensure this field has at least {min_length} characters."
+msgstr ""
+
+#: fields.py:598
+msgid "Enter a valid email address."
+msgstr ""
+
+#: fields.py:609
+msgid "This value does not match the required pattern."
+msgstr ""
+
+#: fields.py:620
+msgid ""
+"Enter a valid \"slug\" consisting of letters, numbers, underscores or "
+"hyphens."
+msgstr ""
+
+#: fields.py:632
+msgid "Enter a valid URL."
+msgstr ""
+
+#: fields.py:645
+#, python-brace-format
+msgid "\"{value}\" is not a valid UUID."
+msgstr ""
+
+#: fields.py:679
+msgid "A valid integer is required."
+msgstr ""
+
+#: fields.py:680 fields.py:715 fields.py:748
+#, python-brace-format
+msgid "Ensure this value is less than or equal to {max_value}."
+msgstr ""
+
+#: fields.py:681 fields.py:716 fields.py:749
+#, python-brace-format
+msgid "Ensure this value is greater than or equal to {min_value}."
+msgstr ""
+
+#: fields.py:682 fields.py:717 fields.py:753
+msgid "String value too large."
+msgstr ""
+
+#: fields.py:714 fields.py:747
+msgid "A valid number is required."
+msgstr ""
+
+#: fields.py:750
+#, python-brace-format
+msgid "Ensure that there are no more than {max_digits} digits in total."
+msgstr ""
+
+#: fields.py:751
+#, python-brace-format
+msgid ""
+"Ensure that there are no more than {max_decimal_places} decimal places."
+msgstr ""
+
+#: fields.py:752
+#, python-brace-format
+msgid ""
+"Ensure that there are no more than {max_whole_digits} digits before the "
+"decimal point."
+msgstr ""
+
+#: fields.py:842
+#, python-brace-format
+msgid "Datetime has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:843
+msgid "Expected a datetime but got a date."
+msgstr ""
+
+#: fields.py:907
+#, python-brace-format
+msgid "Date has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:908
+msgid "Expected a date but got a datetime."
+msgstr ""
+
+#: fields.py:971
+#, python-brace-format
+msgid "Time has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:1025
+#, python-brace-format
+msgid "Duration has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:1050 fields.py:1094
+#, python-brace-format
+msgid "\"{input}\" is not a valid choice."
+msgstr ""
+
+#: fields.py:1095 fields.py:1213 serializers.py:487
+#, python-brace-format
+msgid "Expected a list of items but got type \"{input_type}\"."
+msgstr ""
+
+#: fields.py:1129
+msgid "No file was submitted."
+msgstr ""
+
+#: fields.py:1130
+msgid ""
+"The submitted data was not a file. Check the encoding type on the form."
+msgstr ""
+
+#: fields.py:1131
+msgid "No filename could be determined."
+msgstr ""
+
+#: fields.py:1132
+msgid "The submitted file is empty."
+msgstr ""
+
+#: fields.py:1133
+#, python-brace-format
+msgid ""
+"Ensure this filename has at most {max_length} characters (it has {length})."
+msgstr ""
+
+#: fields.py:1175
+msgid ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
+msgstr ""
+
+#: fields.py:1250
+#, python-brace-format
+msgid "Expected a dictionary of items but got type \"{input_type}\"."
+msgstr ""
+
+#: pagination.py:231
+#, python-brace-format
+msgid "Invalid page \"{page_number}\": {message}."
+msgstr ""
+
+#: pagination.py:492
+msgid "Invalid cursor"
+msgstr ""
+
+#: relations.py:133
+#, python-brace-format
+msgid "Invalid pk \"{pk_value}\" - object does not exist."
+msgstr ""
+
+#: relations.py:134
+#, python-brace-format
+msgid "Incorrect type. Expected pk value, received {data_type}."
+msgstr ""
+
+#: relations.py:157
+msgid "Invalid hyperlink - No URL match."
+msgstr ""
+
+#: relations.py:158
+msgid "Invalid hyperlink - Incorrect URL match."
+msgstr ""
+
+#: relations.py:159
+msgid "Invalid hyperlink - Object does not exist."
+msgstr ""
+
+#: relations.py:160
+#, python-brace-format
+msgid "Incorrect type. Expected URL string, received {data_type}."
+msgstr ""
+
+#: relations.py:302
+#, python-brace-format
+msgid "Object with {slug_name}={value} does not exist."
+msgstr ""
+
+#: relations.py:303
+msgid "Invalid value."
+msgstr ""
+
+#: serializers.py:304
+#, python-brace-format
+msgid "Invalid data. Expected a dictionary, but got {datatype}."
+msgstr ""
+
+#: templates/rest_framework/horizontal/radio.html:2
+#: templates/rest_framework/inline/radio.html:2
+#: templates/rest_framework/vertical/radio.html:2
+msgid "None"
+msgstr ""
+
+#: templates/rest_framework/horizontal/select_multiple.html:2
+#: templates/rest_framework/inline/select_multiple.html:2
+#: templates/rest_framework/vertical/select_multiple.html:2
+msgid "No items to select."
+msgstr ""
+
+#: validators.py:22
+msgid "This field must be unique."
+msgstr ""
+
+#: validators.py:76
+#, python-brace-format
+msgid "The fields {field_names} must make a unique set."
+msgstr ""
+
+#: validators.py:224
+#, python-brace-format
+msgid "This field must be unique for the \"{date_field}\" date."
+msgstr ""
+
+#: validators.py:239
+#, python-brace-format
+msgid "This field must be unique for the \"{date_field}\" month."
+msgstr ""
+
+#: validators.py:252
+#, python-brace-format
+msgid "This field must be unique for the \"{date_field}\" year."
+msgstr ""
+
+#: versioning.py:39
+msgid "Invalid version in \"Accept\" header."
+msgstr ""
+
+#: versioning.py:70 versioning.py:112
+msgid "Invalid version in URL path."
+msgstr ""
+
+#: versioning.py:141
+msgid "Invalid version in hostname."
+msgstr ""
+
+#: versioning.py:163
+msgid "Invalid version in query parameter."
+msgstr ""
+
+#: views.py:85
+msgid "Permission denied."
+msgstr ""

rest_framework/locale/gl_ES/LC_MESSAGES/django.po

+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Django REST framework\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-06-03 17:30+0100\n"
+"PO-Revision-Date: 2015-06-03 16:30+0000\n"
+"Last-Translator: Xavier Ordoquy <xordoquy@linovia.com>\n"
+"Language-Team: Galician (Spain) (http://www.transifex.com/projects/p/django-rest-framework/language/gl_ES/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: gl_ES\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: authentication.py:70
+msgid "Invalid basic header. No credentials provided."
+msgstr ""
+
+#: authentication.py:73
+msgid "Invalid basic header. Credentials string should not contain spaces."
+msgstr ""
+
+#: authentication.py:79
+msgid "Invalid basic header. Credentials not correctly base64 encoded."
+msgstr ""
+
+#: authentication.py:97
+msgid "Invalid username/password."
+msgstr ""
+
+#: authentication.py:100 authentication.py:182
+msgid "User inactive or deleted."
+msgstr ""
+
+#: authentication.py:167
+msgid "Invalid token header. No credentials provided."
+msgstr ""
+
+#: authentication.py:170
+msgid "Invalid token header. Token string should not contain spaces."
+msgstr ""
+
+#: authentication.py:179
+msgid "Invalid token."
+msgstr ""
+
+#: authtoken/serializers.py:20
+msgid "User account is disabled."
+msgstr ""
+
+#: authtoken/serializers.py:23
+msgid "Unable to log in with provided credentials."
+msgstr ""
+
+#: authtoken/serializers.py:26
+msgid "Must include \"username\" and \"password\"."
+msgstr ""
+
+#: exceptions.py:38
+msgid "A server error occurred."
+msgstr ""
+
+#: exceptions.py:73
+msgid "Malformed request."
+msgstr ""
+
+#: exceptions.py:78
+msgid "Incorrect authentication credentials."
+msgstr ""
+
+#: exceptions.py:83
+msgid "Authentication credentials were not provided."
+msgstr ""
+
+#: exceptions.py:88
+msgid "You do not have permission to perform this action."
+msgstr ""
+
+#: exceptions.py:93 views.py:78
+msgid "Not found."
+msgstr ""
+
+#: exceptions.py:98
+#, python-brace-format
+msgid "Method \"{method}\" not allowed."
+msgstr ""
+
+#: exceptions.py:109
+msgid "Could not satisfy the request Accept header."
+msgstr ""
+
+#: exceptions.py:121
+#, python-brace-format
+msgid "Unsupported media type \"{media_type}\" in request."
+msgstr ""
+
+#: exceptions.py:134
+msgid "Request was throttled."
+msgstr ""
+
+#: fields.py:162 relations.py:132 relations.py:156 validators.py:77
+#: validators.py:160
+msgid "This field is required."
+msgstr ""
+
+#: fields.py:163
+msgid "This field may not be null."
+msgstr ""
+
+#: fields.py:496 fields.py:524
+#, python-brace-format
+msgid "\"{input}\" is not a valid boolean."
+msgstr ""
+
+#: fields.py:559
+msgid "This field may not be blank."
+msgstr ""
+
+#: fields.py:560 fields.py:1386
+#, python-brace-format
+msgid "Ensure this field has no more than {max_length} characters."
+msgstr ""
+
+#: fields.py:561
+#, python-brace-format
+msgid "Ensure this field has at least {min_length} characters."
+msgstr ""
+
+#: fields.py:598
+msgid "Enter a valid email address."
+msgstr ""
+
+#: fields.py:609
+msgid "This value does not match the required pattern."
+msgstr ""
+
+#: fields.py:620
+msgid ""
+"Enter a valid \"slug\" consisting of letters, numbers, underscores or "
+"hyphens."
+msgstr ""
+
+#: fields.py:632
+msgid "Enter a valid URL."
+msgstr ""
+
+#: fields.py:645
+#, python-brace-format
+msgid "\"{value}\" is not a valid UUID."
+msgstr ""
+
+#: fields.py:679
+msgid "A valid integer is required."
+msgstr ""
+
+#: fields.py:680 fields.py:715 fields.py:748
+#, python-brace-format
+msgid "Ensure this value is less than or equal to {max_value}."
+msgstr ""
+
+#: fields.py:681 fields.py:716 fields.py:749
+#, python-brace-format
+msgid "Ensure this value is greater than or equal to {min_value}."
+msgstr ""
+
+#: fields.py:682 fields.py:717 fields.py:753
+msgid "String value too large."
+msgstr ""
+
+#: fields.py:714 fields.py:747
+msgid "A valid number is required."
+msgstr ""
+
+#: fields.py:750
+#, python-brace-format
+msgid "Ensure that there are no more than {max_digits} digits in total."
+msgstr ""
+
+#: fields.py:751
+#, python-brace-format
+msgid ""
+"Ensure that there are no more than {max_decimal_places} decimal places."
+msgstr ""
+
+#: fields.py:752
+#, python-brace-format
+msgid ""
+"Ensure that there are no more than {max_whole_digits} digits before the "
+"decimal point."
+msgstr ""
+
+#: fields.py:842
+#, python-brace-format
+msgid "Datetime has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:843
+msgid "Expected a datetime but got a date."
+msgstr ""
+
+#: fields.py:907
+#, python-brace-format
+msgid "Date has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:908
+msgid "Expected a date but got a datetime."
+msgstr ""
+
+#: fields.py:971
+#, python-brace-format
+msgid "Time has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:1025
+#, python-brace-format
+msgid "Duration has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:1050 fields.py:1094
+#, python-brace-format
+msgid "\"{input}\" is not a valid choice."
+msgstr ""
+
+#: fields.py:1095 fields.py:1213 serializers.py:487
+#, python-brace-format
+msgid "Expected a list of items but got type \"{input_type}\"."
+msgstr ""
+
+#: fields.py:1129
+msgid "No file was submitted."
+msgstr ""
+
+#: fields.py:1130
+msgid ""
+"The submitted data was not a file. Check the encoding type on the form."
+msgstr ""
+
+#: fields.py:1131
+msgid "No filename could be determined."
+msgstr ""
+
+#: fields.py:1132
+msgid "The submitted file is empty."
+msgstr ""
+
+#: fields.py:1133
+#, python-brace-format
+msgid ""
+"Ensure this filename has at most {max_length} characters (it has {length})."
+msgstr ""
+
+#: fields.py:1175
+msgid ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
+msgstr ""
+
+#: fields.py:1250
+#, python-brace-format
+msgid "Expected a dictionary of items but got type \"{input_type}\"."
+msgstr ""
+
+#: pagination.py:231
+#, python-brace-format
+msgid "Invalid page \"{page_number}\": {message}."
+msgstr ""
+
+#: pagination.py:492
+msgid "Invalid cursor"
+msgstr ""
+
+#: relations.py:133
+#, python-brace-format
+msgid "Invalid pk \"{pk_value}\" - object does not exist."
+msgstr ""
+
+#: relations.py:134
+#, python-brace-format
+msgid "Incorrect type. Expected pk value, received {data_type}."
+msgstr ""
+
+#: relations.py:157
+msgid "Invalid hyperlink - No URL match."
+msgstr ""
+
+#: relations.py:158
+msgid "Invalid hyperlink - Incorrect URL match."
+msgstr ""
+
+#: relations.py:159
+msgid "Invalid hyperlink - Object does not exist."
+msgstr ""
+
+#: relations.py:160
+#, python-brace-format
+msgid "Incorrect type. Expected URL string, received {data_type}."
+msgstr ""
+
+#: relations.py:302
+#, python-brace-format
+msgid "Object with {slug_name}={value} does not exist."
+msgstr ""
+
+#: relations.py:303
+msgid "Invalid value."
+msgstr ""
+
+#: serializers.py:304
+#, python-brace-format
+msgid "Invalid data. Expected a dictionary, but got {datatype}."
+msgstr ""
+
+#: templates/rest_framework/horizontal/radio.html:2
+#: templates/rest_framework/inline/radio.html:2
+#: templates/rest_framework/vertical/radio.html:2
+msgid "None"
+msgstr ""
+
+#: templates/rest_framework/horizontal/select_multiple.html:2
+#: templates/rest_framework/inline/select_multiple.html:2
+#: templates/rest_framework/vertical/select_multiple.html:2
+msgid "No items to select."
+msgstr ""
+
+#: validators.py:22
+msgid "This field must be unique."
+msgstr ""
+
+#: validators.py:76
+#, python-brace-format
+msgid "The fields {field_names} must make a unique set."
+msgstr ""
+
+#: validators.py:224
+#, python-brace-format
+msgid "This field must be unique for the \"{date_field}\" date."
+msgstr ""
+
+#: validators.py:239
+#, python-brace-format
+msgid "This field must be unique for the \"{date_field}\" month."
+msgstr ""
+
+#: validators.py:252
+#, python-brace-format
+msgid "This field must be unique for the \"{date_field}\" year."
+msgstr ""
+
+#: versioning.py:39
+msgid "Invalid version in \"Accept\" header."
+msgstr ""
+
+#: versioning.py:70 versioning.py:112
+msgid "Invalid version in URL path."
+msgstr ""
+
+#: versioning.py:141
+msgid "Invalid version in hostname."
+msgstr ""
+
+#: versioning.py:163
+msgid "Invalid version in query parameter."
+msgstr ""
+
+#: views.py:85
+msgid "Permission denied."
+msgstr ""

rest_framework/locale/id/LC_MESSAGES/django.po

@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django REST framework\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-30 16:23+0000\n"
-"PO-Revision-Date: 2015-01-30 16:27+0000\n"
-"Last-Translator: Thomas Christie <tom@tomchristie.com>\n"
+"POT-Creation-Date: 2015-06-03 17:30+0100\n"
+"PO-Revision-Date: 2015-06-03 16:30+0000\n"
+"Last-Translator: Xavier Ordoquy <xordoquy@linovia.com>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/django-rest-framework/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,36 +17,48 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: authentication.py:69
+#: authentication.py:70
 msgid "Invalid basic header. No credentials provided."
 msgstr ""
 
-#: authentication.py:72
+#: authentication.py:73
 msgid "Invalid basic header. Credentials string should not contain spaces."
 msgstr ""
 
-#: authentication.py:78
+#: authentication.py:79
 msgid "Invalid basic header. Credentials not correctly base64 encoded."
 msgstr ""
 
-#: authentication.py:90
+#: authentication.py:97
 msgid "Invalid username/password."
 msgstr ""
 
-#: authentication.py:156
+#: authentication.py:100 authentication.py:182
+msgid "User inactive or deleted."
+msgstr ""
+
+#: authentication.py:167
 msgid "Invalid token header. No credentials provided."
 msgstr ""
 
-#: authentication.py:159
+#: authentication.py:170
 msgid "Invalid token header. Token string should not contain spaces."
 msgstr ""
 
-#: authentication.py:168
+#: authentication.py:179
 msgid "Invalid token."
 msgstr ""
 
-#: authentication.py:171
-msgid "User inactive or deleted."
+#: authtoken/serializers.py:20
+msgid "User account is disabled."
+msgstr ""
+
+#: authtoken/serializers.py:23
+msgid "Unable to log in with provided credentials."
+msgstr ""
+
+#: authtoken/serializers.py:26
+msgid "Must include \"username\" and \"password\"."
 msgstr ""
 
 #: exceptions.py:38
@@ -69,11 +81,12 @@ msgstr ""
 msgid "You do not have permission to perform this action."
 msgstr ""
 
-#: exceptions.py:93
+#: exceptions.py:93 views.py:78
 msgid "Not found."
 msgstr ""
 
 #: exceptions.py:98
+#, python-brace-format
 msgid "Method \"{method}\" not allowed."
 msgstr ""
 
@@ -82,6 +95,7 @@ msgid "Could not satisfy the request Accept header."
 msgstr ""
 
 #: exceptions.py:121
+#, python-brace-format
 msgid "Unsupported media type \"{media_type}\" in request."
 msgstr ""
 
@@ -89,161 +103,185 @@ msgstr ""
 msgid "Request was throttled."
 msgstr ""
 
-#: fields.py:153 relations.py:132 relations.py:156 validators.py:77
-#: validators.py:155
+#: fields.py:162 relations.py:132 relations.py:156 validators.py:77
+#: validators.py:160
 msgid "This field is required."
 msgstr ""
 
-#: fields.py:154
+#: fields.py:163
 msgid "This field may not be null."
 msgstr ""
 
-#: fields.py:487 fields.py:515
+#: fields.py:496 fields.py:524
+#, python-brace-format
 msgid "\"{input}\" is not a valid boolean."
 msgstr ""
 
-#: fields.py:550
+#: fields.py:559
 msgid "This field may not be blank."
 msgstr ""
 
-#: fields.py:551 fields.py:1324
+#: fields.py:560 fields.py:1386
+#, python-brace-format
 msgid "Ensure this field has no more than {max_length} characters."
 msgstr ""
 
-#: fields.py:552
+#: fields.py:561
+#, python-brace-format
 msgid "Ensure this field has at least {min_length} characters."
 msgstr ""
 
-#: fields.py:587
+#: fields.py:598
 msgid "Enter a valid email address."
 msgstr ""
 
-#: fields.py:604
+#: fields.py:609
 msgid "This value does not match the required pattern."
 msgstr ""
 
-#: fields.py:615
+#: fields.py:620
 msgid ""
 "Enter a valid \"slug\" consisting of letters, numbers, underscores or "
 "hyphens."
 msgstr ""
 
-#: fields.py:627
+#: fields.py:632
 msgid "Enter a valid URL."
 msgstr ""
 
-#: fields.py:638
+#: fields.py:645
+#, python-brace-format
 msgid "\"{value}\" is not a valid UUID."
 msgstr ""
 
-#: fields.py:657
+#: fields.py:679
 msgid "A valid integer is required."
 msgstr ""
 
-#: fields.py:658 fields.py:692 fields.py:725
+#: fields.py:680 fields.py:715 fields.py:748
+#, python-brace-format
 msgid "Ensure this value is less than or equal to {max_value}."
 msgstr ""
 
-#: fields.py:659 fields.py:693 fields.py:726
+#: fields.py:681 fields.py:716 fields.py:749
+#, python-brace-format
 msgid "Ensure this value is greater than or equal to {min_value}."
 msgstr ""
 
-#: fields.py:660 fields.py:694 fields.py:730
+#: fields.py:682 fields.py:717 fields.py:753
 msgid "String value too large."
 msgstr ""
 
-#: fields.py:691 fields.py:724
+#: fields.py:714 fields.py:747
 msgid "A valid number is required."
 msgstr ""
 
-#: fields.py:727
+#: fields.py:750
+#, python-brace-format
 msgid "Ensure that there are no more than {max_digits} digits in total."
 msgstr ""
 
-#: fields.py:728
+#: fields.py:751
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_decimal_places} decimal places."
 msgstr ""
 
-#: fields.py:729
+#: fields.py:752
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_whole_digits} digits before the "
 "decimal point."
 msgstr ""
 
-#: fields.py:813
+#: fields.py:842
+#, python-brace-format
 msgid "Datetime has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:814
+#: fields.py:843
 msgid "Expected a datetime but got a date."
 msgstr ""
 
-#: fields.py:878
+#: fields.py:907
+#, python-brace-format
 msgid "Date has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:879
+#: fields.py:908
 msgid "Expected a date but got a datetime."
 msgstr ""
 
-#: fields.py:936
+#: fields.py:971
+#, python-brace-format
 msgid "Time has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:992 fields.py:1036
+#: fields.py:1025
+#, python-brace-format
+msgid "Duration has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:1050 fields.py:1094
+#, python-brace-format
 msgid "\"{input}\" is not a valid choice."
 msgstr ""
 
-#: fields.py:1037 fields.py:1151 serializers.py:482
+#: fields.py:1095 fields.py:1213 serializers.py:487
+#, python-brace-format
 msgid "Expected a list of items but got type \"{input_type}\"."
 msgstr ""
 
-#: fields.py:1067
+#: fields.py:1129
 msgid "No file was submitted."
 msgstr ""
 
-#: fields.py:1068
+#: fields.py:1130
 msgid ""
 "The submitted data was not a file. Check the encoding type on the form."
 msgstr ""
 
-#: fields.py:1069
+#: fields.py:1131
 msgid "No filename could be determined."
 msgstr ""
 
-#: fields.py:1070
+#: fields.py:1132
 msgid "The submitted file is empty."
 msgstr ""
 
-#: fields.py:1071
+#: fields.py:1133
+#, python-brace-format
 msgid ""
 "Ensure this filename has at most {max_length} characters (it has {length})."
 msgstr ""
 
-#: fields.py:1113
+#: fields.py:1175
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr ""
 
-#: fields.py:1188
+#: fields.py:1250
+#, python-brace-format
 msgid "Expected a dictionary of items but got type \"{input_type}\"."
 msgstr ""
 
-#: pagination.py:221
+#: pagination.py:231
+#, python-brace-format
 msgid "Invalid page \"{page_number}\": {message}."
 msgstr ""
 
-#: pagination.py:442
+#: pagination.py:492
 msgid "Invalid cursor"
 msgstr ""
 
 #: relations.py:133
+#, python-brace-format
 msgid "Invalid pk \"{pk_value}\" - object does not exist."
 msgstr ""
 
 #: relations.py:134
+#, python-brace-format
 msgid "Incorrect type. Expected pk value, received {data_type}."
 msgstr ""
 
@@ -260,38 +298,57 @@ msgid "Invalid hyperlink - Object does not exist."
 msgstr ""
 
 #: relations.py:160
+#, python-brace-format
 msgid "Incorrect type. Expected URL string, received {data_type}."
 msgstr ""
 
-#: relations.py:295
+#: relations.py:302
+#, python-brace-format
 msgid "Object with {slug_name}={value} does not exist."
 msgstr ""
 
-#: relations.py:296
+#: relations.py:303
 msgid "Invalid value."
 msgstr ""
 
-#: serializers.py:299
+#: serializers.py:304
+#, python-brace-format
 msgid "Invalid data. Expected a dictionary, but got {datatype}."
 msgstr ""
 
+#: templates/rest_framework/horizontal/radio.html:2
+#: templates/rest_framework/inline/radio.html:2
+#: templates/rest_framework/vertical/radio.html:2
+msgid "None"
+msgstr ""
+
+#: templates/rest_framework/horizontal/select_multiple.html:2
+#: templates/rest_framework/inline/select_multiple.html:2
+#: templates/rest_framework/vertical/select_multiple.html:2
+msgid "No items to select."
+msgstr ""
+
 #: validators.py:22
 msgid "This field must be unique."
 msgstr ""
 
 #: validators.py:76
+#, python-brace-format
 msgid "The fields {field_names} must make a unique set."
 msgstr ""
 
-#: validators.py:219
+#: validators.py:224
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" date."
 msgstr ""
 
-#: validators.py:234
+#: validators.py:239
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" month."
 msgstr ""
 
-#: validators.py:247
+#: validators.py:252
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" year."
 msgstr ""
 
@@ -303,22 +360,14 @@ msgstr ""
 msgid "Invalid version in URL path."
 msgstr ""
 
-#: versioning.py:138
+#: versioning.py:141
 msgid "Invalid version in hostname."
 msgstr ""
 
-#: versioning.py:160
+#: versioning.py:163
 msgid "Invalid version in query parameter."
 msgstr ""
 
-#: authtoken/serializers.py:20
-msgid "User account is disabled."
-msgstr ""
-
-#: authtoken/serializers.py:23
-msgid "Unable to log in with provided credentials."
-msgstr ""
-
-#: authtoken/serializers.py:26
-msgid "Must include \"username\" and \"password\"."
+#: views.py:85
+msgid "Permission denied."
 msgstr ""

rest_framework/locale/nb/LC_MESSAGES/django.po

+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Django REST framework\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-06-03 17:30+0100\n"
+"PO-Revision-Date: 2015-06-03 16:30+0000\n"
+"Last-Translator: Xavier Ordoquy <xordoquy@linovia.com>\n"
+"Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/django-rest-framework/language/nb/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: authentication.py:70
+msgid "Invalid basic header. No credentials provided."
+msgstr ""
+
+#: authentication.py:73
+msgid "Invalid basic header. Credentials string should not contain spaces."
+msgstr ""
+
+#: authentication.py:79
+msgid "Invalid basic header. Credentials not correctly base64 encoded."
+msgstr ""
+
+#: authentication.py:97
+msgid "Invalid username/password."
+msgstr ""
+
+#: authentication.py:100 authentication.py:182
+msgid "User inactive or deleted."
+msgstr ""
+
+#: authentication.py:167
+msgid "Invalid token header. No credentials provided."
+msgstr ""
+
+#: authentication.py:170
+msgid "Invalid token header. Token string should not contain spaces."
+msgstr ""
+
+#: authentication.py:179
+msgid "Invalid token."
+msgstr ""
+
+#: authtoken/serializers.py:20
+msgid "User account is disabled."
+msgstr ""
+
+#: authtoken/serializers.py:23
+msgid "Unable to log in with provided credentials."
+msgstr ""
+
+#: authtoken/serializers.py:26
+msgid "Must include \"username\" and \"password\"."
+msgstr ""
+
+#: exceptions.py:38
+msgid "A server error occurred."
+msgstr ""
+
+#: exceptions.py:73
+msgid "Malformed request."
+msgstr ""
+
+#: exceptions.py:78
+msgid "Incorrect authentication credentials."
+msgstr ""
+
+#: exceptions.py:83
+msgid "Authentication credentials were not provided."
+msgstr ""
+
+#: exceptions.py:88
+msgid "You do not have permission to perform this action."
+msgstr ""
+
+#: exceptions.py:93 views.py:78
+msgid "Not found."
+msgstr ""
+
+#: exceptions.py:98
+#, python-brace-format
+msgid "Method \"{method}\" not allowed."
+msgstr ""
+
+#: exceptions.py:109
+msgid "Could not satisfy the request Accept header."
+msgstr ""
+
+#: exceptions.py:121
+#, python-brace-format
+msgid "Unsupported media type \"{media_type}\" in request."
+msgstr ""
+
+#: exceptions.py:134
+msgid "Request was throttled."
+msgstr ""
+
+#: fields.py:162 relations.py:132 relations.py:156 validators.py:77
+#: validators.py:160
+msgid "This field is required."
+msgstr ""
+
+#: fields.py:163
+msgid "This field may not be null."
+msgstr ""
+
+#: fields.py:496 fields.py:524
+#, python-brace-format
+msgid "\"{input}\" is not a valid boolean."
+msgstr ""
+
+#: fields.py:559
+msgid "This field may not be blank."
+msgstr ""
+
+#: fields.py:560 fields.py:1386
+#, python-brace-format
+msgid "Ensure this field has no more than {max_length} characters."
+msgstr ""
+
+#: fields.py:561
+#, python-brace-format
+msgid "Ensure this field has at least {min_length} characters."
+msgstr ""
+
+#: fields.py:598
+msgid "Enter a valid email address."
+msgstr ""
+
+#: fields.py:609
+msgid "This value does not match the required pattern."
+msgstr ""
+
+#: fields.py:620
+msgid ""
+"Enter a valid \"slug\" consisting of letters, numbers, underscores or "
+"hyphens."
+msgstr ""
+
+#: fields.py:632
+msgid "Enter a valid URL."
+msgstr ""
+
+#: fields.py:645
+#, python-brace-format
+msgid "\"{value}\" is not a valid UUID."
+msgstr ""
+
+#: fields.py:679
+msgid "A valid integer is required."
+msgstr ""
+
+#: fields.py:680 fields.py:715 fields.py:748
+#, python-brace-format
+msgid "Ensure this value is less than or equal to {max_value}."
+msgstr ""
+
+#: fields.py:681 fields.py:716 fields.py:749
+#, python-brace-format
+msgid "Ensure this value is greater than or equal to {min_value}."
+msgstr ""
+
+#: fields.py:682 fields.py:717 fields.py:753
+msgid "String value too large."
+msgstr ""
+
+#: fields.py:714 fields.py:747
+msgid "A valid number is required."
+msgstr ""
+
+#: fields.py:750
+#, python-brace-format
+msgid "Ensure that there are no more than {max_digits} digits in total."
+msgstr ""
+
+#: fields.py:751
+#, python-brace-format
+msgid ""
+"Ensure that there are no more than {max_decimal_places} decimal places."
+msgstr ""
+
+#: fields.py:752
+#, python-brace-format
+msgid ""
+"Ensure that there are no more than {max_whole_digits} digits before the "
+"decimal point."
+msgstr ""
+
+#: fields.py:842
+#, python-brace-format
+msgid "Datetime has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:843
+msgid "Expected a datetime but got a date."
+msgstr ""
+
+#: fields.py:907
+#, python-brace-format
+msgid "Date has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:908
+msgid "Expected a date but got a datetime."
+msgstr ""
+
+#: fields.py:971
+#, python-brace-format
+msgid "Time has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:1025
+#, python-brace-format
+msgid "Duration has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:1050 fields.py:1094
+#, python-brace-format
+msgid "\"{input}\" is not a valid choice."
+msgstr ""
+
+#: fields.py:1095 fields.py:1213 serializers.py:487
+#, python-brace-format
+msgid "Expected a list of items but got type \"{input_type}\"."
+msgstr ""
+
+#: fields.py:1129
+msgid "No file was submitted."
+msgstr ""
+
+#: fields.py:1130
+msgid ""
+"The submitted data was not a file. Check the encoding type on the form."
+msgstr ""
+
+#: fields.py:1131
+msgid "No filename could be determined."
+msgstr ""
+
+#: fields.py:1132
+msgid "The submitted file is empty."
+msgstr ""
+
+#: fields.py:1133
+#, python-brace-format
+msgid ""
+"Ensure this filename has at most {max_length} characters (it has {length})."
+msgstr ""
+
+#: fields.py:1175
+msgid ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
+msgstr ""
+
+#: fields.py:1250
+#, python-brace-format
+msgid "Expected a dictionary of items but got type \"{input_type}\"."
+msgstr ""
+
+#: pagination.py:231
+#, python-brace-format
+msgid "Invalid page \"{page_number}\": {message}."
+msgstr ""
+
+#: pagination.py:492
+msgid "Invalid cursor"
+msgstr ""
+
+#: relations.py:133
+#, python-brace-format
+msgid "Invalid pk \"{pk_value}\" - object does not exist."
+msgstr ""
+
+#: relations.py:134
+#, python-brace-format
+msgid "Incorrect type. Expected pk value, received {data_type}."
+msgstr ""
+
+#: relations.py:157
+msgid "Invalid hyperlink - No URL match."
+msgstr ""
+
+#: relations.py:158
+msgid "Invalid hyperlink - Incorrect URL match."
+msgstr ""
+
+#: relations.py:159
+msgid "Invalid hyperlink - Object does not exist."
+msgstr ""
+
+#: relations.py:160
+#, python-brace-format
+msgid "Incorrect type. Expected URL string, received {data_type}."
+msgstr ""
+
+#: relations.py:302
+#, python-brace-format
+msgid "Object with {slug_name}={value} does not exist."
+msgstr ""
+
+#: relations.py:303
+msgid "Invalid value."
+msgstr ""
+
+#: serializers.py:304
+#, python-brace-format
+msgid "Invalid data. Expected a dictionary, but got {datatype}."
+msgstr ""
+
+#: templates/rest_framework/horizontal/radio.html:2
+#: templates/rest_framework/inline/radio.html:2
+#: templates/rest_framework/vertical/radio.html:2
+msgid "None"
+msgstr ""
+
+#: templates/rest_framework/horizontal/select_multiple.html:2
+#: templates/rest_framework/inline/select_multiple.html:2
+#: templates/rest_framework/vertical/select_multiple.html:2
+msgid "No items to select."
+msgstr ""
+
+#: validators.py:22
+msgid "This field must be unique."
+msgstr ""
+
+#: validators.py:76
+#, python-brace-format
+msgid "The fields {field_names} must make a unique set."
+msgstr ""
+
+#: validators.py:224
+#, python-brace-format
+msgid "This field must be unique for the \"{date_field}\" date."
+msgstr ""
+
+#: validators.py:239
+#, python-brace-format
+msgid "This field must be unique for the \"{date_field}\" month."
+msgstr ""
+
+#: validators.py:252
+#, python-brace-format
+msgid "This field must be unique for the \"{date_field}\" year."
+msgstr ""
+
+#: versioning.py:39
+msgid "Invalid version in \"Accept\" header."
+msgstr ""
+
+#: versioning.py:70 versioning.py:112
+msgid "Invalid version in URL path."
+msgstr ""
+
+#: versioning.py:141
+msgid "Invalid version in hostname."
+msgstr ""
+
+#: versioning.py:163
+msgid "Invalid version in query parameter."
+msgstr ""
+
+#: views.py:85
+msgid "Permission denied."
+msgstr ""

rest_framework/locale/nl/LC_MESSAGES/django.po

@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django REST framework\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-30 16:23+0000\n"
-"PO-Revision-Date: 2015-01-30 16:27+0000\n"
-"Last-Translator: Thomas Christie <tom@tomchristie.com>\n"
+"POT-Creation-Date: 2015-06-03 17:30+0100\n"
+"PO-Revision-Date: 2015-06-03 16:30+0000\n"
+"Last-Translator: Xavier Ordoquy <xordoquy@linovia.com>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/django-rest-framework/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,36 +17,48 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: authentication.py:69
+#: authentication.py:70
 msgid "Invalid basic header. No credentials provided."
 msgstr ""
 
-#: authentication.py:72
+#: authentication.py:73
 msgid "Invalid basic header. Credentials string should not contain spaces."
 msgstr ""
 
-#: authentication.py:78
+#: authentication.py:79
 msgid "Invalid basic header. Credentials not correctly base64 encoded."
 msgstr ""
 
-#: authentication.py:90
+#: authentication.py:97
 msgid "Invalid username/password."
 msgstr ""
 
-#: authentication.py:156
+#: authentication.py:100 authentication.py:182
+msgid "User inactive or deleted."
+msgstr ""
+
+#: authentication.py:167
 msgid "Invalid token header. No credentials provided."
 msgstr ""
 
-#: authentication.py:159
+#: authentication.py:170
 msgid "Invalid token header. Token string should not contain spaces."
 msgstr ""
 
-#: authentication.py:168
+#: authentication.py:179
 msgid "Invalid token."
 msgstr ""
 
-#: authentication.py:171
-msgid "User inactive or deleted."
+#: authtoken/serializers.py:20
+msgid "User account is disabled."
+msgstr ""
+
+#: authtoken/serializers.py:23
+msgid "Unable to log in with provided credentials."
+msgstr ""
+
+#: authtoken/serializers.py:26
+msgid "Must include \"username\" and \"password\"."
 msgstr ""
 
 #: exceptions.py:38
@@ -69,11 +81,12 @@ msgstr ""
 msgid "You do not have permission to perform this action."
 msgstr ""
 
-#: exceptions.py:93
+#: exceptions.py:93 views.py:78
 msgid "Not found."
 msgstr ""
 
 #: exceptions.py:98
+#, python-brace-format
 msgid "Method \"{method}\" not allowed."
 msgstr ""
 
@@ -82,6 +95,7 @@ msgid "Could not satisfy the request Accept header."
 msgstr ""
 
 #: exceptions.py:121
+#, python-brace-format
 msgid "Unsupported media type \"{media_type}\" in request."
 msgstr ""
 
@@ -89,161 +103,185 @@ msgstr ""
 msgid "Request was throttled."
 msgstr ""
 
-#: fields.py:153 relations.py:132 relations.py:156 validators.py:77
-#: validators.py:155
+#: fields.py:162 relations.py:132 relations.py:156 validators.py:77
+#: validators.py:160
 msgid "This field is required."
 msgstr ""
 
-#: fields.py:154
+#: fields.py:163
 msgid "This field may not be null."
 msgstr ""
 
-#: fields.py:487 fields.py:515
+#: fields.py:496 fields.py:524
+#, python-brace-format
 msgid "\"{input}\" is not a valid boolean."
 msgstr ""
 
-#: fields.py:550
+#: fields.py:559
 msgid "This field may not be blank."
 msgstr ""
 
-#: fields.py:551 fields.py:1324
+#: fields.py:560 fields.py:1386
+#, python-brace-format
 msgid "Ensure this field has no more than {max_length} characters."
 msgstr ""
 
-#: fields.py:552
+#: fields.py:561
+#, python-brace-format
 msgid "Ensure this field has at least {min_length} characters."
 msgstr ""
 
-#: fields.py:587
+#: fields.py:598
 msgid "Enter a valid email address."
 msgstr ""
 
-#: fields.py:604
+#: fields.py:609
 msgid "This value does not match the required pattern."
 msgstr ""
 
-#: fields.py:615
+#: fields.py:620
 msgid ""
 "Enter a valid \"slug\" consisting of letters, numbers, underscores or "
 "hyphens."
 msgstr ""
 
-#: fields.py:627
+#: fields.py:632
 msgid "Enter a valid URL."
 msgstr ""
 
-#: fields.py:638
+#: fields.py:645
+#, python-brace-format
 msgid "\"{value}\" is not a valid UUID."
 msgstr ""
 
-#: fields.py:657
+#: fields.py:679
 msgid "A valid integer is required."
 msgstr ""
 
-#: fields.py:658 fields.py:692 fields.py:725
+#: fields.py:680 fields.py:715 fields.py:748
+#, python-brace-format
 msgid "Ensure this value is less than or equal to {max_value}."
 msgstr ""
 
-#: fields.py:659 fields.py:693 fields.py:726
+#: fields.py:681 fields.py:716 fields.py:749
+#, python-brace-format
 msgid "Ensure this value is greater than or equal to {min_value}."
 msgstr ""
 
-#: fields.py:660 fields.py:694 fields.py:730
+#: fields.py:682 fields.py:717 fields.py:753
 msgid "String value too large."
 msgstr ""
 
-#: fields.py:691 fields.py:724
+#: fields.py:714 fields.py:747
 msgid "A valid number is required."
 msgstr ""
 
-#: fields.py:727
+#: fields.py:750
+#, python-brace-format
 msgid "Ensure that there are no more than {max_digits} digits in total."
 msgstr ""
 
-#: fields.py:728
+#: fields.py:751
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_decimal_places} decimal places."
 msgstr ""
 
-#: fields.py:729
+#: fields.py:752
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_whole_digits} digits before the "
 "decimal point."
 msgstr ""
 
-#: fields.py:813
+#: fields.py:842
+#, python-brace-format
 msgid "Datetime has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:814
+#: fields.py:843
 msgid "Expected a datetime but got a date."
 msgstr ""
 
-#: fields.py:878
+#: fields.py:907
+#, python-brace-format
 msgid "Date has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:879
+#: fields.py:908
 msgid "Expected a date but got a datetime."
 msgstr ""
 
-#: fields.py:936
+#: fields.py:971
+#, python-brace-format
 msgid "Time has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:992 fields.py:1036
+#: fields.py:1025
+#, python-brace-format
+msgid "Duration has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:1050 fields.py:1094
+#, python-brace-format
 msgid "\"{input}\" is not a valid choice."
 msgstr ""
 
-#: fields.py:1037 fields.py:1151 serializers.py:482
+#: fields.py:1095 fields.py:1213 serializers.py:487
+#, python-brace-format
 msgid "Expected a list of items but got type \"{input_type}\"."
 msgstr ""
 
-#: fields.py:1067
+#: fields.py:1129
 msgid "No file was submitted."
 msgstr ""
 
-#: fields.py:1068
+#: fields.py:1130
 msgid ""
 "The submitted data was not a file. Check the encoding type on the form."
 msgstr ""
 
-#: fields.py:1069
+#: fields.py:1131
 msgid "No filename could be determined."
 msgstr ""
 
-#: fields.py:1070
+#: fields.py:1132
 msgid "The submitted file is empty."
 msgstr ""
 
-#: fields.py:1071
+#: fields.py:1133
+#, python-brace-format
 msgid ""
 "Ensure this filename has at most {max_length} characters (it has {length})."
 msgstr ""
 
-#: fields.py:1113
+#: fields.py:1175
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr ""
 
-#: fields.py:1188
+#: fields.py:1250
+#, python-brace-format
 msgid "Expected a dictionary of items but got type \"{input_type}\"."
 msgstr ""
 
-#: pagination.py:221
+#: pagination.py:231
+#, python-brace-format
 msgid "Invalid page \"{page_number}\": {message}."
 msgstr ""
 
-#: pagination.py:442
+#: pagination.py:492
 msgid "Invalid cursor"
 msgstr ""
 
 #: relations.py:133
+#, python-brace-format
 msgid "Invalid pk \"{pk_value}\" - object does not exist."
 msgstr ""
 
 #: relations.py:134
+#, python-brace-format
 msgid "Incorrect type. Expected pk value, received {data_type}."
 msgstr ""
 
@@ -260,38 +298,57 @@ msgid "Invalid hyperlink - Object does not exist."
 msgstr ""
 
 #: relations.py:160
+#, python-brace-format
 msgid "Incorrect type. Expected URL string, received {data_type}."
 msgstr ""
 
-#: relations.py:295
+#: relations.py:302
+#, python-brace-format
 msgid "Object with {slug_name}={value} does not exist."
 msgstr ""
 
-#: relations.py:296
+#: relations.py:303
 msgid "Invalid value."
 msgstr ""
 
-#: serializers.py:299
+#: serializers.py:304
+#, python-brace-format
 msgid "Invalid data. Expected a dictionary, but got {datatype}."
 msgstr ""
 
+#: templates/rest_framework/horizontal/radio.html:2
+#: templates/rest_framework/inline/radio.html:2
+#: templates/rest_framework/vertical/radio.html:2
+msgid "None"
+msgstr ""
+
+#: templates/rest_framework/horizontal/select_multiple.html:2
+#: templates/rest_framework/inline/select_multiple.html:2
+#: templates/rest_framework/vertical/select_multiple.html:2
+msgid "No items to select."
+msgstr ""
+
 #: validators.py:22
 msgid "This field must be unique."
 msgstr ""
 
 #: validators.py:76
+#, python-brace-format
 msgid "The fields {field_names} must make a unique set."
 msgstr ""
 
-#: validators.py:219
+#: validators.py:224
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" date."
 msgstr ""
 
-#: validators.py:234
+#: validators.py:239
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" month."
 msgstr ""
 
-#: validators.py:247
+#: validators.py:252
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" year."
 msgstr ""
 
@@ -303,22 +360,14 @@ msgstr ""
 msgid "Invalid version in URL path."
 msgstr ""
 
-#: versioning.py:138
+#: versioning.py:141
 msgid "Invalid version in hostname."
 msgstr ""
 
-#: versioning.py:160
+#: versioning.py:163
 msgid "Invalid version in query parameter."
 msgstr ""
 
-#: authtoken/serializers.py:20
-msgid "User account is disabled."
-msgstr ""
-
-#: authtoken/serializers.py:23
-msgid "Unable to log in with provided credentials."
-msgstr ""
-
-#: authtoken/serializers.py:26
-msgid "Must include \"username\" and \"password\"."
+#: views.py:85
+msgid "Permission denied."
 msgstr ""

rest_framework/locale/pt/LC_MESSAGES/django.po

+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Django REST framework\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-06-03 17:30+0100\n"
+"PO-Revision-Date: 2015-06-03 16:30+0000\n"
+"Last-Translator: Xavier Ordoquy <xordoquy@linovia.com>\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/django-rest-framework/language/pt/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: authentication.py:70
+msgid "Invalid basic header. No credentials provided."
+msgstr ""
+
+#: authentication.py:73
+msgid "Invalid basic header. Credentials string should not contain spaces."
+msgstr ""
+
+#: authentication.py:79
+msgid "Invalid basic header. Credentials not correctly base64 encoded."
+msgstr ""
+
+#: authentication.py:97
+msgid "Invalid username/password."
+msgstr ""
+
+#: authentication.py:100 authentication.py:182
+msgid "User inactive or deleted."
+msgstr ""
+
+#: authentication.py:167
+msgid "Invalid token header. No credentials provided."
+msgstr ""
+
+#: authentication.py:170
+msgid "Invalid token header. Token string should not contain spaces."
+msgstr ""
+
+#: authentication.py:179
+msgid "Invalid token."
+msgstr ""
+
+#: authtoken/serializers.py:20
+msgid "User account is disabled."
+msgstr ""
+
+#: authtoken/serializers.py:23
+msgid "Unable to log in with provided credentials."
+msgstr ""
+
+#: authtoken/serializers.py:26
+msgid "Must include \"username\" and \"password\"."
+msgstr ""
+
+#: exceptions.py:38
+msgid "A server error occurred."
+msgstr ""
+
+#: exceptions.py:73
+msgid "Malformed request."
+msgstr ""
+
+#: exceptions.py:78
+msgid "Incorrect authentication credentials."
+msgstr ""
+
+#: exceptions.py:83
+msgid "Authentication credentials were not provided."
+msgstr ""
+
+#: exceptions.py:88
+msgid "You do not have permission to perform this action."
+msgstr ""
+
+#: exceptions.py:93 views.py:78
+msgid "Not found."
+msgstr ""
+
+#: exceptions.py:98
+#, python-brace-format
+msgid "Method \"{method}\" not allowed."
+msgstr ""
+
+#: exceptions.py:109
+msgid "Could not satisfy the request Accept header."
+msgstr ""
+
+#: exceptions.py:121
+#, python-brace-format
+msgid "Unsupported media type \"{media_type}\" in request."
+msgstr ""
+
+#: exceptions.py:134
+msgid "Request was throttled."
+msgstr ""
+
+#: fields.py:162 relations.py:132 relations.py:156 validators.py:77
+#: validators.py:160
+msgid "This field is required."
+msgstr ""
+
+#: fields.py:163
+msgid "This field may not be null."
+msgstr ""
+
+#: fields.py:496 fields.py:524
+#, python-brace-format
+msgid "\"{input}\" is not a valid boolean."
+msgstr ""
+
+#: fields.py:559
+msgid "This field may not be blank."
+msgstr ""
+
+#: fields.py:560 fields.py:1386
+#, python-brace-format
+msgid "Ensure this field has no more than {max_length} characters."
+msgstr ""
+
+#: fields.py:561
+#, python-brace-format
+msgid "Ensure this field has at least {min_length} characters."
+msgstr ""
+
+#: fields.py:598
+msgid "Enter a valid email address."
+msgstr ""
+
+#: fields.py:609
+msgid "This value does not match the required pattern."
+msgstr ""
+
+#: fields.py:620
+msgid ""
+"Enter a valid \"slug\" consisting of letters, numbers, underscores or "
+"hyphens."
+msgstr ""
+
+#: fields.py:632
+msgid "Enter a valid URL."
+msgstr ""
+
+#: fields.py:645
+#, python-brace-format
+msgid "\"{value}\" is not a valid UUID."
+msgstr ""
+
+#: fields.py:679
+msgid "A valid integer is required."
+msgstr ""
+
+#: fields.py:680 fields.py:715 fields.py:748
+#, python-brace-format
+msgid "Ensure this value is less than or equal to {max_value}."
+msgstr ""
+
+#: fields.py:681 fields.py:716 fields.py:749
+#, python-brace-format
+msgid "Ensure this value is greater than or equal to {min_value}."
+msgstr ""
+
+#: fields.py:682 fields.py:717 fields.py:753
+msgid "String value too large."
+msgstr ""
+
+#: fields.py:714 fields.py:747
+msgid "A valid number is required."
+msgstr ""
+
+#: fields.py:750
+#, python-brace-format
+msgid "Ensure that there are no more than {max_digits} digits in total."
+msgstr ""
+
+#: fields.py:751
+#, python-brace-format
+msgid ""
+"Ensure that there are no more than {max_decimal_places} decimal places."
+msgstr ""
+
+#: fields.py:752
+#, python-brace-format
+msgid ""
+"Ensure that there are no more than {max_whole_digits} digits before the "
+"decimal point."
+msgstr ""
+
+#: fields.py:842
+#, python-brace-format
+msgid "Datetime has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:843
+msgid "Expected a datetime but got a date."
+msgstr ""
+
+#: fields.py:907
+#, python-brace-format
+msgid "Date has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:908
+msgid "Expected a date but got a datetime."
+msgstr ""
+
+#: fields.py:971
+#, python-brace-format
+msgid "Time has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:1025
+#, python-brace-format
+msgid "Duration has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:1050 fields.py:1094
+#, python-brace-format
+msgid "\"{input}\" is not a valid choice."
+msgstr ""
+
+#: fields.py:1095 fields.py:1213 serializers.py:487
+#, python-brace-format
+msgid "Expected a list of items but got type \"{input_type}\"."
+msgstr ""
+
+#: fields.py:1129
+msgid "No file was submitted."
+msgstr ""
+
+#: fields.py:1130
+msgid ""
+"The submitted data was not a file. Check the encoding type on the form."
+msgstr ""
+
+#: fields.py:1131
+msgid "No filename could be determined."
+msgstr ""
+
+#: fields.py:1132
+msgid "The submitted file is empty."
+msgstr ""
+
+#: fields.py:1133
+#, python-brace-format
+msgid ""
+"Ensure this filename has at most {max_length} characters (it has {length})."
+msgstr ""
+
+#: fields.py:1175
+msgid ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
+msgstr ""
+
+#: fields.py:1250
+#, python-brace-format
+msgid "Expected a dictionary of items but got type \"{input_type}\"."
+msgstr ""
+
+#: pagination.py:231
+#, python-brace-format
+msgid "Invalid page \"{page_number}\": {message}."
+msgstr ""
+
+#: pagination.py:492
+msgid "Invalid cursor"
+msgstr ""
+
+#: relations.py:133
+#, python-brace-format
+msgid "Invalid pk \"{pk_value}\" - object does not exist."
+msgstr ""
+
+#: relations.py:134
+#, python-brace-format
+msgid "Incorrect type. Expected pk value, received {data_type}."
+msgstr ""
+
+#: relations.py:157
+msgid "Invalid hyperlink - No URL match."
+msgstr ""
+
+#: relations.py:158
+msgid "Invalid hyperlink - Incorrect URL match."
+msgstr ""
+
+#: relations.py:159
+msgid "Invalid hyperlink - Object does not exist."
+msgstr ""
+
+#: relations.py:160
+#, python-brace-format
+msgid "Incorrect type. Expected URL string, received {data_type}."
+msgstr ""
+
+#: relations.py:302
+#, python-brace-format
+msgid "Object with {slug_name}={value} does not exist."
+msgstr ""
+
+#: relations.py:303
+msgid "Invalid value."
+msgstr ""
+
+#: serializers.py:304
+#, python-brace-format
+msgid "Invalid data. Expected a dictionary, but got {datatype}."
+msgstr ""
+
+#: templates/rest_framework/horizontal/radio.html:2
+#: templates/rest_framework/inline/radio.html:2
+#: templates/rest_framework/vertical/radio.html:2
+msgid "None"
+msgstr ""
+
+#: templates/rest_framework/horizontal/select_multiple.html:2
+#: templates/rest_framework/inline/select_multiple.html:2
+#: templates/rest_framework/vertical/select_multiple.html:2
+msgid "No items to select."
+msgstr ""
+
+#: validators.py:22
+msgid "This field must be unique."
+msgstr ""
+
+#: validators.py:76
+#, python-brace-format
+msgid "The fields {field_names} must make a unique set."
+msgstr ""
+
+#: validators.py:224
+#, python-brace-format
+msgid "This field must be unique for the \"{date_field}\" date."
+msgstr ""
+
+#: validators.py:239
+#, python-brace-format
+msgid "This field must be unique for the \"{date_field}\" month."
+msgstr ""
+
+#: validators.py:252
+#, python-brace-format
+msgid "This field must be unique for the \"{date_field}\" year."
+msgstr ""
+
+#: versioning.py:39
+msgid "Invalid version in \"Accept\" header."
+msgstr ""
+
+#: versioning.py:70 versioning.py:112
+msgid "Invalid version in URL path."
+msgstr ""
+
+#: versioning.py:141
+msgid "Invalid version in hostname."
+msgstr ""
+
+#: versioning.py:163
+msgid "Invalid version in query parameter."
+msgstr ""
+
+#: views.py:85
+msgid "Permission denied."
+msgstr ""

rest_framework/locale/pt_PT/LC_MESSAGES/django.po

@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django REST framework\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-30 16:23+0000\n"
-"PO-Revision-Date: 2015-01-02 10:46+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2015-06-03 17:30+0100\n"
+"PO-Revision-Date: 2015-06-03 16:30+0000\n"
+"Last-Translator: Xavier Ordoquy <xordoquy@linovia.com>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/django-rest-framework/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,36 +17,48 @@ msgstr ""
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: authentication.py:69
+#: authentication.py:70
 msgid "Invalid basic header. No credentials provided."
 msgstr ""
 
-#: authentication.py:72
+#: authentication.py:73
 msgid "Invalid basic header. Credentials string should not contain spaces."
 msgstr ""
 
-#: authentication.py:78
+#: authentication.py:79
 msgid "Invalid basic header. Credentials not correctly base64 encoded."
 msgstr ""
 
-#: authentication.py:90
+#: authentication.py:97
 msgid "Invalid username/password."
 msgstr ""
 
-#: authentication.py:156
+#: authentication.py:100 authentication.py:182
+msgid "User inactive or deleted."
+msgstr ""
+
+#: authentication.py:167
 msgid "Invalid token header. No credentials provided."
 msgstr ""
 
-#: authentication.py:159
+#: authentication.py:170
 msgid "Invalid token header. Token string should not contain spaces."
 msgstr ""
 
-#: authentication.py:168
+#: authentication.py:179
 msgid "Invalid token."
 msgstr ""
 
-#: authentication.py:171
-msgid "User inactive or deleted."
+#: authtoken/serializers.py:20
+msgid "User account is disabled."
+msgstr ""
+
+#: authtoken/serializers.py:23
+msgid "Unable to log in with provided credentials."
+msgstr ""
+
+#: authtoken/serializers.py:26
+msgid "Must include \"username\" and \"password\"."
 msgstr ""
 
 #: exceptions.py:38
@@ -69,11 +81,12 @@ msgstr ""
 msgid "You do not have permission to perform this action."
 msgstr ""
 
-#: exceptions.py:93
+#: exceptions.py:93 views.py:78
 msgid "Not found."
 msgstr ""
 
 #: exceptions.py:98
+#, python-brace-format
 msgid "Method \"{method}\" not allowed."
 msgstr ""
 
@@ -82,6 +95,7 @@ msgid "Could not satisfy the request Accept header."
 msgstr ""
 
 #: exceptions.py:121
+#, python-brace-format
 msgid "Unsupported media type \"{media_type}\" in request."
 msgstr ""
 
@@ -89,161 +103,185 @@ msgstr ""
 msgid "Request was throttled."
 msgstr ""
 
-#: fields.py:153 relations.py:132 relations.py:156 validators.py:77
-#: validators.py:155
+#: fields.py:162 relations.py:132 relations.py:156 validators.py:77
+#: validators.py:160
 msgid "This field is required."
 msgstr ""
 
-#: fields.py:154
+#: fields.py:163
 msgid "This field may not be null."
 msgstr ""
 
-#: fields.py:487 fields.py:515
+#: fields.py:496 fields.py:524
+#, python-brace-format
 msgid "\"{input}\" is not a valid boolean."
 msgstr ""
 
-#: fields.py:550
+#: fields.py:559
 msgid "This field may not be blank."
 msgstr ""
 
-#: fields.py:551 fields.py:1324
+#: fields.py:560 fields.py:1386
+#, python-brace-format
 msgid "Ensure this field has no more than {max_length} characters."
 msgstr ""
 
-#: fields.py:552
+#: fields.py:561
+#, python-brace-format
 msgid "Ensure this field has at least {min_length} characters."
 msgstr ""
 
-#: fields.py:587
+#: fields.py:598
 msgid "Enter a valid email address."
 msgstr ""
 
-#: fields.py:604
+#: fields.py:609
 msgid "This value does not match the required pattern."
 msgstr ""
 
-#: fields.py:615
+#: fields.py:620
 msgid ""
 "Enter a valid \"slug\" consisting of letters, numbers, underscores or "
 "hyphens."
 msgstr ""
 
-#: fields.py:627
+#: fields.py:632
 msgid "Enter a valid URL."
 msgstr ""
 
-#: fields.py:638
+#: fields.py:645
+#, python-brace-format
 msgid "\"{value}\" is not a valid UUID."
 msgstr ""
 
-#: fields.py:657
+#: fields.py:679
 msgid "A valid integer is required."
 msgstr ""
 
-#: fields.py:658 fields.py:692 fields.py:725
+#: fields.py:680 fields.py:715 fields.py:748
+#, python-brace-format
 msgid "Ensure this value is less than or equal to {max_value}."
 msgstr ""
 
-#: fields.py:659 fields.py:693 fields.py:726
+#: fields.py:681 fields.py:716 fields.py:749
+#, python-brace-format
 msgid "Ensure this value is greater than or equal to {min_value}."
 msgstr ""
 
-#: fields.py:660 fields.py:694 fields.py:730
+#: fields.py:682 fields.py:717 fields.py:753
 msgid "String value too large."
 msgstr ""
 
-#: fields.py:691 fields.py:724
+#: fields.py:714 fields.py:747
 msgid "A valid number is required."
 msgstr ""
 
-#: fields.py:727
+#: fields.py:750
+#, python-brace-format
 msgid "Ensure that there are no more than {max_digits} digits in total."
 msgstr ""
 
-#: fields.py:728
+#: fields.py:751
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_decimal_places} decimal places."
 msgstr ""
 
-#: fields.py:729
+#: fields.py:752
+#, python-brace-format
 msgid ""
 "Ensure that there are no more than {max_whole_digits} digits before the "
 "decimal point."
 msgstr ""
 
-#: fields.py:813
+#: fields.py:842
+#, python-brace-format
 msgid "Datetime has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:814
+#: fields.py:843
 msgid "Expected a datetime but got a date."
 msgstr ""
 
-#: fields.py:878
+#: fields.py:907
+#, python-brace-format
 msgid "Date has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:879
+#: fields.py:908
 msgid "Expected a date but got a datetime."
 msgstr ""
 
-#: fields.py:936
+#: fields.py:971
+#, python-brace-format
 msgid "Time has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: fields.py:992 fields.py:1036
+#: fields.py:1025
+#, python-brace-format
+msgid "Duration has wrong format. Use one of these formats instead: {format}."
+msgstr ""
+
+#: fields.py:1050 fields.py:1094
+#, python-brace-format
 msgid "\"{input}\" is not a valid choice."
 msgstr ""
 
-#: fields.py:1037 fields.py:1151 serializers.py:482
+#: fields.py:1095 fields.py:1213 serializers.py:487
+#, python-brace-format
 msgid "Expected a list of items but got type \"{input_type}\"."
 msgstr ""
 
-#: fields.py:1067
+#: fields.py:1129
 msgid "No file was submitted."
 msgstr ""
 
-#: fields.py:1068
+#: fields.py:1130
 msgid ""
 "The submitted data was not a file. Check the encoding type on the form."
 msgstr ""
 
-#: fields.py:1069
+#: fields.py:1131
 msgid "No filename could be determined."
 msgstr ""
 
-#: fields.py:1070
+#: fields.py:1132
 msgid "The submitted file is empty."
 msgstr ""
 
-#: fields.py:1071
+#: fields.py:1133
+#, python-brace-format
 msgid ""
 "Ensure this filename has at most {max_length} characters (it has {length})."
 msgstr ""
 
-#: fields.py:1113
+#: fields.py:1175
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr ""
 
-#: fields.py:1188
+#: fields.py:1250
+#, python-brace-format
 msgid "Expected a dictionary of items but got type \"{input_type}\"."
 msgstr ""
 
-#: pagination.py:221
+#: pagination.py:231
+#, python-brace-format
 msgid "Invalid page \"{page_number}\": {message}."
 msgstr ""
 
-#: pagination.py:442
+#: pagination.py:492
 msgid "Invalid cursor"
 msgstr ""
 
 #: relations.py:133
+#, python-brace-format
 msgid "Invalid pk \"{pk_value}\" - object does not exist."
 msgstr ""
 
 #: relations.py:134
+#, python-brace-format
 msgid "Incorrect type. Expected pk value, received {data_type}."
 msgstr ""
 
@@ -260,38 +298,57 @@ msgid "Invalid hyperlink - Object does not exist."
 msgstr ""
 
 #: relations.py:160
+#, python-brace-format
 msgid "Incorrect type. Expected URL string, received {data_type}."
 msgstr ""
 
-#: relations.py:295
+#: relations.py:302
+#, python-brace-format
 msgid "Object with {slug_name}={value} does not exist."
 msgstr ""
 
-#: relations.py:296
+#: relations.py:303
 msgid "Invalid value."
 msgstr ""
 
-#: serializers.py:299
+#: serializers.py:304
+#, python-brace-format
 msgid "Invalid data. Expected a dictionary, but got {datatype}."
 msgstr ""
 
+#: templates/rest_framework/horizontal/radio.html:2
+#: templates/rest_framework/inline/radio.html:2
+#: templates/rest_framework/vertical/radio.html:2
+msgid "None"
+msgstr ""
+
+#: templates/rest_framework/horizontal/select_multiple.html:2
+#: templates/rest_framework/inline/select_multiple.html:2
+#: templates/rest_framework/vertical/select_multiple.html:2
+msgid "No items to select."
+msgstr ""
+
 #: validators.py:22
 msgid "This field must be unique."
 msgstr ""
 
 #: validators.py:76
+#, python-brace-format
 msgid "The fields {field_names} must make a unique set."
 msgstr ""
 
-#: validators.py:219
+#: validators.py:224
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" date."
 msgstr ""
 
-#: validators.py:234
+#: validators.py:239
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" month."
 msgstr ""
 
-#: validators.py:247
+#: validators.py:252
+#, python-brace-format
 msgid "This field must be unique for the \"{date_field}\" year."
 msgstr ""
 
@@ -303,22 +360,14 @@ msgstr ""
 msgid "Invalid version in URL path."
 msgstr ""
 
-#: versioning.py:138
+#: versioning.py:141
 msgid "Invalid version in hostname."
 msgstr ""
 
-#: versioning.py:160
+#: versioning.py:163
 msgid "Invalid version in query parameter."
 msgstr ""
 
-#: authtoken/serializers.py:20
-msgid "User account is disabled."
-msgstr ""
-
-#: authtoken/serializers.py:23
-msgid "Unable to log in with provided credentials."
-msgstr ""
-
-#: authtoken/serializers.py:26
-msgid "Must include \"username\" and \"password\"."
+#: views.py:85
+msgid "Permission denied."
 msgstr ""