From 3d0292e1cdcf56c490c7ee4777724620e76cad11 Mon Sep 17 00:00:00 2001 From: Ollie Walsh Date: Fri, 14 Aug 2015 12:16:57 +0100 Subject: [PATCH 001/457] Do not ignore overridden View.get_view_name() in breadcrumbs --- rest_framework/utils/breadcrumbs.py | 3 +-- tests/test_utils.py | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/rest_framework/utils/breadcrumbs.py b/rest_framework/utils/breadcrumbs.py index 950e9695b..5d8a18cf2 100644 --- a/rest_framework/utils/breadcrumbs.py +++ b/rest_framework/utils/breadcrumbs.py @@ -32,8 +32,7 @@ def get_breadcrumbs(url, request=None): # Don't list the same view twice in a row. # Probably an optional trailing slash. if not seen or seen[-1] != view: - suffix = getattr(view, 'suffix', None) - name = view_name_func(cls, suffix) + name = cls().get_view_name() insert_url = preserve_builtin_query_params(prefix + url, request) breadcrumbs_list.insert(0, (name, insert_url)) seen.append(view) diff --git a/tests/test_utils.py b/tests/test_utils.py index 062f78e11..5e2823b96 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -31,10 +31,15 @@ class NestedResourceRoot(APIView): class NestedResourceInstance(APIView): pass +class CustomNameResourceInstance(APIView): + def get_view_name(self): + return "Foo" + urlpatterns = [ url(r'^$', Root.as_view()), url(r'^resource/$', ResourceRoot.as_view()), + url(r'^resource/customname$', CustomNameResourceInstance.as_view()), url(r'^resource/(?P[0-9]+)$', ResourceInstance.as_view()), url(r'^resource/(?P[0-9]+)/$', NestedResourceRoot.as_view()), url(r'^resource/(?P[0-9]+)/(?P[A-Za-z]+)$', NestedResourceInstance.as_view()), @@ -75,6 +80,17 @@ class BreadcrumbTests(TestCase): ] ) + def test_resource_instance_customname_breadcrumbs(self): + url = '/resource/customname' + self.assertEqual( + get_breadcrumbs(url), + [ + ('Root', '/'), + ('Resource Root', '/resource/'), + ('Foo', '/resource/customname') + ] + ) + def test_nested_resource_breadcrumbs(self): url = '/resource/123/' self.assertEqual( From 332c30afb9f710653843c6d6746be613a9fd638d Mon Sep 17 00:00:00 2001 From: Ollie Walsh Date: Fri, 14 Aug 2015 12:20:25 +0100 Subject: [PATCH 002/457] Lint --- rest_framework/utils/breadcrumbs.py | 3 --- tests/test_utils.py | 3 ++- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/rest_framework/utils/breadcrumbs.py b/rest_framework/utils/breadcrumbs.py index 5d8a18cf2..8f68d9300 100644 --- a/rest_framework/utils/breadcrumbs.py +++ b/rest_framework/utils/breadcrumbs.py @@ -9,11 +9,8 @@ def get_breadcrumbs(url, request=None): tuple of (name, url). """ from rest_framework.reverse import preserve_builtin_query_params - from rest_framework.settings import api_settings from rest_framework.views import APIView - view_name_func = api_settings.VIEW_NAME_FUNCTION - def breadcrumbs_recursive(url, breadcrumbs_list, prefix, seen): """ Add tuples of (name, url) to the breadcrumbs list, diff --git a/tests/test_utils.py b/tests/test_utils.py index 5e2823b96..781aedb84 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -31,6 +31,7 @@ class NestedResourceRoot(APIView): class NestedResourceInstance(APIView): pass + class CustomNameResourceInstance(APIView): def get_view_name(self): return "Foo" @@ -89,7 +90,7 @@ class BreadcrumbTests(TestCase): ('Resource Root', '/resource/'), ('Foo', '/resource/customname') ] - ) + ) def test_nested_resource_breadcrumbs(self): url = '/resource/123/' From c8ca3a1c0571ab12a5c4e07307998fafba577ec4 Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy Date: Thu, 11 Feb 2016 07:14:45 +0100 Subject: [PATCH 003/457] Release notes for 3.3.3 --- docs/topics/release-notes.md | 66 ++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index d21f8e51b..d339e0f70 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -40,6 +40,36 @@ You can determine your currently installed version using `pip freeze`: ## 3.3.x series +### 3.3.3 + +**Date**: [12th February 2016][3.3.3-milestone]. + +* Remove version string from templates. Thanks to @blag for the report and fixes. ([#3878][gh3878], [#3913][gh3913], [#3912][gh3912]) +* Fixes vertical html layout for `BooleanField`. Thanks to Mikalai Radchuk for the fix. ([#3910][gh3910]) +* Silenced deprecation warnings on Django 1.8. Thanks to Simon Charette for the fix. ([#3903][gh3903]) +* Internationalization for authtoken. Thanks to Michael Nacharov for the fix. ([#3887][gh3887]) +* Fix `Token` model as `abstract` when the authtoken application isn't declared. Thanks to Adam Thomas for the report. ([#3860][gh3860], [#3858][gh3858]) +* Improve Markdown version compatibility. Thanks to Michael J. Schultz for the fix. ([#3604][gh3604], [#3842][gh3842]) +* `QueryParameterVersioning` does not use `DEFAULT_VERSION` setting. Thanks to Brad Montgomery for the fix. ([#3833][gh3833]) +* Add an explicit `on_delete` on the models. Thanks to Mads Jensen for the fix. ([#3832][gh3832]) +* Fix `DateField.to_representation` to work with Python 2 unicode. Thanks to Mikalai Radchuk for the fix. ([#3819][gh3819]) +* Fixed `TimeField` not handling string times. Thanks to Areski Belaid for the fix. ([#3809][gh3809]) +* Avoid updates of `Meta.extra_kwargs`. Thanks to Kevin Massey for the report and fix. ([#3805][gh3805], [#3804][gh3804]) +* Fix nested validation error being rendered incorrectly. Thanks to Craig de Stigter for the fix. ([#3801][gh3801]) +* Document how to avoid CSRF and missing button issues with `django-crispy-forms`. Thanks to Emmanuelle Delescolle, José Padilla and Luis San Pablo for the report, analysis and fix. ([#3787][gh3787], [#3636][gh3636], [#3637][gh3637]) +* Improve Rest Framework Settings file setup time. Thanks to Miles Hutson for the report and Mads Jensen for the fix. ([#3786][gh3786], [#3815][gh3815]) +* Improve authtoken compatibility with Django 1.9. Thanks to S. Andrew Sheppard for the fix. ([#3785][gh3785]) +* Fix `Min/MaxValueValidator` transfer from a model's `DecimalField`. Thanks to Kevin Brown for the fix. ([#3774][gh3774]) +* Improve HTML title in the Browsable API. Thanks to Mike Lissner for the report and fix. ([#3769][gh3769]) +* Fix `AutoFilterSet` to inherit from `default_filter_set`. Thanks to Tom Linford for the fix. ([#3753][gh3753]) +* Fix transifex config to handle the new Chinese language codes. Thanks to @nypisces for the report and fix. ([#3739][gh3739]) +* `DateTimeField` does not handle empty values correctly. Thanks to Mick Parker for the report and fix. ([#3731][gh3731], [#3726][gh3728]) +* Raise error when setting a removed rest_framework setting. Thanks to Luis San Pablo for the fix. ([#3715][gh3715]) +* Add missing csrf_token in AdminRenderer post form. Thanks to Piotr Śniegowski for the fix. ([#3703][gh3703]) +* Refactored `_get_reverse_relationships()` to use correct `to_field`. Thanks to Benjamin Phillips for the fix. ([#3696][gh3696]) +* Document the use of `get_queryset` for `RelatedField`. Thanks to Ryan Hiebert for the fix. ([#3605][gh3605]) + + ### 3.3.2 **Date**: [14th December 2015][3.3.2-milestone]. @@ -370,6 +400,7 @@ For older release notes, [please see the version 2.x documentation][old-release- [3.3.0-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.3.0+Release%22 [3.3.1-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.3.1+Release%22 [3.3.2-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.3.2+Release%22 +[3.3.3-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.3.3+Release%22 [gh2013]: https://github.com/tomchristie/django-rest-framework/issues/2013 @@ -649,3 +680,38 @@ For older release notes, [please see the version 2.x documentation][old-release- [gh3714]: https://github.com/tomchristie/django-rest-framework/issues/3714 [gh3718]: https://github.com/tomchristie/django-rest-framework/issues/3718 [gh3723]: https://github.com/tomchristie/django-rest-framework/issues/3723 + + +[gh3913]: https://github.com/tomchristie/django-rest-framework/issues/3913 +[gh3912]: https://github.com/tomchristie/django-rest-framework/issues/3912 +[gh3910]: https://github.com/tomchristie/django-rest-framework/issues/3910 +[gh3903]: https://github.com/tomchristie/django-rest-framework/issues/3903 +[gh3887]: https://github.com/tomchristie/django-rest-framework/issues/3887 +[gh3878]: https://github.com/tomchristie/django-rest-framework/issues/3878 +[gh3860]: https://github.com/tomchristie/django-rest-framework/issues/3860 +[gh3858]: https://github.com/tomchristie/django-rest-framework/issues/3858 +[gh3842]: https://github.com/tomchristie/django-rest-framework/issues/3842 +[gh3833]: https://github.com/tomchristie/django-rest-framework/issues/3833 +[gh3832]: https://github.com/tomchristie/django-rest-framework/issues/3832 +[gh3819]: https://github.com/tomchristie/django-rest-framework/issues/3819 +[gh3815]: https://github.com/tomchristie/django-rest-framework/issues/3815 +[gh3809]: https://github.com/tomchristie/django-rest-framework/issues/3809 +[gh3805]: https://github.com/tomchristie/django-rest-framework/issues/3805 +[gh3804]: https://github.com/tomchristie/django-rest-framework/issues/3804 +[gh3801]: https://github.com/tomchristie/django-rest-framework/issues/3801 +[gh3787]: https://github.com/tomchristie/django-rest-framework/issues/3787 +[gh3786]: https://github.com/tomchristie/django-rest-framework/issues/3786 +[gh3785]: https://github.com/tomchristie/django-rest-framework/issues/3785 +[gh3774]: https://github.com/tomchristie/django-rest-framework/issues/3774 +[gh3769]: https://github.com/tomchristie/django-rest-framework/issues/3769 +[gh3753]: https://github.com/tomchristie/django-rest-framework/issues/3753 +[gh3739]: https://github.com/tomchristie/django-rest-framework/issues/3739 +[gh3731]: https://github.com/tomchristie/django-rest-framework/issues/3731 +[gh3728]: https://github.com/tomchristie/django-rest-framework/issues/3726 +[gh3715]: https://github.com/tomchristie/django-rest-framework/issues/3715 +[gh3703]: https://github.com/tomchristie/django-rest-framework/issues/3703 +[gh3696]: https://github.com/tomchristie/django-rest-framework/issues/3696 +[gh3637]: https://github.com/tomchristie/django-rest-framework/issues/3637 +[gh3636]: https://github.com/tomchristie/django-rest-framework/issues/3636 +[gh3605]: https://github.com/tomchristie/django-rest-framework/issues/3605 +[gh3604]: https://github.com/tomchristie/django-rest-framework/issues/3604 From 72ecd32c6b891395d0df98517195e01e1239234e Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy Date: Fri, 12 Feb 2016 13:15:20 +0100 Subject: [PATCH 004/457] Use pandoc to generate a nice PyPI information page. --- requirements/requirements-packaging.txt | 3 +++ setup.py | 12 ++++++++++++ 2 files changed, 15 insertions(+) diff --git a/requirements/requirements-packaging.txt b/requirements/requirements-packaging.txt index 8f62ee365..89819da20 100644 --- a/requirements/requirements-packaging.txt +++ b/requirements/requirements-packaging.txt @@ -6,3 +6,6 @@ twine==1.4.0 # Transifex client for managing translation resources. transifex-client==0.11 + +# Pandoc to have a nice pypi page +pypandoc diff --git a/setup.py b/setup.py index 8e9d0a9ab..364863137 100755 --- a/setup.py +++ b/setup.py @@ -7,6 +7,17 @@ import sys from setuptools import setup +try: + from pypandoc import convert + + def read_md(f): + return convert(f, 'rst') +except ImportError: + print("warning: pypandoc module not found, could not convert Markdown to RST") + + def read_md(f): + return open(f, 'r').read() + def get_version(package): """ @@ -68,6 +79,7 @@ setup( url='http://www.django-rest-framework.org', license='BSD', description='Web APIs for Django, made easy.', + long_description=read_md('README.md'), author='Tom Christie', author_email='tom@tomchristie.com', # SEE NOTE BELOW (*) packages=get_packages('rest_framework'), From f5822e7b7138622fb10d75c00cdf60a706a98d96 Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy Date: Fri, 12 Feb 2016 13:23:08 +0100 Subject: [PATCH 005/457] Bump version to 3.3.3 --- rest_framework/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py index 74c317f35..6f02b8039 100644 --- a/rest_framework/__init__.py +++ b/rest_framework/__init__.py @@ -8,7 +8,7 @@ ______ _____ _____ _____ __ """ __title__ = 'Django REST framework' -__version__ = '3.3.2' +__version__ = '3.3.3' __author__ = 'Tom Christie' __license__ = 'BSD 2-Clause' __copyright__ = 'Copyright 2011-2016 Tom Christie' From f48ccad581cbcc0466a9418c61d73f34a3721898 Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy Date: Fri, 12 Feb 2016 13:43:18 +0100 Subject: [PATCH 006/457] Fail hard during publish if pandoc isn't available. --- setup.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/setup.py b/setup.py index 364863137..0fef70f1f 100755 --- a/setup.py +++ b/setup.py @@ -56,6 +56,10 @@ version = get_version('rest_framework') if sys.argv[-1] == 'publish': + try: + import pypandoc + except ImportError: + print("pypandoc not installed.\nUse `pip install pypandoc`.\nExiting.") if os.system("pip freeze | grep wheel"): print("wheel not installed.\nUse `pip install wheel`.\nExiting.") sys.exit() From 20d1fdba697a590307ef65626bfb574a0c92bc96 Mon Sep 17 00:00:00 2001 From: Carlton Gibson Date: Tue, 16 Feb 2016 09:29:48 +0100 Subject: [PATCH 007/457] Fix None UUID ForeignKey serialization --- docs/topics/release-notes.md | 1 + rest_framework/fields.py | 2 ++ tests/models.py | 15 +++++++++++++++ tests/test_relations_pk.py | 21 ++++++++++++++++++++- 4 files changed, 38 insertions(+), 1 deletion(-) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index b6794a817..9c8d9e978 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -45,6 +45,7 @@ You can determine your currently installed version using `pip freeze`: **Unreleased** * Dropped support for EOL Django 1.7 ([#3933][gh3933]) +* Fixed null foreign keys targeting UUIDField primary keys. ([#3936][gh3936]) ### 3.3.2 diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 6d5962c8e..c700b85e8 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -778,6 +778,8 @@ class UUIDField(Field): return data def to_representation(self, value): + if value is None: + return None if self.uuid_format == 'hex_verbose': return str(value) else: diff --git a/tests/models.py b/tests/models.py index 8ec274d8b..5d5d40968 100644 --- a/tests/models.py +++ b/tests/models.py @@ -1,5 +1,7 @@ from __future__ import unicode_literals +import uuid + from django.db import models from django.utils.translation import ugettext_lazy as _ @@ -46,6 +48,11 @@ class ForeignKeyTarget(RESTFrameworkModel): name = models.CharField(max_length=100) +class UUIDForeignKeyTarget(RESTFrameworkModel): + uuid = models.UUIDField(primary_key=True, default=uuid.uuid4) + name = models.CharField(max_length=100) + + class ForeignKeySource(RESTFrameworkModel): name = models.CharField(max_length=100) target = models.ForeignKey(ForeignKeyTarget, related_name='sources', @@ -62,6 +69,14 @@ class NullableForeignKeySource(RESTFrameworkModel): on_delete=models.CASCADE) +class NullableUUIDForeignKeySource(RESTFrameworkModel): + name = models.CharField(max_length=100) + target = models.ForeignKey(ForeignKeyTarget, null=True, blank=True, + related_name='nullable_sources', + verbose_name='Optional target object', + on_delete=models.CASCADE) + + # OneToOne class OneToOneTarget(RESTFrameworkModel): name = models.CharField(max_length=100) diff --git a/tests/test_relations_pk.py b/tests/test_relations_pk.py index 169f7d9c5..658357b2f 100644 --- a/tests/test_relations_pk.py +++ b/tests/test_relations_pk.py @@ -6,7 +6,8 @@ from django.utils import six from rest_framework import serializers from tests.models import ( ForeignKeySource, ForeignKeyTarget, ManyToManySource, ManyToManyTarget, - NullableForeignKeySource, NullableOneToOneSource, OneToOneTarget + NullableForeignKeySource, NullableOneToOneSource, + NullableUUIDForeignKeySource, OneToOneTarget, UUIDForeignKeyTarget ) @@ -43,6 +44,18 @@ class NullableForeignKeySourceSerializer(serializers.ModelSerializer): fields = ('id', 'name', 'target') +# Nullable UUIDForeignKey +class NullableUUIDForeignKeySourceSerializer(serializers.ModelSerializer): + target = serializers.PrimaryKeyRelatedField( + pk_field=serializers.UUIDField(), + queryset=UUIDForeignKeyTarget.objects.all(), + allow_empty=True) + + class Meta: + model = NullableUUIDForeignKeySource + fields = ('id', 'name', 'target') + + # Nullable OneToOne class NullableOneToOneTargetSerializer(serializers.ModelSerializer): class Meta: @@ -432,6 +445,12 @@ class PKNullableForeignKeyTests(TestCase): ] self.assertEqual(serializer.data, expected) + def test_null_uuid_foreign_key_serializes_as_none(self): + source = NullableUUIDForeignKeySource(name='Source') + serializer = NullableUUIDForeignKeySourceSerializer(source) + data = serializer.data + self.assertEqual(data["target"], None) + class PKNullableOneToOneTests(TestCase): def setUp(self): From cbb8d8d2546f1673dcd26c4a7f0836a4c10312f3 Mon Sep 17 00:00:00 2001 From: Carlton Gibson Date: Wed, 10 Feb 2016 10:07:11 +0100 Subject: [PATCH 008/457] Test deserialising data including `None` fk --- tests/test_relations_pk.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/test_relations_pk.py b/tests/test_relations_pk.py index 658357b2f..ba75bd94f 100644 --- a/tests/test_relations_pk.py +++ b/tests/test_relations_pk.py @@ -49,7 +49,7 @@ class NullableUUIDForeignKeySourceSerializer(serializers.ModelSerializer): target = serializers.PrimaryKeyRelatedField( pk_field=serializers.UUIDField(), queryset=UUIDForeignKeyTarget.objects.all(), - allow_empty=True) + allow_null=True) class Meta: model = NullableUUIDForeignKeySource @@ -451,6 +451,11 @@ class PKNullableForeignKeyTests(TestCase): data = serializer.data self.assertEqual(data["target"], None) + def test_nullable_uuid_foreign_key_is_valid_when_none(self): + data = {"name": "Source", "target": None} + serializer = NullableUUIDForeignKeySourceSerializer(data=data) + self.assertTrue(serializer.is_valid(), serializer.errors) + class PKNullableOneToOneTests(TestCase): def setUp(self): From 5e082314535d2f18c7596b7451de6b800ac37f71 Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy Date: Wed, 17 Feb 2016 18:18:19 +0100 Subject: [PATCH 009/457] Remove informations about why the pagination didn't work. We remove a couple of informations to lower the exposition of our internals. --- rest_framework/pagination.py | 2 +- tests/test_pagination.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py index 1051dc5b2..de8777b96 100644 --- a/rest_framework/pagination.py +++ b/rest_framework/pagination.py @@ -186,7 +186,7 @@ class PageNumberPagination(BasePagination): template = 'rest_framework/pagination/numbers.html' - invalid_page_message = _('Invalid page "{page_number}": {message}.') + invalid_page_message = _('Invalid page.') def paginate_queryset(self, queryset, request, view=None): """ diff --git a/tests/test_pagination.py b/tests/test_pagination.py index c6caaf641..1c74e837c 100644 --- a/tests/test_pagination.py +++ b/tests/test_pagination.py @@ -113,7 +113,7 @@ class TestPaginationIntegration: response = self.view(request) assert response.status_code == status.HTTP_404_NOT_FOUND assert response.data == { - 'detail': 'Invalid page "0": That page number is less than 1.' + 'detail': 'Invalid page.' } def test_404_not_found_for_invalid_page(self): @@ -121,7 +121,7 @@ class TestPaginationIntegration: response = self.view(request) assert response.status_code == status.HTTP_404_NOT_FOUND assert response.data == { - 'detail': 'Invalid page "invalid": That page number is not an integer.' + 'detail': 'Invalid page.' } From c03c6c6e783b2d7c25c79bdadf2b12433dd88116 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Wed, 24 Feb 2016 14:22:24 +0100 Subject: [PATCH 010/457] fix typo in relations docs --- docs/api-guide/relations.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/relations.md b/docs/api-guide/relations.md index ba6870bcf..b2a7d8e21 100644 --- a/docs/api-guide/relations.md +++ b/docs/api-guide/relations.md @@ -507,7 +507,7 @@ For example, given the following model for a tag, which has a generic relationsh def __unicode__(self): return self.tag_name -And the following two models, which may be have associated tags: +And the following two models, which may have associated tags: class Bookmark(models.Model): """ From a609e4e1ca98228bef7537d7770d7919ac25a047 Mon Sep 17 00:00:00 2001 From: Taranjeet Date: Fri, 26 Feb 2016 00:02:38 +0530 Subject: [PATCH 011/457] Docs: Fix repetitive word in the tutorial --- docs/tutorial/1-serialization.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/tutorial/1-serialization.md b/docs/tutorial/1-serialization.md index 239d54204..fd0783f07 100644 --- a/docs/tutorial/1-serialization.md +++ b/docs/tutorial/1-serialization.md @@ -325,7 +325,7 @@ Quit out of the shell... In another terminal window, we can test the server. -We can test our API using using [curl][curl] or [httpie][httpie]. Httpie is a user friendly http client that's written in Python. Let's install that. +We can test our API using [curl][curl] or [httpie][httpie]. Httpie is a user friendly http client that's written in Python. Let's install that. You can install httpie using pip: From 6ea6e37ac999025c8ee71fbc52764c1fd877c736 Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy Date: Sat, 27 Feb 2016 00:51:35 +0100 Subject: [PATCH 012/457] Add missing migration file for #3887 --- .../migrations/0002_auto_20160226_1747.py | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 rest_framework/authtoken/migrations/0002_auto_20160226_1747.py diff --git a/rest_framework/authtoken/migrations/0002_auto_20160226_1747.py b/rest_framework/authtoken/migrations/0002_auto_20160226_1747.py new file mode 100644 index 000000000..5673f332f --- /dev/null +++ b/rest_framework/authtoken/migrations/0002_auto_20160226_1747.py @@ -0,0 +1,34 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import migrations, models +from django.conf import settings + + +class Migration(migrations.Migration): + + dependencies = [ + ('authtoken', '0001_initial'), + ] + + operations = [ + migrations.AlterModelOptions( + name='token', + options={'verbose_name_plural': 'Tokens', 'verbose_name': 'Token'}, + ), + migrations.AlterField( + model_name='token', + name='created', + field=models.DateTimeField(verbose_name='Created', auto_now_add=True), + ), + migrations.AlterField( + model_name='token', + name='key', + field=models.CharField(verbose_name='Key', max_length=40, primary_key=True, serialize=False), + ), + migrations.AlterField( + model_name='token', + name='user', + field=models.OneToOneField(to=settings.AUTH_USER_MODEL, verbose_name='User', related_name='auth_token'), + ), + ] From 753f4dc4771b07fcfdfd438655a78c089551d019 Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy Date: Sat, 27 Feb 2016 01:46:59 +0100 Subject: [PATCH 013/457] Fix sorting order. --- rest_framework/authtoken/migrations/0002_auto_20160226_1747.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/authtoken/migrations/0002_auto_20160226_1747.py b/rest_framework/authtoken/migrations/0002_auto_20160226_1747.py index 5673f332f..98e0bb670 100644 --- a/rest_framework/authtoken/migrations/0002_auto_20160226_1747.py +++ b/rest_framework/authtoken/migrations/0002_auto_20160226_1747.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import migrations, models from django.conf import settings +from django.db import migrations, models class Migration(migrations.Migration): From 05204333a58ef1cb7c5809e5b04875b6161d6e8c Mon Sep 17 00:00:00 2001 From: Liping Wang <1325266543@qq.com> Date: Mon, 29 Feb 2016 19:51:33 +0800 Subject: [PATCH 014/457] [FIX] "@api_view" calling error. "@api_view" usage error. --- docs/tutorial/5-relationships-and-hyperlinked-apis.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/tutorial/5-relationships-and-hyperlinked-apis.md b/docs/tutorial/5-relationships-and-hyperlinked-apis.md index feef1fcf0..fb5f62fd3 100644 --- a/docs/tutorial/5-relationships-and-hyperlinked-apis.md +++ b/docs/tutorial/5-relationships-and-hyperlinked-apis.md @@ -11,7 +11,7 @@ Right now we have endpoints for 'snippets' and 'users', but we don't have a sing from rest_framework.reverse import reverse - @api_view(('GET',)) + @api_view(['GET',]) def api_root(request, format=None): return Response({ 'users': reverse('user-list', request=request, format=format), From 239815887dacb29bfafd7dae6bc39c113bf13789 Mon Sep 17 00:00:00 2001 From: Liping Wang <1325266543@qq.com> Date: Tue, 1 Mar 2016 15:46:20 +0800 Subject: [PATCH 015/457] remove comma remove comma --- docs/tutorial/5-relationships-and-hyperlinked-apis.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/tutorial/5-relationships-and-hyperlinked-apis.md b/docs/tutorial/5-relationships-and-hyperlinked-apis.md index fb5f62fd3..4b9347bfa 100644 --- a/docs/tutorial/5-relationships-and-hyperlinked-apis.md +++ b/docs/tutorial/5-relationships-and-hyperlinked-apis.md @@ -11,7 +11,7 @@ Right now we have endpoints for 'snippets' and 'users', but we don't have a sing from rest_framework.reverse import reverse - @api_view(['GET',]) + @api_view(['GET']) def api_root(request, format=None): return Response({ 'users': reverse('user-list', request=request, format=format), From f3b4cb59515f10fd93b5d66718d40a2e8975f19f Mon Sep 17 00:00:00 2001 From: Rex Kerr <(none)> Date: Sat, 27 Feb 2016 12:41:56 -0800 Subject: [PATCH 016/457] Fixes incorrect references to URLPathVersioning --- docs/api-guide/versioning.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/api-guide/versioning.md b/docs/api-guide/versioning.md index bd63c974b..df5d5dfbc 100644 --- a/docs/api-guide/versioning.md +++ b/docs/api-guide/versioning.md @@ -143,7 +143,7 @@ Your URL conf must include a pattern that matches the version with a `'version'` ## NamespaceVersioning -To the client, this scheme is the same as `URLParameterVersioning`. The only difference is how it is configured in your Django application, as it uses URL namespacing, instead of URL keyword arguments. +To the client, this scheme is the same as `URLPathVersioning`. The only difference is how it is configured in your Django application, as it uses URL namespacing, instead of URL keyword arguments. GET /v1/something/ HTTP/1.1 Host: example.com @@ -165,7 +165,7 @@ In the following example we're giving a set of views two different possible URL url(r'^v2/bookings/', include('bookings.urls', namespace='v2')) ] -Both `URLParameterVersioning` and `NamespaceVersioning` are reasonable if you just need a simple versioning scheme. The `URLParameterVersioning` approach might be better suitable for small ad-hoc projects, and the `NamespaceVersioning` is probably easier to manage for larger projects. +Both `URLPathVersioning` and `NamespaceVersioning` are reasonable if you just need a simple versioning scheme. The `URLPathVersioning` approach might be better suitable for small ad-hoc projects, and the `NamespaceVersioning` is probably easier to manage for larger projects. ## HostNameVersioning From 03244291070e7f83c9ddbe0e965eeb11b1b56cb2 Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy Date: Tue, 1 Mar 2016 10:39:13 +0100 Subject: [PATCH 017/457] Add #3968 to the release notes. --- docs/topics/release-notes.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index d339e0f70..12f4360b3 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -47,7 +47,7 @@ You can determine your currently installed version using `pip freeze`: * Remove version string from templates. Thanks to @blag for the report and fixes. ([#3878][gh3878], [#3913][gh3913], [#3912][gh3912]) * Fixes vertical html layout for `BooleanField`. Thanks to Mikalai Radchuk for the fix. ([#3910][gh3910]) * Silenced deprecation warnings on Django 1.8. Thanks to Simon Charette for the fix. ([#3903][gh3903]) -* Internationalization for authtoken. Thanks to Michael Nacharov for the fix. ([#3887][gh3887]) +* Internationalization for authtoken. Thanks to Michael Nacharov for the fix. ([#3887][gh3887], [#3968][gh3968]) * Fix `Token` model as `abstract` when the authtoken application isn't declared. Thanks to Adam Thomas for the report. ([#3860][gh3860], [#3858][gh3858]) * Improve Markdown version compatibility. Thanks to Michael J. Schultz for the fix. ([#3604][gh3604], [#3842][gh3842]) * `QueryParameterVersioning` does not use `DEFAULT_VERSION` setting. Thanks to Brad Montgomery for the fix. ([#3833][gh3833]) @@ -682,6 +682,7 @@ For older release notes, [please see the version 2.x documentation][old-release- [gh3723]: https://github.com/tomchristie/django-rest-framework/issues/3723 +[gh3968]: https://github.com/tomchristie/django-rest-framework/issues/3968 [gh3913]: https://github.com/tomchristie/django-rest-framework/issues/3913 [gh3912]: https://github.com/tomchristie/django-rest-framework/issues/3912 [gh3910]: https://github.com/tomchristie/django-rest-framework/issues/3910 From ef8e7f168f9b88b6a59e0ddd44dea988f7030368 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Tue, 1 Mar 2016 18:37:54 +0100 Subject: [PATCH 018/457] add rest-framework-generic-relations link to docs --- docs/api-guide/relations.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/api-guide/relations.md b/docs/api-guide/relations.md index b2a7d8e21..31a78f28f 100644 --- a/docs/api-guide/relations.md +++ b/docs/api-guide/relations.md @@ -580,9 +580,14 @@ The following third party packages are also available. The [drf-nested-routers package][drf-nested-routers] provides routers and relationship fields for working with nested resources. +## Rest Framework Generic Relations + +The [rest-framework-generic-relations][drf-nested-relations] library provides read/write serialization for generic foreign keys. + [cite]: http://lwn.net/Articles/193245/ [reverse-relationships]: https://docs.djangoproject.com/en/dev/topics/db/queries/#following-relationships-backward [routers]: http://www.django-rest-framework.org/api-guide/routers#defaultrouter [generic-relations]: https://docs.djangoproject.com/en/dev/ref/contrib/contenttypes/#id1 [2.2-announcement]: ../topics/2.2-announcement.md [drf-nested-routers]: https://github.com/alanjds/drf-nested-routers +[drf-nested-relations]: https://github.com/Ian-Foote/rest-framework-generic-relations From e34a34e90b870424fc9a59952bfb80452d169306 Mon Sep 17 00:00:00 2001 From: Jared Lang Date: Wed, 24 Feb 2016 13:36:39 -0800 Subject: [PATCH 019/457] Fix empty pk detection in HyperlinkRelatedField.get_url This implementation allows detection of empty values that are non-nullable, allowing the field to return None values for such cases --- rest_framework/relations.py | 2 +- tests/test_relations.py | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/rest_framework/relations.py b/rest_framework/relations.py index 7e04e7e47..2b7906a59 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -280,7 +280,7 @@ class HyperlinkedRelatedField(RelatedField): attributes are not configured to correctly match the URL conf. """ # Unsaved objects will not yet have a valid URL. - if hasattr(obj, 'pk') and obj.pk is None: + if hasattr(obj, 'pk') and obj.pk in (None, ''): return None lookup_value = getattr(obj, self.lookup_field) diff --git a/tests/test_relations.py b/tests/test_relations.py index 240878394..a070ad6de 100644 --- a/tests/test_relations.py +++ b/tests/test_relations.py @@ -87,6 +87,18 @@ class TestProxiedPrimaryKeyRelatedField(APISimpleTestCase): assert representation == self.instance.pk.int +class TestHyperlinkedRelatedField(APISimpleTestCase): + def setUp(self): + self.field = serializers.HyperlinkedRelatedField( + view_name='example', read_only=True) + self.field.reverse = mock_reverse + self.field._context = {'request': True} + + def test_representation_unsaved_object_with_non_nullable_pk(self): + representation = self.field.to_representation(MockObject(pk='')) + assert representation is None + + class TestHyperlinkedIdentityField(APISimpleTestCase): def setUp(self): self.instance = MockObject(pk=1, name='foo') From 173c2f1e539026998ee6c515c119420fc0d2999a Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy Date: Mon, 7 Mar 2016 20:22:47 +0100 Subject: [PATCH 020/457] Release date update. --- docs/topics/release-notes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index 12f4360b3..7834448c1 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -42,7 +42,7 @@ You can determine your currently installed version using `pip freeze`: ### 3.3.3 -**Date**: [12th February 2016][3.3.3-milestone]. +**Date**: [7th March 2016][3.3.3-milestone]. * Remove version string from templates. Thanks to @blag for the report and fixes. ([#3878][gh3878], [#3913][gh3913], [#3912][gh3912]) * Fixes vertical html layout for `BooleanField`. Thanks to Mikalai Radchuk for the fix. ([#3910][gh3910]) From 4399d601c5ca53e187aa80cbf7d1f0d4c9949070 Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy Date: Mon, 7 Mar 2016 20:25:10 +0100 Subject: [PATCH 021/457] Translation updates. --- .../locale/ach/LC_MESSAGES/django.mo | Bin 513 -> 513 bytes .../locale/ach/LC_MESSAGES/django.po | 115 +++-- .../locale/ar/LC_MESSAGES/django.mo | Bin 4888 -> 4766 bytes .../locale/ar/LC_MESSAGES/django.po | 117 +++-- .../locale/be/LC_MESSAGES/django.mo | Bin 655 -> 655 bytes .../locale/be/LC_MESSAGES/django.po | 115 +++-- .../locale/ca/LC_MESSAGES/django.mo | Bin 9749 -> 9646 bytes .../locale/ca/LC_MESSAGES/django.po | 117 +++-- .../locale/ca_ES/LC_MESSAGES/django.mo | Bin 528 -> 528 bytes .../locale/ca_ES/LC_MESSAGES/django.po | 115 +++-- .../locale/cs/LC_MESSAGES/django.mo | Bin 9140 -> 9031 bytes .../locale/cs/LC_MESSAGES/django.po | 117 +++-- .../locale/da/LC_MESSAGES/django.mo | Bin 9682 -> 9881 bytes .../locale/da/LC_MESSAGES/django.po | 131 +++-- .../locale/da_DK/LC_MESSAGES/django.mo | Bin 529 -> 529 bytes .../locale/da_DK/LC_MESSAGES/django.po | 115 +++-- .../locale/de/LC_MESSAGES/django.mo | Bin 10465 -> 10364 bytes .../locale/de/LC_MESSAGES/django.po | 119 +++-- .../locale/el/LC_MESSAGES/django.mo | Bin 0 -> 512 bytes .../locale/el/LC_MESSAGES/django.po | 457 ++++++++++++++++++ .../locale/el_GR/LC_MESSAGES/django.mo | Bin 0 -> 527 bytes .../locale/el_GR/LC_MESSAGES/django.po | 457 ++++++++++++++++++ .../locale/en/LC_MESSAGES/django.mo | Bin 9770 -> 10002 bytes .../locale/en/LC_MESSAGES/django.po | 117 +++-- .../locale/en_AU/LC_MESSAGES/django.mo | Bin 532 -> 532 bytes .../locale/en_AU/LC_MESSAGES/django.po | 115 +++-- .../locale/en_CA/LC_MESSAGES/django.mo | Bin 529 -> 529 bytes .../locale/en_CA/LC_MESSAGES/django.po | 115 +++-- .../locale/en_US/LC_MESSAGES/django.mo | Bin 378 -> 378 bytes .../locale/en_US/LC_MESSAGES/django.po | 113 +++-- .../locale/es/LC_MESSAGES/django.mo | Bin 10509 -> 10782 bytes .../locale/es/LC_MESSAGES/django.po | 119 +++-- .../locale/et/LC_MESSAGES/django.mo | Bin 8836 -> 8732 bytes .../locale/et/LC_MESSAGES/django.po | 117 +++-- .../locale/fa/LC_MESSAGES/django.mo | Bin 0 -> 507 bytes .../locale/fa/LC_MESSAGES/django.po | 457 ++++++++++++++++++ .../locale/fa_IR/LC_MESSAGES/django.mo | Bin 0 -> 520 bytes .../locale/fa_IR/LC_MESSAGES/django.po | 457 ++++++++++++++++++ .../locale/fi/LC_MESSAGES/django.mo | Bin 10068 -> 9993 bytes .../locale/fi/LC_MESSAGES/django.po | 119 +++-- .../locale/fr/LC_MESSAGES/django.mo | Bin 10501 -> 10770 bytes .../locale/fr/LC_MESSAGES/django.po | 119 +++-- .../locale/fr_CA/LC_MESSAGES/django.mo | Bin 527 -> 527 bytes .../locale/fr_CA/LC_MESSAGES/django.po | 115 +++-- .../locale/gl/LC_MESSAGES/django.mo | Bin 515 -> 515 bytes .../locale/gl/LC_MESSAGES/django.po | 115 +++-- .../locale/gl_ES/LC_MESSAGES/django.mo | Bin 669 -> 669 bytes .../locale/gl_ES/LC_MESSAGES/django.po | 115 +++-- .../locale/he_IL/LC_MESSAGES/django.mo | Bin 528 -> 528 bytes .../locale/he_IL/LC_MESSAGES/django.po | 115 +++-- .../locale/hu/LC_MESSAGES/django.mo | Bin 9228 -> 9123 bytes .../locale/hu/LC_MESSAGES/django.po | 117 +++-- .../locale/id/LC_MESSAGES/django.mo | Bin 510 -> 510 bytes .../locale/id/LC_MESSAGES/django.po | 115 +++-- .../locale/it/LC_MESSAGES/django.mo | Bin 9512 -> 10359 bytes .../locale/it/LC_MESSAGES/django.po | 141 +++--- .../locale/ja/LC_MESSAGES/django.mo | Bin 11341 -> 11941 bytes .../locale/ja/LC_MESSAGES/django.po | 132 +++-- .../locale/ko_KR/LC_MESSAGES/django.mo | Bin 10148 -> 10022 bytes .../locale/ko_KR/LC_MESSAGES/django.po | 117 +++-- .../locale/mk/LC_MESSAGES/django.mo | Bin 10744 -> 10623 bytes .../locale/mk/LC_MESSAGES/django.po | 117 +++-- .../locale/nb/LC_MESSAGES/django.mo | Bin 9902 -> 9803 bytes .../locale/nb/LC_MESSAGES/django.po | 119 +++-- .../locale/nl/LC_MESSAGES/django.mo | Bin 9267 -> 9165 bytes .../locale/nl/LC_MESSAGES/django.po | 117 +++-- .../locale/nn/LC_MESSAGES/django.mo | Bin 524 -> 524 bytes .../locale/nn/LC_MESSAGES/django.po | 115 +++-- .../locale/no/LC_MESSAGES/django.mo | Bin 516 -> 516 bytes .../locale/no/LC_MESSAGES/django.po | 115 +++-- .../locale/pl/LC_MESSAGES/django.mo | Bin 10528 -> 10432 bytes .../locale/pl/LC_MESSAGES/django.po | 119 +++-- .../locale/pt/LC_MESSAGES/django.mo | Bin 517 -> 517 bytes .../locale/pt/LC_MESSAGES/django.po | 115 +++-- .../locale/pt_BR/LC_MESSAGES/django.mo | Bin 10343 -> 10238 bytes .../locale/pt_BR/LC_MESSAGES/django.po | 119 +++-- .../locale/pt_PT/LC_MESSAGES/django.mo | Bin 534 -> 534 bytes .../locale/pt_PT/LC_MESSAGES/django.po | 115 +++-- .../locale/ro/LC_MESSAGES/django.mo | Bin 556 -> 556 bytes .../locale/ro/LC_MESSAGES/django.po | 115 +++-- .../locale/ru/LC_MESSAGES/django.mo | Bin 11487 -> 11360 bytes .../locale/ru/LC_MESSAGES/django.po | 117 +++-- .../locale/sk/LC_MESSAGES/django.mo | Bin 9524 -> 9411 bytes .../locale/sk/LC_MESSAGES/django.po | 117 +++-- .../locale/sv/LC_MESSAGES/django.mo | Bin 10151 -> 10073 bytes .../locale/sv/LC_MESSAGES/django.po | 119 +++-- .../locale/tr/LC_MESSAGES/django.mo | Bin 10269 -> 10172 bytes .../locale/tr/LC_MESSAGES/django.po | 119 +++-- .../locale/tr_TR/LC_MESSAGES/django.mo | Bin 1933 -> 1933 bytes .../locale/tr_TR/LC_MESSAGES/django.po | 115 +++-- .../locale/uk/LC_MESSAGES/django.mo | Bin 590 -> 590 bytes .../locale/uk/LC_MESSAGES/django.po | 115 +++-- .../locale/vi/LC_MESSAGES/django.mo | Bin 510 -> 510 bytes .../locale/vi/LC_MESSAGES/django.po | 115 +++-- .../locale/zh-Hans/LC_MESSAGES/django.mo | Bin 9894 -> 9796 bytes .../locale/zh-Hans/LC_MESSAGES/django.po | 119 +++-- .../locale/zh-Hant/LC_MESSAGES/django.mo | Bin 529 -> 529 bytes .../locale/zh-Hant/LC_MESSAGES/django.po | 115 +++-- .../locale/zh_CN/LC_MESSAGES/django.mo | Bin 9895 -> 10007 bytes .../locale/zh_CN/LC_MESSAGES/django.po | 121 +++-- .../locale/zh_TW/LC_MESSAGES/django.mo | Bin 522 -> 522 bytes .../locale/zh_TW/LC_MESSAGES/django.po | 115 +++-- 102 files changed, 5322 insertions(+), 2036 deletions(-) create mode 100644 rest_framework/locale/el/LC_MESSAGES/django.mo create mode 100644 rest_framework/locale/el/LC_MESSAGES/django.po create mode 100644 rest_framework/locale/el_GR/LC_MESSAGES/django.mo create mode 100644 rest_framework/locale/el_GR/LC_MESSAGES/django.po create mode 100644 rest_framework/locale/fa/LC_MESSAGES/django.mo create mode 100644 rest_framework/locale/fa/LC_MESSAGES/django.po create mode 100644 rest_framework/locale/fa_IR/LC_MESSAGES/django.mo create mode 100644 rest_framework/locale/fa_IR/LC_MESSAGES/django.po diff --git a/rest_framework/locale/ach/LC_MESSAGES/django.mo b/rest_framework/locale/ach/LC_MESSAGES/django.mo index a1e8e6bc3273c26f9056a9b7973654150c7fb481..a91bc8b323901c1ec2e6b2cbbaba7c19085ab063 100644 GIT binary patch delta 41 ncmZom&`8(7T*1)7%G7w`Txo=Wxs|Eu#-lcj0M@b!N&o-= diff --git a/rest_framework/locale/ach/LC_MESSAGES/django.po b/rest_framework/locale/ach/LC_MESSAGES/django.po index 0a6f2cce5..bfb8b75cc 100644 --- a/rest_framework/locale/ach/LC_MESSAGES/django.po +++ b/rest_framework/locale/ach/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-07 18:53+0100\n" -"PO-Revision-Date: 2015-12-07 17:55+0000\n" +"POT-Creation-Date: 2016-03-01 18:38+0100\n" +"PO-Revision-Date: 2016-03-01 17:38+0000\n" "Last-Translator: Xavier Ordoquy \n" "Language-Team: Acoli (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/ach/)\n" "MIME-Version: 1.0\n" @@ -17,43 +17,75 @@ msgstr "" "Language: ach\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: authentication.py:72 +#: authentication.py:71 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:75 +#: authentication.py:74 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:81 +#: authentication.py:80 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:98 +#: authentication.py:97 msgid "Invalid username/password." msgstr "" -#: authentication.py:101 authentication.py:188 +#: authentication.py:100 authentication.py:195 msgid "User inactive or deleted." msgstr "" -#: authentication.py:167 +#: authentication.py:173 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:170 +#: authentication.py:176 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:176 +#: authentication.py:182 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:185 +#: authentication.py:192 msgid "Invalid token." msgstr "" +#: authtoken/apps.py:7 +msgid "Auth Token" +msgstr "" + +#: authtoken/models.py:21 +msgid "Key" +msgstr "" + +#: authtoken/models.py:23 +msgid "User" +msgstr "" + +#: authtoken/models.py:24 +msgid "Created" +msgstr "" + +#: authtoken/models.py:33 +msgid "Token" +msgstr "" + +#: authtoken/models.py:34 +msgid "Tokens" +msgstr "" + +#: authtoken/serializers.py:8 +msgid "Username" +msgstr "" + +#: authtoken/serializers.py:9 +msgid "Password" +msgstr "" + #: authtoken/serializers.py:20 msgid "User account is disabled." msgstr "" @@ -108,7 +140,7 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:266 relations.py:195 relations.py:228 validators.py:79 +#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 #: validators.py:162 msgid "This field is required." msgstr "" @@ -126,7 +158,7 @@ msgstr "" msgid "This field may not be blank." msgstr "" -#: fields.py:670 fields.py:1656 +#: fields.py:670 fields.py:1664 #, python-brace-format msgid "Ensure this field has no more than {max_length} characters." msgstr "" @@ -212,137 +244,136 @@ msgstr "" msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1079 +#: fields.py:1082 #, python-brace-format msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1080 +#: fields.py:1083 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1148 +#: fields.py:1151 #, python-brace-format msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1207 +#: fields.py:1215 #, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1232 fields.py:1281 +#: fields.py:1240 fields.py:1289 #, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "" -#: fields.py:1235 relations.py:62 relations.py:431 +#: fields.py:1243 relations.py:71 relations.py:442 #, python-brace-format msgid "More than {count} items..." msgstr "" -#: fields.py:1282 fields.py:1429 relations.py:427 serializers.py:520 +#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 #, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1283 +#: fields.py:1291 msgid "This selection may not be empty." msgstr "" -#: fields.py:1320 +#: fields.py:1328 #, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1339 +#: fields.py:1347 msgid "No file was submitted." msgstr "" -#: fields.py:1340 +#: fields.py:1348 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1341 +#: fields.py:1349 msgid "No filename could be determined." msgstr "" -#: fields.py:1342 +#: fields.py:1350 msgid "The submitted file is empty." msgstr "" -#: fields.py:1343 +#: fields.py:1351 #, python-brace-format msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1391 +#: fields.py:1399 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: fields.py:1430 relations.py:428 serializers.py:521 +#: fields.py:1438 relations.py:439 serializers.py:521 msgid "This list may not be empty." msgstr "" -#: fields.py:1483 +#: fields.py:1491 #, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1530 +#: fields.py:1538 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html:5 +#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 msgid "Submit" msgstr "" #: pagination.py:189 -#, python-brace-format -msgid "Invalid page \"{page_number}\": {message}." +msgid "Invalid page." msgstr "" #: pagination.py:407 msgid "Invalid cursor" msgstr "" -#: relations.py:196 +#: relations.py:207 #, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" -#: relations.py:197 +#: relations.py:208 #, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" -#: relations.py:229 +#: relations.py:240 msgid "Invalid hyperlink - No URL match." msgstr "" -#: relations.py:230 +#: relations.py:241 msgid "Invalid hyperlink - Incorrect URL match." msgstr "" -#: relations.py:231 +#: relations.py:242 msgid "Invalid hyperlink - Object does not exist." msgstr "" -#: relations.py:232 +#: relations.py:243 #, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:391 +#: relations.py:402 #, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:392 +#: relations.py:403 msgid "Invalid value." msgstr "" diff --git a/rest_framework/locale/ar/LC_MESSAGES/django.mo b/rest_framework/locale/ar/LC_MESSAGES/django.mo index 6a32487ecfca6f79807a3851b1e2e62bcf32fc0e..719bb0b318cd7893e394a3c335855cd27d5af81e 100644 GIT binary patch delta 834 zcmX}q&r4KM6u|K_^K8Z@b^JkTW9D;)vDA6=o>mT%M*d(V42p?aB|!@r2BRd!oeT|x zJ6#M#EB}BNQVeZGDB87fp=*iOMuHnj1oM0D8@zDmbI;?>d-t4kKlZLCOTSv{-U}nn zyv9rgL~h|okRQfB?7?HSvC|Uiz!B8_dF;eD=-?`j;}&M|KR&>0oyah*;640?(;_7~ zVUgj%)CGS-8C!`rQ9rPaN!&*ln?oWo9K$A@!5cV-SFnN+{Dk`duh@>ewRj)(z~Qha zS`taH&=Wt!0sMeh@kh-)93(!%7**)2_dhtvS0;G=5^em99`4{xv@ZE^3f~ex$2I(o z(>UKi5`15_Sm*&xaRtX3{gVB}`@|8_)RH|!t<*bA;djjAU(|gQQ9rXXJ|bSn1pYy- zXtddHZ5+FZbC@4xG0#E|uz~ubLtI9;#edNT_7k7rZS3W3y8jsl&}PzR)0Q5LR(67I znwcrIO3BQ)&M##&gHoDXNB`wAvztjKLe}SlQVD%GjntlSFmwB;lo@R`6>YMnspF!) zl12+BHn%}_OK%-#5&@>Op-vR4qimSZ76RQgr|T delta 923 zcmZ9~&r8!`9Ki99o6YHT*2L1S>~TvS*_boOWc^wRLbOYV>=H!67Y|{C;zb$5QAAM$ z4Y5N=hawC-$k-*QKOhF4g75cGmrfOQ>(Gxw@6R)-=mXF9^*j&H_xbU8o{gc$!{rZ= z)-@p#l!KIs7Lha-eSCugE?Hs6S#vH zM9LD{Ba)}%GU|Xw7{Rxw3%ti6{DDa{0g*90k5OF4Fs|VUKEwUkzz+O~I?q=;fT6Z# zJApCQmjV?%@fFma-^Wqh!G8R?Yj03woOT+cWM>vfXqQ-J3ZJ9FPnf}uP;eH`yJPNAl*f|{{6cnrT|0f)OqF5w*N_}8dc z^9zgEx3_uC4r+$)VmVFa36(?Gz*G1cbtB1r&55pKiS|p>iIV(%6qj%UpQ4U`hb=fr z;ri|3ab$fPy}K$23fD4YyU3)C!+goM4Ikeg3h%_;r$G)XB;`+#N#R-8&FfoW-}cHn zs~3GeNA#JpBOC2}c>ux*?5oh1FhHqB{n1*)-{v2V`+ZYSt!NxW@X-4 zT%@a13kMc_UD;G-JT;axnaO\n" "Language-Team: Arabic (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/ar/)\n" "MIME-Version: 1.0\n" @@ -18,43 +18,75 @@ msgstr "" "Language: ar\n" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" -#: authentication.py:72 +#: authentication.py:71 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:75 +#: authentication.py:74 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:81 +#: authentication.py:80 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:98 +#: authentication.py:97 msgid "Invalid username/password." msgstr "اسم المستخدم/كلمة السر غير صحيحين." -#: authentication.py:101 authentication.py:188 +#: authentication.py:100 authentication.py:195 msgid "User inactive or deleted." msgstr "المستخدم غير مفعل او تم حذفه." -#: authentication.py:167 +#: authentication.py:173 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:170 +#: authentication.py:176 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:176 +#: authentication.py:182 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:185 +#: authentication.py:192 msgid "Invalid token." msgstr "" +#: authtoken/apps.py:7 +msgid "Auth Token" +msgstr "" + +#: authtoken/models.py:21 +msgid "Key" +msgstr "" + +#: authtoken/models.py:23 +msgid "User" +msgstr "" + +#: authtoken/models.py:24 +msgid "Created" +msgstr "" + +#: authtoken/models.py:33 +msgid "Token" +msgstr "" + +#: authtoken/models.py:34 +msgid "Tokens" +msgstr "" + +#: authtoken/serializers.py:8 +msgid "Username" +msgstr "" + +#: authtoken/serializers.py:9 +msgid "Password" +msgstr "" + #: authtoken/serializers.py:20 msgid "User account is disabled." msgstr "حساب المستخدم غير مفعل." @@ -109,7 +141,7 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:266 relations.py:195 relations.py:228 validators.py:79 +#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 #: validators.py:162 msgid "This field is required." msgstr "هذا الحقل مطلوب." @@ -127,7 +159,7 @@ msgstr "\"{input}\" ليس قيمة منطقية." msgid "This field may not be blank." msgstr "لا يمكن لهذا الحقل ان يكون فارغاً." -#: fields.py:670 fields.py:1656 +#: fields.py:670 fields.py:1664 #, python-brace-format msgid "Ensure this field has no more than {max_length} characters." msgstr "تأكد ان الحقل لا يزيد عن {max_length} محرف." @@ -213,137 +245,136 @@ msgstr "صيغة التاريخ و الوقت غير صحيحة. عليك أن msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1079 +#: fields.py:1082 #, python-brace-format msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "صيغة التاريخ غير صحيحة. عليك أن تستخدم واحدة من هذه الصيغ التالية: {format}." -#: fields.py:1080 +#: fields.py:1083 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1148 +#: fields.py:1151 #, python-brace-format msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "صيغة الوقت غير صحيحة. عليك أن تستخدم واحدة من هذه الصيغ التالية: {format}." -#: fields.py:1207 +#: fields.py:1215 #, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1232 fields.py:1281 +#: fields.py:1240 fields.py:1289 #, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" ليست واحدة من الخيارات الصالحة." -#: fields.py:1235 relations.py:62 relations.py:431 +#: fields.py:1243 relations.py:71 relations.py:442 #, python-brace-format msgid "More than {count} items..." msgstr "" -#: fields.py:1282 fields.py:1429 relations.py:427 serializers.py:520 +#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 #, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1283 +#: fields.py:1291 msgid "This selection may not be empty." msgstr "" -#: fields.py:1320 +#: fields.py:1328 #, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1339 +#: fields.py:1347 msgid "No file was submitted." msgstr "لم يتم إرسال أي ملف." -#: fields.py:1340 +#: fields.py:1348 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1341 +#: fields.py:1349 msgid "No filename could be determined." msgstr "" -#: fields.py:1342 +#: fields.py:1350 msgid "The submitted file is empty." msgstr "الملف الذي تم إرساله فارغ." -#: fields.py:1343 +#: fields.py:1351 #, python-brace-format msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "تأكد ان اسم الملف لا يحوي أكثر من {max_length} محرف (الإسم المرسل يحوي {length} محرف)." -#: fields.py:1391 +#: fields.py:1399 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: fields.py:1430 relations.py:428 serializers.py:521 +#: fields.py:1438 relations.py:439 serializers.py:521 msgid "This list may not be empty." msgstr "" -#: fields.py:1483 +#: fields.py:1491 #, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1530 +#: fields.py:1538 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html:5 +#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 msgid "Submit" msgstr "" #: pagination.py:189 -#, python-brace-format -msgid "Invalid page \"{page_number}\": {message}." -msgstr "رقم الصفحة \"{page_number}\" غير صالح : {message}." +msgid "Invalid page." +msgstr "" #: pagination.py:407 msgid "Invalid cursor" msgstr "" -#: relations.py:196 +#: relations.py:207 #, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "معرف العنصر \"{pk_value}\" غير صالح - العنصر غير موجود." -#: relations.py:197 +#: relations.py:208 #, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" -#: relations.py:229 +#: relations.py:240 msgid "Invalid hyperlink - No URL match." msgstr "" -#: relations.py:230 +#: relations.py:241 msgid "Invalid hyperlink - Incorrect URL match." msgstr "" -#: relations.py:231 +#: relations.py:242 msgid "Invalid hyperlink - Object does not exist." msgstr "" -#: relations.py:232 +#: relations.py:243 #, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:391 +#: relations.py:402 #, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:392 +#: relations.py:403 msgid "Invalid value." msgstr "قيمة غير صالحة." diff --git a/rest_framework/locale/be/LC_MESSAGES/django.mo b/rest_framework/locale/be/LC_MESSAGES/django.mo index 457e2947968bbc7dc1ebf857a6b8239a04ebc03f..cf959f6d9fb4bf89764a8ab67ec323c64e3cfbc5 100644 GIT binary patch delta 41 ncmeBY?Pr}Zf!9pez*yJ7P{Gi`%GhG!Txo=WIZ$BZ(Nl~7+y)Bp delta 41 ocmeBY?Pr}Zf!9>m&`8(7T*1)7%G7w`Txo=Wxs|Eu#-pbg0o;5F_5c6? diff --git a/rest_framework/locale/be/LC_MESSAGES/django.po b/rest_framework/locale/be/LC_MESSAGES/django.po index 8dd5a6e9e..6fe59735f 100644 --- a/rest_framework/locale/be/LC_MESSAGES/django.po +++ b/rest_framework/locale/be/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-07 18:53+0100\n" -"PO-Revision-Date: 2015-12-07 17:55+0000\n" +"POT-Creation-Date: 2016-03-01 18:38+0100\n" +"PO-Revision-Date: 2016-03-01 17:38+0000\n" "Last-Translator: Xavier Ordoquy \n" "Language-Team: Belarusian (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/be/)\n" "MIME-Version: 1.0\n" @@ -17,43 +17,75 @@ msgstr "" "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:72 +#: authentication.py:71 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:75 +#: authentication.py:74 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:81 +#: authentication.py:80 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:98 +#: authentication.py:97 msgid "Invalid username/password." msgstr "" -#: authentication.py:101 authentication.py:188 +#: authentication.py:100 authentication.py:195 msgid "User inactive or deleted." msgstr "" -#: authentication.py:167 +#: authentication.py:173 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:170 +#: authentication.py:176 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:176 +#: authentication.py:182 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:185 +#: authentication.py:192 msgid "Invalid token." msgstr "" +#: authtoken/apps.py:7 +msgid "Auth Token" +msgstr "" + +#: authtoken/models.py:21 +msgid "Key" +msgstr "" + +#: authtoken/models.py:23 +msgid "User" +msgstr "" + +#: authtoken/models.py:24 +msgid "Created" +msgstr "" + +#: authtoken/models.py:33 +msgid "Token" +msgstr "" + +#: authtoken/models.py:34 +msgid "Tokens" +msgstr "" + +#: authtoken/serializers.py:8 +msgid "Username" +msgstr "" + +#: authtoken/serializers.py:9 +msgid "Password" +msgstr "" + #: authtoken/serializers.py:20 msgid "User account is disabled." msgstr "" @@ -108,7 +140,7 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:266 relations.py:195 relations.py:228 validators.py:79 +#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 #: validators.py:162 msgid "This field is required." msgstr "" @@ -126,7 +158,7 @@ msgstr "" msgid "This field may not be blank." msgstr "" -#: fields.py:670 fields.py:1656 +#: fields.py:670 fields.py:1664 #, python-brace-format msgid "Ensure this field has no more than {max_length} characters." msgstr "" @@ -212,137 +244,136 @@ msgstr "" msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1079 +#: fields.py:1082 #, python-brace-format msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1080 +#: fields.py:1083 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1148 +#: fields.py:1151 #, python-brace-format msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1207 +#: fields.py:1215 #, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1232 fields.py:1281 +#: fields.py:1240 fields.py:1289 #, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "" -#: fields.py:1235 relations.py:62 relations.py:431 +#: fields.py:1243 relations.py:71 relations.py:442 #, python-brace-format msgid "More than {count} items..." msgstr "" -#: fields.py:1282 fields.py:1429 relations.py:427 serializers.py:520 +#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 #, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1283 +#: fields.py:1291 msgid "This selection may not be empty." msgstr "" -#: fields.py:1320 +#: fields.py:1328 #, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1339 +#: fields.py:1347 msgid "No file was submitted." msgstr "" -#: fields.py:1340 +#: fields.py:1348 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1341 +#: fields.py:1349 msgid "No filename could be determined." msgstr "" -#: fields.py:1342 +#: fields.py:1350 msgid "The submitted file is empty." msgstr "" -#: fields.py:1343 +#: fields.py:1351 #, python-brace-format msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1391 +#: fields.py:1399 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: fields.py:1430 relations.py:428 serializers.py:521 +#: fields.py:1438 relations.py:439 serializers.py:521 msgid "This list may not be empty." msgstr "" -#: fields.py:1483 +#: fields.py:1491 #, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1530 +#: fields.py:1538 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html:5 +#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 msgid "Submit" msgstr "" #: pagination.py:189 -#, python-brace-format -msgid "Invalid page \"{page_number}\": {message}." +msgid "Invalid page." msgstr "" #: pagination.py:407 msgid "Invalid cursor" msgstr "" -#: relations.py:196 +#: relations.py:207 #, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" -#: relations.py:197 +#: relations.py:208 #, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" -#: relations.py:229 +#: relations.py:240 msgid "Invalid hyperlink - No URL match." msgstr "" -#: relations.py:230 +#: relations.py:241 msgid "Invalid hyperlink - Incorrect URL match." msgstr "" -#: relations.py:231 +#: relations.py:242 msgid "Invalid hyperlink - Object does not exist." msgstr "" -#: relations.py:232 +#: relations.py:243 #, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:391 +#: relations.py:402 #, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:392 +#: relations.py:403 msgid "Invalid value." msgstr "" diff --git a/rest_framework/locale/ca/LC_MESSAGES/django.mo b/rest_framework/locale/ca/LC_MESSAGES/django.mo index 06136491b8455aeedb64d6da2b84718255d46f0f..e9d5355e1f5641ec5e75b8c3d454e0b0b9fd0858 100644 GIT binary patch delta 1778 zcmYM!Sx8h-9LMp0>5QpqsikSwjP04r=#);HX_}VJlr2_N4?fw8Li(m}V z1|``;Py{xSJyx{$P((chEkw|Q?L@s)^!?3T>fqncId|@I&j0-HJsi3a48O=sJZ!X8 zL_Tq8xY-sAx%fvLon%&k8R$hnPQ_N7h&yl`9z$J!5y#^LEXE-$!rT#N_1J_>xG!$l z9@1IFft+NsI&8x=*oT$)6RWW_#Vm*&ScQYA-@jo93scP|V;5%P3DkrxILGfhen#Cd zYoys63!Amj(Tet+ z@e9^q)hO=6^R1gs9`4lvJdIk(0BQwK9KSioM~#lJ(2v@JCY+A#n2kN?#WR?NH!%^P zBFVBBSc>m4tW@P@#4jwu9L5dk!wsmdIf$CbW9Rp;&N!Kiwb#?I0_#y*vfUXEpceKH zbzTCq@uCMcfx0a6ucGMWz$}bn8NS4Im@$UQVTa=$EN6TQ?+jxLP!l`BvZvq`^x|{J zKRAuChgIqKCRD~cP|w?+L;fr1T;{+M{D{jiKuL#iFY5Qlj;YK>=hdV3um|VjeO!$$ zmRpG%(2o&p#oJhf`J_P;ZbsF}#xR`{I)@yuVjbhpsMo~D*($Cstj0cU#Amn)CryZ- zzYXUx9z?d)zN5}_v0Obkh$`}K)XGnyG8w){M^*eAbwPzEzM`E-z1d~t&u%&6H>ex^ zK;~%q-grs_s0Xce#=9N+Q46?^B*BJI6L1&Az8hgHr<1^eAf{joDkJMrE7^z2#BtOO zUSTc%LT%N&N%52(Kuzc@@@F@k@mtguCGbjVD{D|&v=#G}!}D}>!ClnKKA={TNyTWd zYf-7)k1D3yxE?>D9@xx9npis)2LoHj-FK@CwAf4w^cz&%dVkOHFrB z(-%VT-U=c}C|49^ECmqTE9J9J16mSMMevo3HO-J>w59B=EvGY^NGH^W6I$AQ4QR?Y z`)+QchM=g-MR*BShe}v`p{DAa6YItQ6#`$rSWZzd>rMlmGw# delta 1891 zcmaLXTWAzl9LMp0G#5=w)WjrOYdT51CF{o7=(=`utwznwOQR8cu^}~!Y%z(ND##iJ zv{2|nUo@Z;HBc!?L8Ad*T0%5vZSk?tmY^*PEoh;p4~4c+`~A&Mee8k%e$JVl%Q^q^ zpSjvG(&;@c%p5V=9^z%<%UNbe@a-&qXiknvyB6*=9)F*AnwI6jA2f$SsgZE2c|HNU!ne=m1ow8aje7- zu@FB;O=u!GJ{|ZRb-&7aW>NFZdgy3HBd8mHfgAA;Y{IqqtQrTg2FI}gAEC~h!PQvJ zL1k(;R^u_$@lkZ~YplV)unnu`n>Fx!8=}K8yN)m6WH6pat>_7AB?Sx8hET^_Q7b)! z+6oU>;YBRLyXfEpEW&><6AKrbkvuC!Z!Mh)I=WF8>cRw;;z@MzENYAHpeB;f$@;$< zHQt2U^B&xQDb&{72*yuP3oB<9Ia@{~ju1mrKdN9yrAT&HOiP$CZ@y4m^UL zIEnf{pIOKj)Ojgvz`OV=X0ps~Y{VFz#dUZe_n?-)2D(w1JLS<)v0OqG$2Wn0Vl(5_ zoTb+#i7KWstivC03l=Y<;P5SM#%oxQ&yel5Fw4|=ji?8IfGYOusD*pq(FxO;{YpBe z5mZ(8p)S0DTG?Zy4sDrZM%Tiq@pjY=_ak$*)5tCD66%2y!T4!lZh3kkRY+1i>!PEX z^dnie^EexCU@qQ7W#$%YMbA(f$*4#dRVy|zK7iV?Pm$!<@2CmQ=T)I=A=G#WYC-Se z20K6z(9vE^qb@9>LUe(PTG?*YN=~5m{4=b_8B|f#aMGLDje5WsvNF4m%Iq&^+OjIW z*XePA%_FuDyb}J`q8WLuUbNPrr#q!Ez^fnXQi9Di&=paa*?ILy(EyNr`Z;&#qf>(E6HZ0yF!T%@>whLmV0&|G40j>}WI`sSUd^C$cdf zT^DjAuA94SXSgeIJUNsc90<4czMqIYwQl6ad9ipjI{r>^|J=~j=)vSbuag`&J~etM O+1LAj&$?IkbN0VBQ_DaA diff --git a/rest_framework/locale/ca/LC_MESSAGES/django.po b/rest_framework/locale/ca/LC_MESSAGES/django.po index ce74a5f45..f23310d2c 100644 --- a/rest_framework/locale/ca/LC_MESSAGES/django.po +++ b/rest_framework/locale/ca/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-07 18:53+0100\n" -"PO-Revision-Date: 2015-12-07 17:55+0000\n" +"POT-Creation-Date: 2016-03-01 18:38+0100\n" +"PO-Revision-Date: 2016-03-01 17:38+0000\n" "Last-Translator: Xavier Ordoquy \n" "Language-Team: Catalan (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/ca/)\n" "MIME-Version: 1.0\n" @@ -17,43 +17,75 @@ msgstr "" "Language: ca\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:72 +#: authentication.py:71 msgid "Invalid basic header. No credentials provided." msgstr "Header Basic invàlid. No hi ha disponibles les credencials." -#: authentication.py:75 +#: authentication.py:74 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "Header Basic invàlid. Les credencials no poden contenir espais." -#: authentication.py:81 +#: authentication.py:80 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Header Basic invàlid. Les credencials no estan codificades correctament en base64." -#: authentication.py:98 +#: authentication.py:97 msgid "Invalid username/password." msgstr "Usuari/Contrasenya incorrectes." -#: authentication.py:101 authentication.py:188 +#: authentication.py:100 authentication.py:195 msgid "User inactive or deleted." msgstr "Usuari inactiu o esborrat." -#: authentication.py:167 +#: authentication.py:173 msgid "Invalid token header. No credentials provided." msgstr "Token header invàlid. No s'han indicat les credencials." -#: authentication.py:170 +#: authentication.py:176 msgid "Invalid token header. Token string should not contain spaces." msgstr "Token header invàlid. El token no ha de contenir espais." -#: authentication.py:176 +#: authentication.py:182 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "Token header invàlid. El token no pot contenir caràcters invàlids." -#: authentication.py:185 +#: authentication.py:192 msgid "Invalid token." msgstr "Token invàlid." +#: authtoken/apps.py:7 +msgid "Auth Token" +msgstr "" + +#: authtoken/models.py:21 +msgid "Key" +msgstr "" + +#: authtoken/models.py:23 +msgid "User" +msgstr "" + +#: authtoken/models.py:24 +msgid "Created" +msgstr "" + +#: authtoken/models.py:33 +msgid "Token" +msgstr "" + +#: authtoken/models.py:34 +msgid "Tokens" +msgstr "" + +#: authtoken/serializers.py:8 +msgid "Username" +msgstr "" + +#: authtoken/serializers.py:9 +msgid "Password" +msgstr "" + #: authtoken/serializers.py:20 msgid "User account is disabled." msgstr "Compte d'usuari desactivat." @@ -108,7 +140,7 @@ msgstr "Media type \"{media_type}\" no suportat." msgid "Request was throttled." msgstr "La petició ha estat limitada pel número màxim de peticions definit." -#: fields.py:266 relations.py:195 relations.py:228 validators.py:79 +#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 #: validators.py:162 msgid "This field is required." msgstr "Aquest camp és obligatori." @@ -126,7 +158,7 @@ msgstr "\"{input}\" no és un booleà." msgid "This field may not be blank." msgstr "Aquest camp no pot estar en blanc." -#: fields.py:670 fields.py:1656 +#: fields.py:670 fields.py:1664 #, python-brace-format msgid "Ensure this field has no more than {max_length} characters." msgstr "Aquest camp no pot tenir més de {max_length} caràcters." @@ -212,137 +244,136 @@ msgstr "El Datetime té un format incorrecte. Utilitzi un d'aquests formats: {fo msgid "Expected a datetime but got a date." msgstr "S'espera un Datetime però s'ha rebut un Date." -#: fields.py:1079 +#: fields.py:1082 #, python-brace-format msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "El Date té un format incorrecte. Utilitzi un d'aquests formats: {format}." -#: fields.py:1080 +#: fields.py:1083 msgid "Expected a date but got a datetime." msgstr "S'espera un Date però s'ha rebut un Datetime." -#: fields.py:1148 +#: fields.py:1151 #, python-brace-format msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "El Time té un format incorrecte. Utilitzi un d'aquests formats: {format}." -#: fields.py:1207 +#: fields.py:1215 #, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "La durada té un format incorrecte. Utilitzi un d'aquests formats: {format}." -#: fields.py:1232 fields.py:1281 +#: fields.py:1240 fields.py:1289 #, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" no és una opció vàlida." -#: fields.py:1235 relations.py:62 relations.py:431 +#: fields.py:1243 relations.py:71 relations.py:442 #, python-brace-format msgid "More than {count} items..." msgstr "" -#: fields.py:1282 fields.py:1429 relations.py:427 serializers.py:520 +#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 #, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." msgstr "S'espera una llista d'ítems però s'ha rebut el tipus \"{input_type}\"." -#: fields.py:1283 +#: fields.py:1291 msgid "This selection may not be empty." msgstr "Aquesta selecció no pot estar buida." -#: fields.py:1320 +#: fields.py:1328 #, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "\"{input}\" no és un path vàlid." -#: fields.py:1339 +#: fields.py:1347 msgid "No file was submitted." msgstr "No s'ha enviat cap fitxer." -#: fields.py:1340 +#: fields.py:1348 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "Les dades enviades no són un fitxer. Comproveu l'encoding type del formulari." -#: fields.py:1341 +#: fields.py:1349 msgid "No filename could be determined." msgstr "No s'ha pogut determinar el nom del fitxer." -#: fields.py:1342 +#: fields.py:1350 msgid "The submitted file is empty." msgstr "El fitxer enviat està buit." -#: fields.py:1343 +#: fields.py:1351 #, python-brace-format msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "El nom del fitxer ha de tenir com a màxim {max_length} caràcters (en té {length})." -#: fields.py:1391 +#: fields.py:1399 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "Envieu una imatge vàlida. El fitxer enviat no és una imatge o és una imatge corrompuda." -#: fields.py:1430 relations.py:428 serializers.py:521 +#: fields.py:1438 relations.py:439 serializers.py:521 msgid "This list may not be empty." msgstr "Aquesta llista no pot estar buida." -#: fields.py:1483 +#: fields.py:1491 #, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "S'espera un diccionari però s'ha rebut el tipus \"{input_type}\"." -#: fields.py:1530 +#: fields.py:1538 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html:5 +#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 msgid "Submit" msgstr "" #: pagination.py:189 -#, python-brace-format -msgid "Invalid page \"{page_number}\": {message}." -msgstr "Pàgina invàlida \"{page_number}\": {message}." +msgid "Invalid page." +msgstr "" #: pagination.py:407 msgid "Invalid cursor" msgstr "Cursor invàlid." -#: relations.py:196 +#: relations.py:207 #, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "PK invàlida \"{pk_value}\" - l'objecte no existeix." -#: relations.py:197 +#: relations.py:208 #, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Tipus incorrecte. S'espera el valor d'una PK, s'ha rebut {data_type}." -#: relations.py:229 +#: relations.py:240 msgid "Invalid hyperlink - No URL match." msgstr "Hyperlink invàlid - Cap match d'URL." -#: relations.py:230 +#: relations.py:241 msgid "Invalid hyperlink - Incorrect URL match." msgstr "Hyperlink invàlid - Match d'URL incorrecta." -#: relations.py:231 +#: relations.py:242 msgid "Invalid hyperlink - Object does not exist." msgstr "Hyperlink invàlid - L'objecte no existeix." -#: relations.py:232 +#: relations.py:243 #, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Tipus incorrecte. S'espera una URL, s'ha rebut {data_type}." -#: relations.py:391 +#: relations.py:402 #, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "L'objecte amb {slug_name}={value} no existeix." -#: relations.py:392 +#: relations.py:403 msgid "Invalid value." msgstr "Valor invàlid." diff --git a/rest_framework/locale/ca_ES/LC_MESSAGES/django.mo b/rest_framework/locale/ca_ES/LC_MESSAGES/django.mo index 5c2dd5baaa80fcaa53006459b11bf6172a69b04e..96a0b1ebb8a981b8d762b8c0e8319ee1e54c53a6 100644 GIT binary patch delta 41 ncmbQhGJ$2n1YR>;17lqSLj^+%D`Sg^bEOdi=0JgsN4*&V+X@PC delta 41 pcmbQhGJ$2n1YT2JLnB=Sa|J^SD^uf%bEOdi=2oVr8;^Q30sz~93U>ei diff --git a/rest_framework/locale/ca_ES/LC_MESSAGES/django.po b/rest_framework/locale/ca_ES/LC_MESSAGES/django.po index fad1d9024..c4f9df6cb 100644 --- a/rest_framework/locale/ca_ES/LC_MESSAGES/django.po +++ b/rest_framework/locale/ca_ES/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-07 18:53+0100\n" -"PO-Revision-Date: 2015-12-07 17:55+0000\n" +"POT-Creation-Date: 2016-03-01 18:38+0100\n" +"PO-Revision-Date: 2016-03-01 17:38+0000\n" "Last-Translator: Xavier Ordoquy \n" "Language-Team: Catalan (Spain) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/ca_ES/)\n" "MIME-Version: 1.0\n" @@ -17,43 +17,75 @@ msgstr "" "Language: ca_ES\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:72 +#: authentication.py:71 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:75 +#: authentication.py:74 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:81 +#: authentication.py:80 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:98 +#: authentication.py:97 msgid "Invalid username/password." msgstr "" -#: authentication.py:101 authentication.py:188 +#: authentication.py:100 authentication.py:195 msgid "User inactive or deleted." msgstr "" -#: authentication.py:167 +#: authentication.py:173 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:170 +#: authentication.py:176 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:176 +#: authentication.py:182 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:185 +#: authentication.py:192 msgid "Invalid token." msgstr "" +#: authtoken/apps.py:7 +msgid "Auth Token" +msgstr "" + +#: authtoken/models.py:21 +msgid "Key" +msgstr "" + +#: authtoken/models.py:23 +msgid "User" +msgstr "" + +#: authtoken/models.py:24 +msgid "Created" +msgstr "" + +#: authtoken/models.py:33 +msgid "Token" +msgstr "" + +#: authtoken/models.py:34 +msgid "Tokens" +msgstr "" + +#: authtoken/serializers.py:8 +msgid "Username" +msgstr "" + +#: authtoken/serializers.py:9 +msgid "Password" +msgstr "" + #: authtoken/serializers.py:20 msgid "User account is disabled." msgstr "" @@ -108,7 +140,7 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:266 relations.py:195 relations.py:228 validators.py:79 +#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 #: validators.py:162 msgid "This field is required." msgstr "" @@ -126,7 +158,7 @@ msgstr "" msgid "This field may not be blank." msgstr "" -#: fields.py:670 fields.py:1656 +#: fields.py:670 fields.py:1664 #, python-brace-format msgid "Ensure this field has no more than {max_length} characters." msgstr "" @@ -212,137 +244,136 @@ msgstr "" msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1079 +#: fields.py:1082 #, python-brace-format msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1080 +#: fields.py:1083 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1148 +#: fields.py:1151 #, python-brace-format msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1207 +#: fields.py:1215 #, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1232 fields.py:1281 +#: fields.py:1240 fields.py:1289 #, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "" -#: fields.py:1235 relations.py:62 relations.py:431 +#: fields.py:1243 relations.py:71 relations.py:442 #, python-brace-format msgid "More than {count} items..." msgstr "" -#: fields.py:1282 fields.py:1429 relations.py:427 serializers.py:520 +#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 #, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1283 +#: fields.py:1291 msgid "This selection may not be empty." msgstr "" -#: fields.py:1320 +#: fields.py:1328 #, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1339 +#: fields.py:1347 msgid "No file was submitted." msgstr "" -#: fields.py:1340 +#: fields.py:1348 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1341 +#: fields.py:1349 msgid "No filename could be determined." msgstr "" -#: fields.py:1342 +#: fields.py:1350 msgid "The submitted file is empty." msgstr "" -#: fields.py:1343 +#: fields.py:1351 #, python-brace-format msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1391 +#: fields.py:1399 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: fields.py:1430 relations.py:428 serializers.py:521 +#: fields.py:1438 relations.py:439 serializers.py:521 msgid "This list may not be empty." msgstr "" -#: fields.py:1483 +#: fields.py:1491 #, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1530 +#: fields.py:1538 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html:5 +#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 msgid "Submit" msgstr "" #: pagination.py:189 -#, python-brace-format -msgid "Invalid page \"{page_number}\": {message}." +msgid "Invalid page." msgstr "" #: pagination.py:407 msgid "Invalid cursor" msgstr "" -#: relations.py:196 +#: relations.py:207 #, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" -#: relations.py:197 +#: relations.py:208 #, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" -#: relations.py:229 +#: relations.py:240 msgid "Invalid hyperlink - No URL match." msgstr "" -#: relations.py:230 +#: relations.py:241 msgid "Invalid hyperlink - Incorrect URL match." msgstr "" -#: relations.py:231 +#: relations.py:242 msgid "Invalid hyperlink - Object does not exist." msgstr "" -#: relations.py:232 +#: relations.py:243 #, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:391 +#: relations.py:402 #, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:392 +#: relations.py:403 msgid "Invalid value." msgstr "" diff --git a/rest_framework/locale/cs/LC_MESSAGES/django.mo b/rest_framework/locale/cs/LC_MESSAGES/django.mo index f0dc3dfcf4d6a44d050affcc7d5be2e8bd3c53e5..459b3f01f444090391c6d45f9f44edd71036c949 100644 GIT binary patch delta 1558 zcmYM!OGs2v9LMp$=4e)9zS2sk#ACcwc(VbVPT-5ylW3NQz39ea+<;@a7Q?9PUSke^!BTW2nU$ayTk$Bi;S{#xBDRW9N$K1`cCB$7f?sqSkqi)%XWDW7W#& zdWW!<``b8!W=_08Kc=iQE5kla!4a&*tGE?kp(3(`MVRR{tH5T|b*HfrZ=s;S#zrd9@i2Wkpzy)u{6Wn2qOA8yiD~ zd_Of5BG%&+w%`ZU!fwJu`t2mD z7%w2%u{*d8pP)AM5mlsd6p*SuADOZa)chbSWx>k~_}Ejv6ykTti(qlAq8m7|7k#LO zFY&b<@8UlEgj(3+j@C#w^08xlsc5fYBZjdVf1)1D!!8Q+{-0n_$HX;M?&eUD$RG?p z^kW~MMNZiqR^fN#V+G_T4z-3-r25bX)wEs{T@m)u)hL9eQV%E@HFTaWQo1FmZL5kLbTw^TP47TF zJ)Pb{kNxFF5?sx(S_a)0`s^r7Q@ZrFsm`bd^M_oC*{&Uo)D&wq#nw&N>(LqRO-xD( ok2n_`PG4z-x3t3J_SDvSYeUB~a{kZMFcS`CbSH!i4mQij z3RHjF(9igGo|946m8n{X%|M?ap%srVEXktCPdbj(AwhtY$3Q15qQ5TBs> z8OdQR=A*95IOH z8fs$qP@(^Y8m}^)`0IhqoT#A%mBW)b8?T~5{xNZ#JG^fNwK$XZU8vli#{ztZUd&|H zYq1i?;OT@nv54zleAUk^Era+ggzq!^R-Bn-Hi2tD>c!Qll{cX_TN_Tsi|EGtSb;yW z8bd656}I6*e2v=7(^#b@+J;JT52}6SXyUIN?Wgy7coTQvSL9vW!Yp#I1vT>yRB9fe z-usN&WW^+QA~vFSc^fXnN4N&_2&>xnqsHk*vOxTa`(jMT8CZ)7?P1iwH?SCApax1O zJY`so8sI3hE$lgJ6MjIlWf_ER8s?!UR)gBKQPfv(40+UAuP1KwqH^~I`Po$7QmCtt z55uCU0ruevJd6D7Glw~t_I&mMEo=KY32beK)4zW?={Xk{IkhtDv8 zzfn015C%o$AkM}sxDwwYk63_w%))g@lO4x?s6Le{MOFQ&C z_#cIuwQ|kAjH*&jWsh32E-0igzHt|!RfD z!Qxw3OHhJSs47~5ioT~LDxZoipeFu~@teEe(-ajHUx! zLD#z!pU>?ra(hY~uRq``F7S9go~gguG)<7 ez`{=F_R;#-jz%ZeytDgEbo<`_4R&Vyh15S5YQBH~ diff --git a/rest_framework/locale/cs/LC_MESSAGES/django.po b/rest_framework/locale/cs/LC_MESSAGES/django.po index 15cb86c80..43c571130 100644 --- a/rest_framework/locale/cs/LC_MESSAGES/django.po +++ b/rest_framework/locale/cs/LC_MESSAGES/django.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-07 18:53+0100\n" -"PO-Revision-Date: 2015-12-07 17:55+0000\n" +"POT-Creation-Date: 2016-03-01 18:38+0100\n" +"PO-Revision-Date: 2016-03-01 17:38+0000\n" "Last-Translator: Xavier Ordoquy \n" "Language-Team: Czech (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/cs/)\n" "MIME-Version: 1.0\n" @@ -19,43 +19,75 @@ msgstr "" "Language: cs\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: authentication.py:72 +#: authentication.py:71 msgid "Invalid basic header. No credentials provided." msgstr "Chybná hlavička. Nebyly poskytnuty přihlašovací údaje." -#: authentication.py:75 +#: authentication.py:74 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "Chybná hlavička. Přihlašovací údaje by neměly obsahovat mezery." -#: authentication.py:81 +#: authentication.py:80 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Chybná hlavička. Přihlašovací údaje nebyly správně zakódovány pomocí base64." -#: authentication.py:98 +#: authentication.py:97 msgid "Invalid username/password." msgstr "Chybné uživatelské jméno nebo heslo." -#: authentication.py:101 authentication.py:188 +#: authentication.py:100 authentication.py:195 msgid "User inactive or deleted." msgstr "Uživatelský účet je neaktivní nebo byl smazán." -#: authentication.py:167 +#: authentication.py:173 msgid "Invalid token header. No credentials provided." msgstr "Chybná hlavička tokenu. Nebyly zadány přihlašovací údaje." -#: authentication.py:170 +#: authentication.py:176 msgid "Invalid token header. Token string should not contain spaces." msgstr "Chybná hlavička tokenu. Přihlašovací údaje by neměly obsahovat mezery." -#: authentication.py:176 +#: authentication.py:182 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:185 +#: authentication.py:192 msgid "Invalid token." msgstr "Chybný token." +#: authtoken/apps.py:7 +msgid "Auth Token" +msgstr "" + +#: authtoken/models.py:21 +msgid "Key" +msgstr "" + +#: authtoken/models.py:23 +msgid "User" +msgstr "" + +#: authtoken/models.py:24 +msgid "Created" +msgstr "" + +#: authtoken/models.py:33 +msgid "Token" +msgstr "" + +#: authtoken/models.py:34 +msgid "Tokens" +msgstr "" + +#: authtoken/serializers.py:8 +msgid "Username" +msgstr "" + +#: authtoken/serializers.py:9 +msgid "Password" +msgstr "" + #: authtoken/serializers.py:20 msgid "User account is disabled." msgstr "Uživatelský účet je uzamčen." @@ -110,7 +142,7 @@ msgstr "Nepodporovaný media type \"{media_type}\" v požadavku." msgid "Request was throttled." msgstr "Požadavek byl limitován kvůli omezení počtu požadavků za časovou periodu." -#: fields.py:266 relations.py:195 relations.py:228 validators.py:79 +#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 #: validators.py:162 msgid "This field is required." msgstr "Toto pole je vyžadováno." @@ -128,7 +160,7 @@ msgstr "\"{input}\" nelze použít jako typ boolean." msgid "This field may not be blank." msgstr "Toto pole nesmí být prázdné." -#: fields.py:670 fields.py:1656 +#: fields.py:670 fields.py:1664 #, python-brace-format msgid "Ensure this field has no more than {max_length} characters." msgstr "Zkontrolujte, že toto pole není delší než {max_length} znaků." @@ -214,137 +246,136 @@ msgstr "Chybný formát data a času. Použijte jeden z těchto formátů: {form msgid "Expected a datetime but got a date." msgstr "Bylo zadáno pouze datum bez času." -#: fields.py:1079 +#: fields.py:1082 #, python-brace-format msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "Chybný formát data. Použijte jeden z těchto formátů: {format}." -#: fields.py:1080 +#: fields.py:1083 msgid "Expected a date but got a datetime." msgstr "Bylo zadáno datum a čas, místo samotného data." -#: fields.py:1148 +#: fields.py:1151 #, python-brace-format msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "Chybný formát času. Použijte jeden z těchto formátů: {format}." -#: fields.py:1207 +#: fields.py:1215 #, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1232 fields.py:1281 +#: fields.py:1240 fields.py:1289 #, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" není platnou možností." -#: fields.py:1235 relations.py:62 relations.py:431 +#: fields.py:1243 relations.py:71 relations.py:442 #, python-brace-format msgid "More than {count} items..." msgstr "" -#: fields.py:1282 fields.py:1429 relations.py:427 serializers.py:520 +#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 #, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Byl očekáván seznam položek ale nalezen \"{input_type}\"." -#: fields.py:1283 +#: fields.py:1291 msgid "This selection may not be empty." msgstr "" -#: fields.py:1320 +#: fields.py:1328 #, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1339 +#: fields.py:1347 msgid "No file was submitted." msgstr "Nebyl zaslán žádný soubor." -#: fields.py:1340 +#: fields.py:1348 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "Zaslaná data neobsahují soubor. Zkontrolujte typ kódování ve formuláři." -#: fields.py:1341 +#: fields.py:1349 msgid "No filename could be determined." msgstr "Nebylo možné zjistit jméno souboru." -#: fields.py:1342 +#: fields.py:1350 msgid "The submitted file is empty." msgstr "Zaslaný soubor je prázdný." -#: fields.py:1343 +#: fields.py:1351 #, python-brace-format msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "Zajistěte, aby jméno souboru obsahovalo maximálně {max_length} znaků (teď má {length} znaků)." -#: fields.py:1391 +#: fields.py:1399 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "Nahrajte platný obrázek. Nahraný soubor buď není obrázkem nebo je poškozen." -#: fields.py:1430 relations.py:428 serializers.py:521 +#: fields.py:1438 relations.py:439 serializers.py:521 msgid "This list may not be empty." msgstr "" -#: fields.py:1483 +#: fields.py:1491 #, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "Byl očekáván slovník položek ale nalezen \"{input_type}\"." -#: fields.py:1530 +#: fields.py:1538 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html:5 +#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 msgid "Submit" msgstr "" #: pagination.py:189 -#, python-brace-format -msgid "Invalid page \"{page_number}\": {message}." -msgstr "Chybné čislo stránky \"{page_number}\": {message}." +msgid "Invalid page." +msgstr "" #: pagination.py:407 msgid "Invalid cursor" msgstr "Chybný kurzor." -#: relations.py:196 +#: relations.py:207 #, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Chybný primární klíč \"{pk_value}\" - objekt neexistuje." -#: relations.py:197 +#: relations.py:208 #, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Chybný typ. Byl přijat typ {data_type} místo hodnoty primárního klíče." -#: relations.py:229 +#: relations.py:240 msgid "Invalid hyperlink - No URL match." msgstr "Chybný odkaz - nebyla nalezena žádní shoda." -#: relations.py:230 +#: relations.py:241 msgid "Invalid hyperlink - Incorrect URL match." msgstr "Chybný odkaz - byla nalezena neplatná shoda." -#: relations.py:231 +#: relations.py:242 msgid "Invalid hyperlink - Object does not exist." msgstr "Chybný odkaz - objekt neexistuje." -#: relations.py:232 +#: relations.py:243 #, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Chybný typ. Byl přijat typ {data_type} místo očekávaného odkazu." -#: relations.py:391 +#: relations.py:402 #, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "Objekt s {slug_name}={value} neexistuje." -#: relations.py:392 +#: relations.py:403 msgid "Invalid value." msgstr "Chybná hodnota." diff --git a/rest_framework/locale/da/LC_MESSAGES/django.mo b/rest_framework/locale/da/LC_MESSAGES/django.mo index f6ac0f7d591fd6f98faae73be353464e85743a97..7820bdd3e93b02293df5e92d506df9ccfcbbc40e 100644 GIT binary patch delta 2273 zcmYk+TWl0n9LMp0FSLNP*p_lDwbPbb(QfIDQd)sRFHj1tb+Jl~DaD;Ro@ocIh|F?*p|KW@kMcnn+cGInFZ9cIlqi2D5q?!;Lv z$C5>6`Pha^s2_EH-1kk?{XW5U8tR{PaySv-i$PfnYJ_d52Su<6r*SiWi)~n(YgUaz z$j1)xrR$F2J$MB*b7_ms?!|Jf!5*x}1a@hvPt)0me>eTOK}(-d=3lnC?+!Ld`O4cwX?VuXOJ@4@2DI9jk-ZD z2U%Ew%dpBnZpRvqyHTY)h)VQx)OA<=r(_ zmb4OSM+XP77@x;_Jcyf^69kHiRnK2(H06HsMj+f{Dv? zl=%wox*dm6Q~Ew?@m)pT@K@A>s!CG3V>c?XXHkj2i_EHhkKOnO>H%9F%7-r?x!LRf z@flpLSIq@F`r$`pu$EDpdSR3xvuit1tKUU(wHHy_>m;%~>=KfjT|+j2Wl%r8yOtn3 z+g74#U5UJ6EQm_zF)Y#kAEBdN@Cqt{*HEkfG-}bDMa|I9NI7ji*~mU*khb6VCDf`u zg_`0yT!%#rQv>WnaUIbldA^;Zqgv0Q9$3rUXDfy@g&R>L)(%l)BD_^jzFzC| z-Ha*;FGz1@{L>y)d~5w^*J#J6u|PHcRLg=+LNlSZhiD}Rh)jan^hT@2#elsTVz*i^ zaeKR;1J${WP&w2zTPj66p&3-u8v5_~s`u?p3-4BYn9der2cd<@ogZs6M2LdjoLioAz~Bp2%+W>dLL*()g%Mi z2j&%aM%-w~8IDBbZfx8-QzoYu6{aWWa^Fs$-x~|LvB+q6>R?{gYIi91_!Ab4>x45o z6rFIL_}G{e9g2nBY70*68;Qh|pXPOBEbsSz9GMu8JNsN+8VNZ&g1tRcX@xK6GzMzw z12wfyZBui7)6|i|qW{mV=S*^@@Mczi@Z!0!tGr^amsZS8e!QwVJy~3GB7H${EJnUc zYo@fWk}H*zI~tz6cp?^xxTB66bB4!a&Ukz*R&8CQp>cOKl*}o6Bcr(AyTlpaKNNLz Sx$A_ViH0KKRC>oNYX1c!r3SnJ delta 2036 zcmaLXUu;ul7{~Ev?fx?7SYazN*v={-f7Y=wYq!p^vJDWn0SY4;V+3Io%;vw!g&E7a zm|Qp$W^yz{A$oyA76Kvkf-I0I8NsNDk_j=I$PF>kU;-*3APM^YwH3KAzRAo7H0rcHj%q17 zFz&|yo<>dR>)i3HIm;i&-meLx=9;}sM=SaSb>pwF84JtI+OZuw(ZvRw#0T+r)OmRf z7GfNgscpCz_vVhDz(&U3V*^erH(P@(*v9j1gbx4NS)7d*a^tJ075#}?NzL@Et*GNq zqgJ{HwH0Hi>yP6j_ytzsZ|Gogh1m>Tg!$NpE?Kk=I!mz^b;DuQh3{Yxk6XB}bWN}abzX7?`FH4ya6l9I7*!+}aR~-zQh3;j z&){x+2*1hs3oc{quQdBSkB6eJyUXlDxR}|6u@^NSLQUX9bZ{a_{^!#9fdfr=3m?UL zN?Log6?^a~_UeCB239eP81BO^Jf9nva(C5CC#uRvFpghh3l^~Kb=Z!ok$o;5rFsIj zhZk@GUPJ9+6?skIa%@Ex7vX7a#-DHn*02gqbPGO#$55HOiK?xI++5ekQ1?xtirzgy zM>9E#s^VW!Gp?*9a07PZ4%CBABK2rDkY`)IlO5OLJjM~!@y*B@EQR$rh9u9(Z7spKDbw=#_3jkSPEQp*TafN7 zo9V0Bn(TK%L$AQ|FYO+Dq5rkvP}~_B>`$dQG@R}!KkW1FR4nnrfnd5j(B=2WD@V(s z;mERZW6X&($D>VNqN@7eBe8fin%-G;yRf7$`NqKZT}fxa`)F2e`rzCOUu|mF_Wym_ Zq1qEZ@3~OK^Fr0>Q=xbL-ir&C{tZXh){g)H diff --git a/rest_framework/locale/da/LC_MESSAGES/django.po b/rest_framework/locale/da/LC_MESSAGES/django.po index 95bd0cb96..3d4e0ada2 100644 --- a/rest_framework/locale/da/LC_MESSAGES/django.po +++ b/rest_framework/locale/da/LC_MESSAGES/django.po @@ -3,14 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Mads Jensen , 2015 +# Mads Jensen , 2015-2016 # Mikkel Munch Mortensen <3xm@detfalskested.dk>, 2015 msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-07 18:53+0100\n" -"PO-Revision-Date: 2015-12-07 17:55+0000\n" +"POT-Creation-Date: 2016-03-01 18:38+0100\n" +"PO-Revision-Date: 2016-03-01 17:38+0000\n" "Last-Translator: Xavier Ordoquy \n" "Language-Team: Danish (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/da/)\n" "MIME-Version: 1.0\n" @@ -19,43 +19,75 @@ msgstr "" "Language: da\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:72 +#: authentication.py:71 msgid "Invalid basic header. No credentials provided." msgstr "Ugyldig basic header. Ingen legitimation angivet." -#: authentication.py:75 +#: authentication.py:74 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "Ugyldig basic header. Legitimationsstrenge må ikke indeholde mellemrum." -#: authentication.py:81 +#: authentication.py:80 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Ugyldig basic header. Legitimationen er ikke base64 encoded på korrekt vis." -#: authentication.py:98 +#: authentication.py:97 msgid "Invalid username/password." msgstr "Ugyldigt brugernavn/kodeord." -#: authentication.py:101 authentication.py:188 +#: authentication.py:100 authentication.py:195 msgid "User inactive or deleted." msgstr "Inaktiv eller slettet bruger." -#: authentication.py:167 +#: authentication.py:173 msgid "Invalid token header. No credentials provided." msgstr "Ugyldig token header." -#: authentication.py:170 +#: authentication.py:176 msgid "Invalid token header. Token string should not contain spaces." msgstr "Ugyldig token header. Token-strenge må ikke indeholde mellemrum." -#: authentication.py:176 +#: authentication.py:182 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "Ugyldig token header. Token streng bør ikke indeholde ugyldige karakterer." -#: authentication.py:185 +#: authentication.py:192 msgid "Invalid token." msgstr "Ugyldigt token." +#: authtoken/apps.py:7 +msgid "Auth Token" +msgstr "" + +#: authtoken/models.py:21 +msgid "Key" +msgstr "" + +#: authtoken/models.py:23 +msgid "User" +msgstr "" + +#: authtoken/models.py:24 +msgid "Created" +msgstr "" + +#: authtoken/models.py:33 +msgid "Token" +msgstr "" + +#: authtoken/models.py:34 +msgid "Tokens" +msgstr "" + +#: authtoken/serializers.py:8 +msgid "Username" +msgstr "" + +#: authtoken/serializers.py:9 +msgid "Password" +msgstr "" + #: authtoken/serializers.py:20 msgid "User account is disabled." msgstr "Brugerkontoen er deaktiveret." @@ -110,7 +142,7 @@ msgstr "Forespørgslens media type, \"{media_type}\", er ikke understøttet." msgid "Request was throttled." msgstr "Forespørgslen blev neddroslet." -#: fields.py:266 relations.py:195 relations.py:228 validators.py:79 +#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 #: validators.py:162 msgid "This field is required." msgstr "Dette felt er påkrævet." @@ -128,7 +160,7 @@ msgstr "\"{input}\" er ikke en tilladt boolsk værdi." msgid "This field may not be blank." msgstr "Dette felt må ikke være tomt." -#: fields.py:670 fields.py:1656 +#: fields.py:670 fields.py:1664 #, python-brace-format msgid "Ensure this field has no more than {max_length} characters." msgstr "Tjek at dette felt ikke indeholder flere end {max_length} tegn." @@ -214,137 +246,136 @@ msgstr "Datotid har et forkert format. Brug i stedet et af disse formater: {form msgid "Expected a datetime but got a date." msgstr "Forventede en datotid, men fik en dato." -#: fields.py:1079 +#: fields.py:1082 #, python-brace-format msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "Dato har et forkert format. Brug i stedet et af disse formater: {format}." -#: fields.py:1080 +#: fields.py:1083 msgid "Expected a date but got a datetime." msgstr "Forventede en dato men fik en datotid." -#: fields.py:1148 +#: fields.py:1151 #, python-brace-format msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "Klokkeslæt har forkert format. Brug i stedet et af disse formater: {format}. " -#: fields.py:1207 +#: fields.py:1215 #, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "Varighed har forkert format. Brug istedet et af følgende formater: {format}." -#: fields.py:1232 fields.py:1281 +#: fields.py:1240 fields.py:1289 #, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" er ikke et gyldigt valg." -#: fields.py:1235 relations.py:62 relations.py:431 +#: fields.py:1243 relations.py:71 relations.py:442 #, python-brace-format msgid "More than {count} items..." msgstr "Flere end {count} objekter..." -#: fields.py:1282 fields.py:1429 relations.py:427 serializers.py:520 +#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 #, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Forventede en liste, men fik noget af typen \"{input_type}\"." -#: fields.py:1283 +#: fields.py:1291 msgid "This selection may not be empty." msgstr "Dette valg kan være tomt." -#: fields.py:1320 +#: fields.py:1328 #, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "\"{input}\" er ikke et gyldigt valg af adresse." -#: fields.py:1339 +#: fields.py:1347 msgid "No file was submitted." msgstr "Ingen medsendt fil." -#: fields.py:1340 +#: fields.py:1348 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "Det medsendte data var ikke en fil. Tjek typen af indkodning på formularen." -#: fields.py:1341 +#: fields.py:1349 msgid "No filename could be determined." msgstr "Filnavnet kunne ikke afgøres." -#: fields.py:1342 +#: fields.py:1350 msgid "The submitted file is empty." msgstr "Den medsendte fil er tom." -#: fields.py:1343 +#: fields.py:1351 #, python-brace-format msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "Sørg for at filnavnet er højst {max_length} langt (det er {length})." -#: fields.py:1391 +#: fields.py:1399 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "Medsend et gyldigt billede. Den medsendte fil var enten ikke et billede eller billedfilen var ødelagt." -#: fields.py:1430 relations.py:428 serializers.py:521 +#: fields.py:1438 relations.py:439 serializers.py:521 msgid "This list may not be empty." msgstr "Denne liste er muligvis ikke tom." -#: fields.py:1483 +#: fields.py:1491 #, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "Forventede en dictionary, men fik noget af typen \"{input_type}\"." -#: fields.py:1530 +#: fields.py:1538 msgid "Value must be valid JSON." -msgstr "" +msgstr "Værdi skal være gyldig JSON." -#: filters.py:35 templates/rest_framework/filters/django_filter.html:5 +#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 msgid "Submit" -msgstr "" +msgstr "Indsend." #: pagination.py:189 -#, python-brace-format -msgid "Invalid page \"{page_number}\": {message}." -msgstr "Ugyldig side \"{page_number}\": {message}." +msgid "Invalid page." +msgstr "" #: pagination.py:407 msgid "Invalid cursor" msgstr "Ugyldig cursor" -#: relations.py:196 +#: relations.py:207 #, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Ugyldig primærnøgle \"{pk_value}\" - objektet findes ikke." -#: relations.py:197 +#: relations.py:208 #, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Ugyldig type. Forventet værdi er primærnøgle, fik {data_type}." -#: relations.py:229 +#: relations.py:240 msgid "Invalid hyperlink - No URL match." msgstr "Ugyldigt hyperlink - intet URL match." -#: relations.py:230 +#: relations.py:241 msgid "Invalid hyperlink - Incorrect URL match." msgstr "Ugyldigt hyperlink - forkert URL match." -#: relations.py:231 +#: relations.py:242 msgid "Invalid hyperlink - Object does not exist." msgstr "Ugyldigt hyperlink - objektet findes ikke." -#: relations.py:232 +#: relations.py:243 #, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Forkert type. Forventede en URL-streng, fik {data_type}." -#: relations.py:391 +#: relations.py:402 #, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "Object med {slug_name}={value} findes ikke." -#: relations.py:392 +#: relations.py:403 msgid "Invalid value." msgstr "Ugyldig værdi." @@ -356,20 +387,20 @@ msgstr "Ugyldig data. Forventede en dictionary, men fik {datatype}." #: templates/rest_framework/admin.html:118 #: templates/rest_framework/base.html:128 msgid "Filters" -msgstr "" +msgstr "Filtre" #: templates/rest_framework/filters/django_filter.html:2 #: templates/rest_framework/filters/django_filter_crispyforms.html:4 msgid "Field filters" -msgstr "" +msgstr "Søgefiltre" #: templates/rest_framework/filters/ordering.html:3 msgid "Ordering" -msgstr "" +msgstr "Sortering" #: templates/rest_framework/filters/search.html:2 msgid "Search" -msgstr "" +msgstr "Søg" #: templates/rest_framework/horizontal/radio.html:2 #: templates/rest_framework/inline/radio.html:2 diff --git a/rest_framework/locale/da_DK/LC_MESSAGES/django.mo b/rest_framework/locale/da_DK/LC_MESSAGES/django.mo index 78170eeb6040287c2812b6f909fbc876fbac9462..0e1cc36efce4bf67188b4092a8d23fca1d107dfb 100644 GIT binary patch delta 41 ncmbQpGLdD%1YR>;17lqSLj^+%D`Sg^bEOdi=0JgsM|~Ip+gu8C delta 41 pcmbQpGLdD%1YT2JLnB=Sa|J^SD^uf%bEOdi=2oVr8;|-h0s!063VHwl diff --git a/rest_framework/locale/da_DK/LC_MESSAGES/django.po b/rest_framework/locale/da_DK/LC_MESSAGES/django.po index c198cfdf6..7ec27dee2 100644 --- a/rest_framework/locale/da_DK/LC_MESSAGES/django.po +++ b/rest_framework/locale/da_DK/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-07 18:53+0100\n" -"PO-Revision-Date: 2015-12-07 17:55+0000\n" +"POT-Creation-Date: 2016-03-01 18:38+0100\n" +"PO-Revision-Date: 2016-03-01 17:38+0000\n" "Last-Translator: Xavier Ordoquy \n" "Language-Team: Danish (Denmark) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/da_DK/)\n" "MIME-Version: 1.0\n" @@ -17,43 +17,75 @@ msgstr "" "Language: da_DK\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:72 +#: authentication.py:71 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:75 +#: authentication.py:74 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:81 +#: authentication.py:80 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:98 +#: authentication.py:97 msgid "Invalid username/password." msgstr "" -#: authentication.py:101 authentication.py:188 +#: authentication.py:100 authentication.py:195 msgid "User inactive or deleted." msgstr "" -#: authentication.py:167 +#: authentication.py:173 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:170 +#: authentication.py:176 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:176 +#: authentication.py:182 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:185 +#: authentication.py:192 msgid "Invalid token." msgstr "" +#: authtoken/apps.py:7 +msgid "Auth Token" +msgstr "" + +#: authtoken/models.py:21 +msgid "Key" +msgstr "" + +#: authtoken/models.py:23 +msgid "User" +msgstr "" + +#: authtoken/models.py:24 +msgid "Created" +msgstr "" + +#: authtoken/models.py:33 +msgid "Token" +msgstr "" + +#: authtoken/models.py:34 +msgid "Tokens" +msgstr "" + +#: authtoken/serializers.py:8 +msgid "Username" +msgstr "" + +#: authtoken/serializers.py:9 +msgid "Password" +msgstr "" + #: authtoken/serializers.py:20 msgid "User account is disabled." msgstr "" @@ -108,7 +140,7 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:266 relations.py:195 relations.py:228 validators.py:79 +#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 #: validators.py:162 msgid "This field is required." msgstr "" @@ -126,7 +158,7 @@ msgstr "" msgid "This field may not be blank." msgstr "" -#: fields.py:670 fields.py:1656 +#: fields.py:670 fields.py:1664 #, python-brace-format msgid "Ensure this field has no more than {max_length} characters." msgstr "" @@ -212,137 +244,136 @@ msgstr "" msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1079 +#: fields.py:1082 #, python-brace-format msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1080 +#: fields.py:1083 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1148 +#: fields.py:1151 #, python-brace-format msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1207 +#: fields.py:1215 #, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1232 fields.py:1281 +#: fields.py:1240 fields.py:1289 #, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "" -#: fields.py:1235 relations.py:62 relations.py:431 +#: fields.py:1243 relations.py:71 relations.py:442 #, python-brace-format msgid "More than {count} items..." msgstr "" -#: fields.py:1282 fields.py:1429 relations.py:427 serializers.py:520 +#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 #, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1283 +#: fields.py:1291 msgid "This selection may not be empty." msgstr "" -#: fields.py:1320 +#: fields.py:1328 #, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1339 +#: fields.py:1347 msgid "No file was submitted." msgstr "" -#: fields.py:1340 +#: fields.py:1348 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1341 +#: fields.py:1349 msgid "No filename could be determined." msgstr "" -#: fields.py:1342 +#: fields.py:1350 msgid "The submitted file is empty." msgstr "" -#: fields.py:1343 +#: fields.py:1351 #, python-brace-format msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1391 +#: fields.py:1399 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: fields.py:1430 relations.py:428 serializers.py:521 +#: fields.py:1438 relations.py:439 serializers.py:521 msgid "This list may not be empty." msgstr "" -#: fields.py:1483 +#: fields.py:1491 #, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1530 +#: fields.py:1538 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html:5 +#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 msgid "Submit" msgstr "" #: pagination.py:189 -#, python-brace-format -msgid "Invalid page \"{page_number}\": {message}." +msgid "Invalid page." msgstr "" #: pagination.py:407 msgid "Invalid cursor" msgstr "" -#: relations.py:196 +#: relations.py:207 #, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" -#: relations.py:197 +#: relations.py:208 #, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" -#: relations.py:229 +#: relations.py:240 msgid "Invalid hyperlink - No URL match." msgstr "" -#: relations.py:230 +#: relations.py:241 msgid "Invalid hyperlink - Incorrect URL match." msgstr "" -#: relations.py:231 +#: relations.py:242 msgid "Invalid hyperlink - Object does not exist." msgstr "" -#: relations.py:232 +#: relations.py:243 #, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:391 +#: relations.py:402 #, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:392 +#: relations.py:403 msgid "Invalid value." msgstr "" diff --git a/rest_framework/locale/de/LC_MESSAGES/django.mo b/rest_framework/locale/de/LC_MESSAGES/django.mo index 0c1034bb047c2a0899cf7fd5ae0b9e8388647a6f..ce4458e0019ecbb7a953ea7b87b69c1cbad72051 100644 GIT binary patch delta 2010 zcmYM#TWnNC9LMqh!n(`Fw%Y1eS_-Ev<)YoXrL>enVb?C#rG+Zgwm#5?OWY`Iz<`iI zPSo_pkcioUkq`-y2MGxg_d&cQL@@S+2I5OeiUfSJfsgu>^RVa*h?moSC;eLq&> z`xwVO*5gn38s5WI*f`bGwf!_!GjI`;7@cO;gKKaxp2Vd%iWw}MZq|ldP=7y;>+x5t z#o5oAm0|~KLOrPQ_X0md-R}o%)>0qSC}JSa7mKo`s1xH|)TwVzUMu zL_T(eFI{&M=i_zM&V@?MUdCEXU>7!^i)*#j=V-L!pU7{ln|fHz=kP z!8$C*`k=#TEQ>40sqAT?Bwa2@EmT&$*iUe`>+?k!nGJ;b)A@TX$;W#99QDs zn8qagryC5RRyc;*nW8FxBJ*(>{m#ITaUK0()bT1M5fsusRLHg=i?(+#g&$xmx|eBa zCKIR|tefp0tD{J`Yy^{d3$=ySj-S1oP`UCEHe&%5%5l{Fs@Xo>FNdU$eUE(XO3=TD zaqm^besgbY2<$>-?Jm?-A4C1{EV4N^g7r9#d@RP%P=5)s2HSyJ@ep#L>@aGgCr~?b z1xYI##VVcuJ2dpNn@WJSMJ1>U>u@5rm= zGw1r(wWB7!1)F)keMmz|a{-&Mh~>9q3g1Q-wemmE!7v%AmDZuQJdGjzzvvz+TD=ye zIBR07sm#R-BY4m3+xlrk&CaL|@FqLq4@5ct{|6jh0+^RBXw&iy3J>V?cpYvPEceA^4`?7-#TXQ=LW3h^9 Kg_`P%(fDFqW_Hgx zGynO|;g8;PeVK1p<{mZ5F6x!k-xir=@bqFnD5rvE<@hN&IFDE3(j{hVFoGr6hr0e= zEW<+>!fC9+GuVn3u^n43b=U8e+|3v zJg&nHOU+hd95tamsPTioFQe`^i%~5#xXg?{YvO~&Stn|RanyqjU_HKtoAGD72}8@x zs__Bj&tBj|zdM1~;g6`u737<($6D0*ZmhvWSglaMOXFso!zK)`@NPJYrSu>6`^Qi# zc?Gqy)4mt{@j!vM^7W{#X+m9p2VRR0Vi7)%4!(n#LKD#D@{)zfsDGyUWg36JeLgIe|jr$nTULHsFzedfx z;BxPWRp`*)ikesol}yL562HMPE?H$ZfHAxRpZ0y-_Y_7LKaZc}n5`-z{_YK!-c`B* zsjNK;VFmW1_V9o|{tW7OCy{5`1=NHuVh=`n>L5jYn`NeuvufO&Q{_ zoyI{N#53525#qE3A41*WL(~cjS9_6ZLrr858*$3_Biu&+FVr#HMj~iSkD#{fS!D4x zjV+jYk48O>1=K|9)_OO16tyLvA=_t*9q)LSph7r+)%YZ8OWwySoX04Z5H?-kjk@pS zsEM6L(#qBnUYZ#T)6hU1LzqOKX<6SHRQ7&}3i$$Zp{?L3D2XDd2X`Z1*@WMJ4q21U zqE`MB=HsuZ3Fi>LJe~hA4f4$zk*HZO>g6|r3e`9&gop7)Jc_sBS=2HC{45g5^Blj?>W0PohFMhf1E+EV~xd*n}_PUi==l^6g}*gDKQX z52HfbgvLfu8prLte{hIJv4ao@eg z*h~FyQHb~-;>K8EP$4V<_kgx#&jo5TI(n_tPO5T7Maju&bPI26_XVZ{q2yKxdbp=d z+a9O(P?ZuYeI9l_DnBowYIkB(9dYG0hgW5}n^*m`Hd6<(F9r*9!?dys!P1#8f>XgY ziF=Yx#l-z^*U0{TL&@}HMa-GlmmC{oXmX}2e=e{r8VW~3H5;99eJom=Z7wS7@J8x2 z5{XvUQ1ZGGW8BPv`aAJHk9dp_fL#f1w)B5oTckdlerk%z;?m+X<{-irlof@5) UE-K9{cjC#^`2Wu0O=mXvH`B1{d;kCd diff --git a/rest_framework/locale/de/LC_MESSAGES/django.po b/rest_framework/locale/de/LC_MESSAGES/django.po index 3fc38afb0..c30dd7555 100644 --- a/rest_framework/locale/de/LC_MESSAGES/django.po +++ b/rest_framework/locale/de/LC_MESSAGES/django.po @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-07 18:53+0100\n" -"PO-Revision-Date: 2015-12-08 18:25+0000\n" -"Last-Translator: Fabian Büchler \n" +"POT-Creation-Date: 2016-03-01 18:38+0100\n" +"PO-Revision-Date: 2016-03-01 17:38+0000\n" +"Last-Translator: Xavier Ordoquy \n" "Language-Team: German (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -23,43 +23,75 @@ msgstr "" "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:72 +#: authentication.py:71 msgid "Invalid basic header. No credentials provided." msgstr "Ungültiger basic header. Keine Zugangsdaten angegeben." -#: authentication.py:75 +#: authentication.py:74 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "Ungültiger basic header. Zugangsdaten sollen keine Leerzeichen enthalten." -#: authentication.py:81 +#: authentication.py:80 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Ungültiger basic header. Zugangsdaten sind nicht korrekt mit base64 kodiert." -#: authentication.py:98 +#: authentication.py:97 msgid "Invalid username/password." msgstr "Ungültiger Benutzername/Passwort" -#: authentication.py:101 authentication.py:188 +#: authentication.py:100 authentication.py:195 msgid "User inactive or deleted." msgstr "Benutzer inaktiv oder gelöscht." -#: authentication.py:167 +#: authentication.py:173 msgid "Invalid token header. No credentials provided." msgstr "Ungültiger token header. Keine Zugangsdaten angegeben." -#: authentication.py:170 +#: authentication.py:176 msgid "Invalid token header. Token string should not contain spaces." msgstr "Ungültiger token header. Zugangsdaten sollen keine Leerzeichen enthalten." -#: authentication.py:176 +#: authentication.py:182 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "Ungültiger Token Header. Tokens dürfen keine ungültigen Zeichen enthalten." -#: authentication.py:185 +#: authentication.py:192 msgid "Invalid token." msgstr "Ungültiges Token" +#: authtoken/apps.py:7 +msgid "Auth Token" +msgstr "" + +#: authtoken/models.py:21 +msgid "Key" +msgstr "" + +#: authtoken/models.py:23 +msgid "User" +msgstr "" + +#: authtoken/models.py:24 +msgid "Created" +msgstr "" + +#: authtoken/models.py:33 +msgid "Token" +msgstr "" + +#: authtoken/models.py:34 +msgid "Tokens" +msgstr "" + +#: authtoken/serializers.py:8 +msgid "Username" +msgstr "" + +#: authtoken/serializers.py:9 +msgid "Password" +msgstr "" + #: authtoken/serializers.py:20 msgid "User account is disabled." msgstr "Benutzerkonto ist gesperrt." @@ -114,7 +146,7 @@ msgstr "Nicht unterstützter Medientyp \"{media_type}\" in der Anfrage." msgid "Request was throttled." msgstr "Die Anfrage wurde gedrosselt." -#: fields.py:266 relations.py:195 relations.py:228 validators.py:79 +#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 #: validators.py:162 msgid "This field is required." msgstr "Dieses Feld ist erforderlich." @@ -132,7 +164,7 @@ msgstr "\"{input}\" ist kein gültiger Wahrheitswert." msgid "This field may not be blank." msgstr "Dieses Feld darf nicht leer sein." -#: fields.py:670 fields.py:1656 +#: fields.py:670 fields.py:1664 #, python-brace-format msgid "Ensure this field has no more than {max_length} characters." msgstr "Stelle sicher, dass dieses Feld nicht mehr als {max_length} Zeichen lang ist." @@ -218,137 +250,136 @@ msgstr "Datums- und Zeitangabe hat das falsche Format. Nutze stattdessen eines d msgid "Expected a datetime but got a date." msgstr "Erwarte eine Datums- und Zeitangabe, erhielt aber ein Datum." -#: fields.py:1079 +#: fields.py:1082 #, python-brace-format msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "Datum hat das falsche Format. Nutze stattdessen eines dieser Formate: {format}." -#: fields.py:1080 +#: fields.py:1083 msgid "Expected a date but got a datetime." msgstr "Erwarte ein Datum, erhielt aber eine Datums- und Zeitangabe." -#: fields.py:1148 +#: fields.py:1151 #, python-brace-format msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "Zeitangabe hat das falsche Format. Nutze stattdessen eines dieser Formate: {format}." -#: fields.py:1207 +#: fields.py:1215 #, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "Laufzeit hat das falsche Format. Benutze stattdessen eines dieser Formate {format}." -#: fields.py:1232 fields.py:1281 +#: fields.py:1240 fields.py:1289 #, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" ist keine gültige Option." -#: fields.py:1235 relations.py:62 relations.py:431 +#: fields.py:1243 relations.py:71 relations.py:442 #, python-brace-format msgid "More than {count} items..." msgstr "Mehr als {count} Ergebnisse" -#: fields.py:1282 fields.py:1429 relations.py:427 serializers.py:520 +#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 #, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Erwarte eine Liste von Elementen, erhielt aber den Typ \"{input_type}\"." -#: fields.py:1283 +#: fields.py:1291 msgid "This selection may not be empty." msgstr "Diese Auswahl darf nicht leer sein" -#: fields.py:1320 +#: fields.py:1328 #, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "\"{input}\" ist ein ungültiger Pfad Wahl." -#: fields.py:1339 +#: fields.py:1347 msgid "No file was submitted." msgstr "Es wurde keine Datei übermittelt." -#: fields.py:1340 +#: fields.py:1348 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "Die übermittelten Daten stellen keine Datei dar. Prüfe den Kodierungstyp im Formular." -#: fields.py:1341 +#: fields.py:1349 msgid "No filename could be determined." msgstr "Der Dateiname konnte nicht ermittelt werden." -#: fields.py:1342 +#: fields.py:1350 msgid "The submitted file is empty." msgstr "Die übermittelte Datei ist leer." -#: fields.py:1343 +#: fields.py:1351 #, python-brace-format msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "Stelle sicher, dass dieser Dateiname höchstens {max_length} Zeichen lang ist (er hat {length})." -#: fields.py:1391 +#: fields.py:1399 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "Lade ein gültiges Bild hoch. Die hochgeladene Datei ist entweder kein Bild oder ein beschädigtes Bild." -#: fields.py:1430 relations.py:428 serializers.py:521 +#: fields.py:1438 relations.py:439 serializers.py:521 msgid "This list may not be empty." msgstr "Diese Liste darf nicht leer sein." -#: fields.py:1483 +#: fields.py:1491 #, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "Erwarte ein Dictionary mit Elementen, erhielt aber den Typ \"{input_type}\"." -#: fields.py:1530 +#: fields.py:1538 msgid "Value must be valid JSON." msgstr "Wert muss gültiges JSON sein." -#: filters.py:35 templates/rest_framework/filters/django_filter.html:5 +#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 msgid "Submit" msgstr "Abschicken" #: pagination.py:189 -#, python-brace-format -msgid "Invalid page \"{page_number}\": {message}." -msgstr "Ungültige Seite \"{page_number}\": {message}." +msgid "Invalid page." +msgstr "" #: pagination.py:407 msgid "Invalid cursor" msgstr "Ungültiger Zeiger" -#: relations.py:196 +#: relations.py:207 #, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Ungültiger pk \"{pk_value}\" - Object existiert nicht." -#: relations.py:197 +#: relations.py:208 #, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Falscher Typ. Erwarte pk Wert, erhielt aber {data_type}." -#: relations.py:229 +#: relations.py:240 msgid "Invalid hyperlink - No URL match." msgstr "Ungültiger Hyperlink - entspricht keiner URL." -#: relations.py:230 +#: relations.py:241 msgid "Invalid hyperlink - Incorrect URL match." msgstr "Ungültiger Hyperlink - URL stimmt nicht überein." -#: relations.py:231 +#: relations.py:242 msgid "Invalid hyperlink - Object does not exist." msgstr "Ungültiger Hyperlink - Objekt existiert nicht." -#: relations.py:232 +#: relations.py:243 #, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Falscher Typ. Erwarte URL Zeichenkette, erhielt aber {data_type}." -#: relations.py:391 +#: relations.py:402 #, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "Objekt mit {slug_name}={value} existiert nicht." -#: relations.py:392 +#: relations.py:403 msgid "Invalid value." msgstr "Ungültiger Wert." diff --git a/rest_framework/locale/el/LC_MESSAGES/django.mo b/rest_framework/locale/el/LC_MESSAGES/django.mo new file mode 100644 index 0000000000000000000000000000000000000000..fc2120f7f371fbb381747daa830f56dca521fb92 GIT binary patch literal 512 zcmZvY%}xR_5XUuo+M{O=W8wj#!|p<&YY}7Q!;nZIxEimO9hSn!b{Gt+;6&rZLOY#dviTU}b6SY2Bc5m^1$%R9Rk%q|96O=)DX8{s?YOeo2q zHRUo^Fl@huFxGrdOQmPdkW!@$_Oe(+_>{*PhKhkR=!e+U#EmV*7B|G8>iIY5)zI_7 z4_Ga@@_f&;AP#9EiV+96+YRSg?uBOtL(OHDaHBMX555qjp|2zLm9OD`rMB5)BBWXf zUKy$RgDsPB&SS!m_?*GBCYnKMVob_hcez|vOwm$|X;tuUwDE|V?693j^beoA$$xW~ z61VL1y1n-PxBQCdG?g?Y?X%aZ^>1ip+%(}r)?qZ^IwR9~3p*I>x#BHj(%6\n" +"Language-Team: Greek (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/el/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: el\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: authentication.py:71 +msgid "Invalid basic header. No credentials provided." +msgstr "" + +#: authentication.py:74 +msgid "Invalid basic header. Credentials string should not contain spaces." +msgstr "" + +#: authentication.py:80 +msgid "Invalid basic header. Credentials not correctly base64 encoded." +msgstr "" + +#: authentication.py:97 +msgid "Invalid username/password." +msgstr "" + +#: authentication.py:100 authentication.py:195 +msgid "User inactive or deleted." +msgstr "" + +#: authentication.py:173 +msgid "Invalid token header. No credentials provided." +msgstr "" + +#: authentication.py:176 +msgid "Invalid token header. Token string should not contain spaces." +msgstr "" + +#: authentication.py:182 +msgid "" +"Invalid token header. Token string should not contain invalid characters." +msgstr "" + +#: authentication.py:192 +msgid "Invalid token." +msgstr "" + +#: authtoken/apps.py:7 +msgid "Auth Token" +msgstr "" + +#: authtoken/models.py:21 +msgid "Key" +msgstr "" + +#: authtoken/models.py:23 +msgid "User" +msgstr "" + +#: authtoken/models.py:24 +msgid "Created" +msgstr "" + +#: authtoken/models.py:33 +msgid "Token" +msgstr "" + +#: authtoken/models.py:34 +msgid "Tokens" +msgstr "" + +#: authtoken/serializers.py:8 +msgid "Username" +msgstr "" + +#: authtoken/serializers.py:9 +msgid "Password" +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:49 +msgid "A server error occurred." +msgstr "" + +#: exceptions.py:84 +msgid "Malformed request." +msgstr "" + +#: exceptions.py:89 +msgid "Incorrect authentication credentials." +msgstr "" + +#: exceptions.py:94 +msgid "Authentication credentials were not provided." +msgstr "" + +#: exceptions.py:99 +msgid "You do not have permission to perform this action." +msgstr "" + +#: exceptions.py:104 views.py:81 +msgid "Not found." +msgstr "" + +#: exceptions.py:109 +#, python-brace-format +msgid "Method \"{method}\" not allowed." +msgstr "" + +#: exceptions.py:120 +msgid "Could not satisfy the request Accept header." +msgstr "" + +#: exceptions.py:132 +#, python-brace-format +msgid "Unsupported media type \"{media_type}\" in request." +msgstr "" + +#: exceptions.py:145 +msgid "Request was throttled." +msgstr "" + +#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 +#: validators.py:162 +msgid "This field is required." +msgstr "" + +#: fields.py:267 +msgid "This field may not be null." +msgstr "" + +#: fields.py:603 fields.py:634 +#, python-brace-format +msgid "\"{input}\" is not a valid boolean." +msgstr "" + +#: fields.py:669 +msgid "This field may not be blank." +msgstr "" + +#: fields.py:670 fields.py:1664 +#, python-brace-format +msgid "Ensure this field has no more than {max_length} characters." +msgstr "" + +#: fields.py:671 +#, python-brace-format +msgid "Ensure this field has at least {min_length} characters." +msgstr "" + +#: fields.py:708 +msgid "Enter a valid email address." +msgstr "" + +#: fields.py:719 +msgid "This value does not match the required pattern." +msgstr "" + +#: fields.py:730 +msgid "" +"Enter a valid \"slug\" consisting of letters, numbers, underscores or " +"hyphens." +msgstr "" + +#: fields.py:742 +msgid "Enter a valid URL." +msgstr "" + +#: fields.py:755 +#, python-brace-format +msgid "\"{value}\" is not a valid UUID." +msgstr "" + +#: fields.py:791 +msgid "Enter a valid IPv4 or IPv6 address." +msgstr "" + +#: fields.py:816 +msgid "A valid integer is required." +msgstr "" + +#: fields.py:817 fields.py:852 fields.py:885 +#, python-brace-format +msgid "Ensure this value is less than or equal to {max_value}." +msgstr "" + +#: fields.py:818 fields.py:853 fields.py:886 +#, python-brace-format +msgid "Ensure this value is greater than or equal to {min_value}." +msgstr "" + +#: fields.py:819 fields.py:854 fields.py:890 +msgid "String value too large." +msgstr "" + +#: fields.py:851 fields.py:884 +msgid "A valid number is required." +msgstr "" + +#: fields.py:887 +#, python-brace-format +msgid "Ensure that there are no more than {max_digits} digits in total." +msgstr "" + +#: fields.py:888 +#, python-brace-format +msgid "" +"Ensure that there are no more than {max_decimal_places} decimal places." +msgstr "" + +#: fields.py:889 +#, python-brace-format +msgid "" +"Ensure that there are no more than {max_whole_digits} digits before the " +"decimal point." +msgstr "" + +#: fields.py:1004 +#, python-brace-format +msgid "Datetime has wrong format. Use one of these formats instead: {format}." +msgstr "" + +#: fields.py:1005 +msgid "Expected a datetime but got a date." +msgstr "" + +#: fields.py:1082 +#, python-brace-format +msgid "Date has wrong format. Use one of these formats instead: {format}." +msgstr "" + +#: fields.py:1083 +msgid "Expected a date but got a datetime." +msgstr "" + +#: fields.py:1151 +#, python-brace-format +msgid "Time has wrong format. Use one of these formats instead: {format}." +msgstr "" + +#: fields.py:1215 +#, python-brace-format +msgid "Duration has wrong format. Use one of these formats instead: {format}." +msgstr "" + +#: fields.py:1240 fields.py:1289 +#, python-brace-format +msgid "\"{input}\" is not a valid choice." +msgstr "" + +#: fields.py:1243 relations.py:71 relations.py:442 +#, python-brace-format +msgid "More than {count} items..." +msgstr "" + +#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 +#, python-brace-format +msgid "Expected a list of items but got type \"{input_type}\"." +msgstr "" + +#: fields.py:1291 +msgid "This selection may not be empty." +msgstr "" + +#: fields.py:1328 +#, python-brace-format +msgid "\"{input}\" is not a valid path choice." +msgstr "" + +#: fields.py:1347 +msgid "No file was submitted." +msgstr "" + +#: fields.py:1348 +msgid "" +"The submitted data was not a file. Check the encoding type on the form." +msgstr "" + +#: fields.py:1349 +msgid "No filename could be determined." +msgstr "" + +#: fields.py:1350 +msgid "The submitted file is empty." +msgstr "" + +#: fields.py:1351 +#, python-brace-format +msgid "" +"Ensure this filename has at most {max_length} characters (it has {length})." +msgstr "" + +#: fields.py:1399 +msgid "" +"Upload a valid image. The file you uploaded was either not an image or a " +"corrupted image." +msgstr "" + +#: fields.py:1438 relations.py:439 serializers.py:521 +msgid "This list may not be empty." +msgstr "" + +#: fields.py:1491 +#, python-brace-format +msgid "Expected a dictionary of items but got type \"{input_type}\"." +msgstr "" + +#: fields.py:1538 +msgid "Value must be valid JSON." +msgstr "" + +#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +msgid "Submit" +msgstr "" + +#: pagination.py:189 +msgid "Invalid page." +msgstr "" + +#: pagination.py:407 +msgid "Invalid cursor" +msgstr "" + +#: relations.py:207 +#, python-brace-format +msgid "Invalid pk \"{pk_value}\" - object does not exist." +msgstr "" + +#: relations.py:208 +#, python-brace-format +msgid "Incorrect type. Expected pk value, received {data_type}." +msgstr "" + +#: relations.py:240 +msgid "Invalid hyperlink - No URL match." +msgstr "" + +#: relations.py:241 +msgid "Invalid hyperlink - Incorrect URL match." +msgstr "" + +#: relations.py:242 +msgid "Invalid hyperlink - Object does not exist." +msgstr "" + +#: relations.py:243 +#, python-brace-format +msgid "Incorrect type. Expected URL string, received {data_type}." +msgstr "" + +#: relations.py:402 +#, python-brace-format +msgid "Object with {slug_name}={value} does not exist." +msgstr "" + +#: relations.py:403 +msgid "Invalid value." +msgstr "" + +#: serializers.py:326 +#, python-brace-format +msgid "Invalid data. Expected a dictionary, but got {datatype}." +msgstr "" + +#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/base.html:128 +msgid "Filters" +msgstr "" + +#: templates/rest_framework/filters/django_filter.html:2 +#: templates/rest_framework/filters/django_filter_crispyforms.html:4 +msgid "Field filters" +msgstr "" + +#: templates/rest_framework/filters/ordering.html:3 +msgid "Ordering" +msgstr "" + +#: templates/rest_framework/filters/search.html:2 +msgid "Search" +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:24 +msgid "This field must be unique." +msgstr "" + +#: validators.py:78 +#, python-brace-format +msgid "The fields {field_names} must make a unique set." +msgstr "" + +#: validators.py:226 +#, python-brace-format +msgid "This field must be unique for the \"{date_field}\" date." +msgstr "" + +#: validators.py:241 +#, python-brace-format +msgid "This field must be unique for the \"{date_field}\" month." +msgstr "" + +#: validators.py:254 +#, python-brace-format +msgid "This field must be unique for the \"{date_field}\" year." +msgstr "" + +#: versioning.py:42 +msgid "Invalid version in \"Accept\" header." +msgstr "" + +#: versioning.py:73 versioning.py:115 +msgid "Invalid version in URL path." +msgstr "" + +#: versioning.py:144 +msgid "Invalid version in hostname." +msgstr "" + +#: versioning.py:166 +msgid "Invalid version in query parameter." +msgstr "" + +#: views.py:88 +msgid "Permission denied." +msgstr "" diff --git a/rest_framework/locale/el_GR/LC_MESSAGES/django.mo b/rest_framework/locale/el_GR/LC_MESSAGES/django.mo new file mode 100644 index 0000000000000000000000000000000000000000..67022a7f764708dd90e4ebb5696030a81fb70082 GIT binary patch literal 527 zcmZut!A`mCdOpUb<47Bm}<5d)4XbQRLM9A?cVX6s7%a7%VOnUO;=R(-oPo@i$GqKa!K!T6BpkKDueY3?KVV#+CIA2c literal 0 HcmV?d00001 diff --git a/rest_framework/locale/el_GR/LC_MESSAGES/django.po b/rest_framework/locale/el_GR/LC_MESSAGES/django.po new file mode 100644 index 000000000..645a1a8c6 --- /dev/null +++ b/rest_framework/locale/el_GR/LC_MESSAGES/django.po @@ -0,0 +1,457 @@ +# 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: 2016-03-01 18:38+0100\n" +"PO-Revision-Date: 2016-03-01 17:38+0000\n" +"Last-Translator: Xavier Ordoquy \n" +"Language-Team: Greek (Greece) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/el_GR/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: el_GR\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: authentication.py:71 +msgid "Invalid basic header. No credentials provided." +msgstr "" + +#: authentication.py:74 +msgid "Invalid basic header. Credentials string should not contain spaces." +msgstr "" + +#: authentication.py:80 +msgid "Invalid basic header. Credentials not correctly base64 encoded." +msgstr "" + +#: authentication.py:97 +msgid "Invalid username/password." +msgstr "" + +#: authentication.py:100 authentication.py:195 +msgid "User inactive or deleted." +msgstr "" + +#: authentication.py:173 +msgid "Invalid token header. No credentials provided." +msgstr "" + +#: authentication.py:176 +msgid "Invalid token header. Token string should not contain spaces." +msgstr "" + +#: authentication.py:182 +msgid "" +"Invalid token header. Token string should not contain invalid characters." +msgstr "" + +#: authentication.py:192 +msgid "Invalid token." +msgstr "" + +#: authtoken/apps.py:7 +msgid "Auth Token" +msgstr "" + +#: authtoken/models.py:21 +msgid "Key" +msgstr "" + +#: authtoken/models.py:23 +msgid "User" +msgstr "" + +#: authtoken/models.py:24 +msgid "Created" +msgstr "" + +#: authtoken/models.py:33 +msgid "Token" +msgstr "" + +#: authtoken/models.py:34 +msgid "Tokens" +msgstr "" + +#: authtoken/serializers.py:8 +msgid "Username" +msgstr "" + +#: authtoken/serializers.py:9 +msgid "Password" +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:49 +msgid "A server error occurred." +msgstr "" + +#: exceptions.py:84 +msgid "Malformed request." +msgstr "" + +#: exceptions.py:89 +msgid "Incorrect authentication credentials." +msgstr "" + +#: exceptions.py:94 +msgid "Authentication credentials were not provided." +msgstr "" + +#: exceptions.py:99 +msgid "You do not have permission to perform this action." +msgstr "" + +#: exceptions.py:104 views.py:81 +msgid "Not found." +msgstr "" + +#: exceptions.py:109 +#, python-brace-format +msgid "Method \"{method}\" not allowed." +msgstr "" + +#: exceptions.py:120 +msgid "Could not satisfy the request Accept header." +msgstr "" + +#: exceptions.py:132 +#, python-brace-format +msgid "Unsupported media type \"{media_type}\" in request." +msgstr "" + +#: exceptions.py:145 +msgid "Request was throttled." +msgstr "" + +#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 +#: validators.py:162 +msgid "This field is required." +msgstr "" + +#: fields.py:267 +msgid "This field may not be null." +msgstr "" + +#: fields.py:603 fields.py:634 +#, python-brace-format +msgid "\"{input}\" is not a valid boolean." +msgstr "" + +#: fields.py:669 +msgid "This field may not be blank." +msgstr "" + +#: fields.py:670 fields.py:1664 +#, python-brace-format +msgid "Ensure this field has no more than {max_length} characters." +msgstr "" + +#: fields.py:671 +#, python-brace-format +msgid "Ensure this field has at least {min_length} characters." +msgstr "" + +#: fields.py:708 +msgid "Enter a valid email address." +msgstr "" + +#: fields.py:719 +msgid "This value does not match the required pattern." +msgstr "" + +#: fields.py:730 +msgid "" +"Enter a valid \"slug\" consisting of letters, numbers, underscores or " +"hyphens." +msgstr "" + +#: fields.py:742 +msgid "Enter a valid URL." +msgstr "" + +#: fields.py:755 +#, python-brace-format +msgid "\"{value}\" is not a valid UUID." +msgstr "" + +#: fields.py:791 +msgid "Enter a valid IPv4 or IPv6 address." +msgstr "" + +#: fields.py:816 +msgid "A valid integer is required." +msgstr "" + +#: fields.py:817 fields.py:852 fields.py:885 +#, python-brace-format +msgid "Ensure this value is less than or equal to {max_value}." +msgstr "" + +#: fields.py:818 fields.py:853 fields.py:886 +#, python-brace-format +msgid "Ensure this value is greater than or equal to {min_value}." +msgstr "" + +#: fields.py:819 fields.py:854 fields.py:890 +msgid "String value too large." +msgstr "" + +#: fields.py:851 fields.py:884 +msgid "A valid number is required." +msgstr "" + +#: fields.py:887 +#, python-brace-format +msgid "Ensure that there are no more than {max_digits} digits in total." +msgstr "" + +#: fields.py:888 +#, python-brace-format +msgid "" +"Ensure that there are no more than {max_decimal_places} decimal places." +msgstr "" + +#: fields.py:889 +#, python-brace-format +msgid "" +"Ensure that there are no more than {max_whole_digits} digits before the " +"decimal point." +msgstr "" + +#: fields.py:1004 +#, python-brace-format +msgid "Datetime has wrong format. Use one of these formats instead: {format}." +msgstr "" + +#: fields.py:1005 +msgid "Expected a datetime but got a date." +msgstr "" + +#: fields.py:1082 +#, python-brace-format +msgid "Date has wrong format. Use one of these formats instead: {format}." +msgstr "" + +#: fields.py:1083 +msgid "Expected a date but got a datetime." +msgstr "" + +#: fields.py:1151 +#, python-brace-format +msgid "Time has wrong format. Use one of these formats instead: {format}." +msgstr "" + +#: fields.py:1215 +#, python-brace-format +msgid "Duration has wrong format. Use one of these formats instead: {format}." +msgstr "" + +#: fields.py:1240 fields.py:1289 +#, python-brace-format +msgid "\"{input}\" is not a valid choice." +msgstr "" + +#: fields.py:1243 relations.py:71 relations.py:442 +#, python-brace-format +msgid "More than {count} items..." +msgstr "" + +#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 +#, python-brace-format +msgid "Expected a list of items but got type \"{input_type}\"." +msgstr "" + +#: fields.py:1291 +msgid "This selection may not be empty." +msgstr "" + +#: fields.py:1328 +#, python-brace-format +msgid "\"{input}\" is not a valid path choice." +msgstr "" + +#: fields.py:1347 +msgid "No file was submitted." +msgstr "" + +#: fields.py:1348 +msgid "" +"The submitted data was not a file. Check the encoding type on the form." +msgstr "" + +#: fields.py:1349 +msgid "No filename could be determined." +msgstr "" + +#: fields.py:1350 +msgid "The submitted file is empty." +msgstr "" + +#: fields.py:1351 +#, python-brace-format +msgid "" +"Ensure this filename has at most {max_length} characters (it has {length})." +msgstr "" + +#: fields.py:1399 +msgid "" +"Upload a valid image. The file you uploaded was either not an image or a " +"corrupted image." +msgstr "" + +#: fields.py:1438 relations.py:439 serializers.py:521 +msgid "This list may not be empty." +msgstr "" + +#: fields.py:1491 +#, python-brace-format +msgid "Expected a dictionary of items but got type \"{input_type}\"." +msgstr "" + +#: fields.py:1538 +msgid "Value must be valid JSON." +msgstr "" + +#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +msgid "Submit" +msgstr "" + +#: pagination.py:189 +msgid "Invalid page." +msgstr "" + +#: pagination.py:407 +msgid "Invalid cursor" +msgstr "" + +#: relations.py:207 +#, python-brace-format +msgid "Invalid pk \"{pk_value}\" - object does not exist." +msgstr "" + +#: relations.py:208 +#, python-brace-format +msgid "Incorrect type. Expected pk value, received {data_type}." +msgstr "" + +#: relations.py:240 +msgid "Invalid hyperlink - No URL match." +msgstr "" + +#: relations.py:241 +msgid "Invalid hyperlink - Incorrect URL match." +msgstr "" + +#: relations.py:242 +msgid "Invalid hyperlink - Object does not exist." +msgstr "" + +#: relations.py:243 +#, python-brace-format +msgid "Incorrect type. Expected URL string, received {data_type}." +msgstr "" + +#: relations.py:402 +#, python-brace-format +msgid "Object with {slug_name}={value} does not exist." +msgstr "" + +#: relations.py:403 +msgid "Invalid value." +msgstr "" + +#: serializers.py:326 +#, python-brace-format +msgid "Invalid data. Expected a dictionary, but got {datatype}." +msgstr "" + +#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/base.html:128 +msgid "Filters" +msgstr "" + +#: templates/rest_framework/filters/django_filter.html:2 +#: templates/rest_framework/filters/django_filter_crispyforms.html:4 +msgid "Field filters" +msgstr "" + +#: templates/rest_framework/filters/ordering.html:3 +msgid "Ordering" +msgstr "" + +#: templates/rest_framework/filters/search.html:2 +msgid "Search" +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:24 +msgid "This field must be unique." +msgstr "" + +#: validators.py:78 +#, python-brace-format +msgid "The fields {field_names} must make a unique set." +msgstr "" + +#: validators.py:226 +#, python-brace-format +msgid "This field must be unique for the \"{date_field}\" date." +msgstr "" + +#: validators.py:241 +#, python-brace-format +msgid "This field must be unique for the \"{date_field}\" month." +msgstr "" + +#: validators.py:254 +#, python-brace-format +msgid "This field must be unique for the \"{date_field}\" year." +msgstr "" + +#: versioning.py:42 +msgid "Invalid version in \"Accept\" header." +msgstr "" + +#: versioning.py:73 versioning.py:115 +msgid "Invalid version in URL path." +msgstr "" + +#: versioning.py:144 +msgid "Invalid version in hostname." +msgstr "" + +#: versioning.py:166 +msgid "Invalid version in query parameter." +msgstr "" + +#: views.py:88 +msgid "Permission denied." +msgstr "" diff --git a/rest_framework/locale/en/LC_MESSAGES/django.mo b/rest_framework/locale/en/LC_MESSAGES/django.mo index 6e464e9fd9a61820309b12be2e61b93eb2c72253..06dc754a8d9fca02a5d8c0e2c534ad0ba349e006 100644 GIT binary patch delta 2413 zcmcK4|4-Fb9LMqZ!?g0}4b7#ji;qw=D}OXiMkXZOcX2 z8m^nVxizMhGk&VkFD|6b>9Q}Y<=V0@%KW8OKe)DR)JCi4>+|`nFMmL1_x*XCbMC$8 z^Ev0d&u6Oh)vnm}ti)qR*+<+-)CA4Ou``(q<*8J&B77PhjAIGDhs*IB%){SN|IfP3 ztN>Tz?bv~p*n<^#7*p_F++Y^7b5vUCSn!STuQu98uo?WUdIM3 zPxHQyVkhm_u^4~CEX+vv9!+dtU&LCxfPCyXE_%}B3~$C6s2kN_Jr3h~ zJc|+h0asx~CO5;~sNe0!yYUUwN`8vvcoWmPzvVABtHM&$06Xvj9K&_^1!};|JIt2i za#VXQY9{TdrGL_Q-0wewLHa*Nt-xofExUmlN1d@!ET9s?2s*e6v+)on;smk__8P9n zNo2e2bKk4T$8K=ZIJZ#gvxq@*F$>i$$0`h?wzxl={nwLE`9J&+)t*Bo(E`?C-V$$b zH>28Ps2R+ne)lyx_$%rGLpg48St};d9!EXE1m1(kF^m^-SpS_=ZqcEccJcW6*zG%r zn(3I|K8p9!p2Eukvumh5J;M=j@G|Oj{D@lWOa`NBt56ebLp|^SYDJ%qQK_WzGFIR@ zRMLHq91pvRIvruAD-WQS?gMPb6h`a8cGT&Z#76uIbvm-SYXkP8zCVdN9am7f6DwTi z?Og=vvmVqJqrN9l1HO;7IFC9Vl}t|$+K8HQ1a+gwu^!(#_7G|!&!HxE%6Hc9 z{}zMX-~Obc>OI^lw7#?P0$?gPOoENE%oM z`{Q6a>H#}&10KRy5|vphdZLS{2Y>GE)wUb9yz^RPX* z*{^E_wah9Gp{3tNBoHdvnr)gtC&Vp5uG;4&Vu#yfwitP-*`vfhLPt)eh~PE;pOQ#x zFOf#*j4OFJ5e-BiQA2DcRM;VVh=|>%7DY!%d;RaSo`y2E*zbGG3=4-O^x!Re-=v_MMV=;*V^Zw^vN8>-QJRd(>Qk%MM xG&(ZWHyDk7SJD;F32jfWtE{T7tO`5f`iAQI_`y)YKRs*cnLZUNNcbP0;V+hT|7rjL delta 2186 zcmb`|OKenC9LMp0$36xMLR)Bs0lY0z6gq8Z%Gf$s+bPHtTc~Zd@)94h2x zkN=q-SbwzBKVO>vrcpK%3y42MWt>jhVlQey+feapA8Y2q8DZS5SMuno+QtwjDK~Auj5F%Xtb{(!PKRT(B@m?jBTfKZ=^*cGP?P*Qhj6 zIfKgX5Ytw6w_z>5iX^g~K;3s5mBrUkD_4DMklpR5{y|g@97KKp3siDn#b#XN1b&R2A@(D6{yXd@*>W}a?&AbJ9xAh=rMN^YwPlDhzv zL$fig^WREE4_=FUz!p??40#UaT$bMF{#1O!E!qMtbF1sygehV(kx#ISxz*C?s3uks+J^gy8;g>T ze=W9}&^D+jf3!9CYX3?6Tv7H;mGD%>$?^WDY@nv?(Q(z;S6N4BPgQhUlqWhZIsqz0 z0d_Y&MD!9}#B?pIN_T+Wf&7@+O@xvtN$B|SOPotCumYlwXd#pjDjuQatt4WZf$(Ie zdr^62*R)jj*LlwrM!c$_U5`E4|H!k?4?N!g+;COW8ye^z9HeVFyU9D8m;JJ&I4?U{ zdL)#YSaK?}zq&s2dikN5iD)byt#9;VP02(\n" "Language-Team: English (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/en/)\n" "MIME-Version: 1.0\n" @@ -17,43 +17,75 @@ msgstr "" "Language: en\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:72 +#: authentication.py:71 msgid "Invalid basic header. No credentials provided." msgstr "Invalid basic header. No credentials provided." -#: authentication.py:75 +#: authentication.py:74 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "Invalid basic header. Credentials string should not contain spaces." -#: authentication.py:81 +#: authentication.py:80 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Invalid basic header. Credentials not correctly base64 encoded." -#: authentication.py:98 +#: authentication.py:97 msgid "Invalid username/password." msgstr "Invalid username/password." -#: authentication.py:101 authentication.py:188 +#: authentication.py:100 authentication.py:195 msgid "User inactive or deleted." msgstr "User inactive or deleted." -#: authentication.py:167 +#: authentication.py:173 msgid "Invalid token header. No credentials provided." msgstr "Invalid token header. No credentials provided." -#: authentication.py:170 +#: authentication.py:176 msgid "Invalid token header. Token string should not contain spaces." msgstr "Invalid token header. Token string should not contain spaces." -#: authentication.py:176 +#: authentication.py:182 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "Invalid token header. Token string should not contain invalid characters." -#: authentication.py:185 +#: authentication.py:192 msgid "Invalid token." msgstr "Invalid token." +#: authtoken/apps.py:7 +msgid "Auth Token" +msgstr "Auth Token" + +#: authtoken/models.py:21 +msgid "Key" +msgstr "Key" + +#: authtoken/models.py:23 +msgid "User" +msgstr "User" + +#: authtoken/models.py:24 +msgid "Created" +msgstr "Created" + +#: authtoken/models.py:33 +msgid "Token" +msgstr "Token" + +#: authtoken/models.py:34 +msgid "Tokens" +msgstr "Tokens" + +#: authtoken/serializers.py:8 +msgid "Username" +msgstr "Username" + +#: authtoken/serializers.py:9 +msgid "Password" +msgstr "Password" + #: authtoken/serializers.py:20 msgid "User account is disabled." msgstr "User account is disabled." @@ -108,7 +140,7 @@ msgstr "Unsupported media type \"{media_type}\" in request." msgid "Request was throttled." msgstr "Request was throttled." -#: fields.py:266 relations.py:195 relations.py:228 validators.py:79 +#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 #: validators.py:162 msgid "This field is required." msgstr "This field is required." @@ -126,7 +158,7 @@ msgstr "\"{input}\" is not a valid boolean." msgid "This field may not be blank." msgstr "This field may not be blank." -#: fields.py:670 fields.py:1656 +#: fields.py:670 fields.py:1664 #, python-brace-format msgid "Ensure this field has no more than {max_length} characters." msgstr "Ensure this field has no more than {max_length} characters." @@ -212,137 +244,136 @@ msgstr "Datetime has wrong format. Use one of these formats instead: {format}." msgid "Expected a datetime but got a date." msgstr "Expected a datetime but got a date." -#: fields.py:1079 +#: fields.py:1082 #, python-brace-format msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "Date has wrong format. Use one of these formats instead: {format}." -#: fields.py:1080 +#: fields.py:1083 msgid "Expected a date but got a datetime." msgstr "Expected a date but got a datetime." -#: fields.py:1148 +#: fields.py:1151 #, python-brace-format msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "Time has wrong format. Use one of these formats instead: {format}." -#: fields.py:1207 +#: fields.py:1215 #, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "Duration has wrong format. Use one of these formats instead: {format}." -#: fields.py:1232 fields.py:1281 +#: fields.py:1240 fields.py:1289 #, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" is not a valid choice." -#: fields.py:1235 relations.py:62 relations.py:431 +#: fields.py:1243 relations.py:71 relations.py:442 #, python-brace-format msgid "More than {count} items..." msgstr "More than {count} items..." -#: fields.py:1282 fields.py:1429 relations.py:427 serializers.py:520 +#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 #, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Expected a list of items but got type \"{input_type}\"." -#: fields.py:1283 +#: fields.py:1291 msgid "This selection may not be empty." msgstr "This selection may not be empty." -#: fields.py:1320 +#: fields.py:1328 #, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "\"{input}\" is not a valid path choice." -#: fields.py:1339 +#: fields.py:1347 msgid "No file was submitted." msgstr "No file was submitted." -#: fields.py:1340 +#: fields.py:1348 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "The submitted data was not a file. Check the encoding type on the form." -#: fields.py:1341 +#: fields.py:1349 msgid "No filename could be determined." msgstr "No filename could be determined." -#: fields.py:1342 +#: fields.py:1350 msgid "The submitted file is empty." msgstr "The submitted file is empty." -#: fields.py:1343 +#: fields.py:1351 #, python-brace-format msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "Ensure this filename has at most {max_length} characters (it has {length})." -#: fields.py:1391 +#: fields.py:1399 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "Upload a valid image. The file you uploaded was either not an image or a corrupted image." -#: fields.py:1430 relations.py:428 serializers.py:521 +#: fields.py:1438 relations.py:439 serializers.py:521 msgid "This list may not be empty." msgstr "This list may not be empty." -#: fields.py:1483 +#: fields.py:1491 #, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "Expected a dictionary of items but got type \"{input_type}\"." -#: fields.py:1530 +#: fields.py:1538 msgid "Value must be valid JSON." msgstr "Value must be valid JSON." -#: filters.py:35 templates/rest_framework/filters/django_filter.html:5 +#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 msgid "Submit" msgstr "Submit" #: pagination.py:189 -#, python-brace-format -msgid "Invalid page \"{page_number}\": {message}." -msgstr "Invalid page \"{page_number}\": {message}." +msgid "Invalid page." +msgstr "Invalid page." #: pagination.py:407 msgid "Invalid cursor" msgstr "Invalid cursor" -#: relations.py:196 +#: relations.py:207 #, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Invalid pk \"{pk_value}\" - object does not exist." -#: relations.py:197 +#: relations.py:208 #, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Incorrect type. Expected pk value, received {data_type}." -#: relations.py:229 +#: relations.py:240 msgid "Invalid hyperlink - No URL match." msgstr "Invalid hyperlink - No URL match." -#: relations.py:230 +#: relations.py:241 msgid "Invalid hyperlink - Incorrect URL match." msgstr "Invalid hyperlink - Incorrect URL match." -#: relations.py:231 +#: relations.py:242 msgid "Invalid hyperlink - Object does not exist." msgstr "Invalid hyperlink - Object does not exist." -#: relations.py:232 +#: relations.py:243 #, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Incorrect type. Expected URL string, received {data_type}." -#: relations.py:391 +#: relations.py:402 #, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "Object with {slug_name}={value} does not exist." -#: relations.py:392 +#: relations.py:403 msgid "Invalid value." msgstr "Invalid value." diff --git a/rest_framework/locale/en_AU/LC_MESSAGES/django.mo b/rest_framework/locale/en_AU/LC_MESSAGES/django.mo index ffaa53bd68f864439f560a728412f0a50afe9bdb..288595123478d0817f3b1c44d2884635461fd3ca 100644 GIT binary patch delta 41 ncmbQjGKFQr1YR>;17lqSLj^+%D`Sg^bEOdi=0JgsNBtQA+)@gC delta 41 pcmbQjGKFQr1YT2JLnB=Sa|J^SD^uf%bEOdi=2oVr8;|-k0s!2|3WERu diff --git a/rest_framework/locale/en_AU/LC_MESSAGES/django.po b/rest_framework/locale/en_AU/LC_MESSAGES/django.po index 696396b2b..9ee758d64 100644 --- a/rest_framework/locale/en_AU/LC_MESSAGES/django.po +++ b/rest_framework/locale/en_AU/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-07 18:53+0100\n" -"PO-Revision-Date: 2015-12-07 17:55+0000\n" +"POT-Creation-Date: 2016-03-01 18:38+0100\n" +"PO-Revision-Date: 2016-03-01 17:38+0000\n" "Last-Translator: Xavier Ordoquy \n" "Language-Team: English (Australia) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/en_AU/)\n" "MIME-Version: 1.0\n" @@ -17,43 +17,75 @@ msgstr "" "Language: en_AU\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:72 +#: authentication.py:71 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:75 +#: authentication.py:74 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:81 +#: authentication.py:80 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:98 +#: authentication.py:97 msgid "Invalid username/password." msgstr "" -#: authentication.py:101 authentication.py:188 +#: authentication.py:100 authentication.py:195 msgid "User inactive or deleted." msgstr "" -#: authentication.py:167 +#: authentication.py:173 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:170 +#: authentication.py:176 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:176 +#: authentication.py:182 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:185 +#: authentication.py:192 msgid "Invalid token." msgstr "" +#: authtoken/apps.py:7 +msgid "Auth Token" +msgstr "" + +#: authtoken/models.py:21 +msgid "Key" +msgstr "" + +#: authtoken/models.py:23 +msgid "User" +msgstr "" + +#: authtoken/models.py:24 +msgid "Created" +msgstr "" + +#: authtoken/models.py:33 +msgid "Token" +msgstr "" + +#: authtoken/models.py:34 +msgid "Tokens" +msgstr "" + +#: authtoken/serializers.py:8 +msgid "Username" +msgstr "" + +#: authtoken/serializers.py:9 +msgid "Password" +msgstr "" + #: authtoken/serializers.py:20 msgid "User account is disabled." msgstr "" @@ -108,7 +140,7 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:266 relations.py:195 relations.py:228 validators.py:79 +#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 #: validators.py:162 msgid "This field is required." msgstr "" @@ -126,7 +158,7 @@ msgstr "" msgid "This field may not be blank." msgstr "" -#: fields.py:670 fields.py:1656 +#: fields.py:670 fields.py:1664 #, python-brace-format msgid "Ensure this field has no more than {max_length} characters." msgstr "" @@ -212,137 +244,136 @@ msgstr "" msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1079 +#: fields.py:1082 #, python-brace-format msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1080 +#: fields.py:1083 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1148 +#: fields.py:1151 #, python-brace-format msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1207 +#: fields.py:1215 #, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1232 fields.py:1281 +#: fields.py:1240 fields.py:1289 #, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "" -#: fields.py:1235 relations.py:62 relations.py:431 +#: fields.py:1243 relations.py:71 relations.py:442 #, python-brace-format msgid "More than {count} items..." msgstr "" -#: fields.py:1282 fields.py:1429 relations.py:427 serializers.py:520 +#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 #, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1283 +#: fields.py:1291 msgid "This selection may not be empty." msgstr "" -#: fields.py:1320 +#: fields.py:1328 #, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1339 +#: fields.py:1347 msgid "No file was submitted." msgstr "" -#: fields.py:1340 +#: fields.py:1348 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1341 +#: fields.py:1349 msgid "No filename could be determined." msgstr "" -#: fields.py:1342 +#: fields.py:1350 msgid "The submitted file is empty." msgstr "" -#: fields.py:1343 +#: fields.py:1351 #, python-brace-format msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1391 +#: fields.py:1399 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: fields.py:1430 relations.py:428 serializers.py:521 +#: fields.py:1438 relations.py:439 serializers.py:521 msgid "This list may not be empty." msgstr "" -#: fields.py:1483 +#: fields.py:1491 #, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1530 +#: fields.py:1538 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html:5 +#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 msgid "Submit" msgstr "" #: pagination.py:189 -#, python-brace-format -msgid "Invalid page \"{page_number}\": {message}." +msgid "Invalid page." msgstr "" #: pagination.py:407 msgid "Invalid cursor" msgstr "" -#: relations.py:196 +#: relations.py:207 #, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" -#: relations.py:197 +#: relations.py:208 #, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" -#: relations.py:229 +#: relations.py:240 msgid "Invalid hyperlink - No URL match." msgstr "" -#: relations.py:230 +#: relations.py:241 msgid "Invalid hyperlink - Incorrect URL match." msgstr "" -#: relations.py:231 +#: relations.py:242 msgid "Invalid hyperlink - Object does not exist." msgstr "" -#: relations.py:232 +#: relations.py:243 #, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:391 +#: relations.py:402 #, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:392 +#: relations.py:403 msgid "Invalid value." msgstr "" diff --git a/rest_framework/locale/en_CA/LC_MESSAGES/django.mo b/rest_framework/locale/en_CA/LC_MESSAGES/django.mo index bdf76870d71a111c67706885ed6ced967314d70e..aee511aa1352bcb292c4d565d7c35a2259d0e06f 100644 GIT binary patch delta 41 ncmbQpGLdD%1YR>;17lqSLj^+%D`Sg^bEOdi=0JgsM|~Ip+gu8C delta 41 pcmbQpGLdD%1YT2JLnB=Sa|J^SD^uf%bEOdi=2oVr8;|-h0s!063VHwl diff --git a/rest_framework/locale/en_CA/LC_MESSAGES/django.po b/rest_framework/locale/en_CA/LC_MESSAGES/django.po index f23a59fb6..2bb5b573b 100644 --- a/rest_framework/locale/en_CA/LC_MESSAGES/django.po +++ b/rest_framework/locale/en_CA/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-07 18:53+0100\n" -"PO-Revision-Date: 2015-12-07 17:55+0000\n" +"POT-Creation-Date: 2016-03-01 18:38+0100\n" +"PO-Revision-Date: 2016-03-01 17:38+0000\n" "Last-Translator: Xavier Ordoquy \n" "Language-Team: English (Canada) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/en_CA/)\n" "MIME-Version: 1.0\n" @@ -17,43 +17,75 @@ msgstr "" "Language: en_CA\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:72 +#: authentication.py:71 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:75 +#: authentication.py:74 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:81 +#: authentication.py:80 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:98 +#: authentication.py:97 msgid "Invalid username/password." msgstr "" -#: authentication.py:101 authentication.py:188 +#: authentication.py:100 authentication.py:195 msgid "User inactive or deleted." msgstr "" -#: authentication.py:167 +#: authentication.py:173 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:170 +#: authentication.py:176 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:176 +#: authentication.py:182 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:185 +#: authentication.py:192 msgid "Invalid token." msgstr "" +#: authtoken/apps.py:7 +msgid "Auth Token" +msgstr "" + +#: authtoken/models.py:21 +msgid "Key" +msgstr "" + +#: authtoken/models.py:23 +msgid "User" +msgstr "" + +#: authtoken/models.py:24 +msgid "Created" +msgstr "" + +#: authtoken/models.py:33 +msgid "Token" +msgstr "" + +#: authtoken/models.py:34 +msgid "Tokens" +msgstr "" + +#: authtoken/serializers.py:8 +msgid "Username" +msgstr "" + +#: authtoken/serializers.py:9 +msgid "Password" +msgstr "" + #: authtoken/serializers.py:20 msgid "User account is disabled." msgstr "" @@ -108,7 +140,7 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:266 relations.py:195 relations.py:228 validators.py:79 +#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 #: validators.py:162 msgid "This field is required." msgstr "" @@ -126,7 +158,7 @@ msgstr "" msgid "This field may not be blank." msgstr "" -#: fields.py:670 fields.py:1656 +#: fields.py:670 fields.py:1664 #, python-brace-format msgid "Ensure this field has no more than {max_length} characters." msgstr "" @@ -212,137 +244,136 @@ msgstr "" msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1079 +#: fields.py:1082 #, python-brace-format msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1080 +#: fields.py:1083 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1148 +#: fields.py:1151 #, python-brace-format msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1207 +#: fields.py:1215 #, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1232 fields.py:1281 +#: fields.py:1240 fields.py:1289 #, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "" -#: fields.py:1235 relations.py:62 relations.py:431 +#: fields.py:1243 relations.py:71 relations.py:442 #, python-brace-format msgid "More than {count} items..." msgstr "" -#: fields.py:1282 fields.py:1429 relations.py:427 serializers.py:520 +#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 #, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1283 +#: fields.py:1291 msgid "This selection may not be empty." msgstr "" -#: fields.py:1320 +#: fields.py:1328 #, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1339 +#: fields.py:1347 msgid "No file was submitted." msgstr "" -#: fields.py:1340 +#: fields.py:1348 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1341 +#: fields.py:1349 msgid "No filename could be determined." msgstr "" -#: fields.py:1342 +#: fields.py:1350 msgid "The submitted file is empty." msgstr "" -#: fields.py:1343 +#: fields.py:1351 #, python-brace-format msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1391 +#: fields.py:1399 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: fields.py:1430 relations.py:428 serializers.py:521 +#: fields.py:1438 relations.py:439 serializers.py:521 msgid "This list may not be empty." msgstr "" -#: fields.py:1483 +#: fields.py:1491 #, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1530 +#: fields.py:1538 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html:5 +#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 msgid "Submit" msgstr "" #: pagination.py:189 -#, python-brace-format -msgid "Invalid page \"{page_number}\": {message}." +msgid "Invalid page." msgstr "" #: pagination.py:407 msgid "Invalid cursor" msgstr "" -#: relations.py:196 +#: relations.py:207 #, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" -#: relations.py:197 +#: relations.py:208 #, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" -#: relations.py:229 +#: relations.py:240 msgid "Invalid hyperlink - No URL match." msgstr "" -#: relations.py:230 +#: relations.py:241 msgid "Invalid hyperlink - Incorrect URL match." msgstr "" -#: relations.py:231 +#: relations.py:242 msgid "Invalid hyperlink - Object does not exist." msgstr "" -#: relations.py:232 +#: relations.py:243 #, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:391 +#: relations.py:402 #, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:392 +#: relations.py:403 msgid "Invalid value." msgstr "" diff --git a/rest_framework/locale/en_US/LC_MESSAGES/django.mo b/rest_framework/locale/en_US/LC_MESSAGES/django.mo index c99892e4bc9bddbab7066c13c43ad5dbcc12944a..1f28ebba03d951523b3e9fa42d14ec34fc1aa2c0 100644 GIT binary patch delta 23 ecmeyx^owai7q6MFfw8WEp@N}>m9fRd>5lhExq_jEm8tQ>>5l\n" "Language-Team: LANGUAGE \n" @@ -17,43 +17,75 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: authentication.py:72 +#: authentication.py:71 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:75 +#: authentication.py:74 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:81 +#: authentication.py:80 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:98 +#: authentication.py:97 msgid "Invalid username/password." msgstr "" -#: authentication.py:101 authentication.py:188 +#: authentication.py:100 authentication.py:195 msgid "User inactive or deleted." msgstr "" -#: authentication.py:167 +#: authentication.py:173 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:170 +#: authentication.py:176 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:176 +#: authentication.py:182 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:185 +#: authentication.py:192 msgid "Invalid token." msgstr "" +#: authtoken/apps.py:7 +msgid "Auth Token" +msgstr "" + +#: authtoken/models.py:21 +msgid "Key" +msgstr "" + +#: authtoken/models.py:23 +msgid "User" +msgstr "" + +#: authtoken/models.py:24 +msgid "Created" +msgstr "" + +#: authtoken/models.py:33 +msgid "Token" +msgstr "" + +#: authtoken/models.py:34 +msgid "Tokens" +msgstr "" + +#: authtoken/serializers.py:8 +msgid "Username" +msgstr "" + +#: authtoken/serializers.py:9 +msgid "Password" +msgstr "" + #: authtoken/serializers.py:20 msgid "User account is disabled." msgstr "" @@ -108,7 +140,7 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:266 relations.py:195 relations.py:228 validators.py:79 +#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 #: validators.py:162 msgid "This field is required." msgstr "" @@ -126,7 +158,7 @@ msgstr "" msgid "This field may not be blank." msgstr "" -#: fields.py:670 fields.py:1656 +#: fields.py:670 fields.py:1664 #, python-brace-format msgid "Ensure this field has no more than {max_length} characters." msgstr "" @@ -211,136 +243,135 @@ msgstr "" msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1079 +#: fields.py:1082 #, python-brace-format msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1080 +#: fields.py:1083 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1148 +#: fields.py:1151 #, python-brace-format msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1207 +#: fields.py:1215 #, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1232 fields.py:1281 +#: fields.py:1240 fields.py:1289 #, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "" -#: fields.py:1235 relations.py:62 relations.py:431 +#: fields.py:1243 relations.py:71 relations.py:442 #, python-brace-format msgid "More than {count} items..." msgstr "" -#: fields.py:1282 fields.py:1429 relations.py:427 serializers.py:520 +#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 #, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1283 +#: fields.py:1291 msgid "This selection may not be empty." msgstr "" -#: fields.py:1320 +#: fields.py:1328 #, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1339 +#: fields.py:1347 msgid "No file was submitted." msgstr "" -#: fields.py:1340 +#: fields.py:1348 msgid "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1341 +#: fields.py:1349 msgid "No filename could be determined." msgstr "" -#: fields.py:1342 +#: fields.py:1350 msgid "The submitted file is empty." msgstr "" -#: fields.py:1343 +#: fields.py:1351 #, python-brace-format msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1391 +#: fields.py:1399 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: fields.py:1430 relations.py:428 serializers.py:521 +#: fields.py:1438 relations.py:439 serializers.py:521 msgid "This list may not be empty." msgstr "" -#: fields.py:1483 +#: fields.py:1491 #, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1530 +#: fields.py:1538 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html:5 +#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 msgid "Submit" msgstr "" #: pagination.py:189 -#, python-brace-format -msgid "Invalid page \"{page_number}\": {message}." +msgid "Invalid page." msgstr "" #: pagination.py:407 msgid "Invalid cursor" msgstr "" -#: relations.py:196 +#: relations.py:207 #, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" -#: relations.py:197 +#: relations.py:208 #, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" -#: relations.py:229 +#: relations.py:240 msgid "Invalid hyperlink - No URL match." msgstr "" -#: relations.py:230 +#: relations.py:241 msgid "Invalid hyperlink - Incorrect URL match." msgstr "" -#: relations.py:231 +#: relations.py:242 msgid "Invalid hyperlink - Object does not exist." msgstr "" -#: relations.py:232 +#: relations.py:243 #, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:391 +#: relations.py:402 #, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:392 +#: relations.py:403 msgid "Invalid value." msgstr "" diff --git a/rest_framework/locale/es/LC_MESSAGES/django.mo b/rest_framework/locale/es/LC_MESSAGES/django.mo index 287a794806c6cd9280e7195b9cca8e2ea602bb37..fa87eb02f6d6bb983902834ff2fb54091386e228 100644 GIT binary patch delta 2444 zcmY+_TWnNC9LMq5-gawSY8P54RoGszPz!YJg;J!nU0T3J5NIp+x@|YH*lx93ss!S` zCGN`0V}ed z&!f1S_86ApALz#^InDr!QT>g!31hmc=!Sc-7SAJp=5H<!W505{`Q+>L2?5Xpi$gbVRw zB;DqF*PoF;Gs#8wxr5q1S=?kg`cdr)tim8F#obfMzeax2{o*B5`vz(g-N!ndG0n;C zT2y-!HG^}g@BM-Syo(xOLB74YOdF=t-j5ob&6I5!bT){^4 zFfA=*6L#PR+>9r16Q(iUX58+27}wFhiOaEuz&*%*GGoZI%@?QvjicU( z_plCw`|^ z<+_T{;Pv1Nf&*fjh-U~Dts?YxzDXLVY_IxwEI(x_9lnMiT_w1OR)KPSsBsa*9^Xe2h;J8RM9)5(5^ZE{nk?tyX}>j>(;eTC>~>F`DR)-y%&9f_Q4mT zG1F{q&ndLd`kK9=p=e|{+ME2xH;|EhJ@=R=H5}cQoR^pF@kZkDmj{P>lhytcDcR2N z>}%W_pLW)=@@st^@#s)2G7z;cNQD z2=qn+k)6ZQ*l=G@q^IvfGG^VLu{)dI9!6t#B)bZ~^=9_PMlKxb@9T{u!^QrT^iY3f zB%0h>+TzIy4aSCtBJt>jQ<3CYSz7A<$9K5=nztjqGcwdSXpPKWZpBOTtTS`l{{B`}0>j8Sv zR^8R~MWj8MZE4$4R;^yu3ma6cwc4oFqBd*xxadu-*7tYrTgSR~{^xVu*E#3Duj_yP zuQR^m@$J#Cvy+}N+HT@nVm84nic|A=qg_lfE5r}b!OK{R8L4L1VKrWZ+fcv18w+q0 zgZLtr<0rTQ|HX|MNsAk`F*+>_e2nWcZ@$@1?7}s84%gx(Y{lYqvoH>!K7S3{a0ZL9 zGQ%tzJ5Uq43pM_b?`hQiCb3RSO<7>Z%NlrNan_1jVF&6#_hUVt$94EKHezt0Sp^@+xX& zQ@%g?tgbM1Dyj5XfIztT~DKCp0&jL zVmUfoZ$eG1A5}~za5a8~AxzCN+l66VickBV^}UGIjL+a?z$_=1{FgBBEz`RmlPTp2 z45EWQs687&)x;~f9H+1rf5Mxwkf+^-cVIV8;4aK!6%jn(`#Nsp`d4hiNR&M2I6R8I z_#xhemE=hd;7&Y)nwTx~GE#{*a@mT?$RnuFFQ8KYJt{-x6awX8L#X0@5S6hpR53@- z)7eUA7CW$s-Vt?|HL3JFZ3q11$9bBQ7fKAt$10H zcfWne@1i#B4?KsO*;!P|r+pJCc|E8cxrgmR2ct+*>?CSy-bEH|-=XdkU|+d~1yL(+ zM^2=5p(eZ^Gj#r+q(h3 zZ$+(MZM#SOZxuFoY<7$PN&1{`B-3vp*85}K7$J5ONrbjamET4v z8;yjvtDTtJl)*HjiBS60sP*`kG;9C0S88PKYD>M^^E%q!E3J#p2BMWH_XoEiM>^hA zWZK4hLPt_9#Up;CJL&7B>D0|vTGez!)Kr;Eh(tnrt9{>0s6bWiYV!#FC#)m%C!^*N zxkMomatBjq-0rl_*js4>$puc)(R+IL_uYQ*zQKKc_l^{Wouh+&!@~@X#7Y;v9Eg3C zl^%%AWS>rOpUrv4?aZxmpU8b_L0vFZ9jsd8gzCd}HEtxYz#pl1LUrM~+E{;HYl1tq z^Z|EaL3`{>{-KnT|2@a)KX~}PQv>~X_Rf7`aZz?cY;8#-5F0B^OmvU0{M, 2015 # José Padilla , 2015 # Miguel González , 2015 -# Miguel González , 2015 +# Miguel González , 2015-2016 # Sergio Infante , 2015 msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-07 18:53+0100\n" -"PO-Revision-Date: 2015-12-08 15:54+0000\n" +"POT-Creation-Date: 2016-03-01 18:38+0100\n" +"PO-Revision-Date: 2016-03-01 18:16+0000\n" "Last-Translator: Miguel González \n" "Language-Team: Spanish (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/es/)\n" "MIME-Version: 1.0\n" @@ -22,43 +22,75 @@ msgstr "" "Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:72 +#: authentication.py:71 msgid "Invalid basic header. No credentials provided." msgstr "Cabecera básica inválida. Las credenciales no fueron suministradas." -#: authentication.py:75 +#: authentication.py:74 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "Cabecera básica inválida. La cadena con las credenciales no debe contener espacios." -#: authentication.py:81 +#: authentication.py:80 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Cabecera básica inválida. Las credenciales incorrectamente codificadas en base64." -#: authentication.py:98 +#: authentication.py:97 msgid "Invalid username/password." msgstr "Nombre de usuario/contraseña inválidos." -#: authentication.py:101 authentication.py:188 +#: authentication.py:100 authentication.py:195 msgid "User inactive or deleted." msgstr "Usuario inactivo o borrado." -#: authentication.py:167 +#: authentication.py:173 msgid "Invalid token header. No credentials provided." msgstr "Cabecera token inválida. Las credenciales no fueron suministradas." -#: authentication.py:170 +#: authentication.py:176 msgid "Invalid token header. Token string should not contain spaces." msgstr "Cabecera token inválida. La cadena token no debe contener espacios." -#: authentication.py:176 +#: authentication.py:182 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "Cabecera token inválida. La cadena token no debe contener caracteres inválidos." -#: authentication.py:185 +#: authentication.py:192 msgid "Invalid token." msgstr "Token inválido." +#: authtoken/apps.py:7 +msgid "Auth Token" +msgstr "Token de autenticación" + +#: authtoken/models.py:21 +msgid "Key" +msgstr "Clave" + +#: authtoken/models.py:23 +msgid "User" +msgstr "Usuario" + +#: authtoken/models.py:24 +msgid "Created" +msgstr "Fecha de creación" + +#: authtoken/models.py:33 +msgid "Token" +msgstr "Token" + +#: authtoken/models.py:34 +msgid "Tokens" +msgstr "Tokens" + +#: authtoken/serializers.py:8 +msgid "Username" +msgstr "Nombre de usuario" + +#: authtoken/serializers.py:9 +msgid "Password" +msgstr "Contraseña" + #: authtoken/serializers.py:20 msgid "User account is disabled." msgstr "Cuenta de usuario está deshabilitada." @@ -113,7 +145,7 @@ msgstr "Tipo de medio \"{media_type}\" incompatible en la solicitud." msgid "Request was throttled." msgstr "Solicitud fue regulada (throttled)." -#: fields.py:266 relations.py:195 relations.py:228 validators.py:79 +#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 #: validators.py:162 msgid "This field is required." msgstr "Este campo es requerido." @@ -131,7 +163,7 @@ msgstr "\"{input}\" no es un booleano válido." msgid "This field may not be blank." msgstr "Este campo no puede estar en blanco." -#: fields.py:670 fields.py:1656 +#: fields.py:670 fields.py:1664 #, python-brace-format msgid "Ensure this field has no more than {max_length} characters." msgstr "Asegúrese de que este campo no tenga más de {max_length} caracteres." @@ -217,137 +249,136 @@ msgstr "Fecha/hora con formato erróneo. Use uno de los siguientes formatos en s msgid "Expected a datetime but got a date." msgstr "Se esperaba un fecha/hora en vez de una fecha." -#: fields.py:1079 +#: fields.py:1082 #, python-brace-format msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "Fecha con formato erróneo. Use uno de los siguientes formatos en su lugar: {format}." -#: fields.py:1080 +#: fields.py:1083 msgid "Expected a date but got a datetime." msgstr "Se esperaba una fecha en vez de una fecha/hora." -#: fields.py:1148 +#: fields.py:1151 #, python-brace-format msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "Hora con formato erróneo. Use uno de los siguientes formatos en su lugar: {format}." -#: fields.py:1207 +#: fields.py:1215 #, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "Duración con formato erróneo. Use uno de los siguientes formatos en su lugar: {format}." -#: fields.py:1232 fields.py:1281 +#: fields.py:1240 fields.py:1289 #, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" no es una elección válida." -#: fields.py:1235 relations.py:62 relations.py:431 +#: fields.py:1243 relations.py:71 relations.py:442 #, python-brace-format msgid "More than {count} items..." msgstr "Más de {count} elementos..." -#: fields.py:1282 fields.py:1429 relations.py:427 serializers.py:520 +#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 #, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Se esperaba una lista de elementos en vez del tipo \"{input_type}\"." -#: fields.py:1283 +#: fields.py:1291 msgid "This selection may not be empty." msgstr "Esta selección no puede estar vacía." -#: fields.py:1320 +#: fields.py:1328 #, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "\"{input}\" no es una elección de ruta válida." -#: fields.py:1339 +#: fields.py:1347 msgid "No file was submitted." msgstr "No se envió ningún archivo." -#: fields.py:1340 +#: fields.py:1348 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "La información enviada no era un archivo. Compruebe el tipo de codificación del formulario." -#: fields.py:1341 +#: fields.py:1349 msgid "No filename could be determined." msgstr "No se pudo determinar un nombre de archivo." -#: fields.py:1342 +#: fields.py:1350 msgid "The submitted file is empty." msgstr "El archivo enviado está vació." -#: fields.py:1343 +#: fields.py:1351 #, python-brace-format msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "Asegúrese de que el nombre de archivo no tenga más de {max_length} caracteres (tiene {length})." -#: fields.py:1391 +#: fields.py:1399 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "Adjunte una imagen válida. El archivo adjunto o bien no es una imagen o bien está dañado." -#: fields.py:1430 relations.py:428 serializers.py:521 +#: fields.py:1438 relations.py:439 serializers.py:521 msgid "This list may not be empty." msgstr "Esta lista no puede estar vacía." -#: fields.py:1483 +#: fields.py:1491 #, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "Se esperaba un diccionario de elementos en vez del tipo \"{input_type}\"." -#: fields.py:1530 +#: fields.py:1538 msgid "Value must be valid JSON." msgstr "El valor debe ser JSON válido." -#: filters.py:35 templates/rest_framework/filters/django_filter.html:5 +#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 msgid "Submit" msgstr "Enviar" #: pagination.py:189 -#, python-brace-format -msgid "Invalid page \"{page_number}\": {message}." -msgstr "Página \"{page_number}\" inválida: {message}." +msgid "Invalid page." +msgstr "Página inválida." #: pagination.py:407 msgid "Invalid cursor" msgstr "Cursor inválido" -#: relations.py:196 +#: relations.py:207 #, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Clave primaria \"{pk_value}\" inválida - objeto no existe." -#: relations.py:197 +#: relations.py:208 #, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Tipo incorrecto. Se esperaba valor de clave primaria y se recibió {data_type}." -#: relations.py:229 +#: relations.py:240 msgid "Invalid hyperlink - No URL match." msgstr "Hiperenlace inválido - No hay URL coincidentes." -#: relations.py:230 +#: relations.py:241 msgid "Invalid hyperlink - Incorrect URL match." msgstr "Hiperenlace inválido - Coincidencia incorrecta de la URL." -#: relations.py:231 +#: relations.py:242 msgid "Invalid hyperlink - Object does not exist." msgstr "Hiperenlace inválido - Objeto no existe." -#: relations.py:232 +#: relations.py:243 #, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Tipo incorrecto. Se esperaba una URL y se recibió {data_type}." -#: relations.py:391 +#: relations.py:402 #, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "Objeto con {slug_name}={value} no existe." -#: relations.py:392 +#: relations.py:403 msgid "Invalid value." msgstr "Valor inválido." diff --git a/rest_framework/locale/et/LC_MESSAGES/django.mo b/rest_framework/locale/et/LC_MESSAGES/django.mo index d0d064b1814c573673e8f9b7145b8226e7040ec9..ee9c40c2b63ff58a7f819ddf82980a809985b465 100644 GIT binary patch delta 1558 zcmYM!OGs2v9LMp$<~U`IX-;aXHJW8*HPm;LMI+D%uu@ikbfD7;fW@8lfyH}WlU$7KiZnNd+#}?d!Yw#AX#R+UO z3tQE6vu)fMz&d=1^_V!rY&|w$5YM2VKgSLD2j^gWN<4s_xQO{N$7`r{#;^we;$p0x z8DDQZ26(>>Gic<&Yg~n?v&_n{3sZ3j19%>n;tNzprmz^j90Nx>+vnkZh6XwPj@}cHIT!y{afG1Hq8$+c$h3zZw zHq`tC>PVlWjyRFD?7|jYk2kZ(|0V|CxzU3mN?KJt%tdE>AGN?+M=#r|W!{5Y@Ej_z zH>hI!feNgcbg9}8p#JV5R^TL(Ov@+TA*>2BSi;~Cmf}TRj?Zuf{zUDlgfundKFq+| zSb(F>`~#|}CNU4aTx1m&)lLVJR6B|b@hp~O_#Oj-vT^6ZZ{$O;Y__H9E<}=Jn^6nw zM+G#9O*n$e*e~Q1ES1$+!U~aOSPORJ4(z}Y>_V3>w$ZTlFi-|gV*}nr71dW%QDt!s zTW}p}!Kuc@nNwR$*P3N?KV3~h>N9rJt7Fx}KuuX_jE&;et=&#@ z=A1&T@KkI8x&l@(N?{v46xrzVM_OHJTXnk1Pa$1-(P0u{to~i7rh`*ceiP|@4zXN1 z|8irWKn?fQblA0#&#t0$B}0i(U2)2`Dw3C+mDkKjO({{Ur~Bxw^!8|HvfCXU@{GGY jwWSsQ(uzu7WgzGeL=I-;{J&GjooFQE#`Ngk+=AqPf7g>* delta 1702 zcmaLXe`w5c9LMpu+3jYWU)#)&ZNB^A=NxyNv$<`|cH1ya6t?nX*5%hW%WX@Ij`&Od zz*3U5WQC$M@*{sJ{vf|13Q7J@NK#5d#wyGnW;PQy;&42SCD@Bo@dYX)2_CcQn2(yTM<4D)ef}(# z<8#zHV|W^mlThOdp7Qv9tEZzAMB*OO3yjaBPWTv=^0znz2ajMeEInAY-FQYd00G0aRsPC&8N&fYQW;&YaM%C~b&cREllz)tm^F|Gvpb=*=--)Vi9~R(y z^kW*kZonEGhrMyHVUG$iLH_ILykue-PUcFl!A|614|!6p-=P*5 z!Y<@eoP&o^3*JF(G?@bH(oI2atQmFdPoduT0ev`)Q<79`jM6EivkfQX8T8^KoPob^ zCQhe5bFl$+vL0N3_b?SbS!TJIgBpiWcW4druw8MFqwdgEB-s{yLuVqLuc(@)a|||V z)u{Om$PdHzplq3^cgGiF>9InROxLm*gOvh{m z6RoHd-$Z5N6VAgl@~_La5_P$vxDqd-7IblJooFJKVJ!~AQbHL}_JV|(N->|%L1z=O zt!S6JOl~4TsA&VrLIt6wn(MTKHK0+IST+`-%AyTuGpg+(qP(ZvRTR~B7ZW;$nkrsG z^|0X}1_J$! ZslCbhE#b}KZMSZ;Z2I4qe4gM<`U73xwo?EA diff --git a/rest_framework/locale/et/LC_MESSAGES/django.po b/rest_framework/locale/et/LC_MESSAGES/django.po index da2db4967..5ccd9226c 100644 --- a/rest_framework/locale/et/LC_MESSAGES/django.po +++ b/rest_framework/locale/et/LC_MESSAGES/django.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-07 18:53+0100\n" -"PO-Revision-Date: 2015-12-07 17:55+0000\n" +"POT-Creation-Date: 2016-03-01 18:38+0100\n" +"PO-Revision-Date: 2016-03-01 17:38+0000\n" "Last-Translator: Xavier Ordoquy \n" "Language-Team: Estonian (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/et/)\n" "MIME-Version: 1.0\n" @@ -18,43 +18,75 @@ msgstr "" "Language: et\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:72 +#: authentication.py:71 msgid "Invalid basic header. No credentials provided." msgstr "Sobimatu lihtpäis. Kasutajatunnus on esitamata." -#: authentication.py:75 +#: authentication.py:74 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "Sobimatu lihtpäis. Kasutajatunnus ei tohi sisaldada tühikuid." -#: authentication.py:81 +#: authentication.py:80 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Sobimatu lihtpäis. Kasutajatunnus pole korrektselt base64-kodeeritud." -#: authentication.py:98 +#: authentication.py:97 msgid "Invalid username/password." msgstr "Sobimatu kasutajatunnus/salasõna." -#: authentication.py:101 authentication.py:188 +#: authentication.py:100 authentication.py:195 msgid "User inactive or deleted." msgstr "Kasutaja on inaktiivne või kustutatud." -#: authentication.py:167 +#: authentication.py:173 msgid "Invalid token header. No credentials provided." msgstr "Sobimatu lubakaardi päis. Kasutajatunnus on esitamata." -#: authentication.py:170 +#: authentication.py:176 msgid "Invalid token header. Token string should not contain spaces." msgstr "Sobimatu lubakaardi päis. Loa sõne ei tohi sisaldada tühikuid." -#: authentication.py:176 +#: authentication.py:182 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:185 +#: authentication.py:192 msgid "Invalid token." msgstr "Sobimatu lubakaart." +#: authtoken/apps.py:7 +msgid "Auth Token" +msgstr "" + +#: authtoken/models.py:21 +msgid "Key" +msgstr "" + +#: authtoken/models.py:23 +msgid "User" +msgstr "" + +#: authtoken/models.py:24 +msgid "Created" +msgstr "" + +#: authtoken/models.py:33 +msgid "Token" +msgstr "" + +#: authtoken/models.py:34 +msgid "Tokens" +msgstr "" + +#: authtoken/serializers.py:8 +msgid "Username" +msgstr "" + +#: authtoken/serializers.py:9 +msgid "Password" +msgstr "" + #: authtoken/serializers.py:20 msgid "User account is disabled." msgstr "Kasutajakonto on suletud." @@ -109,7 +141,7 @@ msgstr "Meedia tüüpi {media_type} päringus ei toetata." msgid "Request was throttled." msgstr "Liiga palju päringuid." -#: fields.py:266 relations.py:195 relations.py:228 validators.py:79 +#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 #: validators.py:162 msgid "This field is required." msgstr "Väli on kohustuslik." @@ -127,7 +159,7 @@ msgstr "\"{input}\" pole kehtiv kahendarv." msgid "This field may not be blank." msgstr "See väli ei tohi olla tühi." -#: fields.py:670 fields.py:1656 +#: fields.py:670 fields.py:1664 #, python-brace-format msgid "Ensure this field has no more than {max_length} characters." msgstr "Veendu, et see väli poleks pikem kui {max_length} tähemärki." @@ -213,137 +245,136 @@ msgstr "Valesti formaaditud kuupäev-kellaaeg. Kasutage mõnda neist: {format}." msgid "Expected a datetime but got a date." msgstr "Ootasin kuupäev-kellaaeg andmetüüpi, kuid sain hoopis kuupäeva." -#: fields.py:1079 +#: fields.py:1082 #, python-brace-format msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "Valesti formaaditud kuupäev. Kasutage mõnda neist: {format}." -#: fields.py:1080 +#: fields.py:1083 msgid "Expected a date but got a datetime." msgstr "Ootasin kuupäeva andmetüüpi, kuid sain hoopis kuupäev-kellaaja." -#: fields.py:1148 +#: fields.py:1151 #, python-brace-format msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "Valesti formaaditud kellaaeg. Kasutage mõnda neist: {format}." -#: fields.py:1207 +#: fields.py:1215 #, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1232 fields.py:1281 +#: fields.py:1240 fields.py:1289 #, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" on sobimatu valik." -#: fields.py:1235 relations.py:62 relations.py:431 +#: fields.py:1243 relations.py:71 relations.py:442 #, python-brace-format msgid "More than {count} items..." msgstr "" -#: fields.py:1282 fields.py:1429 relations.py:427 serializers.py:520 +#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 #, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Ootasin kirjete järjendit, kuid sain \"{input_type}\" - tüübi." -#: fields.py:1283 +#: fields.py:1291 msgid "This selection may not be empty." msgstr "" -#: fields.py:1320 +#: fields.py:1328 #, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1339 +#: fields.py:1347 msgid "No file was submitted." msgstr "Ühtegi faili ei esitatud." -#: fields.py:1340 +#: fields.py:1348 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "Esitatud andmetes ei olnud faili. Kontrollige vormi kodeeringut." -#: fields.py:1341 +#: fields.py:1349 msgid "No filename could be determined." msgstr "Ei suutnud tuvastada failinime." -#: fields.py:1342 +#: fields.py:1350 msgid "The submitted file is empty." msgstr "Esitatud fail oli tühi." -#: fields.py:1343 +#: fields.py:1351 #, python-brace-format msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "Veenduge, et failinimi oleks maksimaalselt {max_length} tähemärki pikk (praegu on {length})." -#: fields.py:1391 +#: fields.py:1399 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "Laadige üles kehtiv pildifail. Üles laetud fail ei olnud pilt või oli see katki." -#: fields.py:1430 relations.py:428 serializers.py:521 +#: fields.py:1438 relations.py:439 serializers.py:521 msgid "This list may not be empty." msgstr "" -#: fields.py:1483 +#: fields.py:1491 #, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "Ootasin kirjete sõnastikku, kuid sain \"{input_type}\"." -#: fields.py:1530 +#: fields.py:1538 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html:5 +#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 msgid "Submit" msgstr "" #: pagination.py:189 -#, python-brace-format -msgid "Invalid page \"{page_number}\": {message}." -msgstr "Sobimatu lehekülg \"{page_number}\": {message}." +msgid "Invalid page." +msgstr "" #: pagination.py:407 msgid "Invalid cursor" msgstr "Sobimatu kursor." -#: relations.py:196 +#: relations.py:207 #, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Sobimatu primaarvõti \"{pk_value}\" - objekti pole olemas." -#: relations.py:197 +#: relations.py:208 #, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Sobimatu andmetüüp. Ootasin primaarvõtit, sain {data_type}." -#: relations.py:229 +#: relations.py:240 msgid "Invalid hyperlink - No URL match." msgstr "Sobimatu hüperlink - ei leidnud URLi vastet." -#: relations.py:230 +#: relations.py:241 msgid "Invalid hyperlink - Incorrect URL match." msgstr "Sobimatu hüperlink - vale URLi vaste." -#: relations.py:231 +#: relations.py:242 msgid "Invalid hyperlink - Object does not exist." msgstr "Sobimatu hüperlink - objekti ei eksisteeri." -#: relations.py:232 +#: relations.py:243 #, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Sobimatu andmetüüp. Ootasin URLi sõne, sain {data_type}." -#: relations.py:391 +#: relations.py:402 #, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "Objekti {slug_name}={value} ei eksisteeri." -#: relations.py:392 +#: relations.py:403 msgid "Invalid value." msgstr "Sobimatu väärtus." diff --git a/rest_framework/locale/fa/LC_MESSAGES/django.mo b/rest_framework/locale/fa/LC_MESSAGES/django.mo new file mode 100644 index 0000000000000000000000000000000000000000..4b0b24bc2f1de50cd2d90d779dc1bba70ac760f6 GIT binary patch literal 507 zcmZut%TB{E5Cp*~N6s94-~fVc94bL@DMIuiRibKC0^+(PPU@1_!Eu`QL--(mgm1xV zQG4l1Bd_h5-JShCIsQJdacFUBab|I3ab?kjZ}DS4@9f!dwh?GG=aGR?3~yYQLP$+~4rl?5xvQfD4+9hai+ihKfxBuPE{>!@w zx);uPG#>2s<+Z5OQ_^s02VWI-1BNe+TVyC?heR{fB{$vIa0vd6*UXY|4FegeSjdzS j|3jFq4Mq}lf~?Y*!BFYEWJDJ0YuWWWWRrGj$2s@|e\n" +"Language-Team: Persian (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/fa/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: fa\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: authentication.py:71 +msgid "Invalid basic header. No credentials provided." +msgstr "" + +#: authentication.py:74 +msgid "Invalid basic header. Credentials string should not contain spaces." +msgstr "" + +#: authentication.py:80 +msgid "Invalid basic header. Credentials not correctly base64 encoded." +msgstr "" + +#: authentication.py:97 +msgid "Invalid username/password." +msgstr "" + +#: authentication.py:100 authentication.py:195 +msgid "User inactive or deleted." +msgstr "" + +#: authentication.py:173 +msgid "Invalid token header. No credentials provided." +msgstr "" + +#: authentication.py:176 +msgid "Invalid token header. Token string should not contain spaces." +msgstr "" + +#: authentication.py:182 +msgid "" +"Invalid token header. Token string should not contain invalid characters." +msgstr "" + +#: authentication.py:192 +msgid "Invalid token." +msgstr "" + +#: authtoken/apps.py:7 +msgid "Auth Token" +msgstr "" + +#: authtoken/models.py:21 +msgid "Key" +msgstr "" + +#: authtoken/models.py:23 +msgid "User" +msgstr "" + +#: authtoken/models.py:24 +msgid "Created" +msgstr "" + +#: authtoken/models.py:33 +msgid "Token" +msgstr "" + +#: authtoken/models.py:34 +msgid "Tokens" +msgstr "" + +#: authtoken/serializers.py:8 +msgid "Username" +msgstr "" + +#: authtoken/serializers.py:9 +msgid "Password" +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:49 +msgid "A server error occurred." +msgstr "" + +#: exceptions.py:84 +msgid "Malformed request." +msgstr "" + +#: exceptions.py:89 +msgid "Incorrect authentication credentials." +msgstr "" + +#: exceptions.py:94 +msgid "Authentication credentials were not provided." +msgstr "" + +#: exceptions.py:99 +msgid "You do not have permission to perform this action." +msgstr "" + +#: exceptions.py:104 views.py:81 +msgid "Not found." +msgstr "" + +#: exceptions.py:109 +#, python-brace-format +msgid "Method \"{method}\" not allowed." +msgstr "" + +#: exceptions.py:120 +msgid "Could not satisfy the request Accept header." +msgstr "" + +#: exceptions.py:132 +#, python-brace-format +msgid "Unsupported media type \"{media_type}\" in request." +msgstr "" + +#: exceptions.py:145 +msgid "Request was throttled." +msgstr "" + +#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 +#: validators.py:162 +msgid "This field is required." +msgstr "" + +#: fields.py:267 +msgid "This field may not be null." +msgstr "" + +#: fields.py:603 fields.py:634 +#, python-brace-format +msgid "\"{input}\" is not a valid boolean." +msgstr "" + +#: fields.py:669 +msgid "This field may not be blank." +msgstr "" + +#: fields.py:670 fields.py:1664 +#, python-brace-format +msgid "Ensure this field has no more than {max_length} characters." +msgstr "" + +#: fields.py:671 +#, python-brace-format +msgid "Ensure this field has at least {min_length} characters." +msgstr "" + +#: fields.py:708 +msgid "Enter a valid email address." +msgstr "" + +#: fields.py:719 +msgid "This value does not match the required pattern." +msgstr "" + +#: fields.py:730 +msgid "" +"Enter a valid \"slug\" consisting of letters, numbers, underscores or " +"hyphens." +msgstr "" + +#: fields.py:742 +msgid "Enter a valid URL." +msgstr "" + +#: fields.py:755 +#, python-brace-format +msgid "\"{value}\" is not a valid UUID." +msgstr "" + +#: fields.py:791 +msgid "Enter a valid IPv4 or IPv6 address." +msgstr "" + +#: fields.py:816 +msgid "A valid integer is required." +msgstr "" + +#: fields.py:817 fields.py:852 fields.py:885 +#, python-brace-format +msgid "Ensure this value is less than or equal to {max_value}." +msgstr "" + +#: fields.py:818 fields.py:853 fields.py:886 +#, python-brace-format +msgid "Ensure this value is greater than or equal to {min_value}." +msgstr "" + +#: fields.py:819 fields.py:854 fields.py:890 +msgid "String value too large." +msgstr "" + +#: fields.py:851 fields.py:884 +msgid "A valid number is required." +msgstr "" + +#: fields.py:887 +#, python-brace-format +msgid "Ensure that there are no more than {max_digits} digits in total." +msgstr "" + +#: fields.py:888 +#, python-brace-format +msgid "" +"Ensure that there are no more than {max_decimal_places} decimal places." +msgstr "" + +#: fields.py:889 +#, python-brace-format +msgid "" +"Ensure that there are no more than {max_whole_digits} digits before the " +"decimal point." +msgstr "" + +#: fields.py:1004 +#, python-brace-format +msgid "Datetime has wrong format. Use one of these formats instead: {format}." +msgstr "" + +#: fields.py:1005 +msgid "Expected a datetime but got a date." +msgstr "" + +#: fields.py:1082 +#, python-brace-format +msgid "Date has wrong format. Use one of these formats instead: {format}." +msgstr "" + +#: fields.py:1083 +msgid "Expected a date but got a datetime." +msgstr "" + +#: fields.py:1151 +#, python-brace-format +msgid "Time has wrong format. Use one of these formats instead: {format}." +msgstr "" + +#: fields.py:1215 +#, python-brace-format +msgid "Duration has wrong format. Use one of these formats instead: {format}." +msgstr "" + +#: fields.py:1240 fields.py:1289 +#, python-brace-format +msgid "\"{input}\" is not a valid choice." +msgstr "" + +#: fields.py:1243 relations.py:71 relations.py:442 +#, python-brace-format +msgid "More than {count} items..." +msgstr "" + +#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 +#, python-brace-format +msgid "Expected a list of items but got type \"{input_type}\"." +msgstr "" + +#: fields.py:1291 +msgid "This selection may not be empty." +msgstr "" + +#: fields.py:1328 +#, python-brace-format +msgid "\"{input}\" is not a valid path choice." +msgstr "" + +#: fields.py:1347 +msgid "No file was submitted." +msgstr "" + +#: fields.py:1348 +msgid "" +"The submitted data was not a file. Check the encoding type on the form." +msgstr "" + +#: fields.py:1349 +msgid "No filename could be determined." +msgstr "" + +#: fields.py:1350 +msgid "The submitted file is empty." +msgstr "" + +#: fields.py:1351 +#, python-brace-format +msgid "" +"Ensure this filename has at most {max_length} characters (it has {length})." +msgstr "" + +#: fields.py:1399 +msgid "" +"Upload a valid image. The file you uploaded was either not an image or a " +"corrupted image." +msgstr "" + +#: fields.py:1438 relations.py:439 serializers.py:521 +msgid "This list may not be empty." +msgstr "" + +#: fields.py:1491 +#, python-brace-format +msgid "Expected a dictionary of items but got type \"{input_type}\"." +msgstr "" + +#: fields.py:1538 +msgid "Value must be valid JSON." +msgstr "" + +#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +msgid "Submit" +msgstr "" + +#: pagination.py:189 +msgid "Invalid page." +msgstr "" + +#: pagination.py:407 +msgid "Invalid cursor" +msgstr "" + +#: relations.py:207 +#, python-brace-format +msgid "Invalid pk \"{pk_value}\" - object does not exist." +msgstr "" + +#: relations.py:208 +#, python-brace-format +msgid "Incorrect type. Expected pk value, received {data_type}." +msgstr "" + +#: relations.py:240 +msgid "Invalid hyperlink - No URL match." +msgstr "" + +#: relations.py:241 +msgid "Invalid hyperlink - Incorrect URL match." +msgstr "" + +#: relations.py:242 +msgid "Invalid hyperlink - Object does not exist." +msgstr "" + +#: relations.py:243 +#, python-brace-format +msgid "Incorrect type. Expected URL string, received {data_type}." +msgstr "" + +#: relations.py:402 +#, python-brace-format +msgid "Object with {slug_name}={value} does not exist." +msgstr "" + +#: relations.py:403 +msgid "Invalid value." +msgstr "" + +#: serializers.py:326 +#, python-brace-format +msgid "Invalid data. Expected a dictionary, but got {datatype}." +msgstr "" + +#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/base.html:128 +msgid "Filters" +msgstr "" + +#: templates/rest_framework/filters/django_filter.html:2 +#: templates/rest_framework/filters/django_filter_crispyforms.html:4 +msgid "Field filters" +msgstr "" + +#: templates/rest_framework/filters/ordering.html:3 +msgid "Ordering" +msgstr "" + +#: templates/rest_framework/filters/search.html:2 +msgid "Search" +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:24 +msgid "This field must be unique." +msgstr "" + +#: validators.py:78 +#, python-brace-format +msgid "The fields {field_names} must make a unique set." +msgstr "" + +#: validators.py:226 +#, python-brace-format +msgid "This field must be unique for the \"{date_field}\" date." +msgstr "" + +#: validators.py:241 +#, python-brace-format +msgid "This field must be unique for the \"{date_field}\" month." +msgstr "" + +#: validators.py:254 +#, python-brace-format +msgid "This field must be unique for the \"{date_field}\" year." +msgstr "" + +#: versioning.py:42 +msgid "Invalid version in \"Accept\" header." +msgstr "" + +#: versioning.py:73 versioning.py:115 +msgid "Invalid version in URL path." +msgstr "" + +#: versioning.py:144 +msgid "Invalid version in hostname." +msgstr "" + +#: versioning.py:166 +msgid "Invalid version in query parameter." +msgstr "" + +#: views.py:88 +msgid "Permission denied." +msgstr "" diff --git a/rest_framework/locale/fa_IR/LC_MESSAGES/django.mo b/rest_framework/locale/fa_IR/LC_MESSAGES/django.mo new file mode 100644 index 0000000000000000000000000000000000000000..05d849e0849e8f2a4697719b5a11a60ab4f1ffb9 GIT binary patch literal 520 zcmZutO-}+b5XIdA(23EHQr2R%Tiq0wOhV^h=0qU;BRpj z3|yGxr8DiDd42PHdh%VOI3k=8&I!kaOF|JL;fEe?=`1+A7+5ovBZu7>U!~2J(HvS+ zp%Vkc_HzVdD`s+O?58)BnXwLgd7@%`oF_R(hJ!cgN7%GdIBLa~aFW9n3$BsXkOdHg zycS-tfH5NCP%cyWbNFELTONA8*W}m87~ei^1W0 zKmAwn$Kt&^^ebMk+iUMP7gU+oG}=i`7S\n" +"Language-Team: Persian (Iran) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/fa_IR/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: fa_IR\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: authentication.py:71 +msgid "Invalid basic header. No credentials provided." +msgstr "" + +#: authentication.py:74 +msgid "Invalid basic header. Credentials string should not contain spaces." +msgstr "" + +#: authentication.py:80 +msgid "Invalid basic header. Credentials not correctly base64 encoded." +msgstr "" + +#: authentication.py:97 +msgid "Invalid username/password." +msgstr "" + +#: authentication.py:100 authentication.py:195 +msgid "User inactive or deleted." +msgstr "" + +#: authentication.py:173 +msgid "Invalid token header. No credentials provided." +msgstr "" + +#: authentication.py:176 +msgid "Invalid token header. Token string should not contain spaces." +msgstr "" + +#: authentication.py:182 +msgid "" +"Invalid token header. Token string should not contain invalid characters." +msgstr "" + +#: authentication.py:192 +msgid "Invalid token." +msgstr "" + +#: authtoken/apps.py:7 +msgid "Auth Token" +msgstr "" + +#: authtoken/models.py:21 +msgid "Key" +msgstr "" + +#: authtoken/models.py:23 +msgid "User" +msgstr "" + +#: authtoken/models.py:24 +msgid "Created" +msgstr "" + +#: authtoken/models.py:33 +msgid "Token" +msgstr "" + +#: authtoken/models.py:34 +msgid "Tokens" +msgstr "" + +#: authtoken/serializers.py:8 +msgid "Username" +msgstr "" + +#: authtoken/serializers.py:9 +msgid "Password" +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:49 +msgid "A server error occurred." +msgstr "" + +#: exceptions.py:84 +msgid "Malformed request." +msgstr "" + +#: exceptions.py:89 +msgid "Incorrect authentication credentials." +msgstr "" + +#: exceptions.py:94 +msgid "Authentication credentials were not provided." +msgstr "" + +#: exceptions.py:99 +msgid "You do not have permission to perform this action." +msgstr "" + +#: exceptions.py:104 views.py:81 +msgid "Not found." +msgstr "" + +#: exceptions.py:109 +#, python-brace-format +msgid "Method \"{method}\" not allowed." +msgstr "" + +#: exceptions.py:120 +msgid "Could not satisfy the request Accept header." +msgstr "" + +#: exceptions.py:132 +#, python-brace-format +msgid "Unsupported media type \"{media_type}\" in request." +msgstr "" + +#: exceptions.py:145 +msgid "Request was throttled." +msgstr "" + +#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 +#: validators.py:162 +msgid "This field is required." +msgstr "" + +#: fields.py:267 +msgid "This field may not be null." +msgstr "" + +#: fields.py:603 fields.py:634 +#, python-brace-format +msgid "\"{input}\" is not a valid boolean." +msgstr "" + +#: fields.py:669 +msgid "This field may not be blank." +msgstr "" + +#: fields.py:670 fields.py:1664 +#, python-brace-format +msgid "Ensure this field has no more than {max_length} characters." +msgstr "" + +#: fields.py:671 +#, python-brace-format +msgid "Ensure this field has at least {min_length} characters." +msgstr "" + +#: fields.py:708 +msgid "Enter a valid email address." +msgstr "" + +#: fields.py:719 +msgid "This value does not match the required pattern." +msgstr "" + +#: fields.py:730 +msgid "" +"Enter a valid \"slug\" consisting of letters, numbers, underscores or " +"hyphens." +msgstr "" + +#: fields.py:742 +msgid "Enter a valid URL." +msgstr "" + +#: fields.py:755 +#, python-brace-format +msgid "\"{value}\" is not a valid UUID." +msgstr "" + +#: fields.py:791 +msgid "Enter a valid IPv4 or IPv6 address." +msgstr "" + +#: fields.py:816 +msgid "A valid integer is required." +msgstr "" + +#: fields.py:817 fields.py:852 fields.py:885 +#, python-brace-format +msgid "Ensure this value is less than or equal to {max_value}." +msgstr "" + +#: fields.py:818 fields.py:853 fields.py:886 +#, python-brace-format +msgid "Ensure this value is greater than or equal to {min_value}." +msgstr "" + +#: fields.py:819 fields.py:854 fields.py:890 +msgid "String value too large." +msgstr "" + +#: fields.py:851 fields.py:884 +msgid "A valid number is required." +msgstr "" + +#: fields.py:887 +#, python-brace-format +msgid "Ensure that there are no more than {max_digits} digits in total." +msgstr "" + +#: fields.py:888 +#, python-brace-format +msgid "" +"Ensure that there are no more than {max_decimal_places} decimal places." +msgstr "" + +#: fields.py:889 +#, python-brace-format +msgid "" +"Ensure that there are no more than {max_whole_digits} digits before the " +"decimal point." +msgstr "" + +#: fields.py:1004 +#, python-brace-format +msgid "Datetime has wrong format. Use one of these formats instead: {format}." +msgstr "" + +#: fields.py:1005 +msgid "Expected a datetime but got a date." +msgstr "" + +#: fields.py:1082 +#, python-brace-format +msgid "Date has wrong format. Use one of these formats instead: {format}." +msgstr "" + +#: fields.py:1083 +msgid "Expected a date but got a datetime." +msgstr "" + +#: fields.py:1151 +#, python-brace-format +msgid "Time has wrong format. Use one of these formats instead: {format}." +msgstr "" + +#: fields.py:1215 +#, python-brace-format +msgid "Duration has wrong format. Use one of these formats instead: {format}." +msgstr "" + +#: fields.py:1240 fields.py:1289 +#, python-brace-format +msgid "\"{input}\" is not a valid choice." +msgstr "" + +#: fields.py:1243 relations.py:71 relations.py:442 +#, python-brace-format +msgid "More than {count} items..." +msgstr "" + +#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 +#, python-brace-format +msgid "Expected a list of items but got type \"{input_type}\"." +msgstr "" + +#: fields.py:1291 +msgid "This selection may not be empty." +msgstr "" + +#: fields.py:1328 +#, python-brace-format +msgid "\"{input}\" is not a valid path choice." +msgstr "" + +#: fields.py:1347 +msgid "No file was submitted." +msgstr "" + +#: fields.py:1348 +msgid "" +"The submitted data was not a file. Check the encoding type on the form." +msgstr "" + +#: fields.py:1349 +msgid "No filename could be determined." +msgstr "" + +#: fields.py:1350 +msgid "The submitted file is empty." +msgstr "" + +#: fields.py:1351 +#, python-brace-format +msgid "" +"Ensure this filename has at most {max_length} characters (it has {length})." +msgstr "" + +#: fields.py:1399 +msgid "" +"Upload a valid image. The file you uploaded was either not an image or a " +"corrupted image." +msgstr "" + +#: fields.py:1438 relations.py:439 serializers.py:521 +msgid "This list may not be empty." +msgstr "" + +#: fields.py:1491 +#, python-brace-format +msgid "Expected a dictionary of items but got type \"{input_type}\"." +msgstr "" + +#: fields.py:1538 +msgid "Value must be valid JSON." +msgstr "" + +#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +msgid "Submit" +msgstr "" + +#: pagination.py:189 +msgid "Invalid page." +msgstr "" + +#: pagination.py:407 +msgid "Invalid cursor" +msgstr "" + +#: relations.py:207 +#, python-brace-format +msgid "Invalid pk \"{pk_value}\" - object does not exist." +msgstr "" + +#: relations.py:208 +#, python-brace-format +msgid "Incorrect type. Expected pk value, received {data_type}." +msgstr "" + +#: relations.py:240 +msgid "Invalid hyperlink - No URL match." +msgstr "" + +#: relations.py:241 +msgid "Invalid hyperlink - Incorrect URL match." +msgstr "" + +#: relations.py:242 +msgid "Invalid hyperlink - Object does not exist." +msgstr "" + +#: relations.py:243 +#, python-brace-format +msgid "Incorrect type. Expected URL string, received {data_type}." +msgstr "" + +#: relations.py:402 +#, python-brace-format +msgid "Object with {slug_name}={value} does not exist." +msgstr "" + +#: relations.py:403 +msgid "Invalid value." +msgstr "" + +#: serializers.py:326 +#, python-brace-format +msgid "Invalid data. Expected a dictionary, but got {datatype}." +msgstr "" + +#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/base.html:128 +msgid "Filters" +msgstr "" + +#: templates/rest_framework/filters/django_filter.html:2 +#: templates/rest_framework/filters/django_filter_crispyforms.html:4 +msgid "Field filters" +msgstr "" + +#: templates/rest_framework/filters/ordering.html:3 +msgid "Ordering" +msgstr "" + +#: templates/rest_framework/filters/search.html:2 +msgid "Search" +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:24 +msgid "This field must be unique." +msgstr "" + +#: validators.py:78 +#, python-brace-format +msgid "The fields {field_names} must make a unique set." +msgstr "" + +#: validators.py:226 +#, python-brace-format +msgid "This field must be unique for the \"{date_field}\" date." +msgstr "" + +#: validators.py:241 +#, python-brace-format +msgid "This field must be unique for the \"{date_field}\" month." +msgstr "" + +#: validators.py:254 +#, python-brace-format +msgid "This field must be unique for the \"{date_field}\" year." +msgstr "" + +#: versioning.py:42 +msgid "Invalid version in \"Accept\" header." +msgstr "" + +#: versioning.py:73 versioning.py:115 +msgid "Invalid version in URL path." +msgstr "" + +#: versioning.py:144 +msgid "Invalid version in hostname." +msgstr "" + +#: versioning.py:166 +msgid "Invalid version in query parameter." +msgstr "" + +#: views.py:88 +msgid "Permission denied." +msgstr "" diff --git a/rest_framework/locale/fi/LC_MESSAGES/django.mo b/rest_framework/locale/fi/LC_MESSAGES/django.mo index 2b7144816b59ad8a52ee9d5312b1dee78ee06bca..cd904e35cd5ce2b2f7c8b2ff4128363545f3de61 100644 GIT binary patch delta 2011 zcmYk-eN0t#9LMo5cDWZap}2WLP&`7YDVHu>L!RV8P*DW52SRESmey`Fui7MSxwE!f zI(4$$nwy(XtNw6p4dsuZST0tZ|7e@Gh11;9KN`)onM`x`NAJ(M$JKBA&g*x6_nh;4 z__r$*_c&ZXX-Vdmm^CI`xB$ZP?Qp@Y}34FADmEXgt}z!uc~eOQF= zViZ$Yj^E=-{1aDWWwxhlduXho<2*KF=y9_iY{%tz66^67?7;9$vpU?2`u!NL$IDoX z^Pe!w!&cOUdQkoE_#Q<)?^}FcOTABH79CLzEXwLpD{Ms#l)xJN9Gmc0Y{hvwW)(Pq z{Mir(U3U@}<0NY5GIGt9U@6A13oFpYwc6^hXsp1$k$bHANwY#+g*xv?tsse7QObAN z@4tvz@f}o10#BvyFU3WiH(~_eKnM3>7*C)ZpmB}{yK7(Lb2x#7$^Jq;_#x^6Ih+Ks z4D+$vKX1br=N+g}zK@#d52)*Y^UoikawEd%)mRl~{}sc8-*FnX@=4T%chSMzr_&RQ zp^~T{m*Qtwi9g{c%$RL92VeEw?Rx~P=s$xOGR&@{Li9yG`>$AEVw&3GX>_oFl;#?% z#Rb@nn$S)x!NaH(4C9OVJN9Bdqp!tJunljZa;212_28RWhu@*@f8hE*#CW<^@-Zp| zV>p0QsO0HjKee(!R7{7k5l2x2-N!gK%uCCZ6q>y@0j29uFaTX;)GA|ACrV9<$*& zu9eVWGPVX4immA%>>z5ZhkdW02E2z+EaXRB-;SElc2u&ZkWYbqiC$9ULe3}r^C{GX zrcwE4nLIT>#~ft0tr)dsb*LD%ViUfHY>It@3dL3A8Fm+yOc7?$f=#Fxe}GEvan$wG zzB$ZV<1EH9#A&YyspN_(fc@Q1=@BMty&XiL0;MD+mzZEEON^^ zQ>2$s^)9F=AdgCr#%gMp-?0gsseRM{RZCR{DjQjum#zwIH}(HTSHzr=HnXSdo(ZQ>D2d*qItHNe1$3E2epTJ5y zjsbiV8*m=C;6Jz>V=JhJGj4_?7q z+_=(gHTI(>^cbrDdDnMP@B0!%TB@(mjE_aQusDmOR@jdk=oxIs_c4mU;#Lf-GHb*q zk&nH`MbAy+I{X>6bHznw8?Xh{Ka5Ry92>ROAJVuN7cqjtn{zLmzzXi4b??ujR&oxt zvN_jZ+)7*(Z5m8RWO+Dn^8HkvxNO`qj7)^#qtf*{Q_#{#kb@h zY(R(m9jJ+oppxk<*5eNt#DY?@K@8)qc-r;6>qTs){|a7MW>#9p{wpS*F+IinchnY_ zlF|-#AkW%fT#E-$Ge3njcpf$3dF;mmM%{z^Q6ZhhZTK%LXST7b-FO1S_+y%eUQoeX z^@l#xO3tBHx_}Avvu{eGQRH3r3M!`W;b#0EHBkBOBpME(zW*{7;U}n2&Z8ExfZDU~rd1>}11(&(mkxgC2^`?injp=zmGzOqNl+)7nowG}s( z2siu>$sPmkvkLL?W`lN5<|l7UT1RsWRSDieRnbm!2(yJ>?CcJ diff --git a/rest_framework/locale/fi/LC_MESSAGES/django.po b/rest_framework/locale/fi/LC_MESSAGES/django.po index c6c24c647..39315af6b 100644 --- a/rest_framework/locale/fi/LC_MESSAGES/django.po +++ b/rest_framework/locale/fi/LC_MESSAGES/django.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-07 18:53+0100\n" -"PO-Revision-Date: 2015-12-08 16:26+0000\n" -"Last-Translator: Aarni Koskela\n" +"POT-Creation-Date: 2016-03-01 18:38+0100\n" +"PO-Revision-Date: 2016-03-01 17:38+0000\n" +"Last-Translator: Xavier Ordoquy \n" "Language-Team: Finnish (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/fi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,43 +19,75 @@ msgstr "" "Language: fi\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:72 +#: authentication.py:71 msgid "Invalid basic header. No credentials provided." msgstr "Epäkelpo perusotsake. Ei annettuja tunnuksia." -#: authentication.py:75 +#: authentication.py:74 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "Epäkelpo perusotsake. Tunnusmerkkijono ei saa sisältää välilyöntejä." -#: authentication.py:81 +#: authentication.py:80 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Epäkelpo perusotsake. Tunnukset eivät ole base64-koodattu." -#: authentication.py:98 +#: authentication.py:97 msgid "Invalid username/password." msgstr "Epäkelpo käyttäjänimi tai salasana." -#: authentication.py:101 authentication.py:188 +#: authentication.py:100 authentication.py:195 msgid "User inactive or deleted." msgstr "Käyttäjä ei-aktiivinen tai poistettu." -#: authentication.py:167 +#: authentication.py:173 msgid "Invalid token header. No credentials provided." msgstr "Epäkelpo Token-otsake. Ei annettuja tunnuksia." -#: authentication.py:170 +#: authentication.py:176 msgid "Invalid token header. Token string should not contain spaces." msgstr "Epäkelpo Token-otsake. Tunnusmerkkijono ei saa sisältää välilyöntejä." -#: authentication.py:176 +#: authentication.py:182 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "Epäkelpo Token-otsake. Tunnusmerkkijono ei saa sisältää epäkelpoja merkkejä." -#: authentication.py:185 +#: authentication.py:192 msgid "Invalid token." msgstr "Epäkelpo Token." +#: authtoken/apps.py:7 +msgid "Auth Token" +msgstr "" + +#: authtoken/models.py:21 +msgid "Key" +msgstr "" + +#: authtoken/models.py:23 +msgid "User" +msgstr "" + +#: authtoken/models.py:24 +msgid "Created" +msgstr "" + +#: authtoken/models.py:33 +msgid "Token" +msgstr "" + +#: authtoken/models.py:34 +msgid "Tokens" +msgstr "" + +#: authtoken/serializers.py:8 +msgid "Username" +msgstr "" + +#: authtoken/serializers.py:9 +msgid "Password" +msgstr "" + #: authtoken/serializers.py:20 msgid "User account is disabled." msgstr "Käyttäjätili ei ole käytössä." @@ -110,7 +142,7 @@ msgstr "Pyynnön mediatyyppiä \"{media_type}\" ei tueta." msgid "Request was throttled." msgstr "Pyyntö hidastettu." -#: fields.py:266 relations.py:195 relations.py:228 validators.py:79 +#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 #: validators.py:162 msgid "This field is required." msgstr "Tämä kenttä vaaditaan." @@ -128,7 +160,7 @@ msgstr "\"{input}\" ei ole kelvollinen totuusarvo." msgid "This field may not be blank." msgstr "Tämä kenttä ei voi olla tyhjä." -#: fields.py:670 fields.py:1656 +#: fields.py:670 fields.py:1664 #, python-brace-format msgid "Ensure this field has no more than {max_length} characters." msgstr "Arvo saa olla enintään {max_length} merkkiä pitkä." @@ -214,137 +246,136 @@ msgstr "Virheellinen päivämäärän/ajan muotoilu. Käytä jotain näistä muo msgid "Expected a datetime but got a date." msgstr "Odotettiin päivämäärää ja aikaa, saatiin vain päivämäärä." -#: fields.py:1079 +#: fields.py:1082 #, python-brace-format msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "Virheellinen päivämäärän muotoilu. Käytä jotain näistä muodoista: {format}" -#: fields.py:1080 +#: fields.py:1083 msgid "Expected a date but got a datetime." msgstr "Odotettiin päivämäärää, saatiin päivämäärä ja aika." -#: fields.py:1148 +#: fields.py:1151 #, python-brace-format msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "Virheellinen kellonajan muotoilu. Käytä jotain näistä muodoista: {format}" -#: fields.py:1207 +#: fields.py:1215 #, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "Virheellinen keston muotoilu. Käytä jotain näistä muodoista: {format}" -#: fields.py:1232 fields.py:1281 +#: fields.py:1240 fields.py:1289 #, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" ei ole kelvollinen valinta." -#: fields.py:1235 relations.py:62 relations.py:431 +#: fields.py:1243 relations.py:71 relations.py:442 #, python-brace-format msgid "More than {count} items..." msgstr "Enemmän kuin {count} kappaletta..." -#: fields.py:1282 fields.py:1429 relations.py:427 serializers.py:520 +#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 #, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Odotettiin listaa, saatiin tyyppi {input_type}." -#: fields.py:1283 +#: fields.py:1291 msgid "This selection may not be empty." msgstr "Valinta ei saa olla tyhjä." -#: fields.py:1320 +#: fields.py:1328 #, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "\"{input}\" ei ole kelvollinen polku." -#: fields.py:1339 +#: fields.py:1347 msgid "No file was submitted." msgstr "Yhtään tiedostoa ei ole lähetetty." -#: fields.py:1340 +#: fields.py:1348 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "Tiedostoa ei lähetetty. Tarkista lomakkeen koodaus (encoding)." -#: fields.py:1341 +#: fields.py:1349 msgid "No filename could be determined." msgstr "Tiedostonimeä ei voitu päätellä." -#: fields.py:1342 +#: fields.py:1350 msgid "The submitted file is empty." msgstr "Lähetetty tiedosto on tyhjä." -#: fields.py:1343 +#: fields.py:1351 #, python-brace-format msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "Varmista että tiedostonimi on enintään {max_length} merkkiä pitkä (nyt {length})." -#: fields.py:1391 +#: fields.py:1399 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "Kuva ei kelpaa. Lähettämäsi tiedosto ei ole kuva, tai tiedosto on vioittunut." -#: fields.py:1430 relations.py:428 serializers.py:521 +#: fields.py:1438 relations.py:439 serializers.py:521 msgid "This list may not be empty." msgstr "Lista ei saa olla tyhjä." -#: fields.py:1483 +#: fields.py:1491 #, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "Odotettiin sanakirjaa, saatiin tyyppi {input_type}." -#: fields.py:1530 +#: fields.py:1538 msgid "Value must be valid JSON." msgstr "Arvon pitää olla kelvollista JSONia." -#: filters.py:35 templates/rest_framework/filters/django_filter.html:5 +#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 msgid "Submit" msgstr "Lähetä" #: pagination.py:189 -#, python-brace-format -msgid "Invalid page \"{page_number}\": {message}." -msgstr "Epäkelpo sivu ({page_number}): {message}" +msgid "Invalid page." +msgstr "" #: pagination.py:407 msgid "Invalid cursor" msgstr "Epäkelpo kursori" -#: relations.py:196 +#: relations.py:207 #, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Epäkelpo pääavain {pk_value} - objektia ei ole olemassa." -#: relations.py:197 +#: relations.py:208 #, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Väärä tyyppi. Odotettiin pääavainarvoa, saatiin {data_type}." -#: relations.py:229 +#: relations.py:240 msgid "Invalid hyperlink - No URL match." msgstr "Epäkelpo linkki - URL ei täsmää." -#: relations.py:230 +#: relations.py:241 msgid "Invalid hyperlink - Incorrect URL match." msgstr "Epäkelpo linkki - epäkelpo URL-osuma." -#: relations.py:231 +#: relations.py:242 msgid "Invalid hyperlink - Object does not exist." msgstr "Epäkelpo linkki - objektia ei ole." -#: relations.py:232 +#: relations.py:243 #, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Epäkelpo tyyppi. Odotettiin URL-merkkijonoa, saatiin {data_type}." -#: relations.py:391 +#: relations.py:402 #, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "Objektia ({slug_name}={value}) ei ole." -#: relations.py:392 +#: relations.py:403 msgid "Invalid value." msgstr "Epäkelpo arvo." diff --git a/rest_framework/locale/fr/LC_MESSAGES/django.mo b/rest_framework/locale/fr/LC_MESSAGES/django.mo index 03bcfa949ca022d3279d332353a6188676be4fe5..531cc46b5dec5a0acc874182e1be8111759ecb4b 100644 GIT binary patch delta 2472 zcmYk+S!`5Q9LMqhw52oHmO@KQ3yM<*Ck)GF~-G7jZvPlWsPG?U`ICdwgak_$2xm|V1@*gbEXTJ|D|rED;V+oO^R0NiStXXCZm6hynEDX3WQZn1Kh8U9eYh9=?fe zw_S9-jC|}m7v1L;Dt)rJ$t27}wP#@^R-v|dXFmI{k)L#bcplaM4wXc=u@;LaruKF< zs(k=8gEOe#eS?1d12w?H0w=kw1;@}HK@H#_&c@fU3eOg>{+p=WqC+!X#qf)9t!p1@ zrU%^iA$*wjN&MVn_AP1!-{A;M!waY_{2jG5er_h0xb8+x@MYvDb|Oxtg34K}!QYUB zVAGkNvU?t`#eKL6FJdQ7W!g(Hh8=hsmtr<|SAPdSfk#kFeaE%+0kiG252BJV{wo!p zX_Lte&7cOgG@D#s!T{}2R5E%VG$S9a5xuwu=io-v@f^lx9L2482gA74pE{Q3ko2(e zCGPnzrJ|(Rh1#1Vs3kpz%JQ422mg&a*L4r^FdRmml50ppTRH1ojrFJpL{VGy95Qx0 zg}U!0xBnl^ApdMG(gBsXj)D|DdQl4)gP|;Fe!bNx$*WsiYsqF4WZP5$JHrg?_{}a@bUvq4!- zv#6OJMLpmn)PSy_2iFq|39YXF|9?^Dk0p49=AU}GI2A71LzVdiTk909$_j#UIAsIZ z<%9;Wtx+a(FszAKL#SvAmpHZ53EM(_JJCYSCX{o|^Oa;Af9IXQ6j^MT_0KAGP$Gi8Mk*ThyufD?3%viAh8Qp$u2iQPUFd zAi4-Ip`zti*56w)Xlx^tjO_&5Y%7U+B1qH_$}1I8#vUW$kElh_5!>X{?p_+H@`7`c zNWEJL<%#xMrI}Dds%YO;bYhgODoVx9TG9uThrH&?5k0r8vlM_F9KlAz5_4kCM z)|}XuQ=Ay}HG2aC;b1HrO8)EX%S;aE9`~fTh4&_BPRRCngM))l_YZ`U)p;kBzAp-m4-A|;;k2wh=nn;BiKeoatJHI?8mImSfn>H c$P|YL65Ztu6Ib>3=^wpiL-%~~Uir5F0Dqwyc>n+a delta 2189 zcmZA1T~JhI9LMoL8|?CC2*Q%k%K=11SzvilT-yXg(XdP)LGfkCHX>Lk9BUe)y{ObK znsM4{qKl%^(HbW&R?B9(u^PuFv*ISFahhT>Y@BAg@S>UQ<@?(`k<&B#KcDA3yL-;_ z{Gb0hFLgiP8T-B<{S~A25w{Z8JZ3RGpTU84&SzGJpQD3Uu@ZAL&2Gnfyal(Q{{JYJ z;sFfcJ6Mh1;9C3(*JEo|(wH5j)6T$G*n-8`W?QirSK!1 z;N!^0ra0(#CvYiVL1ivK&ukespvHG$9Uj0MrTR3TjW~;849-toa1={8f5ttZM6Ki) zYGvnLe{sjX`KgsJLv2kM_5U5X1fN7dzKITgfUyO1zNM3nSCK5+Z&-_eAlqfj$){4< z$UzrqM=$QeVvM-w6IjRjbEqvng_`J}sNa=vGo9C?YGm^Q^1p)45ChuFw^8Tcp=O?6 znEGKgI-GAnO>7WVOp~}AFJTZfi_ErR2p8hZuJ5~^!+OSN@NAk{k)Ql4HJ6y)B21^0 zYp@EH>R#8UU8hhh_zVO1BQ|0lck945?7~BMAO3_7U<0dZ!xyjXi;)L?F@OVj z9F@94?jm>KZaj=CqV(HRE2~9Kcq3}%Bd$}Z;+)1X`Y8m;!@ALj5v;~2D&w)&>9o?B z#+_Jr2S36w+=LgA?XyZJmGWlP9*?6^e;k+KMbw2=^15*V_5UI4#nY%F&o3vi4;%EV ziPF&x-a_roNn|cIi@LCveb9IfQWn;ad~6>F7HN~HE&C9etNo0cn3wc$Ppd~2Yd7X% zAF75P!3;hBuhF4?>cuTiPHhO6;9c4IRy33kg~M7G)9Mb*Zq?)VR= z6km63T%3A845R*c1S`0|ouR`u?J{a+*(_Vd6ms2;lj zq1KrqnJsM@FU;iDxWh^G^stT??_jfg+;4JRg_me2S_rl6L@Uupq!Zd2WlKdy;*wR* zQ*8GWH#QZcwzG{;cGOf~de5xW{;P=8$l6@Xoa?1JJmzyv)x4I_7HM15?j^J(YP|N7 zPe?PWFx7l1>`v?-6Q*=4@Sl&%0te0G_rRuLlcS0`A5*9y}hvzi~g7tyAl}@lZ)YK4fEiV0UWECTc!QvKA{F8-y6162~e2f2g u4`*a_#Cf8Bc<`Z!bL0JfFI(YBG%O0IB_=Abc;aJAFUR*(h2y8HcK!oBu;+jP diff --git a/rest_framework/locale/fr/LC_MESSAGES/django.po b/rest_framework/locale/fr/LC_MESSAGES/django.po index 17bff26b9..3824b1a2e 100644 --- a/rest_framework/locale/fr/LC_MESSAGES/django.po +++ b/rest_framework/locale/fr/LC_MESSAGES/django.po @@ -6,13 +6,13 @@ # Etienne Desgagné , 2015 # Martin Maillard , 2015 # Martin Maillard , 2015 -# Xavier Ordoquy , 2015 +# Xavier Ordoquy , 2015-2016 msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-07 18:53+0100\n" -"PO-Revision-Date: 2015-12-07 19:53+0000\n" +"POT-Creation-Date: 2016-03-01 18:38+0100\n" +"PO-Revision-Date: 2016-03-01 17:40+0000\n" "Last-Translator: Xavier Ordoquy \n" "Language-Team: French (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/fr/)\n" "MIME-Version: 1.0\n" @@ -21,43 +21,75 @@ msgstr "" "Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: authentication.py:72 +#: authentication.py:71 msgid "Invalid basic header. No credentials provided." msgstr "En-tête « basic » non valide. Informations d'identification non fournies." -#: authentication.py:75 +#: authentication.py:74 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "En-tête « basic » non valide. Les informations d'identification ne doivent pas contenir d'espaces." -#: authentication.py:81 +#: authentication.py:80 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "En-tête « basic » non valide. Encodage base64 des informations d'identification incorrect." -#: authentication.py:98 +#: authentication.py:97 msgid "Invalid username/password." msgstr "Nom d'utilisateur et/ou mot de passe non valide(s)." -#: authentication.py:101 authentication.py:188 +#: authentication.py:100 authentication.py:195 msgid "User inactive or deleted." msgstr "Utilisateur inactif ou supprimé." -#: authentication.py:167 +#: authentication.py:173 msgid "Invalid token header. No credentials provided." msgstr "En-tête « token » non valide. Informations d'identification non fournies." -#: authentication.py:170 +#: authentication.py:176 msgid "Invalid token header. Token string should not contain spaces." msgstr "En-tête « token » non valide. Un token ne doit pas contenir d'espaces." -#: authentication.py:176 +#: authentication.py:182 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "En-tête « token » non valide. Un token ne doit pas contenir de caractères invalides." -#: authentication.py:185 +#: authentication.py:192 msgid "Invalid token." msgstr "Token non valide." +#: authtoken/apps.py:7 +msgid "Auth Token" +msgstr "Jeton d'authentification" + +#: authtoken/models.py:21 +msgid "Key" +msgstr "Clef" + +#: authtoken/models.py:23 +msgid "User" +msgstr "Utilisateur" + +#: authtoken/models.py:24 +msgid "Created" +msgstr "Création" + +#: authtoken/models.py:33 +msgid "Token" +msgstr "Jeton" + +#: authtoken/models.py:34 +msgid "Tokens" +msgstr "Jetons" + +#: authtoken/serializers.py:8 +msgid "Username" +msgstr "Nom de l'utilisateur" + +#: authtoken/serializers.py:9 +msgid "Password" +msgstr "Mot de passe" + #: authtoken/serializers.py:20 msgid "User account is disabled." msgstr "Ce compte est désactivé." @@ -112,7 +144,7 @@ msgstr "Type de média \"{media_type}\" non supporté." msgid "Request was throttled." msgstr "Requête ralentie." -#: fields.py:266 relations.py:195 relations.py:228 validators.py:79 +#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 #: validators.py:162 msgid "This field is required." msgstr "Ce champ est obligatoire." @@ -130,7 +162,7 @@ msgstr "\"{input}\" n'est pas un booléen valide." msgid "This field may not be blank." msgstr "Ce champ ne peut être vide." -#: fields.py:670 fields.py:1656 +#: fields.py:670 fields.py:1664 #, python-brace-format msgid "Ensure this field has no more than {max_length} characters." msgstr "Assurez-vous que ce champ comporte au plus {max_length} caractères." @@ -216,137 +248,136 @@ msgstr "La date + heure n'a pas le bon format. Utilisez un des formats suivants msgid "Expected a datetime but got a date." msgstr "Attendait une date + heure mais a reçu une date." -#: fields.py:1079 +#: fields.py:1082 #, python-brace-format msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "La date n'a pas le bon format. Utilisez un des formats suivants : {format}." -#: fields.py:1080 +#: fields.py:1083 msgid "Expected a date but got a datetime." msgstr "Attendait une date mais a reçu une date + heure." -#: fields.py:1148 +#: fields.py:1151 #, python-brace-format msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "L'heure n'a pas le bon format. Utilisez un des formats suivants : {format}." -#: fields.py:1207 +#: fields.py:1215 #, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "La durée n'a pas le bon format. Utilisez l'un des formats suivants: {format}." -#: fields.py:1232 fields.py:1281 +#: fields.py:1240 fields.py:1289 #, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" n'est pas un choix valide." -#: fields.py:1235 relations.py:62 relations.py:431 +#: fields.py:1243 relations.py:71 relations.py:442 #, python-brace-format msgid "More than {count} items..." msgstr "Plus de {count} éléments..." -#: fields.py:1282 fields.py:1429 relations.py:427 serializers.py:520 +#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 #, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Attendait une liste d'éléments mais a reçu \"{input_type}\"." -#: fields.py:1283 +#: fields.py:1291 msgid "This selection may not be empty." msgstr "Cette sélection ne peut être vide." -#: fields.py:1320 +#: fields.py:1328 #, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "\"{input}\" n'est pas un choix de chemin valide." -#: fields.py:1339 +#: fields.py:1347 msgid "No file was submitted." msgstr "Aucun fichier n'a été soumis." -#: fields.py:1340 +#: fields.py:1348 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "La donnée soumise n'est pas un fichier. Vérifiez le type d'encodage du formulaire." -#: fields.py:1341 +#: fields.py:1349 msgid "No filename could be determined." msgstr "Le nom de fichier n'a pu être déterminé." -#: fields.py:1342 +#: fields.py:1350 msgid "The submitted file is empty." msgstr "Le fichier soumis est vide." -#: fields.py:1343 +#: fields.py:1351 #, python-brace-format msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "Assurez-vous que le nom de fichier comporte au plus {max_length} caractères (il en comporte {length})." -#: fields.py:1391 +#: fields.py:1399 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "Transférez une image valide. Le fichier que vous avez transféré n'est pas une image, ou il est corrompu." -#: fields.py:1430 relations.py:428 serializers.py:521 +#: fields.py:1438 relations.py:439 serializers.py:521 msgid "This list may not be empty." msgstr "Cette liste ne peut pas être vide." -#: fields.py:1483 +#: fields.py:1491 #, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "Attendait un dictionnaire d'éléments mais a reçu \"{input_type}\"." -#: fields.py:1530 +#: fields.py:1538 msgid "Value must be valid JSON." msgstr "La valeur doit être un JSON valide." -#: filters.py:35 templates/rest_framework/filters/django_filter.html:5 +#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 msgid "Submit" msgstr "Envoyer" #: pagination.py:189 -#, python-brace-format -msgid "Invalid page \"{page_number}\": {message}." -msgstr "Page \"{page_number}\" non valide : {message}." +msgid "Invalid page." +msgstr "Page invalide." #: pagination.py:407 msgid "Invalid cursor" msgstr "Curseur non valide" -#: relations.py:196 +#: relations.py:207 #, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Clé primaire \"{pk_value}\" non valide - l'objet n'existe pas." -#: relations.py:197 +#: relations.py:208 #, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Type incorrect. Attendait une clé primaire, a reçu {data_type}." -#: relations.py:229 +#: relations.py:240 msgid "Invalid hyperlink - No URL match." msgstr "Lien non valide : pas d'URL correspondante." -#: relations.py:230 +#: relations.py:241 msgid "Invalid hyperlink - Incorrect URL match." msgstr "Lien non valide : URL correspondante incorrecte." -#: relations.py:231 +#: relations.py:242 msgid "Invalid hyperlink - Object does not exist." msgstr "Lien non valide : l'objet n'existe pas." -#: relations.py:232 +#: relations.py:243 #, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Type incorrect. Attendait une URL, a reçu {data_type}." -#: relations.py:391 +#: relations.py:402 #, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "L'object avec {slug_name}={value} n'existe pas." -#: relations.py:392 +#: relations.py:403 msgid "Invalid value." msgstr "Valeur non valide." diff --git a/rest_framework/locale/fr_CA/LC_MESSAGES/django.mo b/rest_framework/locale/fr_CA/LC_MESSAGES/django.mo index eb0b496dbe39cfc698a45415b04692e5e6e72255..cd0a91340e7cd76179136ab12b81d454e887b7cd 100644 GIT binary patch delta 41 ncmeBY>1UZRf!9pez*yJ7P{Gi`%GhG!Txo=WIZ$BZQ7=XS+PDgC delta 41 ocmeBY>1UZRf!9>m&`8(7T*1)7%G7w`Txo=Wxs|Eu#-m=00NXAKbN~PV diff --git a/rest_framework/locale/fr_CA/LC_MESSAGES/django.po b/rest_framework/locale/fr_CA/LC_MESSAGES/django.po index 62a559dc5..f26ed453b 100644 --- a/rest_framework/locale/fr_CA/LC_MESSAGES/django.po +++ b/rest_framework/locale/fr_CA/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-07 18:53+0100\n" -"PO-Revision-Date: 2015-12-07 17:55+0000\n" +"POT-Creation-Date: 2016-03-01 18:38+0100\n" +"PO-Revision-Date: 2016-03-01 17:38+0000\n" "Last-Translator: Xavier Ordoquy \n" "Language-Team: French (Canada) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/fr_CA/)\n" "MIME-Version: 1.0\n" @@ -17,43 +17,75 @@ msgstr "" "Language: fr_CA\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: authentication.py:72 +#: authentication.py:71 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:75 +#: authentication.py:74 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:81 +#: authentication.py:80 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:98 +#: authentication.py:97 msgid "Invalid username/password." msgstr "" -#: authentication.py:101 authentication.py:188 +#: authentication.py:100 authentication.py:195 msgid "User inactive or deleted." msgstr "" -#: authentication.py:167 +#: authentication.py:173 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:170 +#: authentication.py:176 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:176 +#: authentication.py:182 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:185 +#: authentication.py:192 msgid "Invalid token." msgstr "" +#: authtoken/apps.py:7 +msgid "Auth Token" +msgstr "" + +#: authtoken/models.py:21 +msgid "Key" +msgstr "" + +#: authtoken/models.py:23 +msgid "User" +msgstr "" + +#: authtoken/models.py:24 +msgid "Created" +msgstr "" + +#: authtoken/models.py:33 +msgid "Token" +msgstr "" + +#: authtoken/models.py:34 +msgid "Tokens" +msgstr "" + +#: authtoken/serializers.py:8 +msgid "Username" +msgstr "" + +#: authtoken/serializers.py:9 +msgid "Password" +msgstr "" + #: authtoken/serializers.py:20 msgid "User account is disabled." msgstr "" @@ -108,7 +140,7 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:266 relations.py:195 relations.py:228 validators.py:79 +#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 #: validators.py:162 msgid "This field is required." msgstr "" @@ -126,7 +158,7 @@ msgstr "" msgid "This field may not be blank." msgstr "" -#: fields.py:670 fields.py:1656 +#: fields.py:670 fields.py:1664 #, python-brace-format msgid "Ensure this field has no more than {max_length} characters." msgstr "" @@ -212,137 +244,136 @@ msgstr "" msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1079 +#: fields.py:1082 #, python-brace-format msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1080 +#: fields.py:1083 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1148 +#: fields.py:1151 #, python-brace-format msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1207 +#: fields.py:1215 #, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1232 fields.py:1281 +#: fields.py:1240 fields.py:1289 #, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "" -#: fields.py:1235 relations.py:62 relations.py:431 +#: fields.py:1243 relations.py:71 relations.py:442 #, python-brace-format msgid "More than {count} items..." msgstr "" -#: fields.py:1282 fields.py:1429 relations.py:427 serializers.py:520 +#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 #, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1283 +#: fields.py:1291 msgid "This selection may not be empty." msgstr "" -#: fields.py:1320 +#: fields.py:1328 #, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1339 +#: fields.py:1347 msgid "No file was submitted." msgstr "" -#: fields.py:1340 +#: fields.py:1348 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1341 +#: fields.py:1349 msgid "No filename could be determined." msgstr "" -#: fields.py:1342 +#: fields.py:1350 msgid "The submitted file is empty." msgstr "" -#: fields.py:1343 +#: fields.py:1351 #, python-brace-format msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1391 +#: fields.py:1399 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: fields.py:1430 relations.py:428 serializers.py:521 +#: fields.py:1438 relations.py:439 serializers.py:521 msgid "This list may not be empty." msgstr "" -#: fields.py:1483 +#: fields.py:1491 #, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1530 +#: fields.py:1538 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html:5 +#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 msgid "Submit" msgstr "" #: pagination.py:189 -#, python-brace-format -msgid "Invalid page \"{page_number}\": {message}." +msgid "Invalid page." msgstr "" #: pagination.py:407 msgid "Invalid cursor" msgstr "" -#: relations.py:196 +#: relations.py:207 #, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" -#: relations.py:197 +#: relations.py:208 #, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" -#: relations.py:229 +#: relations.py:240 msgid "Invalid hyperlink - No URL match." msgstr "" -#: relations.py:230 +#: relations.py:241 msgid "Invalid hyperlink - Incorrect URL match." msgstr "" -#: relations.py:231 +#: relations.py:242 msgid "Invalid hyperlink - Object does not exist." msgstr "" -#: relations.py:232 +#: relations.py:243 #, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:391 +#: relations.py:402 #, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:392 +#: relations.py:403 msgid "Invalid value." msgstr "" diff --git a/rest_framework/locale/gl/LC_MESSAGES/django.mo b/rest_framework/locale/gl/LC_MESSAGES/django.mo index b8c3db3045fc5b4dda9854bbe77e7ce09310e5c9..761037249231da752320dce282cd550027a2b9c3 100644 GIT binary patch delta 41 ncmZo>X=a%)f!9pez*yJ7P{Gi`%GhG!Txo=WIZ$BZQ9DKe*5C?C delta 41 ocmZo>X=a%)f!9>m&`8(7T*1)7%G7w`Txo=Wxs|Eu#-nzO0M}LuPyhe` diff --git a/rest_framework/locale/gl/LC_MESSAGES/django.po b/rest_framework/locale/gl/LC_MESSAGES/django.po index f7e11d4d1..ba0b788fc 100644 --- a/rest_framework/locale/gl/LC_MESSAGES/django.po +++ b/rest_framework/locale/gl/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-07 18:53+0100\n" -"PO-Revision-Date: 2015-12-07 17:55+0000\n" +"POT-Creation-Date: 2016-03-01 18:38+0100\n" +"PO-Revision-Date: 2016-03-01 17:38+0000\n" "Last-Translator: Xavier Ordoquy \n" "Language-Team: Galician (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/gl/)\n" "MIME-Version: 1.0\n" @@ -17,43 +17,75 @@ msgstr "" "Language: gl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:72 +#: authentication.py:71 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:75 +#: authentication.py:74 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:81 +#: authentication.py:80 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:98 +#: authentication.py:97 msgid "Invalid username/password." msgstr "" -#: authentication.py:101 authentication.py:188 +#: authentication.py:100 authentication.py:195 msgid "User inactive or deleted." msgstr "" -#: authentication.py:167 +#: authentication.py:173 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:170 +#: authentication.py:176 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:176 +#: authentication.py:182 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:185 +#: authentication.py:192 msgid "Invalid token." msgstr "" +#: authtoken/apps.py:7 +msgid "Auth Token" +msgstr "" + +#: authtoken/models.py:21 +msgid "Key" +msgstr "" + +#: authtoken/models.py:23 +msgid "User" +msgstr "" + +#: authtoken/models.py:24 +msgid "Created" +msgstr "" + +#: authtoken/models.py:33 +msgid "Token" +msgstr "" + +#: authtoken/models.py:34 +msgid "Tokens" +msgstr "" + +#: authtoken/serializers.py:8 +msgid "Username" +msgstr "" + +#: authtoken/serializers.py:9 +msgid "Password" +msgstr "" + #: authtoken/serializers.py:20 msgid "User account is disabled." msgstr "" @@ -108,7 +140,7 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:266 relations.py:195 relations.py:228 validators.py:79 +#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 #: validators.py:162 msgid "This field is required." msgstr "" @@ -126,7 +158,7 @@ msgstr "" msgid "This field may not be blank." msgstr "" -#: fields.py:670 fields.py:1656 +#: fields.py:670 fields.py:1664 #, python-brace-format msgid "Ensure this field has no more than {max_length} characters." msgstr "" @@ -212,137 +244,136 @@ msgstr "" msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1079 +#: fields.py:1082 #, python-brace-format msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1080 +#: fields.py:1083 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1148 +#: fields.py:1151 #, python-brace-format msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1207 +#: fields.py:1215 #, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1232 fields.py:1281 +#: fields.py:1240 fields.py:1289 #, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "" -#: fields.py:1235 relations.py:62 relations.py:431 +#: fields.py:1243 relations.py:71 relations.py:442 #, python-brace-format msgid "More than {count} items..." msgstr "" -#: fields.py:1282 fields.py:1429 relations.py:427 serializers.py:520 +#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 #, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1283 +#: fields.py:1291 msgid "This selection may not be empty." msgstr "" -#: fields.py:1320 +#: fields.py:1328 #, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1339 +#: fields.py:1347 msgid "No file was submitted." msgstr "" -#: fields.py:1340 +#: fields.py:1348 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1341 +#: fields.py:1349 msgid "No filename could be determined." msgstr "" -#: fields.py:1342 +#: fields.py:1350 msgid "The submitted file is empty." msgstr "" -#: fields.py:1343 +#: fields.py:1351 #, python-brace-format msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1391 +#: fields.py:1399 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: fields.py:1430 relations.py:428 serializers.py:521 +#: fields.py:1438 relations.py:439 serializers.py:521 msgid "This list may not be empty." msgstr "" -#: fields.py:1483 +#: fields.py:1491 #, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1530 +#: fields.py:1538 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html:5 +#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 msgid "Submit" msgstr "" #: pagination.py:189 -#, python-brace-format -msgid "Invalid page \"{page_number}\": {message}." +msgid "Invalid page." msgstr "" #: pagination.py:407 msgid "Invalid cursor" msgstr "" -#: relations.py:196 +#: relations.py:207 #, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" -#: relations.py:197 +#: relations.py:208 #, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" -#: relations.py:229 +#: relations.py:240 msgid "Invalid hyperlink - No URL match." msgstr "" -#: relations.py:230 +#: relations.py:241 msgid "Invalid hyperlink - Incorrect URL match." msgstr "" -#: relations.py:231 +#: relations.py:242 msgid "Invalid hyperlink - Object does not exist." msgstr "" -#: relations.py:232 +#: relations.py:243 #, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:391 +#: relations.py:402 #, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:392 +#: relations.py:403 msgid "Invalid value." msgstr "" diff --git a/rest_framework/locale/gl_ES/LC_MESSAGES/django.mo b/rest_framework/locale/gl_ES/LC_MESSAGES/django.mo index 0e5a00ac0b310b974fe6c52fac423d96ee92527f..281b6e66b7e66e840451489ae54e0fd19a7deba4 100644 GIT binary patch delta 42 ocmbQsI+u0AdtNhL17lqSLj^+%D`Sg^f20ut=0JhXDvXtk0R0pS+W-In delta 42 pcmbQsI+u0AdtOsrLnB=Sa|J^SD^uf%f20ut=2oVrn^hPq83Fx}3gG|% diff --git a/rest_framework/locale/gl_ES/LC_MESSAGES/django.po b/rest_framework/locale/gl_ES/LC_MESSAGES/django.po index 363d49463..07ee4061f 100644 --- a/rest_framework/locale/gl_ES/LC_MESSAGES/django.po +++ b/rest_framework/locale/gl_ES/LC_MESSAGES/django.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-07 18:53+0100\n" -"PO-Revision-Date: 2015-12-07 17:55+0000\n" +"POT-Creation-Date: 2016-03-01 18:38+0100\n" +"PO-Revision-Date: 2016-03-01 17:38+0000\n" "Last-Translator: Xavier Ordoquy \n" "Language-Team: Galician (Spain) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/gl_ES/)\n" "MIME-Version: 1.0\n" @@ -18,43 +18,75 @@ msgstr "" "Language: gl_ES\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:72 +#: authentication.py:71 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:75 +#: authentication.py:74 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:81 +#: authentication.py:80 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:98 +#: authentication.py:97 msgid "Invalid username/password." msgstr "" -#: authentication.py:101 authentication.py:188 +#: authentication.py:100 authentication.py:195 msgid "User inactive or deleted." msgstr "" -#: authentication.py:167 +#: authentication.py:173 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:170 +#: authentication.py:176 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:176 +#: authentication.py:182 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:185 +#: authentication.py:192 msgid "Invalid token." msgstr "" +#: authtoken/apps.py:7 +msgid "Auth Token" +msgstr "" + +#: authtoken/models.py:21 +msgid "Key" +msgstr "" + +#: authtoken/models.py:23 +msgid "User" +msgstr "" + +#: authtoken/models.py:24 +msgid "Created" +msgstr "" + +#: authtoken/models.py:33 +msgid "Token" +msgstr "" + +#: authtoken/models.py:34 +msgid "Tokens" +msgstr "" + +#: authtoken/serializers.py:8 +msgid "Username" +msgstr "" + +#: authtoken/serializers.py:9 +msgid "Password" +msgstr "" + #: authtoken/serializers.py:20 msgid "User account is disabled." msgstr "" @@ -109,7 +141,7 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:266 relations.py:195 relations.py:228 validators.py:79 +#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 #: validators.py:162 msgid "This field is required." msgstr "" @@ -127,7 +159,7 @@ msgstr "" msgid "This field may not be blank." msgstr "" -#: fields.py:670 fields.py:1656 +#: fields.py:670 fields.py:1664 #, python-brace-format msgid "Ensure this field has no more than {max_length} characters." msgstr "" @@ -213,137 +245,136 @@ msgstr "" msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1079 +#: fields.py:1082 #, python-brace-format msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1080 +#: fields.py:1083 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1148 +#: fields.py:1151 #, python-brace-format msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1207 +#: fields.py:1215 #, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1232 fields.py:1281 +#: fields.py:1240 fields.py:1289 #, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "" -#: fields.py:1235 relations.py:62 relations.py:431 +#: fields.py:1243 relations.py:71 relations.py:442 #, python-brace-format msgid "More than {count} items..." msgstr "" -#: fields.py:1282 fields.py:1429 relations.py:427 serializers.py:520 +#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 #, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1283 +#: fields.py:1291 msgid "This selection may not be empty." msgstr "" -#: fields.py:1320 +#: fields.py:1328 #, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1339 +#: fields.py:1347 msgid "No file was submitted." msgstr "" -#: fields.py:1340 +#: fields.py:1348 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1341 +#: fields.py:1349 msgid "No filename could be determined." msgstr "" -#: fields.py:1342 +#: fields.py:1350 msgid "The submitted file is empty." msgstr "" -#: fields.py:1343 +#: fields.py:1351 #, python-brace-format msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1391 +#: fields.py:1399 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: fields.py:1430 relations.py:428 serializers.py:521 +#: fields.py:1438 relations.py:439 serializers.py:521 msgid "This list may not be empty." msgstr "" -#: fields.py:1483 +#: fields.py:1491 #, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1530 +#: fields.py:1538 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html:5 +#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 msgid "Submit" msgstr "" #: pagination.py:189 -#, python-brace-format -msgid "Invalid page \"{page_number}\": {message}." +msgid "Invalid page." msgstr "" #: pagination.py:407 msgid "Invalid cursor" msgstr "" -#: relations.py:196 +#: relations.py:207 #, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" -#: relations.py:197 +#: relations.py:208 #, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" -#: relations.py:229 +#: relations.py:240 msgid "Invalid hyperlink - No URL match." msgstr "" -#: relations.py:230 +#: relations.py:241 msgid "Invalid hyperlink - Incorrect URL match." msgstr "" -#: relations.py:231 +#: relations.py:242 msgid "Invalid hyperlink - Object does not exist." msgstr "" -#: relations.py:232 +#: relations.py:243 #, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:391 +#: relations.py:402 #, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:392 +#: relations.py:403 msgid "Invalid value." msgstr "Valor non válido." diff --git a/rest_framework/locale/he_IL/LC_MESSAGES/django.mo b/rest_framework/locale/he_IL/LC_MESSAGES/django.mo index 53ecccd1e9183668dd55954698190ac1a59165e1..feef64e1b36c9be38b32bf05c413c471116f8199 100644 GIT binary patch delta 41 ncmbQhGJ$2n1YR>;17lqSLj^+%D`Sg^bEOdi=0JgsN4*&V+X@PC delta 41 pcmbQhGJ$2n1YT2JLnB=Sa|J^SD^uf%bEOdi=2oVr8;^Q30sz~93U>ei diff --git a/rest_framework/locale/he_IL/LC_MESSAGES/django.po b/rest_framework/locale/he_IL/LC_MESSAGES/django.po index b2162a4dc..cee35fedc 100644 --- a/rest_framework/locale/he_IL/LC_MESSAGES/django.po +++ b/rest_framework/locale/he_IL/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-07 18:53+0100\n" -"PO-Revision-Date: 2015-12-07 17:55+0000\n" +"POT-Creation-Date: 2016-03-01 18:38+0100\n" +"PO-Revision-Date: 2016-03-01 17:38+0000\n" "Last-Translator: Xavier Ordoquy \n" "Language-Team: Hebrew (Israel) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/he_IL/)\n" "MIME-Version: 1.0\n" @@ -17,43 +17,75 @@ msgstr "" "Language: he_IL\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:72 +#: authentication.py:71 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:75 +#: authentication.py:74 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:81 +#: authentication.py:80 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:98 +#: authentication.py:97 msgid "Invalid username/password." msgstr "" -#: authentication.py:101 authentication.py:188 +#: authentication.py:100 authentication.py:195 msgid "User inactive or deleted." msgstr "" -#: authentication.py:167 +#: authentication.py:173 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:170 +#: authentication.py:176 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:176 +#: authentication.py:182 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:185 +#: authentication.py:192 msgid "Invalid token." msgstr "" +#: authtoken/apps.py:7 +msgid "Auth Token" +msgstr "" + +#: authtoken/models.py:21 +msgid "Key" +msgstr "" + +#: authtoken/models.py:23 +msgid "User" +msgstr "" + +#: authtoken/models.py:24 +msgid "Created" +msgstr "" + +#: authtoken/models.py:33 +msgid "Token" +msgstr "" + +#: authtoken/models.py:34 +msgid "Tokens" +msgstr "" + +#: authtoken/serializers.py:8 +msgid "Username" +msgstr "" + +#: authtoken/serializers.py:9 +msgid "Password" +msgstr "" + #: authtoken/serializers.py:20 msgid "User account is disabled." msgstr "" @@ -108,7 +140,7 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:266 relations.py:195 relations.py:228 validators.py:79 +#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 #: validators.py:162 msgid "This field is required." msgstr "" @@ -126,7 +158,7 @@ msgstr "" msgid "This field may not be blank." msgstr "" -#: fields.py:670 fields.py:1656 +#: fields.py:670 fields.py:1664 #, python-brace-format msgid "Ensure this field has no more than {max_length} characters." msgstr "" @@ -212,137 +244,136 @@ msgstr "" msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1079 +#: fields.py:1082 #, python-brace-format msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1080 +#: fields.py:1083 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1148 +#: fields.py:1151 #, python-brace-format msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1207 +#: fields.py:1215 #, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1232 fields.py:1281 +#: fields.py:1240 fields.py:1289 #, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "" -#: fields.py:1235 relations.py:62 relations.py:431 +#: fields.py:1243 relations.py:71 relations.py:442 #, python-brace-format msgid "More than {count} items..." msgstr "" -#: fields.py:1282 fields.py:1429 relations.py:427 serializers.py:520 +#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 #, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1283 +#: fields.py:1291 msgid "This selection may not be empty." msgstr "" -#: fields.py:1320 +#: fields.py:1328 #, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1339 +#: fields.py:1347 msgid "No file was submitted." msgstr "" -#: fields.py:1340 +#: fields.py:1348 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1341 +#: fields.py:1349 msgid "No filename could be determined." msgstr "" -#: fields.py:1342 +#: fields.py:1350 msgid "The submitted file is empty." msgstr "" -#: fields.py:1343 +#: fields.py:1351 #, python-brace-format msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1391 +#: fields.py:1399 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: fields.py:1430 relations.py:428 serializers.py:521 +#: fields.py:1438 relations.py:439 serializers.py:521 msgid "This list may not be empty." msgstr "" -#: fields.py:1483 +#: fields.py:1491 #, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1530 +#: fields.py:1538 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html:5 +#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 msgid "Submit" msgstr "" #: pagination.py:189 -#, python-brace-format -msgid "Invalid page \"{page_number}\": {message}." +msgid "Invalid page." msgstr "" #: pagination.py:407 msgid "Invalid cursor" msgstr "" -#: relations.py:196 +#: relations.py:207 #, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" -#: relations.py:197 +#: relations.py:208 #, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" -#: relations.py:229 +#: relations.py:240 msgid "Invalid hyperlink - No URL match." msgstr "" -#: relations.py:230 +#: relations.py:241 msgid "Invalid hyperlink - Incorrect URL match." msgstr "" -#: relations.py:231 +#: relations.py:242 msgid "Invalid hyperlink - Object does not exist." msgstr "" -#: relations.py:232 +#: relations.py:243 #, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:391 +#: relations.py:402 #, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:392 +#: relations.py:403 msgid "Invalid value." msgstr "" diff --git a/rest_framework/locale/hu/LC_MESSAGES/django.mo b/rest_framework/locale/hu/LC_MESSAGES/django.mo index a35f73215aa61525aa091d4b18b5df07ae899836..9053ad62fefb8c069bc5eaafbfcfbb5be1cf8948 100644 GIT binary patch delta 1546 zcmYk+OGs2v9LMp$k5MZvolLXIyk=#kqfS$5KJu9g6(mU!nNd>F!;)IGa4`}=kS;2d zbR(3|A_xMBpfD>ULfTY95mXxsN+?{kX%T&Y_fFPsvX{LiDmWwbf+(H}o( zlxFI3YFn(?LF|v`hmx9LmWyfVU>KKT8|wKk4B#aU;w>!1DXhnsM6)JrM17+VYw->4 zHj7w#l35uYC$JJnaT|WZ3M`oC-9LicX^)^EXHWtB#ykwn_pHH9v^#M%4x`>Pf#vuM zYcRaPtby;_SuTp`xQ}|^3$DeSWN+jxxSsZLEWtt4^Utvwf8s(6rXTBvj#|_R&S5cLMa|(;EI?nHSqMY87dtTv$D_W*4YX%*GRABb z^Hf6n$6{|PoOExXO{nJ%r;~rZc!&-MpJ5e##vQnFiDx&Sr~L?7G*(A?)E>fJ7+{!f zcpA^(Gi<;zR%#>mU^_m>9Ly$aWx6_x{Oga0>5valsaZrCh{2jrDcy&)IEwn!XDg=w^7ee;~vb9WP2ZyT6EWtLD@JeMN_C3B(gxXnoDsb zwjMILZb&BZ%ZL>Z2^zfYk8x`_J2 zU0j7PQ7@W}8qD=}%`sF;Z${gbxSe(!QG{_PD!>caffLAkBesG)qWxNd8gVzqpr%1* zkkYUFbyNky+HwyRaEr3?e<`EEdUMYRcBUJwMjA`4r8-oO7WWWaXh+Sq(D+-FO1|$F zcI8}A%C!Y+s9G0H|6Jj?a06#RZmHr|BUK>@?&#MJbouhqv;tHTsah@712=q`Sz4eW zs!BaoJ18o-)8(!-tuhvqdvYoN>&KQP3@41eP5$6ZDGio{ fgC!v+R9+D-A9&&q{Oc*BXY8v#Y5rJl_DsSbHz1Km delta 1656 zcmaLXOKeP09LMp$$Fw!|YU@>xx@|p5O*_*Xt*O$Qq6tE1P|s9MgbYe)Letz}ArT8w zZ%r*k!bT(&N$n&=kf1gq5gQ^l9tj~d4d36Lo5spX&V24UbMHOp|3By4Ys*g6yKl3H zo-;~4buxAHV6!Id9Lf*HNi)mGd~`656L1IW{&t*%mobEQaSp!6#h8_DwiFw18D7B} ze244IT$`3*RzXJ_R$(_T$1fPes$r@BTX6;LTbPY~s0oY=niXQP?<$PaZo%nz6ZM|w zSc$<*vqc!kIOE%KE=uTlgu3Ae7Gde|ROB0QHti#*{_7aVXQ=1?U^SMEU^1A*iP+}1 z&!Z-I9W~*{z8}=j_%?*66wyq~!x+xQMjVGn(ZP#I5Y~gG_`v`FJC3KFIVv@=LR6|7 zPy=?N{_pYIy{IMojP5)xf}>L@u0^#EqawJCrT7%JmVH=^3$x53xEmX>6Lay0?`Wba zqdgm+3^Ln-VcJDwQcKc^3e+7#{&iy)9eQyuI@pg3FmJ5cO5Ego6OYmUiEJJ_LVDEh z#kJT#m<@OX4`4sWv6&rPhj(x@{=%uaE|>f()vZil4|e%}LuI0#G%y!)Q7Ju(HTVWK z;1u$>75Aeu^a7V)4tZC^jW`QWVhP?sW%M1+#~gP`>cN$`o{rO~0Y9QPTR#$<%^+XO zR5j{F&8Xdd73bnZWI63O&cGny#V~@}yh$v;3&<+kJ*-0aDHlxI(jB6~LafGG)P!6l zTlNYyp|7a>bMwunVHEYEjlSoxlJ-kfW-}R8?Q&d!Ni4@6WP+}J;$kZuMVt}6_yk7r z8Y<$~I0!4K`X<#=wKR*Vx}QDgEe&`RQS|>74W2{IrgBofeWgGLQ)_kp9WFAcijtG$ zeH_3mia=4Sa9jt9Ca9xWL)CJz9R>=Y4=+OE@`|!a3|=8A-g0SAsEq4K1SVx^p;XeT z`c^LNI1?D3t9_&dsKlw-Pg?rAj{AX}h<1@SK!~aZRhdI&IlZ%~MQ4+FyG-j=+#N`} zl$O`DGvO4pHN&>OhxTkw9B40yIc<9qEiH7lcXtf`7>Gtgk+M*@!iiMIqUFWmNH`o^ wy(+XO(YmW;*S@`>x~7APm{S&x4BS@{i$=R|XJ-VReaRh7$^Q*-V{%{GUyW|H>Hq)$ diff --git a/rest_framework/locale/hu/LC_MESSAGES/django.po b/rest_framework/locale/hu/LC_MESSAGES/django.po index d37e10426..669a7bffa 100644 --- a/rest_framework/locale/hu/LC_MESSAGES/django.po +++ b/rest_framework/locale/hu/LC_MESSAGES/django.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-07 18:53+0100\n" -"PO-Revision-Date: 2015-12-07 17:55+0000\n" +"POT-Creation-Date: 2016-03-01 18:38+0100\n" +"PO-Revision-Date: 2016-03-01 17:38+0000\n" "Last-Translator: Xavier Ordoquy \n" "Language-Team: Hungarian (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/hu/)\n" "MIME-Version: 1.0\n" @@ -18,43 +18,75 @@ msgstr "" "Language: hu\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:72 +#: authentication.py:71 msgid "Invalid basic header. No credentials provided." msgstr "Érvénytelen basic fejlécmező. Nem voltak megadva azonosítók." -#: authentication.py:75 +#: authentication.py:74 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "Érvénytelen basic fejlécmező. Az azonosító karakterlánc nem tartalmazhat szóközöket." -#: authentication.py:81 +#: authentication.py:80 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Érvénytelen basic fejlécmező. Az azonosítók base64 kódolása nem megfelelő." -#: authentication.py:98 +#: authentication.py:97 msgid "Invalid username/password." msgstr "Érvénytelen felhasználónév/jelszó." -#: authentication.py:101 authentication.py:188 +#: authentication.py:100 authentication.py:195 msgid "User inactive or deleted." msgstr "A felhasználó nincs aktiválva vagy törölve lett." -#: authentication.py:167 +#: authentication.py:173 msgid "Invalid token header. No credentials provided." msgstr "Érvénytelen token fejlécmező. Nem voltak megadva azonosítók." -#: authentication.py:170 +#: authentication.py:176 msgid "Invalid token header. Token string should not contain spaces." msgstr "Érvénytelen token fejlécmező. A token karakterlánc nem tartalmazhat szóközöket." -#: authentication.py:176 +#: authentication.py:182 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:185 +#: authentication.py:192 msgid "Invalid token." msgstr "Érvénytelen token." +#: authtoken/apps.py:7 +msgid "Auth Token" +msgstr "" + +#: authtoken/models.py:21 +msgid "Key" +msgstr "" + +#: authtoken/models.py:23 +msgid "User" +msgstr "" + +#: authtoken/models.py:24 +msgid "Created" +msgstr "" + +#: authtoken/models.py:33 +msgid "Token" +msgstr "" + +#: authtoken/models.py:34 +msgid "Tokens" +msgstr "" + +#: authtoken/serializers.py:8 +msgid "Username" +msgstr "" + +#: authtoken/serializers.py:9 +msgid "Password" +msgstr "" + #: authtoken/serializers.py:20 msgid "User account is disabled." msgstr "A felhasználó tiltva van." @@ -109,7 +141,7 @@ msgstr "Nem támogatott média típus \"{media_type}\" a kérésben." msgid "Request was throttled." msgstr "A kérés korlátozva lett." -#: fields.py:266 relations.py:195 relations.py:228 validators.py:79 +#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 #: validators.py:162 msgid "This field is required." msgstr "Ennek a mezőnek a megadása kötelező." @@ -127,7 +159,7 @@ msgstr "Az \"{input}\" nem egy érvényes logikai érték." msgid "This field may not be blank." msgstr "Ez a mező nem lehet üres." -#: fields.py:670 fields.py:1656 +#: fields.py:670 fields.py:1664 #, python-brace-format msgid "Ensure this field has no more than {max_length} characters." msgstr "Bizonyosodjon meg arról, hogy ez a mező legfeljebb {max_length} karakterből áll." @@ -213,137 +245,136 @@ msgstr "A dátum formátuma hibás. Használja ezek valamelyikét helyette: {for msgid "Expected a datetime but got a date." msgstr "Időt is tartalmazó dátum helyett egy időt nem tartalmazó dátum lett elküldve." -#: fields.py:1079 +#: fields.py:1082 #, python-brace-format msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "A dátum formátuma hibás. Használja ezek valamelyikét helyette: {format}." -#: fields.py:1080 +#: fields.py:1083 msgid "Expected a date but got a datetime." msgstr "Időt nem tartalmazó dátum helyett egy időt is tartalmazó dátum lett elküldve." -#: fields.py:1148 +#: fields.py:1151 #, python-brace-format msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "Az idő formátuma hibás. Használja ezek valamelyikét helyette: {format}." -#: fields.py:1207 +#: fields.py:1215 #, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1232 fields.py:1281 +#: fields.py:1240 fields.py:1289 #, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "Az \"{input}\" nem egy érvényes elem." -#: fields.py:1235 relations.py:62 relations.py:431 +#: fields.py:1243 relations.py:71 relations.py:442 #, python-brace-format msgid "More than {count} items..." msgstr "" -#: fields.py:1282 fields.py:1429 relations.py:427 serializers.py:520 +#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 #, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Elemek listája helyett \"{input_type}\" lett elküldve." -#: fields.py:1283 +#: fields.py:1291 msgid "This selection may not be empty." msgstr "" -#: fields.py:1320 +#: fields.py:1328 #, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1339 +#: fields.py:1347 msgid "No file was submitted." msgstr "Semmilyen fájl sem került feltöltésre." -#: fields.py:1340 +#: fields.py:1348 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "Az elküldött adat nem egy fájl volt. Ellenőrizze a kódolás típusát az űrlapon!" -#: fields.py:1341 +#: fields.py:1349 msgid "No filename could be determined." msgstr "A fájlnév nem megállapítható." -#: fields.py:1342 +#: fields.py:1350 msgid "The submitted file is empty." msgstr "A küldött fájl üres." -#: fields.py:1343 +#: fields.py:1351 #, python-brace-format msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "Bizonyosodjon meg arról, hogy a fájlnév legfeljebb {max_length} karakterből áll (jelenlegi hossza: {length})." -#: fields.py:1391 +#: fields.py:1399 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "Töltsön fel egy érvényes képfájlt! A feltöltött fájl nem kép volt, vagy megsérült." -#: fields.py:1430 relations.py:428 serializers.py:521 +#: fields.py:1438 relations.py:439 serializers.py:521 msgid "This list may not be empty." msgstr "" -#: fields.py:1483 +#: fields.py:1491 #, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1530 +#: fields.py:1538 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html:5 +#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 msgid "Submit" msgstr "" #: pagination.py:189 -#, python-brace-format -msgid "Invalid page \"{page_number}\": {message}." -msgstr "Érvénytelen oldal \"{page_number}\": {message}." +msgid "Invalid page." +msgstr "" #: pagination.py:407 msgid "Invalid cursor" msgstr "" -#: relations.py:196 +#: relations.py:207 #, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Érvénytelen pk \"{pk_value}\" - az objektum nem létezik." -#: relations.py:197 +#: relations.py:208 #, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Helytelen típus. pk érték helyett {data_type} lett elküldve." -#: relations.py:229 +#: relations.py:240 msgid "Invalid hyperlink - No URL match." msgstr "Érvénytelen link - Nem illeszkedő URL." -#: relations.py:230 +#: relations.py:241 msgid "Invalid hyperlink - Incorrect URL match." msgstr "Érvénytelen link. - Eltérő URL illeszkedés." -#: relations.py:231 +#: relations.py:242 msgid "Invalid hyperlink - Object does not exist." msgstr "Érvénytelen link - Az objektum nem létezik." -#: relations.py:232 +#: relations.py:243 #, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Helytelen típus. URL karakterlánc helyett {data_type} lett elküldve." -#: relations.py:391 +#: relations.py:402 #, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "Nem létezik olyan objektum, amelynél {slug_name}={value}." -#: relations.py:392 +#: relations.py:403 msgid "Invalid value." msgstr "Érvénytelen érték." diff --git a/rest_framework/locale/id/LC_MESSAGES/django.mo b/rest_framework/locale/id/LC_MESSAGES/django.mo index ac3fe2c0fc77def64903095adf7d6c8acb8a178e..350d64a3b89e2d42301c885b4d4dc018ea2b21e3 100644 GIT binary patch delta 41 ncmeyz{EvCU1YR>;17lqSLj^+%D`Sg^bEOdi=0JgsM=cov{P+tw delta 41 pcmeyz{EvCU1YT2JLnB=Sa|J^SD^uf%bEOdi=2oVr8;@Et0s#GP3qJq= diff --git a/rest_framework/locale/id/LC_MESSAGES/django.po b/rest_framework/locale/id/LC_MESSAGES/django.po index 5e02437e8..1137755c8 100644 --- a/rest_framework/locale/id/LC_MESSAGES/django.po +++ b/rest_framework/locale/id/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-07 18:53+0100\n" -"PO-Revision-Date: 2015-12-07 17:55+0000\n" +"POT-Creation-Date: 2016-03-01 18:38+0100\n" +"PO-Revision-Date: 2016-03-01 17:38+0000\n" "Last-Translator: Xavier Ordoquy \n" "Language-Team: Indonesian (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/id/)\n" "MIME-Version: 1.0\n" @@ -17,43 +17,75 @@ msgstr "" "Language: id\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: authentication.py:72 +#: authentication.py:71 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:75 +#: authentication.py:74 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:81 +#: authentication.py:80 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:98 +#: authentication.py:97 msgid "Invalid username/password." msgstr "" -#: authentication.py:101 authentication.py:188 +#: authentication.py:100 authentication.py:195 msgid "User inactive or deleted." msgstr "" -#: authentication.py:167 +#: authentication.py:173 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:170 +#: authentication.py:176 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:176 +#: authentication.py:182 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:185 +#: authentication.py:192 msgid "Invalid token." msgstr "" +#: authtoken/apps.py:7 +msgid "Auth Token" +msgstr "" + +#: authtoken/models.py:21 +msgid "Key" +msgstr "" + +#: authtoken/models.py:23 +msgid "User" +msgstr "" + +#: authtoken/models.py:24 +msgid "Created" +msgstr "" + +#: authtoken/models.py:33 +msgid "Token" +msgstr "" + +#: authtoken/models.py:34 +msgid "Tokens" +msgstr "" + +#: authtoken/serializers.py:8 +msgid "Username" +msgstr "" + +#: authtoken/serializers.py:9 +msgid "Password" +msgstr "" + #: authtoken/serializers.py:20 msgid "User account is disabled." msgstr "" @@ -108,7 +140,7 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:266 relations.py:195 relations.py:228 validators.py:79 +#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 #: validators.py:162 msgid "This field is required." msgstr "" @@ -126,7 +158,7 @@ msgstr "" msgid "This field may not be blank." msgstr "" -#: fields.py:670 fields.py:1656 +#: fields.py:670 fields.py:1664 #, python-brace-format msgid "Ensure this field has no more than {max_length} characters." msgstr "" @@ -212,137 +244,136 @@ msgstr "" msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1079 +#: fields.py:1082 #, python-brace-format msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1080 +#: fields.py:1083 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1148 +#: fields.py:1151 #, python-brace-format msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1207 +#: fields.py:1215 #, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1232 fields.py:1281 +#: fields.py:1240 fields.py:1289 #, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "" -#: fields.py:1235 relations.py:62 relations.py:431 +#: fields.py:1243 relations.py:71 relations.py:442 #, python-brace-format msgid "More than {count} items..." msgstr "" -#: fields.py:1282 fields.py:1429 relations.py:427 serializers.py:520 +#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 #, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1283 +#: fields.py:1291 msgid "This selection may not be empty." msgstr "" -#: fields.py:1320 +#: fields.py:1328 #, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1339 +#: fields.py:1347 msgid "No file was submitted." msgstr "" -#: fields.py:1340 +#: fields.py:1348 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1341 +#: fields.py:1349 msgid "No filename could be determined." msgstr "" -#: fields.py:1342 +#: fields.py:1350 msgid "The submitted file is empty." msgstr "" -#: fields.py:1343 +#: fields.py:1351 #, python-brace-format msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1391 +#: fields.py:1399 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: fields.py:1430 relations.py:428 serializers.py:521 +#: fields.py:1438 relations.py:439 serializers.py:521 msgid "This list may not be empty." msgstr "" -#: fields.py:1483 +#: fields.py:1491 #, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1530 +#: fields.py:1538 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html:5 +#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 msgid "Submit" msgstr "" #: pagination.py:189 -#, python-brace-format -msgid "Invalid page \"{page_number}\": {message}." +msgid "Invalid page." msgstr "" #: pagination.py:407 msgid "Invalid cursor" msgstr "" -#: relations.py:196 +#: relations.py:207 #, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" -#: relations.py:197 +#: relations.py:208 #, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" -#: relations.py:229 +#: relations.py:240 msgid "Invalid hyperlink - No URL match." msgstr "" -#: relations.py:230 +#: relations.py:241 msgid "Invalid hyperlink - Incorrect URL match." msgstr "" -#: relations.py:231 +#: relations.py:242 msgid "Invalid hyperlink - Object does not exist." msgstr "" -#: relations.py:232 +#: relations.py:243 #, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:391 +#: relations.py:402 #, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:392 +#: relations.py:403 msgid "Invalid value." msgstr "" diff --git a/rest_framework/locale/it/LC_MESSAGES/django.mo b/rest_framework/locale/it/LC_MESSAGES/django.mo index fde0bde4669aec8382323aaa8ffc27630d30b4b0..8af8bc74694ef0ffc80d50e8c594e49bc6636d0c 100644 GIT binary patch delta 2657 zcmZ|Pdu$X%9Ki9p+7|_B=>tlkW!i!i+n!e*rM6NYh0@Z}mICFKDBIrBZoIo~?)Hil z$o=788Vx2JLP7%dMS}kj;~A8wF^VRdV37Wy_yB^57!y&EAR0~Z`@37KiE+~DXJ&79 zcjot-+0&cu_9dC*f7|QR* zu^T6`8W+q^su0^yCNzL@J?41~<#})63R&u18uxRdo_{P#wVF-5Z zfsL{v*Yj2H`X?wWzJ-#K%vtICt8p>?R-BFdP~%}N!jqWDr12UJqO0D(hwyzQP3jkv z2mgWcfSGi%aS_hJI^?SG$J6M(c{xq(^8@K@% zCs<~XMi^xeOkxWb5Wg+hjk0-8qJ;8el!;!)PRuS(+lT%1k7GC9M1rT9nYE;>2bbV> z?85|Z7C)u2j7G(Rbng05LV6q}0vAwLat&8ujZQ~kAIe^tKnd+dT!9&t>2FCB$^u+u zU#oACN2og}&n>A+O(>yiXvi+@_Z&w#9xozkQkPKUcPM)!mwcs;6Uy}-tVbK=1t%~E z-$72c`q2A*68S`=!pA{TGYDg?od0qfSzPEud10^DH}PTmkK-VoLei;n*$@)iD&&%C zM0xQZY{rA0XHo9I<^5j!KzgBFD4Q>ajl5q?&}hfcP;MwE95P@BZpSB)XQ(fbw5xkw ze}0Wp%jvH}AO2k=ol+$1vLM;88>kzp@*GK*lx@_6ghIk8Me;5sgSwR}d6E!H-eu(y zW+`MMwRvRqQY6n(R#PQ1d>~U1fvHkQi+QIeEE`t}>5%oOOEyRpdc6KFTtnSW&7_jP z)V}CK0+l*`aw2-E|1OWvnMQ4+%11^Ddpxx{*CPibRR|izdw*`K^Upty^;FqGYb{mI zwWLLg95LC9QsfgYCt)R3@-HPPP3kBQ(C+v8d7g3vr7V%0@bOajQ91gl{CD6is^nTq z7FG5^D|IJTil)jZxsn>7x?g6Oxs%y-?v?C0nWKg?lDwT=oLSV_H?~~cQH_n-2nM5O z%>6a*W=XqchJt#Z6>`jIOtq&?elxu!!__mNEwmzIM#u{4p%Ei$49S>ee5T)5YDZ1& zj2IDpaLA5FoWt63%y7)_cc0Hco7)==no%n<>~1fp%QB7V(1@ETn47&dJ{Y!~6jTZhaAg}{AWP2wb1aD4j7@hsl#!ez@6#& zZQ9z~9eZBSl=9m@ZiS_FZ$86S10}WH-Rx&R6 zXz>wWr4<>CJBO>7QbeCWt>Y0rYDS0bXv|K(#7=%+;%3gbB0(!^jgQ+BOJbT1X=)mF zGF%q(l}Qw%mfWqakRCF^qjoB?Q7d_E-k}Wlsfq)|USMs%?lyFc;gMm(En84kI7FZw z0&Q_`$Q&m6$)76r`^x&P^XGKXnhLl*JZw6S)t0y^BP0dm#LN8uu}P;o d;j8WpNo-^{1kEwhn0^?clZ2$h=Kj2}=`VAsj`RQk delta 1951 zcmZA1ZERCj9LMok1YiUQO|iC6F7&B_#-A6-xT|e>E^^X?7>+~<7XH{tIU|?7)SlD2b=LI zDl%{4I{dtFei7sJgWRP1cj9Jz3i+82INXL`sL%N38V${O5w(Ky6?xlH=Lb+LoI-{E zS-c(J!fN~)!?=JI=viru7psw=m|ASdCe(9=QTI(?E=c1TjX0h{_QZUJnn)nPDlmrX zZ%6I%!?+Q1sIB_2&|gHYtdUVPU<$SOQ`m|QcHlL900R}oe-(`bOj{nu_4o!}w2Zlo zy76>XJ`!JInEubmGmM{QXfM~GBGZT3qA}FKuj5Xf$5CuyHM{UQ>inf3@!v{g6{)O0 zjA9Bu!an>1$8Za?(;mK!N~Q%I!qqHS5juno_#EDa=L+7yz4TLrZ2)a-!Fk++B{||c zNMjT`@hoZ!uA)NKxH`Ym`%yD~3^fr4yYV_I)azJ&6h}}Id>)nUpQ0vu9Z3(9UPH9- z9uA6NZkmQ>bOM!B=L>#|G5U%((KhYK&-8Inwm*XW%!?c}@cYOuW*&=BuLduW@u99) zA!%jOs4cx0d2Y@eqp^t-ui`$ughbbLM)KJ_hze~6HNXi>;yVQwQ1^#;RdjtAH{uc0 z2WJj-{WsLWF&=gwj$otG_dE@vZLZ)3{1q+KDwvBK6>uLWwJihog=G~vzDVw)!>G;c zrQS{TQJbkswNh#uwUXLTT`GJ&Zx$wTv&3oLN!5(VTClto*qt&DF1G*sM7 z$v53JEh)4;n5HUal?}I0RkTsOTJF0;X1d>9rQ>p{_JFK*(_5*n>{I6Gee_ZXsU|Wr zk$uTmWnV68a~gcbUVF&@y^}7h^weeckB1{OQ}9ss$;o}=hi4RomaN+1}j{bPhKBWI1P=j#_qabK)Nt_uGB| diff --git a/rest_framework/locale/it/LC_MESSAGES/django.po b/rest_framework/locale/it/LC_MESSAGES/django.po index 4889f61b7..24101d88e 100644 --- a/rest_framework/locale/it/LC_MESSAGES/django.po +++ b/rest_framework/locale/it/LC_MESSAGES/django.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-07 18:53+0100\n" -"PO-Revision-Date: 2015-12-07 17:55+0000\n" +"POT-Creation-Date: 2016-03-01 18:38+0100\n" +"PO-Revision-Date: 2016-03-01 17:38+0000\n" "Last-Translator: Xavier Ordoquy \n" "Language-Team: Italian (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/it/)\n" "MIME-Version: 1.0\n" @@ -21,43 +21,75 @@ msgstr "" "Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:72 +#: authentication.py:71 msgid "Invalid basic header. No credentials provided." msgstr "Header di base invalido. Credenziali non fornite." -#: authentication.py:75 +#: authentication.py:74 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "Header di base invalido. Le credenziali non dovrebbero contenere spazi." -#: authentication.py:81 +#: authentication.py:80 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Credenziali non correttamente codificate in base64." -#: authentication.py:98 +#: authentication.py:97 msgid "Invalid username/password." msgstr "Nome utente/password non validi" -#: authentication.py:101 authentication.py:188 +#: authentication.py:100 authentication.py:195 msgid "User inactive or deleted." msgstr "Utente inattivo o eliminato." -#: authentication.py:167 +#: authentication.py:173 msgid "Invalid token header. No credentials provided." msgstr "Header del token non valido. Credenziali non fornite." -#: authentication.py:170 +#: authentication.py:176 msgid "Invalid token header. Token string should not contain spaces." msgstr "Header del token non valido. Il contenuto del token non dovrebbe contenere spazi." -#: authentication.py:176 +#: authentication.py:182 msgid "" "Invalid token header. Token string should not contain invalid characters." -msgstr "" +msgstr "Header del token invalido. La stringa del token non dovrebbe contenere caratteri illegali." -#: authentication.py:185 +#: authentication.py:192 msgid "Invalid token." msgstr "Token invalido." +#: authtoken/apps.py:7 +msgid "Auth Token" +msgstr "" + +#: authtoken/models.py:21 +msgid "Key" +msgstr "" + +#: authtoken/models.py:23 +msgid "User" +msgstr "" + +#: authtoken/models.py:24 +msgid "Created" +msgstr "" + +#: authtoken/models.py:33 +msgid "Token" +msgstr "" + +#: authtoken/models.py:34 +msgid "Tokens" +msgstr "" + +#: authtoken/serializers.py:8 +msgid "Username" +msgstr "" + +#: authtoken/serializers.py:9 +msgid "Password" +msgstr "" + #: authtoken/serializers.py:20 msgid "User account is disabled." msgstr "L'account dell'utente è disabilitato" @@ -112,7 +144,7 @@ msgstr "Tipo di media \"{media_type}\"non supportato." msgid "Request was throttled." msgstr "La richiesta è stata limitata (throttled)." -#: fields.py:266 relations.py:195 relations.py:228 validators.py:79 +#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 #: validators.py:162 msgid "This field is required." msgstr "Campo obbligatorio." @@ -130,7 +162,7 @@ msgstr "\"{input}\" non è un valido valore booleano." msgid "This field may not be blank." msgstr "Questo campo non può essere omesso." -#: fields.py:670 fields.py:1656 +#: fields.py:670 fields.py:1664 #, python-brace-format msgid "Ensure this field has no more than {max_length} characters." msgstr "Assicurati che questo campo non abbia più di {max_length} caratteri." @@ -165,7 +197,7 @@ msgstr "\"{value}\" non è un UUID valido." #: fields.py:791 msgid "Enter a valid IPv4 or IPv6 address." -msgstr "" +msgstr "Inserisci un indirizzo IPv4 o IPv6 valido." #: fields.py:816 msgid "A valid integer is required." @@ -216,137 +248,136 @@ msgstr "L'oggetto di tipo datetime è in un formato errato. Usa uno dei seguenti msgid "Expected a datetime but got a date." msgstr "Atteso un oggetto di tipo datetime ma l'oggetto ricevuto è di tipo date." -#: fields.py:1079 +#: fields.py:1082 #, python-brace-format msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "La data è in un formato errato. Usa uno dei seguenti formati: {format}." -#: fields.py:1080 +#: fields.py:1083 msgid "Expected a date but got a datetime." msgstr "Atteso un oggetto di tipo date ma l'oggetto ricevuto è di tipo datetime." -#: fields.py:1148 +#: fields.py:1151 #, python-brace-format msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "L'orario ha un formato errato. Usa uno dei seguenti formati: {format}." -#: fields.py:1207 +#: fields.py:1215 #, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "La durata è in un formato errato. Usa uno dei seguenti formati: {format}." -#: fields.py:1232 fields.py:1281 +#: fields.py:1240 fields.py:1289 #, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" non è una scelta valida." -#: fields.py:1235 relations.py:62 relations.py:431 +#: fields.py:1243 relations.py:71 relations.py:442 #, python-brace-format msgid "More than {count} items..." -msgstr "" +msgstr "Più di {count} oggetti..." -#: fields.py:1282 fields.py:1429 relations.py:427 serializers.py:520 +#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 #, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Attesa una lista di oggetti ma l'oggetto ricevuto è di tipo \"{input_type}\"." -#: fields.py:1283 +#: fields.py:1291 msgid "This selection may not be empty." -msgstr "" +msgstr "Questa selezione potrebbe non essere vuota." -#: fields.py:1320 +#: fields.py:1328 #, python-brace-format msgid "\"{input}\" is not a valid path choice." -msgstr "" +msgstr "\"{input}\" non è un percorso valido." -#: fields.py:1339 +#: fields.py:1347 msgid "No file was submitted." msgstr "Non è stato inviato alcun file." -#: fields.py:1340 +#: fields.py:1348 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "I dati inviati non corrispondono ad un file. Si prega di controllare il tipo di codifica nel form." -#: fields.py:1341 +#: fields.py:1349 msgid "No filename could be determined." msgstr "Il nome del file non può essere determinato." -#: fields.py:1342 +#: fields.py:1350 msgid "The submitted file is empty." msgstr "Il file inviato è vuoto." -#: fields.py:1343 +#: fields.py:1351 #, python-brace-format msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "Assicurati che il nome del file abbia, al più, {max_length} caratteri (attualmente ne ha {length})." -#: fields.py:1391 +#: fields.py:1399 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "Invia un'immagine valida. Il file che hai inviato non era un'immagine o era corrotto." -#: fields.py:1430 relations.py:428 serializers.py:521 +#: fields.py:1438 relations.py:439 serializers.py:521 msgid "This list may not be empty." -msgstr "" +msgstr "Questa lista potrebbe non essere vuota." -#: fields.py:1483 +#: fields.py:1491 #, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "Era atteso un dizionario di oggetti ma il dato ricevuto è di tipo \"{input_type}\"." -#: fields.py:1530 +#: fields.py:1538 msgid "Value must be valid JSON." -msgstr "" +msgstr "Il valore deve essere un JSON valido." -#: filters.py:35 templates/rest_framework/filters/django_filter.html:5 +#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 msgid "Submit" -msgstr "" +msgstr "Invia" #: pagination.py:189 -#, python-brace-format -msgid "Invalid page \"{page_number}\": {message}." -msgstr "Pagina \"{page_number}\" non valida: {message}." +msgid "Invalid page." +msgstr "" #: pagination.py:407 msgid "Invalid cursor" msgstr "Cursore non valido" -#: relations.py:196 +#: relations.py:207 #, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Pk \"{pk_value}\" non valido - l'oggetto non esiste." -#: relations.py:197 +#: relations.py:208 #, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Tipo non corretto. Era atteso un valore pk, ma è stato ricevuto {data_type}." -#: relations.py:229 +#: relations.py:240 msgid "Invalid hyperlink - No URL match." msgstr "Collegamento non valido - Nessuna corrispondenza di URL." -#: relations.py:230 +#: relations.py:241 msgid "Invalid hyperlink - Incorrect URL match." msgstr "Collegamento non valido - Corrispondenza di URL non corretta." -#: relations.py:231 +#: relations.py:242 msgid "Invalid hyperlink - Object does not exist." msgstr "Collegamento non valido - L'oggetto non esiste." -#: relations.py:232 +#: relations.py:243 #, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Tipo non corretto. Era attesa una stringa URL, ma è stato ricevuto {data_type}." -#: relations.py:391 +#: relations.py:402 #, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "L'oggetto con {slug_name}={value} non esiste." -#: relations.py:392 +#: relations.py:403 msgid "Invalid value." msgstr "Valore non valido." @@ -358,20 +389,20 @@ msgstr "Dati non validi. Era atteso un dizionario, ma si è ricevuto {datatype}. #: templates/rest_framework/admin.html:118 #: templates/rest_framework/base.html:128 msgid "Filters" -msgstr "" +msgstr "Filtri" #: templates/rest_framework/filters/django_filter.html:2 #: templates/rest_framework/filters/django_filter_crispyforms.html:4 msgid "Field filters" -msgstr "" +msgstr "Filtri per il campo" #: templates/rest_framework/filters/ordering.html:3 msgid "Ordering" -msgstr "" +msgstr "Ordinamento" #: templates/rest_framework/filters/search.html:2 msgid "Search" -msgstr "" +msgstr "Cerca" #: templates/rest_framework/horizontal/radio.html:2 #: templates/rest_framework/inline/radio.html:2 diff --git a/rest_framework/locale/ja/LC_MESSAGES/django.mo b/rest_framework/locale/ja/LC_MESSAGES/django.mo index 4a583925ea55167ec2eb31cbe8b3ef97729c5aee..048da56fd3776f05337b9498f6444bf9546a7a85 100644 GIT binary patch delta 2633 zcmYk-dr(wW9Ki7d%S%}lLN*b@>0Oi=51_orI!vhD(*m8$zGg{S1^nBtA}LdixZ+*W-P@ycnqbZ+xQ&*Zk8=Eftig! znNhB3nOXljvWuz{W#&gvwyGbcpKtJa^r3qcnJ8LmI1yv92t%+OS#?#3Q_z8IuR3aa z9QjlIJfxrVD97d&#^Xn}4+VEBnR#xxIQrln?i z9Zsd}!b?F)eTcF}n>qTq_z}uk_!*_$I69L(UWpmF)3hI11a;f|{7*NTQYzw^7RNw2 zuoAbK{$QHNbStQT8|BphjjM1T>$nU%@ntmd6`VCDaF`F9Ud8RyTQ~@XxC>=~?#pCm zllco}CTZgWR-trw6xZQH=CmHTK|o3>nWPunITewV88&JSnW1KFF-DvDIl3)0)-9K-f>=aM zC)f-B1(SJ?A|%O;XN{GOke!}I$oeD@D+rC?w^pqtIPEHhs3MjUa#AEMA@Ye~1Sj18 z41K@kx_$VN$$jmah!5}|~oDFhc?y($F~`>9s?bAh8Rr%KXG0sK$d*g|3) z!Ikm4U?TUD8i7R&4YiqQPj#`)9*{F&GdONLg!QStNbp=_L*th9hqNgP^IPIEi zldWFcQQgo~@7k$3T=u%g%uKyI`gF{4XN}$IsDDkZur)SrZE)7;r7`KDcAK+$lfEM+ zF|4eqs?Oo^>M`ZP*1)Lz&qn=0>^c3!$m!!(H`<-`wmQ37W29NXKX2-sP5=M^ delta 2111 zcmZY9c}!eI9Ki8mxuFYXITk3=2UPBRyMkLOrG*v&kG2HC9#oL3Nh?-LtfkEpY0_9j zOf#Zw(-$Ql6n5fbChfUP)@9nELI>~Q8GqdlQ`OVCm z*!DrE`K2dfOi|j2EMnHB)E?X#$q&VdRw@T`(7<(gHQtWdcm&gN66OB0xD3C-GQ5PP zSQMkwTI|5}cs!)3zNWH)j)GXF)?hz&;561?bevMFupV1+2m|;o%Kxr-rP?rnd3YE- zIE6Bx(@y_+$G=dXm$yVIzcQ8TrXn*MLwWEiti|849xL3;8vC&vElj{~QLg(13$d6^ z$<$^n#zB<+C$SRW!*cusug9W9rRsRU8lXa-dJ!}6EvJ1RWk!oAGf7w)vIM2S8D*xs zP?o~P0(=6~@EtVpA|~UX7=fN7rAVIgqFF&Dmx?@S6UvQ!=*0tAiI1Wz(K(cXxVc#V zFGgvvMOpK1yatC*mgXg=y@)cg97ZA6U55sCCX;^|!2NW{=9t71{1K}#Jw>T5Y{3kC z+VM12)1Je#VM@iPl1kbiGI|-n5=JLWw+`jH5tJo)70d7&$Ha86Xm@T=2fJFN(IWu zcR7xuJn##=6{}fbxnUH0aR#?x)^erp!u_}d=TQdOWQ6v_QS72UjnW^-4sF5?l(u=2 zN*$FSum$sTLz&ov{j}f4o#G&08gl$Ek8%9uGG=;K67jQdfFdb>{LutQ)^5T>drLM)N zQ0}{ck^y%qlfiJ}e}(tkMK&K9Qhaml*>Ga)kI5QLA}*I^r^0@-OAEhM#3rJR;9d67 z+<;PKK+H=uNP`khtRiBiL6I!lM@x1w6SQ}&e2k>H2uY>PLP{JVDUBjl6KrA?Nf?AI z;Yvb|vlPjYWb<+%8Olx65Q$DFTgSA|y_`{5|D zcHvX-PhmyuPxcKMPoxp81Y1kpOx#2?5;5{7ImfcGHWN|;#8SH!`c5Z1^$64t$7JfB zm~;9!cbaaFZLp5U)<;+i?i5${ZFlq;xkL9r_uYfLd;0D@m>V#LcJ~bo&~?!IDRCl9 zA4~G-g(OQ)c}ny}kJq~7>2&EGsk1sKty1qzJL2}2RaKW&))-Z_0l!bjdzby&Qxov} zEuZ%}mu}C^*XfxXqZS^Ym_Kz)CzWX=S4;C8wWMQ^-rf@Rc RI#lWl(`U+h_0ID8zX6b-2G#%o diff --git a/rest_framework/locale/ja/LC_MESSAGES/django.po b/rest_framework/locale/ja/LC_MESSAGES/django.po index ea9ba1728..85c2fa5ae 100644 --- a/rest_framework/locale/ja/LC_MESSAGES/django.po +++ b/rest_framework/locale/ja/LC_MESSAGES/django.po @@ -3,12 +3,13 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Hiroaki Nakamura , 2016 msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-07 18:53+0100\n" -"PO-Revision-Date: 2015-12-07 17:55+0000\n" +"POT-Creation-Date: 2016-03-01 18:38+0100\n" +"PO-Revision-Date: 2016-03-01 17:38+0000\n" "Last-Translator: Xavier Ordoquy \n" "Language-Team: Japanese (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/ja/)\n" "MIME-Version: 1.0\n" @@ -17,43 +18,75 @@ msgstr "" "Language: ja\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: authentication.py:72 +#: authentication.py:71 msgid "Invalid basic header. No credentials provided." msgstr "不正な基本ヘッダです。認証情報が含まれていません。" -#: authentication.py:75 +#: authentication.py:74 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "不正な基本ヘッダです。認証情報文字列に空白を含めてはいけません。" -#: authentication.py:81 +#: authentication.py:80 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "不正な基本ヘッダです。認証情報がBASE64で正しくエンコードされていません。" -#: authentication.py:98 +#: authentication.py:97 msgid "Invalid username/password." msgstr "ユーザ名かパスワードが違います。" -#: authentication.py:101 authentication.py:188 +#: authentication.py:100 authentication.py:195 msgid "User inactive or deleted." msgstr "ユーザが無効か削除されています。" -#: authentication.py:167 +#: authentication.py:173 msgid "Invalid token header. No credentials provided." msgstr "不正なトークンヘッダです。認証情報が含まれていません。" -#: authentication.py:170 +#: authentication.py:176 msgid "Invalid token header. Token string should not contain spaces." msgstr "不正なトークンヘッダです。トークン文字列に空白を含めてはいけません。" -#: authentication.py:176 +#: authentication.py:182 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "不正なトークンヘッダです。トークン文字列に不正な文字を含めてはいけません。" -#: authentication.py:185 +#: authentication.py:192 msgid "Invalid token." msgstr "不正なトークンです。" +#: authtoken/apps.py:7 +msgid "Auth Token" +msgstr "認証トークン" + +#: authtoken/models.py:21 +msgid "Key" +msgstr "キー" + +#: authtoken/models.py:23 +msgid "User" +msgstr "ユーザ" + +#: authtoken/models.py:24 +msgid "Created" +msgstr "作成された" + +#: authtoken/models.py:33 +msgid "Token" +msgstr "トークン" + +#: authtoken/models.py:34 +msgid "Tokens" +msgstr "トークン" + +#: authtoken/serializers.py:8 +msgid "Username" +msgstr "ユーザ名" + +#: authtoken/serializers.py:9 +msgid "Password" +msgstr "パスワード" + #: authtoken/serializers.py:20 msgid "User account is disabled." msgstr "ユーザアカウントが無効化されています。" @@ -108,7 +141,7 @@ msgstr "リクエストのメディアタイプ \"{media_type}\" はサポート msgid "Request was throttled." msgstr "リクエストの処理は絞られました。" -#: fields.py:266 relations.py:195 relations.py:228 validators.py:79 +#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 #: validators.py:162 msgid "This field is required." msgstr "この項目は必須です。" @@ -126,7 +159,7 @@ msgstr "\"{input}\" は有効なブーリアンではありません。" msgid "This field may not be blank." msgstr "この項目は空にできません。" -#: fields.py:670 fields.py:1656 +#: fields.py:670 fields.py:1664 #, python-brace-format msgid "Ensure this field has no more than {max_length} characters." msgstr "この項目が{max_length}文字より長くならないようにしてください。" @@ -212,137 +245,136 @@ msgstr "日時の形式が違います。以下のどれかの形式にしてく msgid "Expected a datetime but got a date." msgstr "日付ではなく日時を入力してください。" -#: fields.py:1079 +#: fields.py:1082 #, python-brace-format msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "日付の形式が違います。以下のどれかの形式にしてください: {format}。" -#: fields.py:1080 +#: fields.py:1083 msgid "Expected a date but got a datetime." msgstr "日時ではなく日付を入力してください。" -#: fields.py:1148 +#: fields.py:1151 #, python-brace-format msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "時刻の形式が違います。以下のどれかの形式にしてください: {format}。" -#: fields.py:1207 +#: fields.py:1215 #, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "機関の形式が違います。以下のどれかの形式にしてください: {format}。" -#: fields.py:1232 fields.py:1281 +#: fields.py:1240 fields.py:1289 #, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\"は有効な選択肢ではありません。" -#: fields.py:1235 relations.py:62 relations.py:431 +#: fields.py:1243 relations.py:71 relations.py:442 #, python-brace-format msgid "More than {count} items..." -msgstr "" +msgstr " {count} 個より多い..." -#: fields.py:1282 fields.py:1429 relations.py:427 serializers.py:520 +#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 #, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." msgstr "\"{input_type}\" 型のデータではなく項目のリストを入力してください。" -#: fields.py:1283 +#: fields.py:1291 msgid "This selection may not be empty." msgstr "空でない項目を選択してください。" -#: fields.py:1320 +#: fields.py:1328 #, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "\"{input}\"は有効なパスの選択肢ではありません。" -#: fields.py:1339 +#: fields.py:1347 msgid "No file was submitted." msgstr "ファイルが添付されていません。" -#: fields.py:1340 +#: fields.py:1348 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "添付されたデータはファイルではありません。フォームのエンコーディングタイプを確認してください。" -#: fields.py:1341 +#: fields.py:1349 msgid "No filename could be determined." msgstr "ファイル名が取得できませんでした。" -#: fields.py:1342 +#: fields.py:1350 msgid "The submitted file is empty." msgstr "添付ファイルの中身が空でした。" -#: fields.py:1343 +#: fields.py:1351 #, python-brace-format msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "ファイル名は最大{max_length}文字にしてください({length}文字でした)。" -#: fields.py:1391 +#: fields.py:1399 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "有効な画像をアップロードしてください。アップロードされたファイルは画像でないか壊れた画像です。" -#: fields.py:1430 relations.py:428 serializers.py:521 +#: fields.py:1438 relations.py:439 serializers.py:521 msgid "This list may not be empty." msgstr "リストは空ではいけません。" -#: fields.py:1483 +#: fields.py:1491 #, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "\"{input_type}\" 型のデータではなく項目の辞書を入力してください。" -#: fields.py:1530 +#: fields.py:1538 msgid "Value must be valid JSON." -msgstr "" +msgstr "値は有効なJSONでなければなりません。" -#: filters.py:35 templates/rest_framework/filters/django_filter.html:5 +#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 msgid "Submit" -msgstr "" +msgstr "提出" #: pagination.py:189 -#, python-brace-format -msgid "Invalid page \"{page_number}\": {message}." -msgstr "ページ番号 \"{page_number}\" は不正です: {message}。" +msgid "Invalid page." +msgstr "" #: pagination.py:407 msgid "Invalid cursor" msgstr "カーソルが不正です。" -#: relations.py:196 +#: relations.py:207 #, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "主キー \"{pk_value}\" は不正です - データが存在しません。" -#: relations.py:197 +#: relations.py:208 #, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "不正な型です。{data_type} 型ではなく主キーの値を入力してください。" -#: relations.py:229 +#: relations.py:240 msgid "Invalid hyperlink - No URL match." msgstr "ハイパーリンクが不正です - URLにマッチしません。" -#: relations.py:230 +#: relations.py:241 msgid "Invalid hyperlink - Incorrect URL match." msgstr "ハイパーリンクが不正です - 不正なURLにマッチします。" -#: relations.py:231 +#: relations.py:242 msgid "Invalid hyperlink - Object does not exist." msgstr "ハイパーリンクが不正です - リンク先が存在しません。" -#: relations.py:232 +#: relations.py:243 #, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "不正なデータ型です。{data_type} 型ではなくURL文字列を入力してください。" -#: relations.py:391 +#: relations.py:402 #, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "{slug_name}={value} のデータが存在しません。" -#: relations.py:392 +#: relations.py:403 msgid "Invalid value." msgstr "不正な値です。" @@ -354,20 +386,20 @@ msgstr "不正なデータです。{datatype} 型ではなく辞書を入力し #: templates/rest_framework/admin.html:118 #: templates/rest_framework/base.html:128 msgid "Filters" -msgstr "" +msgstr "フィルタ" #: templates/rest_framework/filters/django_filter.html:2 #: templates/rest_framework/filters/django_filter_crispyforms.html:4 msgid "Field filters" -msgstr "" +msgstr "フィールドフィルタ" #: templates/rest_framework/filters/ordering.html:3 msgid "Ordering" -msgstr "" +msgstr "順序" #: templates/rest_framework/filters/search.html:2 msgid "Search" -msgstr "" +msgstr "検索" #: templates/rest_framework/horizontal/radio.html:2 #: templates/rest_framework/inline/radio.html:2 diff --git a/rest_framework/locale/ko_KR/LC_MESSAGES/django.mo b/rest_framework/locale/ko_KR/LC_MESSAGES/django.mo index f9a7261f8b404f226268ff099443cefbc8bf6c49..ac88a062dc30575bd46c86f2479fcd819a420a1f 100644 GIT binary patch delta 1672 zcmY+^-%rhP9LMpu^aGV2g$|-qNIFiPQ&N4CqU2Ym8^%TW6odEyS7CaR*#@k}Iy{Y=@EKN{ zMJ#QaSqlw2u@vuP1&-r3Tr%Cv!NaKU?_xc^#if`(!z>LOQ3Gj5wV(97jrzaGSb}lM zX3Mb*9iDIdxhbRJI#%H*)?iwSSpl}-OgxL~cLnqCIcjAlF&}-YtQOXwe%FUv@D5hu z7u5d*xGY2mXYzd8#f?VXiJC#b=UuOT1U18tsHOjbE6_K~Y(7?_A9rIqo-sk!6ZiXz;&}@U$mm?y{Nssh#KiI7UC1sUVg^_I&;ViJcN625EtNA≦o zL_HT@OrZ~IEA!@>mE(cAtbd4`TQn@g7Z}8EUOjsrc|pAni}40_s2?7}Fw<(lK~!>m z#C;fKn%nU_s{Ji$rI(ShwK(MY*+**+4FwEadwUZ#kk=T-AE+4wSO&QtTksOr<0ov! z5|*nK&*5eq$Ez4%Ij`Xe9>=|lW2a&i+o=DFaHG9wV`JqIZp8`D(k!!X>ZedMn804_ z@y7=G4p&o8AQSnR!=)74P%C@I^AT21pG3xNMLDsph%|7cnfIfT>LK#6&s?+;DP$(A zWnommt*E^}jq3LRyKofsdxszK4C_E0voomwxzA-4zVzCEVu$9GL$7UoaTYc6SE!}S z%#9^o6t(y7k;JzQo-zeh5{Q+AW>!P!bdY227JyrHH2*DYsgPdoNlDe3R#Wj4al{5f zqvhS=o&ZjW#S?#uX0BPPXfS_@!%Z@=o*)N}UA1+D3a+GtKwEq?Ds|qhhH&=9@s0(E(!J#ltrkn9=P^Feoekgf25-Q}PB@yJdm1}AB zHdD59Y~7;7VLRQ|We$>aZqjJ~^d6`rvZD=&SxM1>)Xs#GHNjAEFckKO%ben}Kqwpv p&1h~4?l^d?ySMx3kzj3m-$BP;6bk?CS4zKVL3&q8^jX%Mq~FftpjH3? delta 1750 zcmaLXTWkzb9LMp0s~5DTR@J4ntL~R=yIX5(OIvLftxH7+ac!j%F2~iIcj}qVC%!u&dWdHLy=gjQPobx|tE-vX=8h_(U zIcb!7Vl=TW*{lU`r*NP&rkRb!W$4Ek=Hm$*feF_$E6%~0+)Vdt=P-)rTbI{y7WL*=P$PNf`OWLk80?O;7?px*oPuFK9g8;+AOu3S`7(E|^ACwjd0ZB$NQ;wb!qx>5EJH>XuNjdm9X@hYyy zcQ_Ku$%|ZpA>4salFZJdQo1XL`JYAQa*jJ?pKv_w;ltcTG#l04ip%jhmg0MC)^!YL zGj`%)e1}?O#SCv9cHlC6j_RMtiq(v_VJ-HJpruNP*W8ACQ91sAdhi&At&vruM$qng z30Km7g^MuAG&SM@T!T+>0ZwCDPhmTr#*8sM125oo%!`xAwNw_MQqk+#hxN3>1!gnw zAgX->x1bWuyW3Wb;TO~kuV+Q-`Yz;WH#tP`6_%i{(6t83X~)~CFbKPbQGA4&fiza4 z7FQ+GWv!?O97Sf&uA;7cfLa4doYZvzY{f>@|8JsRsDQXJOpcY?{yJ`(IAsfR^ViKz8#u}xznMw^Ymrx345-PcbUO1hIICDsa zdpIi{oKnS+wP^jEmb*KYuldAmLi=2^rZu5FR}%jgzE8$Ra0>5kX@sBPGhms72C+~% z)W@TmV0Sq=(QL5(oY87Z!$c~f!fZPwz%iL%CpjgB<2*t$GRx_4zX3{VhSwG>pTEj# zz6s99K#Qh`s3TaM#tw6ea;=YuN`FE*SDE5s6{!5y5?Y|YOMW7dR*;_G)Y{@N+_w`p zY~Rz?+_HOrVbs5`ttA$tYky*H){fMya3B~8ltlc&vS_%p`;IT~PfsKo4ktePS~LCs RzfqBO@65?bG!(o}{{=QWukio? diff --git a/rest_framework/locale/ko_KR/LC_MESSAGES/django.po b/rest_framework/locale/ko_KR/LC_MESSAGES/django.po index 901907c86..f0d56067f 100644 --- a/rest_framework/locale/ko_KR/LC_MESSAGES/django.po +++ b/rest_framework/locale/ko_KR/LC_MESSAGES/django.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-07 18:53+0100\n" -"PO-Revision-Date: 2015-12-07 17:55+0000\n" +"POT-Creation-Date: 2016-03-01 18:38+0100\n" +"PO-Revision-Date: 2016-03-01 17:38+0000\n" "Last-Translator: Xavier Ordoquy \n" "Language-Team: Korean (Korea) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/ko_KR/)\n" "MIME-Version: 1.0\n" @@ -18,43 +18,75 @@ msgstr "" "Language: ko_KR\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: authentication.py:72 +#: authentication.py:71 msgid "Invalid basic header. No credentials provided." msgstr "기본 헤더(basic header)가 유효하지 않습니다. 인증데이터(credentials)가 제공되지 않았습니다." -#: authentication.py:75 +#: authentication.py:74 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "기본 헤더(basic header)가 유효하지 않습니다. 인증데이터(credentials) 문자열은 빈칸(spaces)을 포함하지 않아야 합니다." -#: authentication.py:81 +#: authentication.py:80 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "기본 헤더(basic header)가 유효하지 않습니다. 인증데이터(credentials)가 base64로 적절히 부호화(encode)되지 않았습니다." -#: authentication.py:98 +#: authentication.py:97 msgid "Invalid username/password." msgstr "아이디/비밀번호가 유효하지 않습니다." -#: authentication.py:101 authentication.py:188 +#: authentication.py:100 authentication.py:195 msgid "User inactive or deleted." msgstr "계정이 중지되었거나 삭제되었습니다." -#: authentication.py:167 +#: authentication.py:173 msgid "Invalid token header. No credentials provided." msgstr "토큰 헤더가 유효하지 않습니다. 인증데이터(credentials)가 제공되지 않았습니다." -#: authentication.py:170 +#: authentication.py:176 msgid "Invalid token header. Token string should not contain spaces." msgstr "토큰 헤더가 유효하지 않습니다. 토큰 문자열은 빈칸(spaces)를 포함하지 않아야 합니다." -#: authentication.py:176 +#: authentication.py:182 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "토큰 헤더가 유효하지 않습니다. 토큰 문자열은 유효하지 않은 문자를 포함하지 않아야 합니다." -#: authentication.py:185 +#: authentication.py:192 msgid "Invalid token." msgstr "토큰이 유효하지 않습니다." +#: authtoken/apps.py:7 +msgid "Auth Token" +msgstr "" + +#: authtoken/models.py:21 +msgid "Key" +msgstr "" + +#: authtoken/models.py:23 +msgid "User" +msgstr "" + +#: authtoken/models.py:24 +msgid "Created" +msgstr "" + +#: authtoken/models.py:33 +msgid "Token" +msgstr "" + +#: authtoken/models.py:34 +msgid "Tokens" +msgstr "" + +#: authtoken/serializers.py:8 +msgid "Username" +msgstr "" + +#: authtoken/serializers.py:9 +msgid "Password" +msgstr "" + #: authtoken/serializers.py:20 msgid "User account is disabled." msgstr "사용자 계정을 사용할 수 없습니다." @@ -109,7 +141,7 @@ msgstr "요청된 \"{media_type}\"가 지원되지 않는 미디어 형태입니 msgid "Request was throttled." msgstr "요청이 지연(throttled)되었습니다." -#: fields.py:266 relations.py:195 relations.py:228 validators.py:79 +#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 #: validators.py:162 msgid "This field is required." msgstr "이 항목을 채워주십시오." @@ -127,7 +159,7 @@ msgstr "\"{input}\"이 유효하지 않은 부울(boolean)입니다." msgid "This field may not be blank." msgstr "이 칸은 blank일 수 없습니다." -#: fields.py:670 fields.py:1656 +#: fields.py:670 fields.py:1664 #, python-brace-format msgid "Ensure this field has no more than {max_length} characters." msgstr "이 칸이 글자 수가 {max_length} 이하인지 확인하십시오." @@ -213,137 +245,136 @@ msgstr "Datetime의 포멧이 잘못되었습니다. 이 형식들 중 한가지 msgid "Expected a datetime but got a date." msgstr "예상된 datatime 대신 date를 받았습니다." -#: fields.py:1079 +#: fields.py:1082 #, python-brace-format msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "Date의 포멧이 잘못되었습니다. 이 형식들 중 한가지를 사용하세요: {format}." -#: fields.py:1080 +#: fields.py:1083 msgid "Expected a date but got a datetime." msgstr "예상된 date 대신 datetime을 받았습니다." -#: fields.py:1148 +#: fields.py:1151 #, python-brace-format msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "Time의 포멧이 잘못되었습니다. 이 형식들 중 한가지를 사용하세요: {format}." -#: fields.py:1207 +#: fields.py:1215 #, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1232 fields.py:1281 +#: fields.py:1240 fields.py:1289 #, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\"이 유효하지 않은 선택(choice)입니다." -#: fields.py:1235 relations.py:62 relations.py:431 +#: fields.py:1243 relations.py:71 relations.py:442 #, python-brace-format msgid "More than {count} items..." msgstr "" -#: fields.py:1282 fields.py:1429 relations.py:427 serializers.py:520 +#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 #, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." msgstr "아이템 리스트가 예상되었으나 \"{input_type}\"를 받았습니다." -#: fields.py:1283 +#: fields.py:1291 msgid "This selection may not be empty." msgstr "" -#: fields.py:1320 +#: fields.py:1328 #, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1339 +#: fields.py:1347 msgid "No file was submitted." msgstr "파일이 제출되지 않았습니다." -#: fields.py:1340 +#: fields.py:1348 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "제출된 데이터는 파일이 아닙니다. 제출된 서식의 인코딩 형식을 확인하세요." -#: fields.py:1341 +#: fields.py:1349 msgid "No filename could be determined." msgstr "파일명을 알 수 없습니다." -#: fields.py:1342 +#: fields.py:1350 msgid "The submitted file is empty." msgstr "제출된 파일이 비어있습니다." -#: fields.py:1343 +#: fields.py:1351 #, python-brace-format msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "이 파일명의 글자수가 최대 {max_length}를 넘지 않는지 확인하십시오. (이것은 {length}가 있습니다)." -#: fields.py:1391 +#: fields.py:1399 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "유효한 이미지 파일을 업로드 하십시오. 업로드 하신 파일은 이미지 파일이 아니거나 손상된 이미지 파일입니다." -#: fields.py:1430 relations.py:428 serializers.py:521 +#: fields.py:1438 relations.py:439 serializers.py:521 msgid "This list may not be empty." msgstr "" -#: fields.py:1483 +#: fields.py:1491 #, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "아이템 딕셔너리가 예상되었으나 \"{input_type}\" 타입을 받았습니다." -#: fields.py:1530 +#: fields.py:1538 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html:5 +#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 msgid "Submit" msgstr "" #: pagination.py:189 -#, python-brace-format -msgid "Invalid page \"{page_number}\": {message}." -msgstr "유효하지 않은 page \"{page_number}\": {message}." +msgid "Invalid page." +msgstr "" #: pagination.py:407 msgid "Invalid cursor" msgstr "커서(cursor)가 유효하지 않습니다." -#: relations.py:196 +#: relations.py:207 #, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "유효하지 않은 pk \"{pk_value}\" - 객체가 존재하지 않습니다." -#: relations.py:197 +#: relations.py:208 #, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "잘못된 형식입니다. pk 값 대신 {data_type}를 받았습니다." -#: relations.py:229 +#: relations.py:240 msgid "Invalid hyperlink - No URL match." msgstr "유효하지 않은 하이퍼링크 - 일치하는 URL이 없습니다." -#: relations.py:230 +#: relations.py:241 msgid "Invalid hyperlink - Incorrect URL match." msgstr "유효하지 않은 하이퍼링크 - URL이 일치하지 않습니다." -#: relations.py:231 +#: relations.py:242 msgid "Invalid hyperlink - Object does not exist." msgstr "유효하지 않은 하이퍼링크 - 객체가 존재하지 않습니다." -#: relations.py:232 +#: relations.py:243 #, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "잘못된 형식입니다. URL 문자열을 예상했으나 {data_type}을 받았습니다." -#: relations.py:391 +#: relations.py:402 #, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "{slug_name}={value} 객체가 존재하지 않습니다." -#: relations.py:392 +#: relations.py:403 msgid "Invalid value." msgstr "값이 유효하지 않습니다." diff --git a/rest_framework/locale/mk/LC_MESSAGES/django.mo b/rest_framework/locale/mk/LC_MESSAGES/django.mo index 64ef673cf5ab76c91f523b4cc26f5a4d3bd7ccd6..e2a518f71325e547319530bac20437003629b347 100644 GIT binary patch delta 1546 zcmY+^TS!zv7{Kvw#Z@z}tL8ObZ+X9LYr1LPR!u=6E0YAp%u-5?Aj=+tHG&>AA`(Lh zA`5y5>Y*hf!fr&A)Pq*|RJ{pi1QAgfRR8ast!Uu$H#2)YGxN>N`M&el4$nKA|D;eF zi6o-UPoxLW`16Mn5g?L^k!VLJ#$g-k^Fx@3V_1OKFdtu|8!dq%Td^K>jB%{NSJ*D% zk?0_iGCBsZ0>9OeP9W*F(t%Yc@yT+K8VFQiTeCgti-PvhR#rt1azaeyHF=Kh&s`8 zK5zK?=g`LZ@`*|^TKKOlwBtH#LOXUNla^5|!g1g4_b`_B0_wy*pr$x6+#IkM_4iR< zdkS@{ZeuCVqeoL86k&GMpsrv9i|{<^9zMoAv_^_J(19J;i}5(?a}hVv{*22Okqq`J zhjv)BIYAfddk>&)^>j4(FQM{=jx87*BhreEIEYg?idNFmji+%tF5yvhvAia{iEa1| z4`T}_bRW**9!z7FBX|na@CQ0DIf49lP-$h^J$N14F@!wnN_ue@Uhw%5$7s9R(6jgw zhp}_LNFUClPSC}E*5Vj8;|pxTxD=7SxF7ZZo_VO~-dEa1s<0C?@FLdWL)6SzQq5Cc zh4r+Dk+I}1mf<2+V>rvJz-_4S8%I6NbExn6f_g@ZIhndOp5s*dsa(Nh7|iJU;7QEK z`?wibumLlTF#*#7-o=o& l*3i;|VrN0I!|rgEJ6#ixY>EGR%INVf+eSjXms55J{{~KunX3Q* delta 1673 zcmY+^Uu;WJ9Ki7(+M$MR#;~!wnLktA+HFiLV`$GC0;!s{yZQO7U6;K@7`MCB)@*{@AmedbAIQX{#pNXL-ciy z?Yz*|5Cz1x(IRb_u<=1NGDM272n`J4bZkd`z7O;9GP>|4F2Z+Mi`ipER%0{P;}u+q zZ*h}IR7%E)__z_lWthYU{EB{DHs1Qa7aPfMU=IF99l#`q$Q*R0U5j4wFwVv6sPB1! zOVBYvWCaE>NdI!2i!yFJMtxuy7hrj&HS;aFko*Yh{Q-32bJXAc!D=j<$Y8J&XJRCs zUqBt;0P29BrhTvX>0ie1E1l7NoQ-~*k1aS2kD`GWkx9sHEXPOb@4sUn`Gm>Vz~-Qq zx*4^@1nT#<(|HPY$-ZE8F&B<3tHd>^`C-%<3}QJxLtV??=)^#_hzIvz3np*|4yVmx zHWlOx@zW@g?N~})pKA@U2lc(za;d+r`Acq8;iRb|%Q1*e7{g9XVGIM5qZRMtIxJ*b z2eAj&;0J6*H#>A6p1^h-#vQnoQ69p(Sd3LOslSJd%}iHkavIz4EpEb9)JbQOz>WAK z?Of`5hCG62F=Lj<0X&bp(7`(D0DG_oA7TUA3$4w!4jakOMY-6?#cR|T)EL$txQPMs zS6G6%Mb@!didvx~=*3%Dho6zYrGjbsunAY-Dbxx-L4BW%ov52Qi29yrCl|U|uA{Ee zH{6Z+^xBKZQ6Kz;i_piJT8izs3j1+8zQb0moo7|>8tQ4Xv6FRas<9hSqE_+;R_pn1 zU^rK~aT@E<$tct?YR7kQ6zZ&OguZMsQA@BI!k#mq2Xm(M`(M*ROd;5V!bvsXsg)W{ z)ady)xEM#UN6ho9W&76{q*;E=Ij$p3ORq<9C6P<$Y5CXq`;bb4ikppDn&)2=R>|Dx zT4`<5;vsu}w%Vu{4{mPa&Z@ zTK};M2wf{GE6$`n<5I@#w%sA4II<5~yAO8l4DIhL_8XC|P&mx3zGOV}quuLuc`96P zpW#{J_f|UH9=F@kwAQsg)Y}p6*xT)@Yda9~8x?NP$a6lw*P9&7Ig}aCDzcTPj;4;K fVnc&N_l5?IH?jWzdV3Q~jPw@|6yznHh0Tt?og&0K diff --git a/rest_framework/locale/mk/LC_MESSAGES/django.po b/rest_framework/locale/mk/LC_MESSAGES/django.po index 554460c61..5818124ae 100644 --- a/rest_framework/locale/mk/LC_MESSAGES/django.po +++ b/rest_framework/locale/mk/LC_MESSAGES/django.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-07 18:53+0100\n" -"PO-Revision-Date: 2015-12-07 17:55+0000\n" +"POT-Creation-Date: 2016-03-01 18:38+0100\n" +"PO-Revision-Date: 2016-03-01 17:38+0000\n" "Last-Translator: Xavier Ordoquy \n" "Language-Team: Macedonian (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/mk/)\n" "MIME-Version: 1.0\n" @@ -18,43 +18,75 @@ msgstr "" "Language: mk\n" "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n" -#: authentication.py:72 +#: authentication.py:71 msgid "Invalid basic header. No credentials provided." msgstr "Невалиден основен header. Не се внесени податоци за автентикација." -#: authentication.py:75 +#: authentication.py:74 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "Невалиден основен header. Автентикационата низа не треба да содржи празни места." -#: authentication.py:81 +#: authentication.py:80 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Невалиден основен header. Податоците за автентикација не се енкодирани со base64." -#: authentication.py:98 +#: authentication.py:97 msgid "Invalid username/password." msgstr "Невалидно корисничко име/лозинка." -#: authentication.py:101 authentication.py:188 +#: authentication.py:100 authentication.py:195 msgid "User inactive or deleted." msgstr "Корисникот е деактивиран или избришан." -#: authentication.py:167 +#: authentication.py:173 msgid "Invalid token header. No credentials provided." msgstr "Невалиден токен header. Не се внесени податоци за најава." -#: authentication.py:170 +#: authentication.py:176 msgid "Invalid token header. Token string should not contain spaces." msgstr "Невалиден токен во header. Токенот не треба да содржи празни места." -#: authentication.py:176 +#: authentication.py:182 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:185 +#: authentication.py:192 msgid "Invalid token." msgstr "Невалиден токен." +#: authtoken/apps.py:7 +msgid "Auth Token" +msgstr "" + +#: authtoken/models.py:21 +msgid "Key" +msgstr "" + +#: authtoken/models.py:23 +msgid "User" +msgstr "" + +#: authtoken/models.py:24 +msgid "Created" +msgstr "" + +#: authtoken/models.py:33 +msgid "Token" +msgstr "" + +#: authtoken/models.py:34 +msgid "Tokens" +msgstr "" + +#: authtoken/serializers.py:8 +msgid "Username" +msgstr "" + +#: authtoken/serializers.py:9 +msgid "Password" +msgstr "" + #: authtoken/serializers.py:20 msgid "User account is disabled." msgstr "Сметката на корисникот е деактивирана." @@ -109,7 +141,7 @@ msgstr "Media типот „{media_type}“ не е поддржан." msgid "Request was throttled." msgstr "Request-от е забранет заради ограничувања." -#: fields.py:266 relations.py:195 relations.py:228 validators.py:79 +#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 #: validators.py:162 msgid "This field is required." msgstr "Ова поле е задолжително." @@ -127,7 +159,7 @@ msgstr "\"{input}\" не е валиден boolean." msgid "This field may not be blank." msgstr "Ова поле не смее да биде празно." -#: fields.py:670 fields.py:1656 +#: fields.py:670 fields.py:1664 #, python-brace-format msgid "Ensure this field has no more than {max_length} characters." msgstr "Ова поле не смее да има повеќе од {max_length} знаци." @@ -213,137 +245,136 @@ msgstr "Датата и времето се со погрешен формат. msgid "Expected a datetime but got a date." msgstr "Очекувано беше дата и време, а внесено беше само дата." -#: fields.py:1079 +#: fields.py:1082 #, python-brace-format msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "Датата е со погрешен формат. Користете го овој формат: {format}." -#: fields.py:1080 +#: fields.py:1083 msgid "Expected a date but got a datetime." msgstr "Очекувана беше дата, а внесени беа и дата и време." -#: fields.py:1148 +#: fields.py:1151 #, python-brace-format msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "Времето е со погрешен формат. Користете го овој формат: {format}." -#: fields.py:1207 +#: fields.py:1215 #, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1232 fields.py:1281 +#: fields.py:1240 fields.py:1289 #, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "„{input}“ не е валиден избор." -#: fields.py:1235 relations.py:62 relations.py:431 +#: fields.py:1243 relations.py:71 relations.py:442 #, python-brace-format msgid "More than {count} items..." msgstr "" -#: fields.py:1282 fields.py:1429 relations.py:427 serializers.py:520 +#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 #, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Очекувана беше листа, а внесено беше „{input_type}“." -#: fields.py:1283 +#: fields.py:1291 msgid "This selection may not be empty." msgstr "" -#: fields.py:1320 +#: fields.py:1328 #, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1339 +#: fields.py:1347 msgid "No file was submitted." msgstr "Ниеден фајл не е качен (upload-иран)." -#: fields.py:1340 +#: fields.py:1348 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "Испратените податоци не се фајл. Проверете го encoding-от на формата." -#: fields.py:1341 +#: fields.py:1349 msgid "No filename could be determined." msgstr "Не може да се открие име на фајлот." -#: fields.py:1342 +#: fields.py:1350 msgid "The submitted file is empty." msgstr "Качениот (upload-иран) фајл е празен." -#: fields.py:1343 +#: fields.py:1351 #, python-brace-format msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "Името на фајлот треба да има највеќе {max_length} знаци (а има {length})." -#: fields.py:1391 +#: fields.py:1399 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "Качете (upload-ирајте) валидна слика. Фајлот што го качивте не е валидна слика или е расипан." -#: fields.py:1430 relations.py:428 serializers.py:521 +#: fields.py:1438 relations.py:439 serializers.py:521 msgid "This list may not be empty." msgstr "" -#: fields.py:1483 +#: fields.py:1491 #, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1530 +#: fields.py:1538 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html:5 +#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 msgid "Submit" msgstr "" #: pagination.py:189 -#, python-brace-format -msgid "Invalid page \"{page_number}\": {message}." -msgstr "Невалидна страна „{page_number}“: {message}." +msgid "Invalid page." +msgstr "" #: pagination.py:407 msgid "Invalid cursor" msgstr "" -#: relations.py:196 +#: relations.py:207 #, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Невалиден pk „{pk_value}“ - објектот не постои." -#: relations.py:197 +#: relations.py:208 #, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Неточен тип. Очекувано беше pk, а внесено {data_type}." -#: relations.py:229 +#: relations.py:240 msgid "Invalid hyperlink - No URL match." msgstr "Невалиден хиперлинк - не е внесен URL." -#: relations.py:230 +#: relations.py:241 msgid "Invalid hyperlink - Incorrect URL match." msgstr "Невалиден хиперлинк - внесен е неправилен URL." -#: relations.py:231 +#: relations.py:242 msgid "Invalid hyperlink - Object does not exist." msgstr "Невалиден хиперлинк - Објектот не постои." -#: relations.py:232 +#: relations.py:243 #, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Неточен тип. Очекувано беше URL, a внесено {data_type}." -#: relations.py:391 +#: relations.py:402 #, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "Објектот со {slug_name}={value} не постои." -#: relations.py:392 +#: relations.py:403 msgid "Invalid value." msgstr "Невалидна вредност." diff --git a/rest_framework/locale/nb/LC_MESSAGES/django.mo b/rest_framework/locale/nb/LC_MESSAGES/django.mo index 56b7a969b10a76a0c3873834588c5530d9f93a4e..a0bdb3a49184449bd82e8037f9830fba15338b75 100644 GIT binary patch delta 2010 zcmYk-TWl0n9LMqh;<~#Q*+Pq3r6L1`VzrCgR(gY$t=rN!DvVmVqyuDL?3)2CJQ9>7UTCfI|?T~^Eq>NX3pjR zpXqS-4_)r9qTokH8K6E%y*&BZU#!5g>$|Hh|qUc~HiY(d>WfTg$# ziN#aR8gV1)_rutQ*RTxd zJZe^iDb$4eQT=cGeu8@5SGZV9ouo01jyMMvWlK;iOrZu!V?Cb0WjKK;oEuZd=qK~8PtlhzGwXY ztEd&{P$3D<$lqUv3psDb7`}=QzK6wl6x|?=&uOr`b{?O@Z;&wA9n^#WLOmeLNeCBU z30C^&t(f4v6BWvLQ4<|SUH7wp{s$^IVvJsk)y3?;VwmV)%kfXt`CL+3D^8(< z12_lY!TERuwc@X_6?52uwTv!ZY{BnPp)Ful+L;b)z#&u)eecrfrV(Yi`r&1)$B%I> zj$tJ(WIq|h`cN@`1GRz=ea~SV=eID4^JnKnx&;-oZ8#5ip?2ahY60$58qGBRLCvs< zrz<=6Bl&1w;8Gk#ZFzug&zV*@w((xKqj(RPV92mnk<6=C3b$Ah<$9t%W zSFl_M+fmnV#RkT=4``%t6e}>o*GDn0##eA7k|uTu^`PrWG;9(zK#a@{;D1HoP*M0u zbT6OUP~qhkFaBVC)b8mV^mS6vtE4i8`Vy7b)!V`*)QaO&6*j_4TITDORlduzt3su& zm#*|^YAgI-_%{Dvl#a@f9=~TjCaD9|AeHU%GN}_;nfJmgF1^$Ti?UJy)z;~2qQbU> zydbn@bD3s#0pmHVHM^&F3tIO_&?rnhW&dbe-RytQMGvvhYR-%7roelxQ(Jveebb~}|r2NwvKgOUF|mLfWdG@z)c35&eT|!u{T&}2qCla zEoefFNx_5*GnEU>OdvWjdSOhwP-Mgx(3luw0vFC@qF!(%k@)>ReMr3Wr04mZbJjl3 zIsfxN&!!XSc4dAk@|`kD5A`1E%{;RVUcQS9@6<(-g&$qe?vvCaH-h_45P+-u@;YGjY9n~jh#4y%@|siyWt3y(tpnDpGK|Z zUDV1hd(L{}{=(eKH=wqr8TI?eu@aA92~MDcA7Q4L#*Z|7IEO^p{=$uT3)wEKBAyCq zJr~_z2l}xWS7OTRk7F(Umrz@J0X5NoP~R)%Vd~eRa%6Wg@qduU00Y{~cToMGP%|%F zp8H}oI`rF66YEDM(`l^2pD~2_E6fgH4DZI1p65I-Vjbhx@#;LY6(z)9dos)Pv{yx> z@_MXC^?Oh&9!CdHVmV&Gb@&5n#ed^Atm3I{c*ye;Y@wgWYP7Z6P?327AHqu+8cHS~ z@z{lJs6V`cQT!IWuzS4>87?&d#FAt;dA4jKvw34M*Fgd z`rpz_hyNk&IaIt=2#eo+qqJtP`NNt03~iydQx#DaojOHRMTx0o*2z=ysswVl$=^l0 zgSwllQ>C&uhr3hDY0sxBEn-x?)p>`y`3y_kMBGPfGxb3B?Le_ludVE@KoGMikNe3D3wk#G(MGBI^$m)35M!|wGB=v8jFOp@shIE+(^_3 zMPlLls#?l|L^3@V>>N!Frw5Z`Bcm~APikx|HR`k\n" +"POT-Creation-Date: 2016-03-01 18:38+0100\n" +"PO-Revision-Date: 2016-03-01 17:38+0000\n" +"Last-Translator: Xavier Ordoquy \n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,43 +18,75 @@ msgstr "" "Language: nb\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:72 +#: authentication.py:71 msgid "Invalid basic header. No credentials provided." msgstr "Ugyldig basic header. Ingen legitimasjon gitt." -#: authentication.py:75 +#: authentication.py:74 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "Ugylid basic header. Legitimasjonsstreng bør ikke inneholde mellomrom." -#: authentication.py:81 +#: authentication.py:80 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Ugyldig basic header. Legitimasjonen ikke riktig Base64 kodet." -#: authentication.py:98 +#: authentication.py:97 msgid "Invalid username/password." msgstr "Ugyldig brukernavn eller passord." -#: authentication.py:101 authentication.py:188 +#: authentication.py:100 authentication.py:195 msgid "User inactive or deleted." msgstr "Bruker inaktiv eller slettet." -#: authentication.py:167 +#: authentication.py:173 msgid "Invalid token header. No credentials provided." msgstr "Ugyldig token header. Ingen legitimasjon gitt." -#: authentication.py:170 +#: authentication.py:176 msgid "Invalid token header. Token string should not contain spaces." msgstr "Ugyldig token header. Token streng skal ikke inneholde mellomrom." -#: authentication.py:176 +#: authentication.py:182 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "Ugyldig token header. Tokenstrengen skal ikke inneholde ugyldige tegn." -#: authentication.py:185 +#: authentication.py:192 msgid "Invalid token." msgstr "Ugyldig token." +#: authtoken/apps.py:7 +msgid "Auth Token" +msgstr "" + +#: authtoken/models.py:21 +msgid "Key" +msgstr "" + +#: authtoken/models.py:23 +msgid "User" +msgstr "" + +#: authtoken/models.py:24 +msgid "Created" +msgstr "" + +#: authtoken/models.py:33 +msgid "Token" +msgstr "" + +#: authtoken/models.py:34 +msgid "Tokens" +msgstr "" + +#: authtoken/serializers.py:8 +msgid "Username" +msgstr "" + +#: authtoken/serializers.py:9 +msgid "Password" +msgstr "" + #: authtoken/serializers.py:20 msgid "User account is disabled." msgstr "Brukerkonto er deaktivert." @@ -109,7 +141,7 @@ msgstr "Ugyldig media type \"{media_type}\" i request." msgid "Request was throttled." msgstr "Forespørselen ble strupet." -#: fields.py:266 relations.py:195 relations.py:228 validators.py:79 +#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 #: validators.py:162 msgid "This field is required." msgstr "Dette feltet er påkrevd." @@ -127,7 +159,7 @@ msgstr "\"{input}\" er ikke en gyldig bolsk verdi." msgid "This field may not be blank." msgstr "Dette feltet må ikke være blankt." -#: fields.py:670 fields.py:1656 +#: fields.py:670 fields.py:1664 #, python-brace-format msgid "Ensure this field has no more than {max_length} characters." msgstr "Forsikre deg om at dette feltet ikke har mer enn {max_length} tegn." @@ -213,137 +245,136 @@ msgstr "Datetime har feil format. Bruk et av disse formatene i stedet: {format}. msgid "Expected a datetime but got a date." msgstr "Forventet en datetime, men fikk en date." -#: fields.py:1079 +#: fields.py:1082 #, python-brace-format msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "Dato har feil format. Bruk et av disse formatene i stedet: {format}." -#: fields.py:1080 +#: fields.py:1083 msgid "Expected a date but got a datetime." msgstr "Forventet en date, men fikk en datetime." -#: fields.py:1148 +#: fields.py:1151 #, python-brace-format msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "Tid har feil format. Bruk et av disse formatene i stedet: {format}." -#: fields.py:1207 +#: fields.py:1215 #, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "Varighet har feil format. Bruk et av disse formatene i stedet: {format}." -#: fields.py:1232 fields.py:1281 +#: fields.py:1240 fields.py:1289 #, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" er ikke et gyldig valg." -#: fields.py:1235 relations.py:62 relations.py:431 +#: fields.py:1243 relations.py:71 relations.py:442 #, python-brace-format msgid "More than {count} items..." msgstr "Mer enn {count} elementer ..." -#: fields.py:1282 fields.py:1429 relations.py:427 serializers.py:520 +#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 #, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Forventet en liste over elementer, men fikk type \"{input_type}\"." -#: fields.py:1283 +#: fields.py:1291 msgid "This selection may not be empty." msgstr "Dette valget kan ikke være tomt." -#: fields.py:1320 +#: fields.py:1328 #, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "\"{input}\" er ikke en gyldig bane valg." -#: fields.py:1339 +#: fields.py:1347 msgid "No file was submitted." msgstr "Ingen fil ble sendt." -#: fields.py:1340 +#: fields.py:1348 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "De innsendte data var ikke en fil. Kontroller kodingstypen på skjemaet." -#: fields.py:1341 +#: fields.py:1349 msgid "No filename could be determined." msgstr "Kunne ikke finne filnavn." -#: fields.py:1342 +#: fields.py:1350 msgid "The submitted file is empty." msgstr "Den innsendte filen er tom." -#: fields.py:1343 +#: fields.py:1351 #, python-brace-format msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "Sikre dette filnavnet har på det meste {max_length} tegn (det har {length})." -#: fields.py:1391 +#: fields.py:1399 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "Last opp et gyldig bilde. Filen du lastet opp var enten ikke et bilde eller en ødelagt bilde." -#: fields.py:1430 relations.py:428 serializers.py:521 +#: fields.py:1438 relations.py:439 serializers.py:521 msgid "This list may not be empty." msgstr "Denne listen kan ikke være tom." -#: fields.py:1483 +#: fields.py:1491 #, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "Forventet en dictionary av flere ting, men fikk typen \"{input_type}\"." -#: fields.py:1530 +#: fields.py:1538 msgid "Value must be valid JSON." msgstr "Verdien må være gyldig JSON." -#: filters.py:35 templates/rest_framework/filters/django_filter.html:5 +#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 msgid "Submit" msgstr "Send inn" #: pagination.py:189 -#, python-brace-format -msgid "Invalid page \"{page_number}\": {message}." -msgstr "Ugyldig side \"{page_number}\": {message}." +msgid "Invalid page." +msgstr "" #: pagination.py:407 msgid "Invalid cursor" msgstr "Ugyldig markør" -#: relations.py:196 +#: relations.py:207 #, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Ugyldig pk \"{pk_value}\" - objektet eksisterer ikke." -#: relations.py:197 +#: relations.py:208 #, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Feil type. Forventet pk verdi, fikk {data_type}." -#: relations.py:229 +#: relations.py:240 msgid "Invalid hyperlink - No URL match." msgstr "Ugyldig hyperkobling - No URL match." -#: relations.py:230 +#: relations.py:241 msgid "Invalid hyperlink - Incorrect URL match." msgstr "Ugyldig hyperkobling - Incorrect URL match." -#: relations.py:231 +#: relations.py:242 msgid "Invalid hyperlink - Object does not exist." msgstr "Ugyldig hyperkobling - Objektet eksisterer ikke." -#: relations.py:232 +#: relations.py:243 #, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Feil type. Forventet URL streng, fikk {data_type}." -#: relations.py:391 +#: relations.py:402 #, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "Objekt med {slug_name}={value} finnes ikke." -#: relations.py:392 +#: relations.py:403 msgid "Invalid value." msgstr "Ugyldig verdi." diff --git a/rest_framework/locale/nl/LC_MESSAGES/django.mo b/rest_framework/locale/nl/LC_MESSAGES/django.mo index 7cb2a85ef4ecd0d9b1aed5e976094840cccca922..8b70ddbd68f7ef3424197c35c3c064fbb5abc4f5 100644 GIT binary patch delta 1740 zcmX}sS!_&E9LMp$rBiLSW!fsGT+~)>-D$Nm25l9srIsL~p|;p2QjJ&=LMEP&@jyzN z1`l3@2M;o7(pMhD5@LBlQW2gcwmuL`AAEmvFDG;6bI#m*&+jrcM)owomh+4 za2meEIP=>t8ZmyDH`1&DJ8%i!#wr}Z0(A2I`{v?I`ukClxrmjRMi1Yjo-5>`MOcq| z{v=;zmI(OpkGwz?<|T6`AVFD2^@nL(ZQQogbz`t){g|i-s4>S zjEYeCDE~PROX;^@QY+q0gR`&;sD->j-S9o==a2T!wi4_3y%}{xr-FVjYGDb!%qnFMYT!4>C97iF zT0jeG=ljsZZd`>AP!kpN*HEr(!CE|pO3HMSMk|f4sEHS{tvWo7MAQ1P9v`7{BB$I> zE*BM{t*8mlpa$;47=A%c&t{M~6&OQ}*BJ*ap(4V0emul+CCGcB78uF7Cqt)I4qMibw1?MwB&IXbjhlW8ygSrZ(S}swR5B&=Z)!mHl=Ta zl`P8mt~a5w^o!86?6gym6RNFqy&BhxIFVSqCN|rPcwX+hweI>o#}bDVod?~eJCE#% XJJnv~|9w&JOK&Ug$VvY!Ul95WP=cp2 delta 1798 zcmaLXZAesE9LMqhn2uRm>6lYZ>DA5Bwy`lCAEpP*%%)YhM~a9xEKH;|Y+I=i86kRE zP*YGukI=gcVo2JBXtyUS2$rH(Eh`c9ss!HzMZtc5cdqoV!<_k?bLY-E=YP)s-sfvm z@x*@xnP-f$o;sI$I>T%q=4SClx#Kr0#Xr!&*I0~Sa2AHL)Bmf*5dDo9#y(t(=dlH! zU>i=IoOTngHA~nz8qNIh2Df5aj#)h(!DV<0+wlX&uyIQI_usLD{&g(CPpANLr<(nM zm7blbaSmVb@qdz{9AWxq^%Efp>ij zBlLs(N&k=I3Os~->^5I>@S*z5Z=*D{;xSYN1=G_mL0#`aMc9wp`lGlIuVN8CLkHhr z05fKoWnvMsDHg&dxBxZIR@DD`F%hIOOe2D4ku$NUsD@$0T+S+q7(_8%z9s2LQ zel}rfVU<{dZK#R%qQ*IeoAD8D!r4T#1%LJYJIMYkD~m|w4Y(7P12?f1$8aasu)1bE z>G=XRaDZ^R#d=T+7)C{Y8MUMTU_1KQHqFzC%9+!sWE@G*SVrSLc3=hJXyO5^!#|N- zwQ*dDljfy!q6Mqy??vs<8C;Bip(g%-nxL43X}~SWsoHUzj~7wnCLVYfULkYXXXIl+ z!qJU&sK|EkrDPn$8oY$eVK1=~$5A^Ga?;6Hi{!I4q81iM{XT%4hMhp>OV~9U8t^{q zj6Nb`**f+~H};|yHtcx;-JS6qM@3pumd>GHP~#m&9qDz{0>7e;W+74Z;5IDL-ru9a z7&eN^P9I_WFq^9Ddel^Oek!_0N3}j#niU8)(sHPpvW5CHl{cCDhWH72%ee6uVtcYH zE11v|Gf{L@%c%-b!M0K-3d?a{RO<6eagSeZ6&<;XQisfOlf4;<(R~HPP^YI7rfP%M zsbjX=7VxbdRMF$EqPIP{>K1a_E!wr|)KyeHRmv9?<=sSy)0pCQGH^9@MRL2pB+^8y zfT|>@r7BsJi8_OsRAu8DY9_UlntbM;le+IO&o1uj>2}Hn`(fAqfxg|{zYUeeoWZ{C zg9o`Zl=?TX(4Q9#S1%1m>YeI_ShObjH4yrCr9KvorpgQZa-6Q7-u+$Q8|v7+xc`4Z CPq!Wb diff --git a/rest_framework/locale/nl/LC_MESSAGES/django.po b/rest_framework/locale/nl/LC_MESSAGES/django.po index f53b6097c..b89af0606 100644 --- a/rest_framework/locale/nl/LC_MESSAGES/django.po +++ b/rest_framework/locale/nl/LC_MESSAGES/django.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-07 18:53+0100\n" -"PO-Revision-Date: 2015-12-07 17:55+0000\n" +"POT-Creation-Date: 2016-03-01 18:38+0100\n" +"PO-Revision-Date: 2016-03-01 17:38+0000\n" "Last-Translator: Xavier Ordoquy \n" "Language-Team: Dutch (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/nl/)\n" "MIME-Version: 1.0\n" @@ -18,43 +18,75 @@ msgstr "" "Language: nl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:72 +#: authentication.py:71 msgid "Invalid basic header. No credentials provided." msgstr "Ongeldige basic header. Geen login gegevens opgegeven." -#: authentication.py:75 +#: authentication.py:74 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "Ongeldige basic header. login gegevens kunnen geen spaties bevatten." -#: authentication.py:81 +#: authentication.py:80 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Ongeldige basic header. login gegevens zijn niet correct base64 versleuteld." -#: authentication.py:98 +#: authentication.py:97 msgid "Invalid username/password." msgstr "Ongeldige gebruikersnaam/wachtwoord." -#: authentication.py:101 authentication.py:188 +#: authentication.py:100 authentication.py:195 msgid "User inactive or deleted." msgstr "Gebruiker inactief of verwijderd." -#: authentication.py:167 +#: authentication.py:173 msgid "Invalid token header. No credentials provided." msgstr "Ongeldige token header. Geen login gegevens opgegeven" -#: authentication.py:170 +#: authentication.py:176 msgid "Invalid token header. Token string should not contain spaces." msgstr "Ongeldige token header. Token kan geen spaties bevatten." -#: authentication.py:176 +#: authentication.py:182 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:185 +#: authentication.py:192 msgid "Invalid token." msgstr "Ongeldige token." +#: authtoken/apps.py:7 +msgid "Auth Token" +msgstr "" + +#: authtoken/models.py:21 +msgid "Key" +msgstr "" + +#: authtoken/models.py:23 +msgid "User" +msgstr "" + +#: authtoken/models.py:24 +msgid "Created" +msgstr "" + +#: authtoken/models.py:33 +msgid "Token" +msgstr "" + +#: authtoken/models.py:34 +msgid "Tokens" +msgstr "" + +#: authtoken/serializers.py:8 +msgid "Username" +msgstr "" + +#: authtoken/serializers.py:9 +msgid "Password" +msgstr "" + #: authtoken/serializers.py:20 msgid "User account is disabled." msgstr "Gebruikers account is inactief." @@ -109,7 +141,7 @@ msgstr "Ongeldig media type \"{media_type}\" in aanvraag." msgid "Request was throttled." msgstr "Aanvraag was verstikt." -#: fields.py:266 relations.py:195 relations.py:228 validators.py:79 +#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 #: validators.py:162 msgid "This field is required." msgstr "Dit veld is verplicht." @@ -127,7 +159,7 @@ msgstr "\"{input}\" is een ongeldige boolean waarde." msgid "This field may not be blank." msgstr "Dit veld mag niet leeg zijn." -#: fields.py:670 fields.py:1656 +#: fields.py:670 fields.py:1664 #, python-brace-format msgid "Ensure this field has no more than {max_length} characters." msgstr "Zorg ervoor dat dit veld niet meer dan {max_length} karakters bevat." @@ -213,137 +245,136 @@ msgstr "Datetime heeft een ongeldig formaat, gebruik 1 van de volgende formaten: msgid "Expected a datetime but got a date." msgstr "Verwacht een datetime, in plaats kreeg een date." -#: fields.py:1079 +#: fields.py:1082 #, python-brace-format msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "Date heeft het verkeerde formaat, gebruik 1 van de onderstaande formaten: {format}." -#: fields.py:1080 +#: fields.py:1083 msgid "Expected a date but got a datetime." msgstr "Verwacht een date, in plaats kreeg een datetime" -#: fields.py:1148 +#: fields.py:1151 #, python-brace-format msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "Time heeft het verkeerde formaat, gebruik 1 van onderstaande formaten: {format}." -#: fields.py:1207 +#: fields.py:1215 #, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "Tijdsduur heeft een verkeerd formaat, gebruik 1 van onderstaande formaten: {format}." -#: fields.py:1232 fields.py:1281 +#: fields.py:1240 fields.py:1289 #, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" is een ongeldige keuze." -#: fields.py:1235 relations.py:62 relations.py:431 +#: fields.py:1243 relations.py:71 relations.py:442 #, python-brace-format msgid "More than {count} items..." msgstr "" -#: fields.py:1282 fields.py:1429 relations.py:427 serializers.py:520 +#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 #, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Verwacht een lijst met items, kreeg een type \"{input_type}\" in plaats." -#: fields.py:1283 +#: fields.py:1291 msgid "This selection may not be empty." msgstr "" -#: fields.py:1320 +#: fields.py:1328 #, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1339 +#: fields.py:1347 msgid "No file was submitted." msgstr "Er is geen bestand opgestuurd" -#: fields.py:1340 +#: fields.py:1348 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "De verstuurde data was geen bestand. Controleer de encoding type op het formulier." -#: fields.py:1341 +#: fields.py:1349 msgid "No filename could be determined." msgstr "Bestandsnaam kan niet vastgesteld worden." -#: fields.py:1342 +#: fields.py:1350 msgid "The submitted file is empty." msgstr "Het verstuurde bestand is leeg." -#: fields.py:1343 +#: fields.py:1351 #, python-brace-format msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "Zorg ervoor dat deze bestandsnaam minstens {max_length} karakters heeft (momenteel {length})." -#: fields.py:1391 +#: fields.py:1399 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "Upload een geldige afbeelding, de geüploade afbeelding is geen afbeelding of mogelijk corrupt geraakt," -#: fields.py:1430 relations.py:428 serializers.py:521 +#: fields.py:1438 relations.py:439 serializers.py:521 msgid "This list may not be empty." msgstr "" -#: fields.py:1483 +#: fields.py:1491 #, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "Verwacht een dictionary van items, in plaats kreeg een type \"{input_type}\"." -#: fields.py:1530 +#: fields.py:1538 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html:5 +#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 msgid "Submit" msgstr "" #: pagination.py:189 -#, python-brace-format -msgid "Invalid page \"{page_number}\": {message}." -msgstr "Ongeldige pagina \"{page_number}\": {message}." +msgid "Invalid page." +msgstr "" #: pagination.py:407 msgid "Invalid cursor" msgstr "Ongeldige cursor." -#: relations.py:196 +#: relations.py:207 #, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Ongeldige pk \"{pk_value}\" - object bestaat niet." -#: relations.py:197 +#: relations.py:208 #, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Ongeldig type. Verwacht een pk waarde, ontving {data_type}." -#: relations.py:229 +#: relations.py:240 msgid "Invalid hyperlink - No URL match." msgstr "Ongeldige hyperlink - Geen overeenkomende URL." -#: relations.py:230 +#: relations.py:241 msgid "Invalid hyperlink - Incorrect URL match." msgstr "Ongeldige hyperlink - Ongeldige URL" -#: relations.py:231 +#: relations.py:242 msgid "Invalid hyperlink - Object does not exist." msgstr "Ongeldige hyperlink - Object bestaat niet." -#: relations.py:232 +#: relations.py:243 #, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Ongeldig type. Verwacht een URL, ontving {data_type}." -#: relations.py:391 +#: relations.py:402 #, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "Object met {slug_name}={value} bestaat niet." -#: relations.py:392 +#: relations.py:403 msgid "Invalid value." msgstr "Ongeldige waarde." diff --git a/rest_framework/locale/nn/LC_MESSAGES/django.mo b/rest_framework/locale/nn/LC_MESSAGES/django.mo index fd5f5ec26a9568288476ae9a57dea07605386ff3..43d080aa67cdb810998a30d1065253dcdb605a7d 100644 GIT binary patch delta 41 ncmeBS>0y~Lf!9pez*yJ7P{Gi`%GhG!Txo=WIZ$BZQFlfF*}@8C delta 41 ocmeBS>0y~Lf!9>m&`8(7T*1)7%G7w`Txo=Wxs|Eu#-r|x0NOYTYXATM diff --git a/rest_framework/locale/nn/LC_MESSAGES/django.po b/rest_framework/locale/nn/LC_MESSAGES/django.po index a23d8d25b..26a625b6d 100644 --- a/rest_framework/locale/nn/LC_MESSAGES/django.po +++ b/rest_framework/locale/nn/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-07 18:53+0100\n" -"PO-Revision-Date: 2015-12-07 17:55+0000\n" +"POT-Creation-Date: 2016-03-01 18:38+0100\n" +"PO-Revision-Date: 2016-03-01 17:38+0000\n" "Last-Translator: Xavier Ordoquy \n" "Language-Team: Norwegian Nynorsk (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/nn/)\n" "MIME-Version: 1.0\n" @@ -17,43 +17,75 @@ msgstr "" "Language: nn\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:72 +#: authentication.py:71 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:75 +#: authentication.py:74 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:81 +#: authentication.py:80 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:98 +#: authentication.py:97 msgid "Invalid username/password." msgstr "" -#: authentication.py:101 authentication.py:188 +#: authentication.py:100 authentication.py:195 msgid "User inactive or deleted." msgstr "" -#: authentication.py:167 +#: authentication.py:173 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:170 +#: authentication.py:176 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:176 +#: authentication.py:182 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:185 +#: authentication.py:192 msgid "Invalid token." msgstr "" +#: authtoken/apps.py:7 +msgid "Auth Token" +msgstr "" + +#: authtoken/models.py:21 +msgid "Key" +msgstr "" + +#: authtoken/models.py:23 +msgid "User" +msgstr "" + +#: authtoken/models.py:24 +msgid "Created" +msgstr "" + +#: authtoken/models.py:33 +msgid "Token" +msgstr "" + +#: authtoken/models.py:34 +msgid "Tokens" +msgstr "" + +#: authtoken/serializers.py:8 +msgid "Username" +msgstr "" + +#: authtoken/serializers.py:9 +msgid "Password" +msgstr "" + #: authtoken/serializers.py:20 msgid "User account is disabled." msgstr "" @@ -108,7 +140,7 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:266 relations.py:195 relations.py:228 validators.py:79 +#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 #: validators.py:162 msgid "This field is required." msgstr "" @@ -126,7 +158,7 @@ msgstr "" msgid "This field may not be blank." msgstr "" -#: fields.py:670 fields.py:1656 +#: fields.py:670 fields.py:1664 #, python-brace-format msgid "Ensure this field has no more than {max_length} characters." msgstr "" @@ -212,137 +244,136 @@ msgstr "" msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1079 +#: fields.py:1082 #, python-brace-format msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1080 +#: fields.py:1083 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1148 +#: fields.py:1151 #, python-brace-format msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1207 +#: fields.py:1215 #, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1232 fields.py:1281 +#: fields.py:1240 fields.py:1289 #, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "" -#: fields.py:1235 relations.py:62 relations.py:431 +#: fields.py:1243 relations.py:71 relations.py:442 #, python-brace-format msgid "More than {count} items..." msgstr "" -#: fields.py:1282 fields.py:1429 relations.py:427 serializers.py:520 +#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 #, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1283 +#: fields.py:1291 msgid "This selection may not be empty." msgstr "" -#: fields.py:1320 +#: fields.py:1328 #, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1339 +#: fields.py:1347 msgid "No file was submitted." msgstr "" -#: fields.py:1340 +#: fields.py:1348 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1341 +#: fields.py:1349 msgid "No filename could be determined." msgstr "" -#: fields.py:1342 +#: fields.py:1350 msgid "The submitted file is empty." msgstr "" -#: fields.py:1343 +#: fields.py:1351 #, python-brace-format msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1391 +#: fields.py:1399 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: fields.py:1430 relations.py:428 serializers.py:521 +#: fields.py:1438 relations.py:439 serializers.py:521 msgid "This list may not be empty." msgstr "" -#: fields.py:1483 +#: fields.py:1491 #, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1530 +#: fields.py:1538 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html:5 +#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 msgid "Submit" msgstr "" #: pagination.py:189 -#, python-brace-format -msgid "Invalid page \"{page_number}\": {message}." +msgid "Invalid page." msgstr "" #: pagination.py:407 msgid "Invalid cursor" msgstr "" -#: relations.py:196 +#: relations.py:207 #, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" -#: relations.py:197 +#: relations.py:208 #, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" -#: relations.py:229 +#: relations.py:240 msgid "Invalid hyperlink - No URL match." msgstr "" -#: relations.py:230 +#: relations.py:241 msgid "Invalid hyperlink - Incorrect URL match." msgstr "" -#: relations.py:231 +#: relations.py:242 msgid "Invalid hyperlink - Object does not exist." msgstr "" -#: relations.py:232 +#: relations.py:243 #, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:391 +#: relations.py:402 #, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:392 +#: relations.py:403 msgid "Invalid value." msgstr "" diff --git a/rest_framework/locale/no/LC_MESSAGES/django.mo b/rest_framework/locale/no/LC_MESSAGES/django.mo index 00f5db6b594908affee647eec4ca29a8464fd10b..730768a272bbc0c161dc6435e89bf8d700c44b64 100644 GIT binary patch delta 41 ncmZo+Xm&`8(7T*1)7%G7w`Txo=Wxs|Eu#-sL(0N1DrQvd(} diff --git a/rest_framework/locale/no/LC_MESSAGES/django.po b/rest_framework/locale/no/LC_MESSAGES/django.po index 4342b2bdb..4a3d609ca 100644 --- a/rest_framework/locale/no/LC_MESSAGES/django.po +++ b/rest_framework/locale/no/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-07 18:53+0100\n" -"PO-Revision-Date: 2015-12-07 17:55+0000\n" +"POT-Creation-Date: 2016-03-01 18:38+0100\n" +"PO-Revision-Date: 2016-03-01 17:38+0000\n" "Last-Translator: Xavier Ordoquy \n" "Language-Team: Norwegian (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/no/)\n" "MIME-Version: 1.0\n" @@ -17,43 +17,75 @@ msgstr "" "Language: no\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:72 +#: authentication.py:71 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:75 +#: authentication.py:74 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:81 +#: authentication.py:80 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:98 +#: authentication.py:97 msgid "Invalid username/password." msgstr "" -#: authentication.py:101 authentication.py:188 +#: authentication.py:100 authentication.py:195 msgid "User inactive or deleted." msgstr "" -#: authentication.py:167 +#: authentication.py:173 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:170 +#: authentication.py:176 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:176 +#: authentication.py:182 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:185 +#: authentication.py:192 msgid "Invalid token." msgstr "" +#: authtoken/apps.py:7 +msgid "Auth Token" +msgstr "" + +#: authtoken/models.py:21 +msgid "Key" +msgstr "" + +#: authtoken/models.py:23 +msgid "User" +msgstr "" + +#: authtoken/models.py:24 +msgid "Created" +msgstr "" + +#: authtoken/models.py:33 +msgid "Token" +msgstr "" + +#: authtoken/models.py:34 +msgid "Tokens" +msgstr "" + +#: authtoken/serializers.py:8 +msgid "Username" +msgstr "" + +#: authtoken/serializers.py:9 +msgid "Password" +msgstr "" + #: authtoken/serializers.py:20 msgid "User account is disabled." msgstr "" @@ -108,7 +140,7 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:266 relations.py:195 relations.py:228 validators.py:79 +#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 #: validators.py:162 msgid "This field is required." msgstr "" @@ -126,7 +158,7 @@ msgstr "" msgid "This field may not be blank." msgstr "" -#: fields.py:670 fields.py:1656 +#: fields.py:670 fields.py:1664 #, python-brace-format msgid "Ensure this field has no more than {max_length} characters." msgstr "" @@ -212,137 +244,136 @@ msgstr "" msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1079 +#: fields.py:1082 #, python-brace-format msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1080 +#: fields.py:1083 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1148 +#: fields.py:1151 #, python-brace-format msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1207 +#: fields.py:1215 #, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1232 fields.py:1281 +#: fields.py:1240 fields.py:1289 #, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "" -#: fields.py:1235 relations.py:62 relations.py:431 +#: fields.py:1243 relations.py:71 relations.py:442 #, python-brace-format msgid "More than {count} items..." msgstr "" -#: fields.py:1282 fields.py:1429 relations.py:427 serializers.py:520 +#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 #, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1283 +#: fields.py:1291 msgid "This selection may not be empty." msgstr "" -#: fields.py:1320 +#: fields.py:1328 #, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1339 +#: fields.py:1347 msgid "No file was submitted." msgstr "" -#: fields.py:1340 +#: fields.py:1348 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1341 +#: fields.py:1349 msgid "No filename could be determined." msgstr "" -#: fields.py:1342 +#: fields.py:1350 msgid "The submitted file is empty." msgstr "" -#: fields.py:1343 +#: fields.py:1351 #, python-brace-format msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1391 +#: fields.py:1399 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: fields.py:1430 relations.py:428 serializers.py:521 +#: fields.py:1438 relations.py:439 serializers.py:521 msgid "This list may not be empty." msgstr "" -#: fields.py:1483 +#: fields.py:1491 #, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1530 +#: fields.py:1538 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html:5 +#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 msgid "Submit" msgstr "" #: pagination.py:189 -#, python-brace-format -msgid "Invalid page \"{page_number}\": {message}." +msgid "Invalid page." msgstr "" #: pagination.py:407 msgid "Invalid cursor" msgstr "" -#: relations.py:196 +#: relations.py:207 #, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" -#: relations.py:197 +#: relations.py:208 #, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" -#: relations.py:229 +#: relations.py:240 msgid "Invalid hyperlink - No URL match." msgstr "" -#: relations.py:230 +#: relations.py:241 msgid "Invalid hyperlink - Incorrect URL match." msgstr "" -#: relations.py:231 +#: relations.py:242 msgid "Invalid hyperlink - Object does not exist." msgstr "" -#: relations.py:232 +#: relations.py:243 #, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:391 +#: relations.py:402 #, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:392 +#: relations.py:403 msgid "Invalid value." msgstr "" diff --git a/rest_framework/locale/pl/LC_MESSAGES/django.mo b/rest_framework/locale/pl/LC_MESSAGES/django.mo index 30e6022558e4409c426bb205e867ca23c1fc9ef3..232de88ffe95f84a46cafd9c534cbc980579a248 100644 GIT binary patch delta 2010 zcmYk-Z){Ul7{~FaSXwq@TQ}*HIk@`+0Au9S_9&W$k`8xF@DLxBcIQWYC9gDoQW zjV5YHAU4KC6DNT;Bxr=ifWZVc#5YO|!~_yx3BFe2(D?s_-{0*edcx`FoYVE(d!FaH zmk+jnKIqO=2H!T?DE&eD4|B|1{A?~CwDV!JI{XwJyn##cA6$&}^UUtYPSo#5u?7!f z3=7zVU*Kc-6ZT-D#M8A21{+woh#3r*nhj$wuEr^B!)w@wRrAeSaTn_QcX2ab#Rgn* zuURE_p>Ajxwf>UtJE;9GV2h6WJA(x*#Q5M))`mJ^7wSSeOyfyhhqtf`Ys<`ojeECZrz=kO8y5=oQYL2djuYJ)N+AzX^p z*yPWJNWG2g~m(-dG$} zM7!}}Jb?-P7Pn(yq1gkt!*|^GD6V4t6b2~po0w!iQ%(Gp>q<&kIZIGitDmLO2 zYU4|&kj|hs46)dOYj6Z7a0_0+ZCJ-9s+ohh70;oHuawiNhI(8Edl|fm-8k!;B7TRN zzl^%zUs#Lvd?>UTR0N(zMc@s56fdA6^fOYYmZTt*vQAVn_F^YKi%+0?n!!#6w#4i? z*oC^0uaPKOg;PA?GHhW!hHdyBuE1;lJizW5=Iyu{52Lpal6I>gtlm?As-*#3rdQ1v z1BZnp$TjUlR4Ohb(X!wC^$3puLrb6{GK9LpL;m_(sEt3tAbx{9P<91X)VGmWghd*; z8LY*{dj6XkC`A28T5Sl!xDQn%qt=SB*wVDeZ`;$f5moe<9KPDM5X2|a`P4;EbM75s2kgXdhCv30Pi+^r>4^@ zLfUIReFI&;SK+D+(fbt&eOn3MQmMRFjV6< zG2@QCa@^>Dqrl&7AqG0`fWNREGxSkpwuBr{agIeio;UZp<4>MK@)%1c?d%TEO{JeJT z9=g)HhTcn$(Dj7U%4{y5+vpwik;0j9RZs~l%%8Vt`up%};pt=LH$w|jv3N2TPdJHm zYcgG!jMn_OvRW(0qt%Tg*#o(;{mz#C&*WbmpLEtvbhW`a9TBdBW;oJ)YL}!W?>=@hHZXrlU zO_1OfQ7a~ds3;erQMlMJM!e7%6O1#yB*tivL~b?%Mq~8C;M@22v?gA8((`=IbJm{c zIsfxNXYco&>`z@P$vtM29n_ntzvh^waBeXd$_1}k6@H8kUcuXNX`a~%Y``0_5B2*I zti&Ve$5U8~U*HD(3pZkTiEGN9rqM~qXBfie`DR174O{Rmw&6T>V@-is5XVt}e*=5) zGS=XlrDi2KfO?@_sQyD)Uqg-e2{vo0-a<1z*3N~=SvP8i1E>e>$5x!h_4p%ppnsWJ z9mbK5o#dkLoy9wF0TsF8BD2-li0U84dOU)43iUfQ?!$R($H4WO0mrd|`-9p0krv}PjP1Et5HkSj{5yWcsuUHa(o#bd>d1xG`^;hi&u~++t0WLuOZ82KH{m6 zHgVAao#??~T#nJ~{WR8d{}gIT&!JxQPt^A+c$n@RP&v|DO8oDlv4;+=<*TUsZ&7bv zd_(4owdio)g?h0VDw&R>4=-W>^UBP&V-Rn`=d+&4dI1~gzl^^xGAk=5{*81Lk-}Q@ z4%8aOuo|C3y~sISiJzke{tXqXbjN!4u>&tE6ah;pkCk)Bw7}BGBezY&D_6$n!z02iFu4#hYhIy2!`-Q?7>T@ z@qC1pbg&6zSETF^4JFkXT!kN@gIAGfTOld0CGjIsvmsP}9Qlepi;B!F>P0VR`+q@= zTedQj+_lICvj8fG!dRgFAE&_%vS}m;b`%w=w~%GFS@hzks9gC9J8%gJ!)n=P)PrJ3 z)a^;+EA|p@#t(5T7Bf4oeGIi^?_nj+w*?wR$8wp5A6MZ<9K?1!fvxxrYKck+2a~fn zGPWH4RSTvp zB2sSbb(%at{clmI_#fhCnGO>b*3;vjDEFqn_cW%oH8)VZskKxUEs^p{g%jJ2prWm0 zR`F)Ab*N?3X6dEspj7G0;BEqrA-j&Mv\n" +"POT-Creation-Date: 2016-03-01 18:38+0100\n" +"PO-Revision-Date: 2016-03-01 17:38+0000\n" +"Last-Translator: Xavier Ordoquy \n" "Language-Team: Polish (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,43 +20,75 @@ msgstr "" "Language: pl\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: authentication.py:72 +#: authentication.py:71 msgid "Invalid basic header. No credentials provided." msgstr "Niepoprawny podstawowy nagłówek. Brak danych uwierzytelniających." -#: authentication.py:75 +#: authentication.py:74 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "Niepoprawny podstawowy nagłówek. Ciąg znaków danych uwierzytelniających nie powinien zawierać spacji." -#: authentication.py:81 +#: authentication.py:80 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Niepoprawny podstawowy nagłówek. Niewłaściwe kodowanie base64 danych uwierzytelniających." -#: authentication.py:98 +#: authentication.py:97 msgid "Invalid username/password." msgstr "Niepoprawna nazwa użytkownika lub hasło." -#: authentication.py:101 authentication.py:188 +#: authentication.py:100 authentication.py:195 msgid "User inactive or deleted." msgstr "Użytkownik nieaktywny lub usunięty." -#: authentication.py:167 +#: authentication.py:173 msgid "Invalid token header. No credentials provided." msgstr "Niepoprawny nagłówek tokena. Brak danych uwierzytelniających." -#: authentication.py:170 +#: authentication.py:176 msgid "Invalid token header. Token string should not contain spaces." msgstr "Niepoprawny nagłówek tokena. Token nie może zawierać odstępów." -#: authentication.py:176 +#: authentication.py:182 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "Błędny nagłówek z tokenem. Token nie może zawierać błędnych znaków." -#: authentication.py:185 +#: authentication.py:192 msgid "Invalid token." msgstr "Niepoprawny token." +#: authtoken/apps.py:7 +msgid "Auth Token" +msgstr "" + +#: authtoken/models.py:21 +msgid "Key" +msgstr "" + +#: authtoken/models.py:23 +msgid "User" +msgstr "" + +#: authtoken/models.py:24 +msgid "Created" +msgstr "" + +#: authtoken/models.py:33 +msgid "Token" +msgstr "" + +#: authtoken/models.py:34 +msgid "Tokens" +msgstr "" + +#: authtoken/serializers.py:8 +msgid "Username" +msgstr "" + +#: authtoken/serializers.py:9 +msgid "Password" +msgstr "" + #: authtoken/serializers.py:20 msgid "User account is disabled." msgstr "Konto użytkownika jest nieaktywne." @@ -111,7 +143,7 @@ msgstr "Brak wsparcia dla żądanego typu danych \"{media_type}\"." msgid "Request was throttled." msgstr "Żądanie zostało zdławione." -#: fields.py:266 relations.py:195 relations.py:228 validators.py:79 +#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 #: validators.py:162 msgid "This field is required." msgstr "To pole jest wymagane." @@ -129,7 +161,7 @@ msgstr "\"{input}\" nie jest poprawną wartością logiczną." msgid "This field may not be blank." msgstr "To pole nie może być puste." -#: fields.py:670 fields.py:1656 +#: fields.py:670 fields.py:1664 #, python-brace-format msgid "Ensure this field has no more than {max_length} characters." msgstr "Upewnij się, że to pole ma nie więcej niż {max_length} znaków." @@ -215,137 +247,136 @@ msgstr "Wartość daty z czasem ma zły format. Użyj jednego z dostępnych form msgid "Expected a datetime but got a date." msgstr "Oczekiwano datę z czasem, otrzymano tylko datę." -#: fields.py:1079 +#: fields.py:1082 #, python-brace-format msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "Data ma zły format. Użyj jednego z tych formatów: {format}." -#: fields.py:1080 +#: fields.py:1083 msgid "Expected a date but got a datetime." msgstr "Oczekiwano daty a otrzymano datę z czasem." -#: fields.py:1148 +#: fields.py:1151 #, python-brace-format msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "Błędny format czasu. Użyj jednego z dostępnych formatów: {format}" -#: fields.py:1207 +#: fields.py:1215 #, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "Czas trwania ma zły format. Użyj w zamian jednego z tych formatów: {format}." -#: fields.py:1232 fields.py:1281 +#: fields.py:1240 fields.py:1289 #, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" nie jest poprawnym wyborem." -#: fields.py:1235 relations.py:62 relations.py:431 +#: fields.py:1243 relations.py:71 relations.py:442 #, python-brace-format msgid "More than {count} items..." msgstr "Więcej niż {count} elementów..." -#: fields.py:1282 fields.py:1429 relations.py:427 serializers.py:520 +#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 #, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Oczekiwano listy elementów, a otrzymano dane typu \"{input_type}\"." -#: fields.py:1283 +#: fields.py:1291 msgid "This selection may not be empty." msgstr "Zaznaczenie nie może być puste." -#: fields.py:1320 +#: fields.py:1328 #, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "\"{input}\" nie jest poprawną ścieżką." -#: fields.py:1339 +#: fields.py:1347 msgid "No file was submitted." msgstr "Nie przesłano pliku." -#: fields.py:1340 +#: fields.py:1348 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "Przesłane dane nie były plikiem. Sprawdź typ kodowania formatki." -#: fields.py:1341 +#: fields.py:1349 msgid "No filename could be determined." msgstr "Nie można określić nazwy pliku." -#: fields.py:1342 +#: fields.py:1350 msgid "The submitted file is empty." msgstr "Przesłany plik jest pusty." -#: fields.py:1343 +#: fields.py:1351 #, python-brace-format msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "Upewnij się, że nazwa pliku ma długość co najwyżej {max_length} znaków (aktualnie ma {length})." -#: fields.py:1391 +#: fields.py:1399 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "Prześlij poprawny plik graficzny. Przesłany plik albo nie jest grafiką lub jest uszkodzony." -#: fields.py:1430 relations.py:428 serializers.py:521 +#: fields.py:1438 relations.py:439 serializers.py:521 msgid "This list may not be empty." msgstr "Lista nie może być pusta." -#: fields.py:1483 +#: fields.py:1491 #, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "Oczekiwano słownika, ale otrzymano \"{input_type}\"." -#: fields.py:1530 +#: fields.py:1538 msgid "Value must be valid JSON." msgstr "Wartość musi być poprawnym ciągiem znaków JSON" -#: filters.py:35 templates/rest_framework/filters/django_filter.html:5 +#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 msgid "Submit" msgstr "Wyślij" #: pagination.py:189 -#, python-brace-format -msgid "Invalid page \"{page_number}\": {message}." -msgstr "Niepoprawna strona \"{page_number}\": {message}." +msgid "Invalid page." +msgstr "" #: pagination.py:407 msgid "Invalid cursor" msgstr "Niepoprawny wskaźnik" -#: relations.py:196 +#: relations.py:207 #, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Błędny klucz główny \"{pk_value}\" - obiekt nie istnieje." -#: relations.py:197 +#: relations.py:208 #, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Błędny typ danych. Oczekiwano wartość klucza głównego, otrzymano {data_type}." -#: relations.py:229 +#: relations.py:240 msgid "Invalid hyperlink - No URL match." msgstr "Błędny hyperlink - nie znaleziono pasującego adresu URL." -#: relations.py:230 +#: relations.py:241 msgid "Invalid hyperlink - Incorrect URL match." msgstr "Błędny hyperlink - błędne dopasowanie adresu URL." -#: relations.py:231 +#: relations.py:242 msgid "Invalid hyperlink - Object does not exist." msgstr "Błędny hyperlink - obiekt nie istnieje." -#: relations.py:232 +#: relations.py:243 #, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Błędny typ danych. Oczekiwano adresu URL, otrzymano {data_type}" -#: relations.py:391 +#: relations.py:402 #, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "Obiekt z polem {slug_name}={value} nie istnieje" -#: relations.py:392 +#: relations.py:403 msgid "Invalid value." msgstr "Niepoprawna wartość." diff --git a/rest_framework/locale/pt/LC_MESSAGES/django.mo b/rest_framework/locale/pt/LC_MESSAGES/django.mo index 476e41490ac1dbe53c9500f7e5ede967a600905a..9553b8f7ae0e46b54d4aed4f473515eb364357ea 100644 GIT binary patch delta 41 ncmZo=X=Rx(f!9pez*yJ7P{Gi`%GhG!Txo=WIZ$BZQ3pl<*MtgC delta 41 ocmZo=X=Rx(f!9>m&`8(7T*1)7%G7w`Txo=Wxs|Eu#-k350N45oRsaA1 diff --git a/rest_framework/locale/pt/LC_MESSAGES/django.po b/rest_framework/locale/pt/LC_MESSAGES/django.po index 31cf0c2dd..c1217b2d6 100644 --- a/rest_framework/locale/pt/LC_MESSAGES/django.po +++ b/rest_framework/locale/pt/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-07 18:53+0100\n" -"PO-Revision-Date: 2015-12-07 17:55+0000\n" +"POT-Creation-Date: 2016-03-01 18:38+0100\n" +"PO-Revision-Date: 2016-03-01 17:38+0000\n" "Last-Translator: Xavier Ordoquy \n" "Language-Team: Portuguese (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/pt/)\n" "MIME-Version: 1.0\n" @@ -17,43 +17,75 @@ msgstr "" "Language: pt\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:72 +#: authentication.py:71 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:75 +#: authentication.py:74 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:81 +#: authentication.py:80 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:98 +#: authentication.py:97 msgid "Invalid username/password." msgstr "" -#: authentication.py:101 authentication.py:188 +#: authentication.py:100 authentication.py:195 msgid "User inactive or deleted." msgstr "" -#: authentication.py:167 +#: authentication.py:173 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:170 +#: authentication.py:176 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:176 +#: authentication.py:182 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:185 +#: authentication.py:192 msgid "Invalid token." msgstr "" +#: authtoken/apps.py:7 +msgid "Auth Token" +msgstr "" + +#: authtoken/models.py:21 +msgid "Key" +msgstr "" + +#: authtoken/models.py:23 +msgid "User" +msgstr "" + +#: authtoken/models.py:24 +msgid "Created" +msgstr "" + +#: authtoken/models.py:33 +msgid "Token" +msgstr "" + +#: authtoken/models.py:34 +msgid "Tokens" +msgstr "" + +#: authtoken/serializers.py:8 +msgid "Username" +msgstr "" + +#: authtoken/serializers.py:9 +msgid "Password" +msgstr "" + #: authtoken/serializers.py:20 msgid "User account is disabled." msgstr "" @@ -108,7 +140,7 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:266 relations.py:195 relations.py:228 validators.py:79 +#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 #: validators.py:162 msgid "This field is required." msgstr "" @@ -126,7 +158,7 @@ msgstr "" msgid "This field may not be blank." msgstr "" -#: fields.py:670 fields.py:1656 +#: fields.py:670 fields.py:1664 #, python-brace-format msgid "Ensure this field has no more than {max_length} characters." msgstr "" @@ -212,137 +244,136 @@ msgstr "" msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1079 +#: fields.py:1082 #, python-brace-format msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1080 +#: fields.py:1083 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1148 +#: fields.py:1151 #, python-brace-format msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1207 +#: fields.py:1215 #, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1232 fields.py:1281 +#: fields.py:1240 fields.py:1289 #, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "" -#: fields.py:1235 relations.py:62 relations.py:431 +#: fields.py:1243 relations.py:71 relations.py:442 #, python-brace-format msgid "More than {count} items..." msgstr "" -#: fields.py:1282 fields.py:1429 relations.py:427 serializers.py:520 +#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 #, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1283 +#: fields.py:1291 msgid "This selection may not be empty." msgstr "" -#: fields.py:1320 +#: fields.py:1328 #, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1339 +#: fields.py:1347 msgid "No file was submitted." msgstr "" -#: fields.py:1340 +#: fields.py:1348 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1341 +#: fields.py:1349 msgid "No filename could be determined." msgstr "" -#: fields.py:1342 +#: fields.py:1350 msgid "The submitted file is empty." msgstr "" -#: fields.py:1343 +#: fields.py:1351 #, python-brace-format msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1391 +#: fields.py:1399 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: fields.py:1430 relations.py:428 serializers.py:521 +#: fields.py:1438 relations.py:439 serializers.py:521 msgid "This list may not be empty." msgstr "" -#: fields.py:1483 +#: fields.py:1491 #, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1530 +#: fields.py:1538 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html:5 +#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 msgid "Submit" msgstr "" #: pagination.py:189 -#, python-brace-format -msgid "Invalid page \"{page_number}\": {message}." +msgid "Invalid page." msgstr "" #: pagination.py:407 msgid "Invalid cursor" msgstr "" -#: relations.py:196 +#: relations.py:207 #, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" -#: relations.py:197 +#: relations.py:208 #, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" -#: relations.py:229 +#: relations.py:240 msgid "Invalid hyperlink - No URL match." msgstr "" -#: relations.py:230 +#: relations.py:241 msgid "Invalid hyperlink - Incorrect URL match." msgstr "" -#: relations.py:231 +#: relations.py:242 msgid "Invalid hyperlink - Object does not exist." msgstr "" -#: relations.py:232 +#: relations.py:243 #, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:391 +#: relations.py:402 #, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:392 +#: relations.py:403 msgid "Invalid value." msgstr "" diff --git a/rest_framework/locale/pt_BR/LC_MESSAGES/django.mo b/rest_framework/locale/pt_BR/LC_MESSAGES/django.mo index 0f2dac6156a0b7c2706b41f35d99b96bc6e84094..20a41eb1f7bbc11f247fe8dd8755893c878296d4 100644 GIT binary patch delta 2006 zcmYM#eP~s69LMqRUDtCr*S6g3E?sM9PR(l5J6GG<<6V2uIp>_((hbVlgIo%48k&M} z{3HM9pArrch-jh+f=D^=A*Cq#qXi-eGSev}Nc|Ck^@l}EdVkLSRX_GUuix+7^YDB4 z{?2|{`(P-zT^j$`D5J#V#4mYf0bZKLfpR`!R*e_X$D6naXYdJJkZ<-FcA@Sc#R_~E z>oCMx{2E`tU$GDC3nByCO=SfqzQQynW}A)RN^HU-*osp)fMtbdE%*xR_k*|^uVM{W zJ#1Er-KY+Ypw7SJ`~>y9i};*|dY?)WC+avbC~HNHup9NF3^wC&?8IBxjg`e_OK}|e zvjZG--4R@Z*HJSUD=~W-YcPdta481Zuc9)^|Al%$F%1tF zVL8^ib`Pd#51^KEFRG*8qOSYVwf{urMv}KT;_@=)Uu&3gCyt^} zs3h8q&)_kv$1AuAV~?86!!hSh=SR4l^C$6#nAtSy{^+KxK@|r`Uxv*oz&! zeI34!N}egy6696pIy?_G@=oV=)cwaWjdziBvc)8XmaGwvjP(BUh0@+TX5S!4_fitPk1IwgvU#ENZRyVF8{( zJ@+im)&8HPqA9wKKHhb0k6tNhif|0mNMG#`>P257m)Z?f#~)w=R?=HJjJkh6YUJlp z_g_Q)>^_HOyx%IxuwEQQC1HrsRN_|J9-Eliw{55qe~5bEDSQ?uF^2yZyPohU3 zB|U!yp%<%DDjSGFO_8QkMeD1QN316_O`6Jff`pE~=Me3XL1e&D8FqGt!(K&DON$;w zUF&zh6gq`R^bu>+pll-2g!V_A(46Y~sQtkVMA^sojItE|D{a)YpxuO~O@(#v_^PuZ z!+TysphWB`GDtWaNTB0+#e*vm$1xAQ;)^?z|eS@XsV+p_7_YHPM^HoYO{Y}MMjkX-N2@BG@j>Y3l)>-RjI^ZPx| z_xV1@dtGxok~ebF-!|Gl;z8oi#b!yon!$y3*>6^iU!#M!@nKxH#B2=)@qX+^eg6O! z;Ry`jIV{I-u?g>CD>i1jChZMw+8Fo-BUq4SwhMP-4bEU4&S3|ZE;S2d0`>O~u@i4$ zDQ;M1mV-U03H77KU-Ntq^}H)st)=>xoAJ*YxUe|uK&`L`^`bGX#ZPey-oa)JtT3y< zgUCNS!$qH)!AJ2IROYf*nytqWYJ5Ld;t8x!s=wf78_r<^R;@}sFoA{iU-kMYQ7d^L zwX&<8^WL~GJGJulsI6&0eg7F;hp%8ho<;}HV=|YUYuu#cZ6wR~8*ae6$aYy7`BX|b za?u0Y(1-i60QVxIz&~HagERHIslURm7VHGaPGuwkHQ{vLqKVYwR!m|Ceu>)BRjfk&y{M{x7x&^Fuiu^|5Bk8H zxDT&mBi8WN797K!co9`ZIjd7!(14n7FKXrEo*$#We*+`vPzaQjMNwOJ5Ff*%SdYoG z+-M~~V;2^zO&P;5{m+s5vOiEOO>X?P_Y5EC#0>45% zFQ>%KY|=`((Le+K^60U+sqAP_B<+e$FT*^ql$3>>oCM2j$s1X4ZDU~@n5J1=JD&Y z5reo0|7{vmQyozF_Bhc>v=h(j#hRtsQ-o5abgF5#YKw_pLRnHOHxm@Nn?`U?%623n zZrkZuH`VAXN~$WDAwRaM3eX>y>f$vYwht?d7=I4&uM9 zflel|l~6^iu@62shb>b#eWB!ThMEYSxN<`6NrKbpHh!_)AFx`iNDaCFCFoYCMTOi$ zbP-vET6YS!c2z!UgvvpOXB)w9sJlC`!ZNt-BDN5Frl$S5={meqcm0L4-}ztnuZhO` zoRW!`;kn_%Lof7=OqPV5iJ`vHQHCaGJ6F#6mRAR=f`Q5!r>Ztw9h!>d7qzBFYMrW0 z;b3K1B`vEnI(jJ3I}#lp9gH4IjD(%$k!U>TGz~^a$6p*D8*u7}_(b2xf#|^D!ANW< k8XufJoxhM-c4;~mAC5Zl;Ukx(2jeeA|8F|)IQ{;A0ErvxQUCw| diff --git a/rest_framework/locale/pt_BR/LC_MESSAGES/django.po b/rest_framework/locale/pt_BR/LC_MESSAGES/django.po index ce372f321..8b55e9ed9 100644 --- a/rest_framework/locale/pt_BR/LC_MESSAGES/django.po +++ b/rest_framework/locale/pt_BR/LC_MESSAGES/django.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-07 18:53+0100\n" -"PO-Revision-Date: 2015-12-08 16:20+0000\n" -"Last-Translator: Craig Blaszczyk \n" +"POT-Creation-Date: 2016-03-01 18:38+0100\n" +"PO-Revision-Date: 2016-03-01 17:38+0000\n" +"Last-Translator: Xavier Ordoquy \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,43 +21,75 @@ msgstr "" "Language: pt_BR\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: authentication.py:72 +#: authentication.py:71 msgid "Invalid basic header. No credentials provided." msgstr "Cabeçalho básico inválido. Credenciais não fornecidas." -#: authentication.py:75 +#: authentication.py:74 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "Cabeçalho básico inválido. String de credenciais não deve incluir espaços." -#: authentication.py:81 +#: authentication.py:80 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Cabeçalho básico inválido. Credenciais codificadas em base64 incorretamente." -#: authentication.py:98 +#: authentication.py:97 msgid "Invalid username/password." msgstr "Usuário ou senha inválido." -#: authentication.py:101 authentication.py:188 +#: authentication.py:100 authentication.py:195 msgid "User inactive or deleted." msgstr "Usuário inativo ou removido." -#: authentication.py:167 +#: authentication.py:173 msgid "Invalid token header. No credentials provided." msgstr "Cabeçalho de token inválido. Credenciais não fornecidas." -#: authentication.py:170 +#: authentication.py:176 msgid "Invalid token header. Token string should not contain spaces." msgstr "Cabeçalho de token inválido. String de token não deve incluir espaços." -#: authentication.py:176 +#: authentication.py:182 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "Cabeçalho de token inválido. String de token não deve possuir caracteres inválidos." -#: authentication.py:185 +#: authentication.py:192 msgid "Invalid token." msgstr "Token inválido." +#: authtoken/apps.py:7 +msgid "Auth Token" +msgstr "" + +#: authtoken/models.py:21 +msgid "Key" +msgstr "" + +#: authtoken/models.py:23 +msgid "User" +msgstr "" + +#: authtoken/models.py:24 +msgid "Created" +msgstr "" + +#: authtoken/models.py:33 +msgid "Token" +msgstr "" + +#: authtoken/models.py:34 +msgid "Tokens" +msgstr "" + +#: authtoken/serializers.py:8 +msgid "Username" +msgstr "" + +#: authtoken/serializers.py:9 +msgid "Password" +msgstr "" + #: authtoken/serializers.py:20 msgid "User account is disabled." msgstr "Conta de usuário desabilitada." @@ -112,7 +144,7 @@ msgstr "Tipo de mídia \"{media_type}\" no pedido não é suportado." msgid "Request was throttled." msgstr "Pedido foi limitado." -#: fields.py:266 relations.py:195 relations.py:228 validators.py:79 +#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 #: validators.py:162 msgid "This field is required." msgstr "Este campo é obrigatório." @@ -130,7 +162,7 @@ msgstr "\"{input}\" não é um valor boleano válido." msgid "This field may not be blank." msgstr "Este campo não pode ser em branco." -#: fields.py:670 fields.py:1656 +#: fields.py:670 fields.py:1664 #, python-brace-format msgid "Ensure this field has no more than {max_length} characters." msgstr "Certifique-se de que este campo não tenha mais de {max_length} caracteres." @@ -216,137 +248,136 @@ msgstr "Formato inválido para data e hora. Use um dos formatos a seguir: {forma msgid "Expected a datetime but got a date." msgstr "Necessário uma data e hora mas recebeu uma data." -#: fields.py:1079 +#: fields.py:1082 #, python-brace-format msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "Formato inválido para data. Use um dos formatos a seguir: {format}." -#: fields.py:1080 +#: fields.py:1083 msgid "Expected a date but got a datetime." msgstr "Necessário uma data mas recebeu uma data e hora." -#: fields.py:1148 +#: fields.py:1151 #, python-brace-format msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "Formato inválido para Tempo. Use um dos formatos a seguir: {format}." -#: fields.py:1207 +#: fields.py:1215 #, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "Formato inválido para Duração. Use um dos formatos a seguir: {format}." -#: fields.py:1232 fields.py:1281 +#: fields.py:1240 fields.py:1289 #, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" não é um escolha válido." -#: fields.py:1235 relations.py:62 relations.py:431 +#: fields.py:1243 relations.py:71 relations.py:442 #, python-brace-format msgid "More than {count} items..." msgstr "Mais de {count} itens..." -#: fields.py:1282 fields.py:1429 relations.py:427 serializers.py:520 +#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 #, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Necessário uma lista de itens, mas recebeu tipo \"{input_type}\"." -#: fields.py:1283 +#: fields.py:1291 msgid "This selection may not be empty." msgstr "Esta seleção não pode estar vazia." -#: fields.py:1320 +#: fields.py:1328 #, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "\"{input}\" não é uma escolha válida para um caminho." -#: fields.py:1339 +#: fields.py:1347 msgid "No file was submitted." msgstr "Nenhum arquivo foi submetido." -#: fields.py:1340 +#: fields.py:1348 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "O dado submetido não é um arquivo. Certifique-se do tipo de codificação no formulário." -#: fields.py:1341 +#: fields.py:1349 msgid "No filename could be determined." msgstr "Nome do arquivo não pode ser determinado." -#: fields.py:1342 +#: fields.py:1350 msgid "The submitted file is empty." msgstr "O arquivo submetido está vázio." -#: fields.py:1343 +#: fields.py:1351 #, python-brace-format msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "Certifique-se de que o nome do arquivo tem menos de {max_length} caracteres (tem {length})." -#: fields.py:1391 +#: fields.py:1399 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "Fazer upload de uma imagem válida. O arquivo enviado não é um arquivo de imagem ou está corrompido." -#: fields.py:1430 relations.py:428 serializers.py:521 +#: fields.py:1438 relations.py:439 serializers.py:521 msgid "This list may not be empty." msgstr "Esta lista não pode estar vazia." -#: fields.py:1483 +#: fields.py:1491 #, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "Esperado um dicionário de itens mas recebeu tipo \"{input_type}\"." -#: fields.py:1530 +#: fields.py:1538 msgid "Value must be valid JSON." msgstr "Valor devo ser JSON válido." -#: filters.py:35 templates/rest_framework/filters/django_filter.html:5 +#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 msgid "Submit" msgstr "Enviar" #: pagination.py:189 -#, python-brace-format -msgid "Invalid page \"{page_number}\": {message}." -msgstr "Página inválida \"{page_number}\": {message}." +msgid "Invalid page." +msgstr "" #: pagination.py:407 msgid "Invalid cursor" msgstr "Cursor inválido" -#: relations.py:196 +#: relations.py:207 #, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Pk inválido \"{pk_value}\" - objeto não existe." -#: relations.py:197 +#: relations.py:208 #, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Tipo incorreto. Esperado valor pk, recebeu {data_type}." -#: relations.py:229 +#: relations.py:240 msgid "Invalid hyperlink - No URL match." msgstr "Hyperlink inválido - Sem combinação para a URL." -#: relations.py:230 +#: relations.py:241 msgid "Invalid hyperlink - Incorrect URL match." msgstr "Hyperlink inválido - Combinação URL incorreta." -#: relations.py:231 +#: relations.py:242 msgid "Invalid hyperlink - Object does not exist." msgstr "Hyperlink inválido - Objeto não existe." -#: relations.py:232 +#: relations.py:243 #, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Tipo incorreto. Necessário string URL, recebeu {data_type}." -#: relations.py:391 +#: relations.py:402 #, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "Objeto com {slug_name}={value} não existe." -#: relations.py:392 +#: relations.py:403 msgid "Invalid value." msgstr "Valor inválido." diff --git a/rest_framework/locale/pt_PT/LC_MESSAGES/django.mo b/rest_framework/locale/pt_PT/LC_MESSAGES/django.mo index e548456051a5ec9e9b922612cb0df728e89ccd07..82403c3cad8a9408909e20cbf276b8692e5b2af6 100644 GIT binary patch delta 41 ncmbQnGL2=z1YR>;17lqSLj^+%D`Sg^bEOdi=0JgsM*|rF-1Z8C delta 41 pcmbQnGL2=z1YT2JLnB=Sa|J^SD^uf%bEOdi=2oVr8;=Gu0s!4?3W)#! diff --git a/rest_framework/locale/pt_PT/LC_MESSAGES/django.po b/rest_framework/locale/pt_PT/LC_MESSAGES/django.po index 32cdd5c47..1727fc42b 100644 --- a/rest_framework/locale/pt_PT/LC_MESSAGES/django.po +++ b/rest_framework/locale/pt_PT/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-07 18:53+0100\n" -"PO-Revision-Date: 2015-12-07 17:55+0000\n" +"POT-Creation-Date: 2016-03-01 18:38+0100\n" +"PO-Revision-Date: 2016-03-01 17:38+0000\n" "Last-Translator: Xavier Ordoquy \n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/pt_PT/)\n" "MIME-Version: 1.0\n" @@ -17,43 +17,75 @@ msgstr "" "Language: pt_PT\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:72 +#: authentication.py:71 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:75 +#: authentication.py:74 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:81 +#: authentication.py:80 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:98 +#: authentication.py:97 msgid "Invalid username/password." msgstr "" -#: authentication.py:101 authentication.py:188 +#: authentication.py:100 authentication.py:195 msgid "User inactive or deleted." msgstr "" -#: authentication.py:167 +#: authentication.py:173 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:170 +#: authentication.py:176 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:176 +#: authentication.py:182 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:185 +#: authentication.py:192 msgid "Invalid token." msgstr "" +#: authtoken/apps.py:7 +msgid "Auth Token" +msgstr "" + +#: authtoken/models.py:21 +msgid "Key" +msgstr "" + +#: authtoken/models.py:23 +msgid "User" +msgstr "" + +#: authtoken/models.py:24 +msgid "Created" +msgstr "" + +#: authtoken/models.py:33 +msgid "Token" +msgstr "" + +#: authtoken/models.py:34 +msgid "Tokens" +msgstr "" + +#: authtoken/serializers.py:8 +msgid "Username" +msgstr "" + +#: authtoken/serializers.py:9 +msgid "Password" +msgstr "" + #: authtoken/serializers.py:20 msgid "User account is disabled." msgstr "" @@ -108,7 +140,7 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:266 relations.py:195 relations.py:228 validators.py:79 +#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 #: validators.py:162 msgid "This field is required." msgstr "" @@ -126,7 +158,7 @@ msgstr "" msgid "This field may not be blank." msgstr "" -#: fields.py:670 fields.py:1656 +#: fields.py:670 fields.py:1664 #, python-brace-format msgid "Ensure this field has no more than {max_length} characters." msgstr "" @@ -212,137 +244,136 @@ msgstr "" msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1079 +#: fields.py:1082 #, python-brace-format msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1080 +#: fields.py:1083 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1148 +#: fields.py:1151 #, python-brace-format msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1207 +#: fields.py:1215 #, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1232 fields.py:1281 +#: fields.py:1240 fields.py:1289 #, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "" -#: fields.py:1235 relations.py:62 relations.py:431 +#: fields.py:1243 relations.py:71 relations.py:442 #, python-brace-format msgid "More than {count} items..." msgstr "" -#: fields.py:1282 fields.py:1429 relations.py:427 serializers.py:520 +#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 #, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1283 +#: fields.py:1291 msgid "This selection may not be empty." msgstr "" -#: fields.py:1320 +#: fields.py:1328 #, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1339 +#: fields.py:1347 msgid "No file was submitted." msgstr "" -#: fields.py:1340 +#: fields.py:1348 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1341 +#: fields.py:1349 msgid "No filename could be determined." msgstr "" -#: fields.py:1342 +#: fields.py:1350 msgid "The submitted file is empty." msgstr "" -#: fields.py:1343 +#: fields.py:1351 #, python-brace-format msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1391 +#: fields.py:1399 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: fields.py:1430 relations.py:428 serializers.py:521 +#: fields.py:1438 relations.py:439 serializers.py:521 msgid "This list may not be empty." msgstr "" -#: fields.py:1483 +#: fields.py:1491 #, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1530 +#: fields.py:1538 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html:5 +#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 msgid "Submit" msgstr "" #: pagination.py:189 -#, python-brace-format -msgid "Invalid page \"{page_number}\": {message}." +msgid "Invalid page." msgstr "" #: pagination.py:407 msgid "Invalid cursor" msgstr "" -#: relations.py:196 +#: relations.py:207 #, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" -#: relations.py:197 +#: relations.py:208 #, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" -#: relations.py:229 +#: relations.py:240 msgid "Invalid hyperlink - No URL match." msgstr "" -#: relations.py:230 +#: relations.py:241 msgid "Invalid hyperlink - Incorrect URL match." msgstr "" -#: relations.py:231 +#: relations.py:242 msgid "Invalid hyperlink - Object does not exist." msgstr "" -#: relations.py:232 +#: relations.py:243 #, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:391 +#: relations.py:402 #, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:392 +#: relations.py:403 msgid "Invalid value." msgstr "" diff --git a/rest_framework/locale/ro/LC_MESSAGES/django.mo b/rest_framework/locale/ro/LC_MESSAGES/django.mo index 11567edc3997d7f53610509d959deeedacc7a2ae..77dc7d0f23fce6a90c9cf8c60fa31fd568372e46 100644 GIT binary patch delta 41 ncmZ3(vW8{C1YR>;17lqSLj^+%D`Sg^bEOdi=0JgsN7ESr\n" "Language-Team: Romanian (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/ro/)\n" "MIME-Version: 1.0\n" @@ -17,43 +17,75 @@ msgstr "" "Language: ro\n" "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n" -#: authentication.py:72 +#: authentication.py:71 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:75 +#: authentication.py:74 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:81 +#: authentication.py:80 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:98 +#: authentication.py:97 msgid "Invalid username/password." msgstr "" -#: authentication.py:101 authentication.py:188 +#: authentication.py:100 authentication.py:195 msgid "User inactive or deleted." msgstr "" -#: authentication.py:167 +#: authentication.py:173 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:170 +#: authentication.py:176 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:176 +#: authentication.py:182 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:185 +#: authentication.py:192 msgid "Invalid token." msgstr "" +#: authtoken/apps.py:7 +msgid "Auth Token" +msgstr "" + +#: authtoken/models.py:21 +msgid "Key" +msgstr "" + +#: authtoken/models.py:23 +msgid "User" +msgstr "" + +#: authtoken/models.py:24 +msgid "Created" +msgstr "" + +#: authtoken/models.py:33 +msgid "Token" +msgstr "" + +#: authtoken/models.py:34 +msgid "Tokens" +msgstr "" + +#: authtoken/serializers.py:8 +msgid "Username" +msgstr "" + +#: authtoken/serializers.py:9 +msgid "Password" +msgstr "" + #: authtoken/serializers.py:20 msgid "User account is disabled." msgstr "" @@ -108,7 +140,7 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:266 relations.py:195 relations.py:228 validators.py:79 +#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 #: validators.py:162 msgid "This field is required." msgstr "" @@ -126,7 +158,7 @@ msgstr "" msgid "This field may not be blank." msgstr "" -#: fields.py:670 fields.py:1656 +#: fields.py:670 fields.py:1664 #, python-brace-format msgid "Ensure this field has no more than {max_length} characters." msgstr "" @@ -212,137 +244,136 @@ msgstr "" msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1079 +#: fields.py:1082 #, python-brace-format msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1080 +#: fields.py:1083 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1148 +#: fields.py:1151 #, python-brace-format msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1207 +#: fields.py:1215 #, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1232 fields.py:1281 +#: fields.py:1240 fields.py:1289 #, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "" -#: fields.py:1235 relations.py:62 relations.py:431 +#: fields.py:1243 relations.py:71 relations.py:442 #, python-brace-format msgid "More than {count} items..." msgstr "" -#: fields.py:1282 fields.py:1429 relations.py:427 serializers.py:520 +#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 #, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1283 +#: fields.py:1291 msgid "This selection may not be empty." msgstr "" -#: fields.py:1320 +#: fields.py:1328 #, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1339 +#: fields.py:1347 msgid "No file was submitted." msgstr "" -#: fields.py:1340 +#: fields.py:1348 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1341 +#: fields.py:1349 msgid "No filename could be determined." msgstr "" -#: fields.py:1342 +#: fields.py:1350 msgid "The submitted file is empty." msgstr "" -#: fields.py:1343 +#: fields.py:1351 #, python-brace-format msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1391 +#: fields.py:1399 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: fields.py:1430 relations.py:428 serializers.py:521 +#: fields.py:1438 relations.py:439 serializers.py:521 msgid "This list may not be empty." msgstr "" -#: fields.py:1483 +#: fields.py:1491 #, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1530 +#: fields.py:1538 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html:5 +#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 msgid "Submit" msgstr "" #: pagination.py:189 -#, python-brace-format -msgid "Invalid page \"{page_number}\": {message}." +msgid "Invalid page." msgstr "" #: pagination.py:407 msgid "Invalid cursor" msgstr "" -#: relations.py:196 +#: relations.py:207 #, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" -#: relations.py:197 +#: relations.py:208 #, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" -#: relations.py:229 +#: relations.py:240 msgid "Invalid hyperlink - No URL match." msgstr "" -#: relations.py:230 +#: relations.py:241 msgid "Invalid hyperlink - Incorrect URL match." msgstr "" -#: relations.py:231 +#: relations.py:242 msgid "Invalid hyperlink - Object does not exist." msgstr "" -#: relations.py:232 +#: relations.py:243 #, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:391 +#: relations.py:402 #, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:392 +#: relations.py:403 msgid "Invalid value." msgstr "" diff --git a/rest_framework/locale/ru/LC_MESSAGES/django.mo b/rest_framework/locale/ru/LC_MESSAGES/django.mo index 063bf0b74ce2591559b1b8838125b25d00533c66..ac67f09a3be91baa792881c22e91fe1d9dac66f8 100644 GIT binary patch delta 1558 zcmYM!Ur19?9Ki9@a$8#S-~3bRYMN%5n}4QrO>;K2i6*I(e^N0>3DY#NKd8alg9SYW z(-Mk$h=TAza#CRRkl{lTKJ^x6FBMr&QUrm~_jfnwz}e@Vdw1_W=lA>FyVmik-TyH$ zYD&@S=^6Avol<@HGKwEslR>FWY(^`N;BK76ofty7?j5G%H?*PNs8l{W(2J+>C_Y3V zu49!_epS3psa6h*U>PoBIqIU7YQRc#<4u(FOLz=7F%j!y!VBoez0AiV-bcC5B9`J` z%)yfF;rpFJ7tdEy3_P4z!D@`%p_Cn4Fct&o!dti>-=aih1M@J+q*Nh#P_Daxhw%Z* z^{beMKO%D@2W6otn8EXvTL#z`IdKtXXVWO5p21vP#uVH@D@MmD#impq7GNpL`94g= zt0)VbL<#v4%5zNd;q!Uumjhk~lDi&s;y6mE=OXiUlpSOygdbFalG8yvh_hIPAFu;W ztbP}sjTpdU=6A7$`dYy@=9$UFzmCCZayTc8SipP}B_%etBMUi?wfG1-@jG5ZAKM(m zS2&6;D)I!*;RqU8#TgvO9$dp=^st*&oJ}MCGBB|H+t`hg ziH(+UaXrBn=4%+hV)8bD^QfhGk5c{27jPeDTa`M84Soha44z>lrchbOu@?t$9xtOc zi(TLy%tkX6B>#7z6ybH02t7q7{zebl`EvsfA(yHJ%*R!f$ogY)!YlG(1qb>u2_Iu6 zzCg+CAC%POv-~UAg&p`F51^e2l_G8DM;34m?f4wq@e6jLhw#e$9v+h5{9@3?fdcO0 z#~av-Mz+<8gZLWXU>#0SaaFj2O&G^^wxFBNrnQd`H`ZD$zp@Egh(kM~6s4u5*oYvIz%3+!3@ic)^6I%qMZT8=Q1MtHR* y)oP{J(Cb6Z2BR?)Fs$a=9I@;D9;(|B*6|go5Uw*pM%4I_4i)T%N)J delta 1716 zcmZ|PTTEO<9LMn~u&h!SrSyWOtfyRTD_z(Hm&+mr7K$k1R@%@)X(-@ouz^+=5F})& ztt9&3rNpLbqVgb3jiDiKjmE?#jj!75HX1K&&@?=d5YmSxCbo(C{T;TxImw*QnK`$a z|9|HEap?EX=;DU74-KW2x{W%VVoVsnPvby2nr_T?>_rPtp&LKN9Q+RT+)d2IztDr5 zoW|_NMhxN!Y{nQqjd!u$n5YRpU`z)cr?3)#!y4T1;M$;`#{li~sOvxBbLh(89_&I5 zU=R!Nourpg@41eC%v^6w5jLUT_X<|=eKW^N9UY6#1F6vXK^R~ii${z z%a|vy5Y-<-FOH#}{|syK7u0(;bJ&VSsCGSv0={oToM;A-r0?qj?RnG;6R40c;SNlF zn3rKOS{OtoY5K7ghfvo)#x3|IYG6O0LjO1Fd(Dp!f8Ef}i8>}wIXs6Ico`M)m1Mgh zYi$NySW5p0Dz|f3jLYc5jf}bzoAFVcP5KR%(f$$JS!d2{;(w5iu1&_Y;1{Ue+(Uh! zf@vrzjOKY~;E2L6fT_$n*&0IpyJ>lsBqUdA5GArHrKY%B5a;AEK& zS;zFx;#pKqJ%r^2?7$klm~;uXORT)LflQ;H_APA39P)J%kKtRmib{3lF=Gbs4nB@Y zq82NWlhfFPx3LXFtgsM%gqrax9>el{V@B~4oWRX2ltMg%dhRRKqIA%y=e$^fqgaRY z*ov#jD@?SyXlPYGhaODO|>lSVZR@44`s6j!Mzz_&VOePTbE5-G%e0#riV` z4d5Rv!3x592*cQ|pj=6I>^}*yxBs0UB(J8N>Y%D9DJt4eDO9$KX`rT2Rrm+k z@zi-XRXJO)MzXNb?w6U{4p)};8xgTLK8w~g&A8IHdA%9?LZ0^U z=s;xP_>iZmcQ_od%Dle+?yC&={jsj>q0Ex_LgGCuaWe5{Vk*86|2F=0VmiL?zaN}g MaJysIwx7xP7fIXBh5!Hn diff --git a/rest_framework/locale/ru/LC_MESSAGES/django.po b/rest_framework/locale/ru/LC_MESSAGES/django.po index eae0fe286..980a9e5b4 100644 --- a/rest_framework/locale/ru/LC_MESSAGES/django.po +++ b/rest_framework/locale/ru/LC_MESSAGES/django.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-07 18:53+0100\n" -"PO-Revision-Date: 2015-12-07 17:55+0000\n" +"POT-Creation-Date: 2016-03-01 18:38+0100\n" +"PO-Revision-Date: 2016-03-01 17:38+0000\n" "Last-Translator: Xavier Ordoquy \n" "Language-Team: Russian (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/ru/)\n" "MIME-Version: 1.0\n" @@ -20,43 +20,75 @@ msgstr "" "Language: ru\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:72 +#: authentication.py:71 msgid "Invalid basic header. No credentials provided." msgstr "Недопустимый заголовок. Не предоставлены учетные данные." -#: authentication.py:75 +#: authentication.py:74 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "Недопустимый заголовок. Учетные данные не должны содержать пробелов." -#: authentication.py:81 +#: authentication.py:80 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Недопустимый заголовок. Учетные данные некорректно закодированны в base64." -#: authentication.py:98 +#: authentication.py:97 msgid "Invalid username/password." msgstr "Недопустимые имя пользователя или пароль." -#: authentication.py:101 authentication.py:188 +#: authentication.py:100 authentication.py:195 msgid "User inactive or deleted." msgstr "Пользователь неактивен или удален." -#: authentication.py:167 +#: authentication.py:173 msgid "Invalid token header. No credentials provided." msgstr "Недопустимый заголовок токена. Не предоставлены учетные данные." -#: authentication.py:170 +#: authentication.py:176 msgid "Invalid token header. Token string should not contain spaces." msgstr "Недопустимый заголовок токена. Токен не должен содержать пробелов." -#: authentication.py:176 +#: authentication.py:182 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:185 +#: authentication.py:192 msgid "Invalid token." msgstr "Недопустимый токен." +#: authtoken/apps.py:7 +msgid "Auth Token" +msgstr "" + +#: authtoken/models.py:21 +msgid "Key" +msgstr "" + +#: authtoken/models.py:23 +msgid "User" +msgstr "" + +#: authtoken/models.py:24 +msgid "Created" +msgstr "" + +#: authtoken/models.py:33 +msgid "Token" +msgstr "" + +#: authtoken/models.py:34 +msgid "Tokens" +msgstr "" + +#: authtoken/serializers.py:8 +msgid "Username" +msgstr "" + +#: authtoken/serializers.py:9 +msgid "Password" +msgstr "" + #: authtoken/serializers.py:20 msgid "User account is disabled." msgstr "Учетная запись пользователя отключена." @@ -111,7 +143,7 @@ msgstr "Неподдерживаемый тип данных \"{media_type}\" в msgid "Request was throttled." msgstr "Запрос был проигнорирован." -#: fields.py:266 relations.py:195 relations.py:228 validators.py:79 +#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 #: validators.py:162 msgid "This field is required." msgstr "Это поле обязательно." @@ -129,7 +161,7 @@ msgstr "\"{input}\" не является корректным булевым з msgid "This field may not be blank." msgstr "Это поле не может быть пустым." -#: fields.py:670 fields.py:1656 +#: fields.py:670 fields.py:1664 #, python-brace-format msgid "Ensure this field has no more than {max_length} characters." msgstr "Убедитесь что в этом поле не больше {max_length} символов." @@ -215,137 +247,136 @@ msgstr "Неправильный формат datetime. Используйте msgid "Expected a datetime but got a date." msgstr "Ожидался datetime, но был получен date." -#: fields.py:1079 +#: fields.py:1082 #, python-brace-format msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "Неправильный формат date. Используйте один из этих форматов: {format}." -#: fields.py:1080 +#: fields.py:1083 msgid "Expected a date but got a datetime." msgstr "Ожидался date, но был получен datetime." -#: fields.py:1148 +#: fields.py:1151 #, python-brace-format msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "Неправильный формат времени. Используйте один из этих форматов: {format}." -#: fields.py:1207 +#: fields.py:1215 #, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1232 fields.py:1281 +#: fields.py:1240 fields.py:1289 #, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" не является корректным значением." -#: fields.py:1235 relations.py:62 relations.py:431 +#: fields.py:1243 relations.py:71 relations.py:442 #, python-brace-format msgid "More than {count} items..." msgstr "" -#: fields.py:1282 fields.py:1429 relations.py:427 serializers.py:520 +#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 #, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Ожидался list со значениями, но был получен \"{input_type}\"." -#: fields.py:1283 +#: fields.py:1291 msgid "This selection may not be empty." msgstr "" -#: fields.py:1320 +#: fields.py:1328 #, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1339 +#: fields.py:1347 msgid "No file was submitted." msgstr "Не был загружен файл." -#: fields.py:1340 +#: fields.py:1348 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "Загруженный файл не является корректным файлом. " -#: fields.py:1341 +#: fields.py:1349 msgid "No filename could be determined." msgstr "Невозможно определить имя файла." -#: fields.py:1342 +#: fields.py:1350 msgid "The submitted file is empty." msgstr "Загруженный файл пуст." -#: fields.py:1343 +#: fields.py:1351 #, python-brace-format msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "Убедитесь что имя файла меньше {max_length} символов (сейчас {length})." -#: fields.py:1391 +#: fields.py:1399 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "Загрузите корректное изображение. Загруженный файл не является изображением, либо является испорченным." -#: fields.py:1430 relations.py:428 serializers.py:521 +#: fields.py:1438 relations.py:439 serializers.py:521 msgid "This list may not be empty." msgstr "" -#: fields.py:1483 +#: fields.py:1491 #, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "Ожидался словарь со значениями, но был получен \"{input_type}\"." -#: fields.py:1530 +#: fields.py:1538 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html:5 +#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 msgid "Submit" msgstr "" #: pagination.py:189 -#, python-brace-format -msgid "Invalid page \"{page_number}\": {message}." -msgstr "Недопустимая страница \"{page_number}\": {message}." +msgid "Invalid page." +msgstr "" #: pagination.py:407 msgid "Invalid cursor" msgstr "Не корректный курсор" -#: relations.py:196 +#: relations.py:207 #, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Недопустимый первичный ключ \"{pk_value}\" - объект не существует." -#: relations.py:197 +#: relations.py:208 #, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Некорректный тип. Ожилалось значение первичного ключа, получен {data_type}." -#: relations.py:229 +#: relations.py:240 msgid "Invalid hyperlink - No URL match." msgstr "Недопустимая ссылка - нет совпадения по URL." -#: relations.py:230 +#: relations.py:241 msgid "Invalid hyperlink - Incorrect URL match." msgstr "Недопустимая ссылка - некорректное совпадение по URL," -#: relations.py:231 +#: relations.py:242 msgid "Invalid hyperlink - Object does not exist." msgstr "Недопустимая ссылка - объект не существует." -#: relations.py:232 +#: relations.py:243 #, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Некорректный тип. Ожидался URL, получен {data_type}." -#: relations.py:391 +#: relations.py:402 #, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "Объект с {slug_name}={value} не существует." -#: relations.py:392 +#: relations.py:403 msgid "Invalid value." msgstr "Недопустимое значение." diff --git a/rest_framework/locale/sk/LC_MESSAGES/django.mo b/rest_framework/locale/sk/LC_MESSAGES/django.mo index 89c3f462f467c716641e1049cc4135cb2654d59a..83237889833cddac18370ba584b677f8c4fbdcf3 100644 GIT binary patch delta 1558 zcmYMzOKeP09LMp0tJ6^o)eeddQ*V9Hb~-ht)s8;UB2iRT&?eGUD3R1Fh{H^z%ulB%}OzZ4cLwA@D{Ge5saC| zt#YE-4hH&h6~4k6%*-*{h;oFpT547^^0y z-?s}ReBUn9sAu90HsaJNW-D+jPQ?U9@B%KwAyh=huo(S5vvRCQJ$D4x;0@IC!#D>= z-M*JWEp#Rp@_mb{fgSF|QPj?^qC$Nam*Oj&iDMYVoM~ok%8GF%hEel9I1A697B+wi z`3ux{e7WiQVvK8`friem3#;)oD%20${s?LZMbpzCszse?AC}-ftiX@hi9S|88+%<7 zSV{jHe$61#sEytC6aOk2Z~f^3&kVCg^cSK2(1J>`{qA@Il?!)pCw{?hjI!-^yoNFS ziCtJp7?cB-P)G6x58xDDT8AeJh<`1OM-1%4U#LiQu>1wsk1cowWB3`jVG-eI!($l4 zm#Bz*M}@kCmvm!4HsgEL2j>uOHgBD%=lc}@G8#{DC61z!u`pn^8+T(9K1N-iaU{yt zOn8FWf%$k6l_TeIK0b7Pk4nF)a@!VW%pd)Vk7;Z7{M@M4dY>CA#uA+LpvYB9ry=hxMg8F5*P6} z{dcI9Z{SDCbO`yY-NX#kBKeCGP3=@gq1P@~P(xG|QpUN)UaWEsOQRHy&I!HR4ODW{ zCa6PEPAsSDY_*FeR8qlN_y(*^ZuW$dO`hC#u8MPav{aJGi5XjWmh3?lEn7tglSx%Z z#Hd+R74EkaBeiw7)yZ$3rPC{D>9#2i$P#Nz2C`=b*3weZ;j7e8gVZK!YpN~V>rEwm m!yaFCS$U|eydqc;iH0J{gZXp+kE~)OmCTq;F{1P zVWHBOLcvyq(1)TB0|gTbnm~LjhESSFX-S|h#X#vpnmqUzT1e^lx4X$>hMn`7nLTID z%ztLide`ca_~!16c_Vd`UnWnbn?>?fiK}d=)ruK zSrxWo7$>j;SFjWR#gJLt!Y`Peq+tf@@OP}o-Py@O9mOE^uTlTs!?)3$!#x;54PX?@ z@bi>cQT_aae%!I$tQ^}={S9M)_uCSMW*RoJ6^maqtHyrZfnQ<(7w|Rw4Hc1ew^;=q zM78&z7e7Wl|1CD+uc&_Za@mjNsCtM?8Sl3q3YtMI<*fdoeg!qdpHU(I3tz=;JLwE7 z(ZMh>NgKe!IEMQF8{CK2Py^dQh5kR(`#N?Jf88)ZK@HQWHN1##;3_KQk5cur+~f=* zc$oHcsI^_fN_>Dm+{38f#||vSg_LVpL;WuPnP%q7BmSD%!#!rNV|IRWrcHQ|`k7Sy zQ`BZ#Otr6}*6==_#{EpU7h`w=?_vlmnB7?%LG6Xxs3mdH*)X;j5dS6$-_g*3TR4DK z3|olr7jwy&nTQ z|CcHFX}FIXNPbx|0zo`UeHcUdJvL)HH=V~Y>i!#Cw5c|cE-aTro`&^g9!VTU4OmGL zQy+@3_M6!$UI>TCF0uxq^a`0JO}tq3Rx*3kwy8p5ITK-g3l&C%nyryIX4)r>bB&p` zaUZ24WW`m9W0d%kXxMDD#DWtht0iZWl{5tWJ uXwa$g`kvia7xepAB6-_$JW=Q77wcDIAB{V)smb-lv5`-n_qIsUkn4Z**1LEB diff --git a/rest_framework/locale/sk/LC_MESSAGES/django.po b/rest_framework/locale/sk/LC_MESSAGES/django.po index cdd82c107..208c063ac 100644 --- a/rest_framework/locale/sk/LC_MESSAGES/django.po +++ b/rest_framework/locale/sk/LC_MESSAGES/django.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-07 18:53+0100\n" -"PO-Revision-Date: 2015-12-07 17:55+0000\n" +"POT-Creation-Date: 2016-03-01 18:38+0100\n" +"PO-Revision-Date: 2016-03-01 17:38+0000\n" "Last-Translator: Xavier Ordoquy \n" "Language-Team: Slovak (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/sk/)\n" "MIME-Version: 1.0\n" @@ -18,43 +18,75 @@ msgstr "" "Language: sk\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: authentication.py:72 +#: authentication.py:71 msgid "Invalid basic header. No credentials provided." msgstr "Nesprávna hlavička. Neboli poskytnuté prihlasovacie údaje." -#: authentication.py:75 +#: authentication.py:74 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "Nesprávna hlavička. Prihlasovacie údaje nesmú obsahovať medzery." -#: authentication.py:81 +#: authentication.py:80 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Nesprávna hlavička. Prihlasovacie údaje nie sú správne zakódované pomocou metódy base64." -#: authentication.py:98 +#: authentication.py:97 msgid "Invalid username/password." msgstr "Nesprávne prihlasovacie údaje." -#: authentication.py:101 authentication.py:188 +#: authentication.py:100 authentication.py:195 msgid "User inactive or deleted." msgstr "Daný používateľ je neaktívny, alebo zmazaný." -#: authentication.py:167 +#: authentication.py:173 msgid "Invalid token header. No credentials provided." msgstr "Nesprávna token hlavička. Neboli poskytnuté prihlasovacie údaje." -#: authentication.py:170 +#: authentication.py:176 msgid "Invalid token header. Token string should not contain spaces." msgstr "Nesprávna token hlavička. Token hlavička nesmie obsahovať medzery." -#: authentication.py:176 +#: authentication.py:182 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:185 +#: authentication.py:192 msgid "Invalid token." msgstr "Nesprávny token." +#: authtoken/apps.py:7 +msgid "Auth Token" +msgstr "" + +#: authtoken/models.py:21 +msgid "Key" +msgstr "" + +#: authtoken/models.py:23 +msgid "User" +msgstr "" + +#: authtoken/models.py:24 +msgid "Created" +msgstr "" + +#: authtoken/models.py:33 +msgid "Token" +msgstr "" + +#: authtoken/models.py:34 +msgid "Tokens" +msgstr "" + +#: authtoken/serializers.py:8 +msgid "Username" +msgstr "" + +#: authtoken/serializers.py:9 +msgid "Password" +msgstr "" + #: authtoken/serializers.py:20 msgid "User account is disabled." msgstr "Daný používateľ je zablokovaný." @@ -109,7 +141,7 @@ msgstr "Požiadavok obsahuje nepodporovaný media type: \"{media_type}\"." msgid "Request was throttled." msgstr "Požiadavok bol obmedzený, z dôvodu prekročenia limitu." -#: fields.py:266 relations.py:195 relations.py:228 validators.py:79 +#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 #: validators.py:162 msgid "This field is required." msgstr "Toto pole je povinné." @@ -127,7 +159,7 @@ msgstr "\"{input}\" je validný boolean." msgid "This field may not be blank." msgstr "Toto pole nemože byť prázdne." -#: fields.py:670 fields.py:1656 +#: fields.py:670 fields.py:1664 #, python-brace-format msgid "Ensure this field has no more than {max_length} characters." msgstr "Uistite sa, že toto pole nemá viac ako {max_length} znakov." @@ -213,137 +245,136 @@ msgstr "Nesprávny formát dátumu a času. Prosím použite jeden z nasledujúc msgid "Expected a datetime but got a date." msgstr "Vložený len dátum - date namiesto dátumu a času - datetime." -#: fields.py:1079 +#: fields.py:1082 #, python-brace-format msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "Nesprávny formát dátumu. Prosím použite jeden z nasledujúcich formátov: {format}." -#: fields.py:1080 +#: fields.py:1083 msgid "Expected a date but got a datetime." msgstr "Vložený dátum a čas - datetime namiesto jednoduchého dátumu - date." -#: fields.py:1148 +#: fields.py:1151 #, python-brace-format msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "Nesprávny formát času. Prosím použite jeden z nasledujúcich formátov: {format}." -#: fields.py:1207 +#: fields.py:1215 #, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1232 fields.py:1281 +#: fields.py:1240 fields.py:1289 #, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" je nesprávny výber z daných možností." -#: fields.py:1235 relations.py:62 relations.py:431 +#: fields.py:1243 relations.py:71 relations.py:442 #, python-brace-format msgid "More than {count} items..." msgstr "" -#: fields.py:1282 fields.py:1429 relations.py:427 serializers.py:520 +#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 #, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Bol očakávaný zoznam položiek, no namiesto toho bol nájdený \"{input_type}\"." -#: fields.py:1283 +#: fields.py:1291 msgid "This selection may not be empty." msgstr "" -#: fields.py:1320 +#: fields.py:1328 #, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1339 +#: fields.py:1347 msgid "No file was submitted." msgstr "Nebol odoslaný žiadny súbor." -#: fields.py:1340 +#: fields.py:1348 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "Odoslané dáta neobsahujú súbor. Prosím skontrolujte kódovanie - encoding type daného formuláru." -#: fields.py:1341 +#: fields.py:1349 msgid "No filename could be determined." msgstr "Nebolo možné určiť meno súboru." -#: fields.py:1342 +#: fields.py:1350 msgid "The submitted file is empty." msgstr "Odoslaný súbor je prázdny." -#: fields.py:1343 +#: fields.py:1351 #, python-brace-format msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "Uistite sa, že meno súboru neobsahuje viac ako {max_length} znakov. (V skutočnosti ich má {length})." -#: fields.py:1391 +#: fields.py:1399 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "Uploadujte prosím obrázok. Súbor, ktorý ste uploadovali buď nie je obrázok, alebo daný obrázok je poškodený." -#: fields.py:1430 relations.py:428 serializers.py:521 +#: fields.py:1438 relations.py:439 serializers.py:521 msgid "This list may not be empty." msgstr "" -#: fields.py:1483 +#: fields.py:1491 #, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "Bol očakávaný slovník položiek, no namiesto toho bol nájdený \"{input_type}\"." -#: fields.py:1530 +#: fields.py:1538 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html:5 +#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 msgid "Submit" msgstr "" #: pagination.py:189 -#, python-brace-format -msgid "Invalid page \"{page_number}\": {message}." -msgstr "Nesprávne číslo stránky \"{page_number}\": {message}." +msgid "Invalid page." +msgstr "" #: pagination.py:407 msgid "Invalid cursor" msgstr "Nesprávny kurzor." -#: relations.py:196 +#: relations.py:207 #, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Nesprávny primárny kľúč \"{pk_value}\" - objekt s daným primárnym kľúčom neexistuje." -#: relations.py:197 +#: relations.py:208 #, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Nesprávny typ. Bol prijatý {data_type} namiesto primárneho kľúča." -#: relations.py:229 +#: relations.py:240 msgid "Invalid hyperlink - No URL match." msgstr "Nesprávny hypertextový odkaz - žiadna zhoda." -#: relations.py:230 +#: relations.py:241 msgid "Invalid hyperlink - Incorrect URL match." msgstr "Nesprávny hypertextový odkaz - chybná URL." -#: relations.py:231 +#: relations.py:242 msgid "Invalid hyperlink - Object does not exist." msgstr "Nesprávny hypertextový odkaz - požadovný objekt neexistuje." -#: relations.py:232 +#: relations.py:243 #, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Nesprávny typ {data_type}. Požadovaný typ: hypertextový odkaz." -#: relations.py:391 +#: relations.py:402 #, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "Objekt, ktorého atribút \"{slug_name}\" je \"{value}\" neexistuje." -#: relations.py:392 +#: relations.py:403 msgid "Invalid value." msgstr "Nesprávna hodnota." diff --git a/rest_framework/locale/sv/LC_MESSAGES/django.mo b/rest_framework/locale/sv/LC_MESSAGES/django.mo index a6c04ef4bde5b3070f8f7ab5b52f16f3f4f2616d..d560de6e148ec09886153f5ccc95854ea689da9d 100644 GIT binary patch delta 2011 zcmYk-e`r-@9LMqR)!RKzb4zdDm1}w2T%~QdJ8y3Ds&{wIIqmL8E}c5T9J%O{cFEEd zibJ5#AA!Q{7a^KBtq8&#qGA!1fA~*iLF#Y`2L2-={s>Am=>0k8NImR(Ue9y9=g0GX zzR&Tq-q9ZK;?(E|MjId=A+C-y^YEMdIM9weW;5{wx_ANW@Gd@zH51Gp!Zy_P16YM` zVgr`29>2$D@ER_`#xh^ew$bV2#CMoOXQEj@F2!cthYRo=<}p6WEQ2qg{{0i|!e6l# zXWVZ#728oS)Q>vud3G##v0@OX%X;7{|TnMd=)&Lw4;LK7~IZ%ValEH@<_qK{qhvUVVVw^`Ux82v6)s&HOy-hquthiU)%i zOQDKrJwAyCun~X8H5i#@_Assu-4ePB=W_lFJRLC`LrwHxCHYrsf8#Zu#@ncIl9JYo z^o4E;eHZIFe*ov>8C-@Fd1@Y4pvIq~YUB#$Fv-nUU=cO*Q<%j&9-ZZMGE8?dzK6Q- z7wpGrA|Vpj0I$YLww4Vc4WT!fcV zzpv$^B0EE0!8)FAyXYuoM=^tU@iA=XunyOuGV?8RFB?M_BRpNjRD%(`*V17}v!u}d zk5UJA65QI~3E&rGx7I@GQPXVI#u3jGY**vs=+A;e_P^&~B+R-Ay^NZ&qt;ql9;@g=V`jab@SMX!x`mQYQpsn}IVYN`(vuXchmujT~!|3_#C_Jw18Al04=@QYvdH=a;g zXjd&IrVuJ4TDf0{E9qs4)upeUcr-cOprq0MgZ<_*QywrqD7ZYu`8+{VJI#jS5tn_c4vNBQh3~GyNTP0YjeypIDHET+F8HZDm;e{UcozX;XJcSY{V7VgS!4n ztiWR!z<017zrjuT4{pI&QQnNb$VmqS=P`=Q=bP=qer&}lT#qvt$JGnWBA7yb{~mVX zC0vbb7n&`>KGcLBLybT0c@lNMud!LL>R)8W$J#mYau!FuVIS&2&tMyVgd6csycYw- zW(~L>`Pc~#`rQ=Xg_lv8D_Lw-i(%CGAO`UmHYn9+IN63X*p8uF-5aK`ocZta_Wa!&_m#MBUW;0qcGUHIa19>9GJF#q`~)+loczE^AzneUY=7Zeyn!s2)sau7 zw26am(1AW2#O0Xu`V$zW{{m`BKSoV-7WKPw9;SXHsz$m?$$twcdl}GLzK!btgqnHD zQul}T=+NJan%FR^m?p6ff5s5bTV^(Z5xfmw_k7>;EH*NJ33CNz%gV^VZg`IADYe(J z30G3m>i421@|5Rmo~N;%@h@>5UPCQm15b_P)2RLzs9GuJCQ{Z5lO^8PBCF-PFf0%J@sj#;~tYOZGih;YHNM zGqap1^{rG)7p8DGeuhz8!LO-H8$eBT7?tun9BRLRjxj7+ zWk$VP9QkByk2i1xmGW1Rdsz;dgMEv7;8kRqt+LwPR$){IcA_RQhWh>u)b&$d|2*oy z>^Ial{R6cfucKf4zlNvk4eK$28&JF95Rz4U7L~e5RFR!PE!72Nb*!ewop=?nspJdMiC0-nY_tri{Z zMitc<7U0dMf>zT@Quz6G--26-hxNcPp|+FI+9*A0+A3;u2vsfH*!b7X*8zo{UluSj zY1;`+My=Py)@NhBicEkWGvd$Itke5OC3&;?IO!mw-oQf`BUFWjgmR@ls_Nv;^V@=L zY7Y?qZOUyCv6)astC1#OJ}38OfAxhk{S0j);)HgM+Wmy;NKN$-B-)4uLe1}D8}LD* zkLV`!N2#V#P*V-6{^k-Y3zgC~qJ&Tx(TekhsO_w}7|6cmFD+C>WpDV)a~J$a{gsKw zlTP*FF?eM3;K-xN@rmk)b9f|~PBS!->smbHThtr~H3ovMPN*%?9L`3|Dw^DpHYd~) z3ANM(Y4f`h=>vfs\n" "Language-Team: Swedish (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,43 +19,75 @@ msgstr "" "Language: sv\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:72 +#: authentication.py:71 msgid "Invalid basic header. No credentials provided." msgstr "Ogiltig \"basic\"-header. Inga användaruppgifter tillhandahölls." -#: authentication.py:75 +#: authentication.py:74 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "Ogiltig \"basic\"-header. Strängen för användaruppgifterna ska inte innehålla mellanslag." -#: authentication.py:81 +#: authentication.py:80 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Ogiltig \"basic\"-header. Användaruppgifterna är inte korrekt base64-kodade." -#: authentication.py:98 +#: authentication.py:97 msgid "Invalid username/password." msgstr "Ogiltigt användarnamn/lösenord." -#: authentication.py:101 authentication.py:188 +#: authentication.py:100 authentication.py:195 msgid "User inactive or deleted." msgstr "Användaren borttagen eller inaktiv." -#: authentication.py:167 +#: authentication.py:173 msgid "Invalid token header. No credentials provided." msgstr "Ogiltig \"token\"-header. Inga användaruppgifter tillhandahölls." -#: authentication.py:170 +#: authentication.py:176 msgid "Invalid token header. Token string should not contain spaces." msgstr "Ogiltig \"token\"-header. Strängen ska inte innehålla mellanslag." -#: authentication.py:176 +#: authentication.py:182 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "Ogiltig \"token\"-header. Strängen ska inte innehålla ogiltiga tecken." -#: authentication.py:185 +#: authentication.py:192 msgid "Invalid token." msgstr "Ogiltig \"token\"." +#: authtoken/apps.py:7 +msgid "Auth Token" +msgstr "" + +#: authtoken/models.py:21 +msgid "Key" +msgstr "" + +#: authtoken/models.py:23 +msgid "User" +msgstr "" + +#: authtoken/models.py:24 +msgid "Created" +msgstr "" + +#: authtoken/models.py:33 +msgid "Token" +msgstr "" + +#: authtoken/models.py:34 +msgid "Tokens" +msgstr "" + +#: authtoken/serializers.py:8 +msgid "Username" +msgstr "" + +#: authtoken/serializers.py:9 +msgid "Password" +msgstr "" + #: authtoken/serializers.py:20 msgid "User account is disabled." msgstr "Användarkontot är borttaget." @@ -110,7 +142,7 @@ msgstr "Medietypen \"{media_type}\" stöds inte." msgid "Request was throttled." msgstr "Förfrågan stoppades eftersom du har skickat för många." -#: fields.py:266 relations.py:195 relations.py:228 validators.py:79 +#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 #: validators.py:162 msgid "This field is required." msgstr "Det här fältet är obligatoriskt." @@ -128,7 +160,7 @@ msgstr "\"{input}\" är inte ett giltigt booleskt värde." msgid "This field may not be blank." msgstr "Det här fältet får inte vara blankt." -#: fields.py:670 fields.py:1656 +#: fields.py:670 fields.py:1664 #, python-brace-format msgid "Ensure this field has no more than {max_length} characters." msgstr "Se till att detta fält inte har fler än {max_length} tecken." @@ -214,137 +246,136 @@ msgstr "Datumtiden har fel format. Använd ett av dessa format istället: {forma msgid "Expected a datetime but got a date." msgstr "Förväntade en datumtid men fick ett datum." -#: fields.py:1079 +#: fields.py:1082 #, python-brace-format msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "Datumet har fel format. Använde ett av dessa format istället: {format}." -#: fields.py:1080 +#: fields.py:1083 msgid "Expected a date but got a datetime." msgstr "Förväntade ett datum men fick en datumtid." -#: fields.py:1148 +#: fields.py:1151 #, python-brace-format msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "Tiden har fel format. Använd ett av dessa format istället: {format}." -#: fields.py:1207 +#: fields.py:1215 #, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "Perioden har fel format. Använd ett av dessa format istället: {format}." -#: fields.py:1232 fields.py:1281 +#: fields.py:1240 fields.py:1289 #, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" är inte ett giltigt val." -#: fields.py:1235 relations.py:62 relations.py:431 +#: fields.py:1243 relations.py:71 relations.py:442 #, python-brace-format msgid "More than {count} items..." msgstr "Fler än {count} objekt..." -#: fields.py:1282 fields.py:1429 relations.py:427 serializers.py:520 +#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 #, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Förväntade en lista med element men fick typen \"{input_type}\"." -#: fields.py:1283 +#: fields.py:1291 msgid "This selection may not be empty." msgstr "Det här valet får inte vara tomt." -#: fields.py:1320 +#: fields.py:1328 #, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "\"{input}\" är inte ett giltigt val för en sökväg." -#: fields.py:1339 +#: fields.py:1347 msgid "No file was submitted." msgstr "Ingen fil skickades." -#: fields.py:1340 +#: fields.py:1348 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "Den skickade informationen var inte en fil. Kontrollera formulärets kodningstyp." -#: fields.py:1341 +#: fields.py:1349 msgid "No filename could be determined." msgstr "Inget filnamn kunde bestämmas." -#: fields.py:1342 +#: fields.py:1350 msgid "The submitted file is empty." msgstr "Den skickade filen var tom." -#: fields.py:1343 +#: fields.py:1351 #, python-brace-format msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "Se till att det här filnamnet har högst {max_length} tecken (det har {length})." -#: fields.py:1391 +#: fields.py:1399 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "Ladda upp en giltig bild. Filen du laddade upp var antingen inte en bild eller en skadad bild." -#: fields.py:1430 relations.py:428 serializers.py:521 +#: fields.py:1438 relations.py:439 serializers.py:521 msgid "This list may not be empty." msgstr "Den här listan får inte vara tom." -#: fields.py:1483 +#: fields.py:1491 #, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "Förväntade en \"dictionary\" med element men fick typen \"{input_type}\"." -#: fields.py:1530 +#: fields.py:1538 msgid "Value must be valid JSON." msgstr "Värdet måste vara giltig JSON." -#: filters.py:35 templates/rest_framework/filters/django_filter.html:5 +#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 msgid "Submit" msgstr "Skicka" #: pagination.py:189 -#, python-brace-format -msgid "Invalid page \"{page_number}\": {message}." -msgstr "Ogiltigt sida \"{page_number}\": {message}." +msgid "Invalid page." +msgstr "" #: pagination.py:407 msgid "Invalid cursor" msgstr "Ogiltig cursor." -#: relations.py:196 +#: relations.py:207 #, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Ogiltigt pk \"{pk_value}\" - Objektet finns inte." -#: relations.py:197 +#: relations.py:208 #, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Felaktig typ. Förväntade pk-värde, fick {data_type}." -#: relations.py:229 +#: relations.py:240 msgid "Invalid hyperlink - No URL match." msgstr "Ogiltig hyperlänk - Ingen URL matchade." -#: relations.py:230 +#: relations.py:241 msgid "Invalid hyperlink - Incorrect URL match." msgstr "Ogiltig hyperlänk - Felaktig URL-matching." -#: relations.py:231 +#: relations.py:242 msgid "Invalid hyperlink - Object does not exist." msgstr "Ogiltig hyperlänk - Objektet finns inte." -#: relations.py:232 +#: relations.py:243 #, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Felaktig typ. Förväntade URL-sträng, fick {data_type}." -#: relations.py:391 +#: relations.py:402 #, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "Objekt med {slug_name}={value} finns inte." -#: relations.py:392 +#: relations.py:403 msgid "Invalid value." msgstr "Ogiltigt värde." diff --git a/rest_framework/locale/tr/LC_MESSAGES/django.mo b/rest_framework/locale/tr/LC_MESSAGES/django.mo index c3412b330afad6bfa535bb4507c7190eb378dae1..70fe0331421c76d4006c21108add5a475071f389 100644 GIT binary patch delta 2010 zcmYk+Z){Ul7{~FaSlii+4OZxcf!r}R6;^CF_lFHe=l(O;hQiop;#i_1jmE|iCNt_y zNO;X+v-k&*5a9(RC@>N<5{+Oqh7b~nafx7%gclM+oF<}?7k+=Y*XT)~e$F}Vz4x5w zoO2KLpYL;jEDlZ^Wtdn-{4&qX#q$sHMfoIbR)(LVgFj#e-p5C9WuDo?*n+x#7)$Y0 zjAIt7@JoCO?_vigAM$iF9 z1!l$AiW<-Ws(-id+o=0}hP9gNJu36*i1WpytO+&4R@8&i*nmfIBi_JPTwZ9l7Dthf zP4T7w9mdCS7L~a`k=bf2#{~A`T6D2nss4z{2K*Db#_ATBEyZ?JdnalJ8PtrjzNh^D z%cvR8p_U}LFn4`9K1#b8V>pHmzJXEv0No&!GgQc~ox>;a0nOI4HL9`P)qqbYM@`C{`ZsL{tLA?Vm!SLtE1#!Ynb*sj-X~fi~8g5=wQ*J+`tm3 zO|%o&;D?yRD>#IK#b!(JS>HXr2e6v{U$>^fG`K3YQlwbqvyrq*Z)U)mYuV;A{iJK1fl z(yQj4|HCS#c+c}lW9}93J;+MbO9g7TS)e;fc4@QR)L&M>%=_Vj=KIi)J$JQ zW#SmJt?Xm0)cLIN)Et!Y1M38qmqI*BCBKKH$WwY2YJ4OX+U z)E+}!_daUCXVJmSSkLqAE|nBkvL&_FyHGcH3$+)%M(y$_hgmakM+Y;gQ!s@A{I}>@ z6|MhbLd(!jbP_zuI|*Rhh%K6l9;%{;sLUgtAvmsH3Y7(AM(eCX=4}hXM7^@rcVl*I zsMKXuz1NO*L%07+zOM)o9Yn7hlp!KT=sX1p((k<=dytuX2VVK>BmQ63)6jyp5_+4c zupS{V>22A$P>s8Tt`=ewp-ibLqntjk=qer$>ALiRkad} zhzAG`t+&UzP@9`Ws#56fD;-Onpuz0va5R{pmd(#wI&&+$KRh#4bUie`E}p1~Cz4LG zp|PeRI~gneucux;M`9(;;OIp9g>k2E{Q1l)dnTRrdo#IO>ZSC{nTho1%y+ToNcKQc LY-U^8x1oOk9pK1k delta 2100 zcmZYAe@xVM9LMoDMt6XUB7z1bUxA{8LyjLpr{IAE(qa5E0xjLy4n~OJ9o3A{{gH-$ z_0Q#+Tg`rK>6*(L=KQ0rf7+tSGWw^DwO0N^jkV=!{o`~!U*G$-+WL(5JwBh$-F-j5 z-k;<1o_BhaKW@rAXOzRlgT$X}%#yfxKQEL8zu9*D8Xa84hjCq&**2`jt=Nb9{tH-) za~Qx6unL#34ewzGwr0B~?JSi}I&NYZx8#@&;t)3C72J(07{Ri&W+9wJz5fw*<1H-1 zo$Jgt;Q(qvBdGq@JTIc2cLN)=RR4N2{;Zi77H1LE3I|XFox&!(ihJ=l+=qc&vuZqv z{Moy_=yO-_QTzq9b9o!gc3>T<{|MIL99CP@f#`FUxv55AoUi&<1C6`bu zTlD-XiQSH1&vG|i~*KZ_OkG8W4m8s*Fss(lr;L%B(w@-&q} zjN@gDUu^vY~-$p%e2_MG_W=mRG6uDq_5}A|DU=t?K zQPBs#!4b?VF*}Nr*o!xjKXV+j77U}#IEgxnPf%I?6KaCl+tc^H9yPIJsH1udHQ+Lm zua?j3sV1$Q3VCK7ScOCBH|z{Lv@fCtSU|3<-NtgfhniR!=kyrvLr%dakO$lA$W66N zs3g9I`u-QF1utT@?!S+xk#DvUl?&ylAHN7{tNKvC3**>~32ettQAhC?YDKvu5SwTv zo-Now`#G$`l-K?W^}V~emGP~BQ5~$tM(n{b&Y`w+0rh}CP&rY-WmdLNqgMVQI`}Q> zHr&Px{HN#`RFnrKzPtJkR9 z;g){S-KkbzaWX)Q8M%A$r1#ERPvIjvi7=s}`_xJtCNc@m$;~t^ogHxRk@l~b_;1nK zD8<_eZKDe3;d6gco=E-dt4j{i)kf%sRS_x&2yUZW_{DaUTZvko?sAV_)jh;B!~oGl z\n" +"POT-Creation-Date: 2016-03-01 18:38+0100\n" +"PO-Revision-Date: 2016-03-01 17:38+0000\n" +"Last-Translator: Xavier Ordoquy \n" "Language-Team: Turkish (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -24,43 +24,75 @@ msgstr "" "Language: tr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: authentication.py:72 +#: authentication.py:71 msgid "Invalid basic header. No credentials provided." msgstr "Geçersiz yetkilendirme başlığı. Gerekli uygunluk kriterleri sağlanmamış." -#: authentication.py:75 +#: authentication.py:74 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "Geçersiz yetkilendirme başlığı. Uygunluk kriterine ait veri boşluk karakteri içermemeli." -#: authentication.py:81 +#: authentication.py:80 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Geçersiz yetkilendirme başlığı. Uygunluk kriterleri base64 formatına uygun olarak kodlanmamış." -#: authentication.py:98 +#: authentication.py:97 msgid "Invalid username/password." msgstr "Geçersiz kullanıcı adı/parola" -#: authentication.py:101 authentication.py:188 +#: authentication.py:100 authentication.py:195 msgid "User inactive or deleted." msgstr "Kullanıcı aktif değil ya da silinmiş." -#: authentication.py:167 +#: authentication.py:173 msgid "Invalid token header. No credentials provided." msgstr "Geçersiz token başlığı. Kimlik bilgileri eksik." -#: authentication.py:170 +#: authentication.py:176 msgid "Invalid token header. Token string should not contain spaces." msgstr "Geçersiz token başlığı. Token'da boşluk olmamalı." -#: authentication.py:176 +#: authentication.py:182 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "Geçersiz token başlığı. Token geçersiz karakter içermemeli." -#: authentication.py:185 +#: authentication.py:192 msgid "Invalid token." msgstr "Geçersiz token." +#: authtoken/apps.py:7 +msgid "Auth Token" +msgstr "" + +#: authtoken/models.py:21 +msgid "Key" +msgstr "" + +#: authtoken/models.py:23 +msgid "User" +msgstr "" + +#: authtoken/models.py:24 +msgid "Created" +msgstr "" + +#: authtoken/models.py:33 +msgid "Token" +msgstr "" + +#: authtoken/models.py:34 +msgid "Tokens" +msgstr "" + +#: authtoken/serializers.py:8 +msgid "Username" +msgstr "" + +#: authtoken/serializers.py:9 +msgid "Password" +msgstr "" + #: authtoken/serializers.py:20 msgid "User account is disabled." msgstr "Kullanıcı hesabı devre dışı bırakılmış." @@ -115,7 +147,7 @@ msgstr "İstekte desteklenmeyen medya tipi: \"{media_type}\"." msgid "Request was throttled." msgstr "Üst üste çok fazla istek yapıldı." -#: fields.py:266 relations.py:195 relations.py:228 validators.py:79 +#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 #: validators.py:162 msgid "This field is required." msgstr "Bu alan zorunlu." @@ -133,7 +165,7 @@ msgstr "\"{input}\" geçerli bir boolean değil." msgid "This field may not be blank." msgstr "Bu alan boş bırakılmamalı." -#: fields.py:670 fields.py:1656 +#: fields.py:670 fields.py:1664 #, python-brace-format msgid "Ensure this field has no more than {max_length} characters." msgstr "Bu alanın {max_length} karakterden fazla karakter barındırmadığından emin olun." @@ -219,137 +251,136 @@ msgstr "Datetime alanı yanlış biçimde. {format} biçimlerinden birini kullan msgid "Expected a datetime but got a date." msgstr "Datetime değeri bekleniyor, ama date değeri geldi." -#: fields.py:1079 +#: fields.py:1082 #, python-brace-format msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "Tarih biçimi yanlış. {format} biçimlerinden birini kullanın." -#: fields.py:1080 +#: fields.py:1083 msgid "Expected a date but got a datetime." msgstr "Date tipi beklenmekteydi, fakat datetime tipi geldi." -#: fields.py:1148 +#: fields.py:1151 #, python-brace-format msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "Time biçimi yanlış. {format} biçimlerinden birini kullanın." -#: fields.py:1207 +#: fields.py:1215 #, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "Duration biçimi yanlış. {format} biçimlerinden birini kullanın." -#: fields.py:1232 fields.py:1281 +#: fields.py:1240 fields.py:1289 #, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" geçerli bir seçim değil." -#: fields.py:1235 relations.py:62 relations.py:431 +#: fields.py:1243 relations.py:71 relations.py:442 #, python-brace-format msgid "More than {count} items..." msgstr "{count} elemandan daha fazla..." -#: fields.py:1282 fields.py:1429 relations.py:427 serializers.py:520 +#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 #, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Elemanların listesi beklenirken \"{input_type}\" alındı." -#: fields.py:1283 +#: fields.py:1291 msgid "This selection may not be empty." msgstr "Bu seçim boş bırakılmamalı." -#: fields.py:1320 +#: fields.py:1328 #, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "\"{input}\" geçerli bir yol seçimi değil." -#: fields.py:1339 +#: fields.py:1347 msgid "No file was submitted." msgstr "Hiçbir dosya verilmedi." -#: fields.py:1340 +#: fields.py:1348 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "Gönderilen veri dosya değil. Formdaki kodlama tipini kontrol edin." -#: fields.py:1341 +#: fields.py:1349 msgid "No filename could be determined." msgstr "Hiçbir dosya adı belirlenemedi." -#: fields.py:1342 +#: fields.py:1350 msgid "The submitted file is empty." msgstr "Gönderilen dosya boş." -#: fields.py:1343 +#: fields.py:1351 #, python-brace-format msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "Bu dosya adının en fazla {max_length} karakter uzunluğunda olduğundan emin olun. (şu anda {length} karakter)." -#: fields.py:1391 +#: fields.py:1399 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "Geçerli bir resim yükleyin. Yüklediğiniz dosya resim değil ya da bozuk." -#: fields.py:1430 relations.py:428 serializers.py:521 +#: fields.py:1438 relations.py:439 serializers.py:521 msgid "This list may not be empty." msgstr "Bu liste boş olmamalı." -#: fields.py:1483 +#: fields.py:1491 #, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "Sözlük tipi bir değişken beklenirken \"{input_type}\" tipi bir değişken alındı." -#: fields.py:1530 +#: fields.py:1538 msgid "Value must be valid JSON." msgstr "Değer geçerli bir JSON olmalı" -#: filters.py:35 templates/rest_framework/filters/django_filter.html:5 +#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 msgid "Submit" msgstr "Gönder" #: pagination.py:189 -#, python-brace-format -msgid "Invalid page \"{page_number}\": {message}." -msgstr "Geçersiz sayfa \"{page_number}\":{message}." +msgid "Invalid page." +msgstr "" #: pagination.py:407 msgid "Invalid cursor" msgstr "Sayfalandırma imleci geçersiz" -#: relations.py:196 +#: relations.py:207 #, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Geçersiz pk \"{pk_value}\" - obje bulunamadı." -#: relations.py:197 +#: relations.py:208 #, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Hatalı tip. Pk değeri beklenirken, alınan {data_type}." -#: relations.py:229 +#: relations.py:240 msgid "Invalid hyperlink - No URL match." msgstr "Geçersiz bağlantı - Hiçbir URL eşleşmedi." -#: relations.py:230 +#: relations.py:241 msgid "Invalid hyperlink - Incorrect URL match." msgstr "Geçersiz bağlantı - Yanlış URL eşleşmesi." -#: relations.py:231 +#: relations.py:242 msgid "Invalid hyperlink - Object does not exist." msgstr "Geçersiz bağlantı - Obje bulunamadı." -#: relations.py:232 +#: relations.py:243 #, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Hatalı tip. URL metni bekleniyor, {data_type} alındı." -#: relations.py:391 +#: relations.py:402 #, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "{slug_name}={value} değerini taşıyan obje bulunamadı." -#: relations.py:392 +#: relations.py:403 msgid "Invalid value." msgstr "Geçersiz değer." diff --git a/rest_framework/locale/tr_TR/LC_MESSAGES/django.mo b/rest_framework/locale/tr_TR/LC_MESSAGES/django.mo index 1d3475bb273c9669249a5d57c620a3730379cb67..5d4511a4f2b3e5ef48ae9d8a5ada9739c4ac5e34 100644 GIT binary patch delta 44 qcmeC>@8#d{ftlA#*T7iUz)-=^!phiU@?U0Ygors%WV0$u1~UK(xC-t7 delta 44 rcmeC>@8#d{ftlA-*U(7Uz+A!5!phWm@?U0YgowG7sp)1_mJDV93pNV$ diff --git a/rest_framework/locale/tr_TR/LC_MESSAGES/django.po b/rest_framework/locale/tr_TR/LC_MESSAGES/django.po index a5f7d420b..9ead5da4a 100644 --- a/rest_framework/locale/tr_TR/LC_MESSAGES/django.po +++ b/rest_framework/locale/tr_TR/LC_MESSAGES/django.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-07 18:53+0100\n" -"PO-Revision-Date: 2015-12-07 17:55+0000\n" +"POT-Creation-Date: 2016-03-01 18:38+0100\n" +"PO-Revision-Date: 2016-03-01 17:38+0000\n" "Last-Translator: Xavier Ordoquy \n" "Language-Team: Turkish (Turkey) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/tr_TR/)\n" "MIME-Version: 1.0\n" @@ -18,43 +18,75 @@ msgstr "" "Language: tr_TR\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: authentication.py:72 +#: authentication.py:71 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:75 +#: authentication.py:74 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:81 +#: authentication.py:80 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:98 +#: authentication.py:97 msgid "Invalid username/password." msgstr "Geçersiz kullanıcı adı / şifre." -#: authentication.py:101 authentication.py:188 +#: authentication.py:100 authentication.py:195 msgid "User inactive or deleted." msgstr "" -#: authentication.py:167 +#: authentication.py:173 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:170 +#: authentication.py:176 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:176 +#: authentication.py:182 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:185 +#: authentication.py:192 msgid "Invalid token." msgstr "Geçersiz simge." +#: authtoken/apps.py:7 +msgid "Auth Token" +msgstr "" + +#: authtoken/models.py:21 +msgid "Key" +msgstr "" + +#: authtoken/models.py:23 +msgid "User" +msgstr "" + +#: authtoken/models.py:24 +msgid "Created" +msgstr "" + +#: authtoken/models.py:33 +msgid "Token" +msgstr "" + +#: authtoken/models.py:34 +msgid "Tokens" +msgstr "" + +#: authtoken/serializers.py:8 +msgid "Username" +msgstr "" + +#: authtoken/serializers.py:9 +msgid "Password" +msgstr "" + #: authtoken/serializers.py:20 msgid "User account is disabled." msgstr "" @@ -109,7 +141,7 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:266 relations.py:195 relations.py:228 validators.py:79 +#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 #: validators.py:162 msgid "This field is required." msgstr "" @@ -127,7 +159,7 @@ msgstr "" msgid "This field may not be blank." msgstr "" -#: fields.py:670 fields.py:1656 +#: fields.py:670 fields.py:1664 #, python-brace-format msgid "Ensure this field has no more than {max_length} characters." msgstr "" @@ -213,137 +245,136 @@ msgstr "" msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1079 +#: fields.py:1082 #, python-brace-format msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1080 +#: fields.py:1083 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1148 +#: fields.py:1151 #, python-brace-format msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1207 +#: fields.py:1215 #, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1232 fields.py:1281 +#: fields.py:1240 fields.py:1289 #, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "" -#: fields.py:1235 relations.py:62 relations.py:431 +#: fields.py:1243 relations.py:71 relations.py:442 #, python-brace-format msgid "More than {count} items..." msgstr "" -#: fields.py:1282 fields.py:1429 relations.py:427 serializers.py:520 +#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 #, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1283 +#: fields.py:1291 msgid "This selection may not be empty." msgstr "" -#: fields.py:1320 +#: fields.py:1328 #, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1339 +#: fields.py:1347 msgid "No file was submitted." msgstr "" -#: fields.py:1340 +#: fields.py:1348 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1341 +#: fields.py:1349 msgid "No filename could be determined." msgstr "" -#: fields.py:1342 +#: fields.py:1350 msgid "The submitted file is empty." msgstr "" -#: fields.py:1343 +#: fields.py:1351 #, python-brace-format msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1391 +#: fields.py:1399 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: fields.py:1430 relations.py:428 serializers.py:521 +#: fields.py:1438 relations.py:439 serializers.py:521 msgid "This list may not be empty." msgstr "" -#: fields.py:1483 +#: fields.py:1491 #, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1530 +#: fields.py:1538 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html:5 +#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 msgid "Submit" msgstr "" #: pagination.py:189 -#, python-brace-format -msgid "Invalid page \"{page_number}\": {message}." +msgid "Invalid page." msgstr "" #: pagination.py:407 msgid "Invalid cursor" msgstr "Geçersiz imleç." -#: relations.py:196 +#: relations.py:207 #, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" -#: relations.py:197 +#: relations.py:208 #, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" -#: relations.py:229 +#: relations.py:240 msgid "Invalid hyperlink - No URL match." msgstr "Geçersiz hyper link - URL maçı yok." -#: relations.py:230 +#: relations.py:241 msgid "Invalid hyperlink - Incorrect URL match." msgstr "Geçersiz hyper link - Yanlış URL maçı." -#: relations.py:231 +#: relations.py:242 msgid "Invalid hyperlink - Object does not exist." msgstr "Geçersiz hyper link - Nesne yok.." -#: relations.py:232 +#: relations.py:243 #, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:391 +#: relations.py:402 #, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:392 +#: relations.py:403 msgid "Invalid value." msgstr "Geçersiz değer." diff --git a/rest_framework/locale/uk/LC_MESSAGES/django.mo b/rest_framework/locale/uk/LC_MESSAGES/django.mo index 7af39663903d2da845740b0073b6508f19ca6236..79396f543536eb6d2a2bb3842c62d7733c575cad 100644 GIT binary patch delta 41 ncmX@da*k!f1YR>;17lqSLj^+%D`Sg^bEOdi=0JgsM>`n-?&b?C delta 41 pcmX@da*k!f1YT2JLnB=Sa|J^SD^uf%bEOdi=2oVr8;^D}0s!w^3o!ry diff --git a/rest_framework/locale/uk/LC_MESSAGES/django.po b/rest_framework/locale/uk/LC_MESSAGES/django.po index cbf1b0f2f..0e3c82802 100644 --- a/rest_framework/locale/uk/LC_MESSAGES/django.po +++ b/rest_framework/locale/uk/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-07 18:53+0100\n" -"PO-Revision-Date: 2015-12-07 17:55+0000\n" +"POT-Creation-Date: 2016-03-01 18:38+0100\n" +"PO-Revision-Date: 2016-03-01 17:38+0000\n" "Last-Translator: Xavier Ordoquy \n" "Language-Team: Ukrainian (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/uk/)\n" "MIME-Version: 1.0\n" @@ -17,43 +17,75 @@ msgstr "" "Language: uk\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: authentication.py:72 +#: authentication.py:71 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:75 +#: authentication.py:74 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:81 +#: authentication.py:80 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:98 +#: authentication.py:97 msgid "Invalid username/password." msgstr "" -#: authentication.py:101 authentication.py:188 +#: authentication.py:100 authentication.py:195 msgid "User inactive or deleted." msgstr "" -#: authentication.py:167 +#: authentication.py:173 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:170 +#: authentication.py:176 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:176 +#: authentication.py:182 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:185 +#: authentication.py:192 msgid "Invalid token." msgstr "" +#: authtoken/apps.py:7 +msgid "Auth Token" +msgstr "" + +#: authtoken/models.py:21 +msgid "Key" +msgstr "" + +#: authtoken/models.py:23 +msgid "User" +msgstr "" + +#: authtoken/models.py:24 +msgid "Created" +msgstr "" + +#: authtoken/models.py:33 +msgid "Token" +msgstr "" + +#: authtoken/models.py:34 +msgid "Tokens" +msgstr "" + +#: authtoken/serializers.py:8 +msgid "Username" +msgstr "" + +#: authtoken/serializers.py:9 +msgid "Password" +msgstr "" + #: authtoken/serializers.py:20 msgid "User account is disabled." msgstr "" @@ -108,7 +140,7 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:266 relations.py:195 relations.py:228 validators.py:79 +#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 #: validators.py:162 msgid "This field is required." msgstr "" @@ -126,7 +158,7 @@ msgstr "" msgid "This field may not be blank." msgstr "" -#: fields.py:670 fields.py:1656 +#: fields.py:670 fields.py:1664 #, python-brace-format msgid "Ensure this field has no more than {max_length} characters." msgstr "" @@ -212,137 +244,136 @@ msgstr "" msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1079 +#: fields.py:1082 #, python-brace-format msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1080 +#: fields.py:1083 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1148 +#: fields.py:1151 #, python-brace-format msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1207 +#: fields.py:1215 #, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1232 fields.py:1281 +#: fields.py:1240 fields.py:1289 #, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "" -#: fields.py:1235 relations.py:62 relations.py:431 +#: fields.py:1243 relations.py:71 relations.py:442 #, python-brace-format msgid "More than {count} items..." msgstr "" -#: fields.py:1282 fields.py:1429 relations.py:427 serializers.py:520 +#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 #, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1283 +#: fields.py:1291 msgid "This selection may not be empty." msgstr "" -#: fields.py:1320 +#: fields.py:1328 #, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1339 +#: fields.py:1347 msgid "No file was submitted." msgstr "" -#: fields.py:1340 +#: fields.py:1348 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1341 +#: fields.py:1349 msgid "No filename could be determined." msgstr "" -#: fields.py:1342 +#: fields.py:1350 msgid "The submitted file is empty." msgstr "" -#: fields.py:1343 +#: fields.py:1351 #, python-brace-format msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1391 +#: fields.py:1399 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: fields.py:1430 relations.py:428 serializers.py:521 +#: fields.py:1438 relations.py:439 serializers.py:521 msgid "This list may not be empty." msgstr "" -#: fields.py:1483 +#: fields.py:1491 #, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1530 +#: fields.py:1538 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html:5 +#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 msgid "Submit" msgstr "" #: pagination.py:189 -#, python-brace-format -msgid "Invalid page \"{page_number}\": {message}." +msgid "Invalid page." msgstr "" #: pagination.py:407 msgid "Invalid cursor" msgstr "" -#: relations.py:196 +#: relations.py:207 #, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" -#: relations.py:197 +#: relations.py:208 #, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" -#: relations.py:229 +#: relations.py:240 msgid "Invalid hyperlink - No URL match." msgstr "" -#: relations.py:230 +#: relations.py:241 msgid "Invalid hyperlink - Incorrect URL match." msgstr "" -#: relations.py:231 +#: relations.py:242 msgid "Invalid hyperlink - Object does not exist." msgstr "" -#: relations.py:232 +#: relations.py:243 #, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:391 +#: relations.py:402 #, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:392 +#: relations.py:403 msgid "Invalid value." msgstr "" diff --git a/rest_framework/locale/vi/LC_MESSAGES/django.mo b/rest_framework/locale/vi/LC_MESSAGES/django.mo index 0be6ed259ca6319ac2213a93cc2cff7c1d55bcb0..a055d763a364964c42cb63ea396a2ada7557adaf 100644 GIT binary patch delta 41 ncmeyz{EvCU1YR>;17lqSLj^+%D`Sg^bEOdi=0JgsM=cov{P+tw delta 41 pcmeyz{EvCU1YT2JLnB=Sa|J^SD^uf%bEOdi=2oVr8;@Et0s#GP3qJq= diff --git a/rest_framework/locale/vi/LC_MESSAGES/django.po b/rest_framework/locale/vi/LC_MESSAGES/django.po index 8d0e5d3d3..0f8415b51 100644 --- a/rest_framework/locale/vi/LC_MESSAGES/django.po +++ b/rest_framework/locale/vi/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-07 18:53+0100\n" -"PO-Revision-Date: 2015-12-07 17:55+0000\n" +"POT-Creation-Date: 2016-03-01 18:38+0100\n" +"PO-Revision-Date: 2016-03-01 17:38+0000\n" "Last-Translator: Xavier Ordoquy \n" "Language-Team: Vietnamese (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/vi/)\n" "MIME-Version: 1.0\n" @@ -17,43 +17,75 @@ msgstr "" "Language: vi\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: authentication.py:72 +#: authentication.py:71 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:75 +#: authentication.py:74 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:81 +#: authentication.py:80 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:98 +#: authentication.py:97 msgid "Invalid username/password." msgstr "" -#: authentication.py:101 authentication.py:188 +#: authentication.py:100 authentication.py:195 msgid "User inactive or deleted." msgstr "" -#: authentication.py:167 +#: authentication.py:173 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:170 +#: authentication.py:176 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:176 +#: authentication.py:182 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:185 +#: authentication.py:192 msgid "Invalid token." msgstr "" +#: authtoken/apps.py:7 +msgid "Auth Token" +msgstr "" + +#: authtoken/models.py:21 +msgid "Key" +msgstr "" + +#: authtoken/models.py:23 +msgid "User" +msgstr "" + +#: authtoken/models.py:24 +msgid "Created" +msgstr "" + +#: authtoken/models.py:33 +msgid "Token" +msgstr "" + +#: authtoken/models.py:34 +msgid "Tokens" +msgstr "" + +#: authtoken/serializers.py:8 +msgid "Username" +msgstr "" + +#: authtoken/serializers.py:9 +msgid "Password" +msgstr "" + #: authtoken/serializers.py:20 msgid "User account is disabled." msgstr "" @@ -108,7 +140,7 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:266 relations.py:195 relations.py:228 validators.py:79 +#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 #: validators.py:162 msgid "This field is required." msgstr "" @@ -126,7 +158,7 @@ msgstr "" msgid "This field may not be blank." msgstr "" -#: fields.py:670 fields.py:1656 +#: fields.py:670 fields.py:1664 #, python-brace-format msgid "Ensure this field has no more than {max_length} characters." msgstr "" @@ -212,137 +244,136 @@ msgstr "" msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1079 +#: fields.py:1082 #, python-brace-format msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1080 +#: fields.py:1083 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1148 +#: fields.py:1151 #, python-brace-format msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1207 +#: fields.py:1215 #, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1232 fields.py:1281 +#: fields.py:1240 fields.py:1289 #, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "" -#: fields.py:1235 relations.py:62 relations.py:431 +#: fields.py:1243 relations.py:71 relations.py:442 #, python-brace-format msgid "More than {count} items..." msgstr "" -#: fields.py:1282 fields.py:1429 relations.py:427 serializers.py:520 +#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 #, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1283 +#: fields.py:1291 msgid "This selection may not be empty." msgstr "" -#: fields.py:1320 +#: fields.py:1328 #, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1339 +#: fields.py:1347 msgid "No file was submitted." msgstr "" -#: fields.py:1340 +#: fields.py:1348 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1341 +#: fields.py:1349 msgid "No filename could be determined." msgstr "" -#: fields.py:1342 +#: fields.py:1350 msgid "The submitted file is empty." msgstr "" -#: fields.py:1343 +#: fields.py:1351 #, python-brace-format msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1391 +#: fields.py:1399 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: fields.py:1430 relations.py:428 serializers.py:521 +#: fields.py:1438 relations.py:439 serializers.py:521 msgid "This list may not be empty." msgstr "" -#: fields.py:1483 +#: fields.py:1491 #, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1530 +#: fields.py:1538 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html:5 +#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 msgid "Submit" msgstr "" #: pagination.py:189 -#, python-brace-format -msgid "Invalid page \"{page_number}\": {message}." +msgid "Invalid page." msgstr "" #: pagination.py:407 msgid "Invalid cursor" msgstr "" -#: relations.py:196 +#: relations.py:207 #, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" -#: relations.py:197 +#: relations.py:208 #, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" -#: relations.py:229 +#: relations.py:240 msgid "Invalid hyperlink - No URL match." msgstr "" -#: relations.py:230 +#: relations.py:241 msgid "Invalid hyperlink - Incorrect URL match." msgstr "" -#: relations.py:231 +#: relations.py:242 msgid "Invalid hyperlink - Object does not exist." msgstr "" -#: relations.py:232 +#: relations.py:243 #, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:391 +#: relations.py:402 #, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:392 +#: relations.py:403 msgid "Invalid value." msgstr "" diff --git a/rest_framework/locale/zh-Hans/LC_MESSAGES/django.mo b/rest_framework/locale/zh-Hans/LC_MESSAGES/django.mo index 892ed14940ab9937a1ee281502a20c3cdc19317d..cffdae362001044baa09a3a24b87ea50bab071ad 100644 GIT binary patch delta 2006 zcmYM!Z%EZw9LMpmcDpw%wX|I;*Zh^*w!F8lTIMv(Qd^~_&SmC^61L!$bg}3k6h9b? zJ&0Iv8G|iqt?18_XuG37Bt#L>lZXW?w^dLK_M|PU2W_X9box{0!1=%KhihA%%)C2PA1hE2( zG2;5I7^B~g+RELiiC#rr_rUf4LFGo6x7T8I5%Jd^#@)aX)XGOu7d}G|3nphK7DFY` zdaT5wScNxn4Q9PzHWfc|ZgYNt)r_CQ+gWCJ@m>0RQ?eW9;dfY%cd!u)J+m(CMxt%sB9E}MsOSESY=LhNY3Lsl zn4YY}a$JGrizQGm`V@(xokT_G3KA51<}8?*xxNy|Fy4fE(Gt`IyHLsd87eaSaEi|V zH#Btae?-l61a;vptifNf4f9A0Z9%Vd$hjBUJv)So+y&=j)ZSOH8r|2Adj2qK;-6zV z@3*5gn(#U*2}3Mbr=l7^#Eqy2TtXIWqsXQ9!dW_t#HIg#(WF(hO1-d-+D6sUB(S=l0Cr^KSEER9R+>4`w!pd zS4FX1N>!Swtf4kjmF@v5VM~7>+mV%}vybDM&L((O7Sd8`w@~#pQ6YhX=}l-&J_*+N zs~K8M)sfWqLZySM?NZU#buLxWR`RMS6;v9iebf)sq2y+;ZYRlWlc{5<+Rpc=I$4vb z972_R8_Vx1s!OJx!%Fxe-W9)M*si- delta 2103 zcmY+^e@vBC9LMpmc)1q{MMSO&1y?jn;Nrbp2)KxX;jh4qP|_saZMzu-+ytC!j;>{n z{&B5c`@<&qt66JJS43;A=0E*mi|MRZ%eA&xMa)tC(I0Kj*8B6^r(b8B`#R_FJkL4j zd%n-}N&AKE$?q0>UNy>I>YdczGt81WmB|m~iqC8Xeu@FSiFademRSi_<1*|(-TxF8 z<0uC4JXYd$+=zeTW^BoJOxjB{wlHuFn{jE5Sr_icI=qC9ID>7t@(!~oCQ$!>3)^uT zSK``Sv&GnnTF?`y@uRM9pq}>`)@rN11!nwN6F+Ru+E6>}L{0Q8*5iA)0q5|33@$XQ z!UM>ko#98NiKj-#OqIU8o zYG+ffv+lSzKfUvE)X_Ad?(fEX@DTd(GzRc}Ocv1inuZ5&B2l*Aa4p_Kj>{^Dr$So8 zj~=iEz1V|GG4A$9Fhu`F)R9i27J3_XT@jP1UyaI<9Rfb=EJby|0 z!b%L#--=pTFDjW%Vg-JSVazHt+k;VDjwf6%x?aI*#;5VxJhMVS@n6Hhk1S82%_Eha zvqJTIP%C`_71D9H|FPTu23Irw2d>9bW^KhDd;rg*j`SDQ#Fgwy*X=_k;ds(*+`wH7 z_?b;1>~kH%N9kY1N?b$yn9I6Q$(6t$zT$cr^?J?WgIIGHo5G{W3uY1+uz{^;RUm$#%IOKwWQt7GBk7A&ALWOVjKgCN+UyEjUMCsl_-AnaQ38#};?a0oYEY;WKA?kmNvP>!7 zN>#X2$S|+-McI`4-Wy5oW@sa|jao@n*-mwi3;AL@Z(luDQB{-*D(k3^P&=tg zM;a%0m(ZS1)oDhl+o*g)osS+Yv`l`xs2iwzQfGYy9(}e_w|qqtpZkvaN@DxtfwIHT zz`lWl{g1~7N6Mms!~OB0A%;dK+Vf_-3u=Sm>R_lY5U!8bMpDiG;wEP#91esc(NLr! zM9FE74Gjl(4#ozC`eMV0!D!&gg9F3y!4UVYI}{%njwR|En)mm|diy3$`?IrG&z_x} b9Xl78K62`Rvriux`}L#O{$0R$=>_j!^~2`) diff --git a/rest_framework/locale/zh-Hans/LC_MESSAGES/django.po b/rest_framework/locale/zh-Hans/LC_MESSAGES/django.po index 983ff1ba0..8a0f67382 100644 --- a/rest_framework/locale/zh-Hans/LC_MESSAGES/django.po +++ b/rest_framework/locale/zh-Hans/LC_MESSAGES/django.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-07 18:53+0100\n" -"PO-Revision-Date: 2015-12-11 03:03+0000\n" -"Last-Translator: hunter007 \n" +"POT-Creation-Date: 2016-03-01 18:38+0100\n" +"PO-Revision-Date: 2016-03-01 17:38+0000\n" +"Last-Translator: Xavier Ordoquy \n" "Language-Team: Chinese Simplified (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/zh-Hans/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,43 +20,75 @@ msgstr "" "Language: zh-Hans\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: authentication.py:72 +#: authentication.py:71 msgid "Invalid basic header. No credentials provided." msgstr "无效的Basic认证头，没有提供认证信息。" -#: authentication.py:75 +#: authentication.py:74 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "认证字符串不应该包含空格（基本认证HTTP头无效）。" -#: authentication.py:81 +#: authentication.py:80 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "认证字符串base64编码错误（基本认证HTTP头无效）。" -#: authentication.py:98 +#: authentication.py:97 msgid "Invalid username/password." msgstr "用户名或者密码错误。" -#: authentication.py:101 authentication.py:188 +#: authentication.py:100 authentication.py:195 msgid "User inactive or deleted." msgstr "用户未激活或者已删除。" -#: authentication.py:167 +#: authentication.py:173 msgid "Invalid token header. No credentials provided." msgstr "没有提供认证信息（认证令牌HTTP头无效）。" -#: authentication.py:170 +#: authentication.py:176 msgid "Invalid token header. Token string should not contain spaces." msgstr "认证令牌字符串不应该包含空格（无效的认证令牌HTTP头）。" -#: authentication.py:176 +#: authentication.py:182 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "无效的Token。Token字符串不能包含非法的字符。" -#: authentication.py:185 +#: authentication.py:192 msgid "Invalid token." msgstr "认证令牌无效。" +#: authtoken/apps.py:7 +msgid "Auth Token" +msgstr "" + +#: authtoken/models.py:21 +msgid "Key" +msgstr "" + +#: authtoken/models.py:23 +msgid "User" +msgstr "" + +#: authtoken/models.py:24 +msgid "Created" +msgstr "" + +#: authtoken/models.py:33 +msgid "Token" +msgstr "" + +#: authtoken/models.py:34 +msgid "Tokens" +msgstr "" + +#: authtoken/serializers.py:8 +msgid "Username" +msgstr "" + +#: authtoken/serializers.py:9 +msgid "Password" +msgstr "" + #: authtoken/serializers.py:20 msgid "User account is disabled." msgstr "用户账户已禁用。" @@ -111,7 +143,7 @@ msgstr "不支持请求中的媒体类型 “{media_type}”。" msgid "Request was throttled." msgstr "请求超过了限速。" -#: fields.py:266 relations.py:195 relations.py:228 validators.py:79 +#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 #: validators.py:162 msgid "This field is required." msgstr "该字段是必填项。" @@ -129,7 +161,7 @@ msgstr "“{input}” 不是合法的布尔值。" msgid "This field may not be blank." msgstr "该字段不能为空。" -#: fields.py:670 fields.py:1656 +#: fields.py:670 fields.py:1664 #, python-brace-format msgid "Ensure this field has no more than {max_length} characters." msgstr "请确保这个字段不能超过 {max_length} 个字符。" @@ -215,137 +247,136 @@ msgstr "日期时间格式错误。请从这些格式中选择：{format}。" msgid "Expected a datetime but got a date." msgstr "期望为日期时间，获得的是日期。" -#: fields.py:1079 +#: fields.py:1082 #, python-brace-format msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "日期格式错误。请从这些格式中选择：{format}。" -#: fields.py:1080 +#: fields.py:1083 msgid "Expected a date but got a datetime." msgstr "期望为日期，获得的是日期时间。" -#: fields.py:1148 +#: fields.py:1151 #, python-brace-format msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "时间格式错误。请从这些格式中选择：{format}。" -#: fields.py:1207 +#: fields.py:1215 #, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "持续时间的格式错误。使用这些格式中的一个：{format}。" -#: fields.py:1232 fields.py:1281 +#: fields.py:1240 fields.py:1289 #, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "“{input}” 不是合法选项。" -#: fields.py:1235 relations.py:62 relations.py:431 +#: fields.py:1243 relations.py:71 relations.py:442 #, python-brace-format msgid "More than {count} items..." msgstr "多于{count}条记录。" -#: fields.py:1282 fields.py:1429 relations.py:427 serializers.py:520 +#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 #, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." msgstr "期望为一个包含物件的列表，得到的类型是“{input_type}”。" -#: fields.py:1283 +#: fields.py:1291 msgid "This selection may not be empty." msgstr "这项选择不能为空。" -#: fields.py:1320 +#: fields.py:1328 #, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "\"{input}\"不是一个有效路径选项。" -#: fields.py:1339 +#: fields.py:1347 msgid "No file was submitted." msgstr "没有提交任何文件。" -#: fields.py:1340 +#: fields.py:1348 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "提交的数据不是一个文件。请检查表单的编码类型。" -#: fields.py:1341 +#: fields.py:1349 msgid "No filename could be determined." msgstr "无法检测到文件名。" -#: fields.py:1342 +#: fields.py:1350 msgid "The submitted file is empty." msgstr "提交的是空文件。" -#: fields.py:1343 +#: fields.py:1351 #, python-brace-format msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "确保该文件名最多包含 {max_length} 个字符 ( 当前长度为{length} ) 。" -#: fields.py:1391 +#: fields.py:1399 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "请上传有效图片。您上传的该文件不是图片或者图片已经损坏。" -#: fields.py:1430 relations.py:428 serializers.py:521 +#: fields.py:1438 relations.py:439 serializers.py:521 msgid "This list may not be empty." msgstr "列表不能为空。" -#: fields.py:1483 +#: fields.py:1491 #, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "期望是包含类目的字典，得到类型为 “{input_type}”。" -#: fields.py:1530 +#: fields.py:1538 msgid "Value must be valid JSON." msgstr "值必须是有效的 JSON 数据。" -#: filters.py:35 templates/rest_framework/filters/django_filter.html:5 +#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 msgid "Submit" msgstr "提交" #: pagination.py:189 -#, python-brace-format -msgid "Invalid page \"{page_number}\": {message}." -msgstr "无效页面 “{page_number}”：{message}。" +msgid "Invalid page." +msgstr "" #: pagination.py:407 msgid "Invalid cursor" msgstr "无效游标" -#: relations.py:196 +#: relations.py:207 #, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "无效主键 “{pk_value}” － 对象不存在。" -#: relations.py:197 +#: relations.py:208 #, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "类型错误。期望为主键，获得的类型为 {data_type}。" -#: relations.py:229 +#: relations.py:240 msgid "Invalid hyperlink - No URL match." msgstr "无效超链接 －没有匹配的URL。" -#: relations.py:230 +#: relations.py:241 msgid "Invalid hyperlink - Incorrect URL match." msgstr "无效超链接 －错误的URL匹配。" -#: relations.py:231 +#: relations.py:242 msgid "Invalid hyperlink - Object does not exist." msgstr "无效超链接 －对象不存在。" -#: relations.py:232 +#: relations.py:243 #, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "类型错误。期望为URL字符串，实际的类型是 {data_type}。" -#: relations.py:391 +#: relations.py:402 #, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "属性 {slug_name} 为 {value} 的对象不存在。" -#: relations.py:392 +#: relations.py:403 msgid "Invalid value." msgstr "无效值。" diff --git a/rest_framework/locale/zh-Hant/LC_MESSAGES/django.mo b/rest_framework/locale/zh-Hant/LC_MESSAGES/django.mo index 0e9d3a3370df531ef82d539da31f1d2f99af8d03..d33604524b1bd71b84486a858d72aeb44b7f192c 100644 GIT binary patch delta 41 ncmbQpGLdD%1YR>;17lqSLj^+%D`Sg^bEOdi=0JgsM|~Ip+gu8C delta 41 pcmbQpGLdD%1YT2JLnB=Sa|J^SD^uf%bEOdi=2oVr8;|-h0s!063VHwl diff --git a/rest_framework/locale/zh-Hant/LC_MESSAGES/django.po b/rest_framework/locale/zh-Hant/LC_MESSAGES/django.po index a04ed527a..ea6a45312 100644 --- a/rest_framework/locale/zh-Hant/LC_MESSAGES/django.po +++ b/rest_framework/locale/zh-Hant/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-07 18:53+0100\n" -"PO-Revision-Date: 2015-12-07 17:55+0000\n" +"POT-Creation-Date: 2016-03-01 18:38+0100\n" +"PO-Revision-Date: 2016-03-01 17:38+0000\n" "Last-Translator: Xavier Ordoquy \n" "Language-Team: Chinese Traditional (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/zh-Hant/)\n" "MIME-Version: 1.0\n" @@ -17,43 +17,75 @@ msgstr "" "Language: zh-Hant\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: authentication.py:72 +#: authentication.py:71 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:75 +#: authentication.py:74 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:81 +#: authentication.py:80 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:98 +#: authentication.py:97 msgid "Invalid username/password." msgstr "" -#: authentication.py:101 authentication.py:188 +#: authentication.py:100 authentication.py:195 msgid "User inactive or deleted." msgstr "" -#: authentication.py:167 +#: authentication.py:173 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:170 +#: authentication.py:176 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:176 +#: authentication.py:182 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:185 +#: authentication.py:192 msgid "Invalid token." msgstr "" +#: authtoken/apps.py:7 +msgid "Auth Token" +msgstr "" + +#: authtoken/models.py:21 +msgid "Key" +msgstr "" + +#: authtoken/models.py:23 +msgid "User" +msgstr "" + +#: authtoken/models.py:24 +msgid "Created" +msgstr "" + +#: authtoken/models.py:33 +msgid "Token" +msgstr "" + +#: authtoken/models.py:34 +msgid "Tokens" +msgstr "" + +#: authtoken/serializers.py:8 +msgid "Username" +msgstr "" + +#: authtoken/serializers.py:9 +msgid "Password" +msgstr "" + #: authtoken/serializers.py:20 msgid "User account is disabled." msgstr "" @@ -108,7 +140,7 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:266 relations.py:195 relations.py:228 validators.py:79 +#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 #: validators.py:162 msgid "This field is required." msgstr "" @@ -126,7 +158,7 @@ msgstr "" msgid "This field may not be blank." msgstr "" -#: fields.py:670 fields.py:1656 +#: fields.py:670 fields.py:1664 #, python-brace-format msgid "Ensure this field has no more than {max_length} characters." msgstr "" @@ -212,137 +244,136 @@ msgstr "" msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1079 +#: fields.py:1082 #, python-brace-format msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1080 +#: fields.py:1083 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1148 +#: fields.py:1151 #, python-brace-format msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1207 +#: fields.py:1215 #, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1232 fields.py:1281 +#: fields.py:1240 fields.py:1289 #, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "" -#: fields.py:1235 relations.py:62 relations.py:431 +#: fields.py:1243 relations.py:71 relations.py:442 #, python-brace-format msgid "More than {count} items..." msgstr "" -#: fields.py:1282 fields.py:1429 relations.py:427 serializers.py:520 +#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 #, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1283 +#: fields.py:1291 msgid "This selection may not be empty." msgstr "" -#: fields.py:1320 +#: fields.py:1328 #, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1339 +#: fields.py:1347 msgid "No file was submitted." msgstr "" -#: fields.py:1340 +#: fields.py:1348 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1341 +#: fields.py:1349 msgid "No filename could be determined." msgstr "" -#: fields.py:1342 +#: fields.py:1350 msgid "The submitted file is empty." msgstr "" -#: fields.py:1343 +#: fields.py:1351 #, python-brace-format msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1391 +#: fields.py:1399 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: fields.py:1430 relations.py:428 serializers.py:521 +#: fields.py:1438 relations.py:439 serializers.py:521 msgid "This list may not be empty." msgstr "" -#: fields.py:1483 +#: fields.py:1491 #, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1530 +#: fields.py:1538 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html:5 +#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 msgid "Submit" msgstr "" #: pagination.py:189 -#, python-brace-format -msgid "Invalid page \"{page_number}\": {message}." +msgid "Invalid page." msgstr "" #: pagination.py:407 msgid "Invalid cursor" msgstr "" -#: relations.py:196 +#: relations.py:207 #, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" -#: relations.py:197 +#: relations.py:208 #, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" -#: relations.py:229 +#: relations.py:240 msgid "Invalid hyperlink - No URL match." msgstr "" -#: relations.py:230 +#: relations.py:241 msgid "Invalid hyperlink - Incorrect URL match." msgstr "" -#: relations.py:231 +#: relations.py:242 msgid "Invalid hyperlink - Object does not exist." msgstr "" -#: relations.py:232 +#: relations.py:243 #, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:391 +#: relations.py:402 #, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:392 +#: relations.py:403 msgid "Invalid value." msgstr "" diff --git a/rest_framework/locale/zh_CN/LC_MESSAGES/django.mo b/rest_framework/locale/zh_CN/LC_MESSAGES/django.mo index c1552b71f9b251bbe8dc876caf4308d059b54060..ecd7a91eb16f364fa0360fc7fbd39b25a49c22be 100644 GIT binary patch delta 2331 zcmYk-drXye9LMpm2Lud3MDA)FG(ZxNOI+e2pdt{UVwobu>=_xxfwC&XEDf{Ji;b9$-FPn!V-k*{?*AN@;w;{SAq&iMFdDP5 z0@q;|ZZz}RTTaD($2xu}=^FO=BM(KGzvtlYmT+oO7*#!>aco{X)G1QBuu@qCI&8n~k*W)S7#jlY+i(KSf zmx8NkZ$-`EAl{FsF%QQvm-pLWR2ncV#;g+iQ4bo$6#UR_-$0G*2h@n77dx&-ov%lY zxEr-JKGglEF%#d%1pE%Yco%(3s3db&DCQuuZ3VanE0JZi{jLMZpZPfGLBpstxrmAQ zj@$kW^Jq_?mehEOI$V#suG4KFS;G7)Sw=WfjF(Ys`IFmDk8?)Qin{I~deM*S;Jc_~ zn#TE<8Siu`2UpX60Q0d8ci}KN9d+TC zSdNQ%s%*yXcnmew-@3*y&yUis!EAgD>64A4lJF+xVCZs3UjY^Np|#;AJdfm~{fX>I z3!~e*F$U|g05#=@QQ1F+y5E!P?4kzLh<&K*j-z(LgzH_@u1fQ=JX~gVRLVFph?RH+ zH{&13GFdHe=N+~i_28#aOYwqxe$;gm@8kS0NZwi83g<+*5-S!bIr2Q<`;(Ms;|8`BJw@JL; z@~E)9)__IW;W~oKfl1VjAcL;Q{)Y2thZ4;MyYt_ooM3YVOYrMQO^K-`RRXG%5?!YT!fzZ;a zln0NR|NoUH>e@c~YH972xw{A@rq)(P9~4dN<3t$oAfa{EmrXk;m53p>5}H+J-P#Ck zZ!NP*15rgp>HXwGa8G)WnGRdKNmD1dsjx8*$hC{`jJZ?fsp7J?;BD{h!94 ziz?2^E6mBu_vV+D6_)xBB`p2#Oo`5%Nl5gzv=4N3_IWq=b@V=Q;E=cCNuIA-b$3@! z??6|3U@F1miG2I)?Mp+`SI^EKJ06%y@`MLMyth1IGnby9ePbvvv*I~Vl=GuG_`A|S Y@TX-|ESP=i!uLn7%$z*oZ_Q}@2W##F761SM delta 2228 zcmY+^e@xVM9LMnw2OKA91jwP7^bLYa?(mKufv1Ov_>*55Dwt)vwhKjp0-S4v$I7W| zt$!|MG+CuJnyqY+jz3)MpAu8%sz2IV$;KZNIah7f+MKQD>w8}+KfBL8KA+Eh@B96H z-k7t{Q}3t#?lLBZS5x_-Or{z0AYMibZ(lq5j{A z%kUWb@eKO#Yplb+aU-rh^XX>4NP8rEWNx-mPk9jovhuEtqxz`}cs31JWF_p{iD zGgyc#7aEg=t*8k-hZ=vyaSV08D_E(erY$mtj|ua|;!Fc-g{`Ouy@=KLDXzs^xE}rY z8dHidARqHKU%KubK7v1?BA1zA%nB?=jqkw#9>Y?FdV?d54y|9jNT zGZ!Z=^r1z6GiqY{P{}lcCHMmd(UW7$E)3yPe8cf0$4M+>duZ@}c@|sF@C+LOSg9FF5^gu$b}Rum+d#)Ou{gt#}HxrL(997qKc`*N#fU;h59- z7I!d^!P6ANsN+d|lKv(1VFB^uS*8V*Tzk=vuR2bkj@J!rM*ni|i7z1s%)EyB-$~qz zu?ZRqWfIF%R@b9$a2zY~8gf!h>H~@EvQSyP!|^ccw2Yy)W(q6t4u-JIN<^RwTj+m) zMBm&-ZXGk3Oh*q0ptd56{9rm9kK#l0-$U}qe1&@8k4RKaazP?u%aI_NX2(v{^+z!o zM^MihMNRN5x^@1iX(&WDP@(aPugC(eB>_nZ86Sy6xP&X(b^9X`jjr!lyjxS>p z{rRHRs%Vi~&?@Ris=fc*%U%`O3CO#|eyIAIt%{4P2P>Qkp(dx$>*%QvFgw{a36&=j z*cr}Aw%@L#!(By5%S$O{hek(5g;)5$#Z5~uky>X&r(hj*H#LPybnS#|L>6o(uU;~b zQ~zJWbd>q^R7Fum`K9;F2JJrwz%I(_`Qn*xI4a!prJY6{wSnq$2AfcOuEJ~IKEl;l zssTz`0<#9&sI63;hIDmQwk5Dnz+&3TROLj7x`oP{*nV|_Nu}1@@V_;OqTT(Go~l)~9bJ)q2gYl1U9K}tOVf(y-Z?)vdfJ*9I(65S jW`;(8x%lRPvs!Q6a*bCN9&yDl7kw6gy|^+yRlM~dMrrit diff --git a/rest_framework/locale/zh_CN/LC_MESSAGES/django.po b/rest_framework/locale/zh_CN/LC_MESSAGES/django.po index a5e6cde2f..7eca9d517 100644 --- a/rest_framework/locale/zh_CN/LC_MESSAGES/django.po +++ b/rest_framework/locale/zh_CN/LC_MESSAGES/django.po @@ -5,14 +5,14 @@ # Translators: # hunter007 , 2015 # Lele Long , 2015 -# Ming Chen , 2015 +# Ming Chen , 2015-2016 msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-07 18:53+0100\n" -"PO-Revision-Date: 2015-12-11 03:00+0000\n" -"Last-Translator: hunter007 \n" +"POT-Creation-Date: 2016-03-01 18:38+0100\n" +"PO-Revision-Date: 2016-03-01 17:38+0000\n" +"Last-Translator: Xavier Ordoquy \n" "Language-Team: Chinese (China) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,43 +20,75 @@ msgstr "" "Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: authentication.py:72 +#: authentication.py:71 msgid "Invalid basic header. No credentials provided." msgstr "无效的Basic认证头，没有提供认证信息。" -#: authentication.py:75 +#: authentication.py:74 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "认证字符串不应该包含空格（基本认证HTTP头无效）。" -#: authentication.py:81 +#: authentication.py:80 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "认证字符串base64编码错误（基本认证HTTP头无效）。" -#: authentication.py:98 +#: authentication.py:97 msgid "Invalid username/password." msgstr "用户名或者密码错误。" -#: authentication.py:101 authentication.py:188 +#: authentication.py:100 authentication.py:195 msgid "User inactive or deleted." msgstr "用户未激活或者已删除。" -#: authentication.py:167 +#: authentication.py:173 msgid "Invalid token header. No credentials provided." msgstr "没有提供认证信息（认证令牌HTTP头无效）。" -#: authentication.py:170 +#: authentication.py:176 msgid "Invalid token header. Token string should not contain spaces." msgstr "认证令牌字符串不应该包含空格（无效的认证令牌HTTP头）。" -#: authentication.py:176 +#: authentication.py:182 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "无效的Token。Token字符串不能包含非法的字符。" -#: authentication.py:185 +#: authentication.py:192 msgid "Invalid token." msgstr "认证令牌无效。" +#: authtoken/apps.py:7 +msgid "Auth Token" +msgstr "认证令牌" + +#: authtoken/models.py:21 +msgid "Key" +msgstr "" + +#: authtoken/models.py:23 +msgid "User" +msgstr "用户" + +#: authtoken/models.py:24 +msgid "Created" +msgstr "" + +#: authtoken/models.py:33 +msgid "Token" +msgstr "令牌" + +#: authtoken/models.py:34 +msgid "Tokens" +msgstr "令牌" + +#: authtoken/serializers.py:8 +msgid "Username" +msgstr "用户名" + +#: authtoken/serializers.py:9 +msgid "Password" +msgstr "密码" + #: authtoken/serializers.py:20 msgid "User account is disabled." msgstr "用户账户已禁用。" @@ -111,7 +143,7 @@ msgstr "不支持请求中的媒体类型 “{media_type}”。" msgid "Request was throttled." msgstr "请求超过了限速。" -#: fields.py:266 relations.py:195 relations.py:228 validators.py:79 +#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 #: validators.py:162 msgid "This field is required." msgstr "该字段是必填项。" @@ -129,7 +161,7 @@ msgstr "“{input}” 不是合法的布尔值。" msgid "This field may not be blank." msgstr "该字段不能为空。" -#: fields.py:670 fields.py:1656 +#: fields.py:670 fields.py:1664 #, python-brace-format msgid "Ensure this field has no more than {max_length} characters." msgstr "请确保这个字段不能超过 {max_length} 个字符。" @@ -215,137 +247,136 @@ msgstr "日期时间格式错误。请从这些格式中选择：{format}。" msgid "Expected a datetime but got a date." msgstr "期望为日期时间，得到的是日期。" -#: fields.py:1079 +#: fields.py:1082 #, python-brace-format msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "日期格式错误。请从这些格式中选择：{format}。" -#: fields.py:1080 +#: fields.py:1083 msgid "Expected a date but got a datetime." msgstr "期望为日期，得到的是日期时间。" -#: fields.py:1148 +#: fields.py:1151 #, python-brace-format msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "时间格式错误。请从这些格式中选择：{format}。" -#: fields.py:1207 +#: fields.py:1215 #, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "持续时间的格式错误。使用这些格式中的一个：{format}。" -#: fields.py:1232 fields.py:1281 +#: fields.py:1240 fields.py:1289 #, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "“{input}” 不是合法选项。" -#: fields.py:1235 relations.py:62 relations.py:431 +#: fields.py:1243 relations.py:71 relations.py:442 #, python-brace-format msgid "More than {count} items..." msgstr "多于{count}条记录。" -#: fields.py:1282 fields.py:1429 relations.py:427 serializers.py:520 +#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 #, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." msgstr "期望为一个包含物件的列表，得到的类型是“{input_type}”。" -#: fields.py:1283 +#: fields.py:1291 msgid "This selection may not be empty." msgstr "这项选择不能为空。" -#: fields.py:1320 +#: fields.py:1328 #, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "“{input}” 不是有效路径选项。" -#: fields.py:1339 +#: fields.py:1347 msgid "No file was submitted." msgstr "没有提交任何文件。" -#: fields.py:1340 +#: fields.py:1348 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "提交的数据不是一个文件。请检查表单的编码类型。" -#: fields.py:1341 +#: fields.py:1349 msgid "No filename could be determined." msgstr "无法检测到文件名。" -#: fields.py:1342 +#: fields.py:1350 msgid "The submitted file is empty." msgstr "提交的是空文件。" -#: fields.py:1343 +#: fields.py:1351 #, python-brace-format msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "确保该文件名最多包含 {max_length} 个字符 ( 当前长度为{length} ) 。" -#: fields.py:1391 +#: fields.py:1399 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "请上传有效图片。您上传的该文件不是图片或者图片已经损坏。" -#: fields.py:1430 relations.py:428 serializers.py:521 +#: fields.py:1438 relations.py:439 serializers.py:521 msgid "This list may not be empty." msgstr "列表字段不能为空值。" -#: fields.py:1483 +#: fields.py:1491 #, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "期望是包含类目的字典，得到类型为 “{input_type}”。" -#: fields.py:1530 +#: fields.py:1538 msgid "Value must be valid JSON." msgstr "值必须是有效的 JSON 数据。" -#: filters.py:35 templates/rest_framework/filters/django_filter.html:5 +#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 msgid "Submit" msgstr "保存" #: pagination.py:189 -#, python-brace-format -msgid "Invalid page \"{page_number}\": {message}." -msgstr "无效页面 “{page_number}”：{message}。" +msgid "Invalid page." +msgstr "" #: pagination.py:407 msgid "Invalid cursor" msgstr "无效游标" -#: relations.py:196 +#: relations.py:207 #, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "无效主键 “{pk_value}” － 对象不存在。" -#: relations.py:197 +#: relations.py:208 #, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "类型错误。期望为主键，得到的类型为 {data_type}。" -#: relations.py:229 +#: relations.py:240 msgid "Invalid hyperlink - No URL match." msgstr "无效超链接 －没有匹配的URL。" -#: relations.py:230 +#: relations.py:241 msgid "Invalid hyperlink - Incorrect URL match." msgstr "无效超链接 －错误的URL匹配。" -#: relations.py:231 +#: relations.py:242 msgid "Invalid hyperlink - Object does not exist." msgstr "无效超链接 －对象不存在。" -#: relations.py:232 +#: relations.py:243 #, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "类型错误。期望为URL字符串，实际的类型是 {data_type}。" -#: relations.py:391 +#: relations.py:402 #, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "属性 {slug_name} 为 {value} 的对象不存在。" -#: relations.py:392 +#: relations.py:403 msgid "Invalid value." msgstr "无效值。" diff --git a/rest_framework/locale/zh_TW/LC_MESSAGES/django.mo b/rest_framework/locale/zh_TW/LC_MESSAGES/django.mo index e202136e7681b20ca558f9b9d0109c9d62dcf020..6371fcea7fd84e256c8240ad704f5cdbe3ced0c9 100644 GIT binary patch delta 41 ncmeBT>0+5Mf!9pez*yJ7P{Gi`%GhG!Txo=WIZ$BZQCCI)*&YgC delta 41 ocmeBT>0+5Mf!9>m&`8(7T*1)7%G7w`Txo=Wxs|Eu#-px`0NIoZWdHyG diff --git a/rest_framework/locale/zh_TW/LC_MESSAGES/django.po b/rest_framework/locale/zh_TW/LC_MESSAGES/django.po index 5ca07eeaa..8858ce17c 100644 --- a/rest_framework/locale/zh_TW/LC_MESSAGES/django.po +++ b/rest_framework/locale/zh_TW/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-07 18:53+0100\n" -"PO-Revision-Date: 2015-12-07 17:55+0000\n" +"POT-Creation-Date: 2016-03-01 18:38+0100\n" +"PO-Revision-Date: 2016-03-01 17:38+0000\n" "Last-Translator: Xavier Ordoquy \n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/zh_TW/)\n" "MIME-Version: 1.0\n" @@ -17,43 +17,75 @@ msgstr "" "Language: zh_TW\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: authentication.py:72 +#: authentication.py:71 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:75 +#: authentication.py:74 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:81 +#: authentication.py:80 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:98 +#: authentication.py:97 msgid "Invalid username/password." msgstr "" -#: authentication.py:101 authentication.py:188 +#: authentication.py:100 authentication.py:195 msgid "User inactive or deleted." msgstr "" -#: authentication.py:167 +#: authentication.py:173 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:170 +#: authentication.py:176 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:176 +#: authentication.py:182 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:185 +#: authentication.py:192 msgid "Invalid token." msgstr "" +#: authtoken/apps.py:7 +msgid "Auth Token" +msgstr "" + +#: authtoken/models.py:21 +msgid "Key" +msgstr "" + +#: authtoken/models.py:23 +msgid "User" +msgstr "" + +#: authtoken/models.py:24 +msgid "Created" +msgstr "" + +#: authtoken/models.py:33 +msgid "Token" +msgstr "" + +#: authtoken/models.py:34 +msgid "Tokens" +msgstr "" + +#: authtoken/serializers.py:8 +msgid "Username" +msgstr "" + +#: authtoken/serializers.py:9 +msgid "Password" +msgstr "" + #: authtoken/serializers.py:20 msgid "User account is disabled." msgstr "" @@ -108,7 +140,7 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:266 relations.py:195 relations.py:228 validators.py:79 +#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 #: validators.py:162 msgid "This field is required." msgstr "" @@ -126,7 +158,7 @@ msgstr "" msgid "This field may not be blank." msgstr "" -#: fields.py:670 fields.py:1656 +#: fields.py:670 fields.py:1664 #, python-brace-format msgid "Ensure this field has no more than {max_length} characters." msgstr "" @@ -212,137 +244,136 @@ msgstr "" msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1079 +#: fields.py:1082 #, python-brace-format msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1080 +#: fields.py:1083 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1148 +#: fields.py:1151 #, python-brace-format msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1207 +#: fields.py:1215 #, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1232 fields.py:1281 +#: fields.py:1240 fields.py:1289 #, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "" -#: fields.py:1235 relations.py:62 relations.py:431 +#: fields.py:1243 relations.py:71 relations.py:442 #, python-brace-format msgid "More than {count} items..." msgstr "" -#: fields.py:1282 fields.py:1429 relations.py:427 serializers.py:520 +#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 #, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1283 +#: fields.py:1291 msgid "This selection may not be empty." msgstr "" -#: fields.py:1320 +#: fields.py:1328 #, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1339 +#: fields.py:1347 msgid "No file was submitted." msgstr "" -#: fields.py:1340 +#: fields.py:1348 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1341 +#: fields.py:1349 msgid "No filename could be determined." msgstr "" -#: fields.py:1342 +#: fields.py:1350 msgid "The submitted file is empty." msgstr "" -#: fields.py:1343 +#: fields.py:1351 #, python-brace-format msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1391 +#: fields.py:1399 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: fields.py:1430 relations.py:428 serializers.py:521 +#: fields.py:1438 relations.py:439 serializers.py:521 msgid "This list may not be empty." msgstr "" -#: fields.py:1483 +#: fields.py:1491 #, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1530 +#: fields.py:1538 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html:5 +#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 msgid "Submit" msgstr "" #: pagination.py:189 -#, python-brace-format -msgid "Invalid page \"{page_number}\": {message}." +msgid "Invalid page." msgstr "" #: pagination.py:407 msgid "Invalid cursor" msgstr "" -#: relations.py:196 +#: relations.py:207 #, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" -#: relations.py:197 +#: relations.py:208 #, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" -#: relations.py:229 +#: relations.py:240 msgid "Invalid hyperlink - No URL match." msgstr "" -#: relations.py:230 +#: relations.py:241 msgid "Invalid hyperlink - Incorrect URL match." msgstr "" -#: relations.py:231 +#: relations.py:242 msgid "Invalid hyperlink - Object does not exist." msgstr "" -#: relations.py:232 +#: relations.py:243 #, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:391 +#: relations.py:402 #, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:392 +#: relations.py:403 msgid "Invalid value." msgstr "" From 6ea9a414080e651750516dba5aca802b21583aa8 Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy Date: Mon, 7 Mar 2016 20:39:34 +0100 Subject: [PATCH 022/457] Add #3962 in the last minute fixes. --- docs/topics/release-notes.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index 7834448c1..9fa399670 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -68,6 +68,7 @@ You can determine your currently installed version using `pip freeze`: * Add missing csrf_token in AdminRenderer post form. Thanks to Piotr Śniegowski for the fix. ([#3703][gh3703]) * Refactored `_get_reverse_relationships()` to use correct `to_field`. Thanks to Benjamin Phillips for the fix. ([#3696][gh3696]) * Document the use of `get_queryset` for `RelatedField`. Thanks to Ryan Hiebert for the fix. ([#3605][gh3605]) +* Fix empty pk detection in HyperlinkRelatedField.get_url. Thanks to @jslang for the fix ([#3962][gh3962]) ### 3.3.2 @@ -683,6 +684,7 @@ For older release notes, [please see the version 2.x documentation][old-release- [gh3968]: https://github.com/tomchristie/django-rest-framework/issues/3968 +[gh3962]: https://github.com/tomchristie/django-rest-framework/issues/3962 [gh3913]: https://github.com/tomchristie/django-rest-framework/issues/3913 [gh3912]: https://github.com/tomchristie/django-rest-framework/issues/3912 [gh3910]: https://github.com/tomchristie/django-rest-framework/issues/3910 From b572cdb068c0f14e101749a6c7affe4f1a5acaf3 Mon Sep 17 00:00:00 2001 From: Kin Date: Tue, 16 Feb 2016 23:08:45 -0800 Subject: [PATCH 023/457] fix typo --- docs/tutorial/quickstart.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/tutorial/quickstart.md b/docs/tutorial/quickstart.md index 910eb4cff..5e3b522cc 100644 --- a/docs/tutorial/quickstart.md +++ b/docs/tutorial/quickstart.md @@ -157,7 +157,7 @@ We can now access our API, both from the command-line, using tools like `curl`.. Or using the [httpie][httpie], command line tool... - bash: http -a username:password123 http://127.0.0.1:8000/users/ + bash: http -a admin:password123 http://127.0.0.1:8000/users/ HTTP/1.1 200 OK ... From 0e1dcb7323c9ad610d085ee6cbab0182d68edc84 Mon Sep 17 00:00:00 2001 From: Wes Date: Wed, 17 Feb 2016 16:35:53 +0800 Subject: [PATCH 024/457] fix typo --- docs/api-guide/serializers.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md index 6aa34da3d..2e6207805 100644 --- a/docs/api-guide/serializers.md +++ b/docs/api-guide/serializers.md @@ -788,7 +788,7 @@ Here's an example of how you might choose to implement multiple updates: # Perform creations and updates. ret = [] for book_id, data in data_mapping.items(): - book = book_mapping.get(book_id, None): + book = book_mapping.get(book_id, None) if book is None: ret.append(self.child.create(data)) else: From 0a2a01d05a48de0850ed5f614ea1e5ff08aecd21 Mon Sep 17 00:00:00 2001 From: meoooh Date: Thu, 18 Feb 2016 14:43:41 +0900 Subject: [PATCH 025/457] fix typo fix typo --- docs/api-guide/pagination.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/pagination.md b/docs/api-guide/pagination.md index d6c80d93a..f704a3247 100644 --- a/docs/api-guide/pagination.md +++ b/docs/api-guide/pagination.md @@ -317,4 +317,4 @@ The [`DRF-extensions` package][drf-extensions] includes a [`PaginateByMaxMixin` [link-header]: ../img/link-header-pagination.png [drf-extensions]: http://chibisov.github.io/drf-extensions/docs/ [paginate-by-max-mixin]: http://chibisov.github.io/drf-extensions/docs/#paginatebymaxmixin -[disqus-cursor-api]: http://cramer.io/2011/03/08/building-cursors-for-the-disqus-api/ +[disqus-cursor-api]: http://cramer.io/2011/03/08/building-cursors-for-the-disqus-api From 2e2abbc811f536c8266e74f7955dafb4260d9b1f Mon Sep 17 00:00:00 2001 From: ildoc Date: Thu, 25 Feb 2016 14:27:57 +0100 Subject: [PATCH 026/457] updated tutorial for django 1.9 --- docs/tutorial/1-serialization.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/tutorial/1-serialization.md b/docs/tutorial/1-serialization.md index fd0783f07..87856e037 100644 --- a/docs/tutorial/1-serialization.md +++ b/docs/tutorial/1-serialization.md @@ -45,7 +45,7 @@ We'll need to add our new `snippets` app and the `rest_framework` app to `INSTAL INSTALLED_APPS = ( ... 'rest_framework', - 'snippets', + 'snippets.apps.SnippetsConfig', ) Okay, we're ready to roll. @@ -293,11 +293,11 @@ Finally we need to wire these views up. Create the `snippets/urls.py` file: url(r'^snippets/$', views.snippet_list), url(r'^snippets/(?P[0-9]+)/$', views.snippet_detail), ] - + We also need to wire up the root urlconf, in the `tutorial/urls.py` file, to include our snippet app's URLs. - + from django.conf.urls import url, include - + urlpatterns = [ url(r'^', include('snippets.urls')), ] From cfd681dc73e49c7b9878b1adbfa34b0c3bf4eba0 Mon Sep 17 00:00:00 2001 From: Krzysztof Szularz Date: Tue, 1 Mar 2016 14:52:07 +0100 Subject: [PATCH 027/457] Add `/en` to Heroku guidelines link --- docs/api-guide/versioning.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/versioning.md b/docs/api-guide/versioning.md index df5d5dfbc..54aa0170d 100644 --- a/docs/api-guide/versioning.md +++ b/docs/api-guide/versioning.md @@ -214,7 +214,7 @@ If your versioning scheme is based on the request URL, you will also want to alt [cite]: http://www.slideshare.net/evolve_conference/201308-fielding-evolve/31 [roy-fielding-on-versioning]: http://www.infoq.com/articles/roy-fielding-on-versioning [klabnik-guidelines]: http://blog.steveklabnik.com/posts/2011-07-03-nobody-understands-rest-or-http#i_want_my_api_to_be_versioned -[heroku-guidelines]: https://github.com/interagent/http-api-design/blob/master/foundations/require-versioning-in-the-accepts-header.md +[heroku-guidelines]: https://github.com/interagent/http-api-design/blob/master/en/foundations/require-versioning-in-the-accepts-header.md [json-parameters]: http://tools.ietf.org/html/rfc4627#section-6 [vendor-media-type]: http://en.wikipedia.org/wiki/Internet_media_type#Vendor_tree [lvh]: https://reinteractive.net/posts/199-developing-and-testing-rails-applications-with-subdomains From cac1ecb2502bf5de4455d40516b132bb657d7a9c Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy Date: Tue, 8 Mar 2016 06:37:46 +0100 Subject: [PATCH 028/457] paginate_by removed in 3.3 --- docs/api-guide/generic-views.md | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/api-guide/generic-views.md b/docs/api-guide/generic-views.md index 4a9581212..0b155f000 100644 --- a/docs/api-guide/generic-views.md +++ b/docs/api-guide/generic-views.md @@ -26,7 +26,6 @@ Typically when using the generic views, you'll override the view, and set severa queryset = User.objects.all() serializer_class = UserSerializer permission_classes = (IsAdminUser,) - paginate_by = 100 For more complex cases you might also want to override various methods on the view class. For example. From 920861936255ad7f9057df339685e6f059948a4e Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy Date: Tue, 8 Mar 2016 06:38:03 +0100 Subject: [PATCH 029/457] Those are now fully removed. --- docs/api-guide/generic-views.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/docs/api-guide/generic-views.md b/docs/api-guide/generic-views.md index 0b155f000..e6e300561 100644 --- a/docs/api-guide/generic-views.md +++ b/docs/api-guide/generic-views.md @@ -71,8 +71,6 @@ The following attributes are used to control pagination when used with list view * `pagination_class` - The pagination class that should be used when paginating list results. Defaults to the same value as the `DEFAULT_PAGINATION_CLASS` setting, which is `'rest_framework.pagination.PageNumberPagination'`. -Note that usage of the `paginate_by`, `paginate_by_param` and `page_kwarg` attributes are now pending deprecation. The `pagination_serializer_class` attribute and `DEFAULT_PAGINATION_SERIALIZER_CLASS` setting have been removed completely. Pagination settings should instead be controlled by overriding a pagination class and setting any configuration attributes there. See the pagination documentation for more details. - **Filtering**: * `filter_backends` - A list of filter backend classes that should be used for filtering the queryset. Defaults to the same value as the `DEFAULT_FILTER_BACKENDS` setting. From a0aac166bc23b82c4b93f255faafc8fa7766f558 Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy Date: Tue, 8 Mar 2016 06:39:08 +0100 Subject: [PATCH 030/457] DEFAULT_PAGINATION_SERIALIZER_CLASS removed in 3.1 --- docs/api-guide/settings.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/docs/api-guide/settings.md b/docs/api-guide/settings.md index 23691dec1..bc351f321 100644 --- a/docs/api-guide/settings.md +++ b/docs/api-guide/settings.md @@ -102,9 +102,15 @@ Default: `'rest_framework.negotiation.DefaultContentNegotiation'` #### DEFAULT_PAGINATION_SERIALIZER_CLASS -A class the determines the default serialization style for paginated responses. +--- -Default: `rest_framework.pagination.PaginationSerializer` +**This setting has been removed.** + +The pagination API does not use serializers to determine the output format, and +you'll need to instead override the `get_paginated_response method on a +pagination class in order to specify how the output format is controlled. + +--- #### DEFAULT_FILTER_BACKENDS From 180137300f3bb1f67a1003ff940b2b9b0c2da5e1 Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy Date: Tue, 8 Mar 2016 06:39:58 +0100 Subject: [PATCH 031/457] PAGINATE_BY removed in 3.3 --- docs/api-guide/settings.md | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/docs/api-guide/settings.md b/docs/api-guide/settings.md index bc351f321..4de23b1fd 100644 --- a/docs/api-guide/settings.md +++ b/docs/api-guide/settings.md @@ -119,15 +119,9 @@ If set to `None` then generic filtering is disabled. #### PAGINATE_BY -The default page size to use for pagination. If set to `None`, pagination is disabled by default. - -Default: `None` - -#### PAGINATE_BY_PARAM - --- -**This setting is pending deprecation.** +**This setting has been removed.** See the pagination documentation for further guidance on [setting the pagination style](pagination.md#modifying-the-pagination-style). From c90cf828aeda3ebb1a599064ee6c39c03eb04242 Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy Date: Tue, 8 Mar 2016 06:40:33 +0100 Subject: [PATCH 032/457] PAGE_SIZE addition in 3.1 --- docs/api-guide/settings.md | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/docs/api-guide/settings.md b/docs/api-guide/settings.md index 4de23b1fd..142cd7ebc 100644 --- a/docs/api-guide/settings.md +++ b/docs/api-guide/settings.md @@ -127,18 +127,9 @@ See the pagination documentation for further guidance on [setting the pagination --- -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. +#### PAGE_SIZE -For example, given the following settings: - - REST_FRAMEWORK = { - 'PAGINATE_BY': 10, - 'PAGINATE_BY_PARAM': 'page_size', - } - -A client would be able to modify the pagination size by using the `page_size` query parameter. For example: - - GET http://example.com/api/accounts?page_size=25 +The default page size to use for pagination. If set to `None`, pagination is disabled by default. Default: `None` From c91229aaab0e730b0e7f19ce47d0023edb343533 Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy Date: Tue, 8 Mar 2016 06:41:08 +0100 Subject: [PATCH 033/457] PAGINATE_BY_PARAM and MAX_PAGINATE_BY removed in 3.3 --- docs/api-guide/settings.md | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/docs/api-guide/settings.md b/docs/api-guide/settings.md index 142cd7ebc..f218d00ad 100644 --- a/docs/api-guide/settings.md +++ b/docs/api-guide/settings.md @@ -133,6 +133,16 @@ The default page size to use for pagination. If set to `None`, pagination is di Default: `None` +#### PAGINATE_BY_PARAM + +--- + +**This setting has been removed.** + +See the pagination documentation for further guidance on [setting the pagination style](pagination.md#modifying-the-pagination-style). + +--- + #### MAX_PAGINATE_BY --- @@ -143,22 +153,6 @@ See the pagination documentation for further guidance on [setting the pagination --- -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: - - REST_FRAMEWORK = { - 'PAGINATE_BY': 10, - 'PAGINATE_BY_PARAM': 'page_size', - 'MAX_PAGINATE_BY': 100 - } - -A client request like the following would return a paginated list of up to 100 items. - - GET http://example.com/api/accounts?page_size=999 - -Default: `None` - ### SEARCH_PARAM The name of a query parameter, which can be used to specify the search term used by `SearchFilter`. From 2ef74cfa61d6f52a2a5c32151a052488d5d7e9e2 Mon Sep 17 00:00:00 2001 From: Carlton Gibson Date: Sun, 13 Mar 2016 20:39:19 +0100 Subject: [PATCH 034/457] Bring check for null fk to `BaseSerializer.to_representation` --- rest_framework/fields.py | 2 -- rest_framework/serializers.py | 10 +++++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index c700b85e8..6d5962c8e 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -778,8 +778,6 @@ class UUIDField(Field): return data def to_representation(self, value): - if value is None: - return None if self.uuid_format == 'hex_verbose': return str(value) else: diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index b95bb7fa6..625d32644 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -464,9 +464,13 @@ class Serializer(BaseSerializer): except SkipField: continue - if attribute is None: - # We skip `to_representation` for `None` values so that - # fields do not have to explicitly deal with that case. + # We skip `to_representation` for `None` values so that fields do + # not have to explicitly deal with that case. + # + # For related fields with `use_pk_only_optimization` we need to + # resolve the pk value. + check_for_none = attribute.pk if isinstance(attribute, PKOnlyObject) else attribute + if check_for_none is None: ret[field.field_name] = None else: ret[field.field_name] = field.to_representation(attribute) From 265db86590baf57ae2c9ee9bf0bd66172ebe27e8 Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy Date: Mon, 14 Mar 2016 08:31:27 +0100 Subject: [PATCH 035/457] Translation update. --- .../locale/pl/LC_MESSAGES/django.mo | Bin 10432 -> 10799 bytes .../locale/pl/LC_MESSAGES/django.po | 24 +-- .../locale/tr/LC_MESSAGES/django.mo | Bin 10172 -> 10548 bytes .../locale/tr/LC_MESSAGES/django.po | 25 +-- .../locale/tr_TR/LC_MESSAGES/django.mo | Bin 1933 -> 10520 bytes .../locale/tr_TR/LC_MESSAGES/django.po | 168 +++++++++--------- 6 files changed, 109 insertions(+), 108 deletions(-) diff --git a/rest_framework/locale/pl/LC_MESSAGES/django.mo b/rest_framework/locale/pl/LC_MESSAGES/django.mo index 232de88ffe95f84a46cafd9c534cbc980579a248..f228dfc7c72f6d5c1a7c86d8cd61ebe20b6f29e7 100644 GIT binary patch delta 2501 zcmY+_Yiv|S7{>8;yU<-OEznYIxo!caLV;4Lm2zt-mSQi6ZIKp4PL~CHUD;jIv?gp& zutAMr)=ShN2}Gi(QL`jsBF3P^hz28mP)v#;e$W^(8bL*g_j3HNMO>Zq`mi4}28M@FenQe{#`GGqY1G&PKgxA>M&uT#m0` zHU5C}uy_nF!wsn4bz%`7M(yNhI2(V)EZ%PgW6er%7U}`(aWxL&Qv3q-z%k>@CgN07 ze-UaWwWzJ{PP;cfegwUYpGNJ#8C1wFpq`___$-`6V**xV0NXGZAHrd{4~c?3jq~v! z5^noE?bpbkUEreUTtcPKC?0YX=Ainsu>=>OLfoE9{5A8V=^uWK>VJz$qN{j2=8sRs zb`7dOh+4t>sNbE#0A5B-a6+D&Tvmg_>F-5NU?0xGXK?|Z%wzvsX~Jui-)*Le8t@OiP`P7SxsoQCZ!IRrmxp;Thb7(*tH*xC=Fr zi^yhMDK{#=szI1t;)Uyn=+^X0VSMFULxZqR#g*)B`;n0rJgiP{*njiHhyU zTku5;;7Mdo_8lrj-kHjcI9o=8UA0ow4;qkXTMufB_M>KeJUxB}^@3k<82Sl3N7=Ga z$u|Z0CRqb&hgy*nY@3lywC(Bf{g}`D?Kv7gd<&IK$FUlJLc(e#EJH7>M};bgyxVqR z10KP9@e(Q*>Y24dco22}r^sg7_c#|vu>2Y<$M|p>J85L%Zd{6wqrP09pkkOoJhUPQ z**)t)=4MZ!w*DQ|#80En_dn>tb<{;vg;DokFUtH8)MCY7MIV>zMGsO@PACj2ivL|y z=HnKvb~RO#SI881g|L!(H&w+=>QvKR^#C54KYs?R0I!aeig zCJrAp+e{5oeN+|2lh647ijq;`;y*n1gb;2wKPu3n>KHduRY(jl7mjR6 z{x$B^jM1rk-D@;)X#9ypTV9#JB^rwKIz6GplX+h*DG!t`s3z>dC-P-LJ#7V7Tp za5_KQ6YNh6Q zM{po{d3up2v(|~8dN`b%Jad}&zboiZRLuHnRLiON`eR+;zTS?m#Mq*`oJMD$&k5|f LG3q4Rinjg>NU|#) delta 2174 zcmYk-TWl0n9LMqhmhBaVUZmAZ+vyFcv~}Cs3oR|JEv3*>KucSSN;guHRocZ~phRSS z@Ij3U#EF_6y$*y;KTSMc4JMtXUt|9Y+~UfY{%3Lvq9{^Mx4VIyoSA)v(&5^_neute{u*|F)!^oc< z=b-P+;TpV-id9m~DOiqq zSn1EZFvPqUmC7Ti8@+`3-VJ~L7pgXLxq1WE<`947Fyb$~h1&Ub)E9q22bbTIxUmqb zh(>WOp28aZ8h2q}h1q?$+jqwI7}l~rj{yq&TdZTgm`D7T>ugF`Icvfa45M!31uVlk z)QK;lLb`}LVG4_FxDJPL7PsLQ+=<1UL^X2=AHlPz;>%!ns-f-}gMAEM#xA_&+d%w| zGJh6z!N0KpOE@UB?WhPmj*7rb_z+$|Md&A_POXlDP|7+`#n^)#_!K^hv3D3e!N7{l zo`yZB8~Fl>l4UxH9j?N9=404`Z(;>r^XCE1-p;%g`|v1w=RwkLnS|AQ3Q)DwkE`^m z8DrqE@CtHGdl!|8%Sg2BcYi&LM}VQ#pdvDWy1^s<`m3lDe~3Z+5_zEP3aY4YAg>6^ zD&uCb01Nf}S2IwEwjyb@0ZhelRFTYJC(a|;u^&(uN~ds$vN_0-wc%EL5{GaBmGgAA zsZ>3N`u&SYQ0z2Taee!YK{x)2t=Pi$n(#0xHD{2Uw=BZKIjtUbW4lq0-7yT{?WWJv zw0lKJ=h{f$MAz?CxM~CRm_nhvsHu?DlISW9<&Br4cT*I!_dW+N4ce)8t+pe9SLr#7 zRd`C}ovo4y`|yf%v;P6<(EbxG1r&vTf4&Rb=_B+YT@lc0vzJbwyeikrMUUH^Z9NnI zm3S#@@IRo&z2facrA&>W(fsSDd6WMSs)O52x$K~Cp(~GSs&EyjnqJW=Full{>1wG7 zyeDOlvFbogZ&|hN39LeQ#LLT;&{Z7k=sol-x}I~jWcp5e8-19r=FnAyDx{D*o_5n6 zNgs-zPmiR;LzyQ6@vpL$2I4of-%fI0UvbeL$_=^4bFa45I5myUbxmtSw2Z#+)O6Lr zWO!m~e|S1N+3XC54@Sl&oo$nQqtDD7cGk~E6QlP1k%{QRNH~5nZ$nZ>e`L%#5ZxP| zh`I~TN;g!T>=x&Tf?eV1u)C079DhFlRBF7j, 2015 # Piotr Jakimiak , 2015 -# Maciek Olko , 2015 +# Maciek Olko , 2015-2016 msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"PO-Revision-Date: 2016-03-07 21:25+0000\n" +"Last-Translator: Maciek Olko \n" "Language-Team: Polish (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -59,35 +59,35 @@ msgstr "Niepoprawny token." #: authtoken/apps.py:7 msgid "Auth Token" -msgstr "" +msgstr "Token uwierzytelniający" #: authtoken/models.py:21 msgid "Key" -msgstr "" +msgstr "Klucz" #: authtoken/models.py:23 msgid "User" -msgstr "" +msgstr "Użytkownik" #: authtoken/models.py:24 msgid "Created" -msgstr "" +msgstr "Stworzono" #: authtoken/models.py:33 msgid "Token" -msgstr "" +msgstr "Token" #: authtoken/models.py:34 msgid "Tokens" -msgstr "" +msgstr "Tokeny" #: authtoken/serializers.py:8 msgid "Username" -msgstr "" +msgstr "Nazwa użytkownika" #: authtoken/serializers.py:9 msgid "Password" -msgstr "" +msgstr "Hasło" #: authtoken/serializers.py:20 msgid "User account is disabled." @@ -338,7 +338,7 @@ msgstr "Wyślij" #: pagination.py:189 msgid "Invalid page." -msgstr "" +msgstr "Niepoprawna strona." #: pagination.py:407 msgid "Invalid cursor" diff --git a/rest_framework/locale/tr/LC_MESSAGES/django.mo b/rest_framework/locale/tr/LC_MESSAGES/django.mo index 70fe0331421c76d4006c21108add5a475071f389..14f5dc981f0819346e1355b1e01fbf482e93b10f 100644 GIT binary patch delta 2496 zcmYk+TWl0n9LMpqEp%5}ZiOOCwN9x}1q!9K1quqKh=mr4+*_-G$w)iazX% zvEl_)4MZZSNL?Nz@d|B>glMQSQ4=sEh8T@XB6xv5`2Ece(Ubn?bIx@3%(?u} zeAskmQ|e0om{$#@ow$dn%r@o#Hs)}l>6ygFL zhYeVU+i)JffI%F@RmP;uSt@I|G3r~#uO6lSGOolC+=f$fjaiJ{xD1bC175)zoRgRN zzk`jmU&j*s8S`<%_{;!{QTHGAOc~QgMIF9~Rd^2hGk?*1s-At8YA(d%ZhZeTr6nq}XU_Y`8<`6Ex z0c5+)SH9mOf95I|^>YK2KDl&qH|C?-bFds2qPDng3j42-pY$L69M%2-l|-Xhjnk)Q z_O=Pt?nBMsW7Kosp@lb51DsaiC6`%)V`(2i4WJ+A;$d8f=L%T=W-2$hp_y)A_+i}a z+k={EpWl83D`=m@;eauhaW?H^908q*3#h%lj@p_+I@1cQz5P73wjLM^L9^GH+KutyqsIQ3Fl= zK}91hVpub=8Y{8c_aLgn^SBhl_mPOW89A}09T~IfL1lX%>bXy`6K~-zv@K&c;%CS$ zlV8jc)cLQVqNLb|+PkBu<1&IIzPXKMn8)Zeuo_&2G1Lp+M?Loo@~9a_65JHA{`0UL zb-xuYOriRJ1B1NZd_hG^ehKf#E2t4>(|8a|knJ?ixDETN(g%_e*ZTW~eLhT59Ts2ScwcERM(i=2g3xEdGX zbAJ02>UTe)20n@w7I4-VV>PbCD5f-n_o(m{H6NgoVhGjY@2I3HVZHR+UevMKk6M|x zQ3Lx1wKCUG$1B7?1GtUQifH!g|4z}Mv_fo;=AZevcoi;sv5IEKR(fR_*L4K_du2P< zwZvFLTctsBFuYl9L>2PdTSe8CKRbzC#2P|_EGNA8>r+}lXipy@SY@x&aotR`5q!`x z#|t+QD%C{Dt7TS0)yIh@|DINAm0!0|$=yO^5h|QmvsLrgUaDjh+Bc4c*+HmidHJZB zCy90gbF?4DUq)DSkI)3b$8AtlUXL~6NO6eV7>SNrd>f+`<4 z?@Ok;twat%B73ElE8iEdD6v%L6Jf8GIi8!SH~8&()VD)LUr|cHxVM8d+>zjL$l4Oy z<3vrZyJ39TeK%AatcyE#(&Fbm70zo^GcqSI_NZ*=# zA}cTRTko21k52u_Z7HY53YgfbEgt<;%?{cbe0`;^GjPNHS|X4Z)mW6Xwb4dh6deeX>nk_ I+h1DtFCR}Xg#Z8m delta 2151 zcmYk+|4&tQ9LMqZC6KS7f_{^_yFF(F04uSjM)(?-JJLgTQN1mY#4j60Z(BQeusUSn`zdF6R7LQaVO4U2^MCV zaJ?|5&(@>YF+{uY*4h+hgP$O(dy(o-Z@igwhYuJt(vduPQ2>IDG z2mS99mg78X<^n6t?!^)eVn1%i81`zaKcLc#ecRh_9*|9A1(sp~ zR{8A?4ASmHrSdscN3Wp%_p{&r2emfxd3!z9<}&}vVc0+MCTisKs6YON4z662=vWZ7 zi1uJ5zJ)dTHI88*&ulF|>U+rd7}j$BUHmd&_5+sDK3%~4E7!AhQ#o2hP4#+~w0ho( z8*mggwNt2$&EPnGgl(9`TX$kVcHjvd!=F%VrIAso{Q_!+=5Yv}7*C5*nZiE&4fUWp z=C21|M0IQy)uEeMjM?<+eys7GL_P2XZo@@nIawvWW@A|s(iiK*tvG@DU+h&XlT_w# z0=E^K?ZVfPpIztBf*DRC$GxaE@+@kVzlYWMEviF-qC|@7Q7<}*tV=tK{OmFZmXrO0 zRr=H{`4=`aEQbqSs0Z&wcBW0^MtlR+p-WhS3&`wS7Wv{4R*LLQ>&7%3Lf!uuYNSu0 zX5wvRS=onJru~1JiavJNQB(8>>N}9ZTbnTlmD63Q6wIJT^gc3a_NnhRtfPGkw_q&` zOYKS2eXpZBd=4GFiVeKqZcu5(GM1!ry%+U>mr!fr3)CvlWixB!o#w7D;2en1m>Rw6VI7Db0j(TSj`PV18hzPn*r!BbS z=_BzA>ERXe;Hu++_*bhl1M!8Ncaq$f^Deq0`9XI&f3Bs*scC53vb8cu$=De>aIktX z8rpwgU+7>Y+USgirovA|oq_1%k!KDab+#XgBx, 2015 # Emrah BİLBAY , 2015 # Ertaç Paprat , 2015 +# José Alaguna , 2016 # Mesut Can Gürle , 2015 # Murat Çorlu , 2015 # Recep KIRMIZI , 2015 @@ -15,8 +16,8 @@ msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"PO-Revision-Date: 2016-03-09 23:45+0000\n" +"Last-Translator: José Alaguna \n" "Language-Team: Turkish (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -63,35 +64,35 @@ msgstr "Geçersiz token." #: authtoken/apps.py:7 msgid "Auth Token" -msgstr "" +msgstr "Kimlik doğrulama belirteci" #: authtoken/models.py:21 msgid "Key" -msgstr "" +msgstr "Anahtar" #: authtoken/models.py:23 msgid "User" -msgstr "" +msgstr "Kullanan" #: authtoken/models.py:24 msgid "Created" -msgstr "" +msgstr "Oluşturulan" #: authtoken/models.py:33 msgid "Token" -msgstr "" +msgstr "İşaret" #: authtoken/models.py:34 msgid "Tokens" -msgstr "" +msgstr "İşaretler" #: authtoken/serializers.py:8 msgid "Username" -msgstr "" +msgstr "Kullanıcı adı" #: authtoken/serializers.py:9 msgid "Password" -msgstr "" +msgstr "Şifre" #: authtoken/serializers.py:20 msgid "User account is disabled." @@ -334,7 +335,7 @@ msgstr "Sözlük tipi bir değişken beklenirken \"{input_type}\" tipi bir deği #: fields.py:1538 msgid "Value must be valid JSON." -msgstr "Değer geçerli bir JSON olmalı" +msgstr "Değer geçerli bir JSON olmalı." #: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 msgid "Submit" @@ -342,7 +343,7 @@ msgstr "Gönder" #: pagination.py:189 msgid "Invalid page." -msgstr "" +msgstr "Geçersiz sayfa." #: pagination.py:407 msgid "Invalid cursor" diff --git a/rest_framework/locale/tr_TR/LC_MESSAGES/django.mo b/rest_framework/locale/tr_TR/LC_MESSAGES/django.mo index 5d4511a4f2b3e5ef48ae9d8a5ada9739c4ac5e34..5fa743b50e80374a743a42495f008818753c0db2 100644 GIT binary patch literal 10520 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 M+{s%Ni7F-j9~)mM761SM delta 610 zcmYk&%WD%+6u{vV?ZZTE9)=dQ)k(C$CYUBH{%L zSFSDvvvH{|q_ntlCmL`g*nL4naN(ceuD_Fp;(;^Yeat=g%)Gw$D%ty)8QT^jL(Y;P z$T_kR<3a4=6z*XiKjT&WhdIoj5GmqK)b~O>k1s~^K3-=29<~1Wk$;cYdopoSWQ>g> zCU6n885=8j2Zsf5pG*6gX8qwfP2zJb;U_HMAI#&K36T^o;uTy*J?CK=ALE?#MBWYu zA_FY2@f)>~_#{Ozi+V7JHrDVW21q}{;7;L~(3`L^|BZgiX7z-c+|V6QBL-DiGaMV{+=uHSV1va#nI=1bwy EA+5(+0{{R3 diff --git a/rest_framework/locale/tr_TR/LC_MESSAGES/django.po b/rest_framework/locale/tr_TR/LC_MESSAGES/django.po index 9ead5da4a..efbd689e6 100644 --- a/rest_framework/locale/tr_TR/LC_MESSAGES/django.po +++ b/rest_framework/locale/tr_TR/LC_MESSAGES/django.po @@ -3,14 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# José Alaguna , 2015 +# José Alaguna , 2015-2016 msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"PO-Revision-Date: 2016-03-09 23:48+0000\n" +"Last-Translator: José Alaguna \n" "Language-Team: Turkish (Turkey) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/tr_TR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,15 +20,15 @@ msgstr "" #: authentication.py:71 msgid "Invalid basic header. No credentials provided." -msgstr "" +msgstr "Geçersiz yetkilendirme başlığı. Gerekli uygunluk kriterleri sağlanmamış." #: authentication.py:74 msgid "Invalid basic header. Credentials string should not contain spaces." -msgstr "" +msgstr "Geçersiz yetkilendirme başlığı. Uygunluk kriterine ait veri boşluk karakteri içermemeli." #: authentication.py:80 msgid "Invalid basic header. Credentials not correctly base64 encoded." -msgstr "" +msgstr "Geçersiz yetkilendirme başlığı. Uygunluk kriterleri base64 formatına uygun olarak kodlanmamış." #: authentication.py:97 msgid "Invalid username/password." @@ -36,20 +36,20 @@ msgstr "Geçersiz kullanıcı adı / şifre." #: authentication.py:100 authentication.py:195 msgid "User inactive or deleted." -msgstr "" +msgstr "Kullanıcı aktif değil ya da silinmiş" #: authentication.py:173 msgid "Invalid token header. No credentials provided." -msgstr "" +msgstr "Geçersiz token başlığı. Kimlik bilgileri eksik." #: authentication.py:176 msgid "Invalid token header. Token string should not contain spaces." -msgstr "" +msgstr "Geçersiz token başlığı. Token'da boşluk olmamalı." #: authentication.py:182 msgid "" "Invalid token header. Token string should not contain invalid characters." -msgstr "" +msgstr "Geçersiz token başlığı. Token geçersiz karakter içermemeli." #: authentication.py:192 msgid "Invalid token." @@ -57,67 +57,67 @@ msgstr "Geçersiz simge." #: authtoken/apps.py:7 msgid "Auth Token" -msgstr "" +msgstr "Kimlik doğrulama belirteci" #: authtoken/models.py:21 msgid "Key" -msgstr "" +msgstr "Anahtar" #: authtoken/models.py:23 msgid "User" -msgstr "" +msgstr "Kullanan" #: authtoken/models.py:24 msgid "Created" -msgstr "" +msgstr "Oluşturulan" #: authtoken/models.py:33 msgid "Token" -msgstr "" +msgstr "İşaret" #: authtoken/models.py:34 msgid "Tokens" -msgstr "" +msgstr "İşaretler" #: authtoken/serializers.py:8 msgid "Username" -msgstr "" +msgstr "Kullanıcı adı" #: authtoken/serializers.py:9 msgid "Password" -msgstr "" +msgstr "Şifre" #: authtoken/serializers.py:20 msgid "User account is disabled." -msgstr "" +msgstr "Kullanıcı hesabı devre dışı bırakılmış." #: authtoken/serializers.py:23 msgid "Unable to log in with provided credentials." -msgstr "" +msgstr "Verilen bilgiler ile giriş sağlanamadı." #: authtoken/serializers.py:26 msgid "Must include \"username\" and \"password\"." -msgstr "" +msgstr "\"Kullanıcı Adı\" ve \"Parola\" eklenmeli." #: exceptions.py:49 msgid "A server error occurred." -msgstr "" +msgstr "Sunucu hatası oluştu." #: exceptions.py:84 msgid "Malformed request." -msgstr "" +msgstr "Bozuk istek." #: exceptions.py:89 msgid "Incorrect authentication credentials." -msgstr "" +msgstr "Giriş bilgileri hatalı." #: exceptions.py:94 msgid "Authentication credentials were not provided." -msgstr "" +msgstr "Giriş bilgileri verilmedi." #: exceptions.py:99 msgid "You do not have permission to perform this action." -msgstr "" +msgstr "Bu işlemi yapmak için izniniz bulunmuyor." #: exceptions.py:104 views.py:81 msgid "Not found." @@ -126,217 +126,217 @@ msgstr "Bulunamadı." #: exceptions.py:109 #, python-brace-format msgid "Method \"{method}\" not allowed." -msgstr "" +msgstr "\"{method}\" metoduna izin verilmiyor." #: exceptions.py:120 msgid "Could not satisfy the request Accept header." -msgstr "" +msgstr "İsteğe ait Accept başlık bilgisi yanıt verilecek başlık bilgileri arasında değil." #: exceptions.py:132 #, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." -msgstr "" +msgstr "İstekte desteklenmeyen medya tipi: \"{media_type}\"." #: exceptions.py:145 msgid "Request was throttled." -msgstr "" +msgstr "Üst üste çok fazla istek yapıldı." #: fields.py:266 relations.py:206 relations.py:239 validators.py:79 #: validators.py:162 msgid "This field is required." -msgstr "" +msgstr "Bu alan zorunlu." #: fields.py:267 msgid "This field may not be null." -msgstr "" +msgstr "Bu alan boş bırakılmamalı." #: fields.py:603 fields.py:634 #, python-brace-format msgid "\"{input}\" is not a valid boolean." -msgstr "" +msgstr "\"{input}\" geçerli bir boolean değil." #: fields.py:669 msgid "This field may not be blank." -msgstr "" +msgstr "Bu alan boş bırakılmamalı." #: fields.py:670 fields.py:1664 #, python-brace-format msgid "Ensure this field has no more than {max_length} characters." -msgstr "" +msgstr "Bu alanın {max_length} karakterden fazla karakter barındırmadığından emin olun." #: fields.py:671 #, python-brace-format msgid "Ensure this field has at least {min_length} characters." -msgstr "" +msgstr "Bu alanın en az {min_length} karakter barındırdığından emin olun." #: fields.py:708 msgid "Enter a valid email address." -msgstr "" +msgstr "Geçerli bir e-posta adresi girin." #: fields.py:719 msgid "This value does not match the required pattern." -msgstr "" +msgstr "Bu değer gereken düzenli ifade deseni ile uyuşmuyor." #: fields.py:730 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." -msgstr "" +msgstr "Harf, rakam, altçizgi veya tireden oluşan geçerli bir \"slug\" giriniz." #: fields.py:742 msgid "Enter a valid URL." -msgstr "" +msgstr "Geçerli bir URL girin." #: fields.py:755 #, python-brace-format msgid "\"{value}\" is not a valid UUID." -msgstr "" +msgstr "\"{value}\" geçerli bir UUID değil." #: fields.py:791 msgid "Enter a valid IPv4 or IPv6 address." -msgstr "" +msgstr "Geçerli bir IPv4 ya da IPv6 adresi girin." #: fields.py:816 msgid "A valid integer is required." -msgstr "" +msgstr "Geçerli bir tam sayı girin." #: fields.py:817 fields.py:852 fields.py:885 #, python-brace-format msgid "Ensure this value is less than or equal to {max_value}." -msgstr "" +msgstr "Değerin {max_value} değerinden küçük ya da eşit olduğundan emin olun." #: fields.py:818 fields.py:853 fields.py:886 #, python-brace-format msgid "Ensure this value is greater than or equal to {min_value}." -msgstr "" +msgstr "Değerin {min_value} değerinden büyük ya da eşit olduğundan emin olun." #: fields.py:819 fields.py:854 fields.py:890 msgid "String value too large." -msgstr "" +msgstr "String değeri çok uzun." #: fields.py:851 fields.py:884 msgid "A valid number is required." -msgstr "" +msgstr "Geçerli bir numara gerekiyor." #: fields.py:887 #, python-brace-format msgid "Ensure that there are no more than {max_digits} digits in total." -msgstr "" +msgstr "Toplamda {max_digits} haneden fazla hane olmadığından emin olun." #: fields.py:888 #, python-brace-format msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." -msgstr "" +msgstr "Ondalık basamak değerinin {max_decimal_places} haneden fazla olmadığından emin olun." #: fields.py:889 #, python-brace-format msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." -msgstr "" +msgstr "Ondalık ayracından önce {max_whole_digits} basamaktan fazla olmadığından emin olun." #: fields.py:1004 #, python-brace-format msgid "Datetime has wrong format. Use one of these formats instead: {format}." -msgstr "" +msgstr "Datetime alanı yanlış biçimde. {format} biçimlerinden birini kullanın." #: fields.py:1005 msgid "Expected a datetime but got a date." -msgstr "" +msgstr "Datetime değeri bekleniyor, ama date değeri geldi." #: fields.py:1082 #, python-brace-format msgid "Date has wrong format. Use one of these formats instead: {format}." -msgstr "" +msgstr "Tarih biçimi yanlış. {format} biçimlerinden birini kullanın." #: fields.py:1083 msgid "Expected a date but got a datetime." -msgstr "" +msgstr "Date tipi beklenmekteydi, fakat datetime tipi geldi." #: fields.py:1151 #, python-brace-format msgid "Time has wrong format. Use one of these formats instead: {format}." -msgstr "" +msgstr "Time biçimi yanlış. {format} biçimlerinden birini kullanın." #: fields.py:1215 #, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." -msgstr "" +msgstr "Duration biçimi yanlış. {format} biçimlerinden birini kullanın." #: fields.py:1240 fields.py:1289 #, python-brace-format msgid "\"{input}\" is not a valid choice." -msgstr "" +msgstr "\"{input}\" geçerli bir seçim değil." #: fields.py:1243 relations.py:71 relations.py:442 #, python-brace-format msgid "More than {count} items..." -msgstr "" +msgstr "{count} elemandan daha fazla..." #: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 #, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." -msgstr "" +msgstr "Elemanların listesi beklenirken \"{input_type}\" alındı." #: fields.py:1291 msgid "This selection may not be empty." -msgstr "" +msgstr "Bu seçim boş bırakılmamalı." #: fields.py:1328 #, python-brace-format msgid "\"{input}\" is not a valid path choice." -msgstr "" +msgstr "\"{input}\" geçerli bir yol seçimi değil." #: fields.py:1347 msgid "No file was submitted." -msgstr "" +msgstr "Hiçbir dosya verilmedi." #: fields.py:1348 msgid "" "The submitted data was not a file. Check the encoding type on the form." -msgstr "" +msgstr "Gönderilen veri dosya değil. Formdaki kodlama tipini kontrol edin." #: fields.py:1349 msgid "No filename could be determined." -msgstr "" +msgstr "Hiçbir dosya adı belirlenemedi." #: fields.py:1350 msgid "The submitted file is empty." -msgstr "" +msgstr "Gönderilen dosya boş." #: fields.py:1351 #, python-brace-format msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." -msgstr "" +msgstr "Bu dosya adının en fazla {max_length} karakter uzunluğunda olduğundan emin olun. (şu anda {length} karakter)." #: fields.py:1399 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." -msgstr "" +msgstr "Geçerli bir resim yükleyin. Yüklediğiniz dosya resim değil ya da bozuk." #: fields.py:1438 relations.py:439 serializers.py:521 msgid "This list may not be empty." -msgstr "" +msgstr "Bu liste boş olmamalı." #: fields.py:1491 #, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." -msgstr "" +msgstr "Sözlük tipi bir değişken beklenirken \"{input_type}\" tipi bir değişken alındı." #: fields.py:1538 msgid "Value must be valid JSON." -msgstr "" +msgstr "Değer geçerli bir JSON olmalı." #: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 msgid "Submit" -msgstr "" +msgstr "Gönder" #: pagination.py:189 msgid "Invalid page." -msgstr "" +msgstr "Geçersiz sayfa." #: pagination.py:407 msgid "Invalid cursor" @@ -345,12 +345,12 @@ msgstr "Geçersiz imleç." #: relations.py:207 #, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." -msgstr "" +msgstr "Geçersiz pk \"{pk_value}\" - obje bulunamadı." #: relations.py:208 #, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." -msgstr "" +msgstr "Hatalı tip. Pk değeri beklenirken, alınan {data_type}." #: relations.py:240 msgid "Invalid hyperlink - No URL match." @@ -367,12 +367,12 @@ msgstr "Geçersiz hyper link - Nesne yok.." #: relations.py:243 #, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." -msgstr "" +msgstr "Hatalı tip. URL metni bekleniyor, {data_type} alındı." #: relations.py:402 #, python-brace-format msgid "Object with {slug_name}={value} does not exist." -msgstr "" +msgstr "{slug_name}={value} değerini taşıyan obje bulunamadı." #: relations.py:403 msgid "Invalid value." @@ -386,20 +386,20 @@ msgstr "Geçersiz veri. Bir sözlük bekleniyor, ama var {datatype}." #: templates/rest_framework/admin.html:118 #: templates/rest_framework/base.html:128 msgid "Filters" -msgstr "" +msgstr "Filtreler" #: templates/rest_framework/filters/django_filter.html:2 #: templates/rest_framework/filters/django_filter_crispyforms.html:4 msgid "Field filters" -msgstr "" +msgstr "Alan filtreleri" #: templates/rest_framework/filters/ordering.html:3 msgid "Ordering" -msgstr "" +msgstr "Sıralama" #: templates/rest_framework/filters/search.html:2 msgid "Search" -msgstr "" +msgstr "Arama" #: templates/rest_framework/horizontal/radio.html:2 #: templates/rest_framework/inline/radio.html:2 @@ -411,7 +411,7 @@ msgstr "Hiç kimse" #: templates/rest_framework/inline/select_multiple.html:2 #: templates/rest_framework/vertical/select_multiple.html:2 msgid "No items to select." -msgstr "" +msgstr "Seçenek yok." #: validators.py:24 msgid "This field must be unique." @@ -425,17 +425,17 @@ msgstr "{field_names} alanları benzersiz bir set yapmak gerekir." #: validators.py:226 #, python-brace-format msgid "This field must be unique for the \"{date_field}\" date." -msgstr "" +msgstr "Bu alan \"{date_field}\" tarihine göre eşsiz olmalı." #: validators.py:241 #, python-brace-format msgid "This field must be unique for the \"{date_field}\" month." -msgstr "" +msgstr "Bu alan \"{date_field}\" ayına göre eşsiz olmalı." #: validators.py:254 #, python-brace-format msgid "This field must be unique for the \"{date_field}\" year." -msgstr "" +msgstr "Bu alan \"{date_field}\" yılına göre eşsiz olmalı." #: versioning.py:42 msgid "Invalid version in \"Accept\" header." From f0fc339278fa8a8b61423c9d60c23dbd372af0ed Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy Date: Mon, 14 Mar 2016 08:40:00 +0100 Subject: [PATCH 036/457] Release date update. --- docs/topics/release-notes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index 9fa399670..f2187a35c 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -42,7 +42,7 @@ You can determine your currently installed version using `pip freeze`: ### 3.3.3 -**Date**: [7th March 2016][3.3.3-milestone]. +**Date**: [14th March 2016][3.3.3-milestone]. * Remove version string from templates. Thanks to @blag for the report and fixes. ([#3878][gh3878], [#3913][gh3913], [#3912][gh3912]) * Fixes vertical html layout for `BooleanField`. Thanks to Mikalai Radchuk for the fix. ([#3910][gh3910]) From 03270431edc8ce88938a2d8495fe125867807cca Mon Sep 17 00:00:00 2001 From: Mohamad Nour Chawich Date: Sun, 20 Mar 2016 21:46:37 +0100 Subject: [PATCH 037/457] Reorder initializing the view Determining the version and performing content negotiation should be done before ensuring the permission of the request. The reason is that these information can be used in handling the exceptions. For example different versions may return different error scheme. Also, the rendering class can be used to determine how to exception handler response should be rendered. --- rest_framework/views.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/rest_framework/views.py b/rest_framework/views.py index 56e3c4e49..c13e74447 100644 --- a/rest_framework/views.py +++ b/rest_framework/views.py @@ -372,11 +372,6 @@ class APIView(View): """ self.format_kwarg = self.get_format_suffix(**kwargs) - # Ensure that the incoming request is permitted - self.perform_authentication(request) - self.check_permissions(request) - self.check_throttles(request) - # Perform content negotiation and store the accepted info on the request neg = self.perform_content_negotiation(request) request.accepted_renderer, request.accepted_media_type = neg @@ -385,6 +380,11 @@ class APIView(View): version, scheme = self.determine_version(request, *args, **kwargs) request.version, request.versioning_scheme = version, scheme + # Ensure that the incoming request is permitted + self.perform_authentication(request) + self.check_permissions(request) + self.check_throttles(request) + def finalize_response(self, request, response, *args, **kwargs): """ Returns the final response object. From 91e869750ebd2a614a76f74954676ef433e05cd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20Gro=C3=9F?= Date: Mon, 21 Mar 2016 08:57:43 +0000 Subject: [PATCH 038/457] Fix typo --- docs/topics/3.1-announcement.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/topics/3.1-announcement.md b/docs/topics/3.1-announcement.md index 80d4007eb..46a67e3fc 100644 --- a/docs/topics/3.1-announcement.md +++ b/docs/topics/3.1-announcement.md @@ -110,7 +110,7 @@ When per-request internationalization is enabled, client requests will respect t "detail": "No se ha podido satisfacer la solicitud de cabecera de Accept." } -Note that the structure of the error responses is still the same. We still have a `details` key in the response. If needed you can modify this behavior too, by using a [custom exception handler][custom-exception-handler]. +Note that the structure of the error responses is still the same. We still have a `detail` key in the response. If needed you can modify this behavior too, by using a [custom exception handler][custom-exception-handler]. We include built-in translations both for standard exception cases, and for serializer validation errors. From 3785281d4c0830cdeac901e222e667eff42cfa54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20Gro=C3=9F?= Date: Mon, 21 Mar 2016 10:07:47 +0000 Subject: [PATCH 039/457] Add missing paginator in docs --- docs/topics/3.2-announcement.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/topics/3.2-announcement.md b/docs/topics/3.2-announcement.md index f0cc09a46..dc439f110 100644 --- a/docs/topics/3.2-announcement.md +++ b/docs/topics/3.2-announcement.md @@ -54,7 +54,7 @@ The following pagination view attributes and settings have been moved into attri * `view.max_paginate_by` - Use `paginator.max_page_size` instead. * `settings.PAGINATE_BY` - Use `paginator.page_size` instead. * `settings.PAGINATE_BY_PARAM` - Use `paginator.page_size_query_param` instead. -* `settings.MAX_PAGINATE_BY` - Use `max_page_size` instead. +* `settings.MAX_PAGINATE_BY` - Use `paginator.max_page_size` instead. ## Modifications to list behaviors From 0056703fe8afd5f2dfb8fe5eed4fb66c1ea9aa46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20Gro=C3=9F?= Date: Mon, 21 Mar 2016 10:23:34 +0000 Subject: [PATCH 040/457] Fix code sample indention --- docs/api-guide/pagination.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/pagination.md b/docs/api-guide/pagination.md index f704a3247..65ea2b3e6 100644 --- a/docs/api-guide/pagination.md +++ b/docs/api-guide/pagination.md @@ -54,7 +54,7 @@ Or apply the style globally, using the `DEFAULT_PAGINATION_CLASS` settings key. REST_FRAMEWORK = { 'DEFAULT_PAGINATION_CLASS': 'apps.core.pagination.StandardResultsSetPagination' - } + } --- From 101c178b8ccfd133581036c22ae7a1d3b42e4546 Mon Sep 17 00:00:00 2001 From: "S. Andrew Sheppard" Date: Thu, 24 Mar 2016 11:55:19 -0500 Subject: [PATCH 041/457] links to html-json-forms package --- docs/api-guide/serializers.md | 5 +++++ docs/topics/third-party-resources.md | 2 ++ 2 files changed, 7 insertions(+) diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md index 6a5519930..78d43a535 100644 --- a/docs/api-guide/serializers.md +++ b/docs/api-guide/serializers.md @@ -1080,6 +1080,9 @@ The [django-rest-framework-hstore][django-rest-framework-hstore] package provide The [dynamic-rest][dynamic-rest] package extends the ModelSerializer and ModelViewSet interfaces, adding API query parameters for filtering, sorting, and including / excluding all fields and relationships defined by your serializers. +## HTML JSON Forms +The [html-json-forms][html-json-forms] package provides an algorithm and serializer for processing `
` submissions per the (inactive) [HTML JSON Form specification][json-form-spec]. The serializer facilitates processing of arbitrarily nested JSON structures within HTML. For example, `` will be interpreted as `{"items": [{"id": "5"}]}`. + [cite]: https://groups.google.com/d/topic/django-users/sVFaOfQi4wY/discussion [relations]: relations.md [model-managers]: https://docs.djangoproject.com/en/dev/topics/db/managers/ @@ -1092,3 +1095,5 @@ The [dynamic-rest][dynamic-rest] package extends the ModelSerializer and ModelVi [django-rest-framework-hstore]: https://github.com/djangonauts/django-rest-framework-hstore [django-hstore]: https://github.com/djangonauts/django-hstore [dynamic-rest]: https://github.com/AltSchool/dynamic-rest +[html-json-forms]: https://github.com/wq/html-json-forms +[json-form-spec]: https://www.w3.org/TR/html-json-forms/ diff --git a/docs/topics/third-party-resources.md b/docs/topics/third-party-resources.md index ed15269ed..c4ac88255 100644 --- a/docs/topics/third-party-resources.md +++ b/docs/topics/third-party-resources.md @@ -203,6 +203,7 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque * [djangorestframework-gis][djangorestframework-gis] - Geographic add-ons * [djangorestframework-hstore][djangorestframework-hstore] - Serializer class to support django-hstore DictionaryField model field and its schema-mode feature. * [djangorestframework-jsonapi][djangorestframework-jsonapi] - Provides a parser, renderer, serializers, and other tools to help build an API that is compliant with the jsonapi.org spec. +* [html-json-forms][html-json-forms]: Provides an algorithm and serializer to process HTML JSON Form submissions per the (inactive) spec. ### Serializer fields @@ -355,3 +356,4 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque [drf-haystack]: http://drf-haystack.readthedocs.org/en/latest/ [django-rest-framework-version-transforms]: https://github.com/mrhwick/django-rest-framework-version-transforms [djangorestframework-jsonapi]: https://github.com/django-json-api/django-rest-framework-json-api +[html-json-forms]: https://github.com/wq/html-json-forms From 3e5a1397d72045bf9fe84fbbefa426ee31f5febc Mon Sep 17 00:00:00 2001 From: Tom Viner Date: Thu, 24 Mar 2016 20:37:38 +0000 Subject: [PATCH 042/457] remove trailing slash from cramer cursor link --- docs/topics/3.1-announcement.md | 2 +- rest_framework/pagination.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/topics/3.1-announcement.md b/docs/topics/3.1-announcement.md index 46a67e3fc..9eb93fcd7 100644 --- a/docs/topics/3.1-announcement.md +++ b/docs/topics/3.1-announcement.md @@ -30,7 +30,7 @@ Note that as a result of this work a number of settings keys and generic view at Until now, there has only been a single built-in pagination style in REST framework. We now have page, limit/offset and cursor based schemes included by default. -The cursor based pagination scheme is particularly smart, and is a better approach for clients iterating through large or frequently changing result sets. The scheme supports paging against non-unique indexes, by using both cursor and limit/offset information. It also allows for both forward and reverse cursor pagination. Much credit goes to David Cramer for [this blog post](http://cramer.io/2011/03/08/building-cursors-for-the-disqus-api/) on the subject. +The cursor based pagination scheme is particularly smart, and is a better approach for clients iterating through large or frequently changing result sets. The scheme supports paging against non-unique indexes, by using both cursor and limit/offset information. It also allows for both forward and reverse cursor pagination. Much credit goes to David Cramer for [this blog post](http://cramer.io/2011/03/08/building-cursors-for-the-disqus-api) on the subject. #### Pagination controls in the browsable API. diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py index 1051dc5b2..851ddd809 100644 --- a/rest_framework/pagination.py +++ b/rest_framework/pagination.py @@ -400,7 +400,7 @@ class CursorPagination(BasePagination): """ The cursor pagination implementation is neccessarily complex. For an overview of the position/offset style we use, see this post: - http://cramer.io/2011/03/08/building-cursors-for-the-disqus-api/ + http://cramer.io/2011/03/08/building-cursors-for-the-disqus-api """ cursor_query_param = 'cursor' page_size = api_settings.PAGE_SIZE From 3fdd6e1db584c472795d9cfdd7edc764228f33e2 Mon Sep 17 00:00:00 2001 From: Anthony Lukach Date: Tue, 29 Mar 2016 10:50:12 -0600 Subject: [PATCH 043/457] Add .partial_update to ModelViewSet documentation The ModelViewSet inherits from the UpdateModelMixin, which provides the `.partial_update` method. This should be reflected in the documentation. --- docs/api-guide/viewsets.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/viewsets.md b/docs/api-guide/viewsets.md index 0452a0f7b..e6df17f51 100644 --- a/docs/api-guide/viewsets.md +++ b/docs/api-guide/viewsets.md @@ -179,7 +179,7 @@ In order to use a `GenericViewSet` class you'll override the class and either mi The `ModelViewSet` class inherits from `GenericAPIView` and includes implementations for various actions, by mixing in the behavior of the various mixin classes. -The actions provided by the `ModelViewSet` class are `.list()`, `.retrieve()`, `.create()`, `.update()`, and `.destroy()`. +The actions provided by the `ModelViewSet` class are `.list()`, `.retrieve()`, `.create()`, `.update()`, `.partial_update()`, and `.destroy()`. #### Example From 5cc6c254d5d2dfe6a024d0ec64617aac693ccfac Mon Sep 17 00:00:00 2001 From: auvipy Date: Sat, 2 Apr 2016 23:02:44 +0600 Subject: [PATCH 044/457] updated minor django versions on tox --- tox.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index 9af1048d9..39742d2b3 100644 --- a/tox.ini +++ b/tox.ini @@ -13,8 +13,8 @@ setenv = PYTHONDONTWRITEBYTECODE=1 PYTHONWARNINGS=once deps = - django18: Django==1.8.11 - django19: Django==1.9.4 + django18: Django==1.8.12 + django19: Django==1.9.5 -rrequirements/requirements-testing.txt -rrequirements/requirements-optionals.txt From c22b92a66ca3bb740b8561f660883149953026e0 Mon Sep 17 00:00:00 2001 From: Nitesh Lohchab Date: Sun, 3 Apr 2016 00:07:45 +0530 Subject: [PATCH 045/457] type('') to str --- rest_framework/authentication.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/authentication.py b/rest_framework/authentication.py index 0ca90873e..0cd2dd0db 100644 --- a/rest_framework/authentication.py +++ b/rest_framework/authentication.py @@ -19,7 +19,7 @@ def get_authorization_header(request): Hide some test client ickyness where the header can be unicode. """ auth = request.META.get('HTTP_AUTHORIZATION', b'') - if isinstance(auth, type('')): + if isinstance(auth, str): # Work around django test client oddness auth = auth.encode(HTTP_HEADER_ENCODING) return auth From 09aa8f76c44197550e86dfd864fee61425346db8 Mon Sep 17 00:00:00 2001 From: Nitesh Lohchab Date: Sun, 3 Apr 2016 18:39:32 +0530 Subject: [PATCH 046/457] python2.x and 3.x compatible --- rest_framework/authentication.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rest_framework/authentication.py b/rest_framework/authentication.py index 0cd2dd0db..23ef49d69 100644 --- a/rest_framework/authentication.py +++ b/rest_framework/authentication.py @@ -7,6 +7,7 @@ import base64 from django.contrib.auth import authenticate, get_user_model from django.middleware.csrf import CsrfViewMiddleware +from django.utils.six import string_types from django.utils.translation import ugettext_lazy as _ from rest_framework import HTTP_HEADER_ENCODING, exceptions @@ -19,7 +20,7 @@ def get_authorization_header(request): Hide some test client ickyness where the header can be unicode. """ auth = request.META.get('HTTP_AUTHORIZATION', b'') - if isinstance(auth, str): + if isinstance(auth, string_types): # Work around django test client oddness auth = auth.encode(HTTP_HEADER_ENCODING) return auth From 763aab6b457370897d32c36d895a70cb0e980c28 Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy Date: Tue, 5 Apr 2016 16:29:16 +0200 Subject: [PATCH 047/457] Fix the string_types / text_types confusion introduced in #4025 --- rest_framework/authentication.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rest_framework/authentication.py b/rest_framework/authentication.py index 23ef49d69..eb8140643 100644 --- a/rest_framework/authentication.py +++ b/rest_framework/authentication.py @@ -7,7 +7,7 @@ import base64 from django.contrib.auth import authenticate, get_user_model from django.middleware.csrf import CsrfViewMiddleware -from django.utils.six import string_types +from django.utils.six import text_types from django.utils.translation import ugettext_lazy as _ from rest_framework import HTTP_HEADER_ENCODING, exceptions @@ -20,7 +20,7 @@ def get_authorization_header(request): Hide some test client ickyness where the header can be unicode. """ auth = request.META.get('HTTP_AUTHORIZATION', b'') - if isinstance(auth, string_types): + if isinstance(auth, text_types): # Work around django test client oddness auth = auth.encode(HTTP_HEADER_ENCODING) return auth From f1a384b61bdfe61bc45e71b25089609043c3d069 Mon Sep 17 00:00:00 2001 From: Raphael Gyory Date: Wed, 6 Apr 2016 16:58:15 +0200 Subject: [PATCH 048/457] Add Django Rest Messaging in Third party packages --- docs/topics/third-party-resources.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/topics/third-party-resources.md b/docs/topics/third-party-resources.md index c4ac88255..a12a24616 100644 --- a/docs/topics/third-party-resources.md +++ b/docs/topics/third-party-resources.md @@ -253,6 +253,7 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque * [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. * [drf-haystack][drf-haystack] - Haystack search for Django Rest Framework * [django-rest-framework-version-transforms][django-rest-framework-version-transforms] - Enables the use of delta transformations for versioning of DRF resource representations. +* [django-rest-messaging][django-rest-messaging], [django-rest-messaging-centrifugo][django-rest-messaging-centrifugo] and [django-rest-messaging-js][django-rest-messaging-js] - A real-time pluggable messaging service using DRM. ## Other Resources From b8701015818494109441310a5a88ebea901d2086 Mon Sep 17 00:00:00 2001 From: Raphael Gyory Date: Wed, 6 Apr 2016 17:00:26 +0200 Subject: [PATCH 049/457] Update third-party-resources.md --- docs/topics/third-party-resources.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/topics/third-party-resources.md b/docs/topics/third-party-resources.md index a12a24616..cc29c4334 100644 --- a/docs/topics/third-party-resources.md +++ b/docs/topics/third-party-resources.md @@ -358,3 +358,6 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque [django-rest-framework-version-transforms]: https://github.com/mrhwick/django-rest-framework-version-transforms [djangorestframework-jsonapi]: https://github.com/django-json-api/django-rest-framework-json-api [html-json-forms]: https://github.com/wq/html-json-forms +[django-rest-messaging]: https://github.com/raphaelgyory/django-rest-messaging +[django-rest-messaging-centrifugo]: https://github.com/raphaelgyory/django-rest-messaging-centrifugo +[django-rest-messaging-js]: https://github.com/raphaelgyory/django-rest-messaging-js From 78e4ea0d6e88a7b355ec3e790ef0e8f95859ca2d Mon Sep 17 00:00:00 2001 From: Jonathan Liuti Date: Thu, 7 Apr 2016 17:24:26 +0200 Subject: [PATCH 050/457] No auth view failing permission should raise 403 A view with no `authentication_classes` set and that fails a permission check should raise a 403 with the message from the failing permission. --- rest_framework/views.py | 2 +- tests/test_authentication.py | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/rest_framework/views.py b/rest_framework/views.py index c13e74447..41d108e53 100644 --- a/rest_framework/views.py +++ b/rest_framework/views.py @@ -162,7 +162,7 @@ class APIView(View): """ If request is not permitted, determine what kind of exception to raise. """ - if not request.successful_authenticator: + if request.authenticators and not request.successful_authenticator: raise exceptions.NotAuthenticated() raise exceptions.PermissionDenied(detail=message) diff --git a/tests/test_authentication.py b/tests/test_authentication.py index 285a3210c..70eea3132 100644 --- a/tests/test_authentication.py +++ b/tests/test_authentication.py @@ -321,3 +321,28 @@ class FailingAuthAccessedInRenderer(TestCase): response = self.view(request) content = response.render().content self.assertEqual(content, b'not authenticated') + + +class NoAuthenticationClassesTests(TestCase): + def test_permission_message_with_no_authentication_classes(self): + """ + An unauthenticated request made against a view that containes no + `authentication_classes` but do contain `permissions_classes` the error + code returned should be 403 with the exception's message. + """ + + class DummyPermission(permissions.BasePermission): + message = 'Dummy permission message' + + def has_permission(self, request, view): + return False + + request = factory.get('/') + view = MockView.as_view( + authentication_classes=(), + permission_classes=(DummyPermission,), + ) + response = view(request) + self.assertEqual(response.status_code, + status.HTTP_403_FORBIDDEN) + self.assertEqual(response.data, {'detail': 'Dummy permission message'}) From 019c6db759ed5aa765c26a895bbcc6953e62f423 Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy Date: Thu, 7 Apr 2016 17:34:27 +0200 Subject: [PATCH 051/457] Fix the string_types / text_types confusion introduced in #4025 (#4035) --- rest_framework/authentication.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rest_framework/authentication.py b/rest_framework/authentication.py index 23ef49d69..eb8140643 100644 --- a/rest_framework/authentication.py +++ b/rest_framework/authentication.py @@ -7,7 +7,7 @@ import base64 from django.contrib.auth import authenticate, get_user_model from django.middleware.csrf import CsrfViewMiddleware -from django.utils.six import string_types +from django.utils.six import text_types from django.utils.translation import ugettext_lazy as _ from rest_framework import HTTP_HEADER_ENCODING, exceptions @@ -20,7 +20,7 @@ def get_authorization_header(request): Hide some test client ickyness where the header can be unicode. """ auth = request.META.get('HTTP_AUTHORIZATION', b'') - if isinstance(auth, string_types): + if isinstance(auth, text_types): # Work around django test client oddness auth = auth.encode(HTTP_HEADER_ENCODING) return auth From 2622588b30c14a2bfab2838058138c7750cd8fd9 Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy Date: Thu, 7 Apr 2016 18:00:17 +0200 Subject: [PATCH 052/457] Typo correction. --- rest_framework/authentication.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rest_framework/authentication.py b/rest_framework/authentication.py index eb8140643..63d302bc2 100644 --- a/rest_framework/authentication.py +++ b/rest_framework/authentication.py @@ -7,7 +7,7 @@ import base64 from django.contrib.auth import authenticate, get_user_model from django.middleware.csrf import CsrfViewMiddleware -from django.utils.six import text_types +from django.utils.six import text_type from django.utils.translation import ugettext_lazy as _ from rest_framework import HTTP_HEADER_ENCODING, exceptions @@ -20,7 +20,7 @@ def get_authorization_header(request): Hide some test client ickyness where the header can be unicode. """ auth = request.META.get('HTTP_AUTHORIZATION', b'') - if isinstance(auth, text_types): + if isinstance(auth, text_type): # Work around django test client oddness auth = auth.encode(HTTP_HEADER_ENCODING) return auth From 95418eb8ac9b3efd57ccca5c7159ee0bfa8effb3 Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy Date: Fri, 8 Apr 2016 15:43:10 +0200 Subject: [PATCH 053/457] Add the medium collection related to Django REST framework. (#4043) --- docs/topics/third-party-resources.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/topics/third-party-resources.md b/docs/topics/third-party-resources.md index cc29c4334..003366ffe 100644 --- a/docs/topics/third-party-resources.md +++ b/docs/topics/third-party-resources.md @@ -279,6 +279,7 @@ 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] +* [Blog posts about Django REST framework][medium-django-rest-framework] ### Documentations * [Classy Django REST Framework][cdrf.co] @@ -361,3 +362,4 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque [django-rest-messaging]: https://github.com/raphaelgyory/django-rest-messaging [django-rest-messaging-centrifugo]: https://github.com/raphaelgyory/django-rest-messaging-centrifugo [django-rest-messaging-js]: https://github.com/raphaelgyory/django-rest-messaging-js +[medium-django-rest-framework]: https://medium.com/django-rest-framework From d87f2bc7b67c89bf556dfbadf1fb48aa0dc2ca6c Mon Sep 17 00:00:00 2001 From: Simon Charette Date: Fri, 8 Apr 2016 10:37:23 -0400 Subject: [PATCH 054/457] OrderingFilter adjustements (#3983) * Made sure the OrderingFilter relies on Field.verbose_name. * Marked OrderingFilter's order labels for translation. --- rest_framework/filters.py | 7 +++---- tests/test_filters.py | 15 ++++++++++++++- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/rest_framework/filters.py b/rest_framework/filters.py index a4542df10..2a25378a0 100644 --- a/rest_framework/filters.py +++ b/rest_framework/filters.py @@ -240,8 +240,7 @@ class OrderingFilter(BaseFilterBackend): elif valid_fields == '__all__': # View explicitly allows filtering on any model field valid_fields = [ - (field.name, getattr(field, 'label', field.name.title())) - for field in queryset.model._meta.fields + (field.name, field.verbose_name) for field in queryset.model._meta.fields ] valid_fields += [ (key, key.title().split('__')) @@ -272,8 +271,8 @@ class OrderingFilter(BaseFilterBackend): current = None if current is None else current[0] options = [] for key, label in self.get_valid_fields(queryset, view): - options.append((key, '%s - ascending' % label)) - options.append(('-' + key, '%s - descending' % label)) + options.append((key, '%s - %s' % (label, _('ascending')))) + options.append(('-' + key, '%s - %s' % (label, _('descending')))) return { 'request': request, 'current': current, diff --git a/tests/test_filters.py b/tests/test_filters.py index 729a7b75b..b72d95691 100644 --- a/tests/test_filters.py +++ b/tests/test_filters.py @@ -499,7 +499,7 @@ class SearchFilterM2MTests(TestCase): class OrderingFilterModel(models.Model): - title = models.CharField(max_length=20) + title = models.CharField(max_length=20, verbose_name='verbose title') text = models.CharField(max_length=100) @@ -741,6 +741,19 @@ class OrderingFilterTests(TestCase): reload_module(filters) + def test_get_template_context(self): + class OrderingListView(generics.ListAPIView): + ordering_fields = '__all__' + serializer_class = OrderingFilterSerializer + queryset = OrderingFilterModel.objects.all() + filter_backends = (filters.OrderingFilter,) + + request = factory.get('/', {'ordering': 'title'}, HTTP_ACCEPT='text/html') + view = OrderingListView.as_view() + response = view(request) + + self.assertContains(response, 'verbose title') + class SensitiveOrderingFilterModel(models.Model): username = models.CharField(max_length=20) From 08dad04b1989c69295a3536e186e480fde42e460 Mon Sep 17 00:00:00 2001 From: Phivos Stylianides Date: Mon, 11 Apr 2016 16:13:11 +0300 Subject: [PATCH 055/457] Fix warnings when running tests (#4047) --- .gitignore | 1 + tests/browsable_api/test_browsable_nested_api.py | 4 ++-- tests/test_model_serializer.py | 8 ++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index e9222c2da..41768084c 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,7 @@ /*.egg-info/ /env/ MANIFEST +coverage.* !.gitignore !.travis.yml diff --git a/tests/browsable_api/test_browsable_nested_api.py b/tests/browsable_api/test_browsable_nested_api.py index dbbd11eea..9e5538efc 100644 --- a/tests/browsable_api/test_browsable_nested_api.py +++ b/tests/browsable_api/test_browsable_nested_api.py @@ -14,13 +14,13 @@ class NestedSerializer(serializers.Serializer): two = serializers.IntegerField(max_value=10) -class TestNestedSerializerSerializer(serializers.Serializer): +class NestedSerializerTestSerializer(serializers.Serializer): nested = NestedSerializer() class NestedSerializersView(ListCreateAPIView): renderer_classes = (BrowsableAPIRenderer, ) - serializer_class = TestNestedSerializerSerializer + serializer_class = NestedSerializerTestSerializer queryset = [{'nested': {'one': 1, 'two': 2}}] diff --git a/tests/test_model_serializer.py b/tests/test_model_serializer.py index 0179abc44..185130778 100644 --- a/tests/test_model_serializer.py +++ b/tests/test_model_serializer.py @@ -784,7 +784,7 @@ class TestBulkCreate(TestCase): assert serializer.data == data -class TestMetaClassModel(models.Model): +class MetaClassTestModel(models.Model): text = models.CharField(max_length=100) @@ -792,7 +792,7 @@ class TestSerializerMetaClass(TestCase): def test_meta_class_fields_option(self): class ExampleSerializer(serializers.ModelSerializer): class Meta: - model = TestMetaClassModel + model = MetaClassTestModel fields = 'text' with self.assertRaises(TypeError) as result: @@ -806,7 +806,7 @@ class TestSerializerMetaClass(TestCase): def test_meta_class_exclude_option(self): class ExampleSerializer(serializers.ModelSerializer): class Meta: - model = TestMetaClassModel + model = MetaClassTestModel exclude = 'text' with self.assertRaises(TypeError) as result: @@ -820,7 +820,7 @@ class TestSerializerMetaClass(TestCase): def test_meta_class_fields_and_exclude_options(self): class ExampleSerializer(serializers.ModelSerializer): class Meta: - model = TestMetaClassModel + model = MetaClassTestModel fields = ('text',) exclude = ('text',) From 9d9658f128476e72aedd62ee60ca2506c5e4bae1 Mon Sep 17 00:00:00 2001 From: Clinton Blackburn Date: Mon, 11 Apr 2016 23:04:20 -0400 Subject: [PATCH 056/457] Added support for custom CSRF cookie names Instead of hardcoding the CSRF cookie name, the value is passed to the template as a context variable, rendered as a JavaScript variable, and read by csrf.js. Fixes #4048 --- rest_framework/renderers.py | 4 +++- rest_framework/static/rest_framework/js/csrf.js | 2 +- rest_framework/templates/rest_framework/admin.html | 5 +++++ rest_framework/templates/rest_framework/base.html | 5 +++++ 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index 68af417da..53bbb1390 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -12,6 +12,7 @@ import json from collections import OrderedDict from django import forms +from django.conf import settings from django.core.exceptions import ImproperlyConfigured from django.core.paginator import Page from django.http.multipartparser import parse_header @@ -657,7 +658,8 @@ class BrowsableAPIRenderer(BaseRenderer): 'display_edit_forms': bool(response.status_code != 403), - 'api_settings': api_settings + 'api_settings': api_settings, + 'csrf_cookie_name': settings.CSRF_COOKIE_NAME, } return context diff --git a/rest_framework/static/rest_framework/js/csrf.js b/rest_framework/static/rest_framework/js/csrf.js index 4e8da0de5..73d1ef67d 100644 --- a/rest_framework/static/rest_framework/js/csrf.js +++ b/rest_framework/static/rest_framework/js/csrf.js @@ -33,7 +33,7 @@ function sameOrigin(url) { !(/^(\/\/|http:|https:).*/.test(url)); } -var csrftoken = getCookie('csrftoken'); +var csrftoken = getCookie(window.drf.csrfCookieName); $.ajaxSetup({ beforeSend: function(xhr, settings) { diff --git a/rest_framework/templates/rest_framework/admin.html b/rest_framework/templates/rest_framework/admin.html index a86adbc60..a21ea57be 100644 --- a/rest_framework/templates/rest_framework/admin.html +++ b/rest_framework/templates/rest_framework/admin.html @@ -230,6 +230,11 @@ {% if filter_form %}{{ filter_form }}{% endif %} {% block script %} + diff --git a/rest_framework/templates/rest_framework/base.html b/rest_framework/templates/rest_framework/base.html index eccadc3cc..21431b70c 100644 --- a/rest_framework/templates/rest_framework/base.html +++ b/rest_framework/templates/rest_framework/base.html @@ -258,6 +258,11 @@ {% block script %} + From 888e5c78bd0fafd261ad86441a52887a803ec165 Mon Sep 17 00:00:00 2001 From: Puneet Aggarwal Date: Tue, 19 Apr 2016 19:39:16 +0530 Subject: [PATCH 057/457] Update README.md (#4055) --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 9025e91b4..79b43416f 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,7 @@ [![build-status-image]][travis] [![coverage-status-image]][codecov] [![pypi-version]][pypi] +[![Gitter](https://badges.gitter.im/tomchristie/django-rest-framework.svg)](https://gitter.im/tomchristie/django-rest-framework?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) **Awesome web-browsable Web APIs.** From 88c80fe2e901cf6607125b7bf57b4b2e084a4c7b Mon Sep 17 00:00:00 2001 From: Daniele Varrazzo Date: Wed, 27 Apr 2016 17:04:01 +0100 Subject: [PATCH 058/457] Fixed DecimalField arbitrary precision support (#4075) --- rest_framework/fields.py | 3 +++ tests/test_fields.py | 15 +++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 2a08e09ff..5dcd546c0 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -992,6 +992,9 @@ class DecimalField(Field): """ Quantize the decimal value to the configured precision. """ + if self.decimal_places is None: + return value + context = decimal.getcontext().copy() context.prec = self.max_digits return value.quantize( diff --git a/tests/test_fields.py b/tests/test_fields.py index cefb45605..304de11ee 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -894,6 +894,21 @@ class TestNoStringCoercionDecimalField(FieldValues): ) +class TestNoDecimalPlaces(FieldValues): + valid_inputs = { + '0.12345': Decimal('0.12345'), + } + invalid_inputs = { + '0.1234567': ['Ensure that there are no more than 6 digits in total.'] + } + outputs = { + '1.2345': '1.2345', + '0': '0', + '1.1': '1.1', + } + field = serializers.DecimalField(max_digits=6, decimal_places=None) + + # Date & time serializers... class TestDateField(FieldValues): From a9bbb502cb0fb516deb444e1b58762cd3edb0c6d Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy Date: Fri, 29 Apr 2016 15:16:03 +0200 Subject: [PATCH 059/457] Remove references to South as we don't need it any longer. (#4085) * Remove references to South as we don't need it any longer. * Add a note about auth_token including Django migrations. --- docs/api-guide/authentication.md | 37 +------------------------------- 1 file changed, 1 insertion(+), 36 deletions(-) diff --git a/docs/api-guide/authentication.md b/docs/api-guide/authentication.md index 3d1cfd1e8..06d043b6c 100644 --- a/docs/api-guide/authentication.md +++ b/docs/api-guide/authentication.md @@ -128,11 +128,10 @@ To use the `TokenAuthentication` scheme you'll need to [configure the authentica --- -**Note:** Make sure to run `manage.py syncdb` after changing your settings. The `rest_framework.authtoken` app provides both Django (from v1.7) and South database migrations. See [Schema migrations](#schema-migrations) below. +**Note:** Make sure to run `manage.py migrate` after changing your settings. The `rest_framework.authtoken` app provides Django database migrations. --- - You'll also need to create tokens for your users. from rest_framework.authtoken.models import Token @@ -217,38 +216,6 @@ It is also possible to create Tokens manually through admin interface. In case y TokenAdmin.raw_id_fields = ('user',) -#### Schema migrations - -The `rest_framework.authtoken` app includes both Django native migrations (for Django versions >1.7) and South migrations (for Django versions <1.7) that will create the authtoken table. - ----- - -**Note**: From REST Framework v2.4.0 using South with Django <1.7 requires upgrading South v1.0+ - ----- - - -If you're using a [custom user model][custom-user-model] you'll need to make sure that any initial migration that creates the user table runs before the authtoken table is created. - -You can do so by inserting a `needed_by` attribute in your user migration: - - class Migration: - - needed_by = ( - ('authtoken', '0001_initial'), - ) - - def forwards(self): - ... - -For more details, see the [south documentation on dependencies][south-dependencies]. - -Also note that if you're using a `post_save` signal to create tokens, then the first time you create the database tables, you'll need to ensure any migrations are run prior to creating any superusers. For example: - - python manage.py syncdb --noinput # Won't create a superuser just yet, due to `--noinput`. - python manage.py migrate - python manage.py createsuperuser - ## SessionAuthentication This authentication scheme uses Django's default session backend for authentication. Session authentication is appropriate for AJAX clients that are running in the same session context as your website. @@ -392,8 +359,6 @@ HTTP Signature (currently a [IETF draft][http-signature-ietf-draft]) provides a [throttling]: throttling.md [csrf-ajax]: https://docs.djangoproject.com/en/dev/ref/csrf/#ajax [mod_wsgi_official]: http://code.google.com/p/modwsgi/wiki/ConfigurationDirectives#WSGIPassAuthorization -[custom-user-model]: https://docs.djangoproject.com/en/dev/topics/auth/customizing/#specifying-a-custom-user-model -[south-dependencies]: http://south.readthedocs.org/en/latest/dependencies.html [django-oauth-toolkit-getting-started]: https://django-oauth-toolkit.readthedocs.org/en/latest/rest-framework/getting_started.html [django-rest-framework-oauth]: http://jpadilla.github.io/django-rest-framework-oauth/ [django-rest-framework-oauth-authentication]: http://jpadilla.github.io/django-rest-framework-oauth/authentication/ From 04ebb1ef04a788485ca10007dd9c91895d7c0792 Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Tue, 3 May 2016 09:50:52 +0600 Subject: [PATCH 060/457] upgraded minor django version n tox --- tox.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index 39742d2b3..8721af601 100644 --- a/tox.ini +++ b/tox.ini @@ -13,8 +13,8 @@ setenv = PYTHONDONTWRITEBYTECODE=1 PYTHONWARNINGS=once deps = - django18: Django==1.8.12 - django19: Django==1.9.5 + django18: Django==1.8.13 + django19: Django==1.9.6 -rrequirements/requirements-testing.txt -rrequirements/requirements-optionals.txt From e19b21ecc547bc3318354802aeadb5d45c65d475 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Germ=C3=A1n=20Larra=C3=ADn?= Date: Tue, 3 May 2016 05:24:55 -0300 Subject: [PATCH 061/457] Handle incorrectly padded HTTP basic auth header (#4090) --- rest_framework/authentication.py | 3 ++- tests/test_authentication.py | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/rest_framework/authentication.py b/rest_framework/authentication.py index 63d302bc2..120be6165 100644 --- a/rest_framework/authentication.py +++ b/rest_framework/authentication.py @@ -4,6 +4,7 @@ Provides various authentication policies. from __future__ import unicode_literals import base64 +import binascii from django.contrib.auth import authenticate, get_user_model from django.middleware.csrf import CsrfViewMiddleware @@ -77,7 +78,7 @@ class BasicAuthentication(BaseAuthentication): try: auth_parts = base64.b64decode(auth[1]).decode(HTTP_HEADER_ENCODING).partition(':') - except (TypeError, UnicodeDecodeError): + except (TypeError, UnicodeDecodeError, binascii.Error): msg = _('Invalid basic header. Credentials not correctly base64 encoded.') raise exceptions.AuthenticationFailed(msg) diff --git a/tests/test_authentication.py b/tests/test_authentication.py index 70eea3132..9aff7280b 100644 --- a/tests/test_authentication.py +++ b/tests/test_authentication.py @@ -85,6 +85,14 @@ class BasicAuthTests(TestCase): response = self.csrf_client.post('/basic/', {'example': 'example'}, format='json', HTTP_AUTHORIZATION=auth) self.assertEqual(response.status_code, status.HTTP_200_OK) + def test_regression_handle_bad_base64_basic_auth_header(self): + """Ensure POSTing JSON over basic auth with incorrectly padded Base64 string is handled correctly""" + # regression test for issue in 'rest_framework.authentication.BasicAuthentication.authenticate' + # https://github.com/tomchristie/django-rest-framework/issues/4089 + auth = 'Basic =a=' + response = self.csrf_client.post('/basic/', {'example': 'example'}, format='json', HTTP_AUTHORIZATION=auth) + self.assertEqual(response.status_code, status.HTTP_401_UNAUTHORIZED) + def test_post_form_failing_basic_auth(self): """Ensure POSTing form over basic auth without correct credentials fails""" response = self.csrf_client.post('/basic/', {'example': 'example'}) From 28c6d96af85dae4678f4cfc5932b0022c3017d1e Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Tue, 3 May 2016 14:25:27 +0600 Subject: [PATCH 062/457] upgraded minor django version n tox (#4091) --- tox.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index 39742d2b3..8721af601 100644 --- a/tox.ini +++ b/tox.ini @@ -13,8 +13,8 @@ setenv = PYTHONDONTWRITEBYTECODE=1 PYTHONWARNINGS=once deps = - django18: Django==1.8.12 - django19: Django==1.9.5 + django18: Django==1.8.13 + django19: Django==1.9.6 -rrequirements/requirements-testing.txt -rrequirements/requirements-optionals.txt From 5f52c4ff3eafdd90987c789d6f7b5b26aadfce2b Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Tue, 3 May 2016 15:52:05 +0600 Subject: [PATCH 063/457] added python3.5 for django 1.8 checks --- .travis.yml | 1 + tox.ini | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index cf3cddfec..4c7c09dc0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,7 @@ env: - TOX_ENV=py35-django19 - TOX_ENV=py34-django19 - TOX_ENV=py27-django19 + - TOX_ENV=py35-django18 - TOX_ENV=py34-django18 - TOX_ENV=py33-django18 - TOX_ENV=py32-django18 diff --git a/tox.ini b/tox.ini index 8721af601..120d2f340 100644 --- a/tox.ini +++ b/tox.ini @@ -4,7 +4,7 @@ addopts=--tb=short [tox] envlist = py27-{lint,docs}, - {py27,py32,py33,py34}-django18, + {py27,py32,py33,py34,py35}-django18, {py27,py34,py35}-django{19} [testenv] From 399e1c1dcfd9eb69794e63dd60d74c16f66e06ba Mon Sep 17 00:00:00 2001 From: Kyle Hornberg Date: Tue, 3 May 2016 09:53:55 -0500 Subject: [PATCH 064/457] Typo fix (#4094) --- docs/api-guide/relations.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/relations.md b/docs/api-guide/relations.md index 31a78f28f..8695b2c1e 100644 --- a/docs/api-guide/relations.md +++ b/docs/api-guide/relations.md @@ -489,7 +489,7 @@ See the Django documentation on [reverse relationships][reverse-relationships] f ## Generic relationships -If you want to serialize a generic foreign key, you need to define a custom field, to determine explicitly how you want serialize the targets of the relationship. +If you want to serialize a generic foreign key, you need to define a custom field, to determine explicitly how you want to serialize the targets of the relationship. For example, given the following model for a tag, which has a generic relationship with other arbitrary models: From c355cdc585efd36302445ab99c6e7e5887383a4e Mon Sep 17 00:00:00 2001 From: Taylor Edmiston Date: Tue, 3 May 2016 14:20:45 -0400 Subject: [PATCH 065/457] Fix typo in permissions docs --- docs/api-guide/permissions.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/permissions.md b/docs/api-guide/permissions.md index bbac824da..5386e4df6 100644 --- a/docs/api-guide/permissions.md +++ b/docs/api-guide/permissions.md @@ -144,7 +144,7 @@ To use custom model permissions, override `DjangoModelPermissions` and set the ` #### Using with views that do not include a `queryset` attribute. -If you're using this permission with a view that uses an overridden `get_queryset()` method there may not be a `queryset` attribute on the view. In this case we suggest also marking the view with a sential queryset, so that this class can determine the required permissions. For example: +If you're using this permission with a view that uses an overridden `get_queryset()` method there may not be a `queryset` attribute on the view. In this case we suggest also marking the view with a sentinel queryset, so that this class can determine the required permissions. For example: queryset = User.objects.none() # Required for DjangoModelPermissions From ffdac0d93619b7ec6039b94ce0e563f0330faeb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 4 May 2016 11:53:34 +0200 Subject: [PATCH 066/457] TokenAuthentication: Allow custom keyword in the header (#4097) This allows subclassing TokenAuthentication and setting custom keyword, thus allowing the Authorization header to be for example: Bearer 956e252a-513c-48c5-92dd-bfddc364e812 It doesn't change the behavior of TokenAuthentication itself, it simply allows to reuse the logic of TokenAuthentication without the need of copy pasting the class and changing one hardcoded string. Related: #4080 --- docs/api-guide/authentication.md | 2 ++ rest_framework/authentication.py | 5 +++-- tests/test_authentication.py | 22 +++++++++++++++++----- 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/docs/api-guide/authentication.md b/docs/api-guide/authentication.md index 06d043b6c..5568ed0c9 100644 --- a/docs/api-guide/authentication.md +++ b/docs/api-guide/authentication.md @@ -143,6 +143,8 @@ For clients to authenticate, the token key should be included in the `Authorizat Authorization: Token 9944b09199c62bcf9418ad846dd0e4bbdfc6ee4b +**Note:** If you want to use a different keyword in the header, such as `Bearer`, simply subclass `TokenAuthentication` and set the `keyword` class variable. + If successfully authenticated, `TokenAuthentication` provides the following credentials. * `request.user` will be a Django `User` instance. diff --git a/rest_framework/authentication.py b/rest_framework/authentication.py index 120be6165..cb9608a3c 100644 --- a/rest_framework/authentication.py +++ b/rest_framework/authentication.py @@ -150,6 +150,7 @@ class TokenAuthentication(BaseAuthentication): Authorization: Token 401f7ac837da42b97f613d789819ff93537bee6a """ + keyword = 'Token' model = None def get_model(self): @@ -168,7 +169,7 @@ class TokenAuthentication(BaseAuthentication): def authenticate(self, request): auth = get_authorization_header(request).split() - if not auth or auth[0].lower() != b'token': + if not auth or auth[0].lower() != self.keyword.lower().encode(): return None if len(auth) == 1: @@ -199,4 +200,4 @@ class TokenAuthentication(BaseAuthentication): return (token.user, token) def authenticate_header(self, request): - return 'Token' + return self.keyword diff --git a/tests/test_authentication.py b/tests/test_authentication.py index 9aff7280b..9784087d8 100644 --- a/tests/test_authentication.py +++ b/tests/test_authentication.py @@ -35,6 +35,10 @@ class CustomTokenAuthentication(TokenAuthentication): model = CustomToken +class CustomKeywordTokenAuthentication(TokenAuthentication): + keyword = 'Bearer' + + class MockView(APIView): permission_classes = (permissions.IsAuthenticated,) @@ -53,6 +57,7 @@ urlpatterns = [ url(r'^basic/$', MockView.as_view(authentication_classes=[BasicAuthentication])), url(r'^token/$', MockView.as_view(authentication_classes=[TokenAuthentication])), url(r'^customtoken/$', MockView.as_view(authentication_classes=[CustomTokenAuthentication])), + url(r'^customkeywordtoken/$', MockView.as_view(authentication_classes=[CustomKeywordTokenAuthentication])), url(r'^auth-token/$', 'rest_framework.authtoken.views.obtain_auth_token'), url(r'^auth/', include('rest_framework.urls', namespace='rest_framework')), ] @@ -166,6 +171,7 @@ class BaseTokenAuthTests(object): urls = 'tests.test_authentication' model = None path = None + header_prefix = 'Token ' def setUp(self): self.csrf_client = APIClient(enforce_csrf_checks=True) @@ -179,31 +185,31 @@ class BaseTokenAuthTests(object): def test_post_form_passing_token_auth(self): """Ensure POSTing json over token auth with correct credentials passes and does not require CSRF""" - auth = 'Token ' + self.key + auth = self.header_prefix + self.key response = self.csrf_client.post(self.path, {'example': 'example'}, HTTP_AUTHORIZATION=auth) self.assertEqual(response.status_code, status.HTTP_200_OK) def test_fail_post_form_passing_nonexistent_token_auth(self): # use a nonexistent token key - auth = 'Token wxyz6789' + auth = self.header_prefix + 'wxyz6789' response = self.csrf_client.post(self.path, {'example': 'example'}, HTTP_AUTHORIZATION=auth) self.assertEqual(response.status_code, status.HTTP_401_UNAUTHORIZED) def test_fail_post_form_passing_invalid_token_auth(self): # add an 'invalid' unicode character - auth = 'Token ' + self.key + "¸" + auth = self.header_prefix + self.key + "¸" response = self.csrf_client.post(self.path, {'example': 'example'}, HTTP_AUTHORIZATION=auth) self.assertEqual(response.status_code, status.HTTP_401_UNAUTHORIZED) def test_post_json_passing_token_auth(self): """Ensure POSTing form over token auth with correct credentials passes and does not require CSRF""" - auth = "Token " + self.key + auth = self.header_prefix + self.key response = self.csrf_client.post(self.path, {'example': 'example'}, format='json', HTTP_AUTHORIZATION=auth) self.assertEqual(response.status_code, status.HTTP_200_OK) def test_post_json_makes_one_db_query(self): """Ensure that authenticating a user using a token performs only one DB query""" - auth = "Token " + self.key + auth = self.header_prefix + self.key def func_to_test(): return self.csrf_client.post(self.path, {'example': 'example'}, format='json', HTTP_AUTHORIZATION=auth) @@ -273,6 +279,12 @@ class CustomTokenAuthTests(BaseTokenAuthTests, TestCase): path = '/customtoken/' +class CustomKeywordTokenAuthTests(BaseTokenAuthTests, TestCase): + model = Token + path = '/customkeywordtoken/' + header_prefix = 'Bearer ' + + class IncorrectCredentialsTests(TestCase): def test_incorrect_credentials(self): """ From d39af5335cba57c0e36ab6949c5cef9b02a20e26 Mon Sep 17 00:00:00 2001 From: Hongxia Zhong Date: Fri, 6 May 2016 01:22:33 -0700 Subject: [PATCH 067/457] Fix incorrect zh-hans and zh-hant locale directory path --- .../{zh-Hans => zh_Hans}/LC_MESSAGES/django.mo | Bin .../{zh-Hans => zh_Hans}/LC_MESSAGES/django.po | 0 .../{zh-Hant => zh_Hant}/LC_MESSAGES/django.mo | Bin .../{zh-Hant => zh_Hant}/LC_MESSAGES/django.po | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename rest_framework/locale/{zh-Hans => zh_Hans}/LC_MESSAGES/django.mo (100%) rename rest_framework/locale/{zh-Hans => zh_Hans}/LC_MESSAGES/django.po (100%) rename rest_framework/locale/{zh-Hant => zh_Hant}/LC_MESSAGES/django.mo (100%) rename rest_framework/locale/{zh-Hant => zh_Hant}/LC_MESSAGES/django.po (100%) diff --git a/rest_framework/locale/zh-Hans/LC_MESSAGES/django.mo b/rest_framework/locale/zh_Hans/LC_MESSAGES/django.mo similarity index 100% rename from rest_framework/locale/zh-Hans/LC_MESSAGES/django.mo rename to rest_framework/locale/zh_Hans/LC_MESSAGES/django.mo diff --git a/rest_framework/locale/zh-Hans/LC_MESSAGES/django.po b/rest_framework/locale/zh_Hans/LC_MESSAGES/django.po similarity index 100% rename from rest_framework/locale/zh-Hans/LC_MESSAGES/django.po rename to rest_framework/locale/zh_Hans/LC_MESSAGES/django.po diff --git a/rest_framework/locale/zh-Hant/LC_MESSAGES/django.mo b/rest_framework/locale/zh_Hant/LC_MESSAGES/django.mo similarity index 100% rename from rest_framework/locale/zh-Hant/LC_MESSAGES/django.mo rename to rest_framework/locale/zh_Hant/LC_MESSAGES/django.mo diff --git a/rest_framework/locale/zh-Hant/LC_MESSAGES/django.po b/rest_framework/locale/zh_Hant/LC_MESSAGES/django.po similarity index 100% rename from rest_framework/locale/zh-Hant/LC_MESSAGES/django.po rename to rest_framework/locale/zh_Hant/LC_MESSAGES/django.po From dbbf79be6496c66070fcf24d17b9c19e06925bd4 Mon Sep 17 00:00:00 2001 From: "Graham R. Jeffries" Date: Fri, 6 May 2016 06:58:58 -0400 Subject: [PATCH 068/457] minor docs indentation fix (#4101) Fixes a minor indentation typo. --- docs/api-guide/routers.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/api-guide/routers.md b/docs/api-guide/routers.md index d73606da2..10a86bdf0 100644 --- a/docs/api-guide/routers.md +++ b/docs/api-guide/routers.md @@ -226,9 +226,9 @@ The following example will only route to the `list` and `retrieve` actions, and ), Route( url=r'^{prefix}/{lookup}$', - mapping={'get': 'retrieve'}, - name='{basename}-detail', - initkwargs={'suffix': 'Detail'} + mapping={'get': 'retrieve'}, + name='{basename}-detail', + initkwargs={'suffix': 'Detail'} ), DynamicDetailRoute( url=r'^{prefix}/{lookup}/{methodnamehyphen}$', From 0795f7394c3b452c10efd8db2b668bcccc717d49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= Date: Tue, 10 May 2016 05:58:24 -0400 Subject: [PATCH 069/457] Prevent raising exception when limit is 0 (#4098) --- rest_framework/pagination.py | 32 ++++++++++++++++++++------------ tests/test_pagination.py | 25 +++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 12 deletions(-) diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py index b2255a212..153a77d33 100644 --- a/rest_framework/pagination.py +++ b/rest_framework/pagination.py @@ -36,10 +36,11 @@ def _positive_int(integer_string, strict=False, cutoff=None): def _divide_with_ceil(a, b): """ - Returns 'a' divded by 'b', with any remainder rounded up. + Returns 'a' divided by 'b', with any remainder rounded up. """ if a % b: return (a // b) + 1 + return a // b @@ -358,17 +359,24 @@ class LimitOffsetPagination(BasePagination): def get_html_context(self): base_url = self.request.build_absolute_uri() - current = _divide_with_ceil(self.offset, self.limit) + 1 - # The number of pages is a little bit fiddly. - # We need to sum both the number of pages from current offset to end - # plus the number of pages up to the current offset. - # When offset is not strictly divisible by the limit then we may - # end up introducing an extra page as an artifact. - final = ( - _divide_with_ceil(self.count - self.offset, self.limit) + - _divide_with_ceil(self.offset, self.limit) - ) - if final < 1: + + if self.limit: + current = _divide_with_ceil(self.offset, self.limit) + 1 + + # The number of pages is a little bit fiddly. + # We need to sum both the number of pages from current offset to end + # plus the number of pages up to the current offset. + # When offset is not strictly divisible by the limit then we may + # end up introducing an extra page as an artifact. + final = ( + _divide_with_ceil(self.count - self.offset, self.limit) + + _divide_with_ceil(self.offset, self.limit) + ) + + if final < 1: + final = 1 + else: + current = 1 final = 1 if current > final: diff --git a/tests/test_pagination.py b/tests/test_pagination.py index 1c74e837c..ba3cc7037 100644 --- a/tests/test_pagination.py +++ b/tests/test_pagination.py @@ -505,6 +505,31 @@ class TestLimitOffset: assert content.get('next') == next_url assert content.get('previous') == prev_url + def test_limit_zero(self): + """ + A limit of 0 should return empty results. + """ + request = Request(factory.get('/', {'limit': 0, 'offset': 10})) + queryset = self.paginate_queryset(request) + context = self.get_html_context() + content = self.get_paginated_content(queryset) + + assert context == { + 'previous_url': 'http://testserver/?limit=0&offset=10', + 'page_links': [ + PageLink( + url='http://testserver/?limit=0', + number=1, + is_active=True, + is_break=False + ) + ], + 'next_url': 'http://testserver/?limit=0&offset=10' + } + + assert queryset == [] + assert content.get('results') == [] + class TestCursorPagination: """ From ebb4070467e34d20c6eccb78b4ec5a8f8780a4e9 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 10 May 2016 11:56:36 +0100 Subject: [PATCH 070/457] Resolve TimeField representation for midnight value. (#4107) --- rest_framework/fields.py | 2 +- tests/test_fields.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 5dcd546c0..04dea89a2 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -1191,7 +1191,7 @@ class TimeField(Field): self.fail('invalid', format=humanized_format) def to_representation(self, value): - if not value: + if value in (None, ''): return None output_format = getattr(self, 'format', api_settings.TIME_FORMAT) diff --git a/tests/test_fields.py b/tests/test_fields.py index 304de11ee..8b187ecd4 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -1063,7 +1063,8 @@ class TestTimeField(FieldValues): '99:99': ['Time has wrong format. Use one of these formats instead: hh:mm[:ss[.uuuuuu]].'], } outputs = { - datetime.time(13, 00): '13:00:00', + datetime.time(13, 0): '13:00:00', + datetime.time(0, 0): '00:00:00', '00:00:00': '00:00:00', None: None, '': None, From 788603e1532cd5d7cd10d1fa341626809ad1afd8 Mon Sep 17 00:00:00 2001 From: Petros Moisiadis Date: Fri, 13 May 2016 17:55:31 +0300 Subject: [PATCH 071/457] Document allow_empty argument (#4117) ListSerializer fields or serializers that are passed many=True may also take an allow_empty=False argument to disallow empty lists as valid input. Information about this was part of the 3.2 release announcement, but had not been part of the API docs until now. --- docs/api-guide/serializers.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md index 78d43a535..bc79406d7 100644 --- a/docs/api-guide/serializers.md +++ b/docs/api-guide/serializers.md @@ -731,9 +731,17 @@ The `ListSerializer` class provides the behavior for serializing and validating When a serializer is instantiated and `many=True` is passed, a `ListSerializer` instance will be created. The serializer class then becomes a child of the parent `ListSerializer` +The following argument can also be passed to a `ListSerializer` field or a serializer that is passed `many=True`: + +### `allow_empty` + +This is `True` by default, but can be set to `False` if you want to disallow empty lists as valid input. + +### Customizing `ListSerializer` behavior + There *are* a few use cases when you might want to customize the `ListSerializer` behavior. For example: -* You want to provide particular validation of the lists, such as always ensuring that there is at least one element in a list. +* You want to provide particular validation of the lists, such as checking that one element does not conflict with another element in a list. * You want to customize the create or update behavior of multiple objects. For these cases you can modify the class that is used when `many=True` is passed, by using the `list_serializer_class` option on the serializer `Meta` class. From 1328982de3ffda5df3339af0be50447baa38affb Mon Sep 17 00:00:00 2001 From: Alexander Gaevsky Date: Mon, 16 May 2016 11:22:28 +0300 Subject: [PATCH 072/457] Set proper status code in AdminRenderer for the redirection after POST/DELETE requests. (#4106) --- rest_framework/renderers.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index 53bbb1390..63e0d836f 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -712,12 +712,12 @@ class AdminRenderer(BrowsableAPIRenderer): # Creation and deletion should use redirects in the admin style. if (response.status_code == status.HTTP_201_CREATED) and ('Location' in response): - response.status_code = status.HTTP_302_FOUND + response.status_code = status.HTTP_303_SEE_OTHER response['Location'] = request.build_absolute_uri() ret = '' if response.status_code == status.HTTP_204_NO_CONTENT: - response.status_code = status.HTTP_302_FOUND + response.status_code = status.HTTP_303_SEE_OTHER try: # Attempt to get the parent breadcrumb URL. response['Location'] = self.get_breadcrumbs(request)[-2][1] From 5392be4ddba37da3e50c3feabc8b3b1c944481a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= Date: Mon, 16 May 2016 04:27:10 -0400 Subject: [PATCH 073/457] Spring cleaning template styles (#4124) --- .../templates/rest_framework/admin.html | 480 +++++++++--------- .../rest_framework/admin/detail.html | 12 +- .../templates/rest_framework/admin/list.html | 34 +- .../rest_framework/admin/list_value.html | 16 +- .../templates/rest_framework/base.html | 461 +++++++++-------- 5 files changed, 501 insertions(+), 502 deletions(-) diff --git a/rest_framework/templates/rest_framework/admin.html b/rest_framework/templates/rest_framework/admin.html index a21ea57be..cec8f426f 100644 --- a/rest_framework/templates/rest_framework/admin.html +++ b/rest_framework/templates/rest_framework/admin.html @@ -1,252 +1,252 @@ {% load staticfiles %} {% load i18n %} {% load rest_framework %} + - - {% block head %} + + {% block head %} - {% block meta %} - - - {% endblock %} + {% block meta %} + + + {% endblock %} - {% block title %}Django REST framework{% endblock %} - - {% block style %} - {% block bootstrap_theme %} - - - {% endblock %} - - - {% endblock %} + {% block title %}Django REST framework{% endblock %} + {% block style %} + {% block bootstrap_theme %} + + {% endblock %} - + + + {% endblock %} - {% block body %} - - -
- - {% block navbar %} -
-
- - {% block branding %} - - Django REST framework - - {% endblock %} - -
    - {% block userlinks %} - {% if user.is_authenticated %} - {% optional_logout request user %} - {% else %} - {% optional_login request %} - {% endif %} - {% endblock %} -
-
-
- {% endblock %} - -
- {% block breadcrumbs %} - - {% endblock %} - - -
- - {% if 'GET' in allowed_methods %} - -
-
- - -
-
- - {% endif %} - - {% if post_form %} - - {% endif %} - - {% if put_form %} - - {% endif %} - - {% if delete_form %} -
- -
- {% endif %} - - {% if filter_form %} - - {% endif %} - -
-
-

{{ name }}

-
-
- {% block description %} - {{ description }} - {% endblock %} -
- - {% if paginator %} - - {% endif %} - -
- {% if style == 'list' %} - {% include "rest_framework/admin/list.html" %} - {% else %} - {% include "rest_framework/admin/detail.html" %} - {% endif %} -
- - {% if paginator %} - - {% endif %} -
- -
- -
-
- - - - - - - -{% if error_form %} - - -{% endif %} - -{% if filter_form %}{{ filter_form }}{% endif %} - - {% block script %} - - - - - - - - - {% endblock %} - {% endblock %} + + + {% block body %} + +
+ {% block navbar %} +
+
+ + {% block branding %} + + Django REST framework + + {% endblock %} + +
    + {% block userlinks %} + {% if user.is_authenticated %} + {% optional_logout request user %} + {% else %} + {% optional_login request %} + {% endif %} + {% endblock %} +
+
+
+ {% endblock %} + +
+ {% block breadcrumbs %} + + {% endblock %} + + +
+ {% if 'GET' in allowed_methods %} +
+
+
+ + +
+
+
+ {% endif %} + + {% if post_form %} + + {% endif %} + + {% if put_form %} + + {% endif %} + + {% if delete_form %} +
+ +
+ {% endif %} + + {% if filter_form %} + + {% endif %} + +
+
+

{{ name }}

+
+ +
+ {% block description %} + {{ description }} + {% endblock %} +
+ + {% if paginator %} + + {% endif %} + +
+ {% if style == 'list' %} + {% include "rest_framework/admin/list.html" %} + {% else %} + {% include "rest_framework/admin/detail.html" %} + {% endif %} +
+ + {% if paginator %} + + {% endif %} +
+
+ +
+
+ + + + + + + + {% if error_form %} + + + {% endif %} + + {% if filter_form %} + {{ filter_form }} + {% endif %} + + {% block script %} + + + + + + + + + {% endblock %} + + {% endblock %} diff --git a/rest_framework/templates/rest_framework/admin/detail.html b/rest_framework/templates/rest_framework/admin/detail.html index beac0a708..759fa163d 100644 --- a/rest_framework/templates/rest_framework/admin/detail.html +++ b/rest_framework/templates/rest_framework/admin/detail.html @@ -1,10 +1,10 @@ {% load rest_framework %} - - {% for key, value in results.items %} - {% if key in details %} + + {% for key, value in results.items %} + {% if key in details %} - {% endif %} - {% endfor %} - + {% endif %} + {% endfor %} +
{{ key|capfirst }}{{ value|format_value }}
diff --git a/rest_framework/templates/rest_framework/admin/list.html b/rest_framework/templates/rest_framework/admin/list.html index 048843bb7..6044ebb38 100644 --- a/rest_framework/templates/rest_framework/admin/list.html +++ b/rest_framework/templates/rest_framework/admin/list.html @@ -1,22 +1,22 @@ {% load rest_framework %} - - {% for column in columns%}{% endfor %} - - - {% for row in results %} - - {% for key, value in row.items %} - {% if key in columns %} - - {% endif %} - {% endfor %} - + {% for column in columns%}{% endfor %} + + + {% for row in results %} + + {% for key, value in row.items %} + {% if key in columns %} + - + {% endif %} {% endfor %} - + + + {% endfor %} +
{{ column|capfirst }}
- {{ value|format_value }} - - +
{{ column|capfirst }}
+ {{ value|format_value }}
+ +
diff --git a/rest_framework/templates/rest_framework/admin/list_value.html b/rest_framework/templates/rest_framework/admin/list_value.html index 267bbaa39..5bab6b57a 100644 --- a/rest_framework/templates/rest_framework/admin/list_value.html +++ b/rest_framework/templates/rest_framework/admin/list_value.html @@ -1,11 +1,11 @@ {% load rest_framework %} - - {% for item in value %} - - - - - {% endfor %} - + + {% for item in value %} + + + + + {% endfor %} +
{{ forloop.counter0 }}{{ item|format_value }}
{{ forloop.counter0 }}{{ item|format_value }}
diff --git a/rest_framework/templates/rest_framework/base.html b/rest_framework/templates/rest_framework/base.html index 21431b70c..a75e642e6 100644 --- a/rest_framework/templates/rest_framework/base.html +++ b/rest_framework/templates/rest_framework/base.html @@ -1,185 +1,198 @@ {% load staticfiles %} -{% load rest_framework %} {% load i18n %} +{% load rest_framework %} - - {% block head %} + + {% block head %} - {% block meta %} - - - {% endblock %} - - {% block title %}{% if name %}{{ name }} – {% endif %}Django REST framework{% endblock %} - - {% block style %} - {% block bootstrap_theme %} - - + {% block meta %} + + + {% endblock %} + + {% block title %}{% if name %}{{ name }} – {% endif %}Django REST framework{% endblock %} + + {% block style %} + {% block bootstrap_theme %} + + + {% endblock %} + + + {% endblock %} - - {% endblock %} + - {% endblock %} - + {% block body %} + -{% block body %} - - -
- {% block navbar %} -
-
- - {% block branding %} - - Django REST framework - - {% endblock %} - -
    - {% block userlinks %} - {% if user.is_authenticated %} - {% optional_logout request user %} - {% else %} - {% optional_login request %} - {% endif %} - {% endblock %} -
+
+ {% block navbar %} +
+
+ + {% block branding %} + + Django REST framework + + {% endblock %} + +
    + {% block userlinks %} + {% if user.is_authenticated %} + {% optional_logout request user %} + {% else %} + {% optional_login request %} + {% endif %} + {% endblock %} +
+
-
- {% endblock %} - -
- {% block breadcrumbs %} - {% endblock %} - -
- - {% if 'GET' in allowed_methods %} -
-
- {% if api_settings.URL_FORMAT_OVERRIDE %} -
- GET - - -
    - {% for format in available_formats %} -
  • - {{ format }} -
    • - {% endfor %} -
-
+
+ {% block breadcrumbs %} +
-
- {% endif %} + {% endfor %} + + {% endblock %} - {% if options_form %} -
- -
- {% endif %} + +
- {% if delete_form %} - + {% if 'GET' in allowed_methods %} +
+
+ {% if api_settings.URL_FORMAT_OVERRIDE %} +
+ GET - -
+ + {% endif %} + + {% if options_form %} +
+ +
+ {% endif %} + + {% if delete_form %} + + + + -
- {% endif %} + {% endif %} - {% if filter_form %} + {% if filter_form %} - {% endif %} + {% endif %} -
-
+
+

{{ name }}

-
-
- {% block description %} - {{ description }} - {% endblock %} +
+
+ {% block description %} + {{ description }} + {% endblock %} +
+ + {% if paginator %} + + {% endif %} + +
+ 
{{ request.method }} {{ request.get_full_path }}
+
+ +
+ 
HTTP {{ response.status_code }} {{ response.status_text }}{% autoescape off %}
+  {% for key, val in response_headers.items %}{{ key }}: {{ val|break_long_headers|urlize_quoted_links }}
+  {% endfor %}
+  {{ content|urlize_quoted_links }}
{% endautoescape %} +
- {% if paginator %} - - {% endif %} - -
- 
{{ request.method }} {{ request.get_full_path }}
-
- -
- 
HTTP {{ response.status_code }} {{ response.status_text }}{% autoescape off %}
-{% for key, val in response_headers.items %}{{ key }}: {{ val|break_long_headers|urlize_quoted_links }}
-{% endfor %}
-{{ content|urlize_quoted_links }}
{% endautoescape %} -
-
- - {% if display_edit_forms %} - - {% if post_form or raw_data_post_form %} -
- {% if post_form %} - - {% endif %} - -
+ {% if display_edit_forms %} + {% if post_form or raw_data_post_form %} +
{% if post_form %} -
- {% with form=post_form %} -
+ + {% endif %} + +
+ {% if post_form %} +
+ {% with form=post_form %} + +
+ {% csrf_token %} + {{ post_form }} +
+ +
+
+ + {% endwith %} +
+ {% endif %} + +
+ {% with form=raw_data_post_form %} +
- {% csrf_token %} - {{ post_form }} + {% include "rest_framework/raw_data_form.html" %}
@@ -187,99 +200,85 @@ {% endwith %}
- {% endif %} - -
- {% with form=raw_data_post_form %} -
-
- {% include "rest_framework/raw_data_form.html" %} -
- -
-
-
- {% endwith %}
-
- {% endif %} + {% endif %} - {% if put_form or raw_data_put_form or raw_data_patch_form %} -
- {% if put_form %} - - {% endif %} - -
+ {% if put_form or raw_data_put_form or raw_data_patch_form %} +
{% if put_form %} -
-
-
- {{ put_form }} -
- -
-
-
-
+ {% endif %} -
- {% with form=raw_data_put_or_patch_form %} -
-
- {% include "rest_framework/raw_data_form.html" %} -
- {% if raw_data_put_form %} +
+ {% if put_form %} +
+ +
+ {{ put_form }} +
- {% endif %} - {% if raw_data_patch_form %} - +
+
+ +
+ {% endif %} + +
+ {% with form=raw_data_put_or_patch_form %} +
+
+ {% include "rest_framework/raw_data_form.html" %} +
+ {% if raw_data_put_form %} + {% endif %} -
-
-
- {% endwith %} + {% if raw_data_patch_form %} + + {% endif %} +
+
+ + {% endwith %} +
-
+ {% endif %} {% endif %} - {% endif %} -
-
-
+
+
+
- {% block script %} - - - - - - - - + + + + + + + + + {% endblock %} + + {% endblock %} - - {% if filter_form %} - {{ filter_form }} - {% endif %} - - -{% endblock %} From daccc2b8f3a1ebe104480748bfac8e92f17d4234 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= Date: Mon, 16 May 2016 04:27:38 -0400 Subject: [PATCH 074/457] Clean up js style and remove extra getCookie function (#4123) --- .../static/rest_framework/js/ajax-form.js | 177 ++++++++++-------- .../static/rest_framework/js/csrf.js | 69 +++---- .../static/rest_framework/js/default.js | 94 ++++------ 3 files changed, 170 insertions(+), 170 deletions(-) diff --git a/rest_framework/static/rest_framework/js/ajax-form.js b/rest_framework/static/rest_framework/js/ajax-form.js index db07fd8fb..ce17729d1 100644 --- a/rest_framework/static/rest_framework/js/ajax-form.js +++ b/rest_framework/static/rest_framework/js/ajax-form.js @@ -1,97 +1,112 @@ function replaceDocument(docString) { - var doc = document.open("text/html"); - doc.write(docString); - doc.close(); -} + var doc = document.open("text/html"); + doc.write(docString); + doc.close(); +} function doAjaxSubmit(e) { - var form = $(this); - var btn = $(this.clk); - var method = btn.data('method') || form.data('method') || form.attr('method') || 'GET'; - method = method.toUpperCase() - if (method === 'GET') { - // GET requests can always use standard form submits. + var form = $(this); + var btn = $(this.clk); + var method = ( + btn.data('method') || + form.data('method') || + form.attr('method') || 'GET' + ).toUpperCase(); + + if (method === 'GET') { + // GET requests can always use standard form submits. + return; + } + + var contentType = + form.find('input[data-override="content-type"]').val() || + form.find('select[data-override="content-type"] option:selected').text(); + + if (method === 'POST' && !contentType) { + // POST requests can use standard form submits, unless we have + // overridden the content type. + return; + } + + // At this point we need to make an AJAX form submission. + e.preventDefault(); + + var url = form.attr('action'); + var data; + + if (contentType) { + data = form.find('[data-override="content"]').val() || '' + } else { + contentType = form.attr('enctype') || form.attr('encoding') + + if (contentType === 'multipart/form-data') { + if (!window.FormData) { + alert('Your browser does not support AJAX multipart form submissions'); return; - } + } - var contentType = - form.find('input[data-override="content-type"]').val() || - form.find('select[data-override="content-type"] option:selected').text(); - if (method === 'POST' && !contentType) { - // POST requests can use standard form submits, unless we have - // overridden the content type. - return; - } - - // At this point we need to make an AJAX form submission. - e.preventDefault(); - - var url = form.attr('action'); - var data; - if (contentType) { - data = form.find('[data-override="content"]').val() || '' + // Use the FormData API and allow the content type to be set automatically, + // so it includes the boundary string. + // See https://developer.mozilla.org/en-US/docs/Web/API/FormData/Using_FormData_Objects + contentType = false; + data = new FormData(form[0]); } else { - contentType = form.attr('enctype') || form.attr('encoding') - if (contentType === 'multipart/form-data') { - if (!window.FormData) { - alert('Your browser does not support AJAX multipart form submissions'); - return; - } - // Use the FormData API and allow the content type to be set automatically, - // so it includes the boundary string. - // See https://developer.mozilla.org/en-US/docs/Web/API/FormData/Using_FormData_Objects - contentType = false; - data = new FormData(form[0]); - } else { - contentType = 'application/x-www-form-urlencoded; charset=UTF-8' - data = form.serialize(); - } + contentType = 'application/x-www-form-urlencoded; charset=UTF-8' + data = form.serialize(); + } + } + + var ret = $.ajax({ + url: url, + method: method, + data: data, + contentType: contentType, + processData: false, + headers: { + 'Accept': 'text/html; q=1.0, */*' + }, + }); + + ret.always(function(data, textStatus, jqXHR) { + if (textStatus != 'success') { + jqXHR = data; } - var ret = $.ajax({ - url: url, - method: method, - data: data, - contentType: contentType, - processData: false, - headers: {'Accept': 'text/html; q=1.0, */*'}, - }); - ret.always(function(data, textStatus, jqXHR) { - if (textStatus != 'success') { - jqXHR = data; - } - var responseContentType = jqXHR.getResponseHeader("content-type") || ""; - if (responseContentType.toLowerCase().indexOf('text/html') === 0) { - replaceDocument(jqXHR.responseText); - try { - // Modify the location and scroll to top, as if after page load. - history.replaceState({}, '', url); - scroll(0,0); - } catch(err) { - // History API not supported, so redirect. - window.location = url; - } - } else { - // Not HTML content. We can't open this directly, so redirect. - window.location = url; - } - }); - return ret; -} + var responseContentType = jqXHR.getResponseHeader("content-type") || ""; + if (responseContentType.toLowerCase().indexOf('text/html') === 0) { + replaceDocument(jqXHR.responseText); + + try { + // Modify the location and scroll to top, as if after page load. + history.replaceState({}, '', url); + scroll(0, 0); + } catch (err) { + // History API not supported, so redirect. + window.location = url; + } + } else { + // Not HTML content. We can't open this directly, so redirect. + window.location = url; + } + }); + + return ret; +} function captureSubmittingElement(e) { - var target = e.target; - var form = this; - form.clk = target; + var target = e.target; + var form = this; + + form.clk = target; } - $.fn.ajaxForm = function() { - var options = {} - return this - .unbind('submit.form-plugin click.form-plugin') - .bind('submit.form-plugin', options, doAjaxSubmit) - .bind('click.form-plugin', options, captureSubmittingElement); + var options = {} + + return this + .unbind('submit.form-plugin click.form-plugin') + .bind('submit.form-plugin', options, doAjaxSubmit) + .bind('click.form-plugin', options, captureSubmittingElement); }; diff --git a/rest_framework/static/rest_framework/js/csrf.js b/rest_framework/static/rest_framework/js/csrf.js index 73d1ef67d..f8ab4428c 100644 --- a/rest_framework/static/rest_framework/js/csrf.js +++ b/rest_framework/static/rest_framework/js/csrf.js @@ -1,47 +1,52 @@ function getCookie(name) { - var cookieValue = null; - if (document.cookie && document.cookie != '') { - var cookies = document.cookie.split(';'); - for (var i = 0; i < cookies.length; i++) { - var cookie = jQuery.trim(cookies[i]); - // Does this cookie string begin with the name we want? - if (cookie.substring(0, name.length + 1) == (name + '=')) { - cookieValue = decodeURIComponent(cookie.substring(name.length + 1)); - break; - } - } + var cookieValue = null; + + if (document.cookie && document.cookie != '') { + var cookies = document.cookie.split(';'); + + for (var i = 0; i < cookies.length; i++) { + var cookie = jQuery.trim(cookies[i]); + + // Does this cookie string begin with the name we want? + if (cookie.substring(0, name.length + 1) == (name + '=')) { + cookieValue = decodeURIComponent(cookie.substring(name.length + 1)); + break; + } } - return cookieValue; + } + + return cookieValue; } function csrfSafeMethod(method) { - // these HTTP methods do not require CSRF protection - return (/^(GET|HEAD|OPTIONS|TRACE)$/.test(method)); + // these HTTP methods do not require CSRF protection + return (/^(GET|HEAD|OPTIONS|TRACE)$/.test(method)); } function sameOrigin(url) { - // test that a given url is a same-origin URL - // url could be relative or scheme relative or absolute - var host = document.location.host; // host + port - var protocol = document.location.protocol; - var sr_origin = '//' + host; - var origin = protocol + sr_origin; - // Allow absolute or scheme relative URLs to same origin - return (url == origin || url.slice(0, origin.length + 1) == origin + '/') || - (url == sr_origin || url.slice(0, sr_origin.length + 1) == sr_origin + '/') || - // or any other URL that isn't scheme relative or absolute i.e relative. - !(/^(\/\/|http:|https:).*/.test(url)); + // test that a given url is a same-origin URL + // url could be relative or scheme relative or absolute + var host = document.location.host; // host + port + var protocol = document.location.protocol; + var sr_origin = '//' + host; + var origin = protocol + sr_origin; + + // Allow absolute or scheme relative URLs to same origin + return (url == origin || url.slice(0, origin.length + 1) == origin + '/') || + (url == sr_origin || url.slice(0, sr_origin.length + 1) == sr_origin + '/') || + // or any other URL that isn't scheme relative or absolute i.e relative. + !(/^(\/\/|http:|https:).*/.test(url)); } var csrftoken = getCookie(window.drf.csrfCookieName); $.ajaxSetup({ - beforeSend: function(xhr, settings) { - if (!csrfSafeMethod(settings.type) && sameOrigin(settings.url)) { - // Send the token to same-origin, relative URLs only. - // Send the token only if the method warrants CSRF protection - // Using the CSRFToken value acquired earlier - xhr.setRequestHeader("X-CSRFToken", csrftoken); - } + beforeSend: function(xhr, settings) { + if (!csrfSafeMethod(settings.type) && sameOrigin(settings.url)) { + // Send the token to same-origin, relative URLs only. + // Send the token only if the method warrants CSRF protection + // Using the CSRFToken value acquired earlier + xhr.setRequestHeader("X-CSRFToken", csrftoken); } + } }); diff --git a/rest_framework/static/rest_framework/js/default.js b/rest_framework/static/rest_framework/js/default.js index d25325099..d8394b0bf 100644 --- a/rest_framework/static/rest_framework/js/default.js +++ b/rest_framework/static/rest_framework/js/default.js @@ -1,67 +1,47 @@ -function getCookie(c_name) -{ - // From http://www.w3schools.com/js/js_cookies.asp - var c_value = document.cookie; - var c_start = c_value.indexOf(" " + c_name + "="); - if (c_start == -1) { - c_start = c_value.indexOf(c_name + "="); - } - if (c_start == -1) { - c_value = null; - } else { - c_start = c_value.indexOf("=", c_start) + 1; - var c_end = c_value.indexOf(";", c_start); - if (c_end == -1) { - c_end = c_value.length; - } - c_value = unescape(c_value.substring(c_start,c_end)); - } - return c_value; -} +$(document).ready(function() { + // JSON highlighting. + prettyPrint(); -$(document).ready(function () { - // JSON highlighting. - prettyPrint(); + // Bootstrap tooltips. + $('.js-tooltip').tooltip({ + delay: 1000, + container: 'body' + }); - // Bootstrap tooltips. - $('.js-tooltip').tooltip({ - delay: 1000, - container: 'body' - }); + // Deal with rounded tab styling after tab clicks. + $('a[data-toggle="tab"]:first').on('shown', function(e) { + $(e.target).parents('.tabbable').addClass('first-tab-active'); + }); - // Deal with rounded tab styling after tab clicks. - $('a[data-toggle="tab"]:first').on('shown', function (e) { - $(e.target).parents('.tabbable').addClass('first-tab-active'); - }); - $('a[data-toggle="tab"]:not(:first)').on('shown', function (e) { - $(e.target).parents('.tabbable').removeClass('first-tab-active'); - }); + $('a[data-toggle="tab"]:not(:first)').on('shown', function(e) { + $(e.target).parents('.tabbable').removeClass('first-tab-active'); + }); - $('a[data-toggle="tab"]').click(function(){ - document.cookie="tabstyle=" + this.name + "; path=/"; - }); + $('a[data-toggle="tab"]').click(function() { + document.cookie = "tabstyle=" + this.name + "; path=/"; + }); - // Store tab preference in cookies & display appropriate tab on load. - var selectedTab = null; - var selectedTabName = getCookie('tabstyle'); + // Store tab preference in cookies & display appropriate tab on load. + var selectedTab = null; + var selectedTabName = getCookie('tabstyle'); - if (selectedTabName) { - selectedTabName = selectedTabName.replace(/[^a-z-]/g, ''); - } + if (selectedTabName) { + selectedTabName = selectedTabName.replace(/[^a-z-]/g, ''); + } - if (selectedTabName) { - selectedTab = $('.form-switcher a[name=' + selectedTabName + ']'); - } + if (selectedTabName) { + selectedTab = $('.form-switcher a[name=' + selectedTabName + ']'); + } - if (selectedTab && selectedTab.length > 0) { - // Display whichever tab is selected. - selectedTab.tab('show'); - } else { - // If no tab selected, display rightmost tab. - $('.form-switcher a:first').tab('show'); - } + if (selectedTab && selectedTab.length > 0) { + // Display whichever tab is selected. + selectedTab.tab('show'); + } else { + // If no tab selected, display rightmost tab. + $('.form-switcher a:first').tab('show'); + } - $(window).load(function(){ - $('#errorModal').modal('show'); - }); + $(window).load(function() { + $('#errorModal').modal('show'); + }); }); From 768ae26aa4a4db45d64384d3a07b310c068175f1 Mon Sep 17 00:00:00 2001 From: KhasanovBI Date: Mon, 16 May 2016 11:30:23 +0300 Subject: [PATCH 075/457] Fix None values representation in childs of ListField, DictField. (#4118) --- rest_framework/fields.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 04dea89a2..5eb1b3b4c 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -1480,7 +1480,7 @@ class ListField(Field): """ List of object instances -> List of dicts of primitive datatypes. """ - return [self.child.to_representation(item) for item in data] + return [self.child.to_representation(item) if item is not None else None for item in data] class DictField(Field): @@ -1527,7 +1527,7 @@ class DictField(Field): List of object instances -> List of dicts of primitive datatypes. """ return { - six.text_type(key): self.child.to_representation(val) + six.text_type(key): self.child.to_representation(val) if val is not None else None for key, val in value.items() } From d721021429ca05402dd25f4dd11bad0b209a87ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= Date: Mon, 16 May 2016 08:24:09 -0400 Subject: [PATCH 076/457] Update requirements (#4125) --- requirements/requirements-codestyle.txt | 2 +- requirements/requirements-documentation.txt | 2 +- requirements/requirements-optionals.txt | 4 ++-- requirements/requirements-packaging.txt | 4 ++-- requirements/requirements-testing.txt | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/requirements/requirements-codestyle.txt b/requirements/requirements-codestyle.txt index 2284a4cab..264416f5f 100644 --- a/requirements/requirements-codestyle.txt +++ b/requirements/requirements-codestyle.txt @@ -3,4 +3,4 @@ flake8==2.4.0 pep8==1.5.7 # Sort and lint imports -isort==4.2.2 +isort==4.2.5 diff --git a/requirements/requirements-documentation.txt b/requirements/requirements-documentation.txt index b33663542..0ee097566 100644 --- a/requirements/requirements-documentation.txt +++ b/requirements/requirements-documentation.txt @@ -1,2 +1,2 @@ # MkDocs to build our documentation. -mkdocs==0.13.2 +mkdocs==0.15.3 diff --git a/requirements/requirements-optionals.txt b/requirements/requirements-optionals.txt index 42f1205af..0ba514c13 100644 --- a/requirements/requirements-optionals.txt +++ b/requirements/requirements-optionals.txt @@ -1,4 +1,4 @@ # Optional packages which may be used with REST framework. -markdown==2.6.4 -django-guardian==1.3.2 +markdown==2.6.6 +django-guardian==1.4.4 django-filter==0.10.0 diff --git a/requirements/requirements-packaging.txt b/requirements/requirements-packaging.txt index 89819da20..f930bfa96 100644 --- a/requirements/requirements-packaging.txt +++ b/requirements/requirements-packaging.txt @@ -1,8 +1,8 @@ # Wheel for PyPI installs. -wheel==0.24.0 +wheel==0.29.0 # Twine for secured PyPI uploads. -twine==1.4.0 +twine==1.6.5 # Transifex client for managing translation resources. transifex-client==0.11 diff --git a/requirements/requirements-testing.txt b/requirements/requirements-testing.txt index caa58765a..177d677d8 100644 --- a/requirements/requirements-testing.txt +++ b/requirements/requirements-testing.txt @@ -1,4 +1,4 @@ # PyTest for running the tests. -pytest==2.8.5 +pytest==2.9.1 pytest-django==2.9.1 pytest-cov==1.8.1 From 400078311bae2055a4d4ab6f5933439d6111e3cb Mon Sep 17 00:00:00 2001 From: Ben Brostoff Date: Mon, 16 May 2016 20:39:13 -0400 Subject: [PATCH 077/457] Fix typos in ReturnDict and ReturnList docstrings --- rest_framework/utils/serializer_helpers.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rest_framework/utils/serializer_helpers.py b/rest_framework/utils/serializer_helpers.py index cfaeb25e8..115f1e186 100644 --- a/rest_framework/utils/serializer_helpers.py +++ b/rest_framework/utils/serializer_helpers.py @@ -10,7 +10,7 @@ from rest_framework.compat import unicode_to_repr class ReturnDict(OrderedDict): """ - Return object from `serialier.data` for the `Serializer` class. + Return object from `serializer.data` for the `Serializer` class. Includes a backlink to the serializer instance for renderers to use if they need richer field information. """ @@ -33,7 +33,7 @@ class ReturnDict(OrderedDict): class ReturnList(list): """ - Return object from `serialier.data` for the `SerializerList` class. + Return object from `serializer.data` for the `SerializerList` class. Includes a backlink to the serializer instance for renderers to use if they need richer field information. """ From 5cf7d4a90de34ad6a0c2965e6bb8bbd7c60593b3 Mon Sep 17 00:00:00 2001 From: Joe Simpson Date: Tue, 17 May 2016 12:09:25 +0100 Subject: [PATCH 078/457] Add LaTeX renderer to documentation (#4131) --- docs/api-guide/renderers.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/api-guide/renderers.md b/docs/api-guide/renderers.md index b495fd09c..f04770a36 100644 --- a/docs/api-guide/renderers.md +++ b/docs/api-guide/renderers.md @@ -471,6 +471,10 @@ Comma-separated values are a plain-text tabular data format, that can be easily [Django REST Pandas] provides a serializer and renderers that support additional data processing and output via the [Pandas] DataFrame API. Django REST Pandas includes renderers for Pandas-style CSV files, Excel workbooks (both `.xls` and `.xlsx`), and a number of [other formats]. It is maintained by [S. Andrew Sheppard][sheppard] as part of the [wq Project][wq]. +## LaTeX + +[Rest Framework Latex] provides a renderer that outputs PDFs using Laulatex. It is maintained by [Pebble (S/F Software)][mypebble]. + [cite]: https://docs.djangoproject.com/en/dev/ref/template-response/#the-rendering-process [conneg]: content-negotiation.md @@ -506,3 +510,5 @@ Comma-separated values are a plain-text tabular data format, that can be easily [other formats]: https://github.com/wq/django-rest-pandas#supported-formats [sheppard]: https://github.com/sheppard [wq]: https://github.com/wq +[mypebble]: https://github.com/mypebble +[Rest Framework Latex]: https://github.com/mypebble/rest-framework-latex From 9b56dda91850a07cfaecbe972e0f586434b965c3 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 18 May 2016 08:38:18 +0100 Subject: [PATCH 079/457] Update requests.md Drop out-of-date paragraph on `request.content` --- docs/api-guide/requests.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/docs/api-guide/requests.md b/docs/api-guide/requests.md index 94cdb14f8..393b1ab9a 100644 --- a/docs/api-guide/requests.md +++ b/docs/api-guide/requests.md @@ -118,10 +118,6 @@ For more information see the [browser enhancements documentation]. You won't typically need to directly access the request's content, as you'll normally rely on REST framework's default request parsing behavior. -If you do need to access the raw content directly, you should use the `.stream` property in preference to using `request.content`, as it provides transparent support for browser-based non-form content. - -For more information see the [browser enhancements documentation]. - --- # Standard HttpRequest attributes From 9d87dbc016f790e5e60efaccc6ba20708a1a2589 Mon Sep 17 00:00:00 2001 From: Carlton Gibson Date: Wed, 25 May 2016 15:38:44 +0200 Subject: [PATCH 080/457] Remove Py2/Py3 difference from Example (#4145) `print` is available as a function on every supported version of Python (2.7+) --- docs/api-guide/serializers.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md index bc79406d7..4f0119525 100644 --- a/docs/api-guide/serializers.md +++ b/docs/api-guide/serializers.md @@ -452,7 +452,7 @@ To do so, open the Django shell, using `python manage.py shell`, then import the >>> from myapp.serializers import AccountSerializer >>> serializer = AccountSerializer() - >>> print repr(serializer) # Or `print(repr(serializer))` in Python 3.x. + >>> print(repr(serializer)) AccountSerializer(): id = IntegerField(label='ID', read_only=True) name = CharField(allow_blank=True, max_length=100, required=False) From 35ace2e9ec1cdbbb5d925e5cf53d7c28803c93ef Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Thu, 26 May 2016 01:07:21 +0600 Subject: [PATCH 081/457] django 1.10 support initials (#4144) * added django 1.10 alpha on tox * added django 1.10 alpha on travis * added allow_failure on travis matrix --- .travis.yml | 11 +++++++++++ tox.ini | 2 ++ 2 files changed, 13 insertions(+) diff --git a/.travis.yml b/.travis.yml index 4c7c09dc0..5067f62a3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,8 +16,19 @@ env: - TOX_ENV=py33-django18 - TOX_ENV=py32-django18 - TOX_ENV=py27-django18 + - TOX_ENV=py27-django110 + - TOX_ENV=py35-django110 + - TOX_ENV=py34-django110 + + matrix: + allow_failures: + - env: TOX_ENV=py27-django110 + - env: TOX_ENV=py34-django110 + - env: TOX_ENV=py35-django110 + + fast_finish: true install: diff --git a/tox.ini b/tox.ini index 120d2f340..15442991e 100644 --- a/tox.ini +++ b/tox.ini @@ -6,6 +6,7 @@ envlist = py27-{lint,docs}, {py27,py32,py33,py34,py35}-django18, {py27,py34,py35}-django{19} + {py27,py34,py35}-django{110} [testenv] commands = ./runtests.py --fast {posargs} --coverage -rw @@ -15,6 +16,7 @@ setenv = deps = django18: Django==1.8.13 django19: Django==1.9.6 + django110: Django==1.10a1 -rrequirements/requirements-testing.txt -rrequirements/requirements-optionals.txt From 19bdfda49af2986d0a27e829272f732bb159903f Mon Sep 17 00:00:00 2001 From: Xiao Hanyu Date: Wed, 20 Jan 2016 11:28:18 +0800 Subject: [PATCH 082/457] Fix #3844, refine validator for fields with kwargs When serializers has fields with something like `source=user.email`, the uniqueness validator should check `email` field instead of `user`, cause `user` is a model object. --- rest_framework/validators.py | 6 +++--- tests/test_validators.py | 25 +++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/rest_framework/validators.py b/rest_framework/validators.py index a21f67e60..83ad6f7d8 100644 --- a/rest_framework/validators.py +++ b/rest_framework/validators.py @@ -35,7 +35,7 @@ class UniqueValidator(object): """ # Determine the underlying model field name. This may not be the # same as the serializer field name if `source=<>` is set. - self.field_name = serializer_field.source_attrs[0] + self.field_name = serializer_field.source_attrs[-1] # Determine the existing instance, if this is an update operation. self.instance = getattr(serializer_field.parent, 'instance', None) @@ -174,8 +174,8 @@ class BaseUniqueForValidator(object): """ # Determine the underlying model field names. These may not be the # same as the serializer field names if `source=<>` is set. - self.field_name = serializer.fields[self.field].source_attrs[0] - self.date_field_name = serializer.fields[self.date_field].source_attrs[0] + self.field_name = serializer.fields[self.field].source_attrs[-1] + self.date_field_name = serializer.fields[self.date_field].source_attrs[-1] # Determine the existing instance, if this is an update operation. self.instance = getattr(serializer, 'instance', None) diff --git a/tests/test_validators.py b/tests/test_validators.py index acaaf5743..67156f31c 100644 --- a/tests/test_validators.py +++ b/tests/test_validators.py @@ -4,6 +4,7 @@ from django.db import models from django.test import TestCase from rest_framework import serializers +from rest_framework.validators import UniqueValidator def dedent(blocktext): @@ -22,6 +23,20 @@ class UniquenessSerializer(serializers.ModelSerializer): model = UniquenessModel +class RelatedModel(models.Model): + user = models.OneToOneField(UniquenessModel, on_delete=models.CASCADE) + email = models.CharField(unique=True, max_length=80) + + +class RelatedModelSerializer(serializers.ModelSerializer): + username = serializers.CharField(source='user.username', + validators=[UniqueValidator(queryset=UniquenessModel.objects.all())]) # NOQA + + class Meta: + model = RelatedModel + fields = ('username', 'email') + + class AnotherUniquenessModel(models.Model): code = models.IntegerField(unique=True) @@ -73,6 +88,16 @@ class TestUniquenessValidation(TestCase): self.assertEqual( AnotherUniquenessModel._meta.get_field('code').validators, []) + def test_related_model_is_unique(self): + data = {'username': 'existing', 'email': 'new-email@example.com'} + rs = RelatedModelSerializer(data=data) + self.assertFalse(rs.is_valid()) + self.assertEqual(rs.errors, + {'username': ['This field must be unique.']}) + data = {'username': 'new-username', 'email': 'new-email@example.com'} + rs = RelatedModelSerializer(data=data) + self.assertTrue(rs.is_valid()) + # Tests for `UniqueTogetherValidator` # ----------------------------------- From 592eea9b9e55e0ff53b0d8b32f47f3d4a50d4406 Mon Sep 17 00:00:00 2001 From: Kennedy Mwenja Date: Thu, 26 May 2016 11:59:13 +0300 Subject: [PATCH 083/457] * Use get_serializer_class in ordering filter* Test improper configuration of ordering* Raise ImproperlyConfigured when missing get_serializer_class * Use get_serializer_class in ordering filter * Test improper configuration of ordering * Raise ImproperlyConfigured when missing get_serializer_class --- rest_framework/filters.py | 9 ++++++--- tests/test_filters.py | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 3 deletions(-) diff --git a/rest_framework/filters.py b/rest_framework/filters.py index 2a25378a0..a510d3bf6 100644 --- a/rest_framework/filters.py +++ b/rest_framework/filters.py @@ -227,11 +227,14 @@ class OrderingFilter(BaseFilterBackend): if valid_fields is None: # Default to allowing filtering on serializer fields - serializer_class = getattr(view, 'serializer_class') - if serializer_class is None: + try: + serializer_class = view.get_serializer_class() + except AssertionError: # raised if no serializer_class was found msg = ("Cannot use %s on a view which does not have either a " - "'serializer_class' or 'ordering_fields' attribute.") + "'serializer_class', an overriding 'get_serializer_class' " + "or 'ordering_fields' attribute.") raise ImproperlyConfigured(msg % self.__class__.__name__) + valid_fields = [ (field.source or field_name, field.label) for field_name, field in serializer_class().fields.items() diff --git a/tests/test_filters.py b/tests/test_filters.py index b72d95691..8493c96af 100644 --- a/tests/test_filters.py +++ b/tests/test_filters.py @@ -5,6 +5,7 @@ import unittest from decimal import Decimal from django.conf.urls import url +from django.core.exceptions import ImproperlyConfigured from django.core.urlresolvers import reverse from django.db import models from django.test import TestCase @@ -754,6 +755,41 @@ class OrderingFilterTests(TestCase): self.assertContains(response, 'verbose title') + def test_ordering_with_overridden_get_serializer_class(self): + class OrderingListView(generics.ListAPIView): + queryset = OrderingFilterModel.objects.all() + filter_backends = (filters.OrderingFilter,) + ordering = ('title',) + # note: no ordering_fields and serializer_class speficied + + def get_serializer_class(self): + return OrderingFilterSerializer + + view = OrderingListView.as_view() + request = factory.get('/', {'ordering': 'text'}) + response = view(request) + self.assertEqual( + response.data, + [ + {'id': 1, 'title': 'zyx', 'text': 'abc'}, + {'id': 2, 'title': 'yxw', 'text': 'bcd'}, + {'id': 3, 'title': 'xwv', 'text': 'cde'}, + ] + ) + + def test_ordering_with_improper_configuration(self): + class OrderingListView(generics.ListAPIView): + queryset = OrderingFilterModel.objects.all() + filter_backends = (filters.OrderingFilter,) + ordering = ('title',) + # note: no ordering_fields and serializer_class + # or get_serializer_class speficied + + view = OrderingListView.as_view() + request = factory.get('/', {'ordering': 'text'}) + with self.assertRaises(ImproperlyConfigured): + view(request) + class SensitiveOrderingFilterModel(models.Model): username = models.CharField(max_length=20) From 3a173547ad65082ff4bc07fea43b67365f0f9e59 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 26 May 2016 11:48:15 +0100 Subject: [PATCH 084/457] Funding announcement (#4147) --- docs/index.md | 3 + docs/topics/funding.md | 173 +++++++++++++++++++----------- docs/topics/mozilla-grant.md | 67 ++++++++++++ docs/topics/project-management.md | 2 +- docs_theme/base.html | 18 ++-- mkdocs.yml | 2 + 6 files changed, 189 insertions(+), 76 deletions(-) create mode 100644 docs/topics/mozilla-grant.md diff --git a/docs/index.md b/docs/index.md index a2635c048..380c598a6 100644 --- a/docs/index.md +++ b/docs/index.md @@ -204,6 +204,8 @@ General guides to using REST framework. * [3.2 Announcement][3.2-announcement] * [3.3 Announcement][3.3-announcement] * [Kickstarter Announcement][kickstarter-announcement] +* [Mozilla Grant][mozilla-grant] +* [Funding][funding] * [Release Notes][release-notes] ## Development @@ -320,6 +322,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. [3.2-announcement]: topics/3.2-announcement.md [3.3-announcement]: topics/3.3-announcement.md [kickstarter-announcement]: topics/kickstarter-announcement.md +[mozilla-grant]: topics/mozilla-grant.md [funding]: topics/funding.md [release-notes]: topics/release-notes.md diff --git a/docs/topics/funding.md b/docs/topics/funding.md index 7857f8658..d2dcbb85e 100644 --- a/docs/topics/funding.md +++ b/docs/topics/funding.md @@ -8,6 +8,22 @@ if (window.location.hostname == "www.django-rest-framework.org") { +
+
+
+

Stay up to date, with our monthly progress reports...

+
+ + +
+
+ + +
+ +
+
+
+
+ + -By taking out a paid plan you'll be directly contributing towards making these features happen. +--- + +## Our sponsors + +
+ + diff --git a/docs/topics/mozilla-grant.md b/docs/topics/mozilla-grant.md new file mode 100644 index 000000000..4606d26be --- /dev/null +++ b/docs/topics/mozilla-grant.md @@ -0,0 +1,67 @@ +# Mozilla Grant + +We have recently been [awarded a Mozilla grant](https://blog.mozilla.org/blog/2016/04/13/mozilla-open-source-support-moss-update-q1-2016/), in order to fund the next major releases of REST framework. This work will focus on seamless client-side integration by introducing supporting client libraries that are able to dynamically interact with REST framework APIs. The framework will provide for either hypermedia or schema endpoints, which will expose the available interface for the client libraries to interact with. + +Additionally, we will be building on the realtime support that Django Channels provides, supporting and documenting how to build realtime APIs with REST framework. Again, this will include supporting work in the associated client libraries, making it easier to build richly interactive applications. + +The [Core API](www.coreapi.org) project will provide the foundations for our client library support, and will allow us to support interaction using a wide range of schemas and hypermedia formats. It's worth noting that these client libraries won't be tightly coupled to solely REST framework APIs either, and will be able to interact with *any* API that exposes a supported schema or hypermedia format. + +Specifically, the work includes: + +## Client libraries + +This work will include built-in schema and hypermedia support, allowing dynamic client libraries to interact with the API. I'll also be releasing both Python and Javascript client libraries, plus a command-line client, a new tutorial section, and further documentation. + +* Client library support in REST framework. + * Schema & hypermedia support for REST framework APIs. + * A test client, allowing you to write tests that emulate a client library interacting with your API. + * New tutorial sections on using client libraries to interact with REST framework APIs. +* Python client library. +* JavaScript client library. +* Command line client. + +## Realtime APIs + +The next goal is to build on the realtime support offered by Django Channels, adding support & documentation for building realtime API endpoints. + +* Support for API subscription endpoints, using REST framework and Django Channels. +* New tutorial section on building realtime API endpoints with REST framework. +* Realtime support in the Python & Javascript client libraries. + +## Accountability + +In order to ensure that I can be fully focused on trying to secure a sustainable +& well-funded open source business I will be leaving my current role at [DabApps](http://www.dabapps.com) +at the end of May 2016. + +I have formed a UK limited company, [Encode](http://www.encode.io), which will +act as the business entity behind REST framework. I will be issuing monthly reports +from Encode on progress both towards the Mozilla grant, and for development time +funded via the [REST framework paid plans](funding.md). + + + + +
+
+
+

Stay up to date, with our monthly progress reports...

+
+ + +
+
+ + +
+ +
+
+
+
+ + diff --git a/docs/topics/project-management.md b/docs/topics/project-management.md index 8c1fdfd99..e84f2acfb 100644 --- a/docs/topics/project-management.md +++ b/docs/topics/project-management.md @@ -17,7 +17,7 @@ We have a quarterly maintenance cycle where new members may join the maintenance #### Current team -The [maintenance team for Q1 2015](https://github.com/tomchristie/django-rest-framework/issues/2190): +The [maintenance team for Q4 2015](https://github.com/tomchristie/django-rest-framework/issues/2190): * [@tomchristie](https://github.com/tomchristie/) * [@xordoquy](https://github.com/xordoquy/) (Release manager.) diff --git a/docs_theme/base.html b/docs_theme/base.html index 369927b41..6cb929d1c 100644 --- a/docs_theme/base.html +++ b/docs_theme/base.html @@ -38,15 +38,12 @@ +

@@ -38,24 +57,28 @@ Some reasons you might want to use REST framework: * [Serialization][serializers] that supports both [ORM][modelserializer-section] and [non-ORM][serializer-section] data sources. * Customizable all the way down - just use [regular function-based views][functionview-section] if you don't need the [more][generic-views] [powerful][viewsets] [features][routers]. * [Extensive documentation][index], and [great community support][group]. -* Used and trusted by large companies such as [Mozilla][mozilla] and [Eventbrite][eventbrite]. +* Used and trusted by internationally recognised companies including [Mozilla][mozilla], [Red Hat][redhat], [Heroku][heroku], and [Eventbrite][eventbrite]. --- -We are a [collaboratively funded project](https://fund.django-rest-framework.org/topics/funding/). -Many thanks to our sponsors for ensuring we can continue to develop, support and improve Django REST framework. +## Funding -Rover.com +REST framework is a *collaboratively funded project*. If you use +REST framework commercially we strongly encourage you to invest in its +continued development by **[signing up for a paid plan][funding]**. + +The initial aim is to provide a single full-time position on REST framework. +Right now we're a little over 43% of the way towards achieving that. +*Every single sign-up makes a significant impact.* Taking out a +[basic tier sponsorship](https://fund.django-rest-framework.org/topics/funding/#corporate-plans) moves us about 1% closer to our funding target. + +

+
+ +*Many thanks to all our [awesome sponsors][sponsors], and in particular to our premium backers, [Rover](http://jobs.rover.com/) and [Sentry](https://getsentry.com/welcome/).* --- @@ -270,6 +293,8 @@ 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. [mozilla]: http://www.mozilla.org/en-US/about/ +[redhat]: https://www.redhat.com/ +[heroku]: https://www.heroku.com/ [eventbrite]: https://www.eventbrite.co.uk/about/ [markdown]: http://pypi.python.org/pypi/Markdown/ [django-filter]: http://pypi.python.org/pypi/django-filter @@ -284,6 +309,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. [modelserializer-section]: api-guide/serializers#modelserializer [functionview-section]: api-guide/views#function-based-views [sandbox]: http://restframework.herokuapp.com/ +[sponsors]: https://fund.django-rest-framework.org/topics/funding/#our-sponsors [quickstart]: tutorial/quickstart.md [tut-1]: tutorial/1-serialization.md From 57122f042216db00903820bc9f6ff17f5a9f7a29 Mon Sep 17 00:00:00 2001 From: Ken Lewerentz Date: Sat, 25 Jun 2016 22:05:28 +0700 Subject: [PATCH 133/457] Added missing colon in extra_kwargs documentation --- docs/api-guide/validators.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/validators.md b/docs/api-guide/validators.md index edd099056..2c3d15676 100644 --- a/docs/api-guide/validators.md +++ b/docs/api-guide/validators.md @@ -216,7 +216,7 @@ For example: class Meta: fields = ('client', 'date', 'amount') - extra_kwargs = {'client' {'required': 'False'}} + extra_kwargs = {'client': {'required': 'False'}} validators = [] # Remove a default "unique together" constraint. ## Updating nested serializers From 1037a2742e39eac6777924725e2bf2e13447fa80 Mon Sep 17 00:00:00 2001 From: decore <278972894@qq.com> Date: Tue, 28 Jun 2016 10:15:42 +0800 Subject: [PATCH 134/457] Update pagination.md --- docs/api-guide/pagination.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/pagination.md b/docs/api-guide/pagination.md index 65ea2b3e6..0dd935ba3 100644 --- a/docs/api-guide/pagination.md +++ b/docs/api-guide/pagination.md @@ -47,7 +47,7 @@ You can then apply your new style to a view using the `.pagination_class` attrib class BillingRecordsView(generics.ListAPIView): queryset = Billing.objects.all() - serializer = BillingRecordsSerializer + serializer_class = BillingRecordsSerializer pagination_class = LargeResultsSetPagination Or apply the style globally, using the `DEFAULT_PAGINATION_CLASS` settings key. For example: From d41ddc9e5f3346892e46659245522d4be8abdc1a Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 29 Jun 2016 12:16:42 +0100 Subject: [PATCH 135/457] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9474f6da0..fc9bd43a5 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ REST framework commercially we strongly encourage you to invest in its continued development by **[signing up for a paid plan][funding]**. The initial aim is to provide a single full-time position on REST framework. -Right now we're a little over 43% of the way towards achieving that. +Right now we're a little over 45% of the way towards achieving that. *Every single sign-up makes a significant impact.* Taking out a [basic tier sponsorship](https://fund.django-rest-framework.org/topics/funding/#corporate-plans) moves us about 1% closer to our funding target. From 1d2fba906e6a66288263e0cc6d997e51a88df008 Mon Sep 17 00:00:00 2001 From: Vikalp Jain Date: Wed, 29 Jun 2016 21:57:17 +0530 Subject: [PATCH 136/457] Fix issues with routers for custom list-route and detail-routes (#4229) --- rest_framework/routers.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rest_framework/routers.py b/rest_framework/routers.py index 027a78cc1..70a1149ab 100644 --- a/rest_framework/routers.py +++ b/rest_framework/routers.py @@ -144,7 +144,9 @@ class SimpleRouter(BaseRouter): Returns a list of the Route namedtuple. """ - known_actions = flatten([route.mapping.values() for route in self.routes if isinstance(route, Route)]) + # converting to list as iterables are good for one pass, known host needs to be checked again and again for + # different functions. + known_actions = list(flatten([route.mapping.values() for route in self.routes if isinstance(route, Route)])) # Determine any `@detail_route` or `@list_route` decorated methods on the viewset detail_routes = [] @@ -154,6 +156,7 @@ class SimpleRouter(BaseRouter): httpmethods = getattr(attr, 'bind_to_methods', None) detail = getattr(attr, 'detail', True) if httpmethods: + # checking method names against the known actions list if methodname in known_actions: raise ImproperlyConfigured('Cannot use @detail_route or @list_route ' 'decorators on method "%s" ' From 6ff9840bdecbd877732d678e08c84bfaf288a3f8 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 4 Jul 2016 16:38:17 +0100 Subject: [PATCH 137/457] Schemas & client libraries. (#4179) * Added schema generation support. * New tutorial section. * API guide on schema generation. * Topic guide on API clients. --- docs/api-guide/schemas.md | 383 ++++++++++++++++++ docs/img/corejson-format.png | Bin 0 -> 20499 bytes docs/index.md | 7 + docs/topics/api-clients.md | 294 ++++++++++++++ docs/tutorial/6-viewsets-and-routers.md | 26 +- .../7-schemas-and-client-libraries.md | 216 ++++++++++ mkdocs.yml | 3 + requirements/requirements-optionals.txt | 1 + rest_framework/compat.py | 10 + rest_framework/filters.py | 20 + rest_framework/pagination.py | 14 + rest_framework/renderers.py | 17 +- rest_framework/routers.py | 43 +- rest_framework/schemas.py | 300 ++++++++++++++ rest_framework/utils/encoders.py | 7 +- rest_framework/viewsets.py | 1 + runtests.py | 2 +- schema-support | 0 tests/test_routers.py | 2 +- tests/test_schemas.py | 137 +++++++ 20 files changed, 1449 insertions(+), 34 deletions(-) create mode 100644 docs/api-guide/schemas.md create mode 100644 docs/img/corejson-format.png create mode 100644 docs/topics/api-clients.md create mode 100644 docs/tutorial/7-schemas-and-client-libraries.md create mode 100644 rest_framework/schemas.py create mode 100644 schema-support create mode 100644 tests/test_schemas.py diff --git a/docs/api-guide/schemas.md b/docs/api-guide/schemas.md new file mode 100644 index 000000000..9fa1ba2e3 --- /dev/null +++ b/docs/api-guide/schemas.md @@ -0,0 +1,383 @@ +source: schemas.py + +# Schemas + +> A machine-readable [schema] describes what resources are available via the API, what their URLs are, how they are represented and what operations they support. +> +> — Heroku, [JSON Schema for the Heroku Platform API][cite] + +API schemas are a useful tool that allow for a range of use cases, including +generating reference documentation, or driving dynamic client libraries that +can interact with your API. + +## Representing schemas internally + +REST framework uses [Core API][coreapi] in order to model schema information in +a format-independent representation. This information can then be rendered +into various different schema formats, or used to generate API documentation. + +When using Core API, a schema is represented as a `Document` which is the +top-level container object for information about the API. Available API +interactions are represented using `Link` objects. Each link includes a URL, +HTTP method, and may include a list of `Field` instances, which describe any +parameters that may be accepted by the API endpoint. The `Link` and `Field` +instances may also include descriptions, that allow an API schema to be +rendered into user documentation. + +Here's an example of an API description that includes a single `search` +endpoint: + + coreapi.Document( + title='Flight Search API', + url='https://api.example.org/', + content={ + 'search': coreapi.Link( + url='/search/', + action='get', + fields=[ + coreapi.Field( + name='from', + required=True, + location='query', + description='City name or airport code.' + ), + coreapi.Field( + name='to', + required=True, + location='query', + description='City name or airport code.' + ), + coreapi.Field( + name='date', + required=True, + location='query', + description='Flight date in "YYYY-MM-DD" format.' + ) + ], + description='Return flight availability and prices.' + ) + } + ) + +## Schema output formats + +In order to be presented in an HTTP response, the internal representation +has to be rendered into the actual bytes that are used in the response. + +[Core JSON][corejson] is designed as a canonical format for use with Core API. +REST framework includes a renderer class for handling this media type, which +is available as `renderers.CoreJSONRenderer`. + +Other schema formats such as [Open API][open-api] (Formerly "Swagger"), +[JSON HyperSchema][json-hyperschema], or [API Blueprint][api-blueprint] can +also be supported by implementing a custom renderer class. + +## Schemas vs Hypermedia + +It's worth pointing out here that Core API can also be used to model hypermedia +responses, which present an alternative interaction style to API schemas. + +With an API schema, the entire available interface is presented up-front +as a single endpoint. Responses to individual API endpoints are then typically +presented as plain data, without any further interactions contained in each +response. + +With Hypermedia, the client is instead presented with a document containing +both data and available interactions. Each interaction results in a new +document, detailing both the current state and the available interactions. + +Further information and support on building Hypermedia APIs with REST framework +is planned for a future version. + +--- + +# Adding a schema + +You'll need to install the `coreapi` package in order to add schema support +for REST framework. + + pip install coreapi + +REST framework includes functionality for auto-generating a schema, +or allows you to specify one explicitly. There are a few different ways to +add a schema to your API, depending on exactly what you need. + +## Using DefaultRouter + +If you're using `DefaultRouter` then you can include an auto-generated schema, +simply by adding a `schema_title` argument to the router. + + router = DefaultRouter(schema_title='Server Monitoring API') + +The schema will be included at the root URL, `/`, and presented to clients +that include the Core JSON media type in their `Accept` header. + + $ http http://127.0.0.1:8000/ Accept:application/vnd.coreapi+json + HTTP/1.0 200 OK + Allow: GET, HEAD, OPTIONS + Content-Type: application/vnd.coreapi+json + + { + "_meta": { + "title": "Server Monitoring API" + }, + "_type": "document", + ... + } + +This is a great zero-configuration option for when you want to get up and +running really quickly. If you want a little more flexibility over the +schema output then you'll need to consider using `SchemaGenerator` instead. + +## Using SchemaGenerator + +The most common way to add a schema to your API is to use the `SchemaGenerator` +class to auto-generate the `Document` instance, and to return that from a view. + +This option gives you the flexibility of setting up the schema endpoint +with whatever behaviour you want. For example, you can apply different +permission, throttling or authentication policies to the schema endpoint. + +Here's an example of using `SchemaGenerator` together with a view to +return the schema. + +**views.py:** + + from rest_framework.decorators import api_view, renderer_classes + from rest_framework import renderers, schemas + + generator = schemas.SchemaGenerator(title='Bookings API') + + @api_view() + @renderer_classes([renderers.CoreJSONRenderer]) + def schema_view(request): + return generator.get_schema() + +**urls.py:** + + urlpatterns = [ + url('/', schema_view), + ... + ] + +You can also serve different schemas to different users, depending on the +permissions they have available. This approach can be used to ensure that +unauthenticated requests are presented with a different schema to +authenticated requests, or to ensure that different parts of the API are +made visible to different users depending on their role. + +In order to present a schema with endpoints filtered by user permissions, +you need to pass the `request` argument to the `get_schema()` method, like so: + + @api_view() + @renderer_classes([renderers.CoreJSONRenderer]) + def schema_view(request): + return generator.get_schema(request=request) + +## Explicit schema definition + +An alternative to the auto-generated approach is to specify the API schema +explicitly, by declaring a `Document` object in your codebase. Doing so is a +little more work, but ensures that you have full control over the schema +representation. + + import coreapi + from rest_framework.decorators import api_view, renderer_classes + from rest_framework import renderers + + schema = coreapi.Document( + title='Bookings API', + content={ + ... + } + ) + + @api_view() + @renderer_classes([renderers.CoreJSONRenderer]) + def schema_view(request): + return schema + +## Static schema file + +A final option is to write your API schema as a static file, using one +of the available formats, such as Core JSON or Open API. + +You could then either: + +* Write a schema definition as a static file, and [serve the static file directly][static-files]. +* Write a schema definition that is loaded using `Core API`, and then + rendered to one of many available formats, depending on the client request. + +--- + +# API Reference + +## SchemaGenerator + +A class that deals with introspecting your API views, which can be used to +generate a schema. + +Typically you'll instantiate `SchemaGenerator` with a single argument, like so: + + generator = SchemaGenerator(title='Stock Prices API') + +Arguments: + +* `title` - The name of the API. **required** +* `patterns` - A list of URLs to inspect when generating the schema. Defaults to the project's URL conf. +* `urlconf` - A URL conf module name to use when generating the schema. Defaults to `settings.ROOT_URLCONF`. + +### get_schema() + +Returns a `coreapi.Document` instance that represents the API schema. + + @api_view + @renderer_classes([renderers.CoreJSONRenderer]) + def schema_view(request): + return generator.get_schema() + +Arguments: + +* `request` - The incoming request. Optionally used if you want to apply per-user permissions to the schema-generation. + +--- + +## Core API + +This documentation gives a brief overview of the components within the `coreapi` +package that are used to represent an API schema. + +Note that these classes are imported from the `coreapi` package, rather than +from the `rest_framework` package. + +### Document + +Represents a container for the API schema. + +#### `title` + +A name for the API. + +#### `url` + +A canonical URL for the API. + +#### `content` + +A dictionary, containing the `Link` objects that the schema contains. + +In order to provide more structure to the schema, the `content` dictionary +may be nested, typically to a second level. For example: + + content={ + "bookings": { + "list": Link(...), + "create": Link(...), + ... + }, + "venues": { + "list": Link(...), + ... + }, + ... + } + +### Link + +Represents an individual API endpoint. + +#### `url` + +The URL of the endpoint. May be a URI template, such as `/users/{username}/`. + +#### `action` + +The HTTP method associated with the endpoint. Note that URLs that support +more than one HTTP method, should correspond to a single `Link` for each. + +#### `fields` + +A list of `Field` instances, describing the available parameters on the input. + +#### `description` + +A short description of the meaning and intended usage of the endpoint. + +### Field + +Represents a single input parameter on a given API endpoint. + +#### `name` + +A descriptive name for the input. + +#### `required` + +A boolean, indicated if the client is required to included a value, or if +the parameter can be omitted. + +#### `location` + +Determines how the information is encoded into the request. Should be one of +the following strings: + +**"path"** + +Included in a templated URI. For example a `url` value of `/products/{product_code}/` could be used together with a `"path"` field, to handle API inputs in a URL path such as `/products/slim-fit-jeans/`. + +These fields will normally correspond with [named arguments in the project URL conf][named-arguments]. + +**"query"** + +Included as a URL query parameter. For example `?search=sale`. Typically for `GET` requests. + +These fields will normally correspond with pagination and filtering controls on a view. + +**"form"** + +Included in the request body, as a single item of a JSON object or HTML form. For example `{"colour": "blue", ...}`. Typically for `POST`, `PUT` and `PATCH` requests. Multiple `"form"` fields may be included on a single link. + +These fields will normally correspond with serializer fields on a view. + +**"body"** + +Included as the complete request body. Typically for `POST`, `PUT` and `PATCH` requests. No more than one `"body"` field may exist on a link. May not be used together with `"form"` fields. + +These fields will normally correspond with views that use `ListSerializer` to validate the request input, or with file upload views. + +#### `encoding` + +**"application/json"** + +JSON encoded request content. Corresponds to views using `JSONParser`. +Valid only if either one or more `location="form"` fields, or a single +`location="body"` field is included on the `Link`. + +**"multipart/form-data"** + +Multipart encoded request content. Corresponds to views using `MultiPartParser`. +Valid only if one or more `location="form"` fields is included on the `Link`. + +**"application/x-www-form-urlencoded"** + +URL encoded request content. Corresponds to views using `FormParser`. Valid +only if one or more `location="form"` fields is included on the `Link`. + +**"application/octet-stream"** + +Binary upload request content. Corresponds to views using `FileUploadParser`. +Valid only if a `location="body"` field is included on the `Link`. + +#### `description` + +A short description of the meaning and intended usage of the input field. + + +[cite]: https://blog.heroku.com/archives/2014/1/8/json_schema_for_heroku_platform_api +[coreapi]: http://www.coreapi.org/ +[corejson]: http://www.coreapi.org/specification/encoding/#core-json-encoding +[open-api]: https://openapis.org/ +[json-hyperschema]: http://json-schema.org/latest/json-schema-hypermedia.html +[api-blueprint]: https://apiblueprint.org/ +[static-files]: https://docs.djangoproject.com/en/dev/howto/static-files/ +[named-arguments]: https://docs.djangoproject.com/en/dev/topics/http/urls/#named-groups diff --git a/docs/img/corejson-format.png b/docs/img/corejson-format.png new file mode 100644 index 0000000000000000000000000000000000000000..36c197a0d02a78fa165f3cd123343ca87a27f102 GIT binary patch literal 20499 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 W6-VWcKNo4ud8WozM*kXmru+}qf?_iO literal 0 HcmV?d00001 diff --git a/docs/index.md b/docs/index.md index cc8d183f4..072d80c66 100644 --- a/docs/index.md +++ b/docs/index.md @@ -91,6 +91,7 @@ REST framework requires the following: The following packages are optional: +* [coreapi][coreapi] (1.21.0+) - Schema generation support. * [Markdown][markdown] (2.1.0+) - Markdown support for the browsable API. * [django-filter][django-filter] (0.9.2+) - Filtering support. * [django-crispy-forms][django-crispy-forms] - Improved HTML display for filtering. @@ -214,6 +215,7 @@ The API guide is your complete reference manual to all the functionality provide * [Versioning][versioning] * [Content negotiation][contentnegotiation] * [Metadata][metadata] +* [Schemas][schemas] * [Format suffixes][formatsuffixes] * [Returning URLs][reverse] * [Exceptions][exceptions] @@ -226,6 +228,7 @@ The API guide is your complete reference manual to all the functionality provide General guides to using REST framework. * [Documenting your API][documenting-your-api] +* [API Clients][api-clients] * [Internationalization][internationalization] * [AJAX, CSRF & CORS][ajax-csrf-cors] * [HTML & Forms][html-and-forms] @@ -296,6 +299,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. [redhat]: https://www.redhat.com/ [heroku]: https://www.heroku.com/ [eventbrite]: https://www.eventbrite.co.uk/about/ +[coreapi]: http://pypi.python.org/pypi/coreapi/ [markdown]: http://pypi.python.org/pypi/Markdown/ [django-filter]: http://pypi.python.org/pypi/django-filter [django-crispy-forms]: https://github.com/maraujop/django-crispy-forms @@ -318,6 +322,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. [tut-4]: tutorial/4-authentication-and-permissions.md [tut-5]: tutorial/5-relationships-and-hyperlinked-apis.md [tut-6]: tutorial/6-viewsets-and-routers.md +[tut-7]: tutorial/7-schemas-and-client-libraries.md [request]: api-guide/requests.md [response]: api-guide/responses.md @@ -339,6 +344,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. [versioning]: api-guide/versioning.md [contentnegotiation]: api-guide/content-negotiation.md [metadata]: api-guide/metadata.md +[schemas]: 'api-guide/schemas.md' [formatsuffixes]: api-guide/format-suffixes.md [reverse]: api-guide/reverse.md [exceptions]: api-guide/exceptions.md @@ -347,6 +353,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. [settings]: api-guide/settings.md [documenting-your-api]: topics/documenting-your-api.md +[api-clients]: topics/api-clients.md [internationalization]: topics/internationalization.md [ajax-csrf-cors]: topics/ajax-csrf-cors.md [html-and-forms]: topics/html-and-forms.md diff --git a/docs/topics/api-clients.md b/docs/topics/api-clients.md new file mode 100644 index 000000000..5f09c2a8f --- /dev/null +++ b/docs/topics/api-clients.md @@ -0,0 +1,294 @@ +# API Clients + +An API client handles the underlying details of how network requests are made +and how responses are decoded. They present the developer with an application +interface to work against, rather than working directly with the network interface. + +The API clients documented here are not restricted to APIs built with Django REST framework. + They can be used with any API that exposes a supported schema format. + +For example, [the Heroku platform API][heroku-api] exposes a schema in the JSON +Hyperschema format. As a result, the Core API command line client and Python +client library can be [used to interact with the Heroku API][heroku-example]. + +## Client-side Core API + +[Core API][core-api] is a document specification that can be used to describe APIs. It can +be used either server-side, as is done with REST framework's [schema generation][schema-generation], +or used client-side, as described here. + +When used client-side, Core API allows for *dynamically driven client libraries* +that can interact with any API that exposes a supported schema or hypermedia +format. + +Using a dynamically driven client has a number of advantages over interacting +with an API by building HTTP requests directly. + +#### More meaningful interaction + +API interactions are presented in a more meaningful way. You're working at +the application interface layer, rather than the network interface layer. + +#### Resilience & evolvability + +The client determines what endpoints are available, what parameters exist +against each particular endpoint, and how HTTP requests are formed. + +This also allows for a degree of API evolvability. URLs can be modified +without breaking existing clients, or more efficient encodings can be used +on-the-wire, with clients transparently upgrading. + +#### Self-descriptive APIs + +A dynamically driven client is able to present documentation on the API to the +end user. This documentation allows the user to discover the available endpoints +and parameters, and better understand the API they are working with. + +Because this documentation is driven by the API schema it will always be fully +up to date with the most recently deployed version of the service. + +--- + +# Command line client + +The command line client allows you to inspect and interact with any API that +exposes a supported schema format. + +## Getting started + +To install the Core API command line client, use `pip`. + + $ pip install coreapi + +To start inspecting and interacting with an API the schema must first be loaded +from the network. + + + $ coreapi get http://api.example.org/ + + snippets: { + create(code, [title], [linenos], [language], [style]) + destroy(pk) + highlight(pk) + list([page]) + partial_update(pk, [title], [code], [linenos], [language], [style]) + retrieve(pk) + update(pk, code, [title], [linenos], [language], [style]) + } + users: { + list([page]) + retrieve(pk) + } + +This will then load the schema, displaying the resulting `Document`. This +`Document` includes all the available interactions that may be made against the API. + +To interact with the API, use the `action` command. This command requires a list +of keys that are used to index into the link. + + $ coreapi action users list + [ + { + "url": "http://127.0.0.1:8000/users/2/", + "id": 2, + "username": "aziz", + "snippets": [] + }, + ... + ] + +To inspect the underlying HTTP request and response, use the `--debug` flag. + + $ coreapi action users list --debug + > GET /users/ HTTP/1.1 + > Accept: application/vnd.coreapi+json, */* + > Authorization: Basic bWF4Om1heA== + > Host: 127.0.0.1 + > User-Agent: coreapi + < 200 OK + < Allow: GET, HEAD, OPTIONS + < Content-Type: application/json + < Date: Thu, 30 Jun 2016 10:51:46 GMT + < Server: WSGIServer/0.1 Python/2.7.10 + < Vary: Accept, Cookie + < + < [{"url":"http://127.0.0.1/users/2/","id":2,"username":"aziz","snippets":[]},{"url":"http://127.0.0.1/users/3/","id":3,"username":"amy","snippets":["http://127.0.0.1/snippets/3/"]},{"url":"http://127.0.0.1/users/4/","id":4,"username":"max","snippets":["http://127.0.0.1/snippets/4/","http://127.0.0.1/snippets/5/","http://127.0.0.1/snippets/6/","http://127.0.0.1/snippets/7/"]},{"url":"http://127.0.0.1/users/5/","id":5,"username":"jose","snippets":[]},{"url":"http://127.0.0.1/users/6/","id":6,"username":"admin","snippets":["http://127.0.0.1/snippets/1/","http://127.0.0.1/snippets/2/"]}] + + [ + ... + ] + +Some actions may include optional or required parameters. + + $ coreapi action users create --params username example + +## Authentication & headers + +The `credentials` command is used to manage the request `Authentication:` header. +Any credentials added are always linked to a particular domain, so as to ensure +that credentials are not leaked across differing APIs. + +The format for adding a new credential is: + + coreapi credentials add + +For instance: + + coreapi credentials add api.example.org "Token 9944b09199c62bcf9418ad846dd0e4bbdfc6ee4b" + +The optional `--auth` flag also allows you to add specific types of authentication, +handling the encoding for you. Currently only `"basic"` is supported as an option here. +For example: + + coreapi credentials add api.example.org tomchristie:foobar --auth basic + +You can also add specific request headers, using the `headers` command: + + coreapi headers add api.example.org x-api-version 2 + +For more information and a listing of the available subcommands use `coreapi +credentials --help` or `coreapi headers --help`. + +## Utilities + +The command line client includes functionality for bookmarking API URLs +under a memorable name. For example, you can add a bookmark for the +existing API, like so... + + coreapi bookmarks add accountmanagement + +There is also functionality for navigating forward or backward through the +history of which API URLs have been accessed. + + coreapi history show + coreapi history back + +For more information and a listing of the available subcommands use +`coreapi bookmarks --help` or `coreapi history --help`. + +## Other commands + +To display the current `Document`: + + coreapi show + +To reload the current `Document` from the network: + + coreapi reload + +To load a schema file from disk: + + coreapi load my-api-schema.json --format corejson + +To remove the current document, along with all currently saved history, +credentials, headers and bookmarks: + + coreapi clear + +--- + +# Python client library + +The `coreapi` Python package allows you to programatically interact with any +API that exposes a supported schema format. + +## Getting started + +You'll need to install the `coreapi` package using `pip` before you can get +started. Once you've done so, open up a python terminal. + +In order to start working with an API, we first need a `Client` instance. The +client holds any configuration around which codecs and transports are supported +when interacting with an API, which allows you to provide for more advanced +kinds of behaviour. + + import coreapi + client = coreapi.Client() + +Once we have a `Client` instance, we can fetch an API schema from the network. + + schema = client.get('https://api.example.org/') + +The object returned from this call will be a `Document` instance, which is +the internal representation of the interface that we are interacting with. + +Now that we have our schema `Document`, we can now start to interact with the API: + + users = client.action(schema, ['users', 'list']) + +Some endpoints may include named parameters, which might be either optional or required: + + new_user = client.action(schema, ['users', 'create'], params={"username": "max"}) + +## Codecs + +Codecs are responsible for encoding or decoding Documents. + +The decoding process is used by a client to take a bytestring of an API schema +definition, and returning the Core API `Document` that represents that interface. + +A codec should be associated with a particular media type, such as **TODO**. + +This media type is used by the server in the response `Content-Type` header, +in order to indicate what kind of data is being returned in the response. + +#### Configuring codecs + +The codecs that are available can be configured when instantiating a client. +The keyword argument used here is `decoders`, because in the context of a +client the codecs are only for *decoding* responses. + +In the following example we'll configure a client to only accept `Core JSON` +and `JSON` responses. This will allow us to receive and decode a Core JSON schema, +and subsequently to receive JSON responses made against the API. + + from coreapi import codecs, Client + + decoders = [codecs.CoreJSONCodec(), codecs.JSONCodec()] + client = Client(decoders=decoders) + +#### Loading and saving schemas + +You can use a codec directly, in order to load an existing schema definition, +and return the resulting `Document`. + + schema_definition = open('my-api-schema.json', 'r').read() + codec = codecs.CoreJSONCodec() + schema = codec.load(schema_definition) + +You can also use a codec directly to generate a schema definition given a `Document` instance: + + schema_definition = codec.dump(schema) + output_file = open('my-api-schema.json', 'r') + output_file.write(schema_definition) + +## Transports + +Transports are responsible for making network requests. The set of transports +that a client has installed determines which network protocols it is able to +support. + +Currently the `coreapi` library only includes an HTTP/HTTPS transport, but +other protocols can also be supported. + +#### Configuring transports + +The behaviour of the network layer can be customized by configuring the +transports that the client is instantiated with. + + import requests + from coreapi import transports, Client + + credentials = {'api.example.org': 'Token 3bd44a009d16ff'} + transports = transports.HTTPTransport(credentials=credentials) + client = Client(transports=transports) + +More complex customizations can also be achieved, for example modifying the +underlying `requests.Session` instance to [attach transport adaptors][transport-adaptors] +that modify the outgoing requests. + +[heroku-api]: https://devcenter.heroku.com/categories/platform-api +[heroku-example]: http://www.coreapi.org/tools-and-resources/example-services/#heroku-json-hyper-schema +[core-api]: http://www.coreapi.org/ +[schema-generation]: ../api-guide/schemas.md +[transport-adaptors]: http://docs.python-requests.org/en/master/user/advanced/#transport-adapters diff --git a/docs/tutorial/6-viewsets-and-routers.md b/docs/tutorial/6-viewsets-and-routers.md index f1dbe9443..00152cc17 100644 --- a/docs/tutorial/6-viewsets-and-routers.md +++ b/docs/tutorial/6-viewsets-and-routers.md @@ -130,27 +130,7 @@ Using viewsets can be a really useful abstraction. It helps ensure that URL con That doesn't mean it's always the right approach to take. There's a similar set of trade-offs to consider as when using class-based views instead of function based views. Using viewsets is less explicit than building your views individually. -## Reviewing our work +In [part 7][tut-7] of the tutorial we'll look at how we can add an API schema, +and interact with our API using a client library or command line tool. -With an incredibly small amount of code, we've now got a complete pastebin Web API, which is fully web browsable, and comes complete with authentication, per-object permissions, and multiple renderer formats. - -We've walked through each step of the design process, and seen how if we need to customize anything we can gradually work our way down to simply using regular Django views. - -You can review the final [tutorial code][repo] on GitHub, or try out a live example in [the sandbox][sandbox]. - -## Onwards and upwards - -We've reached the end of our tutorial. If you want to get more involved in the REST framework project, here are a few places you can start: - -* Contribute on [GitHub][github] by reviewing and submitting issues, and making pull requests. -* Join the [REST framework discussion group][group], and help build the community. -* Follow [the author][twitter] on Twitter and say hi. - -**Now go build awesome things.** - - -[repo]: https://github.com/tomchristie/rest-framework-tutorial -[sandbox]: http://restframework.herokuapp.com/ -[github]: https://github.com/tomchristie/django-rest-framework -[group]: https://groups.google.com/forum/?fromgroups#!forum/django-rest-framework -[twitter]: https://twitter.com/_tomchristie +[tut-7]: 7-schemas-and-client-libraries.md diff --git a/docs/tutorial/7-schemas-and-client-libraries.md b/docs/tutorial/7-schemas-and-client-libraries.md new file mode 100644 index 000000000..8d772a5bf --- /dev/null +++ b/docs/tutorial/7-schemas-and-client-libraries.md @@ -0,0 +1,216 @@ +# Tutorial 7: Schemas & client libraries + +A schema is a machine-readable document that describes the available API +endpoints, their URLS, and what operations they support. + +Schemas can be a useful tool for auto-generated documentation, and can also +be used to drive dynamic client libraries that can interact with the API. + +## Core API + +In order to provide schema support REST framework uses [Core API][coreapi]. + +Core API is a document specification for describing APIs. It is used to provide +an internal representation format of the available endpoints and possible +interactions that an API exposes. It can either be used server-side, or +client-side. + +When used server-side, Core API allows an API to support rendering to a wide +range of schema or hypermedia formats. + +When used client-side, Core API allows for dynamically driven client libraries +that can interact with any API that exposes a supported schema or hypermedia +format. + +## Adding a schema + +REST framework supports either explicitly defined schema views, or +automatically generated schemas. Since we're using viewsets and routers, +we can simply use the automatic schema generation. + +You'll need to install the `coreapi` python package in order to include an +API schema. + + $ pip install coreapi + +We can now include a schema for our API, by adding a `schema_title` argument to +the router instantiation. + + router = DefaultRouter(schema_title='Pastebin API') + +If you visit the API root endpoint in a browser you should now see `corejson` +representation become available as an option. + +![Schema format](../img/corejson-format.png) + +We can also request the schema from the command line, by specifying the desired +content type in the `Accept` header. + + $ http http://127.0.0.1:8000/ Accept:application/vnd.coreapi+json + HTTP/1.0 200 OK + Allow: GET, HEAD, OPTIONS + Content-Type: application/vnd.coreapi+json + + { + "_meta": { + "title": "Pastebin API" + }, + "_type": "document", + ... + +The default output style is to use the [Core JSON][corejson] encoding. + +Other schema formats, such as [Open API][openapi] (formerly Swagger) are +also supported. + +## Using a command line client + +Now that our API is exposing a schema endpoint, we can use a dynamic client +library to interact with the API. To demonstrate this, let's use the +Core API command line client. We've already installed the `coreapi` package +using `pip`, so the client tool should already be installed. Check that it +is available on the command line... + + $ coreapi + Usage: coreapi [OPTIONS] COMMAND [ARGS]... + + Command line client for interacting with CoreAPI services. + + Visit http://www.coreapi.org for more information. + + Options: + --version Display the package version number. + --help Show this message and exit. + + Commands: + ... + +First we'll load the API schema using the command line client. + + $ coreapi get http://127.0.0.1:8000/ + + snippets: { + highlight(pk) + list() + retrieve(pk) + } + users: { + list() + retrieve(pk) + } + +We haven't authenticated yet, so right now we're only able to see the read only +endpoints, in line with how we've set up the permissions on the API. + +Let's try listing the existing snippets, using the command line client: + + $ coreapi action snippets list + [ + { + "url": "http://127.0.0.1:8000/snippets/1/", + "highlight": "http://127.0.0.1:8000/snippets/1/highlight/", + "owner": "lucy", + "title": "Example", + "code": "print('hello, world!')", + "linenos": true, + "language": "python", + "style": "friendly" + }, + ... + +Some of the API endpoints require named parameters. For example, to get back +the highlight HTML for a particular snippet we need to provide an id. + + $ coreapi action snippets highlight --param pk 1 + + + + + Example + ... + +## Authenticating our client + +If we want to be able to create, edit and delete snippets, we'll need to +authenticate as a valid user. In this case we'll just use basic auth. + +Make sure to replace the `` and `` below with your +actual username and password. + + $ coreapi credentials add 127.0.0.1 : --auth basic + Added credentials + 127.0.0.1 "Basic <...>" + +Now if we fetch the schema again, we should be able to see the full +set of available interactions. + + $ coreapi reload + Pastebin API "http://127.0.0.1:8000/"> + snippets: { + create(code, [title], [linenos], [language], [style]) + destroy(pk) + highlight(pk) + list() + partial_update(pk, [title], [code], [linenos], [language], [style]) + retrieve(pk) + update(pk, code, [title], [linenos], [language], [style]) + } + users: { + list() + retrieve(pk) + } + +We're now able to interact with these endpoints. For example, to create a new +snippet: + + $ coreapi action snippets create --param title "Example" --param code "print('hello, world')" + { + "url": "http://127.0.0.1:8000/snippets/7/", + "id": 7, + "highlight": "http://127.0.0.1:8000/snippets/7/highlight/", + "owner": "lucy", + "title": "Example", + "code": "print('hello, world')", + "linenos": false, + "language": "python", + "style": "friendly" + } + +And to delete a snippet: + + $ coreapi action snippets destroy --param pk 7 + +As well as the command line client, developers can also interact with your +API using client libraries. The Python client library is the first of these +to be available, and a Javascript client library is planned to be released +soon. + +For more details on customizing schema generation and using Core API +client libraries you'll need to refer to the full documentation. + +## Reviewing our work + +With an incredibly small amount of code, we've now got a complete pastebin Web API, which is fully web browsable, includes a schema-driven client library, and comes complete with authentication, per-object permissions, and multiple renderer formats. + +We've walked through each step of the design process, and seen how if we need to customize anything we can gradually work our way down to simply using regular Django views. + +You can review the final [tutorial code][repo] on GitHub, or try out a live example in [the sandbox][sandbox]. + +## Onwards and upwards + +We've reached the end of our tutorial. If you want to get more involved in the REST framework project, here are a few places you can start: + +* Contribute on [GitHub][github] by reviewing and submitting issues, and making pull requests. +* Join the [REST framework discussion group][group], and help build the community. +* Follow [the author][twitter] on Twitter and say hi. + +**Now go build awesome things.** + +[coreapi]: http://www.coreapi.org +[corejson]: http://www.coreapi.org/specification/encoding/#core-json-encoding +[openapi]: https://openapis.org/ +[repo]: https://github.com/tomchristie/rest-framework-tutorial +[sandbox]: http://restframework.herokuapp.com/ +[github]: https://github.com/tomchristie/django-rest-framework +[group]: https://groups.google.com/forum/?fromgroups#!forum/django-rest-framework +[twitter]: https://twitter.com/_tomchristie diff --git a/mkdocs.yml b/mkdocs.yml index 19d1b3553..b10fbefb5 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -20,6 +20,7 @@ pages: - '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' + - '7 - Schemas and client libraries': 'tutorial/7-schemas-and-client-libraries.md' - API Guide: - 'Requests': 'api-guide/requests.md' - 'Responses': 'api-guide/responses.md' @@ -41,6 +42,7 @@ pages: - 'Versioning': 'api-guide/versioning.md' - 'Content negotiation': 'api-guide/content-negotiation.md' - 'Metadata': 'api-guide/metadata.md' + - 'Schemas': 'api-guide/schemas.md' - 'Format suffixes': 'api-guide/format-suffixes.md' - 'Returning URLs': 'api-guide/reverse.md' - 'Exceptions': 'api-guide/exceptions.md' @@ -49,6 +51,7 @@ pages: - 'Settings': 'api-guide/settings.md' - Topics: - 'Documenting your API': 'topics/documenting-your-api.md' + - 'API Clients': 'topics/api-clients.md' - 'Internationalization': 'topics/internationalization.md' - 'AJAX, CSRF & CORS': 'topics/ajax-csrf-cors.md' - 'HTML & Forms': 'topics/html-and-forms.md' diff --git a/requirements/requirements-optionals.txt b/requirements/requirements-optionals.txt index 241e1951d..54c080491 100644 --- a/requirements/requirements-optionals.txt +++ b/requirements/requirements-optionals.txt @@ -2,3 +2,4 @@ markdown==2.6.4 django-guardian==1.4.3 django-filter==0.13.0 +coreapi==1.21.1 diff --git a/rest_framework/compat.py b/rest_framework/compat.py index dd30636f4..9c69eaa03 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -156,6 +156,16 @@ except ImportError: crispy_forms = None +# coreapi is optional (Note that uritemplate is a dependancy of coreapi) +try: + import coreapi + import uritemplate +except (ImportError, SyntaxError): + # SyntaxError is possible under python 3.2 + coreapi = None + uritemplate = None + + # Django-guardian is optional. Import only if guardian is in INSTALLED_APPS # Fixes (#1712). We keep the try/except for the test suite. guardian = None diff --git a/rest_framework/filters.py b/rest_framework/filters.py index fdd9519c6..caff1c17f 100644 --- a/rest_framework/filters.py +++ b/rest_framework/filters.py @@ -72,6 +72,9 @@ class BaseFilterBackend(object): """ raise NotImplementedError(".filter_queryset() must be overridden.") + def get_fields(self, view): + return [] + class DjangoFilterBackend(BaseFilterBackend): """ @@ -128,6 +131,17 @@ class DjangoFilterBackend(BaseFilterBackend): template = loader.get_template(self.template) return template_render(template, context) + def get_fields(self, view): + filter_class = getattr(view, 'filter_class', None) + if filter_class: + return list(filter_class().filters.keys()) + + filter_fields = getattr(view, 'filter_fields', None) + if filter_fields: + return filter_fields + + return [] + class SearchFilter(BaseFilterBackend): # The URL query parameter used for the search. @@ -217,6 +231,9 @@ class SearchFilter(BaseFilterBackend): template = loader.get_template(self.template) return template_render(template, context) + def get_fields(self, view): + return [self.search_param] + class OrderingFilter(BaseFilterBackend): # The URL query parameter used for the ordering. @@ -330,6 +347,9 @@ class OrderingFilter(BaseFilterBackend): context = self.get_template_context(request, queryset, view) return template_render(template, context) + def get_fields(self, view): + return [self.ordering_param] + class DjangoObjectPermissionsFilter(BaseFilterBackend): """ diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py index a66c7505c..6ad10d860 100644 --- a/rest_framework/pagination.py +++ b/rest_framework/pagination.py @@ -157,6 +157,9 @@ class BasePagination(object): def get_results(self, data): return data['results'] + def get_fields(self, view): + return [] + class PageNumberPagination(BasePagination): """ @@ -280,6 +283,11 @@ class PageNumberPagination(BasePagination): context = self.get_html_context() return template_render(template, context) + def get_fields(self, view): + if self.page_size_query_param is None: + return [self.page_query_param] + return [self.page_query_param, self.page_size_query_param] + class LimitOffsetPagination(BasePagination): """ @@ -404,6 +412,9 @@ class LimitOffsetPagination(BasePagination): context = self.get_html_context() return template_render(template, context) + def get_fields(self, view): + return [self.limit_query_param, self.offset_query_param] + class CursorPagination(BasePagination): """ @@ -706,3 +717,6 @@ class CursorPagination(BasePagination): template = loader.get_template(self.template) context = self.get_html_context() return template_render(template, context) + + def get_fields(self, view): + return [self.cursor_query_param] diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index 7ca680e74..e313998d1 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -22,7 +22,8 @@ from django.utils import six from rest_framework import VERSION, exceptions, serializers, status from rest_framework.compat import ( - INDENT_SEPARATORS, LONG_SEPARATORS, SHORT_SEPARATORS, template_render + INDENT_SEPARATORS, LONG_SEPARATORS, SHORT_SEPARATORS, coreapi, + template_render ) from rest_framework.exceptions import ParseError from rest_framework.request import is_form_media_type, override_method @@ -790,3 +791,17 @@ class MultiPartRenderer(BaseRenderer): "test case." % key ) return encode_multipart(self.BOUNDARY, data) + + +class CoreJSONRenderer(BaseRenderer): + media_type = 'application/vnd.coreapi+json' + charset = None + format = 'corejson' + + def __init__(self): + assert coreapi, 'Using CoreJSONRenderer, but `coreapi` is not installed.' + + def render(self, data, media_type=None, renderer_context=None): + indent = bool(renderer_context.get('indent', 0)) + codec = coreapi.codecs.CoreJSONCodec() + return codec.dump(data, indent=indent) diff --git a/rest_framework/routers.py b/rest_framework/routers.py index 70a1149ab..a71bb7791 100644 --- a/rest_framework/routers.py +++ b/rest_framework/routers.py @@ -22,9 +22,11 @@ from django.conf.urls import url from django.core.exceptions import ImproperlyConfigured from django.core.urlresolvers import NoReverseMatch -from rest_framework import views +from rest_framework import exceptions, renderers, views from rest_framework.response import Response from rest_framework.reverse import reverse +from rest_framework.schemas import SchemaGenerator +from rest_framework.settings import api_settings from rest_framework.urlpatterns import format_suffix_patterns Route = namedtuple('Route', ['url', 'mapping', 'name', 'initkwargs']) @@ -255,6 +257,7 @@ class SimpleRouter(BaseRouter): lookup=lookup, trailing_slash=self.trailing_slash ) + view = viewset.as_view(mapping, **route.initkwargs) name = route.name.format(basename=basename) ret.append(url(regex, view, name=name)) @@ -270,8 +273,13 @@ class DefaultRouter(SimpleRouter): include_root_view = True include_format_suffixes = True root_view_name = 'api-root' + schema_renderers = [renderers.CoreJSONRenderer] - def get_api_root_view(self): + def __init__(self, *args, **kwargs): + self.schema_title = kwargs.pop('schema_title', None) + super(DefaultRouter, self).__init__(*args, **kwargs) + + def get_api_root_view(self, schema_urls=None): """ Return a view to use as the API root. """ @@ -280,10 +288,33 @@ class DefaultRouter(SimpleRouter): for prefix, viewset, basename in self.registry: api_root_dict[prefix] = list_name.format(basename=basename) + view_renderers = list(api_settings.DEFAULT_RENDERER_CLASSES) + schema_media_types = [] + + if schema_urls and self.schema_title: + view_renderers += list(self.schema_renderers) + schema_generator = SchemaGenerator( + title=self.schema_title, + patterns=schema_urls + ) + schema_media_types = [ + renderer.media_type + for renderer in self.schema_renderers + ] + class APIRoot(views.APIView): _ignore_model_permissions = True + renderer_classes = view_renderers def get(self, request, *args, **kwargs): + if request.accepted_renderer.media_type in schema_media_types: + # Return a schema response. + schema = schema_generator.get_schema(request) + if schema is None: + raise exceptions.PermissionDenied() + return Response(schema) + + # Return a plain {"name": "hyperlink"} response. ret = OrderedDict() namespace = request.resolver_match.namespace for key, url_name in api_root_dict.items(): @@ -310,15 +341,13 @@ class DefaultRouter(SimpleRouter): Generate the list of URL patterns, including a default root view for the API, and appending `.json` style format suffixes. """ - urls = [] + urls = super(DefaultRouter, self).get_urls() if self.include_root_view: - root_url = url(r'^$', self.get_api_root_view(), name=self.root_view_name) + view = self.get_api_root_view(schema_urls=urls) + root_url = url(r'^$', view, name=self.root_view_name) urls.append(root_url) - default_urls = super(DefaultRouter, self).get_urls() - urls.extend(default_urls) - if self.include_format_suffixes: urls = format_suffix_patterns(urls) diff --git a/rest_framework/schemas.py b/rest_framework/schemas.py new file mode 100644 index 000000000..cf84aca74 --- /dev/null +++ b/rest_framework/schemas.py @@ -0,0 +1,300 @@ +from importlib import import_module + +from django.conf import settings +from django.contrib.admindocs.views import simplify_regex +from django.core.urlresolvers import RegexURLPattern, RegexURLResolver +from django.utils import six + +from rest_framework import exceptions, serializers +from rest_framework.compat import coreapi, uritemplate +from rest_framework.request import clone_request +from rest_framework.views import APIView + + +def as_query_fields(items): + """ + Take a list of Fields and plain strings. + Convert any pain strings into `location='query'` Field instances. + """ + return [ + item if isinstance(item, coreapi.Field) else coreapi.Field(name=item, required=False, location='query') + for item in items + ] + + +def is_api_view(callback): + """ + Return `True` if the given view callback is a REST framework view/viewset. + """ + cls = getattr(callback, 'cls', None) + return (cls is not None) and issubclass(cls, APIView) + + +def insert_into(target, keys, item): + """ + Insert `item` into the nested dictionary `target`. + + For example: + + target = {} + insert_into(target, ('users', 'list'), Link(...)) + insert_into(target, ('users', 'detail'), Link(...)) + assert target == {'users': {'list': Link(...), 'detail': Link(...)}} + """ + for key in keys[:1]: + if key not in target: + target[key] = {} + target = target[key] + target[keys[-1]] = item + + +class SchemaGenerator(object): + default_mapping = { + 'get': 'read', + 'post': 'create', + 'put': 'update', + 'patch': 'partial_update', + 'delete': 'destroy', + } + + def __init__(self, title=None, patterns=None, urlconf=None): + assert coreapi, '`coreapi` must be installed for schema support.' + + if patterns is None and urlconf is not None: + if isinstance(urlconf, six.string_types): + urls = import_module(urlconf) + else: + urls = urlconf + patterns = urls.urlpatterns + elif patterns is None and urlconf is None: + urls = import_module(settings.ROOT_URLCONF) + patterns = urls.urlpatterns + + self.title = title + self.endpoints = self.get_api_endpoints(patterns) + + def get_schema(self, request=None): + if request is None: + endpoints = self.endpoints + else: + # Filter the list of endpoints to only include those that + # the user has permission on. + endpoints = [] + for key, link, callback in self.endpoints: + method = link.action.upper() + view = callback.cls() + view.request = clone_request(request, method) + try: + view.check_permissions(view.request) + except exceptions.APIException: + pass + else: + endpoints.append((key, link, callback)) + + if not endpoints: + return None + + # Generate the schema content structure, from the endpoints. + # ('users', 'list'), Link -> {'users': {'list': Link()}} + content = {} + for key, link, callback in endpoints: + insert_into(content, key, link) + + # Return the schema document. + return coreapi.Document(title=self.title, content=content) + + def get_api_endpoints(self, patterns, prefix=''): + """ + Return a list of all available API endpoints by inspecting the URL conf. + """ + api_endpoints = [] + + for pattern in patterns: + path_regex = prefix + pattern.regex.pattern + + if isinstance(pattern, RegexURLPattern): + path = self.get_path(path_regex) + callback = pattern.callback + if self.should_include_endpoint(path, callback): + for method in self.get_allowed_methods(callback): + key = self.get_key(path, method, callback) + link = self.get_link(path, method, callback) + endpoint = (key, link, callback) + api_endpoints.append(endpoint) + + elif isinstance(pattern, RegexURLResolver): + nested_endpoints = self.get_api_endpoints( + patterns=pattern.url_patterns, + prefix=path_regex + ) + api_endpoints.extend(nested_endpoints) + + return api_endpoints + + def get_path(self, path_regex): + """ + Given a URL conf regex, return a URI template string. + """ + path = simplify_regex(path_regex) + path = path.replace('<', '{').replace('>', '}') + return path + + def should_include_endpoint(self, path, callback): + """ + Return `True` if the given endpoint should be included. + """ + if not is_api_view(callback): + return False # Ignore anything except REST framework views. + + if path.endswith('.{format}') or path.endswith('.{format}/'): + return False # Ignore .json style URLs. + + if path == '/': + return False # Ignore the root endpoint. + + return True + + def get_allowed_methods(self, callback): + """ + Return a list of the valid HTTP methods for this endpoint. + """ + if hasattr(callback, 'actions'): + return [method.upper() for method in callback.actions.keys()] + + return [ + method for method in + callback.cls().allowed_methods if method != 'OPTIONS' + ] + + def get_key(self, path, method, callback): + """ + Return a tuple of strings, indicating the identity to use for a + given endpoint. eg. ('users', 'list'). + """ + category = None + for item in path.strip('/').split('/'): + if '{' in item: + break + category = item + + actions = getattr(callback, 'actions', self.default_mapping) + action = actions[method.lower()] + + if category: + return (category, action) + return (action,) + + # Methods for generating each individual `Link` instance... + + def get_link(self, path, method, callback): + """ + Return a `coreapi.Link` instance for the given endpoint. + """ + view = callback.cls() + + fields = self.get_path_fields(path, method, callback, view) + fields += self.get_serializer_fields(path, method, callback, view) + fields += self.get_pagination_fields(path, method, callback, view) + fields += self.get_filter_fields(path, method, callback, view) + + if fields and any([field.location in ('form', 'body') for field in fields]): + encoding = self.get_encoding(path, method, callback, view) + else: + encoding = None + + return coreapi.Link( + url=path, + action=method.lower(), + encoding=encoding, + fields=fields + ) + + def get_encoding(self, path, method, callback, view): + """ + Return the 'encoding' parameter to use for a given endpoint. + """ + # Core API supports the following request encodings over HTTP... + supported_media_types = set(( + 'application/json', + 'application/x-www-form-urlencoded', + 'multipart/form-data', + )) + parser_classes = getattr(view, 'parser_classes', []) + for parser_class in parser_classes: + media_type = getattr(parser_class, 'media_type', None) + if media_type in supported_media_types: + return media_type + # Raw binary uploads are supported with "application/octet-stream" + if media_type == '*/*': + return 'application/octet-stream' + + return None + + def get_path_fields(self, path, method, callback, view): + """ + Return a list of `coreapi.Field` instances corresponding to any + templated path variables. + """ + fields = [] + + for variable in uritemplate.variables(path): + field = coreapi.Field(name=variable, location='path', required=True) + fields.append(field) + + return fields + + def get_serializer_fields(self, path, method, callback, view): + """ + Return a list of `coreapi.Field` instances corresponding to any + request body input, as determined by the serializer class. + """ + if method not in ('PUT', 'PATCH', 'POST'): + return [] + + fields = [] + + serializer_class = view.get_serializer_class() + serializer = serializer_class() + + if isinstance(serializer, serializers.ListSerializer): + return coreapi.Field(name='data', location='body', required=True) + + if not isinstance(serializer, serializers.Serializer): + return [] + + for field in serializer.fields.values(): + if field.read_only: + continue + required = field.required and method != 'PATCH' + field = coreapi.Field(name=field.source, location='form', required=required) + fields.append(field) + + return fields + + def get_pagination_fields(self, path, method, callback, view): + if method != 'GET': + return [] + + if hasattr(callback, 'actions') and ('list' not in callback.actions.values()): + return [] + + if not hasattr(view, 'pagination_class'): + return [] + + paginator = view.pagination_class() + return as_query_fields(paginator.get_fields(view)) + + def get_filter_fields(self, path, method, callback, view): + if method != 'GET': + return [] + + if hasattr(callback, 'actions') and ('list' not in callback.actions.values()): + return [] + + if not hasattr(view, 'filter_backends'): + return [] + + fields = [] + for filter_backend in view.filter_backends: + fields += as_query_fields(filter_backend().get_fields(view)) + return fields diff --git a/rest_framework/utils/encoders.py b/rest_framework/utils/encoders.py index f883b4925..e5b52ea5f 100644 --- a/rest_framework/utils/encoders.py +++ b/rest_framework/utils/encoders.py @@ -13,7 +13,7 @@ from django.utils import six, timezone from django.utils.encoding import force_text from django.utils.functional import Promise -from rest_framework.compat import total_seconds +from rest_framework.compat import coreapi, total_seconds class JSONEncoder(json.JSONEncoder): @@ -64,4 +64,9 @@ class JSONEncoder(json.JSONEncoder): pass elif hasattr(obj, '__iter__'): return tuple(item for item in obj) + elif (coreapi is not None) and isinstance(obj, (coreapi.Document, coreapi.Error)): + raise RuntimeError( + 'Cannot return a coreapi object from a JSON view. ' + 'You should be using a schema renderer instead for this view.' + ) return super(JSONEncoder, self).default(obj) diff --git a/rest_framework/viewsets.py b/rest_framework/viewsets.py index 05434b72e..7687448c4 100644 --- a/rest_framework/viewsets.py +++ b/rest_framework/viewsets.py @@ -98,6 +98,7 @@ class ViewSetMixin(object): # resolved URL. view.cls = cls view.suffix = initkwargs.get('suffix', None) + view.actions = actions return csrf_exempt(view) def initialize_request(self, request, *args, **kwargs): diff --git a/runtests.py b/runtests.py index 1627e33b2..e97ac0367 100755 --- a/runtests.py +++ b/runtests.py @@ -14,7 +14,7 @@ PYTEST_ARGS = { FLAKE8_ARGS = ['rest_framework', 'tests', '--ignore=E501'] -ISORT_ARGS = ['--recursive', '--check-only', '-p', 'tests', 'rest_framework', 'tests'] +ISORT_ARGS = ['--recursive', '--check-only', '-o' 'uritemplate', '-p', 'tests', 'rest_framework', 'tests'] sys.path.append(os.path.dirname(__file__)) diff --git a/schema-support b/schema-support new file mode 100644 index 000000000..e69de29bb diff --git a/tests/test_routers.py b/tests/test_routers.py index acab660d8..f45039f80 100644 --- a/tests/test_routers.py +++ b/tests/test_routers.py @@ -257,7 +257,7 @@ class TestNameableRoot(TestCase): def test_router_has_custom_name(self): expected = 'nameable-root' - self.assertEqual(expected, self.urls[0].name) + self.assertEqual(expected, self.urls[-1].name) class TestActionKeywordArgs(TestCase): diff --git a/tests/test_schemas.py b/tests/test_schemas.py new file mode 100644 index 000000000..7d3308ed9 --- /dev/null +++ b/tests/test_schemas.py @@ -0,0 +1,137 @@ +import unittest + +from django.conf.urls import include, url +from django.test import TestCase, override_settings + +from rest_framework import filters, pagination, permissions, serializers +from rest_framework.compat import coreapi +from rest_framework.routers import DefaultRouter +from rest_framework.test import APIClient +from rest_framework.viewsets import ModelViewSet + + +class MockUser(object): + def is_authenticated(self): + return True + + +class ExamplePagination(pagination.PageNumberPagination): + page_size = 100 + + +class ExampleSerializer(serializers.Serializer): + a = serializers.CharField(required=True) + b = serializers.CharField(required=False) + + +class ExampleViewSet(ModelViewSet): + pagination_class = ExamplePagination + permission_classes = [permissions.IsAuthenticatedOrReadOnly] + filter_backends = [filters.OrderingFilter] + serializer_class = ExampleSerializer + + +router = DefaultRouter(schema_title='Example API' if coreapi else None) +router.register('example', ExampleViewSet, base_name='example') +urlpatterns = [ + url(r'^', include(router.urls)) +] + + +@unittest.skipUnless(coreapi, 'coreapi is not installed') +@override_settings(ROOT_URLCONF='tests.test_schemas') +class TestRouterGeneratedSchema(TestCase): + def test_anonymous_request(self): + client = APIClient() + response = client.get('/', HTTP_ACCEPT='application/vnd.coreapi+json') + self.assertEqual(response.status_code, 200) + expected = coreapi.Document( + url='', + title='Example API', + content={ + 'example': { + 'list': coreapi.Link( + url='/example/', + action='get', + fields=[ + coreapi.Field('page', required=False, location='query'), + coreapi.Field('ordering', required=False, location='query') + ] + ), + 'retrieve': coreapi.Link( + url='/example/{pk}/', + action='get', + fields=[ + coreapi.Field('pk', required=True, location='path') + ] + ) + } + } + ) + self.assertEqual(response.data, expected) + + def test_authenticated_request(self): + client = APIClient() + client.force_authenticate(MockUser()) + response = client.get('/', HTTP_ACCEPT='application/vnd.coreapi+json') + self.assertEqual(response.status_code, 200) + expected = coreapi.Document( + url='', + title='Example API', + content={ + 'example': { + 'list': coreapi.Link( + url='/example/', + action='get', + fields=[ + coreapi.Field('page', required=False, location='query'), + coreapi.Field('ordering', required=False, location='query') + ] + ), + 'create': coreapi.Link( + url='/example/', + action='post', + encoding='application/json', + fields=[ + coreapi.Field('a', required=True, location='form'), + coreapi.Field('b', required=False, location='form') + ] + ), + 'retrieve': coreapi.Link( + url='/example/{pk}/', + action='get', + fields=[ + coreapi.Field('pk', required=True, location='path') + ] + ), + 'update': coreapi.Link( + url='/example/{pk}/', + action='put', + encoding='application/json', + fields=[ + coreapi.Field('pk', required=True, location='path'), + coreapi.Field('a', required=True, location='form'), + coreapi.Field('b', required=False, location='form') + ] + ), + 'partial_update': coreapi.Link( + url='/example/{pk}/', + action='patch', + encoding='application/json', + fields=[ + coreapi.Field('pk', required=True, location='path'), + coreapi.Field('a', required=False, location='form'), + coreapi.Field('b', required=False, location='form') + ] + ), + 'destroy': coreapi.Link( + url='/example/{pk}/', + action='delete', + fields=[ + coreapi.Field('pk', required=True, location='path') + ] + ) + } + } + ) + self.assertEqual(response.data, expected) From b04bd8618ca956c2ceab36a8729cab822f0cff93 Mon Sep 17 00:00:00 2001 From: cobaltchang Date: Tue, 5 Jul 2016 22:36:52 +0800 Subject: [PATCH 138/457] Fix the error without specified encoding when compiling (#4246) Fix setup.py error on some platforms --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 0fef70f1f..86870489f 100755 --- a/setup.py +++ b/setup.py @@ -4,6 +4,7 @@ import os import re import shutil import sys +from io import open from setuptools import setup @@ -16,7 +17,7 @@ except ImportError: print("warning: pypandoc module not found, could not convert Markdown to RST") def read_md(f): - return open(f, 'r').read() + return open(f, 'r', encoding='utf-8').read() def get_version(package): From b10de374765d4abd42fae354d7ed5e875a9b2127 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 5 Jul 2016 15:58:36 +0100 Subject: [PATCH 139/457] Funding text tweaks [ci skip] (#4247) --- README.md | 7 +++---- docs/index.md | 5 ++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index fc9bd43a5..89e73de83 100644 --- a/README.md +++ b/README.md @@ -18,16 +18,15 @@ REST framework commercially we strongly encourage you to invest in its continued development by **[signing up for a paid plan][funding]**. The initial aim is to provide a single full-time position on REST framework. -Right now we're a little over 45% of the way towards achieving that. -*Every single sign-up makes a significant impact.* Taking out a -[basic tier sponsorship](https://fund.django-rest-framework.org/topics/funding/#corporate-plans) moves us about 1% closer to our funding target. +Right now we're a little over 50% of the way towards achieving that. +*Every single sign-up makes a significant impact.*

-*Many thanks to all our [awesome sponsors][sponsors], and in particular to our premium backers, [Rover](http://jobs.rover.com/) and [Sentry](https://getsentry.com/welcome/).* +*Many thanks to all our [wonderful sponsors][sponsors], and in particular to our premium backers, [Rover](http://jobs.rover.com/) and [Sentry](https://getsentry.com/welcome/).* --- diff --git a/docs/index.md b/docs/index.md index 072d80c66..6f4b0bf07 100644 --- a/docs/index.md +++ b/docs/index.md @@ -68,9 +68,8 @@ REST framework commercially we strongly encourage you to invest in its continued development by **[signing up for a paid plan][funding]**. The initial aim is to provide a single full-time position on REST framework. -Right now we're a little over 43% of the way towards achieving that. -*Every single sign-up makes a significant impact.* Taking out a -[basic tier sponsorship](https://fund.django-rest-framework.org/topics/funding/#corporate-plans) moves us about 1% closer to our funding target. +Right now we're a little over 50% of the way towards achieving that. +*Every single sign-up makes a significant impact.*
-*Many thanks to all our [awesome sponsors][sponsors], and in particular to our premium backers, [Rover](http://jobs.rover.com/), [Sentry](https://getsentry.com/welcome/), and [Stream](https://getstream.io/?utm_source=drf&utm_medium=banner&utm_campaign=drf).* +*Many thanks to all our [wonderful sponsors][sponsors], and in particular to our premium backers, [Rover](http://jobs.rover.com/), [Sentry](https://getsentry.com/welcome/), and [Stream](https://getstream.io/?utm_source=drf&utm_medium=banner&utm_campaign=drf).* --- @@ -243,6 +243,7 @@ General guides to using REST framework. * [3.1 Announcement][3.1-announcement] * [3.2 Announcement][3.2-announcement] * [3.3 Announcement][3.3-announcement] +* [3.4 Announcement][3.4-announcement] * [Kickstarter Announcement][kickstarter-announcement] * [Mozilla Grant][mozilla-grant] * [Funding][funding] @@ -368,6 +369,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. [3.1-announcement]: topics/3.1-announcement.md [3.2-announcement]: topics/3.2-announcement.md [3.3-announcement]: topics/3.3-announcement.md +[3.4-announcement]: topics/3.4-announcement.md [kickstarter-announcement]: topics/kickstarter-announcement.md [mozilla-grant]: topics/mozilla-grant.md [funding]: topics/funding.md diff --git a/docs/topics/3.4-announcement.md b/docs/topics/3.4-announcement.md new file mode 100644 index 000000000..d3af44298 --- /dev/null +++ b/docs/topics/3.4-announcement.md @@ -0,0 +1,172 @@ + + +# Django REST framework 3.4 + +The 3.4 release is the first in a planned series that will be addressing schema +generation, hypermedia support, API clients, and finally realtime support. + +--- + +## Funding + +The 3.4 release has been made possible a recent [Mozilla grant][moss], and by our +[collaborative funding model][funding]. If you use REST framework commercially, and would +like to see this work continue, we strongly encourage you to invest in its +continued development by **[signing up for a paid plan][funding]**. + +The initial aim is to provide a single full-time position on REST framework. +Right now we're over 60% of the way towards achieving that. +*Every single sign-up makes a significant impact.* + + +
+ +*Many thanks to all our [awesome sponsors][sponsors], and in particular to our premium backers, [Rover](http://jobs.rover.com/), [Sentry](https://getsentry.com/welcome/), and [Stream](https://getstream.io/?utm_source=drf&utm_medium=banner&utm_campaign=drf).* + +--- + +## Schemas & client libraries + +REST framework 3.4 brings built-in support for generating API schemas. + +We provide this support by using [Core API][core-api], a Document Object Model +for describing APIs. + +Because Core API represents the API schema in an format-independent +manner, we're able to render the Core API `Document` object into many different +schema formats, by allowing the renderer class to determine how the internal +representation maps onto the external schema format. + +This approach should also open the door to a range of auto-generated API +documentation options in the future, by rendering the `Document` object into +HTML documentation pages. + +Alongside the built-in schema support, we're also now providing the following: + +* A [command line tool][command-line-client] for interacting with APIs. +* A [Python client library][client-library] for interacting with APIs. + +These API clients are dynamically driven, and able to interact with any API +that exposes a supported schema format. + +Dynamically driven clients allow you to interact with an API at an application +layer interface, rather than a network layer interface, while still providing +the benefits of RESTful Web API design. + +We're expecting to expand the range of languages that we provide client libraries +for over the coming months. + +--- + +Current support for schema formats is as follows: + +Name | Support | PyPI package +---------------------------------|-------------------------------------|-------------------------------- +[Core JSON][core-json] | Schema generation & client support. | Built-in support in `coreapi`. +[Swagger / OpenAPI][swagger] | Schema generation & client support. | The `openapi-codec` package. +[JSON Hyper-Schema][hyperschema] | Currrently client support only. | The `hyperschema-codec` package. +[API Blueprint][api-blueprint] | Not yet available. | Not yet available. + +--- + +You can read more about any of this new functionality in the following: + +* New tutorial section on [schemas & client libraries][tut-7]. +* Documentation page on [schema generation][schema-generation]. +* Topic page on [API clients][api-clients]. + +It is also worth noting that Marc Gibbons is currently working towards a 2.0 release of +the popular Django REST Swagger package, which will tie in with our new built-in support. + +--- + +## Supported versions + +The 3.4.0 release adds support for Django 1.10. + +The following versions of Python and Django are now supported: + +* Django versions 1.8, 1.9, and 1.10. +* Python versions 2.7, 3.2(\*), 3.3(\*), 3.4, 3.5. + +(\*) Note that Python 3.2 and 3.3 are not supported from Django 1.9 onwards. + +--- + +## Deprecations and changes + +The 3.4 release includes very limited deprecation or behavioral changes, and +should present a straightforward upgrade. + +#### Use fields or exclude on serializer classes. + +The following change in 3.3.0 is now escalated from "pending deprecation" to +"deprecated". Its usage will continue to function but will raise warnings: + +`ModelSerializer` and `HyperlinkedModelSerializer` should include either a `fields` +option, or an `exclude` option. The `fields = '__all__'` shortcut may be used +to explicitly include all fields. + +#### Microsecond precision when returning time or datetime + +Using the default JSON renderer and directly returning a `datetime` or `time` +instance will now render with microsecond precision (6 digits), rather than +millisecond precision (3 digits). This makes the output format consistent with the +default string output of `serializers.DateTimeField` and `serializers.TimeField`. + +This change *does not affect the default behavior when using serializers*, +which is to serialize `datetime` and `time` instances into strings with +microsecond precision. + +The serializer behavior can be modified if needed, using the `DATETIME_FORMAT` +and `TIME_FORMAT` settings. + +The renderer behavior can be modified by setting a custom `encoder_class` +attribute on a `JSONRenderer` subclass. + +--- + +## Other improvements + +This release includes further work from a huge number of [pull requests and issues][milestone]. + +Many thanks to all our contributors who've been involved in the release, either through raising issues, giving feedback, improving the documentation, or suggesting and implementing code changes. + +The full set of itemized release notes [are available here][release-notes]. + +[sponsors]: https://fund.django-rest-framework.org/topics/funding/#our-sponsors +[moss]: mozilla-grant.md +[funding]: funding.md +[core-api]: http://www.coreapi.org/ +[command-line-client]: api-clients#command-line-client +[client-library]: api-clients#python-client-library +[core-json]: http://www.coreapi.org/specification/encoding/#core-json-encoding +[swagger]: https://openapis.org/specification +[hyperschema]: http://json-schema.org/latest/json-schema-hypermedia.html +[api-blueprint]: https://apiblueprint.org/ +[tut-7]: ../../tutorial/7-schemas-and-client-libraries/ +[schema-generation]: ../../api-guide/schemas/ +[api-clients]: api-clients.md +[milestone]: https://github.com/tomchristie/django-rest-framework/milestone/35 +[release-notes]: release-notes#34 diff --git a/docs/topics/api-clients.md b/docs/topics/api-clients.md index 635fd8ae0..25b0c6145 100644 --- a/docs/topics/api-clients.md +++ b/docs/topics/api-clients.md @@ -59,7 +59,7 @@ exposes a supported schema format. To install the Core API command line client, use `pip`. Note that the command-line client is a separate package to the -python client library `coreapi`. Make sure to install `coreapi-cli`. +python client library. Make sure to install `coreapi-cli`. $ pip install coreapi-cli diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index 201549b45..5bfdad09b 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -40,12 +40,94 @@ You can determine your currently installed version using `pip freeze`: ## 3.4.x series -### 3.4 +### 3.4.0 -**Unreleased** +**Date**: [14th July 2016][3.4.0-milestone] -* Dropped support for EOL Django 1.7 ([#3933][gh3933]) -* Fixed null foreign keys targeting UUIDField primary keys. ([#3936][gh3936]) +* Don't strip microseconds in JSON output. ([#4256][gh4256]) +* Two slightly different iso 8601 datetime serialization. ([#4255][gh4255]) +* Resolve incorrect inclusion of media type parameters. ([#4254][gh4254]) +* Response Content-Type potentially malformed. ([#4253][gh4253]) +* Fix setup.py error on some platforms. ([#4246][gh4246]) +* Move alternate formats in coreapi into separate packages. ([#4244][gh4244]) +* Add localize keyword argument to `DecimalField`. ([#4233][gh4233]) +* Fix issues with routers for custom list-route and detail-routes. ([#4229][gh4229]) +* Namespace versioning with nested namespaces. ([#4219][gh4219]) +* Robust uniqueness checks. ([#4217][gh4217]) +* Minor refactoring of `must_call_distinct`. ([#4215][gh4215]) +* Overridable offset cutoff in CursorPagination. ([#4212][gh4212]) +* Pass through strings as-in with date/time fields. ([#4196][gh4196]) +* Add test confirming that required=False is valid on a relational field. ([#4195][gh4195]) +* In LimitOffsetPagination `limit=0` should revert to default limit. ([#4194][gh4194]) +* Exclude read_only=True fields from unique_together validation & add docs. ([#4192][gh4192]) +* Handle bytestrings in JSON. ([#4191][gh4191]) +* JSONField(binary=True) represents using binary strings, which JSONRenderer does not support. ([#4187][gh4187]) +* JSONField(binary=True) represents using binary strings, which JSONRenderer does not support. ([#4185][gh4185]) +* More robust form rendering in the browsable API. ([#4181][gh4181]) +* Empty cases of `.validated_data` and `.errors` as lists not dicts for ListSerializer. ([#4180][gh4180]) +* Schemas & client libraries. ([#4179][gh4179]) +* Removed `AUTH_USER_MODEL` compat property. ([#4176][gh4176]) +* Clean up existing deprecation warnings. ([#4166][gh4166]) +* Django 1.10 support. ([#4158][gh4158]) +* Updated jQuery version to 1.12.4. ([#4157][gh4157]) +* More robust default behavior on OrderingFilter. ([#4156][gh4156]) +* description.py codes and tests removal. ([#4153][gh4153]) +* Wrap guardian.VERSION in tuple. ([#4149][gh4149]) +* Refine validator for fields with kwargs. ([#4146][gh4146]) +* Fix None values representation in childs of ListField, DictField. ([#4118][gh4118]) +* Resolve TimeField representation for midnight value. ([#4107][gh4107]) +* Set proper status code in AdminRenderer for the redirection after POST/DELETE requests. ([#4106][gh4106]) +* TimeField render returns None instead of 00:00:00. ([#4105][gh4105]) +* Fix incorrectly named zh-hans and zh-hant locale path. ([#4103][gh4103]) +* Prevent raising exception when limit is 0. ([#4098][gh4098]) +* TokenAuthentication: Allow custom keyword in the header. ([#4097][gh4097]) +* Handle incorrectly padded HTTP basic auth header. ([#4090][gh4090]) +* LimitOffset pagination crashes Browseable API when limit=0. ([#4079][gh4079]) +* Fixed DecimalField arbitrary precision support. ([#4075][gh4075]) +* Added support for custom CSRF cookie names. ([#4049][gh4049]) +* Fix regression introduced by #4035. ([#4041][gh4041]) +* No auth view failing permission should raise 403. ([#4040][gh4040]) +* Fix string_types / text_types confusion. ([#4025][gh4025]) +* Do not list related field choices in OPTIONS requests. ([#4021][gh4021]) +* Fix typo. ([#4008][gh4008]) +* Reorder initializing the view. ([#4006][gh4006]) +* Type error in DjangoObjectPermissionsFilter on Python 3.4. ([#4005][gh4005]) +* Fixed use of deprecated Query.aggregates. ([#4003][gh4003]) +* Fix blank lines around docstrings. ([#4002][gh4002]) +* Fixed admin pagination when limit is 0. ([#3990][gh3990]) +* OrderingFilter adjustements. ([#3983][gh3983]) +* Non-required serializer related fields. ([#3976][gh3976]) +* Using safer calling way of "@api_view" in tutorial. ([#3971][gh3971]) +* ListSerializer doesn't handle unique_together constraints. ([#3970][gh3970]) +* Add missing migration file. ([#3968][gh3968]) +* `OrderingFilter` should call `get_serializer_class()` to determine default fields. ([#3964][gh3964]) +* Remove old django checks from tests and compat. ([#3953][gh3953]) +* Support callable as the value of `initial` for any `serializer.Field`. ([#3943][gh3943]) +* Prevented unnecessary distinct() call in SearchFilter. ([#3938][gh3938]) +* Fix None UUID ForeignKey serialization. ([#3936][gh3936]) +* Drop EOL Django 1.7. ([#3933][gh3933]) +* Add missing space in serializer error message. ([#3926][gh3926]) +* Fixed _force_text_recursive typo. ([#3908][gh3908]) +* Attempt to address Django 2.0 deprecate warnings related to `field.rel`. ([#3906][gh3906]) +* Fix parsing multipart data using a nested serializer with list. ([#3820][gh3820]) +* Resolving APIs URL to different namespaces. ([#3816][gh3816]) +* Do not HTML-escape `help_text` in Browsable API forms. ([#3812][gh3812]) +* OPTIONS fetches and shows all possible foreign keys in choices field. ([#3751][gh3751]) +* Django 1.9 deprecation warnings ([#3729][gh3729]) +* Test case for #3598 ([#3710][gh3710]) +* Adding support for multiple values for search filter. ([#3541][gh3541]) +* Use get_serializer_class in ordering filter. ([#3487][gh3487]) +* Serializers with many=True should return empty list rather than empty dict. ([#3476][gh3476]) +* LimitOffsetPagination limit=0 fix. ([#3444][gh3444]) +* Enable Validators to defer string evaluation and handle new string format. ([#3438][gh3438]) +* Unique validator is executed and breaks if field is invalid. ([#3381][gh3381]) +* Do not ignore overridden View.get_view_name() in breadcrumbs. ([#3273][gh3273]) +* Retry form rendering when rendering with serializer fails. ([#3164][gh3164]) +* Unique constraint prevents nested serializers from updating. ([#2996][gh2996]) +* Uniqueness validators should not be run for excluded (read_only) fields. ([#2848][gh2848]) +* UniqueValidator raises exception for nested objects. ([#2403][gh2403]) +* `lookup_type` is deprecated in favor of `lookup_expr`. ([#4259][gh4259]) +--- ## 3.3.x series @@ -127,6 +209,8 @@ You can determine your currently installed version using `pip freeze`: * Removed support for Django 1.5 & 1.6. ([#3421][gh3421], [#3429][gh3429]) * Removed 'south' migrations. ([#3495][gh3495]) +--- + ## 3.2.x series ### 3.2.5 @@ -410,6 +494,7 @@ For older release notes, [please see the version 2.x documentation][old-release- [3.3.1-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.3.1+Release%22 [3.3.2-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.3.2+Release%22 [3.3.3-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.3.3+Release%22 +[3.4.0-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.4.0+Release%22 [gh2013]: https://github.com/tomchristie/django-rest-framework/issues/2013 @@ -726,3 +811,88 @@ For older release notes, [please see the version 2.x documentation][old-release- [gh3636]: https://github.com/tomchristie/django-rest-framework/issues/3636 [gh3605]: https://github.com/tomchristie/django-rest-framework/issues/3605 [gh3604]: https://github.com/tomchristie/django-rest-framework/issues/3604 + + +[gh2403]: https://github.com/tomchristie/django-rest-framework/issues/2403 +[gh2848]: https://github.com/tomchristie/django-rest-framework/issues/2848 +[gh2996]: https://github.com/tomchristie/django-rest-framework/issues/2996 +[gh3164]: https://github.com/tomchristie/django-rest-framework/issues/3164 +[gh3273]: https://github.com/tomchristie/django-rest-framework/issues/3273 +[gh3381]: https://github.com/tomchristie/django-rest-framework/issues/3381 +[gh3438]: https://github.com/tomchristie/django-rest-framework/issues/3438 +[gh3444]: https://github.com/tomchristie/django-rest-framework/issues/3444 +[gh3476]: https://github.com/tomchristie/django-rest-framework/issues/3476 +[gh3487]: https://github.com/tomchristie/django-rest-framework/issues/3487 +[gh3541]: https://github.com/tomchristie/django-rest-framework/issues/3541 +[gh3710]: https://github.com/tomchristie/django-rest-framework/issues/3710 +[gh3729]: https://github.com/tomchristie/django-rest-framework/issues/3729 +[gh3751]: https://github.com/tomchristie/django-rest-framework/issues/3751 +[gh3812]: https://github.com/tomchristie/django-rest-framework/issues/3812 +[gh3816]: https://github.com/tomchristie/django-rest-framework/issues/3816 +[gh3820]: https://github.com/tomchristie/django-rest-framework/issues/3820 +[gh3906]: https://github.com/tomchristie/django-rest-framework/issues/3906 +[gh3908]: https://github.com/tomchristie/django-rest-framework/issues/3908 +[gh3926]: https://github.com/tomchristie/django-rest-framework/issues/3926 +[gh3933]: https://github.com/tomchristie/django-rest-framework/issues/3933 +[gh3936]: https://github.com/tomchristie/django-rest-framework/issues/3936 +[gh3938]: https://github.com/tomchristie/django-rest-framework/issues/3938 +[gh3943]: https://github.com/tomchristie/django-rest-framework/issues/3943 +[gh3953]: https://github.com/tomchristie/django-rest-framework/issues/3953 +[gh3964]: https://github.com/tomchristie/django-rest-framework/issues/3964 +[gh3968]: https://github.com/tomchristie/django-rest-framework/issues/3968 +[gh3970]: https://github.com/tomchristie/django-rest-framework/issues/3970 +[gh3971]: https://github.com/tomchristie/django-rest-framework/issues/3971 +[gh3976]: https://github.com/tomchristie/django-rest-framework/issues/3976 +[gh3983]: https://github.com/tomchristie/django-rest-framework/issues/3983 +[gh3990]: https://github.com/tomchristie/django-rest-framework/issues/3990 +[gh4002]: https://github.com/tomchristie/django-rest-framework/issues/4002 +[gh4003]: https://github.com/tomchristie/django-rest-framework/issues/4003 +[gh4005]: https://github.com/tomchristie/django-rest-framework/issues/4005 +[gh4006]: https://github.com/tomchristie/django-rest-framework/issues/4006 +[gh4008]: https://github.com/tomchristie/django-rest-framework/issues/4008 +[gh4021]: https://github.com/tomchristie/django-rest-framework/issues/4021 +[gh4025]: https://github.com/tomchristie/django-rest-framework/issues/4025 +[gh4040]: https://github.com/tomchristie/django-rest-framework/issues/4040 +[gh4041]: https://github.com/tomchristie/django-rest-framework/issues/4041 +[gh4049]: https://github.com/tomchristie/django-rest-framework/issues/4049 +[gh4075]: https://github.com/tomchristie/django-rest-framework/issues/4075 +[gh4079]: https://github.com/tomchristie/django-rest-framework/issues/4079 +[gh4090]: https://github.com/tomchristie/django-rest-framework/issues/4090 +[gh4097]: https://github.com/tomchristie/django-rest-framework/issues/4097 +[gh4098]: https://github.com/tomchristie/django-rest-framework/issues/4098 +[gh4103]: https://github.com/tomchristie/django-rest-framework/issues/4103 +[gh4105]: https://github.com/tomchristie/django-rest-framework/issues/4105 +[gh4106]: https://github.com/tomchristie/django-rest-framework/issues/4106 +[gh4107]: https://github.com/tomchristie/django-rest-framework/issues/4107 +[gh4118]: https://github.com/tomchristie/django-rest-framework/issues/4118 +[gh4146]: https://github.com/tomchristie/django-rest-framework/issues/4146 +[gh4149]: https://github.com/tomchristie/django-rest-framework/issues/4149 +[gh4153]: https://github.com/tomchristie/django-rest-framework/issues/4153 +[gh4156]: https://github.com/tomchristie/django-rest-framework/issues/4156 +[gh4157]: https://github.com/tomchristie/django-rest-framework/issues/4157 +[gh4158]: https://github.com/tomchristie/django-rest-framework/issues/4158 +[gh4166]: https://github.com/tomchristie/django-rest-framework/issues/4166 +[gh4176]: https://github.com/tomchristie/django-rest-framework/issues/4176 +[gh4179]: https://github.com/tomchristie/django-rest-framework/issues/4179 +[gh4180]: https://github.com/tomchristie/django-rest-framework/issues/4180 +[gh4181]: https://github.com/tomchristie/django-rest-framework/issues/4181 +[gh4185]: https://github.com/tomchristie/django-rest-framework/issues/4185 +[gh4187]: https://github.com/tomchristie/django-rest-framework/issues/4187 +[gh4191]: https://github.com/tomchristie/django-rest-framework/issues/4191 +[gh4192]: https://github.com/tomchristie/django-rest-framework/issues/4192 +[gh4194]: https://github.com/tomchristie/django-rest-framework/issues/4194 +[gh4195]: https://github.com/tomchristie/django-rest-framework/issues/4195 +[gh4196]: https://github.com/tomchristie/django-rest-framework/issues/4196 +[gh4212]: https://github.com/tomchristie/django-rest-framework/issues/4212 +[gh4215]: https://github.com/tomchristie/django-rest-framework/issues/4215 +[gh4217]: https://github.com/tomchristie/django-rest-framework/issues/4217 +[gh4219]: https://github.com/tomchristie/django-rest-framework/issues/4219 +[gh4229]: https://github.com/tomchristie/django-rest-framework/issues/4229 +[gh4233]: https://github.com/tomchristie/django-rest-framework/issues/4233 +[gh4244]: https://github.com/tomchristie/django-rest-framework/issues/4244 +[gh4246]: https://github.com/tomchristie/django-rest-framework/issues/4246 +[gh4253]: https://github.com/tomchristie/django-rest-framework/issues/4253 +[gh4254]: https://github.com/tomchristie/django-rest-framework/issues/4254 +[gh4255]: https://github.com/tomchristie/django-rest-framework/issues/4255 +[gh4256]: https://github.com/tomchristie/django-rest-framework/issues/4256 +[gh4259]: https://github.com/tomchristie/django-rest-framework/issues/4259 diff --git a/mkdocs.yml b/mkdocs.yml index b10fbefb5..0b89988b1 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -65,6 +65,7 @@ pages: - '3.1 Announcement': 'topics/3.1-announcement.md' - '3.2 Announcement': 'topics/3.2-announcement.md' - '3.3 Announcement': 'topics/3.3-announcement.md' + - '3.4 Announcement': 'topics/3.4-announcement.md' - 'Kickstarter Announcement': 'topics/kickstarter-announcement.md' - 'Mozilla Grant': 'topics/mozilla-grant.md' - 'Funding': 'topics/funding.md' diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py index 6f02b8039..ab1a16597 100644 --- a/rest_framework/__init__.py +++ b/rest_framework/__init__.py @@ -8,7 +8,7 @@ ______ _____ _____ _____ __ """ __title__ = 'Django REST framework' -__version__ = '3.3.3' +__version__ = '3.4.0' __author__ = 'Tom Christie' __license__ = 'BSD 2-Clause' __copyright__ = 'Copyright 2011-2016 Tom Christie' diff --git a/rest_framework/locale/ach/LC_MESSAGES/django.mo b/rest_framework/locale/ach/LC_MESSAGES/django.mo index a91bc8b323901c1ec2e6b2cbbaba7c19085ab063..495c1ce7d7e83414ea9a9c8b538eb04f08d0bd4f 100644 GIT binary patch delta 90 zcmZowqv hGV*g1ixr$RiZY8!GE)_7O7e3ZfH)Z{u<;KoBLI_#9OwW5 delta 90 zcmZo4GCE}z8W65WuZ#Ju91#FG3XD}{)} ivdq*X1^=Ry{KC>o1)GX|2+JWSGcUg^GjZb|Rz?7t5*;c4 diff --git a/rest_framework/locale/ach/LC_MESSAGES/django.po b/rest_framework/locale/ach/LC_MESSAGES/django.po index bfb8b75cc..a245f1510 100644 --- a/rest_framework/locale/ach/LC_MESSAGES/django.po +++ b/rest_framework/locale/ach/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: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Acoli (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/ach/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,40 +17,40 @@ msgstr "" "Language: ach\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "" -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "" -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "" @@ -58,23 +58,23 @@ msgstr "" msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -123,7 +123,6 @@ msgid "Not found." msgstr "" #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "" @@ -132,7 +131,6 @@ msgid "Could not satisfy the request Accept header." msgstr "" #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "" @@ -140,214 +138,201 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "" -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "" -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "" -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "" -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "" -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "" -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "" -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "" -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "" -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "" -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "" -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "" -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "" -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "" -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "" -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "" -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "" -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "" -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "" -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "" -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "" -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "" -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "" -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "" -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "" -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "" -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "" -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" @@ -364,25 +349,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "" #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "" #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "" -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "" @@ -412,27 +394,23 @@ msgstr "" msgid "No items to select." msgstr "" -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "" -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "" -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "" -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "" -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "" @@ -440,15 +418,19 @@ msgstr "" msgid "Invalid version in \"Accept\" header." msgstr "" -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "" -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "" -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "" diff --git a/rest_framework/locale/ar/LC_MESSAGES/django.mo b/rest_framework/locale/ar/LC_MESSAGES/django.mo index 719bb0b318cd7893e394a3c335855cd27d5af81e..06471de238d2249bd794f744ebb7c4c710622b4f 100644 GIT binary patch delta 1608 zcmY+@e`u6-9KiAKcH7;4=$$*A=9T))oR-_UojY63)Vak7PqW$t$snHGle^mP;JMQn zXmhot3ECgu78WFd(sXgf?Oa4c5(EWNe-%AXLBZ&sLInR9L=g1;JkLYqm-{}i=lgxW zKR@5^U2gq->%_0|ni)k(kslymtx~EV+e17^kJc#Ff;-W`qj(>lLTNvP_v1V^;P;qB z7b6&{RjLnTIDpS!FTRW2N=>MrdD%rpJgig(pTr(~4{4xgWzG?~!A<+vMVf((yV z91QBmv6J#yjN)gQz^{YyBFf(G;uhvtOT4V6VqKlTgEaC}djp?9)}WpaJc6>2=Wz|5 z3d(PzM52rx_#Mj5|3UVsdh7jh2C$9tL9AhZHO|Xgd^PYA(nrnXcD#v+YNhVr7RvR@ z{3A-CLHPvA@x6l&;WyZfcZ2!};ga!o;w1LrTlf`DNXUnX(?0wFWyOnl7F%QfS(R`P zTr!Qaqs!QVv$zg_!ri!pvXQQp{)8v-H01@9{#~p51@Bo!{AJ<{ z6)aX=!mW56)A$3*8P_wr4A_EID9Iqp#oJ7l`y)G+#mEM>kvqw9?u}&D<3$MmOI$m- z|NhEla+!!DxhKhLCCP3jw5-Rw19AZ+B9hpYm*gl2pch)XuqkqqENPRE_uR;{Iw;Gf zR1cHaljU#GLY4?fl3U8(*h})C=lH!ON3ww|mrW-^2^|le2^&NCm#v(>5bB8Z+m>0h zhATHi9o5YPS!;CIcriO#wCsW!@YR3Rc81L3mX3yZ)fT;ud&BLaj5V%b3THMPvWG1@ zn>((aG7E)Q^7gPAv`qWhh#EZc!dSMbZ-f_@dDAKHSRcZqwa9QvUBE`rI#WX z8@iLJ?MCX6o>Z5};W! zwT#D#`LSN|v7n-IyRNso*(tlz&b;Bwx>L@aJL#Tt&pV&$w#Ibiiu;Ch!}(DE*0{EE zvT=WCGY!ksl$=>-&hJoiU!%j6`u`VwE4nS=EVz?2ylyz3GhW$n7Mv0<)acvMBhA5_ z_kPoTvFD<)4tJW)bIelG@5kOu^IB$U=bdZHeO4&T use4^JK#I{#3PpEaMAUUefme$zB8oz&zUO^c4;(+|8OQgW^E_vxYq_)dA>eu- zh%jR(qo+oQUQ9UnL;S=L{z4twoI*5X0@eCSY{NW8@Gc(1bsWY&n8ab15dFA>hw(X% z2vHQ9Oyc}-yw+Y&!T|X*R2#g;POPAT^;?8!#X;PTQ@9r|VG~O9;0mh$e~LTsT{W+u zIihA z@93SN*4|R!~{%5%L^FBV#v%iwTPGKd7AG8CZQ)E#jQkW2A6a zG*nfno~v7{a5HGT;QZFxQ13)lK!oL#t68R9H>9aG$#1S;*;jkOAt$t6d0#W+8!arq zYbWJ&-6uKbHe`vh=Dw4SMU1E(9f-#Ux{at|cutK+(wRbbKAW4344Dg=xZY<(4@C@n zUB9)?VBM%WzYsZ{H)rQ(%!OP&uAemv*-Ty^&tJ@4zH&`ZT+P|DC!VB3 tYTj5mVvYue?~6)&&i7aR{2rjc8wejj>(nav, 2015 msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Arabic (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,74 +19,74 @@ msgstr "" "Language: ar\n" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "اسم المستخدم/كلمة السر غير صحيحين." -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "المستخدم غير مفعل او تم حذفه." -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." -msgstr "" +msgstr "رمز غير صحيح" #: authtoken/apps.py:7 msgid "Auth Token" -msgstr "" +msgstr "رمز التفويض" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" -msgstr "" +msgstr "المفتاح" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" -msgstr "" +msgstr "المستخدم" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" -msgstr "" +msgstr "أنشئ" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" -msgstr "" +msgstr "الرمز" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" -msgstr "" +msgstr "الرموز" #: authtoken/serializers.py:8 msgid "Username" -msgstr "" +msgstr "اسم المستخدم" #: authtoken/serializers.py:9 msgid "Password" -msgstr "" +msgstr "كلمة المرور" #: authtoken/serializers.py:20 msgid "User account is disabled." @@ -124,7 +125,6 @@ msgid "Not found." msgstr "غير موجود." #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "" @@ -133,7 +133,6 @@ msgid "Could not satisfy the request Accept header." msgstr "" #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "" @@ -141,214 +140,201 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "هذا الحقل مطلوب." -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "لا يمكن لهذا الحقل ان يكون فارغاً null." -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "\"{input}\" ليس قيمة منطقية." -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "لا يمكن لهذا الحقل ان يكون فارغاً." -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "تأكد ان الحقل لا يزيد عن {max_length} محرف." -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "تأكد ان الحقل {min_length} محرف على الاقل." -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "عليك ان تدخل بريد إلكتروني صالح." -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "هذه القيمة لا تطابق النمط المطلوب." -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "" -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "الرجاء إدخال رابط إلكتروني صالح." -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "" -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "" -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "الرجاء إدخال رقم صحيح صالح." -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "تأكد ان القيمة أقل أو تساوي {max_value}." -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "تأكد ان القيمة أكبر أو تساوي {min_value}." -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "" -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "الرجاء إدخال رقم صالح." -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "تأكد ان القيمة لا تحوي أكثر من {max_digits} رقم." -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "" -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "" -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "صيغة التاريخ و الوقت غير صحيحة. عليك أن تستخدم واحدة من هذه الصيغ التالية: {format}." -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "صيغة التاريخ غير صحيحة. عليك أن تستخدم واحدة من هذه الصيغ التالية: {format}." -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "صيغة الوقت غير صحيحة. عليك أن تستخدم واحدة من هذه الصيغ التالية: {format}." -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" ليست واحدة من الخيارات الصالحة." -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "" -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "" -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "لم يتم إرسال أي ملف." -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "" -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "الملف الذي تم إرساله فارغ." -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "تأكد ان اسم الملف لا يحوي أكثر من {max_length} محرف (الإسم المرسل يحوي {length} محرف)." -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "" -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" +msgstr "أرسل" + +#: filters.py:336 +msgid "ascending" msgstr "" -#: pagination.py:189 +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." -msgstr "" +msgstr "صفحة غير صحيحة" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "معرف العنصر \"{pk_value}\" غير صالح - العنصر غير موجود." #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" @@ -365,41 +351,38 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "" #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "قيمة غير صالحة." #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "" -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" -msgstr "" +msgstr "مرشحات" #: templates/rest_framework/filters/django_filter.html:2 #: templates/rest_framework/filters/django_filter_crispyforms.html:4 msgid "Field filters" -msgstr "" +msgstr "مرشحات الحقول" #: templates/rest_framework/filters/ordering.html:3 msgid "Ordering" -msgstr "" +msgstr "الترتيب" #: templates/rest_framework/filters/search.html:2 msgid "Search" -msgstr "" +msgstr "البحث" #: templates/rest_framework/horizontal/radio.html:2 #: templates/rest_framework/inline/radio.html:2 @@ -413,27 +396,23 @@ msgstr "" msgid "No items to select." msgstr "" -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "" -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "" -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "" -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "" -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "" @@ -441,15 +420,19 @@ msgstr "" msgid "Invalid version in \"Accept\" header." msgstr "" -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "" -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "" -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "" diff --git a/rest_framework/locale/be/LC_MESSAGES/django.mo b/rest_framework/locale/be/LC_MESSAGES/django.mo index cf959f6d9fb4bf89764a8ab67ec323c64e3cfbc5..13a9e256933805d001779e1ba01f975a592d26b5 100644 GIT binary patch delta 90 zcmeBY?Pr}Znaf<)&`811%*xPs;#@gL2+!2Y&_vq+2)KL_i%WDviW2jRa}rDPi>wqv hGV*g1ixr$RiZY8!GE)_7O7e3ZfH)Z{u<_4iMgX4>9h3k7 delta 90 zcmeBY?Pr}Znafz$z)-=^!phiU;#@gL2+thI(>4GCE}z8W65WuZ#Ju91#FG3XD}{)} ivdq*X1^=Ry{KC>o1)GX|2+JWSGcUg^GjZde$&3J{njO{v diff --git a/rest_framework/locale/be/LC_MESSAGES/django.po b/rest_framework/locale/be/LC_MESSAGES/django.po index 6fe59735f..5aaa072ae 100644 --- a/rest_framework/locale/be/LC_MESSAGES/django.po +++ b/rest_framework/locale/be/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: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Belarusian (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/be/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,40 +17,40 @@ msgstr "" "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:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "" -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "" -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "" @@ -58,23 +58,23 @@ msgstr "" msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -123,7 +123,6 @@ msgid "Not found." msgstr "" #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "" @@ -132,7 +131,6 @@ msgid "Could not satisfy the request Accept header." msgstr "" #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "" @@ -140,214 +138,201 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "" -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "" -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "" -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "" -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "" -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "" -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "" -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "" -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "" -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "" -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "" -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "" -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "" -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "" -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "" -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "" -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "" -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "" -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "" -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "" -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "" -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "" -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "" -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "" -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "" -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "" -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "" -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" @@ -364,25 +349,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "" #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "" #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "" -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "" @@ -412,27 +394,23 @@ msgstr "" msgid "No items to select." msgstr "" -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "" -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "" -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "" -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "" -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "" @@ -440,15 +418,19 @@ msgstr "" msgid "Invalid version in \"Accept\" header." msgstr "" -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "" -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "" -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "" diff --git a/rest_framework/locale/ca/LC_MESSAGES/django.mo b/rest_framework/locale/ca/LC_MESSAGES/django.mo index e9d5355e1f5641ec5e75b8c3d454e0b0b9fd0858..7418c1ed05769800a93e799c05042bf4a73c7c7e 100644 GIT binary patch delta 75 zcmZ4Iz0P}sjwqM8uAz~Fp_!GT@nkbmIVjiE%FtwToT#`$NJf5cVzGjAMp0&QNoJ~o TO-X*P0}v-e1vXC=l@tH~A5IqS delta 75 zcmZ4Iz0P}sjwqM0u7RO~p@o&P#bh&4IVjg0#ElabSBOX~%S\n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Catalan (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/ca/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,40 +17,40 @@ msgstr "" "Language: ca\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "Header Basic invàlid. No hi ha disponibles les credencials." -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "Header Basic invàlid. Les credencials no poden contenir espais." -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Header Basic invàlid. Les credencials no estan codificades correctament en base64." -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "Usuari/Contrasenya incorrectes." -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "Usuari inactiu o esborrat." -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "Token header invàlid. No s'han indicat les credencials." -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "Token header invàlid. El token no ha de contenir espais." -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "Token header invàlid. El token no pot contenir caràcters invàlids." -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "Token invàlid." @@ -58,23 +58,23 @@ msgstr "Token invàlid." msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -123,7 +123,6 @@ msgid "Not found." msgstr "No trobat." #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "Mètode \"{method}\" no permès." @@ -132,7 +131,6 @@ msgid "Could not satisfy the request Accept header." msgstr "No s'ha pogut satisfer l'Accept header de la petició." #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "Media type \"{media_type}\" no suportat." @@ -140,214 +138,201 @@ msgstr "Media type \"{media_type}\" no suportat." msgid "Request was throttled." msgstr "La petició ha estat limitada pel número màxim de peticions definit." -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "Aquest camp és obligatori." -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "Aquest camp no pot ser nul." -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "\"{input}\" no és un booleà." -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "Aquest camp no pot estar en blanc." -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "Aquest camp no pot tenir més de {max_length} caràcters." -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "Aquest camp ha de tenir un mínim de {min_length} caràcters." -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "Introdueixi una adreça de correu vàlida." -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "Aquest valor no compleix el patró requerit." -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "Introdueix un \"slug\" vàlid consistent en lletres, números, guions o guions baixos." -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "Introdueixi una URL vàlida." -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "\"{value}\" no és un UUID vàlid." -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "Introdueixi una adreça IPv4 o IPv6 vàlida." -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "Es requereix un nombre enter vàlid." -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "Aquest valor ha de ser menor o igual a {max_value}." -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "Aquest valor ha de ser més gran o igual a {min_value}." -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "Valor del text massa gran." -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "Es requereix un nombre vàlid." -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "No pot haver-hi més de {max_digits} dígits en total." -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "No pot haver-hi més de {max_decimal_places} decimals." -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "No pot haver-hi més de {max_whole_digits} dígits abans del punt decimal." -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "El Datetime té un format incorrecte. Utilitzi un d'aquests formats: {format}." -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "S'espera un Datetime però s'ha rebut un Date." -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "El Date té un format incorrecte. Utilitzi un d'aquests formats: {format}." -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "S'espera un Date però s'ha rebut un Datetime." -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "El Time té un format incorrecte. Utilitzi un d'aquests formats: {format}." -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "La durada té un format incorrecte. Utilitzi un d'aquests formats: {format}." -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" no és una opció vàlida." -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "" -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "S'espera una llista d'ítems però s'ha rebut el tipus \"{input_type}\"." -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "Aquesta selecció no pot estar buida." -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "\"{input}\" no és un path vàlid." -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "No s'ha enviat cap fitxer." -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "Les dades enviades no són un fitxer. Comproveu l'encoding type del formulari." -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "No s'ha pogut determinar el nom del fitxer." -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "El fitxer enviat està buit." -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "El nom del fitxer ha de tenir com a màxim {max_length} caràcters (en té {length})." -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "Envieu una imatge vàlida. El fitxer enviat no és una imatge o és una imatge corrompuda." -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "Aquesta llista no pot estar buida." -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "S'espera un diccionari però s'ha rebut el tipus \"{input_type}\"." -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "Cursor invàlid." #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "PK invàlida \"{pk_value}\" - l'objecte no existeix." #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Tipus incorrecte. S'espera el valor d'una PK, s'ha rebut {data_type}." @@ -364,25 +349,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "Hyperlink invàlid - L'objecte no existeix." #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Tipus incorrecte. S'espera una URL, s'ha rebut {data_type}." -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "L'objecte amb {slug_name}={value} no existeix." -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "Valor invàlid." #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "Dades invàlides. S'espera un diccionari però s'ha rebut {datatype}." -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "" @@ -412,27 +394,23 @@ msgstr "Cap" msgid "No items to select." msgstr "Cap opció seleccionada." -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "Aquest camp ha de ser únic." -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "Aquests camps {field_names} han de constituir un conjunt únic." -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "Aquest camp ha de ser únic per a la data \"{date_field}\"." -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "Aquest camp ha de ser únic per al mes \"{date_field}\"." -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "Aquest camp ha de ser únic per a l'any \"{date_field}\"." @@ -440,15 +418,19 @@ msgstr "Aquest camp ha de ser únic per a l'any \"{date_field}\"." msgid "Invalid version in \"Accept\" header." msgstr "Versió invàlida al header \"Accept\"." -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "Versió invàlida a la URL." -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "Versió invàlida al hostname." -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "Versió invàlida al paràmetre de consulta." diff --git a/rest_framework/locale/ca_ES/LC_MESSAGES/django.mo b/rest_framework/locale/ca_ES/LC_MESSAGES/django.mo index 96a0b1ebb8a981b8d762b8c0e8319ee1e54c53a6..3a733aa1bff6f023acaa798f4d55f94a713ada8d 100644 GIT binary patch delta 90 zcmbQhGJ$2nWG-`ELn8%4Gb=;miF4%~Av{wnLlbQSAmH*zEH2RvDN4*M&PgoEFS1ey h$;i)5ELL#ND9S7@$xKzSDap@u0ODk*z{Wo!i~yb#9Tflo delta 90 zcmbQhGJ$2nWG-V}149Kv3oB!biF4%~Av|*+PulKWK|2o*h>J diff --git a/rest_framework/locale/ca_ES/LC_MESSAGES/django.po b/rest_framework/locale/ca_ES/LC_MESSAGES/django.po index c4f9df6cb..c9ce5fd13 100644 --- a/rest_framework/locale/ca_ES/LC_MESSAGES/django.po +++ b/rest_framework/locale/ca_ES/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: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Catalan (Spain) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/ca_ES/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,40 +17,40 @@ msgstr "" "Language: ca_ES\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "" -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "" -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "" @@ -58,23 +58,23 @@ msgstr "" msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -123,7 +123,6 @@ msgid "Not found." msgstr "" #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "" @@ -132,7 +131,6 @@ msgid "Could not satisfy the request Accept header." msgstr "" #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "" @@ -140,214 +138,201 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "" -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "" -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "" -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "" -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "" -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "" -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "" -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "" -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "" -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "" -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "" -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "" -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "" -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "" -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "" -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "" -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "" -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "" -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "" -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "" -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "" -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "" -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "" -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "" -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "" -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "" -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "" -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" @@ -364,25 +349,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "" #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "" #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "" -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "" @@ -412,27 +394,23 @@ msgstr "" msgid "No items to select." msgstr "" -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "" -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "" -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "" -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "" -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "" @@ -440,15 +418,19 @@ msgstr "" msgid "Invalid version in \"Accept\" header." msgstr "" -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "" -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "" -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "" diff --git a/rest_framework/locale/cs/LC_MESSAGES/django.mo b/rest_framework/locale/cs/LC_MESSAGES/django.mo index 459b3f01f444090391c6d45f9f44edd71036c949..1c98eb62d30fb3a73710923f9bd0428ea2b38668 100644 GIT binary patch delta 118 zcmX@^cHC`)hH$32uAz~Fp_!GTv9^JsfdN;5ziv=!S!Qu&ex9yNVo9o%f{}rtnXUmu zovD?fiM9a{aQP$_m*|ERCFT|9B$nhCSt*2M!EqWfqrYrYhK!mAfdN;5ziv=!S!Qu&ex9yNVo9o%f{}rtnXUmu zojF*Y0Z^S!VsVLXNKs;5aZX}Mevy?zL}FQHYLS9}QA&PcX{CZqMLvY(kdv90UzVA; Jd7|((egFVhC3ye< diff --git a/rest_framework/locale/cs/LC_MESSAGES/django.po b/rest_framework/locale/cs/LC_MESSAGES/django.po index 43c571130..8ba979350 100644 --- a/rest_framework/locale/cs/LC_MESSAGES/django.po +++ b/rest_framework/locale/cs/LC_MESSAGES/django.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Czech (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,40 +19,40 @@ msgstr "" "Language: cs\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "Chybná hlavička. Nebyly poskytnuty přihlašovací údaje." -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "Chybná hlavička. Přihlašovací údaje by neměly obsahovat mezery." -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Chybná hlavička. Přihlašovací údaje nebyly správně zakódovány pomocí base64." -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "Chybné uživatelské jméno nebo heslo." -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "Uživatelský účet je neaktivní nebo byl smazán." -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "Chybná hlavička tokenu. Nebyly zadány přihlašovací údaje." -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "Chybná hlavička tokenu. Přihlašovací údaje by neměly obsahovat mezery." -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "Chybný token." @@ -60,23 +60,23 @@ msgstr "Chybný token." msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -125,7 +125,6 @@ msgid "Not found." msgstr "Nenalezeno." #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "Metoda \"{method}\" není povolena." @@ -134,7 +133,6 @@ msgid "Could not satisfy the request Accept header." msgstr "Nelze vyhovět požadavku v hlavičce Accept." #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "Nepodporovaný media type \"{media_type}\" v požadavku." @@ -142,214 +140,201 @@ msgstr "Nepodporovaný media type \"{media_type}\" v požadavku." msgid "Request was throttled." msgstr "Požadavek byl limitován kvůli omezení počtu požadavků za časovou periodu." -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "Toto pole je vyžadováno." -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "Toto pole nesmí být prázdné (null)." -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "\"{input}\" nelze použít jako typ boolean." -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "Toto pole nesmí být prázdné." -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "Zkontrolujte, že toto pole není delší než {max_length} znaků." -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "Zkontrolujte, že toto pole obsahuje alespoň {min_length} znaků." -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "Vložte platnou e-mailovou adresu." -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "Hodnota v tomto poli neodpovídá požadovanému formátu." -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "Vložte platnou \"zkrácenou formu\" obsahující pouze malá písmena, čísla, spojovník nebo podtržítko." -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "Vložte platný odkaz." -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "\"{value}\" není platné UUID." -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "" -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "Je vyžadováno celé číslo." -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "Zkontrolujte, že hodnota je menší nebo rovna {max_value}." -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "Zkontrolujte, že hodnota je větší nebo rovna {min_value}." -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "Řetězec je příliš dlouhý." -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "Je vyžadováno číslo." -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "Zkontrolujte, že číslo neobsahuje více než {max_digits} čislic." -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "Zkontrolujte, že číslo nemá více než {max_decimal_places} desetinných míst." -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "Zkontrolujte, že číslo neobsahuje více než {max_whole_digits} čislic před desetinnou čárkou." -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "Chybný formát data a času. Použijte jeden z těchto formátů: {format}." -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "Bylo zadáno pouze datum bez času." -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "Chybný formát data. Použijte jeden z těchto formátů: {format}." -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "Bylo zadáno datum a čas, místo samotného data." -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "Chybný formát času. Použijte jeden z těchto formátů: {format}." -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" není platnou možností." -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "" -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Byl očekáván seznam položek ale nalezen \"{input_type}\"." -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "" -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "Nebyl zaslán žádný soubor." -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "Zaslaná data neobsahují soubor. Zkontrolujte typ kódování ve formuláři." -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "Nebylo možné zjistit jméno souboru." -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "Zaslaný soubor je prázdný." -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "Zajistěte, aby jméno souboru obsahovalo maximálně {max_length} znaků (teď má {length} znaků)." -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "Nahrajte platný obrázek. Nahraný soubor buď není obrázkem nebo je poškozen." -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "" -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "Byl očekáván slovník položek ale nalezen \"{input_type}\"." -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "Chybný kurzor." #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Chybný primární klíč \"{pk_value}\" - objekt neexistuje." #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Chybný typ. Byl přijat typ {data_type} místo hodnoty primárního klíče." @@ -366,25 +351,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "Chybný odkaz - objekt neexistuje." #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Chybný typ. Byl přijat typ {data_type} místo očekávaného odkazu." -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "Objekt s {slug_name}={value} neexistuje." -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "Chybná hodnota." #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "Chybná data. Byl přijat typ {datatype} místo očekávaného slovníku." -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "" @@ -414,27 +396,23 @@ msgstr "" msgid "No items to select." msgstr "" -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "Tato položka musí být unikátní." -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "Položka {field_names} musí tvořit unikátní množinu." -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "Tato položka musí být pro datum \"{date_field}\" unikátní." -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "Tato položka musí být pro měsíc \"{date_field}\" unikátní." -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "Tato položka musí být pro rok \"{date_field}\" unikátní." @@ -442,15 +420,19 @@ msgstr "Tato položka musí být pro rok \"{date_field}\" unikátní." msgid "Invalid version in \"Accept\" header." msgstr "Chybné číslo verze v hlavičce Accept." -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "Chybné číslo verze v odkazu." -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "Chybné číslo verze v hostname." -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "Chybné čislo verze v URL parametru." diff --git a/rest_framework/locale/da/LC_MESSAGES/django.mo b/rest_framework/locale/da/LC_MESSAGES/django.mo index 7820bdd3e93b02293df5e92d506df9ccfcbbc40e..9c17c3a405ef51c7a68fe18da1fd52289e1ffb74 100644 GIT binary patch delta 93 zcmbQ~JJWZAnHZP3uAz~Fp_!GT@ni=vIY$WB)XLCA+W-i-d=iUGbVG^~^NMp4OY)1X k6hboca}$ddoHL3ti%T+76>LiKa~*&<87i=OzSu8*0Ni{X`~Uy| delta 93 zcmbQ~JJWZAnHZO`u7RO~p@o&P#bgIDIY$WB9LUu+00J(b#Nra&kfOxA;+({i{30ub lh{UqY)FK7{qLlo?(n\n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Danish (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,40 +19,40 @@ msgstr "" "Language: da\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "Ugyldig basic header. Ingen legitimation angivet." -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "Ugyldig basic header. Legitimationsstrenge må ikke indeholde mellemrum." -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Ugyldig basic header. Legitimationen er ikke base64 encoded på korrekt vis." -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "Ugyldigt brugernavn/kodeord." -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "Inaktiv eller slettet bruger." -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "Ugyldig token header." -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "Ugyldig token header. Token-strenge må ikke indeholde mellemrum." -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "Ugyldig token header. Token streng bør ikke indeholde ugyldige karakterer." -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "Ugyldigt token." @@ -60,23 +60,23 @@ msgstr "Ugyldigt token." msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -125,7 +125,6 @@ msgid "Not found." msgstr "Ikke fundet." #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "Metoden \"{method}\" er ikke tilladt." @@ -134,7 +133,6 @@ msgid "Could not satisfy the request Accept header." msgstr "Kunne ikke efterkomme forespørgslens Accept header." #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "Forespørgslens media type, \"{media_type}\", er ikke understøttet." @@ -142,214 +140,201 @@ msgstr "Forespørgslens media type, \"{media_type}\", er ikke understøttet." msgid "Request was throttled." msgstr "Forespørgslen blev neddroslet." -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "Dette felt er påkrævet." -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "Dette felt må ikke være null." -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "\"{input}\" er ikke en tilladt boolsk værdi." -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "Dette felt må ikke være tomt." -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "Tjek at dette felt ikke indeholder flere end {max_length} tegn." -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "Tjek at dette felt indeholder mindst {min_length} tegn." -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "Angiv en gyldig e-mailadresse." -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "Denne værdi passer ikke med det påkrævede mønster." -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "Indtast en gyldig \"slug\", bestående af bogstaver, tal, bund- og bindestreger." -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "Indtast en gyldig URL." -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "\"{value}\" er ikke et gyldigt UUID." -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "Indtast en gyldig IPv4 eller IPv6 adresse." -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "Et gyldigt heltal er påkrævet." -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "Tjek at værdien er mindre end eller lig med {max_value}." -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "Tjek at værdien er større end eller lig med {min_value}." -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "Strengværdien er for stor." -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "Et gyldigt tal er påkrævet." -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "Tjek at der ikke er flere end {max_digits} cifre i alt." -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "Tjek at der ikke er flere end {max_decimal_places} cifre efter kommaet." -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "Tjek at der ikke er flere end {max_whole_digits} cifre før kommaet." -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "Datotid har et forkert format. Brug i stedet et af disse formater: {format}." -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "Forventede en datotid, men fik en dato." -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "Dato har et forkert format. Brug i stedet et af disse formater: {format}." -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "Forventede en dato men fik en datotid." -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "Klokkeslæt har forkert format. Brug i stedet et af disse formater: {format}. " -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "Varighed har forkert format. Brug istedet et af følgende formater: {format}." -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" er ikke et gyldigt valg." -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "Flere end {count} objekter..." -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Forventede en liste, men fik noget af typen \"{input_type}\"." -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "Dette valg kan være tomt." -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "\"{input}\" er ikke et gyldigt valg af adresse." -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "Ingen medsendt fil." -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "Det medsendte data var ikke en fil. Tjek typen af indkodning på formularen." -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "Filnavnet kunne ikke afgøres." -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "Den medsendte fil er tom." -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "Sørg for at filnavnet er højst {max_length} langt (det er {length})." -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "Medsend et gyldigt billede. Den medsendte fil var enten ikke et billede eller billedfilen var ødelagt." -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "Denne liste er muligvis ikke tom." -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "Forventede en dictionary, men fik noget af typen \"{input_type}\"." -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "Værdi skal være gyldig JSON." -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "Indsend." -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "Ugyldig cursor" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Ugyldig primærnøgle \"{pk_value}\" - objektet findes ikke." #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Ugyldig type. Forventet værdi er primærnøgle, fik {data_type}." @@ -366,25 +351,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "Ugyldigt hyperlink - objektet findes ikke." #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Forkert type. Forventede en URL-streng, fik {data_type}." -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "Object med {slug_name}={value} findes ikke." -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "Ugyldig værdi." #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "Ugyldig data. Forventede en dictionary, men fik {datatype}." -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "Filtre" @@ -414,27 +396,23 @@ msgstr "Ingen" msgid "No items to select." msgstr "Intet at vælge." -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "Dette felt skal være unikt." -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "Felterne {field_names} skal udgøre et unikt sæt." -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "Dette felt skal være unikt for \"{date_field}\"-datoen." -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "Dette felt skal være unikt for \"{date_field}\"-måneden." -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "Dette felt skal være unikt for \"{date_field}\"-året." @@ -442,15 +420,19 @@ msgstr "Dette felt skal være unikt for \"{date_field}\"-året." msgid "Invalid version in \"Accept\" header." msgstr "Ugyldig version i \"Accept\" headeren." -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "Ugyldig version i URL-stien." -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "Ugyldig version i hostname." -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "Ugyldig version i forespørgselsparameteren." diff --git a/rest_framework/locale/da_DK/LC_MESSAGES/django.mo b/rest_framework/locale/da_DK/LC_MESSAGES/django.mo index 0e1cc36efce4bf67188b4092a8d23fca1d107dfb..f34583e4c20fbd84e69fe3c25847ea9bc43df310 100644 GIT binary patch delta 90 zcmbQpGLdD%WG-`ELn8%4Gb=;miF4%~Av{wnLlbQSAmH*zEH2RvDN4*M&PgoEFS1ey h$;i)5ELL#ND9S7@$xKzSDap@u0ODk*z{WqKi~yd<9T)%r delta 90 zcmbQpGLdD%WG-V}149Kv3oB!biF4%~Av|*+PulKWU34QXN_V diff --git a/rest_framework/locale/da_DK/LC_MESSAGES/django.po b/rest_framework/locale/da_DK/LC_MESSAGES/django.po index 7ec27dee2..bb512e284 100644 --- a/rest_framework/locale/da_DK/LC_MESSAGES/django.po +++ b/rest_framework/locale/da_DK/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: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Danish (Denmark) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/da_DK/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,40 +17,40 @@ msgstr "" "Language: da_DK\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "" -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "" -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "" @@ -58,23 +58,23 @@ msgstr "" msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -123,7 +123,6 @@ msgid "Not found." msgstr "" #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "" @@ -132,7 +131,6 @@ msgid "Could not satisfy the request Accept header." msgstr "" #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "" @@ -140,214 +138,201 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "" -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "" -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "" -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "" -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "" -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "" -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "" -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "" -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "" -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "" -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "" -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "" -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "" -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "" -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "" -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "" -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "" -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "" -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "" -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "" -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "" -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "" -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "" -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "" -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "" -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "" -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "" -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" @@ -364,25 +349,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "" #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "" #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "" -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "" @@ -412,27 +394,23 @@ msgstr "" msgid "No items to select." msgstr "" -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "" -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "" -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "" -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "" -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "" @@ -440,15 +418,19 @@ msgstr "" msgid "Invalid version in \"Accept\" header." msgstr "" -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "" -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "" -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "" diff --git a/rest_framework/locale/de/LC_MESSAGES/django.mo b/rest_framework/locale/de/LC_MESSAGES/django.mo index ce4458e0019ecbb7a953ea7b87b69c1cbad72051..317124886528d1de71f4021441d60acd700235dc 100644 GIT binary patch delta 2376 zcmZA2e@sL2RbwzW#nfVX4 zTHV>^Ki2$1rIl;me_Tq9^}|-nQEhEji@D0SVy!ltO`GfeIp^?4J>z>{&vQIKp6~N~ z&+(tGKX-?JNRK~lXntZDQ50v)2`pW}53SZ?Oaa!Rh5K+N9>Y95hdDTny8c^Sigz&? zGm?xc!#pg-4s6D8+-gkNTyr`mjNkHP&EBiZKoNIPSo+SdYJ={(YsF zo8x|5fp1|t-at+4mV5kxYhkMH7iJc8syN{VSimJ<1S=7&2iTW z0K7f=)Y6jfAzV*)lTb|&P*HH_P^5<~bHo<}8WvRMBmm_QmbAC+mHJ8s5x zjQjC=j4`jEZrDr77vTxi9$&;l{1Ua-ciiJy+*Ic^qE_@UGDkCt)%aqV&Q3a4@ernv zW;YID4^CqzW|MXwK7p#05AYF8V)+hXFSgx{Vt#oI-`D z(}wMM5_vDp3~I*N`OZ=nBCBRrqYoRg7LTJQ@*e7XkL7IL9%S3iDQv>CsFj?>wV2K_ zv2|hNqf^C!r%`);0d>P!)D6p6R|?fUiySf&?)YsiWBfkyY%}NToCH<5ZZlgO%?DO3@D zhgz{)sPpgQW{l;d(u+PU;Q8hZ9bI@;2k@rreQagC{9(rd+`@PgE&LsIej4d2flAa$ zcB5)&0uyi+7vRsh9_MfqT2yX$kj?=*%H%p~X=c#EIpk|;Qdc`Gl8f4+I*h@1LdB`< z=i7EVyd-whM~ttt{TXk-Qu`>^qeXBpKz7ys-*yM)&gb9GpovH&s6)H5W05U3U4-`CL+mHi^y=x; zx{c5ttLe2`MjX(9rVrIFyXWk;YD}%e!TxPiMYj;DcnZ}13g+N^OQfUMXTI&G)94Q3 zu$f3ABKH$>BVQ$c?6JB>pA3u`U!*g2N%S4h7Ej!czQhT)@m)+ax>TFs{2P)ZmpmEBdhffY*wq)AF-U9wbn1(dVik#WS!mbeVz00+~+yx ze9t*t?_2Cmd|Qxp+9*TB8sch(SpqLD;fr!H+pHAdLkF*51uo)REXy&w9V4jU58)m7 zFa|J*)%X$az-zb*L%FUAJ5HsI3m;-LW-l`vz;@h>XK*XdVFwm2Hw)u1>hCXOCw_(H zxb7CS0&GEbXaIG6!t+Jc^FF{j4fS^_d0Yta#h`2}YJ@GQ7sapv&*FCc23xRXg;@tu@GOyL>85Is4%}}KtKF1!sfg{+(+xzhX?!`<-(~X0;AK$>;=wozU*pZ+zLggjg ziGN`$HZy;EzzNg{ub^fouO!`(O58@f%kvrBLwg3by$Vasl9CtiUD=;y#R{Ix>UIvMqS+Yz_-uuR^7;!}B?8 zr9FoZuDLUPUn8pH!&t}r?I|i+G#9ZJ^B8_3M(_wGP$T~d9n4}yYNQpYDQ`s|{#*16 z6^&j4Ql8bZHiEvmX$1G33C;}nbkYSaG?fhEK0^8DaCAGPZAHG^qTVaVOn_VN_1un{ z+B`xj{eMx4=)c`VXa}fpVr%^AvJ`d^+Ab=CL^Cl&WD#V^JvKX#iE_^YcB{Mn;AYXT z;9rS*L~DzxXtuOSl@6s&g-N4$@6T}?|9!EYZx-b~LTEMX&`{|lv>jD+L~DU56=6ap zJB|B~W`KI1*VejH=}lu*%86EaCZQZ}A=(LT8MeGzmhioo&|=gfqT&#KqLk3ln|w5< zIN6u;S*k2|C@1yA%H_V)^9AQJlI^Q5C3F43DcJF(=&cB z{?ODT&bH(6bglVlY%D$7A8X=gV~3}rherebqtRnwr!94)=!P%#;OZZ9Q^VyE XU+Vn&`po3j4L>C3E9;WQRr~${XVK-< diff --git a/rest_framework/locale/de/LC_MESSAGES/django.po b/rest_framework/locale/de/LC_MESSAGES/django.po index c30dd7555..057a69f1c 100644 --- a/rest_framework/locale/de/LC_MESSAGES/django.po +++ b/rest_framework/locale/de/LC_MESSAGES/django.po @@ -5,7 +5,7 @@ # Translators: # Fabian Büchler , 2015 # Mads Jensen , 2015 -# Niklas P , 2015 +# Niklas P , 2015-2016 # Thomas Tanner, 2015 # Tom Jaster , 2015 # Xavier Ordoquy , 2015 @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: German (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -23,74 +23,74 @@ msgstr "" "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "Ungültiger basic header. Keine Zugangsdaten angegeben." -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "Ungültiger basic header. Zugangsdaten sollen keine Leerzeichen enthalten." -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Ungültiger basic header. Zugangsdaten sind nicht korrekt mit base64 kodiert." -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "Ungültiger Benutzername/Passwort" -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "Benutzer inaktiv oder gelöscht." -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "Ungültiger token header. Keine Zugangsdaten angegeben." -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "Ungültiger token header. Zugangsdaten sollen keine Leerzeichen enthalten." -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "Ungültiger Token Header. Tokens dürfen keine ungültigen Zeichen enthalten." -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "Ungültiges Token" #: authtoken/apps.py:7 msgid "Auth Token" -msgstr "" +msgstr "Auth Token" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" -msgstr "" +msgstr "Schlüssel" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" -msgstr "" +msgstr "Benutzer" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" -msgstr "" +msgstr "Token" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" -msgstr "" +msgstr "Tokens" #: authtoken/serializers.py:8 msgid "Username" -msgstr "" +msgstr "Benutzername" #: authtoken/serializers.py:9 msgid "Password" -msgstr "" +msgstr "Passwort" #: authtoken/serializers.py:20 msgid "User account is disabled." @@ -129,7 +129,6 @@ msgid "Not found." msgstr "Nicht gefunden." #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "Methode \"{method}\" nicht erlaubt." @@ -138,7 +137,6 @@ msgid "Could not satisfy the request Accept header." msgstr "Kann die Accept Kopfzeile der Anfrage nicht erfüllen." #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "Nicht unterstützter Medientyp \"{media_type}\" in der Anfrage." @@ -146,214 +144,201 @@ msgstr "Nicht unterstützter Medientyp \"{media_type}\" in der Anfrage." msgid "Request was throttled." msgstr "Die Anfrage wurde gedrosselt." -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "Dieses Feld ist erforderlich." -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "Dieses Feld darf nicht Null sein." -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "\"{input}\" ist kein gültiger Wahrheitswert." -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "Dieses Feld darf nicht leer sein." -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "Stelle sicher, dass dieses Feld nicht mehr als {max_length} Zeichen lang ist." -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "Stelle sicher, dass dieses Feld mindestens {min_length} Zeichen lang ist." -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "Gib eine gültige E-Mail Adresse an." -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "Dieser Wert passt nicht zu dem erforderlichen Muster." -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "Gib ein gültiges \"slug\" aus Buchstaben, Ziffern, Unterstrichen und Minuszeichen ein." -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "Gib eine gültige URL ein." -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "\"{value}\" ist keine gültige UUID." -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "Geben Sie eine gültige UPv4 oder IPv6 Adresse an" -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "Eine gültige Ganzzahl ist erforderlich." -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "Stelle sicher, dass dieser Wert kleiner oder gleich {max_value} ist." -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "Stelle sicher, dass dieser Wert größer oder gleich {min_value} ist." -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "Zeichenkette zu lang." -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "Eine gültige Zahl ist erforderlich." -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "Stelle sicher, dass es insgesamt nicht mehr als {max_digits} Ziffern lang ist." -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "Stelle sicher, dass es nicht mehr als {max_decimal_places} Nachkommastellen lang ist." -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "Stelle sicher, dass es nicht mehr als {max_whole_digits} Stellen vor dem Komma lang ist." -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "Datums- und Zeitangabe hat das falsche Format. Nutze stattdessen eines dieser Formate: {format}." -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "Erwarte eine Datums- und Zeitangabe, erhielt aber ein Datum." -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "Datum hat das falsche Format. Nutze stattdessen eines dieser Formate: {format}." -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "Erwarte ein Datum, erhielt aber eine Datums- und Zeitangabe." -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "Zeitangabe hat das falsche Format. Nutze stattdessen eines dieser Formate: {format}." -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "Laufzeit hat das falsche Format. Benutze stattdessen eines dieser Formate {format}." -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" ist keine gültige Option." -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "Mehr als {count} Ergebnisse" -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Erwarte eine Liste von Elementen, erhielt aber den Typ \"{input_type}\"." -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "Diese Auswahl darf nicht leer sein" -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "\"{input}\" ist ein ungültiger Pfad Wahl." -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "Es wurde keine Datei übermittelt." -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "Die übermittelten Daten stellen keine Datei dar. Prüfe den Kodierungstyp im Formular." -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "Der Dateiname konnte nicht ermittelt werden." -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "Die übermittelte Datei ist leer." -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "Stelle sicher, dass dieser Dateiname höchstens {max_length} Zeichen lang ist (er hat {length})." -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "Lade ein gültiges Bild hoch. Die hochgeladene Datei ist entweder kein Bild oder ein beschädigtes Bild." -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "Diese Liste darf nicht leer sein." -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "Erwarte ein Dictionary mit Elementen, erhielt aber den Typ \"{input_type}\"." -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "Wert muss gültiges JSON sein." -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "Abschicken" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "Ungültiger Zeiger" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Ungültiger pk \"{pk_value}\" - Object existiert nicht." #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Falscher Typ. Erwarte pk Wert, erhielt aber {data_type}." @@ -370,25 +355,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "Ungültiger Hyperlink - Objekt existiert nicht." #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Falscher Typ. Erwarte URL Zeichenkette, erhielt aber {data_type}." -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "Objekt mit {slug_name}={value} existiert nicht." -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "Ungültiger Wert." #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "Ungültige Daten. Dictionary erwartet, aber {datatype} erhalten." -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "Filter" @@ -418,27 +400,23 @@ msgstr "Nichts" msgid "No items to select." msgstr "Keine Elemente zum Auswählen." -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "Dieses Feld muss eindeutig sein." -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "Die Felder {field_names} müssen eine eindeutige Menge bilden." -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "Dieses Feld muss bezüglich des \"{date_field}\" Datums eindeutig sein." -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "Dieses Feld muss bezüglich des \"{date_field}\" Monats eindeutig sein." -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "Dieses Feld muss bezüglich des \"{date_field}\" Jahrs eindeutig sein." @@ -446,15 +424,19 @@ msgstr "Dieses Feld muss bezüglich des \"{date_field}\" Jahrs eindeutig sein." msgid "Invalid version in \"Accept\" header." msgstr "Ungültige Version in der \"Accept\" Kopfzeile." -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "Ungültige Version im URL Pfad." -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "Ungültige Version im Hostname." -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "Ungültige Version im Anfrageparameter." diff --git a/rest_framework/locale/el/LC_MESSAGES/django.mo b/rest_framework/locale/el/LC_MESSAGES/django.mo index fc2120f7f371fbb381747daa830f56dca521fb92..c7fb97b2ca50c64f7f8d5b0a30b4d462f148575b 100644 GIT binary patch literal 13507 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 delta 151 zcmX?{*}!6PPl#nI0}wC*u?!Ha05LNV>i{tbSOD=cprj>`2C0F8$#=w}xr}uU3>6G5 ztc)!tJBrIWLb&EYuC@UXaQP$_m*|ERCFT|9B$nhCSt&#$mSv_EDfkzq, 2016 msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Greek (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,441 +18,423 @@ msgstr "" "Language: el\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." -msgstr "" +msgstr "Λανθασμένη επικεφαλίδα basic. Δεν υπάρχουν διαπιστευτήρια." -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." -msgstr "" +msgstr "Λανθασμένη επικεφαλίδα basic. Τα διαπιστευτήρια δε μπορεί να περιέχουν κενά." -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." -msgstr "" +msgstr "Λανθασμένη επικεφαλίδα basic. Τα διαπιστευτήρια δεν είναι κωδικοποιημένα κατά base64." -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." -msgstr "" +msgstr "Λανθασμένο όνομα χρήστη/κωδικός." -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." -msgstr "" - -#: authentication.py:173 -msgid "Invalid token header. No credentials provided." -msgstr "" +msgstr "Ο χρήστης είναι ανενεργός ή διεγραμμένος." #: authentication.py:176 -msgid "Invalid token header. Token string should not contain spaces." -msgstr "" +msgid "Invalid token header. No credentials provided." +msgstr "Λανθασμένη επικεφαλίδα token. Δεν υπάρχουν διαπιστευτήρια." -#: authentication.py:182 +#: authentication.py:179 +msgid "Invalid token header. Token string should not contain spaces." +msgstr "Λανθασμένη επικεφαλίδα token. Το token δε πρέπει να περιέχει κενά." + +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." -msgstr "" +msgstr "Λανθασμένη επικεφαλίδα token. Το token περιέχει μη επιτρεπτούς χαρακτήρες." -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." -msgstr "" +msgstr "Λανθασμένο token" #: authtoken/apps.py:7 msgid "Auth Token" -msgstr "" +msgstr "Token πιστοποίησης" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" -msgstr "" +msgstr "Κλειδί" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" -msgstr "" +msgstr "Χρήστης" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" -msgstr "" +msgstr "Δημιουργήθηκε" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" -msgstr "" +msgstr "Token" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" -msgstr "" +msgstr "Tokens" #: authtoken/serializers.py:8 msgid "Username" -msgstr "" +msgstr "Όνομα χρήστη" #: authtoken/serializers.py:9 msgid "Password" -msgstr "" +msgstr "Κωδικός" #: authtoken/serializers.py:20 msgid "User account is disabled." -msgstr "" +msgstr "Ο λογαριασμός χρήστη είναι απενεργοποιημένος." #: authtoken/serializers.py:23 msgid "Unable to log in with provided credentials." -msgstr "" +msgstr "Δεν είναι δυνατή η σύνδεση με τα διαπιστευτήρια." #: authtoken/serializers.py:26 msgid "Must include \"username\" and \"password\"." -msgstr "" +msgstr "Πρέπει να περιέχει \"όνομα χρήστη\" και \"κωδικό\"." #: exceptions.py:49 msgid "A server error occurred." -msgstr "" +msgstr "Σφάλμα διακομιστή." #: exceptions.py:84 msgid "Malformed request." -msgstr "" +msgstr "Λανθασμένο αίτημα." #: exceptions.py:89 msgid "Incorrect authentication credentials." -msgstr "" +msgstr "Λάθος διαπιστευτήρια." #: exceptions.py:94 msgid "Authentication credentials were not provided." -msgstr "" +msgstr "Δεν δόθηκαν διαπιστευτήρια." #: exceptions.py:99 msgid "You do not have permission to perform this action." -msgstr "" +msgstr "Δεν έχετε δικαίωματα για αυτή την ενέργεια." #: exceptions.py:104 views.py:81 msgid "Not found." -msgstr "" +msgstr "Δε βρέθηκε." #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." -msgstr "" +msgstr "Η μέθοδος \"{method\"} δεν επιτρέπεται." #: exceptions.py:120 msgid "Could not satisfy the request Accept header." -msgstr "" +msgstr "Δεν ήταν δυνατή η ικανοποίηση της επικεφαλίδας Accept της αίτησης." #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." -msgstr "" +msgstr "Δεν υποστηρίζεται το media type \"{media_type}\" της αίτησης." #: exceptions.py:145 msgid "Request was throttled." -msgstr "" +msgstr "Το αίτημα έγινε throttle." -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." -msgstr "" +msgstr "Το πεδίο είναι απαραίτητο." -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." -msgstr "" +msgstr "Το πεδίο δε μπορεί να είναι null." -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." -msgstr "" +msgstr "Το \"{input}\" δεν είναι έγκυρο boolean." -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." -msgstr "" +msgstr "Το πεδίο δε μπορεί να είναι κενό." -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." -msgstr "" +msgstr "Επιβεβαιώσατε ότι το πεδίο δεν έχει περισσότερους από {max_length} χαρακτήρες." -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." -msgstr "" +msgstr "Επιβεβαιώσατε ότι το πεδίο έχει τουλάχιστον {min_length} χαρακτήρες." -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." -msgstr "" +msgstr "Συμπληρώσατε μια έγκυρη διεύθυνση e-mail." -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." -msgstr "" +msgstr "Η τιμή δε ταιριάζει με το pattern." -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." -msgstr "" +msgstr "Εισάγετε ένα έγκυρο \"slug\" που αποτελείται από γράμματα, αριθμούς παύλες και κάτω παύλες." -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." -msgstr "" +msgstr "Εισάγετε έγκυρο URL." -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." -msgstr "" +msgstr "Το \"{value}\" δεν είναι έγκυρο UUID." -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." -msgstr "" +msgstr "Εισάγετε μια έγκυρη διεύθυνση IPv4 ή IPv6." -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." -msgstr "" +msgstr "Ένας έγκυρος ακέραιος είναι απαραίτητος." -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." -msgstr "" +msgstr "Επιβεβαιώσατε ότι η τιμή είναι μικρότερη ή ίση του {max_value}." -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." -msgstr "" +msgstr "Επιβεβαιώσατε ότι η τιμή είναι μεγαλύτερη ή ίση του {min_value}." -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." -msgstr "" +msgstr "Το κείμενο είναι πολύ μεγάλο." -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." -msgstr "" +msgstr "Ένας έγκυρος αριθμός είναι απαραίτητος." -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." -msgstr "" +msgstr "Επιβεβαιώσατε ότι δεν υπάρχουν παραπάνω από {max_digits} ψηφία." -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." -msgstr "" +msgstr "Επιβεβαιώσατε ότι δεν υπάρχουν παραπάνω από {max_decimal_places} δεκαδικά ψηφία." -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." -msgstr "" +msgstr "Επιβεβαιώσατε ότι δεν υπάρχουν παραπάνω από {max_whole_digits} ακέραια ψηφία." -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." -msgstr "" +msgstr "Η ημερομηνία έχεi λάθος μορφή. Χρησιμοποιήστε μια από τις ακόλουθες μορφές: {format}" -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." -msgstr "" +msgstr "Αναμένεται ημερομηνία και ώρα αλλά δόθηκε μόνο ημερομηνία." -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." -msgstr "" +msgstr "Η ημερομηνία έχεi λάθος μορφή. Χρησιμοποιήστε μια από τις ακόλουθες μορφές: {format}" -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." -msgstr "" +msgstr "Αναμένεται ημερομηνία αλλά δόθηκε ημερομηνία και ώρα." -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." -msgstr "" +msgstr "Η ώρα έχει λάθος μορφή. Χρησιμοποιήστε μια από τις ακόλουθες μορφές: {format}" -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." -msgstr "" +msgstr "Η διάρκεια έχει λάθος μορφή. Χρησιμοποιήστε μια από τις ακόλουθες μορφές: {format}" -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." -msgstr "" +msgstr "Το \"{input}\" δεν είναι έγκυρη επιλογή." -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." -msgstr "" +msgstr "Περισσότερα από {count} αντικείμενα..." -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." -msgstr "" +msgstr "Αναμένεται μια λίστα αντικειμένον αλλά δόθηκε ο τύπος \"{input_type}\"" -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." -msgstr "" +msgstr "Η επιλογή δε μπορεί να είναι κενή." -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." -msgstr "" +msgstr "Το \"{input}\" δεν είναι έγκυρη επιλογή διαδρομής." -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." -msgstr "" +msgstr "Δεν υποβλήθηκε αρχείο." -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." -msgstr "" +msgstr "Τα δεδομένα που υποβλήθηκαν δεν ήταν αρχείο. Ελέγξατε την κωδικοποίηση της φόρμας." -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." -msgstr "" +msgstr "Δε βρέθηκε όνομα αρχείου." -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." -msgstr "" +msgstr "Το αρχείο που υποβλήθηκε είναι κενό." -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." -msgstr "" +msgstr "Επιβεβαιώσατε ότι το όνομα αρχείου έχει ως {max_length} χαρακτήρες (έχει {length})." -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." -msgstr "" +msgstr "Ανεβάστε μια έγκυρη εικόνα. Το αρχείο που ανεβάσατε είτε δεν είναι εικόνα είτε έχει καταστραφεί." -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." -msgstr "" +msgstr "Η λίστα δε μπορεί να είναι κενή." -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." -msgstr "" +msgstr "Αναμένεται ένα λεξικό αντικείμενων αλλά δόθηκε ο τύπος \"{input_type}\"." -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." -msgstr "" +msgstr "Η τιμή πρέπει να είναι μορφής JSON." -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" +msgstr "Υποβολή" + +#: filters.py:336 +msgid "ascending" msgstr "" -#: pagination.py:189 +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." -msgstr "" +msgstr "Λάθος σελίδα." -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" -msgstr "" +msgstr "Λάθος cursor." #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." -msgstr "" +msgstr "Λάθος κλειδί \"{pk_value}\" - το αντικείμενο δεν υπάρχει." #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." -msgstr "" +msgstr "Λάθος τύπος. Αναμένεται τιμή κλειδιού, δόθηκε {data_type}." #: relations.py:240 msgid "Invalid hyperlink - No URL match." -msgstr "" +msgstr "Λάθος σύνδεση - δε ταιριάζει κάποιο URL." #: relations.py:241 msgid "Invalid hyperlink - Incorrect URL match." -msgstr "" +msgstr "Λάθος σύνδεση - δε ταιριάζει κάποιο URL." #: relations.py:242 msgid "Invalid hyperlink - Object does not exist." -msgstr "" +msgstr "Λάθος σύνδεση - το αντικείμενο δεν υπάρχει." #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." -msgstr "" +msgstr "Λάθος τύπος. Αναμένεται URL, δόθηκε {data_type}." + +#: relations.py:401 +msgid "Object with {slug_name}={value} does not exist." +msgstr "Το αντικείμενο {slug_name}={value} δεν υπάρχει." #: relations.py:402 -#, python-brace-format -msgid "Object with {slug_name}={value} does not exist." -msgstr "" - -#: relations.py:403 msgid "Invalid value." -msgstr "" +msgstr "Λάθος τιμή." #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." -msgstr "" +msgstr "Λάθος δεδομένα. Αναμένεται λεξικό αλλά δόθηκε {datatype}." -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" -msgstr "" +msgstr "Φίλτρα" #: templates/rest_framework/filters/django_filter.html:2 #: templates/rest_framework/filters/django_filter_crispyforms.html:4 msgid "Field filters" -msgstr "" +msgstr "Φίλτρα πεδίων" #: templates/rest_framework/filters/ordering.html:3 msgid "Ordering" -msgstr "" +msgstr "Ταξινόμηση" #: templates/rest_framework/filters/search.html:2 msgid "Search" -msgstr "" +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 "" +msgstr "None" #: 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 "" +msgstr "Δεν υπάρχουν αντικείμενα προς επιλογή." -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." -msgstr "" +msgstr "Το πεδίο πρέπει να είναι μοναδικό" -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." -msgstr "" +msgstr "Τα πεδία {field_names} πρέπει να αποτελούν ένα μοναδικό σύνολο." -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." -msgstr "" +msgstr "Το πεδίο πρέπει να είναι μοναδικό για την ημερομηνία \"{date_field}\"." -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." -msgstr "" +msgstr "Το πεδίο πρέπει να είναι μοναδικό για το μήνα \"{date_field}\"." -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." -msgstr "" +msgstr "Το πεδίο πρέπει να είναι μοναδικό για το έτος \"{date_field}\"." #: versioning.py:42 msgid "Invalid version in \"Accept\" header." -msgstr "" +msgstr "Λάθος έκδοση στην επικεφαλίδα \"Accept\"." -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." +msgstr "Λάθος έκδοση στη διαδρομή URL." + +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." msgstr "" -#: versioning.py:144 +#: versioning.py:147 msgid "Invalid version in hostname." -msgstr "" +msgstr "Λάθος έκδοση στο hostname." -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." -msgstr "" +msgstr "Λάθος έκδοση στην παράμετρο" #: views.py:88 msgid "Permission denied." -msgstr "" +msgstr "Απόρριψη πρόσβασης" diff --git a/rest_framework/locale/el_GR/LC_MESSAGES/django.mo b/rest_framework/locale/el_GR/LC_MESSAGES/django.mo index 67022a7f764708dd90e4ebb5696030a81fb70082..67018c3f97c474c10811d60112af016f806d3b22 100644 GIT binary patch delta 90 zcmeBY>1UZRnaf<)&`811%*xPs;#@gL2+!2Y&_vq+2)KL_i%WDviW2jRa}rDPi>wqv hGV*g1ixr$RiZY8!GE)_7O7e3ZfH)Z{u1UZRnafz$z)-=^!phiU;#@gL2+thI(>4GCE}z8W65WuZ#Ju91#FG3XD}{)} ivdq*X1^=Ry{KC>o1)GX|2+JWSGcUg^GjZb|VMYL>>K#-7 diff --git a/rest_framework/locale/el_GR/LC_MESSAGES/django.po b/rest_framework/locale/el_GR/LC_MESSAGES/django.po index 645a1a8c6..051a88783 100644 --- a/rest_framework/locale/el_GR/LC_MESSAGES/django.po +++ b/rest_framework/locale/el_GR/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: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Greek (Greece) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/el_GR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,40 +17,40 @@ msgstr "" "Language: el_GR\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "" -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "" -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "" @@ -58,23 +58,23 @@ msgstr "" msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -123,7 +123,6 @@ msgid "Not found." msgstr "" #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "" @@ -132,7 +131,6 @@ msgid "Could not satisfy the request Accept header." msgstr "" #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "" @@ -140,214 +138,201 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "" -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "" -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "" -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "" -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "" -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "" -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "" -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "" -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "" -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "" -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "" -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "" -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "" -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "" -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "" -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "" -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "" -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "" -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "" -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "" -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "" -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "" -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "" -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "" -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "" -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "" -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "" -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" @@ -364,25 +349,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "" #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "" #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "" -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "" @@ -412,27 +394,23 @@ msgstr "" msgid "No items to select." msgstr "" -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "" -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "" -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "" -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "" -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "" @@ -440,15 +418,19 @@ msgstr "" msgid "Invalid version in \"Accept\" header." msgstr "" -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "" -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "" -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "" diff --git a/rest_framework/locale/en/LC_MESSAGES/django.mo b/rest_framework/locale/en/LC_MESSAGES/django.mo index 06dc754a8d9fca02a5d8c0e2c534ad0ba349e006..13760f707539fa5c2f961f3edb61ce0ef08c3b1b 100644 GIT binary patch delta 2351 zcmbW&TWl0n9LMp0?-vwlOK;S|fI_*n$RcfZORrm7E4AfPiWIOc?b0@}yVBhd4aRv= zY)GhKMH7S+6E6uqR%`IVL`c+#h|y>;D%ymEkQfsQ`hb1#`=djJpwVQN0I8n{jGLD`2A+})p0<(S$VLhJ02K*Yg;KIAif;fQs z{3LecWxNlU+-+8fO{f>#hB_bhbj?oC(G6#@7H=Vcwt8XeP3uq@H=!Ohj1S>7Hse(c zVc9)q>v1n~%8sF~JB6$98`MnB<62z0i0ANp>!Py(ccE_Z5_aJS*obKbsT(%q62?9L zcnp=vGpNi?BU5VU{qem2c{%B4aJ~^W6RjMybbaXRhH*MocpOV`79G5dMfe+LVmbp> z#d7cgEJVt{+I+Vlms%g{J|n0ydLB#h1%G@7mGGNItiRU!TTUp0%EhS*gQ)R#R58V{ z4v(SM_<}#agGwM!oVuD#>$!=e&rvmW2sQPup?1xzOGlYrL1p?Y z>PESwRf9!XjjgC{6Gdfo7`0o@`|8V@$xdv+DeT9uupX;;NCOU{cFpS;ME3?AU9h4u zwQUAaMfDD9EiWOL*fszBU%tyoLpKazExM>(^FHcDFQPKOgnH2LsNGP#EVXMQ$gXki zEjp_Do2YG5=AVmg113yR2#Ft1CHix>QE~PELwRl4B*)NUw5jn|?w4xrZh0BUK@A@ydT`s1IGWw&{( z!!p)EOWcbZA4Mhb5xTnYdpZvOfqKJ|RsM`%7UN0O3rwN5&8w(ga{+hbZOp_Tri1#m z9lqnJOpp5Gmr=Xs9BSA6R7KvJnj4%*!(Bu$xidTDZlF*~x3B9)FPEA$84}n)j9Z1$*YvnJmsUd zCWY<8t$tr~67u^FYA*K>>BK=obKRdjlv7mROiweXwus<&%)-QQ@=Q*J8=0 zF1BJ7c48$S!W=w{>&#Mijz$v$Q_ck6YNr1l#_=k4Vq}Kd3fzSacoJLjCe~xcqrv-q zxPktsxB!30Fy`k43!IM{U*nrH>!qOyk6qA+UbNCsez4T|nr5q^d`$?vcN?_nO#x8j**)mVm_pbMYHAzY0=p(ZSN%&@%tOszh?=Jym5gzW z@_cJ{13jpnzKV+Ran#BuQP*h7^=Ca9BvA~PGrkcO+e5BDj@rPVNE%o^@$s+%wZK+f zhX*j3O=E(FR&)_{J-$UI=huTEdDs@yU3O?7@PnKtpMf)Ye zYX`NLA2dGzI#ZRl0RQZ?e3kM5+lK9~ts~Gmsd!YKT{ra+s*29`#q^1sNbwq4T^gdy zr1CRluTXcSzt1UAi2X!)8Tn`A-#;bRMru7ZNv)x7rmApy_B?f!IuvEO!tnpnNJq&; zO88|vuOTWS_sd#dl{=J$esZX#>!bLo=#IWX)sKWq%h=Irjnl^p!fUhBebMgRWmVNN zFIHE-tS)^eTI#wh)cqqG^}3S#`}_8J?fZ5P?0xesZ`I&H(2DQw-!rhkKRLFjD3\n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: English (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/en/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,40 +17,40 @@ msgstr "" "Language: en\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "Invalid basic header. No credentials provided." -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "Invalid basic header. Credentials string should not contain spaces." -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Invalid basic header. Credentials not correctly base64 encoded." -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "Invalid username/password." -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "User inactive or deleted." -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "Invalid token header. No credentials provided." -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "Invalid token header. Token string should not contain spaces." -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "Invalid token header. Token string should not contain invalid characters." -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "Invalid token." @@ -58,23 +58,23 @@ msgstr "Invalid token." msgid "Auth Token" msgstr "Auth Token" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "Key" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "User" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "Created" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "Token" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "Tokens" @@ -123,7 +123,6 @@ msgid "Not found." msgstr "Not found." #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "Method \"{method}\" not allowed." @@ -132,7 +131,6 @@ msgid "Could not satisfy the request Accept header." msgstr "Could not satisfy the request Accept header." #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "Unsupported media type \"{media_type}\" in request." @@ -140,214 +138,201 @@ msgstr "Unsupported media type \"{media_type}\" in request." msgid "Request was throttled." msgstr "Request was throttled." -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "This field is required." -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "This field may not be null." -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "\"{input}\" is not a valid boolean." -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "This field may not be blank." -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "Ensure this field has no more than {max_length} characters." -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "Ensure this field has at least {min_length} characters." -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "Enter a valid email address." -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "This value does not match the required pattern." -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "Enter a valid \"slug\" consisting of letters, numbers, underscores or hyphens." -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "Enter a valid URL." -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "\"{value}\" is not a valid UUID." -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "Enter a valid IPv4 or IPv6 address." -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "A valid integer is required." -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "Ensure this value is less than or equal to {max_value}." -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "Ensure this value is greater than or equal to {min_value}." -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "String value too large." -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "A valid number is required." -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "Ensure that there are no more than {max_digits} digits in total." -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "Ensure that there are no more than {max_decimal_places} decimal places." -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "Ensure that there are no more than {max_whole_digits} digits before the decimal point." -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "Datetime has wrong format. Use one of these formats instead: {format}." -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "Expected a datetime but got a date." -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "Date has wrong format. Use one of these formats instead: {format}." -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "Expected a date but got a datetime." -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "Time has wrong format. Use one of these formats instead: {format}." -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "Duration has wrong format. Use one of these formats instead: {format}." -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" is not a valid choice." -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "More than {count} items..." -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Expected a list of items but got type \"{input_type}\"." -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "This selection may not be empty." -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "\"{input}\" is not a valid path choice." -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "No file was submitted." -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "The submitted data was not a file. Check the encoding type on the form." -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "No filename could be determined." -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "The submitted file is empty." -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "Ensure this filename has at most {max_length} characters (it has {length})." -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "Upload a valid image. The file you uploaded was either not an image or a corrupted image." -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "This list may not be empty." -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "Expected a dictionary of items but got type \"{input_type}\"." -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "Value must be valid JSON." -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "Submit" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "ascending" + +#: filters.py:337 +msgid "descending" +msgstr "descending" + +#: pagination.py:193 msgid "Invalid page." msgstr "Invalid page." -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "Invalid cursor" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Invalid pk \"{pk_value}\" - object does not exist." #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Incorrect type. Expected pk value, received {data_type}." @@ -364,25 +349,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "Invalid hyperlink - Object does not exist." #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Incorrect type. Expected URL string, received {data_type}." -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "Object with {slug_name}={value} does not exist." -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "Invalid value." #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "Invalid data. Expected a dictionary, but got {datatype}." -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "Filters" @@ -412,27 +394,23 @@ msgstr "None" msgid "No items to select." msgstr "No items to select." -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "This field must be unique." -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "The fields {field_names} must make a unique set." -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "This field must be unique for the \"{date_field}\" date." -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "This field must be unique for the \"{date_field}\" month." -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "This field must be unique for the \"{date_field}\" year." @@ -440,15 +418,19 @@ msgstr "This field must be unique for the \"{date_field}\" year." msgid "Invalid version in \"Accept\" header." msgstr "Invalid version in \"Accept\" header." -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "Invalid version in URL path." -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "Invalid version in URL path. Does not match any version namespace." + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "Invalid version in hostname." -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "Invalid version in query parameter." diff --git a/rest_framework/locale/en_AU/LC_MESSAGES/django.mo b/rest_framework/locale/en_AU/LC_MESSAGES/django.mo index 288595123478d0817f3b1c44d2884635461fd3ca..d24f22cb4b2367d46fdbcafb48bf468210d420d8 100644 GIT binary patch delta 90 zcmbQjGKFQrWG-`ELn8%4Gb=;miF4%~Av{wnLlbQSAmH*zEH2RvDN4*M&PgoEFS1ey h$;i)5ELL#ND9S7@$xKzSDap@u0ODk*z{Woki~ykI9U%Y! delta 90 zcmbQjGKFQrWG-V}149Kv3oB!biF4%~Av|*+PulKW\n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: English (Australia) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/en_AU/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,40 +17,40 @@ msgstr "" "Language: en_AU\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "" -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "" -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "" @@ -58,23 +58,23 @@ msgstr "" msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -123,7 +123,6 @@ msgid "Not found." msgstr "" #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "" @@ -132,7 +131,6 @@ msgid "Could not satisfy the request Accept header." msgstr "" #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "" @@ -140,214 +138,201 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "" -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "" -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "" -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "" -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "" -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "" -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "" -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "" -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "" -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "" -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "" -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "" -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "" -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "" -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "" -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "" -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "" -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "" -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "" -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "" -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "" -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "" -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "" -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "" -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "" -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "" -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "" -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" @@ -364,25 +349,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "" #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "" #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "" -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "" @@ -412,27 +394,23 @@ msgstr "" msgid "No items to select." msgstr "" -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "" -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "" -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "" -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "" -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "" @@ -440,15 +418,19 @@ msgstr "" msgid "Invalid version in \"Accept\" header." msgstr "" -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "" -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "" -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "" diff --git a/rest_framework/locale/en_CA/LC_MESSAGES/django.mo b/rest_framework/locale/en_CA/LC_MESSAGES/django.mo index aee511aa1352bcb292c4d565d7c35a2259d0e06f..ef1569c0b30c91945f3c2ba99a232cec7c1602b7 100644 GIT binary patch delta 90 zcmbQpGLdD%WG-`ELn8%4Gb=;miF4%~Av{wnLlbQSAmH*zEH2RvDN4*M&PgoEFS1ey h$;i)5ELL#ND9S7@$xKzSDap@u0ODk*z{WqKi~yd<9T)%r delta 90 zcmbQpGLdD%WG-V}149Kv3oB!biF4%~Av|*+PulKWU34QXN_V diff --git a/rest_framework/locale/en_CA/LC_MESSAGES/django.po b/rest_framework/locale/en_CA/LC_MESSAGES/django.po index 2bb5b573b..144694345 100644 --- a/rest_framework/locale/en_CA/LC_MESSAGES/django.po +++ b/rest_framework/locale/en_CA/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: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: English (Canada) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/en_CA/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,40 +17,40 @@ msgstr "" "Language: en_CA\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "" -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "" -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "" @@ -58,23 +58,23 @@ msgstr "" msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -123,7 +123,6 @@ msgid "Not found." msgstr "" #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "" @@ -132,7 +131,6 @@ msgid "Could not satisfy the request Accept header." msgstr "" #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "" @@ -140,214 +138,201 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "" -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "" -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "" -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "" -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "" -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "" -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "" -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "" -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "" -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "" -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "" -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "" -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "" -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "" -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "" -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "" -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "" -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "" -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "" -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "" -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "" -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "" -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "" -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "" -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "" -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "" -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "" -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" @@ -364,25 +349,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "" #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "" #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "" -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "" @@ -412,27 +394,23 @@ msgstr "" msgid "No items to select." msgstr "" -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "" -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "" -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "" -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "" -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "" @@ -440,15 +418,19 @@ msgstr "" msgid "Invalid version in \"Accept\" header." msgstr "" -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "" -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "" -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "" diff --git a/rest_framework/locale/en_US/LC_MESSAGES/django.mo b/rest_framework/locale/en_US/LC_MESSAGES/django.mo index 1f28ebba03d951523b3e9fa42d14ec34fc1aa2c0..3714ec8fabd768dd705dfcfe8f58ab3b6d58faaf 100644 GIT binary patch delta 20 bcmeyx^owaiFPFKlp^<{2nU$gO#OaR#OF#z~ delta 20 bcmeyx^owaiFPE{dfuVw-g_W_z#OaR#OCtvw diff --git a/rest_framework/locale/en_US/LC_MESSAGES/django.po b/rest_framework/locale/en_US/LC_MESSAGES/django.po index f88a3e567..3733a1e33 100644 --- a/rest_framework/locale/en_US/LC_MESSAGES/django.po +++ b/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: 2016-03-01 18:38+0100\n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,40 +17,40 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "" -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "" -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "" @@ -58,23 +58,23 @@ msgstr "" msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -123,7 +123,6 @@ msgid "Not found." msgstr "" #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "" @@ -132,7 +131,6 @@ msgid "Could not satisfy the request Accept header." msgstr "" #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "" @@ -140,212 +138,199 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "" -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "" -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "" -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "" -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "" -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "" -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "" -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "" -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "" -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "" -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "" -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "" -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "" -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "" -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "" -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "" -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "" -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "" -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "" -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "" -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "" -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "" -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "" -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "" -#: fields.py:1348 +#: fields.py:1359 msgid "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "" -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "" -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "" -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" @@ -362,25 +347,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "" #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "" #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "" -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "" @@ -410,27 +392,23 @@ msgstr "" msgid "No items to select." msgstr "" -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "" -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "" -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "" -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "" -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "" @@ -438,15 +416,19 @@ msgstr "" msgid "Invalid version in \"Accept\" header." msgstr "" -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "" -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "" -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "" diff --git a/rest_framework/locale/es/LC_MESSAGES/django.mo b/rest_framework/locale/es/LC_MESSAGES/django.mo index fa87eb02f6d6bb983902834ff2fb54091386e228..1ddc885dee3fb7cd254ac0f3b099b02b1e3afc91 100644 GIT binary patch delta 894 zcmXZaO-NKx6u|K_g=1KlxoD~}=lNX>nr~)wYSMB>Qv*SzSCCD_BLqclV%`)EF5V&n zSAj&7h9XpMD<*=FTC_4;)60*L)&h z4~o=_$jTv+MqI}h+(83t4vQSa6gJ=lhHwr8_!49I0ngxHti;YEA{TK8M{or%qc13u z#4AB@{|^?K7-r%-_MllM(u=pz#<$pkp`)H@yhJ>Yn&>w2sf4OUPT^@hfwxefKf^x! zgej~d`wF}kaz#oR++-q*(|8u2;vjC}1&kS9C9`;r_#5g1^)({h*oFzrV=KPGL5}2v{ E2SQK@Mf7C!Xb+;H1PVeg;X`kIPuK3t=XZYh-rxD1-}y}^=aMfY`|RZs zk+p*&H6pTDEph_CVKeTcfi;Ij>M?<}n85%(K`*|>2!6$OEIBOV!A`t}{dfZx@j90J zM7r>nPwan#A`^W~Y+^S?j)+{uduZZEY{TGD#~~aboL$& z)RXW8osHF^em{g-@Pf@iE8az2Fn-+m@iJ;WhPtr_s4aN4=PGKVQu^k?(?~8kiv|uN zhbH$?TQ-dxl6*p4?+21n>`!(ERtK^ARDq}l|d^Le=v&SIw!t^+S4LxW$%$sWF56~7srvrD7tV8 z-S`O4;ZxL>tl&+oqN*~?psq8HKFu)8Kr4HPv|E<(6z(ita{sC_ad!_meNPx%!yKiZVcnVGz0j%IUl<7zrJHf$L^+04Y}d24vWXd6kV2uy3-%yp(l M%(S&s^iF#I0?BQ4Z~y=R diff --git a/rest_framework/locale/es/LC_MESSAGES/django.po b/rest_framework/locale/es/LC_MESSAGES/django.po index f443b2e28..b8a89aeb6 100644 --- a/rest_framework/locale/es/LC_MESSAGES/django.po +++ b/rest_framework/locale/es/LC_MESSAGES/django.po @@ -3,18 +3,18 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# nnrcschmdt , 2015 +# Ernesto Rico-Schmidt , 2015 # José Padilla , 2015 -# Miguel González , 2015 -# Miguel González , 2015-2016 +# Miguel Gonzalez , 2015 +# Miguel Gonzalez , 2015-2016 # Sergio Infante , 2015 msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 18:16+0000\n" -"Last-Translator: Miguel González \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Spanish (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,40 +22,40 @@ msgstr "" "Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "Cabecera básica inválida. Las credenciales no fueron suministradas." -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "Cabecera básica inválida. La cadena con las credenciales no debe contener espacios." -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Cabecera básica inválida. Las credenciales incorrectamente codificadas en base64." -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "Nombre de usuario/contraseña inválidos." -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "Usuario inactivo o borrado." -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "Cabecera token inválida. Las credenciales no fueron suministradas." -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "Cabecera token inválida. La cadena token no debe contener espacios." -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "Cabecera token inválida. La cadena token no debe contener caracteres inválidos." -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "Token inválido." @@ -63,23 +63,23 @@ msgstr "Token inválido." msgid "Auth Token" msgstr "Token de autenticación" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "Clave" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "Usuario" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "Fecha de creación" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "Token" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "Tokens" @@ -128,7 +128,6 @@ msgid "Not found." msgstr "No encontrado." #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "Método \"{method}\" no permitido." @@ -137,7 +136,6 @@ msgid "Could not satisfy the request Accept header." msgstr "No se ha podido satisfacer la solicitud de cabecera de Accept." #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "Tipo de medio \"{media_type}\" incompatible en la solicitud." @@ -145,214 +143,201 @@ msgstr "Tipo de medio \"{media_type}\" incompatible en la solicitud." msgid "Request was throttled." msgstr "Solicitud fue regulada (throttled)." -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "Este campo es requerido." -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "Este campo no puede ser nulo." -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "\"{input}\" no es un booleano válido." -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "Este campo no puede estar en blanco." -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "Asegúrese de que este campo no tenga más de {max_length} caracteres." -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "Asegúrese de que este campo tenga al menos {min_length} caracteres." -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "Introduzca una dirección de correo electrónico válida." -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "Este valor no coincide con el patrón requerido." -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "Introduzca un \"slug\" válido consistente en letras, números, guiones o guiones bajos." -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "Introduzca una URL válida." -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "\"{value}\" no es un UUID válido." -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "Introduzca una dirección IPv4 o IPv6 válida." -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "Introduzca un número entero válido." -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "Asegúrese de que este valor es menor o igual a {max_value}." -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "Asegúrese de que este valor es mayor o igual a {min_value}." -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "Cadena demasiado larga." -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "Se requiere un número válido." -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "Asegúrese de que no haya más de {max_digits} dígitos en total." -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "Asegúrese de que no haya más de {max_decimal_places} decimales." -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "Asegúrese de que no haya más de {max_whole_digits} dígitos en la parte entera." -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "Fecha/hora con formato erróneo. Use uno de los siguientes formatos en su lugar: {format}." -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "Se esperaba un fecha/hora en vez de una fecha." -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "Fecha con formato erróneo. Use uno de los siguientes formatos en su lugar: {format}." -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "Se esperaba una fecha en vez de una fecha/hora." -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "Hora con formato erróneo. Use uno de los siguientes formatos en su lugar: {format}." -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "Duración con formato erróneo. Use uno de los siguientes formatos en su lugar: {format}." -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" no es una elección válida." -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "Más de {count} elementos..." -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Se esperaba una lista de elementos en vez del tipo \"{input_type}\"." -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "Esta selección no puede estar vacía." -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "\"{input}\" no es una elección de ruta válida." -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "No se envió ningún archivo." -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "La información enviada no era un archivo. Compruebe el tipo de codificación del formulario." -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "No se pudo determinar un nombre de archivo." -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "El archivo enviado está vació." -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "Asegúrese de que el nombre de archivo no tenga más de {max_length} caracteres (tiene {length})." -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "Adjunte una imagen válida. El archivo adjunto o bien no es una imagen o bien está dañado." -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "Esta lista no puede estar vacía." -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "Se esperaba un diccionario de elementos en vez del tipo \"{input_type}\"." -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "El valor debe ser JSON válido." -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "Enviar" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "Página inválida." -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "Cursor inválido" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Clave primaria \"{pk_value}\" inválida - objeto no existe." #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Tipo incorrecto. Se esperaba valor de clave primaria y se recibió {data_type}." @@ -369,25 +354,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "Hiperenlace inválido - Objeto no existe." #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Tipo incorrecto. Se esperaba una URL y se recibió {data_type}." -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "Objeto con {slug_name}={value} no existe." -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "Valor inválido." #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "Datos inválidos. Se esperaba un diccionario pero es un {datatype}." -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "Filtros" @@ -417,27 +399,23 @@ msgstr "Ninguno" msgid "No items to select." msgstr "No hay elementos para seleccionar." -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "Este campo debe ser único." -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "Los campos {field_names} deben formar un conjunto único." -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "Este campo debe ser único para el día \"{date_field}\"." -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "Este campo debe ser único para el mes \"{date_field}\"." -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "Este campo debe ser único para el año \"{date_field}\"." @@ -445,15 +423,19 @@ msgstr "Este campo debe ser único para el año \"{date_field}\"." msgid "Invalid version in \"Accept\" header." msgstr "Versión inválida en la cabecera \"Accept\"." -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "Versión inválida en la ruta de la URL." -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "Versión inválida en el nombre de host." -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "Versión inválida en el parámetro de consulta." diff --git a/rest_framework/locale/et/LC_MESSAGES/django.mo b/rest_framework/locale/et/LC_MESSAGES/django.mo index ee9c40c2b63ff58a7f819ddf82980a809985b465..8bed3993091edd5eba9ee23912b87934b09915ee 100644 GIT binary patch delta 118 zcmbQ^GRI|uhH$32uAz~Fp_!GTv9^JsfdN;5ziv=!S!Qu&ex9yNVo9o%f{}rtnXUmu zovD?fiM9a{aQP$_m*|ERCFT|9B$nhCSt*2M!EqWfqrYrYhK!mAfdN;5ziv=!S!Qu&ex9yNVo9o%f{}rtnXUmu zojF*Y0Z^S!VsVLXNKs;5aZX}Mevy?zL}FQHYLS9}QA&PcX{CZqMLvY(kdv90UzVA; Jd7^MP9{|?VB=Z0O diff --git a/rest_framework/locale/et/LC_MESSAGES/django.po b/rest_framework/locale/et/LC_MESSAGES/django.po index 5ccd9226c..c9701cca7 100644 --- a/rest_framework/locale/et/LC_MESSAGES/django.po +++ b/rest_framework/locale/et/LC_MESSAGES/django.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Estonian (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/et/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,40 +18,40 @@ msgstr "" "Language: et\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "Sobimatu lihtpäis. Kasutajatunnus on esitamata." -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "Sobimatu lihtpäis. Kasutajatunnus ei tohi sisaldada tühikuid." -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Sobimatu lihtpäis. Kasutajatunnus pole korrektselt base64-kodeeritud." -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "Sobimatu kasutajatunnus/salasõna." -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "Kasutaja on inaktiivne või kustutatud." -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "Sobimatu lubakaardi päis. Kasutajatunnus on esitamata." -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "Sobimatu lubakaardi päis. Loa sõne ei tohi sisaldada tühikuid." -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "Sobimatu lubakaart." @@ -59,23 +59,23 @@ msgstr "Sobimatu lubakaart." msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -124,7 +124,6 @@ msgid "Not found." msgstr "Ei leidnud." #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "Meetod \"{method}\" pole lubatud." @@ -133,7 +132,6 @@ msgid "Could not satisfy the request Accept header." msgstr "Päringu Accept-päist ei suutnud täita." #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "Meedia tüüpi {media_type} päringus ei toetata." @@ -141,214 +139,201 @@ msgstr "Meedia tüüpi {media_type} päringus ei toetata." msgid "Request was throttled." msgstr "Liiga palju päringuid." -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "Väli on kohustuslik." -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "Väli ei tohi olla tühi." -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "\"{input}\" pole kehtiv kahendarv." -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "See väli ei tohi olla tühi." -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "Veendu, et see väli poleks pikem kui {max_length} tähemärki." -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "Veendu, et see väli oleks vähemalt {min_length} tähemärki pikk." -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "Sisestage kehtiv e-posti aadress." -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "Väärtus ei ühti etteantud mustriga." -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "Sisestage kehtiv \"slug\", mis koosneks tähtedest, numbritest, ala- või sidekriipsudest." -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "Sisestage korrektne URL." -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "\"{value}\" pole kehtiv UUID." -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "" -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "Sisendiks peab olema täisarv." -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "Veenduge, et väärtus on väiksem kui või võrdne väärtusega {max_value}. " -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "Veenduge, et väärtus on suurem kui või võrdne väärtusega {min_value}." -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "Sõne on liiga pikk." -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "Sisendiks peab olema arv." -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "Veenduge, et kokku pole rohkem kui {max_digits} numbit." -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "Veenduge, et komakohti pole rohkem kui {max_decimal_places}. " -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "Veenduge, et täiskohti poleks rohkem kui {max_whole_digits}." -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "Valesti formaaditud kuupäev-kellaaeg. Kasutage mõnda neist: {format}." -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "Ootasin kuupäev-kellaaeg andmetüüpi, kuid sain hoopis kuupäeva." -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "Valesti formaaditud kuupäev. Kasutage mõnda neist: {format}." -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "Ootasin kuupäeva andmetüüpi, kuid sain hoopis kuupäev-kellaaja." -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "Valesti formaaditud kellaaeg. Kasutage mõnda neist: {format}." -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" on sobimatu valik." -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "" -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Ootasin kirjete järjendit, kuid sain \"{input_type}\" - tüübi." -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "" -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "Ühtegi faili ei esitatud." -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "Esitatud andmetes ei olnud faili. Kontrollige vormi kodeeringut." -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "Ei suutnud tuvastada failinime." -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "Esitatud fail oli tühi." -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "Veenduge, et failinimi oleks maksimaalselt {max_length} tähemärki pikk (praegu on {length})." -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "Laadige üles kehtiv pildifail. Üles laetud fail ei olnud pilt või oli see katki." -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "" -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "Ootasin kirjete sõnastikku, kuid sain \"{input_type}\"." -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "Sobimatu kursor." #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Sobimatu primaarvõti \"{pk_value}\" - objekti pole olemas." #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Sobimatu andmetüüp. Ootasin primaarvõtit, sain {data_type}." @@ -365,25 +350,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "Sobimatu hüperlink - objekti ei eksisteeri." #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Sobimatu andmetüüp. Ootasin URLi sõne, sain {data_type}." -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "Objekti {slug_name}={value} ei eksisteeri." -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "Sobimatu väärtus." #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "Sobimatud andmed. Ootasin sõnastikku, kuid sain {datatype}." -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "" @@ -413,27 +395,23 @@ msgstr "" msgid "No items to select." msgstr "" -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "Selle välja väärtus peab olema unikaalne." -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "Veerud {field_names} peavad moodustama unikaalse hulga." -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "Selle välja väärtus peab olema unikaalne veerus \"{date_field}\" märgitud kuupäeval." -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "Selle välja väärtus peab olema unikaalneveerus \"{date_field}\" märgitud kuul." -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "Selle välja väärtus peab olema unikaalneveerus \"{date_field}\" märgitud aastal." @@ -441,15 +419,19 @@ msgstr "Selle välja väärtus peab olema unikaalneveerus \"{date_field}\" märg msgid "Invalid version in \"Accept\" header." msgstr "Sobimatu versioon \"Accept\" päises." -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "Sobimatu versioon URLi rajas." -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "Sobimatu versioon hostinimes." -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "Sobimatu versioon päringu parameetris." diff --git a/rest_framework/locale/fa/LC_MESSAGES/django.mo b/rest_framework/locale/fa/LC_MESSAGES/django.mo index 4b0b24bc2f1de50cd2d90d779dc1bba70ac760f6..0f9b58f3fe5acf170bbbcee2f9a590321759f36f 100644 GIT binary patch delta 89 zcmey({F`~gWG-`ELn8%4Gb=;miF4%~Av{wnLlbQSAmH*zEH2RvDN4*M&PgoEFS1ey g$;i)5ELL#ND9S7@$xKzSDap@u0ODk*z{EfQ0m^J1vj6}9 delta 89 zcmey({F`~gWG-V}149Kv3oB!biF4%~Av|*+PulKWx>U diff --git a/rest_framework/locale/fa/LC_MESSAGES/django.po b/rest_framework/locale/fa/LC_MESSAGES/django.po index 986c56594..0aa9ae4c6 100644 --- a/rest_framework/locale/fa/LC_MESSAGES/django.po +++ b/rest_framework/locale/fa/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: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Persian (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/fa/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,40 +17,40 @@ msgstr "" "Language: fa\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "" -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "" -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "" @@ -58,23 +58,23 @@ msgstr "" msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -123,7 +123,6 @@ msgid "Not found." msgstr "" #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "" @@ -132,7 +131,6 @@ msgid "Could not satisfy the request Accept header." msgstr "" #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "" @@ -140,214 +138,201 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "" -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "" -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "" -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "" -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "" -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "" -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "" -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "" -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "" -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "" -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "" -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "" -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "" -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "" -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "" -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "" -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "" -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "" -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "" -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "" -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "" -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "" -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "" -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "" -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "" -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "" -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "" -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" @@ -364,25 +349,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "" #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "" #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "" -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "" @@ -412,27 +394,23 @@ msgstr "" msgid "No items to select." msgstr "" -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "" -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "" -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "" -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "" -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "" @@ -440,15 +418,19 @@ msgstr "" msgid "Invalid version in \"Accept\" header." msgstr "" -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "" -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "" -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "" diff --git a/rest_framework/locale/fa_IR/LC_MESSAGES/django.mo b/rest_framework/locale/fa_IR/LC_MESSAGES/django.mo index 05d849e0849e8f2a4697719b5a11a60ab4f1ffb9..9a02cb05e285cf893658f1f689c2e9d688646f25 100644 GIT binary patch delta 90 zcmeBR>0p^Knaf<)&`811%*xPs;#@gL2+!2Y&_vq+2)KL_i%WDviW2jRa}rDPi>wqv hGV*g1ixr$RiZY8!GE)_7O7e3ZfH)Z{u<;KMBLJ9m9Q^0p^Knafz$z)-=^!phiU;#@gL2+thI(>4GCE}z8W65WuZ#Ju91#FG3XD}{)} ivdq*X1^=Ry{KC>o1)GX|2+JWSGcUg^GjZb|9!3D3{vAI6 diff --git a/rest_framework/locale/fa_IR/LC_MESSAGES/django.po b/rest_framework/locale/fa_IR/LC_MESSAGES/django.po index 94388647f..75b6fd156 100644 --- a/rest_framework/locale/fa_IR/LC_MESSAGES/django.po +++ b/rest_framework/locale/fa_IR/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: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Persian (Iran) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/fa_IR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,40 +17,40 @@ msgstr "" "Language: fa_IR\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "" -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "" -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "" @@ -58,23 +58,23 @@ msgstr "" msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -123,7 +123,6 @@ msgid "Not found." msgstr "" #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "" @@ -132,7 +131,6 @@ msgid "Could not satisfy the request Accept header." msgstr "" #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "" @@ -140,214 +138,201 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "" -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "" -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "" -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "" -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "" -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "" -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "" -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "" -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "" -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "" -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "" -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "" -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "" -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "" -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "" -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "" -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "" -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "" -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "" -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "" -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "" -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "" -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "" -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "" -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "" -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "" -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "" -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" @@ -364,25 +349,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "" #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "" #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "" -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "" @@ -412,27 +394,23 @@ msgstr "" msgid "No items to select." msgstr "" -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "" -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "" -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "" -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "" -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "" @@ -440,15 +418,19 @@ msgstr "" msgid "Invalid version in \"Accept\" header." msgstr "" -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "" -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "" -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "" diff --git a/rest_framework/locale/fi/LC_MESSAGES/django.mo b/rest_framework/locale/fi/LC_MESSAGES/django.mo index cd904e35cd5ce2b2f7c8b2ff4128363545f3de61..cb13cdaae78d64290c050162c2ec26193513cf08 100644 GIT binary patch delta 93 zcmeD5>-5`TCdOs1YiOikXl7+-JlR1^&Jn^jwK6o(HUI)HpTy!4-H@WhyyBe1lKdho kg^-N=+{9u9=ZvDv;*!i%1)GxmTn8Xdh6-$+FP0?$0ML^iPXGV_ delta 93 zcmeD5>-5`TCdOr~Yhb8gXkle+G1);(&Jn^j2XeIyfPl*\n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Finnish (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/fi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,40 +19,40 @@ msgstr "" "Language: fi\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "Epäkelpo perusotsake. Ei annettuja tunnuksia." -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "Epäkelpo perusotsake. Tunnusmerkkijono ei saa sisältää välilyöntejä." -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Epäkelpo perusotsake. Tunnukset eivät ole base64-koodattu." -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "Epäkelpo käyttäjänimi tai salasana." -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "Käyttäjä ei-aktiivinen tai poistettu." -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "Epäkelpo Token-otsake. Ei annettuja tunnuksia." -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "Epäkelpo Token-otsake. Tunnusmerkkijono ei saa sisältää välilyöntejä." -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "Epäkelpo Token-otsake. Tunnusmerkkijono ei saa sisältää epäkelpoja merkkejä." -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "Epäkelpo Token." @@ -60,23 +60,23 @@ msgstr "Epäkelpo Token." msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -125,7 +125,6 @@ msgid "Not found." msgstr "Ei löydy." #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "Metodi \"{method}\" ei ole sallittu." @@ -134,7 +133,6 @@ msgid "Could not satisfy the request Accept header." msgstr "Ei voitu vastata pyynnön Accept-otsakkeen mukaisesti." #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "Pyynnön mediatyyppiä \"{media_type}\" ei tueta." @@ -142,214 +140,201 @@ msgstr "Pyynnön mediatyyppiä \"{media_type}\" ei tueta." msgid "Request was throttled." msgstr "Pyyntö hidastettu." -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "Tämä kenttä vaaditaan." -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "Tämän kentän arvo ei voi olla \"null\"." -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "\"{input}\" ei ole kelvollinen totuusarvo." -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "Tämä kenttä ei voi olla tyhjä." -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "Arvo saa olla enintään {max_length} merkkiä pitkä." -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "Arvo tulee olla vähintään {min_length} merkkiä pitkä." -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "Syötä kelvollinen sähköpostiosoite." -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "Arvo ei täsmää vaadittuun kuvioon." -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "Tässä voidaan käyttää vain kirjaimia (a-z), numeroita (0-9) sekä ala- ja tavuviivoja (_ -)." -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "Syötä oikea URL-osoite." -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "{value} ei ole kelvollinen UUID." -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "Syötä kelvollinen IPv4- tai IPv6-osoite." -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "Syötä kelvollinen kokonaisluku." -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "Tämän arvon on oltava enintään {max_value}." -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "Tämän luvun on oltava vähintään {min_value}." -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "Liian suuri merkkijonoarvo." -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "Kelvollinen luku vaaditaan." -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "Tässä luvussa voi olla yhteensä enintään {max_digits} numeroa." -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "Tässä luvussa saa olla enintään {max_decimal_places} desimaalia." -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "Tässä luvussa saa olla enintään {max_whole_digits} numeroa ennen desimaalipilkkua." -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "Virheellinen päivämäärän/ajan muotoilu. Käytä jotain näistä muodoista: {format}" -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "Odotettiin päivämäärää ja aikaa, saatiin vain päivämäärä." -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "Virheellinen päivämäärän muotoilu. Käytä jotain näistä muodoista: {format}" -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "Odotettiin päivämäärää, saatiin päivämäärä ja aika." -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "Virheellinen kellonajan muotoilu. Käytä jotain näistä muodoista: {format}" -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "Virheellinen keston muotoilu. Käytä jotain näistä muodoista: {format}" -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" ei ole kelvollinen valinta." -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "Enemmän kuin {count} kappaletta..." -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Odotettiin listaa, saatiin tyyppi {input_type}." -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "Valinta ei saa olla tyhjä." -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "\"{input}\" ei ole kelvollinen polku." -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "Yhtään tiedostoa ei ole lähetetty." -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "Tiedostoa ei lähetetty. Tarkista lomakkeen koodaus (encoding)." -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "Tiedostonimeä ei voitu päätellä." -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "Lähetetty tiedosto on tyhjä." -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "Varmista että tiedostonimi on enintään {max_length} merkkiä pitkä (nyt {length})." -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "Kuva ei kelpaa. Lähettämäsi tiedosto ei ole kuva, tai tiedosto on vioittunut." -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "Lista ei saa olla tyhjä." -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "Odotettiin sanakirjaa, saatiin tyyppi {input_type}." -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "Arvon pitää olla kelvollista JSONia." -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "Lähetä" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "Epäkelpo kursori" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Epäkelpo pääavain {pk_value} - objektia ei ole olemassa." #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Väärä tyyppi. Odotettiin pääavainarvoa, saatiin {data_type}." @@ -366,25 +351,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "Epäkelpo linkki - objektia ei ole." #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Epäkelpo tyyppi. Odotettiin URL-merkkijonoa, saatiin {data_type}." -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "Objektia ({slug_name}={value}) ei ole." -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "Epäkelpo arvo." #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "Odotettiin sanakirjaa, saatiin tyyppi {datatype}." -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "Suotimet" @@ -414,27 +396,23 @@ msgstr "Ei mitään" msgid "No items to select." msgstr "Ei valittavia kohteita." -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "Arvon tulee olla uniikki." -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "Kenttien {field_names} tulee muodostaa uniikki joukko." -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "Kentän tulee olla uniikki päivämäärän {date_field} suhteen." -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "Kentän tulee olla uniikki kuukauden {date_field} suhteen." -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "Kentän tulee olla uniikki vuoden {date_field} suhteen." @@ -442,15 +420,19 @@ msgstr "Kentän tulee olla uniikki vuoden {date_field} suhteen." msgid "Invalid version in \"Accept\" header." msgstr "Epäkelpo versio Accept-otsakkeessa." -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "Epäkelpo versio URL-polussa." -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "Epäkelpo versio palvelinosoitteessa." -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "Epäkelpo versio kyselyparametrissa." diff --git a/rest_framework/locale/fr/LC_MESSAGES/django.mo b/rest_framework/locale/fr/LC_MESSAGES/django.mo index 531cc46b5dec5a0acc874182e1be8111759ecb4b..2bc60c63a1e7c38332b1c06124ebff5b552c2e06 100644 GIT binary patch delta 93 zcmbOfGAU$(xj2`(uAz~Fp_!GT@nlDFIY$WB)XLCA+W-i-d=iUGbVG^~^NMp4OY)1X k6hboca}$ddoHL3ti%T+76>LiKa~*&<87i=Ofq0P+0Nkn_eE\n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: French (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,40 +21,40 @@ msgstr "" "Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "En-tête « basic » non valide. Informations d'identification non fournies." -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "En-tête « basic » non valide. Les informations d'identification ne doivent pas contenir d'espaces." -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "En-tête « basic » non valide. Encodage base64 des informations d'identification incorrect." -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "Nom d'utilisateur et/ou mot de passe non valide(s)." -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "Utilisateur inactif ou supprimé." -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "En-tête « token » non valide. Informations d'identification non fournies." -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "En-tête « token » non valide. Un token ne doit pas contenir d'espaces." -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "En-tête « token » non valide. Un token ne doit pas contenir de caractères invalides." -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "Token non valide." @@ -62,23 +62,23 @@ msgstr "Token non valide." msgid "Auth Token" msgstr "Jeton d'authentification" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "Clef" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "Utilisateur" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "Création" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "Jeton" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "Jetons" @@ -127,7 +127,6 @@ msgid "Not found." msgstr "Pas trouvé." #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "Méthode \"{method}\" non autorisée." @@ -136,7 +135,6 @@ msgid "Could not satisfy the request Accept header." msgstr "L'en-tête « Accept » n'a pas pu être satisfaite." #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "Type de média \"{media_type}\" non supporté." @@ -144,214 +142,201 @@ msgstr "Type de média \"{media_type}\" non supporté." msgid "Request was throttled." msgstr "Requête ralentie." -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "Ce champ est obligatoire." -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "Ce champ ne peut être nul." -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "\"{input}\" n'est pas un booléen valide." -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "Ce champ ne peut être vide." -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "Assurez-vous que ce champ comporte au plus {max_length} caractères." -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "Assurez-vous que ce champ comporte au moins {min_length} caractères." -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "Saisissez une adresse email valable." -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "Cette valeur ne satisfait pas le motif imposé." -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "Ce champ ne doit contenir que des lettres, des nombres, des tirets bas _ et des traits d'union." -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "Saisissez une URL valide." -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "\"{value}\" n'est pas un UUID valide." -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "Saisissez une adresse IPv4 ou IPv6 valide." -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "Un nombre entier valide est requis." -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "Assurez-vous que cette valeur est inférieure ou égale à {max_value}." -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "Assurez-vous que cette valeur est supérieure ou égale à {min_value}." -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "Chaîne de caractères trop longue." -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "Un nombre valide est requis." -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "Assurez-vous qu'il n'y a pas plus de {max_digits} chiffres au total." -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "Assurez-vous qu'il n'y a pas plus de {max_decimal_places} chiffres après la virgule." -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "Assurez-vous qu'il n'y a pas plus de {max_whole_digits} chiffres avant la virgule." -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "La date + heure n'a pas le bon format. Utilisez un des formats suivants : {format}." -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "Attendait une date + heure mais a reçu une date." -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "La date n'a pas le bon format. Utilisez un des formats suivants : {format}." -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "Attendait une date mais a reçu une date + heure." -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "L'heure n'a pas le bon format. Utilisez un des formats suivants : {format}." -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "La durée n'a pas le bon format. Utilisez l'un des formats suivants: {format}." -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" n'est pas un choix valide." -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "Plus de {count} éléments..." -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Attendait une liste d'éléments mais a reçu \"{input_type}\"." -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "Cette sélection ne peut être vide." -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "\"{input}\" n'est pas un choix de chemin valide." -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "Aucun fichier n'a été soumis." -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "La donnée soumise n'est pas un fichier. Vérifiez le type d'encodage du formulaire." -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "Le nom de fichier n'a pu être déterminé." -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "Le fichier soumis est vide." -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "Assurez-vous que le nom de fichier comporte au plus {max_length} caractères (il en comporte {length})." -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "Transférez une image valide. Le fichier que vous avez transféré n'est pas une image, ou il est corrompu." -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "Cette liste ne peut pas être vide." -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "Attendait un dictionnaire d'éléments mais a reçu \"{input_type}\"." -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "La valeur doit être un JSON valide." -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "Envoyer" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "Page invalide." -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "Curseur non valide" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Clé primaire \"{pk_value}\" non valide - l'objet n'existe pas." #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Type incorrect. Attendait une clé primaire, a reçu {data_type}." @@ -368,25 +353,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "Lien non valide : l'objet n'existe pas." #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Type incorrect. Attendait une URL, a reçu {data_type}." -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "L'object avec {slug_name}={value} n'existe pas." -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "Valeur non valide." #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "Donnée non valide. Attendait un dictionnaire, a reçu {datatype}." -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "Filtres" @@ -416,27 +398,23 @@ msgstr "Aucune" msgid "No items to select." msgstr "Aucun élément à sélectionner." -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "Ce champ doit être unique." -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "Les champs {field_names} doivent former un ensemble unique." -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "Ce champ doit être unique pour la date \"{date_field}\"." -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "Ce champ doit être unique pour le mois \"{date_field}\"." -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "Ce champ doit être unique pour l'année \"{date_field}\"." @@ -444,15 +422,19 @@ msgstr "Ce champ doit être unique pour l'année \"{date_field}\"." msgid "Invalid version in \"Accept\" header." msgstr "Version non valide dans l'en-tête « Accept »." -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "Version non valide dans l'URL." -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "Version non valide dans le nom d'hôte." -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "Version non valide dans le paramètre de requête." diff --git a/rest_framework/locale/fr_CA/LC_MESSAGES/django.mo b/rest_framework/locale/fr_CA/LC_MESSAGES/django.mo index cd0a91340e7cd76179136ab12b81d454e887b7cd..1771787f8a38aee2306456baddf8901ccb76ce34 100644 GIT binary patch delta 90 zcmeBY>1UZRnaf<)&`811%*xPs;#@gL2+!2Y&_vq+2)KL_i%WDviW2jRa}rDPi>wqv hGV*g1ixr$RiZY8!GE)_7O7e3ZfH)Z{u1UZRnafz$z)-=^!phiU;#@gL2+thI(>4GCE}z8W65WuZ#Ju91#FG3XD}{)} ivdq*X1^=Ry{KC>o1)GX|2+JWSGcUg^GjZb|VMYL>>K#-7 diff --git a/rest_framework/locale/fr_CA/LC_MESSAGES/django.po b/rest_framework/locale/fr_CA/LC_MESSAGES/django.po index f26ed453b..84cbdf4cc 100644 --- a/rest_framework/locale/fr_CA/LC_MESSAGES/django.po +++ b/rest_framework/locale/fr_CA/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: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: French (Canada) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/fr_CA/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,40 +17,40 @@ msgstr "" "Language: fr_CA\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "" -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "" -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "" @@ -58,23 +58,23 @@ msgstr "" msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -123,7 +123,6 @@ msgid "Not found." msgstr "" #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "" @@ -132,7 +131,6 @@ msgid "Could not satisfy the request Accept header." msgstr "" #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "" @@ -140,214 +138,201 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "" -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "" -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "" -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "" -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "" -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "" -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "" -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "" -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "" -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "" -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "" -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "" -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "" -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "" -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "" -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "" -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "" -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "" -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "" -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "" -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "" -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "" -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "" -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "" -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "" -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "" -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "" -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" @@ -364,25 +349,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "" #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "" #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "" -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "" @@ -412,27 +394,23 @@ msgstr "" msgid "No items to select." msgstr "" -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "" -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "" -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "" -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "" -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "" @@ -440,15 +418,19 @@ msgstr "" msgid "Invalid version in \"Accept\" header." msgstr "" -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "" -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "" -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "" diff --git a/rest_framework/locale/gl/LC_MESSAGES/django.mo b/rest_framework/locale/gl/LC_MESSAGES/django.mo index 761037249231da752320dce282cd550027a2b9c3..030e25f9404b394648d6213e662d64c6891d9892 100644 GIT binary patch delta 90 zcmZo>X=a%)naf<)&`811%*xPs;#@gL2+!2Y&_vq+2)KL_i%WDviW2jRa}rDPi>wqv hGV*g1ixr$RiZY8!GE)_7O7e3ZfH)Z{u<;K&BLI}}9PR)B delta 90 zcmZo>X=a%)nafz$z)-=^!phiU;#@gL2+thI(>4GCE}z8W65WuZ#Ju91#FG3XD}{)} ivdq*X1^=Ry{KC>o1)GX|2+JWSGcUg^GjZb|c18f3dL1wT diff --git a/rest_framework/locale/gl/LC_MESSAGES/django.po b/rest_framework/locale/gl/LC_MESSAGES/django.po index ba0b788fc..5ec55729e 100644 --- a/rest_framework/locale/gl/LC_MESSAGES/django.po +++ b/rest_framework/locale/gl/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: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Galician (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/gl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,40 +17,40 @@ msgstr "" "Language: gl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "" -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "" -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "" @@ -58,23 +58,23 @@ msgstr "" msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -123,7 +123,6 @@ msgid "Not found." msgstr "" #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "" @@ -132,7 +131,6 @@ msgid "Could not satisfy the request Accept header." msgstr "" #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "" @@ -140,214 +138,201 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "" -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "" -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "" -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "" -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "" -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "" -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "" -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "" -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "" -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "" -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "" -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "" -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "" -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "" -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "" -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "" -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "" -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "" -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "" -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "" -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "" -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "" -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "" -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "" -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "" -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "" -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "" -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" @@ -364,25 +349,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "" #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "" #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "" -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "" @@ -412,27 +394,23 @@ msgstr "" msgid "No items to select." msgstr "" -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "" -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "" -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "" -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "" -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "" @@ -440,15 +418,19 @@ msgstr "" msgid "Invalid version in \"Accept\" header." msgstr "" -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "" -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "" -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "" diff --git a/rest_framework/locale/gl_ES/LC_MESSAGES/django.mo b/rest_framework/locale/gl_ES/LC_MESSAGES/django.mo index 281b6e66b7e66e840451489ae54e0fd19a7deba4..90c4212bacbc7d7515ae06b7fd6ff961fe04394f 100644 GIT binary patch delta 91 zcmbQsI+u0ACoXecLn8%4Gb=;miGSoAAv{wnLlbQSAmH*zEH2RvDN4*M&PgoEFS1ey i$;i)5ELL#ND9S7@$xKzSDap@u0ODk*z~*R1Cq@AM&>epO delta 91 zcmbQsI+u0ACoW@M149Kv3oB!biGSoAAv|*+PulKW\n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Galician (Spain) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/gl_ES/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,40 +18,40 @@ msgstr "" "Language: gl_ES\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "" -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "" -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "" @@ -59,23 +59,23 @@ msgstr "" msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -124,7 +124,6 @@ msgid "Not found." msgstr "" #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "" @@ -133,7 +132,6 @@ msgid "Could not satisfy the request Accept header." msgstr "" #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "" @@ -141,214 +139,201 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "" -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "" -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "" -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "" -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "" -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "" -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "" -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "" -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "" -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "" -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "" -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "" -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "" -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "" -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "" -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "" -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "" -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "" -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "" -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "" -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "" -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "" -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "" -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "" -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "" -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "" -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "" -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" @@ -365,25 +350,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "" #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "Valor non válido." #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "" -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "" @@ -413,27 +395,23 @@ msgstr "Ningún" msgid "No items to select." msgstr "" -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "" -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "" -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "" -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "" -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "" @@ -441,15 +419,19 @@ msgstr "" msgid "Invalid version in \"Accept\" header." msgstr "" -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "" -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "" -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "" diff --git a/rest_framework/locale/he_IL/LC_MESSAGES/django.mo b/rest_framework/locale/he_IL/LC_MESSAGES/django.mo index feef64e1b36c9be38b32bf05c413c471116f8199..55ffe5403c8cf163011f5511c6f3a6b5209be7d5 100644 GIT binary patch delta 90 zcmbQhGJ$2nWG-`ELn8%4Gb=;miF4%~Av{wnLlbQSAmH*zEH2RvDN4*M&PgoEFS1ey h$;i)5ELL#ND9S7@$xKzSDap@u0ODk*z{Wo!i~yb#9Tflo delta 90 zcmbQhGJ$2nWG-V}149Kv3oB!biF4%~Av|*+PulKWK|2o*h>J diff --git a/rest_framework/locale/he_IL/LC_MESSAGES/django.po b/rest_framework/locale/he_IL/LC_MESSAGES/django.po index cee35fedc..686ae6fa7 100644 --- a/rest_framework/locale/he_IL/LC_MESSAGES/django.po +++ b/rest_framework/locale/he_IL/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: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Hebrew (Israel) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/he_IL/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,40 +17,40 @@ msgstr "" "Language: he_IL\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "" -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "" -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "" @@ -58,23 +58,23 @@ msgstr "" msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -123,7 +123,6 @@ msgid "Not found." msgstr "" #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "" @@ -132,7 +131,6 @@ msgid "Could not satisfy the request Accept header." msgstr "" #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "" @@ -140,214 +138,201 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "" -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "" -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "" -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "" -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "" -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "" -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "" -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "" -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "" -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "" -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "" -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "" -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "" -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "" -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "" -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "" -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "" -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "" -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "" -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "" -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "" -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "" -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "" -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "" -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "" -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "" -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "" -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" @@ -364,25 +349,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "" #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "" #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "" -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "" @@ -412,27 +394,23 @@ msgstr "" msgid "No items to select." msgstr "" -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "" -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "" -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "" -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "" -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "" @@ -440,15 +418,19 @@ msgstr "" msgid "Invalid version in \"Accept\" header." msgstr "" -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "" -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "" -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "" diff --git a/rest_framework/locale/hu/LC_MESSAGES/django.mo b/rest_framework/locale/hu/LC_MESSAGES/django.mo index 9053ad62fefb8c069bc5eaafbfcfbb5be1cf8948..cb27fb740a8f8efca1fd9c8264bb56df60d5b078 100644 GIT binary patch delta 75 zcmZ4NzSw<3oe-C~uAz~Fp_!GT@#GF6IVjiE%Ftx;1|e~Ukc|A?#9{^KjH1lqlFU>E To09xo2Ov&{3T%EZv_}8{Ou-ng delta 75 zcmZ4NzSw<3oe-C?u7RO~p@o&P#pDhlIVjg0#N8kyt`Lz}mYG_l;9r!IUszhHU{jF~ TVL9Yv=H-`VCT@N%v_}8{Q#Kgz diff --git a/rest_framework/locale/hu/LC_MESSAGES/django.po b/rest_framework/locale/hu/LC_MESSAGES/django.po index 669a7bffa..7f3081fff 100644 --- a/rest_framework/locale/hu/LC_MESSAGES/django.po +++ b/rest_framework/locale/hu/LC_MESSAGES/django.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Hungarian (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/hu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,40 +18,40 @@ msgstr "" "Language: hu\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "Érvénytelen basic fejlécmező. Nem voltak megadva azonosítók." -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "Érvénytelen basic fejlécmező. Az azonosító karakterlánc nem tartalmazhat szóközöket." -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Érvénytelen basic fejlécmező. Az azonosítók base64 kódolása nem megfelelő." -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "Érvénytelen felhasználónév/jelszó." -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "A felhasználó nincs aktiválva vagy törölve lett." -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "Érvénytelen token fejlécmező. Nem voltak megadva azonosítók." -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "Érvénytelen token fejlécmező. A token karakterlánc nem tartalmazhat szóközöket." -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "Érvénytelen token." @@ -59,23 +59,23 @@ msgstr "Érvénytelen token." msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -124,7 +124,6 @@ msgid "Not found." msgstr "Nem található." #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "A \"{method}\" metódus nem megengedett." @@ -133,7 +132,6 @@ msgid "Could not satisfy the request Accept header." msgstr "A kérés Accept fejlécmezőjét nem lehetett kiszolgálni." #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "Nem támogatott média típus \"{media_type}\" a kérésben." @@ -141,214 +139,201 @@ msgstr "Nem támogatott média típus \"{media_type}\" a kérésben." msgid "Request was throttled." msgstr "A kérés korlátozva lett." -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "Ennek a mezőnek a megadása kötelező." -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "Ez a mező nem lehet null értékű." -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "Az \"{input}\" nem egy érvényes logikai érték." -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "Ez a mező nem lehet üres." -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "Bizonyosodjon meg arról, hogy ez a mező legfeljebb {max_length} karakterből áll." -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "Bizonyosodjon meg arról, hogy ez a mező legalább {min_length} karakterből áll." -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "Adjon meg egy érvényes e-mail címet!" -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "Ez az érték nem illeszkedik a szükséges mintázatra." -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "Az URL barát cím csak betűket, számokat, aláhúzásokat és kötőjeleket tartalmazhat." -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "Adjon meg egy érvényes URL-t!" -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "" -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "" -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "Egy érvényes egész szám megadása szükséges." -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "Bizonyosodjon meg arról, hogy ez az érték legfeljebb {max_value}." -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "Bizonyosodjon meg arról, hogy ez az érték legalább {min_value}." -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "A karakterlánc túl hosszú." -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "Egy érvényes szám megadása szükséges." -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "Bizonyosodjon meg arról, hogy a számjegyek száma összesen legfeljebb {max_digits}." -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "Bizonyosodjon meg arról, hogy a tizedes tört törtrészében levő számjegyek száma összesen legfeljebb {max_decimal_places}." -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "Bizonyosodjon meg arról, hogy a tizedes tört egész részében levő számjegyek száma összesen legfeljebb {max_whole_digits}." -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "A dátum formátuma hibás. Használja ezek valamelyikét helyette: {format}." -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "Időt is tartalmazó dátum helyett egy időt nem tartalmazó dátum lett elküldve." -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "A dátum formátuma hibás. Használja ezek valamelyikét helyette: {format}." -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "Időt nem tartalmazó dátum helyett egy időt is tartalmazó dátum lett elküldve." -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "Az idő formátuma hibás. Használja ezek valamelyikét helyette: {format}." -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "Az \"{input}\" nem egy érvényes elem." -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "" -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Elemek listája helyett \"{input_type}\" lett elküldve." -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "" -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "Semmilyen fájl sem került feltöltésre." -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "Az elküldött adat nem egy fájl volt. Ellenőrizze a kódolás típusát az űrlapon!" -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "A fájlnév nem megállapítható." -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "A küldött fájl üres." -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "Bizonyosodjon meg arról, hogy a fájlnév legfeljebb {max_length} karakterből áll (jelenlegi hossza: {length})." -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "Töltsön fel egy érvényes képfájlt! A feltöltött fájl nem kép volt, vagy megsérült." -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "" -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Érvénytelen pk \"{pk_value}\" - az objektum nem létezik." #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Helytelen típus. pk érték helyett {data_type} lett elküldve." @@ -365,25 +350,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "Érvénytelen link - Az objektum nem létezik." #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Helytelen típus. URL karakterlánc helyett {data_type} lett elküldve." -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "Nem létezik olyan objektum, amelynél {slug_name}={value}." -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "Érvénytelen érték." #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "Érvénytelen adat. Egy dictionary helyett {datatype} lett elküldve." -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "" @@ -413,27 +395,23 @@ msgstr "" msgid "No items to select." msgstr "" -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "Ennek a mezőnek egyedinek kell lennie." -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "A {field_names} mezőnevek nem tartalmazhatnak duplikátumot." -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "A mezőnek egyedinek kell lennie a \"{date_field}\" dátumra." -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "A mezőnek egyedinek kell lennie a \"{date_field}\" hónapra." -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "A mezőnek egyedinek kell lennie a \"{date_field}\" évre." @@ -441,15 +419,19 @@ msgstr "A mezőnek egyedinek kell lennie a \"{date_field}\" évre." msgid "Invalid version in \"Accept\" header." msgstr "Érvénytelen verzió az \"Accept\" fejlécmezőben." -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "Érvénytelen verzió az URL elérési útban." -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "Érvénytelen verzió a hosztnévben." -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "Érvénytelen verzió a lekérdezési paraméterben." diff --git a/rest_framework/locale/id/LC_MESSAGES/django.mo b/rest_framework/locale/id/LC_MESSAGES/django.mo index 350d64a3b89e2d42301c885b4d4dc018ea2b21e3..beb9643b0570cfa42a3e5fad53aee3664ce79141 100644 GIT binary patch delta 90 zcmeyz{EvCUWG-`ELn8%4Gb=;miF4%~Av{wnLlbQSAmH*zEH2RvDN4*M&PgoEFS1ey h$;i)5ELL#ND9S7@$xKzSDap@u0ODk*z{WpJi~#Ap9o+x` delta 90 zcmeyz{EvCUWG-V}149Kv3oB!biF4%~Av|*+PulKW2=@Mjjsk diff --git a/rest_framework/locale/id/LC_MESSAGES/django.po b/rest_framework/locale/id/LC_MESSAGES/django.po index 1137755c8..c84add0a4 100644 --- a/rest_framework/locale/id/LC_MESSAGES/django.po +++ b/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: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Indonesian (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/id/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,40 +17,40 @@ msgstr "" "Language: id\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "" -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "" -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "" @@ -58,23 +58,23 @@ msgstr "" msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -123,7 +123,6 @@ msgid "Not found." msgstr "" #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "" @@ -132,7 +131,6 @@ msgid "Could not satisfy the request Accept header." msgstr "" #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "" @@ -140,214 +138,201 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "" -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "" -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "" -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "" -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "" -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "" -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "" -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "" -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "" -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "" -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "" -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "" -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "" -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "" -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "" -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "" -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "" -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "" -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "" -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "" -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "" -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "" -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "" -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "" -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "" -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "" -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "" -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" @@ -364,25 +349,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "" #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "" #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "" -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "" @@ -412,27 +394,23 @@ msgstr "" msgid "No items to select." msgstr "" -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "" -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "" -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "" -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "" -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "" @@ -440,15 +418,19 @@ msgstr "" msgid "Invalid version in \"Accept\" header." msgstr "" -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "" -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "" -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "" diff --git a/rest_framework/locale/it/LC_MESSAGES/django.mo b/rest_framework/locale/it/LC_MESSAGES/django.mo index 8af8bc74694ef0ffc80d50e8c594e49bc6636d0c..5d52d3dcfde88ac19716f27a7d8c3904b3987413 100644 GIT binary patch delta 93 zcmew!@I7FInHZP3uAz~Fp_!GT@ni=vIY$WB)XLCA+W-i-d=iUGbVG^~^NMp4OY)1X k6hboca}$ddoHL3ti%T+76>LiKa~*&<87i=OzSs>x03rJxo&W#< delta 93 zcmew!@I7FInHZO`u7RO~p@o&P#bgIDIY$WB9LUu+00J(b#Nra&kfOxA;+({i{30ub lh{UqY)FK7{qLlo?(n\n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Italian (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,40 +21,40 @@ msgstr "" "Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "Header di base invalido. Credenziali non fornite." -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "Header di base invalido. Le credenziali non dovrebbero contenere spazi." -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Credenziali non correttamente codificate in base64." -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "Nome utente/password non validi" -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "Utente inattivo o eliminato." -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "Header del token non valido. Credenziali non fornite." -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "Header del token non valido. Il contenuto del token non dovrebbe contenere spazi." -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "Header del token invalido. La stringa del token non dovrebbe contenere caratteri illegali." -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "Token invalido." @@ -62,23 +62,23 @@ msgstr "Token invalido." msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -127,7 +127,6 @@ msgid "Not found." msgstr "Non trovato." #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "Metodo \"{method}\" non consentito" @@ -136,7 +135,6 @@ msgid "Could not satisfy the request Accept header." msgstr "Impossibile soddisfare l'header \"Accept\" presente nella richiesta." #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "Tipo di media \"{media_type}\"non supportato." @@ -144,214 +142,201 @@ msgstr "Tipo di media \"{media_type}\"non supportato." msgid "Request was throttled." msgstr "La richiesta è stata limitata (throttled)." -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "Campo obbligatorio." -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "Il campo non può essere nullo." -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "\"{input}\" non è un valido valore booleano." -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "Questo campo non può essere omesso." -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "Assicurati che questo campo non abbia più di {max_length} caratteri." -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "Assicurati che questo campo abbia almeno {min_length} caratteri." -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "Inserisci un indirizzo email valido." -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "Questo valore non corrisponde alla sequenza richiesta." -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "Immetti uno \"slug\" valido che consista di lettere, numeri, underscore o trattini." -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "Inserisci un URL valido" -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "\"{value}\" non è un UUID valido." -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "Inserisci un indirizzo IPv4 o IPv6 valido." -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "È richiesto un numero intero valido." -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "Assicurati che il valore sia minore o uguale a {max_value}." -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "Assicurati che il valore sia maggiore o uguale a {min_value}." -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "Stringa troppo lunga." -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "È richiesto un numero valido." -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "Assicurati che non ci siano più di {max_digits} cifre in totale." -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "Assicurati che non ci siano più di {max_decimal_places} cifre decimali." -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "Assicurati che non ci siano più di {max_whole_digits} cifre prima del separatore decimale." -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "L'oggetto di tipo datetime è in un formato errato. Usa uno dei seguenti formati: {format}." -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "Atteso un oggetto di tipo datetime ma l'oggetto ricevuto è di tipo date." -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "La data è in un formato errato. Usa uno dei seguenti formati: {format}." -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "Atteso un oggetto di tipo date ma l'oggetto ricevuto è di tipo datetime." -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "L'orario ha un formato errato. Usa uno dei seguenti formati: {format}." -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "La durata è in un formato errato. Usa uno dei seguenti formati: {format}." -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" non è una scelta valida." -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "Più di {count} oggetti..." -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Attesa una lista di oggetti ma l'oggetto ricevuto è di tipo \"{input_type}\"." -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "Questa selezione potrebbe non essere vuota." -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "\"{input}\" non è un percorso valido." -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "Non è stato inviato alcun file." -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "I dati inviati non corrispondono ad un file. Si prega di controllare il tipo di codifica nel form." -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "Il nome del file non può essere determinato." -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "Il file inviato è vuoto." -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "Assicurati che il nome del file abbia, al più, {max_length} caratteri (attualmente ne ha {length})." -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "Invia un'immagine valida. Il file che hai inviato non era un'immagine o era corrotto." -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "Questa lista potrebbe non essere vuota." -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "Era atteso un dizionario di oggetti ma il dato ricevuto è di tipo \"{input_type}\"." -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "Il valore deve essere un JSON valido." -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "Invia" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "Cursore non valido" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Pk \"{pk_value}\" non valido - l'oggetto non esiste." #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Tipo non corretto. Era atteso un valore pk, ma è stato ricevuto {data_type}." @@ -368,25 +353,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "Collegamento non valido - L'oggetto non esiste." #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Tipo non corretto. Era attesa una stringa URL, ma è stato ricevuto {data_type}." -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "L'oggetto con {slug_name}={value} non esiste." -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "Valore non valido." #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "Dati non validi. Era atteso un dizionario, ma si è ricevuto {datatype}." -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "Filtri" @@ -416,27 +398,23 @@ msgstr "Nessuno" msgid "No items to select." msgstr "Nessun elemento da selezionare." -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "Questo campo deve essere unico." -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "I campi {field_names} devono costituire un insieme unico." -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "Questo campo deve essere unico per la data \"{date_field}\"." -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "Questo campo deve essere unico per il mese \"{date_field}\"." -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "Questo campo deve essere unico per l'anno \"{date_field}\"." @@ -444,15 +422,19 @@ msgstr "Questo campo deve essere unico per l'anno \"{date_field}\"." msgid "Invalid version in \"Accept\" header." msgstr "Versione non valida nell'header \"Accept\"." -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "Versione non valida nella sequenza URL." -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "Versione non valida nel nome dell'host." -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "Versione non valida nel parametro della query." diff --git a/rest_framework/locale/ja/LC_MESSAGES/django.mo b/rest_framework/locale/ja/LC_MESSAGES/django.mo index 048da56fd3776f05337b9498f6444bf9546a7a85..1f934cc378a47eb5d4f15aec1e1bde9e58f6acf2 100644 GIT binary patch delta 93 zcmZ1)yEJwKqd1qjuAz~Fp_!GT@nmjsIY$WB)XLCA+W-i-d=iUGbVG^~^NMp4OY)1X k6hboca}$ddoHL3ti%T+76>LiKa~*&<87i\n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Japanese (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,40 +18,40 @@ msgstr "" "Language: ja\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "不正な基本ヘッダです。認証情報が含まれていません。" -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "不正な基本ヘッダです。認証情報文字列に空白を含めてはいけません。" -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "不正な基本ヘッダです。認証情報がBASE64で正しくエンコードされていません。" -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "ユーザ名かパスワードが違います。" -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "ユーザが無効か削除されています。" -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "不正なトークンヘッダです。認証情報が含まれていません。" -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "不正なトークンヘッダです。トークン文字列に空白を含めてはいけません。" -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "不正なトークンヘッダです。トークン文字列に不正な文字を含めてはいけません。" -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "不正なトークンです。" @@ -59,23 +59,23 @@ msgstr "不正なトークンです。" msgid "Auth Token" msgstr "認証トークン" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "キー" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "ユーザ" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "作成された" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "トークン" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "トークン" @@ -124,7 +124,6 @@ msgid "Not found." msgstr "見つかりませんでした。" #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "メソッド \"{method}\" は許されていません。" @@ -133,7 +132,6 @@ msgid "Could not satisfy the request Accept header." msgstr "リクエストのAcceptヘッダを満たすことができませんでした。" #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "リクエストのメディアタイプ \"{media_type}\" はサポートされていません。" @@ -141,214 +139,201 @@ msgstr "リクエストのメディアタイプ \"{media_type}\" はサポート msgid "Request was throttled." msgstr "リクエストの処理は絞られました。" -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "この項目は必須です。" -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "この項目はnullにできません。" -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "\"{input}\" は有効なブーリアンではありません。" -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "この項目は空にできません。" -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "この項目が{max_length}文字より長くならないようにしてください。" -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "この項目は少なくとも{min_length}文字以上にしてください。" -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "有効なメールアドレスを入力してください。" -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "この値は所要のパターンにマッチしません。" -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "文字、数字、アンダースコア、またはハイフンから成る有効な \"slug\" を入力してください。" -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "有効なURLを入力してください。" -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "\"{value}\" は有効なUUIDではありません。" -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "有効なIPv4またはIPv6アドレスを入力してください。" -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "有効な整数を入力してください。" -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "この値は{max_value}以下にしてください。" -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "この値は{min_value}以上にしてください。" -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "文字列が長過ぎます。" -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "有効な数値を入力してください。" -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "合計で最大{max_digits}桁以下になるようにしてください。" -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "小数点以下の桁数を{max_decimal_places}を超えないようにしてください。" -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "整数部の桁数を{max_whole_digits}を超えないようにしてください。" -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "日時の形式が違います。以下のどれかの形式にしてください: {format}。" -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "日付ではなく日時を入力してください。" -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "日付の形式が違います。以下のどれかの形式にしてください: {format}。" -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "日時ではなく日付を入力してください。" -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "時刻の形式が違います。以下のどれかの形式にしてください: {format}。" -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "機関の形式が違います。以下のどれかの形式にしてください: {format}。" -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\"は有効な選択肢ではありません。" -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr " {count} 個より多い..." -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "\"{input_type}\" 型のデータではなく項目のリストを入力してください。" -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "空でない項目を選択してください。" -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "\"{input}\"は有効なパスの選択肢ではありません。" -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "ファイルが添付されていません。" -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "添付されたデータはファイルではありません。フォームのエンコーディングタイプを確認してください。" -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "ファイル名が取得できませんでした。" -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "添付ファイルの中身が空でした。" -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "ファイル名は最大{max_length}文字にしてください({length}文字でした)。" -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "有効な画像をアップロードしてください。アップロードされたファイルは画像でないか壊れた画像です。" -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "リストは空ではいけません。" -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "\"{input_type}\" 型のデータではなく項目の辞書を入力してください。" -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "値は有効なJSONでなければなりません。" -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "提出" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "カーソルが不正です。" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "主キー \"{pk_value}\" は不正です - データが存在しません。" #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "不正な型です。{data_type} 型ではなく主キーの値を入力してください。" @@ -365,25 +350,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "ハイパーリンクが不正です - リンク先が存在しません。" #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "不正なデータ型です。{data_type} 型ではなくURL文字列を入力してください。" -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "{slug_name}={value} のデータが存在しません。" -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "不正な値です。" #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "不正なデータです。{datatype} 型ではなく辞書を入力してください。" -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "フィルタ" @@ -413,27 +395,23 @@ msgstr "なし" msgid "No items to select." msgstr "選択する項目がありません。" -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "この項目は一意でなければなりません。" -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "項目 {field_names} は一意な組でなければなりません。" -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "この項目は \"{date_field}\" の日に対して一意でなければなりません。" -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "この項目は \"{date_field}\" の月に対して一意でなければなりません。" -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "この項目は \"{date_field}\" の年に対して一意でなければなりません。" @@ -441,15 +419,19 @@ msgstr "この項目は \"{date_field}\" の年に対して一意でなければ msgid "Invalid version in \"Accept\" header." msgstr "\"Accept\" 内のバージョンが不正です。" -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "URLパス内のバージョンが不正です。" -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "ホスト名内のバージョンが不正です。" -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "クエリパラメータ内のバージョンが不正です。" diff --git a/rest_framework/locale/ko_KR/LC_MESSAGES/django.mo b/rest_framework/locale/ko_KR/LC_MESSAGES/django.mo index ac88a062dc30575bd46c86f2479fcd819a420a1f..6410f0b1cd6cd733df113762a4664c01ecae63ff 100644 GIT binary patch delta 93 zcmZ4Hx6E(DW+5(fT|*-ULo+Kwu4oEH24RRj?_^&vgLeWT?Pq8DTCF053xwnE(I) delta 93 zcmZ4Hx6E(DW+5(PT?0b}LklZoi^+S1\n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Korean (Korea) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/ko_KR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,40 +18,40 @@ msgstr "" "Language: ko_KR\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "기본 헤더(basic header)가 유효하지 않습니다. 인증데이터(credentials)가 제공되지 않았습니다." -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "기본 헤더(basic header)가 유효하지 않습니다. 인증데이터(credentials) 문자열은 빈칸(spaces)을 포함하지 않아야 합니다." -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "기본 헤더(basic header)가 유효하지 않습니다. 인증데이터(credentials)가 base64로 적절히 부호화(encode)되지 않았습니다." -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "아이디/비밀번호가 유효하지 않습니다." -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "계정이 중지되었거나 삭제되었습니다." -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "토큰 헤더가 유효하지 않습니다. 인증데이터(credentials)가 제공되지 않았습니다." -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "토큰 헤더가 유효하지 않습니다. 토큰 문자열은 빈칸(spaces)를 포함하지 않아야 합니다." -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "토큰 헤더가 유효하지 않습니다. 토큰 문자열은 유효하지 않은 문자를 포함하지 않아야 합니다." -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "토큰이 유효하지 않습니다." @@ -59,23 +59,23 @@ msgstr "토큰이 유효하지 않습니다." msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -124,7 +124,6 @@ msgid "Not found." msgstr "찾을 수 없습니다." #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "메소드(Method) \"{method}\"는 허용되지 않습니다." @@ -133,7 +132,6 @@ msgid "Could not satisfy the request Accept header." msgstr "Accept header 요청을 만족할 수 없습니다." #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "요청된 \"{media_type}\"가 지원되지 않는 미디어 형태입니다." @@ -141,214 +139,201 @@ msgstr "요청된 \"{media_type}\"가 지원되지 않는 미디어 형태입니 msgid "Request was throttled." msgstr "요청이 지연(throttled)되었습니다." -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "이 항목을 채워주십시오." -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "이 칸은 null일 수 없습니다." -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "\"{input}\"이 유효하지 않은 부울(boolean)입니다." -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "이 칸은 blank일 수 없습니다." -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "이 칸이 글자 수가 {max_length} 이하인지 확인하십시오." -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "이 칸이 글자 수가 적어도 {min_length} 이상인지 확인하십시오." -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "유효한 이메일 주소를 입력하십시오." -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "형식에 맞지 않는 값입니다." -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "문자, 숫자, 밑줄( _ ) 또는 하이픈( - )으로 이루어진 유효한 \"slug\"를 입력하십시오." -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "유효한 URL을 입력하십시오." -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "\"{value}\"가 유효하지 않은 UUID 입니다." -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "유효한 IPv4 또는 IPv6 주소를 입력하십시오." -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "유효한 정수(integer)를 넣어주세요." -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "이 값이 {max_value}보다 작거나 같은지 확인하십시오." -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "이 값이 {min_value}보다 크거나 같은지 확인하십시오." -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "문자열 값이 너무 큽니다." -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "유효한 숫자를 넣어주세요." -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "전체 숫자(digits)가 {max_digits} 이하인지 확인하십시오." -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "소수점 자릿수가 {max_decimal_places} 이하인지 확인하십시오." -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "소수점 자리 앞에 숫자(digits)가 {max_whole_digits} 이하인지 확인하십시오." -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "Datetime의 포멧이 잘못되었습니다. 이 형식들 중 한가지를 사용하세요: {format}." -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "예상된 datatime 대신 date를 받았습니다." -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "Date의 포멧이 잘못되었습니다. 이 형식들 중 한가지를 사용하세요: {format}." -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "예상된 date 대신 datetime을 받았습니다." -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "Time의 포멧이 잘못되었습니다. 이 형식들 중 한가지를 사용하세요: {format}." -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\"이 유효하지 않은 선택(choice)입니다." -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "" -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "아이템 리스트가 예상되었으나 \"{input_type}\"를 받았습니다." -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "" -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "파일이 제출되지 않았습니다." -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "제출된 데이터는 파일이 아닙니다. 제출된 서식의 인코딩 형식을 확인하세요." -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "파일명을 알 수 없습니다." -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "제출된 파일이 비어있습니다." -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "이 파일명의 글자수가 최대 {max_length}를 넘지 않는지 확인하십시오. (이것은 {length}가 있습니다)." -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "유효한 이미지 파일을 업로드 하십시오. 업로드 하신 파일은 이미지 파일이 아니거나 손상된 이미지 파일입니다." -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "" -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "아이템 딕셔너리가 예상되었으나 \"{input_type}\" 타입을 받았습니다." -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "커서(cursor)가 유효하지 않습니다." #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "유효하지 않은 pk \"{pk_value}\" - 객체가 존재하지 않습니다." #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "잘못된 형식입니다. pk 값 대신 {data_type}를 받았습니다." @@ -365,25 +350,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "유효하지 않은 하이퍼링크 - 객체가 존재하지 않습니다." #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "잘못된 형식입니다. URL 문자열을 예상했으나 {data_type}을 받았습니다." -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "{slug_name}={value} 객체가 존재하지 않습니다." -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "값이 유효하지 않습니다." #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "유효하지 않은 데이터. 딕셔너리(dictionary)대신 {datatype}를 받았습니다." -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "" @@ -413,27 +395,23 @@ msgstr "" msgid "No items to select." msgstr "선택할 아이템이 없습니다." -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "이 칸은 반드시 고유해야 합니다." -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "" -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "" -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "" -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "" @@ -441,15 +419,19 @@ msgstr "" msgid "Invalid version in \"Accept\" header." msgstr "\"Accept\" header내 버전이 유효하지 않습니다." -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "URL path내 버전이 유효하지 않습니다." -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "hostname내 버전이 유효하지 않습니다." -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "쿼리 파라메터내 버전이 유효하지 않습니다." diff --git a/rest_framework/locale/mk/LC_MESSAGES/django.mo b/rest_framework/locale/mk/LC_MESSAGES/django.mo index e2a518f71325e547319530bac20437003629b347..ac9a48193d7df5680b8e91070daa80cbdbc1713f 100644 GIT binary patch delta 75 zcmew#^gn1roe-C~uAz~Fp_!GT@#GF6IVjiE%Ftx;1|e~Ukc|A?#9{^KjH1lqlFU>E To09xo2Ov&{3T%EZG(!vkhxHj= delta 75 zcmew#^gn1roe-C?u7RO~p@o&P#pDhlIVjg0#N8kyt`Lz}mYG_l;9r!IUszhHU{jF~ TVL9Yv=H-`VCT@N%G(!vkj%pd8 diff --git a/rest_framework/locale/mk/LC_MESSAGES/django.po b/rest_framework/locale/mk/LC_MESSAGES/django.po index 5818124ae..d53a30677 100644 --- a/rest_framework/locale/mk/LC_MESSAGES/django.po +++ b/rest_framework/locale/mk/LC_MESSAGES/django.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Macedonian (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/mk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,40 +18,40 @@ msgstr "" "Language: mk\n" "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "Невалиден основен header. Не се внесени податоци за автентикација." -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "Невалиден основен header. Автентикационата низа не треба да содржи празни места." -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Невалиден основен header. Податоците за автентикација не се енкодирани со base64." -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "Невалидно корисничко име/лозинка." -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "Корисникот е деактивиран или избришан." -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "Невалиден токен header. Не се внесени податоци за најава." -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "Невалиден токен во header. Токенот не треба да содржи празни места." -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "Невалиден токен." @@ -59,23 +59,23 @@ msgstr "Невалиден токен." msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -124,7 +124,6 @@ msgid "Not found." msgstr "Не е пронајдено ништо." #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "Методата \"{method}\" не е дозволена." @@ -133,7 +132,6 @@ msgid "Could not satisfy the request Accept header." msgstr "Не може да се исполни барањето на Accept header-от." #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "Media типот „{media_type}“ не е поддржан." @@ -141,214 +139,201 @@ msgstr "Media типот „{media_type}“ не е поддржан." msgid "Request was throttled." msgstr "Request-от е забранет заради ограничувања." -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "Ова поле е задолжително." -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "Ова поле не смее да биде недефинирано." -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "\"{input}\" не е валиден boolean." -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "Ова поле не смее да биде празно." -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "Ова поле не смее да има повеќе од {max_length} знаци." -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "Ова поле мора да има барем {min_length} знаци." -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "Внесете валидна email адреса." -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "Ова поле не е по правилната шема/барање." -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "Внесете валидно име што содржи букви, бројки, долни црти или црти." -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "Внесете валиден URL." -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "" -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "" -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "Задолжителен е валиден цел број." -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "Вредноста треба да биде помала или еднаква на {max_value}." -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "Вредноста треба да биде поголема или еднаква на {min_value}." -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "Вредноста е преголема." -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "Задолжителен е валиден број." -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "Не смее да има повеќе од {max_digits} цифри вкупно." -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "Не смее да има повеќе од {max_decimal_places} децимални места." -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "Не смее да има повеќе од {max_whole_digits} цифри пред децималната точка." -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "Датата и времето се со погрешен формат. Користете го овој формат: {format}." -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "Очекувано беше дата и време, а внесено беше само дата." -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "Датата е со погрешен формат. Користете го овој формат: {format}." -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "Очекувана беше дата, а внесени беа и дата и време." -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "Времето е со погрешен формат. Користете го овој формат: {format}." -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "„{input}“ не е валиден избор." -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "" -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Очекувана беше листа, а внесено беше „{input_type}“." -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "" -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "Ниеден фајл не е качен (upload-иран)." -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "Испратените податоци не се фајл. Проверете го encoding-от на формата." -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "Не може да се открие име на фајлот." -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "Качениот (upload-иран) фајл е празен." -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "Името на фајлот треба да има највеќе {max_length} знаци (а има {length})." -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "Качете (upload-ирајте) валидна слика. Фајлот што го качивте не е валидна слика или е расипан." -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "" -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Невалиден pk „{pk_value}“ - објектот не постои." #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Неточен тип. Очекувано беше pk, а внесено {data_type}." @@ -365,25 +350,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "Невалиден хиперлинк - Објектот не постои." #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Неточен тип. Очекувано беше URL, a внесено {data_type}." -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "Објектот со {slug_name}={value} не постои." -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "Невалидна вредност." #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "Невалидни податоци. Очекуван беше dictionary, а внесен {datatype}." -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "" @@ -413,27 +395,23 @@ msgstr "" msgid "No items to select." msgstr "" -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "Ова поле мора да биде уникатно." -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "Полињата {field_names} заедно мора да формираат уникатен збир." -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "Ова поле мора да биде уникатно за „{date_field}“ датата." -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "Ова поле мора да биде уникатно за „{date_field}“ месецот." -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "Ова поле мора да биде уникатно за „{date_field}“ годината." @@ -441,15 +419,19 @@ msgstr "Ова поле мора да биде уникатно за „{date_fi msgid "Invalid version in \"Accept\" header." msgstr "Невалидна верзија во „Accept“ header-от." -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "Невалидна верзија во URL патеката." -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "Невалидна верзија во hostname-от." -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "Невалидна верзија во query параметарот." diff --git a/rest_framework/locale/nb/LC_MESSAGES/django.mo b/rest_framework/locale/nb/LC_MESSAGES/django.mo index a0bdb3a49184449bd82e8037f9830fba15338b75..d3dfe100a7f558c9f067d9a720b6889c1a501b9f 100644 GIT binary patch delta 93 zcmX@@bJ}NvnHZP3uAz~Fp_!GT@ni=vIY$WB)XLCA+W-i-d=iUGbVG^~^NMp4OY)1X k6hboca}$ddoHL3ti%T+76>LiKa~*&<87i=OzStUm0RI{u5C8xG delta 93 zcmX@@bJ}NvnHZO`u7RO~p@o&P#bgIDIY$WB9LUu+00J(b#Nra&kfOxA;+({i{30ub lh{UqY)FK7{qLlo?(n\n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,40 +18,40 @@ msgstr "" "Language: nb\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "Ugyldig basic header. Ingen legitimasjon gitt." -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "Ugylid basic header. Legitimasjonsstreng bør ikke inneholde mellomrom." -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Ugyldig basic header. Legitimasjonen ikke riktig Base64 kodet." -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "Ugyldig brukernavn eller passord." -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "Bruker inaktiv eller slettet." -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "Ugyldig token header. Ingen legitimasjon gitt." -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "Ugyldig token header. Token streng skal ikke inneholde mellomrom." -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "Ugyldig token header. Tokenstrengen skal ikke inneholde ugyldige tegn." -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "Ugyldig token." @@ -59,23 +59,23 @@ msgstr "Ugyldig token." msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -124,7 +124,6 @@ msgid "Not found." msgstr "Ikke funnet." #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "Metoden \"{method}\" ikke gyldig." @@ -133,7 +132,6 @@ msgid "Could not satisfy the request Accept header." msgstr "Kunne ikke tilfredsstille request Accept header." #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "Ugyldig media type \"{media_type}\" i request." @@ -141,214 +139,201 @@ msgstr "Ugyldig media type \"{media_type}\" i request." msgid "Request was throttled." msgstr "Forespørselen ble strupet." -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "Dette feltet er påkrevd." -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "Dette feltet må ikke være tomt." -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "\"{input}\" er ikke en gyldig bolsk verdi." -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "Dette feltet må ikke være blankt." -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "Forsikre deg om at dette feltet ikke har mer enn {max_length} tegn." -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "Forsikre deg at dette feltet har minst {min_length} tegn." -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "Oppgi en gyldig epost-adresse." -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "Denne verdien samsvarer ikke med de påkrevde mønsteret." -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "Skriv inn en gyldig \"slug\" som består av bokstaver, tall, understrek eller bindestrek." -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "Skriv inn en gyldig URL." -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "\"{value}\" er ikke en gyldig UUID." -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "Skriv inn en gyldig IPv4 eller IPv6-adresse." -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "En gyldig heltall er nødvendig." -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "Sikre denne verdien er mindre enn eller lik {max_value}." -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "Sikre denne verdien er større enn eller lik {min_value}." -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "Strengverdien for stor." -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "Et gyldig nummer er nødvendig." -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "Pass på at det ikke er flere enn {max_digits} siffer totalt." -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "Pass på at det ikke er flere enn {max_decimal_places} desimaler." -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "Pass på at det ikke er flere enn {max_whole_digits} siffer før komma." -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "Datetime har feil format. Bruk et av disse formatene i stedet: {format}." -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "Forventet en datetime, men fikk en date." -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "Dato har feil format. Bruk et av disse formatene i stedet: {format}." -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "Forventet en date, men fikk en datetime." -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "Tid har feil format. Bruk et av disse formatene i stedet: {format}." -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "Varighet har feil format. Bruk et av disse formatene i stedet: {format}." -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" er ikke et gyldig valg." -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "Mer enn {count} elementer ..." -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Forventet en liste over elementer, men fikk type \"{input_type}\"." -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "Dette valget kan ikke være tomt." -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "\"{input}\" er ikke en gyldig bane valg." -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "Ingen fil ble sendt." -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "De innsendte data var ikke en fil. Kontroller kodingstypen på skjemaet." -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "Kunne ikke finne filnavn." -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "Den innsendte filen er tom." -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "Sikre dette filnavnet har på det meste {max_length} tegn (det har {length})." -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "Last opp et gyldig bilde. Filen du lastet opp var enten ikke et bilde eller en ødelagt bilde." -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "Denne listen kan ikke være tom." -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "Forventet en dictionary av flere ting, men fikk typen \"{input_type}\"." -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "Verdien må være gyldig JSON." -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "Send inn" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "Ugyldig markør" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Ugyldig pk \"{pk_value}\" - objektet eksisterer ikke." #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Feil type. Forventet pk verdi, fikk {data_type}." @@ -365,25 +350,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "Ugyldig hyperkobling - Objektet eksisterer ikke." #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Feil type. Forventet URL streng, fikk {data_type}." -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "Objekt med {slug_name}={value} finnes ikke." -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "Ugyldig verdi." #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "Ugyldige data. Forventet en dicitonary, men fikk {datatype}." -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "Filtre" @@ -413,27 +395,23 @@ msgstr "Ingen" msgid "No items to select." msgstr "Ingenting å velge." -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "Dette feltet må være unikt." -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "Feltene {field_names} må gjøre et unikt sett." -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "Dette feltet må være unikt for \"{date_field}\" dato." -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "Dette feltet må være unikt for \"{date_field}\" måned." -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "Dette feltet må være unikt for \"{date_field}\" år." @@ -441,15 +419,19 @@ msgstr "Dette feltet må være unikt for \"{date_field}\" år." msgid "Invalid version in \"Accept\" header." msgstr "Ugyldig versjon på \"Accept\" header." -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "Ugyldig versjon i URL-banen." -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "Ugyldig versjon i vertsnavn." -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "Ugyldig versjon i søkeparameter." diff --git a/rest_framework/locale/nl/LC_MESSAGES/django.mo b/rest_framework/locale/nl/LC_MESSAGES/django.mo index 8b70ddbd68f7ef3424197c35c3c064fbb5abc4f5..8f9c2dcdede91e1447e0c78de83f7534d2561ac5 100644 GIT binary patch delta 3697 zcmZvddu$ZP8NkQ!E4*wtZ6&Hs8nsoTRw1g=s7-{NwnBZV;*Ug4o22ERKJsq*Ql-%R;Yd^>Re#^!6=>Sg zefyi4o&9FM*W7En9=~_?ok-c&6fJ?YAU&l@orC);c+e(pSE>y@2rX#f9q=U>g@1qz z@Sjk=k1SBC8Lov3;Xc>_M`0X31}ou3xI?K~b&1X(6W5Cz;HzDXzX9eR8MqI=1N&h6;=+3k_cMMPu7rPw5m>dPaKJVw^LK}wRcefmDEtE4053y+>KYF@ zX+>4R;wmT`^}tQggWKS9Z~*=dcEWfyo52U5tQ&`)fft~7@>j4OUWH58Uo|dOY8_ky zMZsaX2cCs@!QVhpSiMZCCK!b>-VDW(-B4VgE%ID({yVUg`B$NM;B_b=dmoA(nVek% zo9WcS0cgP^um+xiW$-*C3hD{C7Jds7ZuLfyzk~eL`#eO?Je2fVgpzs~fiiA~>tGj@ z5RcUme>wT{#f7gx8NUl9iLS$5*s#11+aW09vrsJf8I*OuhZg)8$^q+Y!{kzfu$=KZ zC+|8OZ^9QB#Y;uWdCoWc%-7O zu&@h?X9i#o44@q7yKob{3dNOcVoI%oo1koPtT^_dxc&)7q(Zun&=G5?)UcQFqeWhV5`vGQ7_fSE;o$ucC#e%q zlJ^mK5WWOw%juM3W(8aX#li>_mv4nhn1gb_D-h$W> zBUEviGazi@J<*4^#QuVt!VVAdfHYA=M8YNswHHBe*zV)G2a&^zha_Jp2-S~>Wzyt8 zJHuWfksqLc0vSZ)4iE#w{l$V>gzG*mDZCf90iIH7V@L$qg-AP4Kb|~j3Ckoy}B2f-6|v6UC8}m@8)A0UCG>)#i?UZ@`St$+jgFk zkkaI@Sz0F|$tO+9QxaM30cpFD>abTxM7kx)yjsy@E?30OYZdin6Lyd`A5=VCVU2hh z?V6*NM=J+>Z3j9z_oK@G(waR7r+O^Uw_vYjCzHO;o4+jluy)YV*`#&K$p+fbtHA>2 zt}Lp(t<+9w^VX8DM;v#`&N@jek+yw1A?wVNss=Ms^+D-AecJR^_cVCEwt}?nT4xg8 zq#HbBIf2gQJ3CFP`iIMg{G|3BH>D2R`TVr!Cr!)J_$qDtiL@FHq%HKr|{n+Q&Ks*$vlxAHox6M^Ho|Fgi9MnQ8-?ejEjfT7CCQ*;tf{}ZNhYpxz&H05JJG$0eUA=u>-R6^; z==Q>JLtj_Vo$F`|_uKiPW5l=JeAW&;zt0*;dpSFA4WxaJ>u76h;N|*}L~&y7=}{yJ zF?X`zCuM2ROPSWjRg2RYk=FVYrub%mdz8EW0KW^My5;yaW zZB<$F&B_P9))V6-XKPcmUb3~P!}3mrY1?5-)>@8h;!Oj`0}=s0B}wr(!MA-Y!>6em zlYx`Nxue>jwiD^#meum&|9)}nYV+%+=7l%4ntwG#V?`ZVXI%0T6T>9GRTaw`y0Xbn zRg)UR;}T76*|$a~rBixJyLof5IcmPqys5IIkR9f!=2mmAWodcVOJVGimbQ`(v$mz( z9BJ8Oo^82WZZmD0$5$LOZ?5QzcsI0XsLu@bX_}+W=93jK@Y(mGE6QBk&Y2gZb>>ge zWnsn6M+etyLV*82U9g?%9uLc6lf@c|S@<|MA%$y>x5k%ssvSBX*lsc}TCI#{zS%lC zJM8&^DD)=Oed6tDk1D6^SgLb5De#n@);Pc?n@PYa-?mfMH03fyrUg!hOg`f2j2h9I zd{FR$BnTeQlCEK3X0)3mzjsooIFnPIIVD%u2`br4SkIJF4;Sj&O3K6Vm~Cx!i}eio zRJb3sOqiOORl$a=G<~sS|9v?;8S5_5=3*pj{u(F<|`2Fo$5ECam?=!RSn3>=F z-h2GcGd&|;g>HCOQPxr`se8vMHH24g;6OQgqf#~aDr)=~BlrW(z=`?6eYIFYzY801 zGuGoMF2j@9jeq4_R-jamQX}eV8l9XthxcHpP^mU_@m72p*Wg9$z?+ML^8?sR|9K4I z_b3avf-|vfV&H8k&v9@8zJRmvJa#a?x=f>;KW@26sil~}<#-$$@mHLTdQx!Re4Imn z5G67Pa4wEv6Mltq-xO}T4VR$Y{|JY29L@EQ;7rC>CuqpbKhODxoS#~)E5R5dlYuL;BSdvHW%yoCmPq4uLp$Blk1;AS=kRL1LiZD?0Fl`!`;}7M{py4hGp1NO#G$M%k*1t8@`{X z)M1p6K2Q>bcoa4Ll!^X=)i{Z8$UqG!&)JA~<6gWAzs5dnWmV!+D9Ly+O#Ii= zs3nzU?=yHip1{rcCwAfnW+@&ibWdc1YE019l9>O*F0m?wrc{LK#juhqk<8T>uF_n*~8c&r{O_ki?Eo{jq-x4|@sw9x?r6ihsU>d0< zRLNv{J0#J1ZK7b6y-<+0_Z8kdcB*jccw0H?!r0`=)5qDSsrzjHwD;`UX|1+0G-kgE z&9lYD;j!l8<9W8C#IpxWPTPA+o9t_)`-)l{nwoWUdq-=#?FvV_f^Hk#c}szYyZcDN>`*QExM4`z1h#SbNeR%hJxk~>^y?4|JRygY5+pHW}5!-;3i zo~U*`8!4N`pUca-ONZlb|DfNfx-$Nt@qD-6@m-_s@v=_)Sah1rFK@A*mPhUS@}qgX z?d9?XlViqr;&J0?hx?2@S5adND#CV8MSl3&som~&k72Z*^c^Q|_g5?|xO&c>sW?48 z!4&pY))pp`3C1)gZr`e$Z-1-oxREmhCS`A}T4Xa-HQ|i((*4Pl(aCK(?Wc?x-fq(N z^Qz@5wP6wij&JH^sNuNd_-Q@F6|rk)d^cg#JtnnN=K7z1ue--?iImyhk&5E~d5V28 z60vVbN<063uD@&8=;*_)H=OaeNGBW7-1v=Zofk9l0XJr}bA3c@b6v3=te$SWtJ{hE zNOcFtQ`I#bzpS3iae`jOajpKzuB}-~>tIcXEr}kabu3ynL3@squ&+l;?RRX-rRa*< zqzM)jjhU^fj5|b_TzR^ugE zuRS_@vkld?*fS*&+h4b#J&`03?)D+g?xixrzK)rc;|%%rs^{8_$)Wya#`9$e*K_(w ay>0gIy4uicqX*4axrgP*{2XiM=zjnVslP`6 diff --git a/rest_framework/locale/nl/LC_MESSAGES/django.po b/rest_framework/locale/nl/LC_MESSAGES/django.po index b89af0606..6b9dd127b 100644 --- a/rest_framework/locale/nl/LC_MESSAGES/django.po +++ b/rest_framework/locale/nl/LC_MESSAGES/django.po @@ -3,14 +3,17 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Hans van Luttikhuizen , 2016 # mikedingjan , 2015 +# mikedingjan , 2015 +# Hans van Luttikhuizen , 2016 msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Dutch (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,78 +21,78 @@ msgstr "" "Language: nl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." -msgstr "Ongeldige basic header. Geen login gegevens opgegeven." +msgstr "Ongeldige basic header. Geen logingegevens opgegeven." -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." -msgstr "Ongeldige basic header. login gegevens kunnen geen spaties bevatten." +msgstr "Ongeldige basic header. logingegevens kunnen geen spaties bevatten." -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." -msgstr "Ongeldige basic header. login gegevens zijn niet correct base64 versleuteld." +msgstr "Ongeldige basic header. logingegevens zijn niet correct base64-versleuteld." -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "Ongeldige gebruikersnaam/wachtwoord." -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "Gebruiker inactief of verwijderd." -#: authentication.py:173 -msgid "Invalid token header. No credentials provided." -msgstr "Ongeldige token header. Geen login gegevens opgegeven" - #: authentication.py:176 +msgid "Invalid token header. No credentials provided." +msgstr "Ongeldige token header. Geen logingegevens opgegeven" + +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "Ongeldige token header. Token kan geen spaties bevatten." -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." -msgstr "" +msgstr "Ongeldige token header. Token kan geen ongeldige karakters bevatten." -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "Ongeldige token." #: authtoken/apps.py:7 msgid "Auth Token" -msgstr "" +msgstr "Autorisatietoken" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" -msgstr "" +msgstr "Key" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" -msgstr "" +msgstr "Gebruiker" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" -msgstr "" +msgstr "Aangemaakt" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" -msgstr "" +msgstr "Token" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" -msgstr "" +msgstr "Tokens" #: authtoken/serializers.py:8 msgid "Username" -msgstr "" +msgstr "Gebruikersnaam" #: authtoken/serializers.py:9 msgid "Password" -msgstr "" +msgstr "Wachtwoord" #: authtoken/serializers.py:20 msgid "User account is disabled." -msgstr "Gebruikers account is inactief." +msgstr "Gebruikersaccount is gedeactiveerd." #: authtoken/serializers.py:23 msgid "Unable to log in with provided credentials." @@ -97,11 +100,11 @@ msgstr "Kan niet inloggen met opgegeven gegevens." #: authtoken/serializers.py:26 msgid "Must include \"username\" and \"password\"." -msgstr "Moet een \"gebruikersnaam\" en \"wachtwoord\" bevatten." +msgstr "Moet \"username\" en \"password\" bevatten." #: exceptions.py:49 msgid "A server error occurred." -msgstr "Er is een server fout opgetreden." +msgstr "Er is een serverfout opgetreden." #: exceptions.py:84 msgid "Malformed request." @@ -109,248 +112,233 @@ msgstr "Ongeldig samengestelde request." #: exceptions.py:89 msgid "Incorrect authentication credentials." -msgstr "Ongeldige authenticatie gegevens." +msgstr "Ongeldige authenticatiegegevens." #: exceptions.py:94 msgid "Authentication credentials were not provided." -msgstr "Authenticatie gegevens zijn niet opgegeven." +msgstr "Authenticatiegegevens zijn niet opgegeven." #: exceptions.py:99 msgid "You do not have permission to perform this action." -msgstr "Je hebt geen toegang om deze actie uit te voeren." +msgstr "Je hebt geen toestemming om deze actie uit te voeren." #: exceptions.py:104 views.py:81 msgid "Not found." msgstr "Niet gevonden." #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "Methode \"{method}\" niet toegestaan." #: exceptions.py:120 msgid "Could not satisfy the request Accept header." -msgstr "Kan niet voldoen aan de opgegeven \"Accept\" header." +msgstr "Kan niet voldoen aan de opgegeven Accept header." #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." -msgstr "Ongeldig media type \"{media_type}\" in aanvraag." +msgstr "Ongeldige media type \"{media_type}\" in aanvraag." #: exceptions.py:145 msgid "Request was throttled." msgstr "Aanvraag was verstikt." -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." -msgstr "Dit veld is verplicht." +msgstr "Dit veld is vereist." -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "Dit veld mag niet leeg zijn." -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." -msgstr "\"{input}\" is een ongeldige boolean waarde." +msgstr "\"{input}\" is een ongeldige booleanwaarde." -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "Dit veld mag niet leeg zijn." -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "Zorg ervoor dat dit veld niet meer dan {max_length} karakters bevat." -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "Zorg ervoor dat dit veld minimaal {min_length} karakters bevat." -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "Voer een geldig e-mailadres in." -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." -msgstr "Deze waarde voldoet niet aan het benodigde formaat." +msgstr "Deze waarde voldoet niet aan het vereisde formaat." -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." -msgstr "Voer een geldige \"slug\" in bestaande uit letters, cijfers, underscore of streepjes." +msgstr "Voer een geldige \"slug\" in, bestaande uit letters, cijfers, lage streepjes of streepjes." -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "Voer een geldige URL in." -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." -msgstr "\"{value}\" in een ongeldige UUID." +msgstr "\"{value}\" is een ongeldige UUID." -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." -msgstr "" +msgstr "Voer een geldig IPv4- of IPv6-adres in." -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "Een geldig getal is vereist." -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." -msgstr "Zorg ervoor dat deze waarde minder of gelijk is aan {max_value}." +msgstr "Zorg ervoor dat deze waarde kleiner is dan of gelijk is aan {max_value}." -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." -msgstr "Zorg ervoor dat deze waarde groter of gelijk is aan {min_value}." +msgstr "Zorg ervoor dat deze waarde groter is dan of gelijk is aan {min_value}." -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." -msgstr "Tekstuele waarde is te lang." +msgstr "Tekstwaarde is te lang." -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." -msgstr "Een geldig nummer is verplicht." +msgstr "Een geldig nummer is vereist." -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." -msgstr "Zorg ervoor dat er niet meer dan {max_digits} getallen zijn in totaal." +msgstr "Zorg ervoor dat er in totaal niet meer dan {max_digits} cijfers zijn." -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." -msgstr "zorg ervoor dat er niet meer dan {max_decimal_places} getallen achter de komma zijn." +msgstr "Zorg ervoor dat er niet meer dan {max_decimal_places} cijfers achter de komma zijn." -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." -msgstr "Zorg ervoor dat er niet meer dan {max_whole_digits} getallen voor de komma zijn." +msgstr "Zorg ervoor dat er niet meer dan {max_whole_digits} cijfers voor de komma zijn." -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "Datetime heeft een ongeldig formaat, gebruik 1 van de volgende formaten: {format}." -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." -msgstr "Verwacht een datetime, in plaats kreeg een date." +msgstr "Verwachtte een datetime, maar kreeg een date." -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." -msgstr "Date heeft het verkeerde formaat, gebruik 1 van de onderstaande formaten: {format}." +msgstr "Date heeft het verkeerde formaat, gebruik 1 van deze formaten: {format}." -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." -msgstr "Verwacht een date, in plaats kreeg een datetime" +msgstr "Verwachtte een date, maar kreeg een datetime." -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "Time heeft het verkeerde formaat, gebruik 1 van onderstaande formaten: {format}." -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "Tijdsduur heeft een verkeerd formaat, gebruik 1 van onderstaande formaten: {format}." -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" is een ongeldige keuze." -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." -msgstr "" +msgstr "Meer dan {count} items..." -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." -msgstr "Verwacht een lijst met items, kreeg een type \"{input_type}\" in plaats." +msgstr "Verwachtte een lijst met items, maar kreeg type \"{input_type}\"." -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." -msgstr "" +msgstr "Deze selectie mag niet leeg zijn." -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." -msgstr "" +msgstr "\"{input}\" is niet een geldig pad." -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." -msgstr "Er is geen bestand opgestuurd" +msgstr "Er is geen bestand opgestuurd." -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "De verstuurde data was geen bestand. Controleer de encoding type op het formulier." -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." -msgstr "Bestandsnaam kan niet vastgesteld worden." +msgstr "Bestandsnaam kon niet vastgesteld worden." -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "Het verstuurde bestand is leeg." -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." -msgstr "Zorg ervoor dat deze bestandsnaam minstens {max_length} karakters heeft (momenteel {length})." +msgstr "Zorg ervoor dat deze bestandsnaam hoogstens {max_length} karakters heeft (het heeft er {length})." -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." -msgstr "Upload een geldige afbeelding, de geüploade afbeelding is geen afbeelding of mogelijk corrupt geraakt," +msgstr "Upload een geldige afbeelding, de geüploade afbeelding is geen afbeelding of is beschadigd geraakt," -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." -msgstr "" +msgstr "Deze lijst mag niet leeg zijn." -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." -msgstr "Verwacht een dictionary van items, in plaats kreeg een type \"{input_type}\"." +msgstr "Verwachtte een dictionary van items, maar kreeg type \"{input_type}\"." -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." -msgstr "" +msgstr "Waarde moet valide JSON zijn." -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" +msgstr "Verzenden" + +#: filters.py:336 +msgid "ascending" msgstr "" -#: pagination.py:189 +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." -msgstr "" +msgstr "Ongeldige pagina." -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "Ongeldige cursor." #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Ongeldige pk \"{pk_value}\" - object bestaat niet." #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." -msgstr "Ongeldig type. Verwacht een pk waarde, ontving {data_type}." +msgstr "Ongeldig type. Verwacht een pk-waarde, ontving {data_type}." #: relations.py:240 msgid "Invalid hyperlink - No URL match." @@ -365,41 +353,38 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "Ongeldige hyperlink - Object bestaat niet." #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Ongeldig type. Verwacht een URL, ontving {data_type}." -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "Object met {slug_name}={value} bestaat niet." -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "Ongeldige waarde." #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "Ongeldige data. Verwacht een dictionary, kreeg een {datatype}." -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" -msgstr "" +msgstr "Filters" #: templates/rest_framework/filters/django_filter.html:2 #: templates/rest_framework/filters/django_filter_crispyforms.html:4 msgid "Field filters" -msgstr "" +msgstr "Veldfilters" #: templates/rest_framework/filters/ordering.html:3 msgid "Ordering" -msgstr "" +msgstr "Sorteer op" #: templates/rest_framework/filters/search.html:2 msgid "Search" -msgstr "" +msgstr "Zoek" #: templates/rest_framework/horizontal/radio.html:2 #: templates/rest_framework/inline/radio.html:2 @@ -413,27 +398,23 @@ msgstr "Geen" msgid "No items to select." msgstr "Geen items geselecteerd." -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "Dit veld moet uniek zijn." -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "De velden {field_names} moeten een unieke set zijn." -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "Dit veld moet uniek zijn voor de \"{date_field}\" datum." -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "Dit veld moet uniek zijn voor de \"{date_field}\" maand." -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "Dit veld moet uniek zijn voor de \"{date_field}\" year." @@ -441,18 +422,22 @@ msgstr "Dit veld moet uniek zijn voor de \"{date_field}\" year." msgid "Invalid version in \"Accept\" header." msgstr "Ongeldige versie in \"Accept\" header." -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." -msgstr "Ongeldige versie in URL pad." +msgstr "Ongeldige versie in URL-pad." -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." -msgstr "Ongeldige versie in host naam." +msgstr "Ongeldige versie in hostnaam." -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "Ongeldige versie in query parameter." #: views.py:88 msgid "Permission denied." -msgstr "Toegang niet toegestaan." +msgstr "Toestemming geweigerd." diff --git a/rest_framework/locale/nn/LC_MESSAGES/django.mo b/rest_framework/locale/nn/LC_MESSAGES/django.mo index 43d080aa67cdb810998a30d1065253dcdb605a7d..a2c1e01f8dd4127b3f67ffe9bd98d580454c2ddc 100644 GIT binary patch delta 90 zcmeBS>0y~Lnaf<)&`811%*xPs;#@gL2+!2Y&_vq+2)KL_i%WDviW2jRa}rDPi>wqv hGV*g1ixr$RiZY8!GE)_7O7e3ZfH)Z{u0y~Lnafz$z)-=^!phiU;#@gL2+thI(>4GCE}z8W65WuZ#Ju91#FG3XD}{)} ivdq*X1^=Ry{KC>o1)GX|2+JWSGcUg^GjZb|0Y(6!&K*kt diff --git a/rest_framework/locale/nn/LC_MESSAGES/django.po b/rest_framework/locale/nn/LC_MESSAGES/django.po index 26a625b6d..bd4d690d2 100644 --- a/rest_framework/locale/nn/LC_MESSAGES/django.po +++ b/rest_framework/locale/nn/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: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Norwegian Nynorsk (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/nn/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,40 +17,40 @@ msgstr "" "Language: nn\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "" -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "" -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "" @@ -58,23 +58,23 @@ msgstr "" msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -123,7 +123,6 @@ msgid "Not found." msgstr "" #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "" @@ -132,7 +131,6 @@ msgid "Could not satisfy the request Accept header." msgstr "" #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "" @@ -140,214 +138,201 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "" -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "" -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "" -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "" -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "" -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "" -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "" -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "" -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "" -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "" -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "" -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "" -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "" -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "" -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "" -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "" -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "" -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "" -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "" -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "" -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "" -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "" -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "" -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "" -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "" -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "" -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "" -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" @@ -364,25 +349,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "" #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "" #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "" -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "" @@ -412,27 +394,23 @@ msgstr "" msgid "No items to select." msgstr "" -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "" -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "" -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "" -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "" -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "" @@ -440,15 +418,19 @@ msgstr "" msgid "Invalid version in \"Accept\" header." msgstr "" -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "" -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "" -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "" diff --git a/rest_framework/locale/no/LC_MESSAGES/django.mo b/rest_framework/locale/no/LC_MESSAGES/django.mo index 730768a272bbc0c161dc6435e89bf8d700c44b64..2c058c8c754c1bcbc5fdabc169a794b53b619f26 100644 GIT binary patch delta 90 zcmZo+Xwqv hGV*g1ixr$RiZY8!GE)_7O7e3ZfH)Z{u<;KEBLJ189Pt1E delta 90 zcmZo+X4GCE}z8W65WuZ#Ju91#FG3XD}{)} ivdq*X1^=Ry{KC>o1)GX|2+JWSGcUg^GjZb|4n_c+E*&!f diff --git a/rest_framework/locale/no/LC_MESSAGES/django.po b/rest_framework/locale/no/LC_MESSAGES/django.po index 4a3d609ca..1ddd6675f 100644 --- a/rest_framework/locale/no/LC_MESSAGES/django.po +++ b/rest_framework/locale/no/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: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Norwegian (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/no/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,40 +17,40 @@ msgstr "" "Language: no\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "" -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "" -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "" @@ -58,23 +58,23 @@ msgstr "" msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -123,7 +123,6 @@ msgid "Not found." msgstr "" #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "" @@ -132,7 +131,6 @@ msgid "Could not satisfy the request Accept header." msgstr "" #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "" @@ -140,214 +138,201 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "" -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "" -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "" -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "" -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "" -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "" -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "" -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "" -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "" -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "" -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "" -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "" -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "" -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "" -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "" -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "" -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "" -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "" -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "" -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "" -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "" -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "" -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "" -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "" -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "" -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "" -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "" -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" @@ -364,25 +349,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "" #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "" #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "" -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "" @@ -412,27 +394,23 @@ msgstr "" msgid "No items to select." msgstr "" -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "" -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "" -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "" -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "" -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "" @@ -440,15 +418,19 @@ msgstr "" msgid "Invalid version in \"Accept\" header." msgstr "" -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "" -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "" -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "" diff --git a/rest_framework/locale/pl/LC_MESSAGES/django.mo b/rest_framework/locale/pl/LC_MESSAGES/django.mo index f228dfc7c72f6d5c1a7c86d8cd61ebe20b6f29e7..8af27437f01d85967413cde8c9ce0b58231f0f36 100644 GIT binary patch delta 895 zcmXZaPe_w-9LMob=@v~w(ag%)p33z{nYsB`ZI!uJ5@HT=VI&397FyZ^+q(7?lF*?b zJw^X-UHU5odFfK83cN?`)S*Llh$86H`->afUf<{YJkRgX_xpREdzpLT*7z${N?+DV z-I6Nnr6@LSkal7cx8fLX#Ov6GkC3n4^T#Wy;12wY33PaPH4bAhp21Ui53~3iPvX&5 z`8q^!w^cfUpK(8SZjv&10ng(zJc7-empzSFxPFK>aX2gysvmh&=dc5>VH}^LixoVK zYa`Mc9Etc+kf1DI%wveCLj4m(r;sEyG4YUos#a;Lhn=ncl zEuX|byo`hR+9$99Yqm*^cnsTd6zPg)aXa2e2j3xU(pR(=1?WcrJCUl&MZ2FxhL(p` zp*ge#FIMwQXyg082xFB>c>*i_8?=>w#4c3(!a(qQLuhX-o^axOQt|HjbW1qB zeA$zVyB%G8LWB8IIhHHtFO{b9Wv`fWaueQkzT{*kij$@CWWhO5_NM#zjaL&34_a#mhK`k8uQl;3y6@ z$X6f1qXy{$e#Vp7)yPe}iP!NZ4q;u>f5&i^@iN+n8-o&|hLA^f6+6+#2)@8>Ea4ff zZI-HWwAq&e1Q{j{;S>(weY}Vpcm-P=DT{MxiEQFtba|;4&tebWMccqScHnQU!&b^@ z^D*qlA|~;TPhbm{wUQMM<1rjZx}teJj7#X?J0vH4L2FTYn^b{aNLA&c-A^G)E00#8 z1+;|Mw&pj`*7v^?Y$w=B<9A~yDg(L5hjzcnN=^orNT6TMwV2E$|7croLhbE7|@q#;^isF@W=U z8t-8oKcKa68~v~ic}Ve;$96j{iv(8sw`iGv#4!HpSUnfmtf`8I!VxDDPekJn2I_-- z3}cQPNw__oVSZIfuQ(G*PkXnDId7&gop4fKX7XCr8Odb}&Z)c&rj8dF^xw#PleyJr I^^3Lt0BsO(kN^Mx diff --git a/rest_framework/locale/pl/LC_MESSAGES/django.po b/rest_framework/locale/pl/LC_MESSAGES/django.po index fdf4904bb..b8592e9b7 100644 --- a/rest_framework/locale/pl/LC_MESSAGES/django.po +++ b/rest_framework/locale/pl/LC_MESSAGES/django.po @@ -5,14 +5,14 @@ # Translators: # Janusz Harkot , 2015 # Piotr Jakimiak , 2015 -# Maciek Olko , 2015-2016 +# m_aciek , 2015-2016 msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-07 21:25+0000\n" -"Last-Translator: Maciek Olko \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Polish (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,40 +20,40 @@ msgstr "" "Language: pl\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "Niepoprawny podstawowy nagłówek. Brak danych uwierzytelniających." -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "Niepoprawny podstawowy nagłówek. Ciąg znaków danych uwierzytelniających nie powinien zawierać spacji." -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Niepoprawny podstawowy nagłówek. Niewłaściwe kodowanie base64 danych uwierzytelniających." -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "Niepoprawna nazwa użytkownika lub hasło." -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "Użytkownik nieaktywny lub usunięty." -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "Niepoprawny nagłówek tokena. Brak danych uwierzytelniających." -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "Niepoprawny nagłówek tokena. Token nie może zawierać odstępów." -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "Błędny nagłówek z tokenem. Token nie może zawierać błędnych znaków." -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "Niepoprawny token." @@ -61,23 +61,23 @@ msgstr "Niepoprawny token." msgid "Auth Token" msgstr "Token uwierzytelniający" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "Klucz" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "Użytkownik" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "Stworzono" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "Token" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "Tokeny" @@ -126,7 +126,6 @@ msgid "Not found." msgstr "Nie znaleziono." #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "Niedozwolona metoda \"{method}\"." @@ -135,7 +134,6 @@ msgid "Could not satisfy the request Accept header." msgstr "Nie można zaspokoić nagłówka Accept żądania." #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "Brak wsparcia dla żądanego typu danych \"{media_type}\"." @@ -143,214 +141,201 @@ msgstr "Brak wsparcia dla żądanego typu danych \"{media_type}\"." msgid "Request was throttled." msgstr "Żądanie zostało zdławione." -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "To pole jest wymagane." -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "Pole nie może mieć wartości null." -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "\"{input}\" nie jest poprawną wartością logiczną." -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "To pole nie może być puste." -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "Upewnij się, że to pole ma nie więcej niż {max_length} znaków." -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "Upewnij się, że pole ma co najmniej {min_length} znaków." -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "Podaj poprawny adres e-mail." -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "Ta wartość nie pasuje do wymaganego wzorca." -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "Wprowadź poprawną wartość pola typu \"slug\", składającą się ze znaków łacińskich, cyfr, podkreślenia lub myślnika." -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "Wprowadź poprawny adres URL." -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "\"{value}\" nie jest poprawnym UUID." -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "Wprowadź poprawny adres IPv4 lub IPv6." -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "Wymagana poprawna liczba całkowita." -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "Upewnij się, że ta wartość jest mniejsza lub równa {max_value}." -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "Upewnij się, że ta wartość jest większa lub równa {min_value}." -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "Za długi ciąg znaków." -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "Wymagana poprawna liczba." -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "Upewnij się, że liczba ma nie więcej niż {max_digits} cyfr." -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "Upewnij się, że liczba ma nie więcej niż {max_decimal_places} cyfr dziesiętnych." -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "Upewnij się, że liczba ma nie więcej niż {max_whole_digits} cyfr całkowitych." -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "Wartość daty z czasem ma zły format. Użyj jednego z dostępnych formatów: {format}." -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "Oczekiwano datę z czasem, otrzymano tylko datę." -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "Data ma zły format. Użyj jednego z tych formatów: {format}." -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "Oczekiwano daty a otrzymano datę z czasem." -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "Błędny format czasu. Użyj jednego z dostępnych formatów: {format}" -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "Czas trwania ma zły format. Użyj w zamian jednego z tych formatów: {format}." -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" nie jest poprawnym wyborem." -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "Więcej niż {count} elementów..." -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Oczekiwano listy elementów, a otrzymano dane typu \"{input_type}\"." -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "Zaznaczenie nie może być puste." -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "\"{input}\" nie jest poprawną ścieżką." -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "Nie przesłano pliku." -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "Przesłane dane nie były plikiem. Sprawdź typ kodowania formatki." -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "Nie można określić nazwy pliku." -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "Przesłany plik jest pusty." -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "Upewnij się, że nazwa pliku ma długość co najwyżej {max_length} znaków (aktualnie ma {length})." -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "Prześlij poprawny plik graficzny. Przesłany plik albo nie jest grafiką lub jest uszkodzony." -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "Lista nie może być pusta." -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "Oczekiwano słownika, ale otrzymano \"{input_type}\"." -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "Wartość musi być poprawnym ciągiem znaków JSON" -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "Wyślij" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "Niepoprawna strona." -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "Niepoprawny wskaźnik" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Błędny klucz główny \"{pk_value}\" - obiekt nie istnieje." #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Błędny typ danych. Oczekiwano wartość klucza głównego, otrzymano {data_type}." @@ -367,25 +352,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "Błędny hyperlink - obiekt nie istnieje." #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Błędny typ danych. Oczekiwano adresu URL, otrzymano {data_type}" -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "Obiekt z polem {slug_name}={value} nie istnieje" -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "Niepoprawna wartość." #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "Niepoprawne dane. Oczekiwano słownika, otrzymano {datatype}." -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "Filtry" @@ -415,27 +397,23 @@ msgstr "None" msgid "No items to select." msgstr "Nie wybrano wartości." -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "Wartość dla tego pola musi być unikalna." -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "Pola {field_names} muszą tworzyć unikalny zestaw." -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "To pole musi mieć unikalną wartość dla jednej daty z pola \"{date_field}\"." -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "To pole musi mieć unikalną wartość dla konkretnego miesiąca z pola \"{date_field}\"." -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "To pole musi mieć unikalną wartość dla konkretnego roku z pola \"{date_field}\"." @@ -443,15 +421,19 @@ msgstr "To pole musi mieć unikalną wartość dla konkretnego roku z pola \"{da msgid "Invalid version in \"Accept\" header." msgstr "Błędna wersja w nagłówku \"Accept\"." -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "Błędna wersja w ścieżce URL." -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "Błędna wersja w nazwie hosta." -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "Błędna wersja w parametrach zapytania." diff --git a/rest_framework/locale/pt/LC_MESSAGES/django.mo b/rest_framework/locale/pt/LC_MESSAGES/django.mo index 9553b8f7ae0e46b54d4aed4f473515eb364357ea..9e3c7ab2f490b065535b03e05a2df1c16cb38e88 100644 GIT binary patch delta 90 zcmZo=X=Rx(naf<)&`811%*xPs;#@gL2+!2Y&_vq+2)KL_i%WDviW2jRa}rDPi>wqv hGV*g1ixr$RiZY8!GE)_7O7e3ZfH)Z{u<;KkBLJ3I9P|JH delta 90 zcmZo=X=Rx(nafz$z)-=^!phiU;#@gL2+thI(>4GCE}z8W65WuZ#Ju91#FG3XD}{)} ivdq*X1^=Ry{KC>o1)GX|2+JWSGcUg^GjZb|PDTKn;vF^s diff --git a/rest_framework/locale/pt/LC_MESSAGES/django.po b/rest_framework/locale/pt/LC_MESSAGES/django.po index c1217b2d6..9f1de1938 100644 --- a/rest_framework/locale/pt/LC_MESSAGES/django.po +++ b/rest_framework/locale/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: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Portuguese (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/pt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,40 +17,40 @@ msgstr "" "Language: pt\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "" -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "" -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "" @@ -58,23 +58,23 @@ msgstr "" msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -123,7 +123,6 @@ msgid "Not found." msgstr "" #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "" @@ -132,7 +131,6 @@ msgid "Could not satisfy the request Accept header." msgstr "" #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "" @@ -140,214 +138,201 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "" -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "" -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "" -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "" -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "" -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "" -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "" -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "" -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "" -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "" -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "" -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "" -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "" -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "" -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "" -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "" -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "" -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "" -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "" -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "" -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "" -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "" -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "" -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "" -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "" -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "" -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "" -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" @@ -364,25 +349,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "" #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "" #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "" -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "" @@ -412,27 +394,23 @@ msgstr "" msgid "No items to select." msgstr "" -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "" -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "" -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "" -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "" -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "" @@ -440,15 +418,19 @@ msgstr "" msgid "Invalid version in \"Accept\" header." msgstr "" -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "" -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "" -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "" diff --git a/rest_framework/locale/pt_BR/LC_MESSAGES/django.mo b/rest_framework/locale/pt_BR/LC_MESSAGES/django.mo index 20a41eb1f7bbc11f247fe8dd8755893c878296d4..1dd7287f36ab955d7ab8281100108cc84f22c8dd 100644 GIT binary patch delta 93 zcmez8|IdGenHZP3uAz~Fp_!GT@ni=vIY$WB)XLCA+W-i-d=iUGbVG^~^NMp4OY)1X k6hboca}$ddoHL3ti%T+76>LiKa~*&<87i=OzF52<03}-#c&9&-Qy diff --git a/rest_framework/locale/pt_BR/LC_MESSAGES/django.po b/rest_framework/locale/pt_BR/LC_MESSAGES/django.po index 8b55e9ed9..2c90f14ca 100644 --- a/rest_framework/locale/pt_BR/LC_MESSAGES/django.po +++ b/rest_framework/locale/pt_BR/LC_MESSAGES/django.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,40 +21,40 @@ msgstr "" "Language: pt_BR\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "Cabeçalho básico inválido. Credenciais não fornecidas." -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "Cabeçalho básico inválido. String de credenciais não deve incluir espaços." -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Cabeçalho básico inválido. Credenciais codificadas em base64 incorretamente." -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "Usuário ou senha inválido." -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "Usuário inativo ou removido." -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "Cabeçalho de token inválido. Credenciais não fornecidas." -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "Cabeçalho de token inválido. String de token não deve incluir espaços." -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "Cabeçalho de token inválido. String de token não deve possuir caracteres inválidos." -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "Token inválido." @@ -62,23 +62,23 @@ msgstr "Token inválido." msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -127,7 +127,6 @@ msgid "Not found." msgstr "Não encontrado." #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "Método \"{method}\" não é permitido." @@ -136,7 +135,6 @@ msgid "Could not satisfy the request Accept header." msgstr "Não foi possível satisfazer a requisição do cabeçalho Accept." #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "Tipo de mídia \"{media_type}\" no pedido não é suportado." @@ -144,214 +142,201 @@ msgstr "Tipo de mídia \"{media_type}\" no pedido não é suportado." msgid "Request was throttled." msgstr "Pedido foi limitado." -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "Este campo é obrigatório." -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "Este campo não pode ser nulo." -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "\"{input}\" não é um valor boleano válido." -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "Este campo não pode ser em branco." -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "Certifique-se de que este campo não tenha mais de {max_length} caracteres." -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "Certifique-se de que este campo tenha mais de {min_length} caracteres." -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "Insira um endereço de email válido." -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "Este valor não corresponde ao padrão exigido." -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "Entrar um \"slug\" válido que consista de letras, números, sublinhados ou hífens." -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "Entrar um URL válido." -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "\"{value}\" não é um UUID válido." -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "Informe um endereço IPv4 ou IPv6 válido." -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "Um número inteiro válido é exigido." -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "Certifique-se de que este valor seja inferior ou igual a {max_value}." -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "Certifque-se de que este valor seja maior ou igual a {min_value}." -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "Valor da string é muito grande." -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "Um número válido é necessário." -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "Certifique-se de que não haja mais de {max_digits} dígitos no total." -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "Certifique-se de que não haja mais de {max_decimal_places} casas decimais." -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "Certifique-se de que não haja mais de {max_whole_digits} dígitos antes do ponto decimal." -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "Formato inválido para data e hora. Use um dos formatos a seguir: {format}." -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "Necessário uma data e hora mas recebeu uma data." -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "Formato inválido para data. Use um dos formatos a seguir: {format}." -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "Necessário uma data mas recebeu uma data e hora." -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "Formato inválido para Tempo. Use um dos formatos a seguir: {format}." -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "Formato inválido para Duração. Use um dos formatos a seguir: {format}." -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" não é um escolha válido." -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "Mais de {count} itens..." -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Necessário uma lista de itens, mas recebeu tipo \"{input_type}\"." -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "Esta seleção não pode estar vazia." -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "\"{input}\" não é uma escolha válida para um caminho." -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "Nenhum arquivo foi submetido." -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "O dado submetido não é um arquivo. Certifique-se do tipo de codificação no formulário." -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "Nome do arquivo não pode ser determinado." -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "O arquivo submetido está vázio." -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "Certifique-se de que o nome do arquivo tem menos de {max_length} caracteres (tem {length})." -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "Fazer upload de uma imagem válida. O arquivo enviado não é um arquivo de imagem ou está corrompido." -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "Esta lista não pode estar vazia." -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "Esperado um dicionário de itens mas recebeu tipo \"{input_type}\"." -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "Valor devo ser JSON válido." -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "Enviar" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "Cursor inválido" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Pk inválido \"{pk_value}\" - objeto não existe." #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Tipo incorreto. Esperado valor pk, recebeu {data_type}." @@ -368,25 +353,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "Hyperlink inválido - Objeto não existe." #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Tipo incorreto. Necessário string URL, recebeu {data_type}." -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "Objeto com {slug_name}={value} não existe." -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "Valor inválido." #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "Dado inválido. Necessário um dicionário mas recebeu {datatype}." -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "Filtra" @@ -416,27 +398,23 @@ msgstr "Nenhum(a/as)" msgid "No items to select." msgstr "Nenhum item para escholher." -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "Esse campo deve ser único." -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "Os campos {field_names} devem criar um set único." -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "O campo \"{date_field}\" deve ser único para a data." -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "O campo \"{date_field}\" deve ser único para o mês." -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "O campo \"{date_field}\" deve ser único para o ano." @@ -444,15 +422,19 @@ msgstr "O campo \"{date_field}\" deve ser único para o ano." msgid "Invalid version in \"Accept\" header." msgstr "Versão inválida no cabeçalho \"Accept\"." -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "Versão inválida no caminho de URL." -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "Versão inválida no hostname." -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "Versão inválida no parâmetro de query." diff --git a/rest_framework/locale/pt_PT/LC_MESSAGES/django.mo b/rest_framework/locale/pt_PT/LC_MESSAGES/django.mo index 82403c3cad8a9408909e20cbf276b8692e5b2af6..754e181547eb0e92090f8f04a285eb70141ebb66 100644 GIT binary patch delta 90 zcmbQnGL2=zWG-`ELn8%4Gb=;miF4%~Av{wnLlbQSAmH*zEH2RvDN4*M&PgoEFS1ey h$;i)5ELL#ND9S7@$xKzSDap@u0ODk*z{WpPi~yoc9VY+) delta 90 zcmbQnGL2=zWG-V}149Kv3oB!biF4%~Av|*+PulKW\n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/pt_PT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,40 +17,40 @@ msgstr "" "Language: pt_PT\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "" -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "" -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "" @@ -58,23 +58,23 @@ msgstr "" msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -123,7 +123,6 @@ msgid "Not found." msgstr "" #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "" @@ -132,7 +131,6 @@ msgid "Could not satisfy the request Accept header." msgstr "" #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "" @@ -140,214 +138,201 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "" -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "" -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "" -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "" -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "" -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "" -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "" -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "" -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "" -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "" -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "" -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "" -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "" -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "" -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "" -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "" -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "" -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "" -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "" -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "" -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "" -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "" -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "" -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "" -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "" -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "" -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "" -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" @@ -364,25 +349,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "" #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "" #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "" -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "" @@ -412,27 +394,23 @@ msgstr "" msgid "No items to select." msgstr "" -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "" -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "" -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "" -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "" -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "" @@ -440,15 +418,19 @@ msgstr "" msgid "Invalid version in \"Accept\" header." msgstr "" -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "" -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "" -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "" diff --git a/rest_framework/locale/ro/LC_MESSAGES/django.mo b/rest_framework/locale/ro/LC_MESSAGES/django.mo index 77dc7d0f23fce6a90c9cf8c60fa31fd568372e46..5a113ab72d84c7bb47d55264e7b4a938aa00e46b 100644 GIT binary patch literal 10895 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, 2016 msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Romanian (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/ro/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,441 +18,423 @@ msgstr "" "Language: ro\n" "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." -msgstr "" +msgstr "Antet de bază invalid. Datele de autentificare nu au fost furnizate." -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." -msgstr "" +msgstr "Antet de bază invalid. Şirul de caractere cu datele de autentificare nu trebuie să conțină spații." -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." -msgstr "" +msgstr "Antet de bază invalid. Datele de autentificare nu au fost corect codificate în base64." -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." -msgstr "" +msgstr "Nume utilizator / Parolă invalid(ă)." -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." -msgstr "" - -#: authentication.py:173 -msgid "Invalid token header. No credentials provided." -msgstr "" +msgstr "Utilizator inactiv sau șters." #: authentication.py:176 -msgid "Invalid token header. Token string should not contain spaces." -msgstr "" +msgid "Invalid token header. No credentials provided." +msgstr "Antet token invalid. Datele de autentificare nu au fost furnizate." -#: authentication.py:182 +#: authentication.py:179 +msgid "Invalid token header. Token string should not contain spaces." +msgstr "Antet token invalid. Şirul de caractere pentru token nu trebuie să conțină spații." + +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." -msgstr "" +msgstr "Antet token invalid. Şirul de caractere pentru token nu trebuie să conțină caractere nevalide." -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." -msgstr "" +msgstr "Token nevalid." #: authtoken/apps.py:7 msgid "Auth Token" -msgstr "" +msgstr "Token de autentificare" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" -msgstr "" +msgstr "Cheie" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" -msgstr "" +msgstr "Utilizator" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" -msgstr "" +msgstr "Creat" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" -msgstr "" +msgstr "Token" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" -msgstr "" +msgstr "Tokenuri" #: authtoken/serializers.py:8 msgid "Username" -msgstr "" +msgstr "Nume de utilizator" #: authtoken/serializers.py:9 msgid "Password" -msgstr "" +msgstr "Parola" #: authtoken/serializers.py:20 msgid "User account is disabled." -msgstr "" +msgstr "Contul de utilizator este dezactivat." #: authtoken/serializers.py:23 msgid "Unable to log in with provided credentials." -msgstr "" +msgstr "Nu se poate conecta cu datele de conectare furnizate." #: authtoken/serializers.py:26 msgid "Must include \"username\" and \"password\"." -msgstr "" +msgstr "Trebuie să includă \"numele de utilizator\" și \"parola\"." #: exceptions.py:49 msgid "A server error occurred." -msgstr "" +msgstr "A apărut o eroare pe server." #: exceptions.py:84 msgid "Malformed request." -msgstr "" +msgstr "Cerere incorectă." #: exceptions.py:89 msgid "Incorrect authentication credentials." -msgstr "" +msgstr "Date de autentificare incorecte." #: exceptions.py:94 msgid "Authentication credentials were not provided." -msgstr "" +msgstr "Datele de autentificare nu au fost furnizate." #: exceptions.py:99 msgid "You do not have permission to perform this action." -msgstr "" +msgstr "Nu aveți permisiunea de a efectua această acțiune." #: exceptions.py:104 views.py:81 msgid "Not found." -msgstr "" +msgstr "Nu a fost găsit(ă)." #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." -msgstr "" +msgstr "Metoda \"{method}\" nu este permisa." #: exceptions.py:120 msgid "Could not satisfy the request Accept header." -msgstr "" +msgstr "Antetul Accept al cererii nu a putut fi îndeplinit." #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." -msgstr "" +msgstr "Cererea conține tipul media neacceptat \"{media_type}\"" #: exceptions.py:145 msgid "Request was throttled." -msgstr "" +msgstr "Cererea a fost gâtuită." -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." -msgstr "" +msgstr "Acest câmp este obligatoriu." -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." -msgstr "" +msgstr "Acest câmp nu poate fi nul." -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." -msgstr "" +msgstr "\"{input}\" nu este un boolean valid." -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." -msgstr "" +msgstr "Acest câmp nu poate fi gol." -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." -msgstr "" +msgstr "Asigurați-vă că acest câmp nu are mai mult de {max_length} caractere." -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." -msgstr "" +msgstr "Asigurați-vă că acest câmp are cel puțin{min_length} caractere." -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." -msgstr "" +msgstr "Introduceți o adresă de email validă." -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." -msgstr "" +msgstr "Această valoare nu se potrivește cu şablonul cerut." -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." -msgstr "" +msgstr "Introduceți un \"slug\" valid format din litere, numere, caractere de subliniere sau cratime." -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." -msgstr "" +msgstr "Introduceți un URL valid." -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." -msgstr "" +msgstr "\"{value}\" nu este un UUID valid." -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." -msgstr "" +msgstr "Introduceți o adresă IPv4 sau IPv6 validă." -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." -msgstr "" +msgstr "Este necesar un întreg valid." -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." -msgstr "" +msgstr "Asigurați-vă că această valoare este mai mică sau egală cu {max_value}." -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." -msgstr "" +msgstr "Asigurați-vă că această valoare este mai mare sau egală cu {min_value}." -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." -msgstr "" +msgstr "Valoare șir de caractere prea mare." -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." -msgstr "" +msgstr "Este necesar un număr valid." -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." -msgstr "" +msgstr "Asigurați-vă că nu există mai mult de {max_digits} cifre în total." -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." -msgstr "" +msgstr "Asigurați-vă că nu există mai mult de {max_decimal_places} zecimale." -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." -msgstr "" +msgstr "Asigurați-vă că nu există mai mult de {max_whole_digits} cifre înainte de punctul zecimal." -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." -msgstr "" +msgstr "Câmpul datetime are format greșit. Utilizați unul dintre aceste formate în loc: {format}." -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." -msgstr "" +msgstr "Se aștepta un câmp datetime, dar s-a primit o dată." -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." -msgstr "" +msgstr "Data are formatul greșit. Utilizați unul dintre aceste formate în loc: {format}." -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." -msgstr "" +msgstr "Se aștepta o dată, dar s-a primit un câmp datetime." -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." -msgstr "" +msgstr "Timpul are formatul greșit. Utilizați unul dintre aceste formate în loc: {format}." -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." -msgstr "" +msgstr "Durata are formatul greșit. Utilizați unul dintre aceste formate în loc: {format}." -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." -msgstr "" +msgstr "\"{input}\" nu este o opțiune validă." -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." -msgstr "" +msgstr "Mai mult de {count} articole ..." -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." -msgstr "" +msgstr "Se aștepta o listă de elemente, dar s-a primit tip \"{input_type}\"." -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." -msgstr "" +msgstr "Această selecție nu poate fi goală." -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." -msgstr "" +msgstr "\"{input}\" nu este o cale validă." -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." -msgstr "" +msgstr "Nici un fișier nu a fost sumis." -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." -msgstr "" +msgstr "Datele prezentate nu sunt un fișier. Verificați tipul de codificare de pe formular." -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." -msgstr "" +msgstr "Numele fișierului nu a putut fi determinat." -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." -msgstr "" +msgstr "Fișierul sumis este gol." -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." -msgstr "" +msgstr "Asigurați-vă că acest nume de fișier are cel mult {max_length} caractere (momentan are {length})." -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." -msgstr "" +msgstr "Încărcați o imagine validă. Fișierul încărcat a fost fie nu o imagine sau o imagine coruptă." -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." -msgstr "" +msgstr "Această listă nu poate fi goală." -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." -msgstr "" +msgstr "Se aștepta un dicționar de obiecte, dar s-a primit tipul \"{input_type}\"." -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." -msgstr "" +msgstr "Valoarea trebuie să fie JSON valid." -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" +msgstr "Sumiteţi" + +#: filters.py:336 +msgid "ascending" msgstr "" -#: pagination.py:189 +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." -msgstr "" +msgstr "Pagină nevalidă." -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" -msgstr "" +msgstr "Cursor nevalid" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." -msgstr "" +msgstr "Pk \"{pk_value}\" nevalid - obiectul nu există." #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." -msgstr "" +msgstr "Tip incorect. Se aștepta un pk, dar s-a primit \"{data_type}\"." #: relations.py:240 msgid "Invalid hyperlink - No URL match." -msgstr "" +msgstr "Hyperlink nevalid - Nici un URL nu se potrivește." #: relations.py:241 msgid "Invalid hyperlink - Incorrect URL match." -msgstr "" +msgstr "Hyperlink nevalid - Potrivire URL incorectă." #: relations.py:242 msgid "Invalid hyperlink - Object does not exist." -msgstr "" +msgstr "Hyperlink nevalid - Obiectul nu există." #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." -msgstr "" +msgstr "Tip incorect. Se aștepta un URL, dar s-a primit \"{data_type}\"." + +#: relations.py:401 +msgid "Object with {slug_name}={value} does not exist." +msgstr "Obiectul cu {slug_name}={value} nu există." #: relations.py:402 -#, python-brace-format -msgid "Object with {slug_name}={value} does not exist." -msgstr "" - -#: relations.py:403 msgid "Invalid value." -msgstr "" +msgstr "Valoare nevalidă." #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." -msgstr "" +msgstr "Date nevalide. Se aștepta un dicționar de obiecte, dar s-a primit \"{datatype}\"." -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" -msgstr "" +msgstr "Filtre" #: templates/rest_framework/filters/django_filter.html:2 #: templates/rest_framework/filters/django_filter_crispyforms.html:4 msgid "Field filters" -msgstr "" +msgstr "Filtre câmpuri" #: templates/rest_framework/filters/ordering.html:3 msgid "Ordering" -msgstr "" +msgstr "Ordonare" #: templates/rest_framework/filters/search.html:2 msgid "Search" -msgstr "" +msgstr "Căutare" #: templates/rest_framework/horizontal/radio.html:2 #: templates/rest_framework/inline/radio.html:2 #: templates/rest_framework/vertical/radio.html:2 msgid "None" -msgstr "" +msgstr "Nici unul/una" #: 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 "" +msgstr "Nu există elemente pentru a fi selectate." -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." -msgstr "" +msgstr "Acest câmp trebuie să fie unic." -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." -msgstr "" +msgstr "Câmpurile {field_names} trebuie să formeze un set unic." -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." -msgstr "" +msgstr "Acest câmp trebuie să fie unic pentru data \"{date_field}\"." -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." -msgstr "" +msgstr "Acest câmp trebuie să fie unic pentru luna \"{date_field}\"." -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." -msgstr "" +msgstr "Acest câmp trebuie să fie unic pentru anul \"{date_field}\"." #: versioning.py:42 msgid "Invalid version in \"Accept\" header." -msgstr "" +msgstr "Versiune nevalidă în antetul \"Accept\"." -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." +msgstr "Versiune nevalidă în calea URL." + +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." msgstr "" -#: versioning.py:144 +#: versioning.py:147 msgid "Invalid version in hostname." -msgstr "" +msgstr "Versiune nevalidă în numele de gazdă." -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." -msgstr "" +msgstr "Versiune nevalid în parametrul de interogare." #: views.py:88 msgid "Permission denied." -msgstr "" +msgstr "Permisiune refuzată." diff --git a/rest_framework/locale/ru/LC_MESSAGES/django.mo b/rest_framework/locale/ru/LC_MESSAGES/django.mo index ac67f09a3be91baa792881c22e91fe1d9dac66f8..be0620a3328bfbfca68e546d34b94bbe152402ca 100644 GIT binary patch delta 3379 zcmZYAe^8Xi8Nl%c6a)kUgkRCpkhQLh=NiRlh}iM6HbpiygPKP(*kNW z22xtrG-)%b)&7_^GjWIq6I8%zC(}%I%=>00GiftT>!g{ z_WkU>_ulTayU%<4Y0uxg`aa5=_L8D>QfE_ZQj|K4O{rWcJu{Rl#e=BPU>T0$9Q-{N z<6V^R=cOw(3zuOAZo>*}$EA1z)9_8)s8pZ2Ok*=QzDn4@w;Jicfa~!+Y{&derB>m7 zd;~AxHv9M~ZN?W-w(vt-j2`ys0Pe;^ zcpcB+YN9@hH<7VbBM-~>11PW86?_ao!CLfivmQH8em5@Q3<>RX8Z1VAiA(VzGDKd( zMwGKUgc9*ZT#N5x1?KUv9MyUx?^H8BiXF(})p?wWZzHFq-a|>czhVZ?V~}OCH5D{? zW7N}l7<=#u{1gdZZ6q2=mH^61&Y}c(lgl3bCq9L3WSaCxa1EyOu1UZRC=>UiBJ{;%S%d58AH%u$Yutbz;|?sVQ7Q>#3<)Hk znn}G^WUO>58zFJTx5I64VGOrOQpvGMk%WAlDv2sZRcyU(Ofwd^&~Z!DrFXRx2&I6)h#Jpi>Q)Ba*k3Sph|Lmo!UuFqe>~I=DMwa zU#8J~hAKzdM3tOrrq)rtR8GbH%>Xx{cVeF;h?I3yNxJ_m^>hlU^Ak6p##E}jZc^mT zXS=QVn<7ne(fxgp_G)S?b(?f3Tc|m1EB-4=)3l^En%>l+X+7R(ml;g`)(pKXbifL# z4W>S`#LP|Gkk$~kyiv<%_N5KZ*wh>LM*X3n>B+5+eU=tX&fmJ@P>l|SHP&jc&lk2L zrZM9$1)Kd=z^9+}2clLuqBh5kt;j4$PVqixnRQvOquo?+u#@_1XzcJqV0VgIU% z>gBq+wyt`Gr>eTDDq}}WMXPnlFYBn-#Ie-rI!wU&W5fq>+oB8Z8X%qp4yqX5&K^Liez)Npr+)SbKE&*kJ%I29<`^m zbHX06FWXn`5p%uZlkyAplzoLyC$&A2cyN-($9Zg=4@R7mIIhf{IoiBkcs%nw&%eb$ zBle`3DDs$tMemrYq6OF-TT^^9Wz{HyU3LZ-;}WCD#8;gmd(s)SFEfQb>h#-V&Vb}s zjb`Yp_PCpCX78+pvEtchlFEN7cby^UnA7hJYWo@!UX?MG{a>G$>N&-+Up;&`Wx+Lu z9Ff`LGZFK!mH^z_lLT>+wT{d$Fx%&*#%`C^BqdFnW?hu+4Dgi+zQ_d5pvj#-D>gDO zGdb;tbid=AGM5*$R=nZPJs}&!TBhtv+J4i0e#m*=9@EY#KAE_e%_hCHj9$pA5X%KWUXz4@Gc;0((#*;iPC+m*BEmzg<@ab=%ldD3Nv zlzo;bWTD6HYnoFTv1Kd9oYNAnxm#9~&WL<{z`kNU3zz5qh$Y}nej>}I%par&8i!Aj3mE&ibJezqw4e$yF@r7r1DGVgkd%n8rX^jGW&XW0DM hQ<9_Xm+eX7l{In>rfE@$xn7i?I-%Y7A!}*dzW}AZ2VDRF delta 1917 zcmZA1Uu;uV9Ki9@vaMTj8~fME){R@Yf&0_0TL&v;vOkK04P;x${xHaBT$O2A-P&!A z8S5U9WC_uDV326UglM8fiCm%)@j(btiP?)jmqM_%9|HzrWl1pugnwbI!eO z?>WEUx##!8-wr3gDa<&fh#s1o7PTuC!7CYj5Pexnd9WW1jAJF9#Cy?1`Q7JOjz6Lo zGaX7bU;w-D5I&6Oup4h66lH{QiU>~W?h za1g5)A5Hrz%Ku!&&GUFhcdDkL2oO5aGJtn3U*s?Xylyn!yf zg9hg0E5)Kz9X8@-l=~4Z#b;0^b`mA!*HNC6yDoLV4wG`Bi;mQ847cC{N~$lW$G1^d z;3-Hws12p2QLM)c*o0r>2<9^T_4s(&MQmpLG7hl6R&a>1r-c0Pq%&WVs>xMsWPBH; zBwm&y6FGuA@O2!;pKu1dS>{pv2$o3@8TBx1KZKZmwRy% z`Kh{$4R{MBvq@)7YDQhy#)Szi#y4;~euz@rzfelk!1U+v0FL07Sc^V(sBF?ngBZn+@fz;LW9+yNT){rfXE`B`$-&>o`o(Eg1IeI$FAzL_1@`*Vi$2RTdTl5^6o-MKf-yu4z&_OCmk9R=6) zNu)lef}ucAca~OmriQHy>-~gtcQ~H#?wbxz#-rgxY&v8Nhi4}u)5hNE@z~VN zywUb_EY<6XPE5vTC&K1yr2)IHD*H~aR(td#<%@d2U8^(QpX$ZR3UjpLoi%#FQ*1uw zdC6vas`4}RCpCp;bW^KM8#Q(2q1qR0`p>#PJy(BL_c!$GUmBXV&+9j*ykFS0>Ho?+ P*YvDShXPA_V@uyZH5&6| diff --git a/rest_framework/locale/ru/LC_MESSAGES/django.po b/rest_framework/locale/ru/LC_MESSAGES/django.po index 980a9e5b4..b73270906 100644 --- a/rest_framework/locale/ru/LC_MESSAGES/django.po +++ b/rest_framework/locale/ru/LC_MESSAGES/django.po @@ -5,14 +5,15 @@ # Translators: # Kirill Tarasenko, 2015 # koodjo , 2015 -# Mikhail Dmitriev , 2015 +# Mike TUMS , 2015 +# Sergei Sinitsyn , 2016 msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Russian (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,74 +21,74 @@ msgstr "" "Language: ru\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:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "Недопустимый заголовок. Не предоставлены учетные данные." -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "Недопустимый заголовок. Учетные данные не должны содержать пробелов." -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Недопустимый заголовок. Учетные данные некорректно закодированны в base64." -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "Недопустимые имя пользователя или пароль." -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "Пользователь неактивен или удален." -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "Недопустимый заголовок токена. Не предоставлены учетные данные." -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "Недопустимый заголовок токена. Токен не должен содержать пробелов." -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." -msgstr "" +msgstr "Недопустимый заголовок токена. Токен не должен содержать недопустимые символы." -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "Недопустимый токен." #: authtoken/apps.py:7 msgid "Auth Token" -msgstr "" +msgstr "Токен аутентификации" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" -msgstr "" +msgstr "Ключ" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" -msgstr "" +msgstr "Пользователь" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" -msgstr "" +msgstr "Создан" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" -msgstr "" +msgstr "Токен" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" -msgstr "" +msgstr "Токены" #: authtoken/serializers.py:8 msgid "Username" -msgstr "" +msgstr "Имя пользователя" #: authtoken/serializers.py:9 msgid "Password" -msgstr "" +msgstr "Пароль" #: authtoken/serializers.py:20 msgid "User account is disabled." @@ -126,7 +127,6 @@ msgid "Not found." msgstr "Не найдено." #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "Метод \"{method}\" не разрешен." @@ -135,7 +135,6 @@ msgid "Could not satisfy the request Accept header." msgstr "Невозможно удовлетворить \"Accept\" заголовок запроса." #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "Неподдерживаемый тип данных \"{media_type}\" в запросе." @@ -143,214 +142,201 @@ msgstr "Неподдерживаемый тип данных \"{media_type}\" в msgid "Request was throttled." msgstr "Запрос был проигнорирован." -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "Это поле обязательно." -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "Это поле не может быть null." -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "\"{input}\" не является корректным булевым значением." -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "Это поле не может быть пустым." -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "Убедитесь что в этом поле не больше {max_length} символов." -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "Убедитесь что в этом поле как минимум {min_length} символов." -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "Введите корректный адрес электронной почты." -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "Значение не соответствует требуемому паттерну." -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "Введите корректный \"slug\", состоящий из букв, цифр, знаков подчеркивания или дефисов." -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "Введите корректный URL." -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "\"{value}\" не является корректным UUID." -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." -msgstr "" +msgstr "Введите действительный адрес IPv4 или IPv6." -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "Требуется целочисленное значение." -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "Убедитесь что значение меньше или равно {max_value}." -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "Убедитесь что значение больше или равно {min_value}." -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "Слишком длинное значение." -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "Требуется численное значение." -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "Убедитесь что в числе не больше {max_digits} знаков." -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "Убедитесь что в числе не больше {max_decimal_places} знаков в дробной части." -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "Убедитесь что в цисле не больше {max_whole_digits} знаков в целой части." -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "Неправильный формат datetime. Используйте один из этих форматов: {format}." -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "Ожидался datetime, но был получен date." -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "Неправильный формат date. Используйте один из этих форматов: {format}." -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "Ожидался date, но был получен datetime." -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "Неправильный формат времени. Используйте один из этих форматов: {format}." -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." -msgstr "" +msgstr "Неправильный формат. Используйте один из этих форматов: {format}." -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" не является корректным значением." -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." -msgstr "" +msgstr "Элементов больше чем {count}" -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Ожидался list со значениями, но был получен \"{input_type}\"." -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." -msgstr "" +msgstr "Выбор не может быть пустым." -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." -msgstr "" +msgstr "\"{input}\" не является корректным путем до файла" -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "Не был загружен файл." -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "Загруженный файл не является корректным файлом. " -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "Невозможно определить имя файла." -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "Загруженный файл пуст." -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "Убедитесь что имя файла меньше {max_length} символов (сейчас {length})." -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "Загрузите корректное изображение. Загруженный файл не является изображением, либо является испорченным." -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." -msgstr "" +msgstr "Этот список не может быть пустым." -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "Ожидался словарь со значениями, но был получен \"{input_type}\"." -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." -msgstr "" +msgstr "Значение должно быть правильным JSON." -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" +msgstr "Отправить" + +#: filters.py:336 +msgid "ascending" msgstr "" -#: pagination.py:189 +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." -msgstr "" +msgstr "Неправильная страница" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "Не корректный курсор" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Недопустимый первичный ключ \"{pk_value}\" - объект не существует." #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Некорректный тип. Ожилалось значение первичного ключа, получен {data_type}." @@ -367,75 +353,68 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "Недопустимая ссылка - объект не существует." #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Некорректный тип. Ожидался URL, получен {data_type}." -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "Объект с {slug_name}={value} не существует." -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "Недопустимое значение." #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "Недопустимые данные. Ожидался dictionary, но был получен {datatype}." -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" -msgstr "" +msgstr "Фильтры" #: templates/rest_framework/filters/django_filter.html:2 #: templates/rest_framework/filters/django_filter_crispyforms.html:4 msgid "Field filters" -msgstr "" +msgstr "Фильтры полей" #: templates/rest_framework/filters/ordering.html:3 msgid "Ordering" -msgstr "" +msgstr "Порядок сортировки" #: templates/rest_framework/filters/search.html:2 msgid "Search" -msgstr "" +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 "" +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 "" +msgstr "Нет элементов для выбора" -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "Это поле должно быть уникально." -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "Поля {field_names} должны производить массив с уникальными значениями." -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "Это поле должно быть уникально для даты \"{date_field}\"." -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "Это поле должно быть уникально для месяца \"{date_field}\"." -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "Это поле должно быть уникально для года \"{date_field}\"." @@ -443,18 +422,22 @@ msgstr "Это поле должно быть уникально для года msgid "Invalid version in \"Accept\" header." msgstr "Недопустимая версия в заголовке \"Accept\"." -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "Недопустимая версия в пути URL." -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "Недопустимая версия в имени хоста." -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "Недопустимая версия в параметре запроса." #: views.py:88 msgid "Permission denied." -msgstr "" +msgstr "Доступ запрещен" diff --git a/rest_framework/locale/sk/LC_MESSAGES/django.mo b/rest_framework/locale/sk/LC_MESSAGES/django.mo index 83237889833cddac18370ba584b677f8c4fbdcf3..dda693e32c59738c5bcd1218feb7157b3a5a6078 100644 GIT binary patch delta 118 zcmX@?dDwG!EqWfqrYrYhK!+tSB(nej delta 118 zcmX@?dDwGmAfdN;5ziv=!S!Qu&ex9yNVo9o%f{}rtnXUmu zojF*Y0Z^S!VsVLXNKs;5aZX}Mevy?zL}FQHYLS9}QA&PcX{CZqMLvY(kdv90UzVA; Jd7`k9AOQYSB=rCQ diff --git a/rest_framework/locale/sk/LC_MESSAGES/django.po b/rest_framework/locale/sk/LC_MESSAGES/django.po index 208c063ac..1c22d09f0 100644 --- a/rest_framework/locale/sk/LC_MESSAGES/django.po +++ b/rest_framework/locale/sk/LC_MESSAGES/django.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Slovak (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/sk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,40 +18,40 @@ msgstr "" "Language: sk\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "Nesprávna hlavička. Neboli poskytnuté prihlasovacie údaje." -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "Nesprávna hlavička. Prihlasovacie údaje nesmú obsahovať medzery." -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Nesprávna hlavička. Prihlasovacie údaje nie sú správne zakódované pomocou metódy base64." -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "Nesprávne prihlasovacie údaje." -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "Daný používateľ je neaktívny, alebo zmazaný." -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "Nesprávna token hlavička. Neboli poskytnuté prihlasovacie údaje." -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "Nesprávna token hlavička. Token hlavička nesmie obsahovať medzery." -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "Nesprávny token." @@ -59,23 +59,23 @@ msgstr "Nesprávny token." msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -124,7 +124,6 @@ msgid "Not found." msgstr "Nebolo nájdené." #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "Metóda \"{method}\" nie je povolená." @@ -133,7 +132,6 @@ msgid "Could not satisfy the request Accept header." msgstr "Nie je možné vyhovieť požiadavku v hlavičke \"Accept\"." #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "Požiadavok obsahuje nepodporovaný media type: \"{media_type}\"." @@ -141,214 +139,201 @@ msgstr "Požiadavok obsahuje nepodporovaný media type: \"{media_type}\"." msgid "Request was throttled." msgstr "Požiadavok bol obmedzený, z dôvodu prekročenia limitu." -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "Toto pole je povinné." -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "Toto pole nemôže byť nulové." -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "\"{input}\" je validný boolean." -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "Toto pole nemože byť prázdne." -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "Uistite sa, že toto pole nemá viac ako {max_length} znakov." -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "Uistite sa, že toto pole má viac ako {min_length} znakov." -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "Vložte správnu emailovú adresu." -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "Toto pole nezodpovedá požadovanému formátu." -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "Zadajte platný \"slug\", ktorý obsahuje len malé písmená, čísla, spojovník alebopodtržítko." -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "Zadajte platnú URL adresu." -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "\"{value}\" nie je platné UUID." -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "" -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "Je vyžadované celé číslo." -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "Uistite sa, že hodnota je menšia alebo rovná {max_value}." -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "Uistite sa, že hodnota je väčšia alebo rovná {min_value}." -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "Zadaný textový reťazec je príliš dlhý." -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "Je vyžadované číslo." -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "Uistite sa, že hodnota neobsahuje viac ako {max_digits} cifier." -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "Uistite sa, že hodnota neobsahuje viac ako {max_decimal_places} desatinných miest." -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "Uistite sa, že hodnota neobsahuje viac ako {max_whole_digits} cifier pred desatinnou čiarkou." -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "Nesprávny formát dátumu a času. Prosím použite jeden z nasledujúcich formátov: {format}." -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "Vložený len dátum - date namiesto dátumu a času - datetime." -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "Nesprávny formát dátumu. Prosím použite jeden z nasledujúcich formátov: {format}." -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "Vložený dátum a čas - datetime namiesto jednoduchého dátumu - date." -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "Nesprávny formát času. Prosím použite jeden z nasledujúcich formátov: {format}." -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" je nesprávny výber z daných možností." -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "" -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Bol očakávaný zoznam položiek, no namiesto toho bol nájdený \"{input_type}\"." -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "" -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "Nebol odoslaný žiadny súbor." -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "Odoslané dáta neobsahujú súbor. Prosím skontrolujte kódovanie - encoding type daného formuláru." -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "Nebolo možné určiť meno súboru." -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "Odoslaný súbor je prázdny." -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "Uistite sa, že meno súboru neobsahuje viac ako {max_length} znakov. (V skutočnosti ich má {length})." -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "Uploadujte prosím obrázok. Súbor, ktorý ste uploadovali buď nie je obrázok, alebo daný obrázok je poškodený." -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "" -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "Bol očakávaný slovník položiek, no namiesto toho bol nájdený \"{input_type}\"." -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "Nesprávny kurzor." #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Nesprávny primárny kľúč \"{pk_value}\" - objekt s daným primárnym kľúčom neexistuje." #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Nesprávny typ. Bol prijatý {data_type} namiesto primárneho kľúča." @@ -365,25 +350,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "Nesprávny hypertextový odkaz - požadovný objekt neexistuje." #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Nesprávny typ {data_type}. Požadovaný typ: hypertextový odkaz." -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "Objekt, ktorého atribút \"{slug_name}\" je \"{value}\" neexistuje." -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "Nesprávna hodnota." #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "Bol očakávaný slovník položiek, no namiesto toho bol nájdený \"{datatype}\"." -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "" @@ -413,27 +395,23 @@ msgstr "" msgid "No items to select." msgstr "" -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "Táto položka musí byť unikátna." -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "Dané položky: {field_names} musia tvoriť musia spolu tvoriť unikátnu množinu." -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "Položka musí byť pre špecifický deň \"{date_field}\" unikátna." -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "Položka musí byť pre mesiac \"{date_field}\" unikátna." -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "Položka musí byť pre rok \"{date_field}\" unikátna." @@ -441,15 +419,19 @@ msgstr "Položka musí byť pre rok \"{date_field}\" unikátna." msgid "Invalid version in \"Accept\" header." msgstr "Nesprávna verzia v \"Accept\" hlavičke." -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "Nesprávna verzia v URL adrese." -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "Nesprávna verzia v \"hostname\"." -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "Nesprávna verzia v parametri požiadavku." diff --git a/rest_framework/locale/sv/LC_MESSAGES/django.mo b/rest_framework/locale/sv/LC_MESSAGES/django.mo index d560de6e148ec09886153f5ccc95854ea689da9d..cbecec44db41c28528e50379a8db597b0f7bb909 100644 GIT binary patch delta 2471 zcmY+^e@sv_(-_c_mx z?{hAz}TiHam+MzGn>g)*3GOff!*7RGTAp29->73bhTsQ>4r88Z*d za5^?&DR$s;d=UfqF>Wv>Wt?U6}UW;hv6>N@Al&Z_%3QCFW^%A3p04WDabOW97|9g?7#={FxKLas17r;jhTyu zsP-DvOtzqw{($F*cYh3%xPKnC0u!h$yN2pVH)AC@k4io^poN{7i_c&(9z}M+ypCmf z9NBJj(eoGNW3F*gKetfnGlNcMV-Bjl6w5J)+TyNU_Fp4E>HY8=sy&HHqPtjyb7r}F zyA9PojGDn$sNY>i3#U*6%+GU@%QRvN?Ge-fj^Z+W6N7jrkM-Y4S*b_lm(JHCun_&e6&Y?iSVJ8&b8qyBdTJ1}@3`G&D0R5X&0 zkiN|~r~yrSrjs$+t2G$H=a3U;&Y%W5fkpTeY64TJV_L?|X55Rr@DzqH%Oa7n73*~V zZ7SN6cTmUV0xrQR)G;h7c9*ymL$r5eBfgFGcpW()reuM8ysA;{PSlq4p$2#q8JqbK z^}Gr6^L%rg3VCCE{F=T@K58YZQ3Gj1eg7<~qhntC6I61YLmkH-Q0MwL3}E1XW704a zHRA%T!6lfCJvg7|n_enf%0sBEd7V16GNlYVDw6)tce=Vs>5~0^+9kGK@Q6?+-o*=r30HLBp&30<{ zF3D82UFn359=m29BDAG8Q9-m5D%xJ%JgPCI$YX5WJjV0 z?BRi-8moQZK))Te8uktKMu&UD*1F+={t(ga-AEkI&zY7otTD$&=j`*h_1S}VPa>_r z7f7+9y*+lqXI=F9TMl;jg%2by7H9g>n$Lb34M#NQD+`K}{y*kBi@x`TlO}DjMv!=Jr>6Y7dbI#41&bzib?bgh-_De7?TyQi!+NK#4 zM_|w&fx@>eB+}T*A_(z_S{hM_L{M3fIWi%^e%QNHANKw}KA*4m{qcE! z-k+}@Z=dT+UoOde#b~3%y~J-hW@$XLfCKF#zgZQ|Vi14ATD*nJuzI1{-55h%KZ^I@ z)7Xd(HsELY0A9n**i?`;Z3pP|aN<*pqQB5=5Vv3}9>aG05#w08$Si`7q5l0S_Tu+g zgUjzQE5T0G3k{;qPkO$Jy5DJR(NzDYb0;SnIWQ?}N6oMk^`IoS;S6rVpRp4wi_Aip zK>qA72mS6C*5O4|=6s9I?!y`kV;_bvja!xK_vviJe~@cz-4e5<*o_+RLd_tBnvvsq z(mVe(YQ}${mL#v(y}kxlG48+sK7m1e4omS3Oy|)#MThL#hj>4Jjx3X1N8R`)>IOv& z^05}nvB4X6VVH3owUp1IUi2*LcfWY!8>rd{@bq=Krj-0^4U^u9H&HXci2C857{tYQ zxi1z*711tSjnmkK-{J`R%FHTohvz=eL%4?X@8Xv}vrDLnzEw{CmD(S8&9!&~H4ahI zdXaw5J)SRO1Lvo4J)Xy{Sjbc3IDi@-N7cx$7{w4b8^9E5=4Y`3Z>H&NrxRhiUHB5} z!tZbp%gCeFa2!d7y^LI9@1S1f3(wzCsjsYbA2^0=2zwi~WT$XB&fqdF0Qoa?s5E)$W6!|Jb9{TYD zYGRi$qWyo3j&?ykuR|6sgi2W)Rb2h3B|3<#id{hd>^cW6O<;xlz39MAjCW%cXK*84 zMg6{pkBaQ^d=hJUz8#{Ylzo5^yoD>VmBUWliOS3;$i3_m2GPgURZP|B!~a{e*U>B~ z^z28e8+!M*Ua zH!(TYI53geJ2{@1N=-z9!-@ULv5DZeiQTEE_B|8aa3JOOqT|WEsr|`B=6HEYj&rVJ kWP0UNe`amfIbX(CQ{>B3tXP)obglZzsi, 2015 -# Joakim Soderlund, 2015 +# Joakim Soderlund, 2015-2016 msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Swedish (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,74 +19,74 @@ msgstr "" "Language: sv\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "Ogiltig \"basic\"-header. Inga användaruppgifter tillhandahölls." -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "Ogiltig \"basic\"-header. Strängen för användaruppgifterna ska inte innehålla mellanslag." -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Ogiltig \"basic\"-header. Användaruppgifterna är inte korrekt base64-kodade." -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "Ogiltigt användarnamn/lösenord." -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "Användaren borttagen eller inaktiv." -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "Ogiltig \"token\"-header. Inga användaruppgifter tillhandahölls." -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "Ogiltig \"token\"-header. Strängen ska inte innehålla mellanslag." -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "Ogiltig \"token\"-header. Strängen ska inte innehålla ogiltiga tecken." -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "Ogiltig \"token\"." #: authtoken/apps.py:7 msgid "Auth Token" -msgstr "" +msgstr "Autentiseringstoken" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" -msgstr "" +msgstr "Nyckel" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" -msgstr "" +msgstr "Användare" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" -msgstr "" +msgstr "Skapad" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" -msgstr "" +msgstr "Token" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" -msgstr "" +msgstr "Tokens" #: authtoken/serializers.py:8 msgid "Username" -msgstr "" +msgstr "Användarnamn" #: authtoken/serializers.py:9 msgid "Password" -msgstr "" +msgstr "Lösenord" #: authtoken/serializers.py:20 msgid "User account is disabled." @@ -125,7 +125,6 @@ msgid "Not found." msgstr "Hittades inte." #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "Metoden \"{method}\" tillåts inte." @@ -134,7 +133,6 @@ msgid "Could not satisfy the request Accept header." msgstr "Kunde inte tillfredsställa förfrågans \"Accept\"-header." #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "Medietypen \"{media_type}\" stöds inte." @@ -142,214 +140,201 @@ msgstr "Medietypen \"{media_type}\" stöds inte." msgid "Request was throttled." msgstr "Förfrågan stoppades eftersom du har skickat för många." -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "Det här fältet är obligatoriskt." -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "Det här fältet får inte vara null." -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "\"{input}\" är inte ett giltigt booleskt värde." -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "Det här fältet får inte vara blankt." -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "Se till att detta fält inte har fler än {max_length} tecken." -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "Se till att detta fält har minst {min_length} tecken." -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "Ange en giltig mejladress." -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "Det här värdet matchar inte mallen." -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "Ange en giltig \"slug\" bestående av bokstäver, nummer, understreck eller bindestreck." -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "Ange en giltig URL." -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "\"{value} är inte ett giltigt UUID." -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "Ange en giltig IPv4- eller IPv6-adress." -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "Ett giltigt heltal krävs." -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "Se till att detta värde är mindre än eller lika med {max_value}." -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "Se till att detta värde är större än eller lika med {min_value}." -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "Textvärdet är för långt." -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "Ett giltigt nummer krävs." -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "Se till att det inte finns fler än totalt {max_digits} siffror." -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "Se till att det inte finns fler än {max_decimal_places} decimaler." -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "Se till att det inte finns fler än {max_whole_digits} siffror före decimalpunkten." -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "Datumtiden har fel format. Använd ett av dessa format istället: {format}." -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "Förväntade en datumtid men fick ett datum." -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "Datumet har fel format. Använde ett av dessa format istället: {format}." -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "Förväntade ett datum men fick en datumtid." -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "Tiden har fel format. Använd ett av dessa format istället: {format}." -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "Perioden har fel format. Använd ett av dessa format istället: {format}." -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" är inte ett giltigt val." -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "Fler än {count} objekt..." -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Förväntade en lista med element men fick typen \"{input_type}\"." -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "Det här valet får inte vara tomt." -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "\"{input}\" är inte ett giltigt val för en sökväg." -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "Ingen fil skickades." -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "Den skickade informationen var inte en fil. Kontrollera formulärets kodningstyp." -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "Inget filnamn kunde bestämmas." -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "Den skickade filen var tom." -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "Se till att det här filnamnet har högst {max_length} tecken (det har {length})." -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "Ladda upp en giltig bild. Filen du laddade upp var antingen inte en bild eller en skadad bild." -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "Den här listan får inte vara tom." -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "Förväntade en \"dictionary\" med element men fick typen \"{input_type}\"." -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "Värdet måste vara giltig JSON." -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "Skicka" -#: pagination.py:189 -msgid "Invalid page." +#: filters.py:336 +msgid "ascending" msgstr "" -#: pagination.py:407 +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 +msgid "Invalid page." +msgstr "Ogiltig sida." + +#: pagination.py:427 msgid "Invalid cursor" msgstr "Ogiltig cursor." #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Ogiltigt pk \"{pk_value}\" - Objektet finns inte." #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Felaktig typ. Förväntade pk-värde, fick {data_type}." @@ -366,25 +351,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "Ogiltig hyperlänk - Objektet finns inte." #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Felaktig typ. Förväntade URL-sträng, fick {data_type}." -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "Objekt med {slug_name}={value} finns inte." -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "Ogiltigt värde." #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "Ogiltig data. Förväntade en dictionary, men fick {datatype}." -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "Filter" @@ -414,27 +396,23 @@ msgstr "Inget" msgid "No items to select." msgstr "Inga valbara objekt." -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "Det här fältet måste vara unikt." -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "Fälten {field_names} måste skapa ett unikt set." -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "Det här fältet måste vara unikt för datumet \"{date_field}\"." -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "Det här fältet måste vara unikt för månaden \"{date_field}\"." -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "Det här fältet måste vara unikt för året \"{date_field}\"." @@ -442,15 +420,19 @@ msgstr "Det här fältet måste vara unikt för året \"{date_field}\"." msgid "Invalid version in \"Accept\" header." msgstr "Ogiltig version i \"Accept\"-headern." -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "Ogiltig version i URL-resursen." -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "Ogiltig version i värdnamnet." -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "Ogiltig version i förfrågningsparametern." diff --git a/rest_framework/locale/tr/LC_MESSAGES/django.mo b/rest_framework/locale/tr/LC_MESSAGES/django.mo index 14f5dc981f0819346e1355b1e01fbf482e93b10f..818aad27929ca67ead8eca3a42804446d8192935 100644 GIT binary patch delta 894 zcmXZaO-NKx6u|Lgq1l+GC{8u0H*K`ZhJ57&^f>*n<5yjorA4L+A^L zCtUcsarhJP@DBSz#Jen3)Ec1q+T+Sq_Dp2vASgP*Y&|6&-6 z=uR7J$4gL*RCn1{PqihHPUrI3e`i#F=XMNu1x;{_bXZhV4z zHCw0~{Egg# z2*G)>*u(?uM{SeNzyOx<4j#t3@33v-orik37haQMzN9V ztgs9o#*#;18$L%{_zhXB6%1gQ{_n#W+WZJQ=%H;ei)-*bTFV!37k)u2u#Q1HMv&Xo z3A8+;xDLJR1b%`Uv;=q2PW}X~GfU{hW!#9r(cVe}4`nqb&^nh!Dc%eY!y?)No?!#NLVFW$(enL3 zdovN*W$Pv|j#seVp6_DD4pj(-Wo-Vt^O2M5fl{3z7wf#aQ_FFDt%+)?#06VY;Y#<4-o8e AqyPW_ diff --git a/rest_framework/locale/tr/LC_MESSAGES/django.po b/rest_framework/locale/tr/LC_MESSAGES/django.po index 50722b3d8..17e6e4a73 100644 --- a/rest_framework/locale/tr/LC_MESSAGES/django.po +++ b/rest_framework/locale/tr/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ # Dogukan Tufekci , 2015 # Emrah BİLBAY , 2015 # Ertaç Paprat , 2015 -# José Alaguna , 2016 +# Yusuf (Josè) Luis , 2016 # Mesut Can Gürle , 2015 # Murat Çorlu , 2015 # Recep KIRMIZI , 2015 @@ -15,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-09 23:45+0000\n" -"Last-Translator: José Alaguna \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Turkish (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -25,40 +25,40 @@ msgstr "" "Language: tr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "Geçersiz yetkilendirme başlığı. Gerekli uygunluk kriterleri sağlanmamış." -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "Geçersiz yetkilendirme başlığı. Uygunluk kriterine ait veri boşluk karakteri içermemeli." -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Geçersiz yetkilendirme başlığı. Uygunluk kriterleri base64 formatına uygun olarak kodlanmamış." -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "Geçersiz kullanıcı adı/parola" -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "Kullanıcı aktif değil ya da silinmiş." -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "Geçersiz token başlığı. Kimlik bilgileri eksik." -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "Geçersiz token başlığı. Token'da boşluk olmamalı." -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "Geçersiz token başlığı. Token geçersiz karakter içermemeli." -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "Geçersiz token." @@ -66,23 +66,23 @@ msgstr "Geçersiz token." msgid "Auth Token" msgstr "Kimlik doğrulama belirteci" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "Anahtar" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "Kullanan" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "Oluşturulan" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "İşaret" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "İşaretler" @@ -131,7 +131,6 @@ msgid "Not found." msgstr "Bulunamadı." #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "\"{method}\" metoduna izin verilmiyor." @@ -140,7 +139,6 @@ msgid "Could not satisfy the request Accept header." msgstr "İsteğe ait Accept başlık bilgisi yanıt verilecek başlık bilgileri arasında değil." #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "İstekte desteklenmeyen medya tipi: \"{media_type}\"." @@ -148,214 +146,201 @@ msgstr "İstekte desteklenmeyen medya tipi: \"{media_type}\"." msgid "Request was throttled." msgstr "Üst üste çok fazla istek yapıldı." -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "Bu alan zorunlu." -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "Bu alan boş bırakılmamalı." -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "\"{input}\" geçerli bir boolean değil." -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "Bu alan boş bırakılmamalı." -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "Bu alanın {max_length} karakterden fazla karakter barındırmadığından emin olun." -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "Bu alanın en az {min_length} karakter barındırdığından emin olun." -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "Geçerli bir e-posta adresi girin." -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "Bu değer gereken düzenli ifade deseni ile uyuşmuyor." -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "Harf, rakam, altçizgi veya tireden oluşan geçerli bir \"slug\" giriniz." -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "Geçerli bir URL girin." -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "\"{value}\" geçerli bir UUID değil." -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "Geçerli bir IPv4 ya da IPv6 adresi girin." -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "Geçerli bir tam sayı girin." -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "Değerin {max_value} değerinden küçük ya da eşit olduğundan emin olun." -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "Değerin {min_value} değerinden büyük ya da eşit olduğundan emin olun." -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "String değeri çok uzun." -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "Geçerli bir numara gerekiyor." -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "Toplamda {max_digits} haneden fazla hane olmadığından emin olun." -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "Ondalık basamak değerinin {max_decimal_places} haneden fazla olmadığından emin olun." -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "Ondalık ayracından önce {max_whole_digits} basamaktan fazla olmadığından emin olun." -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "Datetime alanı yanlış biçimde. {format} biçimlerinden birini kullanın." -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "Datetime değeri bekleniyor, ama date değeri geldi." -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "Tarih biçimi yanlış. {format} biçimlerinden birini kullanın." -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "Date tipi beklenmekteydi, fakat datetime tipi geldi." -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "Time biçimi yanlış. {format} biçimlerinden birini kullanın." -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "Duration biçimi yanlış. {format} biçimlerinden birini kullanın." -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" geçerli bir seçim değil." -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "{count} elemandan daha fazla..." -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Elemanların listesi beklenirken \"{input_type}\" alındı." -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "Bu seçim boş bırakılmamalı." -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "\"{input}\" geçerli bir yol seçimi değil." -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "Hiçbir dosya verilmedi." -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "Gönderilen veri dosya değil. Formdaki kodlama tipini kontrol edin." -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "Hiçbir dosya adı belirlenemedi." -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "Gönderilen dosya boş." -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "Bu dosya adının en fazla {max_length} karakter uzunluğunda olduğundan emin olun. (şu anda {length} karakter)." -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "Geçerli bir resim yükleyin. Yüklediğiniz dosya resim değil ya da bozuk." -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "Bu liste boş olmamalı." -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "Sözlük tipi bir değişken beklenirken \"{input_type}\" tipi bir değişken alındı." -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "Değer geçerli bir JSON olmalı." -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "Gönder" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "Geçersiz sayfa." -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "Sayfalandırma imleci geçersiz" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Geçersiz pk \"{pk_value}\" - obje bulunamadı." #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Hatalı tip. Pk değeri beklenirken, alınan {data_type}." @@ -372,25 +357,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "Geçersiz bağlantı - Obje bulunamadı." #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Hatalı tip. URL metni bekleniyor, {data_type} alındı." -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "{slug_name}={value} değerini taşıyan obje bulunamadı." -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "Geçersiz değer." #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "Geçersiz veri. Sözlük bekleniyordu fakat {datatype} geldi. " -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "Filtreler" @@ -420,27 +402,23 @@ msgstr "Hiçbiri" msgid "No items to select." msgstr "Seçenek yok." -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "Bu alan eşsiz olmalı." -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "{field_names} hep birlikte eşsiz bir küme oluşturmalılar." -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "Bu alan \"{date_field}\" tarihine göre eşsiz olmalı." -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "Bu alan \"{date_field}\" ayına göre eşsiz olmalı." -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "Bu alan \"{date_field}\" yılına göre eşsiz olmalı." @@ -448,15 +426,19 @@ msgstr "Bu alan \"{date_field}\" yılına göre eşsiz olmalı." msgid "Invalid version in \"Accept\" header." msgstr "\"Accept\" başlığındaki sürüm geçersiz." -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "URL dizininde geçersiz versiyon." -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "Host adında geçersiz versiyon." -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "Sorgu parametresinde geçersiz versiyon." diff --git a/rest_framework/locale/tr_TR/LC_MESSAGES/django.mo b/rest_framework/locale/tr_TR/LC_MESSAGES/django.mo index 5fa743b50e80374a743a42495f008818753c0db2..a3a8ca0d57ea9e7fd39683f59274b8adccf003f1 100644 GIT binary patch delta 894 zcmXZaPe{{Y9LMob#Fot>C2HlI{;Xx1to-SgHH=&ewek?AMINg4chcry+rhg03hEkU z5ZWQnQAA;#BqHdhNCc}(T@pO*(y@r%U-lb}*Y|n$?E8G5@AJ%!JsW$I*yw%PApP7a zbxL}@OWKE3Jb-_2FLv&h!gv~^cop059!7A%cL^sMf5$D@*CM6yIF90d9Klt*h}$Fb zG)zz+i%q=6li1iQP2f2!;R`&2t?X`za(D{gqZRrOt-x-o+Jk9K;C0`5w0x_06l3ku zHoVmCNt+3#nV@LR;1QffTeyrjG2lp-F^^|)1)DM2Ar0ao?7=)*C+E-#`G`&U3*-13 zt*{P$Jb~vu0^4vNZQ)mp;TqZo4fOvYwjhU8#`hN5Mh|flzCvsHJGB3QLTcAKc4Lr9 zZd1KT4a(qF^llS`2=1UIcz|~D$7r2d#voSF3i^SzaSa2wg9l@si=Y*f#1tOG5u8E0 znh$6PtRlCd^}3z{WJ@v;!+xCf$B)n!enzW&4ITW80~p;e4dDbf;8SeG1++Ku5-s01 zv^Nv#s;|3%F5@fMWzTn(z$#lpYt0JUUDg&e!CF&jAnx`#?%|Z%|0Er5OV@|Vl$+@3 y45)vgV~Q= zW(UmdRg>9%tl}a3gZr?p*(`zsxCgIdE8fK@&evVUi;TbFHcYmd^2+4vsl6xcp6)%u0&%vfE84u|4PZkqMf%8O-1;YT*)&VZbrFf(1N-%NWM!Ub7xdU?&z(C;0@`$a`$WpP0bk zsK#Rac>+g#0u`J?E&PIQxQZ$et06{x{sUjCF;oEqQ3ut^loc-5H~W( zZCV%7gXM8M`V#~pg4?JB_fR{3h&q`i3}O}4(05efb=-tIc`!P;W>h0CX7L#I;|%I* z-k~;FMQ*{?YWfx++Yu(>=;HbM_yKC+M^xvl=-^*GiqUqnK0JpF_!zh1JnBs>pz?i1 zy_trN+PYCpF}{o)dcLy+>TD5pG|Q;FT(6u8{%Q=liDb%2WwLJOQ7+Qj%dp!y>}J!M z&LqFkkXN2gjFh~|a?zWfDrKF)sq&`x{<-YNo-bAtTJaQ-eAF;G? A9smFU diff --git a/rest_framework/locale/tr_TR/LC_MESSAGES/django.po b/rest_framework/locale/tr_TR/LC_MESSAGES/django.po index efbd689e6..171826a63 100644 --- a/rest_framework/locale/tr_TR/LC_MESSAGES/django.po +++ b/rest_framework/locale/tr_TR/LC_MESSAGES/django.po @@ -3,14 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# José Alaguna , 2015-2016 +# Yusuf (Josè) Luis , 2015-2016 msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-09 23:48+0000\n" -"Last-Translator: José Alaguna \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Turkish (Turkey) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/tr_TR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,40 +18,40 @@ msgstr "" "Language: tr_TR\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "Geçersiz yetkilendirme başlığı. Gerekli uygunluk kriterleri sağlanmamış." -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "Geçersiz yetkilendirme başlığı. Uygunluk kriterine ait veri boşluk karakteri içermemeli." -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Geçersiz yetkilendirme başlığı. Uygunluk kriterleri base64 formatına uygun olarak kodlanmamış." -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "Geçersiz kullanıcı adı / şifre." -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "Kullanıcı aktif değil ya da silinmiş" -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "Geçersiz token başlığı. Kimlik bilgileri eksik." -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "Geçersiz token başlığı. Token'da boşluk olmamalı." -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "Geçersiz token başlığı. Token geçersiz karakter içermemeli." -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "Geçersiz simge." @@ -59,23 +59,23 @@ msgstr "Geçersiz simge." msgid "Auth Token" msgstr "Kimlik doğrulama belirteci" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "Anahtar" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "Kullanan" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "Oluşturulan" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "İşaret" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "İşaretler" @@ -124,7 +124,6 @@ msgid "Not found." msgstr "Bulunamadı." #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "\"{method}\" metoduna izin verilmiyor." @@ -133,7 +132,6 @@ msgid "Could not satisfy the request Accept header." msgstr "İsteğe ait Accept başlık bilgisi yanıt verilecek başlık bilgileri arasında değil." #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "İstekte desteklenmeyen medya tipi: \"{media_type}\"." @@ -141,214 +139,201 @@ msgstr "İstekte desteklenmeyen medya tipi: \"{media_type}\"." msgid "Request was throttled." msgstr "Üst üste çok fazla istek yapıldı." -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "Bu alan zorunlu." -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "Bu alan boş bırakılmamalı." -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "\"{input}\" geçerli bir boolean değil." -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "Bu alan boş bırakılmamalı." -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "Bu alanın {max_length} karakterden fazla karakter barındırmadığından emin olun." -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "Bu alanın en az {min_length} karakter barındırdığından emin olun." -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "Geçerli bir e-posta adresi girin." -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "Bu değer gereken düzenli ifade deseni ile uyuşmuyor." -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "Harf, rakam, altçizgi veya tireden oluşan geçerli bir \"slug\" giriniz." -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "Geçerli bir URL girin." -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "\"{value}\" geçerli bir UUID değil." -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "Geçerli bir IPv4 ya da IPv6 adresi girin." -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "Geçerli bir tam sayı girin." -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "Değerin {max_value} değerinden küçük ya da eşit olduğundan emin olun." -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "Değerin {min_value} değerinden büyük ya da eşit olduğundan emin olun." -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "String değeri çok uzun." -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "Geçerli bir numara gerekiyor." -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "Toplamda {max_digits} haneden fazla hane olmadığından emin olun." -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "Ondalık basamak değerinin {max_decimal_places} haneden fazla olmadığından emin olun." -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "Ondalık ayracından önce {max_whole_digits} basamaktan fazla olmadığından emin olun." -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "Datetime alanı yanlış biçimde. {format} biçimlerinden birini kullanın." -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "Datetime değeri bekleniyor, ama date değeri geldi." -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "Tarih biçimi yanlış. {format} biçimlerinden birini kullanın." -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "Date tipi beklenmekteydi, fakat datetime tipi geldi." -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "Time biçimi yanlış. {format} biçimlerinden birini kullanın." -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "Duration biçimi yanlış. {format} biçimlerinden birini kullanın." -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" geçerli bir seçim değil." -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "{count} elemandan daha fazla..." -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Elemanların listesi beklenirken \"{input_type}\" alındı." -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "Bu seçim boş bırakılmamalı." -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "\"{input}\" geçerli bir yol seçimi değil." -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "Hiçbir dosya verilmedi." -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "Gönderilen veri dosya değil. Formdaki kodlama tipini kontrol edin." -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "Hiçbir dosya adı belirlenemedi." -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "Gönderilen dosya boş." -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "Bu dosya adının en fazla {max_length} karakter uzunluğunda olduğundan emin olun. (şu anda {length} karakter)." -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "Geçerli bir resim yükleyin. Yüklediğiniz dosya resim değil ya da bozuk." -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "Bu liste boş olmamalı." -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "Sözlük tipi bir değişken beklenirken \"{input_type}\" tipi bir değişken alındı." -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "Değer geçerli bir JSON olmalı." -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "Gönder" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "Geçersiz sayfa." -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "Geçersiz imleç." #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Geçersiz pk \"{pk_value}\" - obje bulunamadı." #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Hatalı tip. Pk değeri beklenirken, alınan {data_type}." @@ -365,25 +350,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "Geçersiz hyper link - Nesne yok.." #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Hatalı tip. URL metni bekleniyor, {data_type} alındı." -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "{slug_name}={value} değerini taşıyan obje bulunamadı." -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "Geçersiz değer." #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "Geçersiz veri. Bir sözlük bekleniyor, ama var {datatype}." -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "Filtreler" @@ -413,27 +395,23 @@ msgstr "Hiç kimse" msgid "No items to select." msgstr "Seçenek yok." -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "Bu alan benzersiz olmalıdır." -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "{field_names} alanları benzersiz bir set yapmak gerekir." -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "Bu alan \"{date_field}\" tarihine göre eşsiz olmalı." -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "Bu alan \"{date_field}\" ayına göre eşsiz olmalı." -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "Bu alan \"{date_field}\" yılına göre eşsiz olmalı." @@ -441,15 +419,19 @@ msgstr "Bu alan \"{date_field}\" yılına göre eşsiz olmalı." msgid "Invalid version in \"Accept\" header." msgstr "\"Kabul et\" başlığında geçersiz sürümü." -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "URL yolu geçersiz sürümü." -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "Hostname geçersiz sürümü." -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "Sorgu parametresi geçersiz sürümü." diff --git a/rest_framework/locale/uk/LC_MESSAGES/django.mo b/rest_framework/locale/uk/LC_MESSAGES/django.mo index 79396f543536eb6d2a2bb3842c62d7733c575cad..bfcb776e763fa2dc91969ef5117861e5c817186e 100644 GIT binary patch literal 13352 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, 2016 +# Illarion , 2016 +# Kirill Tarasenko, 2016 msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Ukrainian (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/uk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,441 +20,423 @@ msgstr "" "Language: uk\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." -msgstr "" +msgstr "Недійсний основний заголовок. Облікові дані відсутні." -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." -msgstr "" +msgstr "Недійсний основний заголовок. Облікові дані мають бути без пробілів." -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." -msgstr "" +msgstr "Недійсний основний заголовок. Облікові дані невірно закодовані у Base64." -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." -msgstr "" +msgstr "Недійсне iм'я користувача/пароль." -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." -msgstr "" - -#: authentication.py:173 -msgid "Invalid token header. No credentials provided." -msgstr "" +msgstr "Користувач неактивний або видалений." #: authentication.py:176 -msgid "Invalid token header. Token string should not contain spaces." -msgstr "" +msgid "Invalid token header. No credentials provided." +msgstr "Недійсний заголовок токена. Облікові дані відсутні." -#: authentication.py:182 +#: authentication.py:179 +msgid "Invalid token header. Token string should not contain spaces." +msgstr "Недійсний заголовок токена. Значення токена не повинне містити пробіли." + +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." -msgstr "" +msgstr "Недійсний заголовок токена. Значення токена не повинне містити некоректні символи." -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." -msgstr "" +msgstr "Недійсний токен." #: authtoken/apps.py:7 msgid "Auth Token" -msgstr "" +msgstr "Авторизаційний токен" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" -msgstr "" +msgstr "Ключ" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" -msgstr "" +msgstr "Користувач" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" -msgstr "" +msgstr "Створено" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" -msgstr "" +msgstr "Токен" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" -msgstr "" +msgstr "Токени" #: authtoken/serializers.py:8 msgid "Username" -msgstr "" +msgstr "Ім'я користувача" #: authtoken/serializers.py:9 msgid "Password" -msgstr "" +msgstr "Пароль" #: authtoken/serializers.py:20 msgid "User account is disabled." -msgstr "" +msgstr "Обліковий запис деактивований." #: authtoken/serializers.py:23 msgid "Unable to log in with provided credentials." -msgstr "" +msgstr "Неможливо зайти з введеними даними." #: authtoken/serializers.py:26 msgid "Must include \"username\" and \"password\"." -msgstr "" +msgstr "Має включати iм'я користувача та пароль" #: exceptions.py:49 msgid "A server error occurred." -msgstr "" +msgstr "Помилка сервера." #: exceptions.py:84 msgid "Malformed request." -msgstr "" +msgstr "Некоректний запит." #: exceptions.py:89 msgid "Incorrect authentication credentials." -msgstr "" +msgstr "Некоректні реквізити перевірки достовірності." #: exceptions.py:94 msgid "Authentication credentials were not provided." -msgstr "" +msgstr "Реквізити перевірки достовірності не надані." #: exceptions.py:99 msgid "You do not have permission to perform this action." -msgstr "" +msgstr "У вас нема дозволу робити цю дію." #: exceptions.py:104 views.py:81 msgid "Not found." -msgstr "" +msgstr "Не знайдено." #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." -msgstr "" +msgstr "Метод \"{method}\" не дозволений." #: exceptions.py:120 msgid "Could not satisfy the request Accept header." -msgstr "" +msgstr "Неможливо виконати запит прийняття заголовку." #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." -msgstr "" +msgstr "Непідтримуваний тип даних \"{media_type}\" в запиті." #: exceptions.py:145 msgid "Request was throttled." -msgstr "" +msgstr "Запит було проігноровано." -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." -msgstr "" +msgstr "Це поле обов'язкове." -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." -msgstr "" +msgstr "Це поле не може бути null." -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." -msgstr "" +msgstr "\"{input}\" не є коректним бульовим значенням." -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." -msgstr "" +msgstr "Це поле не може бути порожнім." -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." -msgstr "" +msgstr "Переконайтесь, що кількість символів в цьому полі не перевищує {max_length}." -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." -msgstr "" +msgstr "Переконайтесь, що в цьому полі мінімум {min_length} символів." -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." -msgstr "" +msgstr "Введіть коректну адресу електронної пошти." -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." -msgstr "" +msgstr "Значення не відповідає необхідному патерну." -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." -msgstr "" +msgstr "Введіть коректний \"slug\", що складається із букв, цифр, нижніх підкреслень або дефісів. " -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." -msgstr "" +msgstr "Введіть коректний URL." -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." -msgstr "" +msgstr "\"{value}\" не є коректним UUID." -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." -msgstr "" +msgstr "Введіть дійсну IPv4 або IPv6 адресу." -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." -msgstr "" +msgstr "Необхідне цілочисельне значення." -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." -msgstr "" +msgstr "Переконайтесь, що значення менше або дорівнює {max_value}." -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." -msgstr "" +msgstr "Переконайтесь, що значення більше або дорівнює {min_value}." -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." -msgstr "" +msgstr "Строкове значення занадто велике." -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." -msgstr "" +msgstr "Необхідне чисельне значення." -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." -msgstr "" +msgstr "Переконайтесь, що в числі не більше {max_digits} знаків." -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." -msgstr "" +msgstr "Переконайтесь, що в числі не більше {max_decimal_places} знаків у дробовій частині." -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." -msgstr "" +msgstr "Переконайтесь, що в числі не більше {max_whole_digits} знаків у цілій частині." -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." -msgstr "" +msgstr "Невірний формат дата з часом. Використайте один з цих форматів: {format}." -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." -msgstr "" +msgstr "Очікувалась дата з часом, але було отримано дату." -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." -msgstr "" +msgstr "Невірний формат дати. Використайте один з цих форматів: {format}." -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." -msgstr "" +msgstr "Очікувалась дата, але було отримано дату з часом." -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." -msgstr "" +msgstr "Неправильний формат часу. Використайте один з цих форматів: {format}." -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." -msgstr "" +msgstr "Невірний формат тривалості. Використайте один з цих форматів: {format}." -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." -msgstr "" +msgstr "\"{input}\" не є коректним вибором." -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." -msgstr "" +msgstr "Елементів більше, ніж {count}..." -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." -msgstr "" +msgstr "Очікувався список елементів, але було отримано \"{input_type}\"." -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." -msgstr "" +msgstr "Вибір не може бути порожнім." -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." -msgstr "" +msgstr "\"{input}\" вибраний шлях не є коректним." -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." -msgstr "" +msgstr "Файл не було відправленно." -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." -msgstr "" +msgstr "Відправленні дані не є файл. Перевірте тип кодування у формі." -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." -msgstr "" +msgstr "Неможливо визначити ім'я файлу." -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." -msgstr "" +msgstr "Відправленний файл порожній." -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." -msgstr "" +msgstr "Переконайтесь, що ім'я файлу становить менше {max_length} символів (зараз {length})." -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." -msgstr "" +msgstr "Завантажте коректне зображення. Завантажений файл або не є зображенням, або пошкоджений." -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." -msgstr "" +msgstr "Цей список не може бути порожнім." -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." -msgstr "" +msgstr "Очікувався словник зі елементами, але було отримано \"{input_type}\"." -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." -msgstr "" +msgstr "Значення повинно бути коректним JSON." -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" +msgstr "Відправити" + +#: filters.py:336 +msgid "ascending" msgstr "" -#: pagination.py:189 +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." -msgstr "" +msgstr "Недійсна сторінка." -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" -msgstr "" +msgstr "Недійсний курсор." #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." -msgstr "" +msgstr "Недопустимий первинний ключ \"{pk_value}\" - об'єкт не існує." #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." -msgstr "" +msgstr "Некоректний тип. Очікувалось значення первинного ключа, отримано {data_type}." #: relations.py:240 msgid "Invalid hyperlink - No URL match." -msgstr "" +msgstr "Недійсне посилання - немає збігу за URL." #: relations.py:241 msgid "Invalid hyperlink - Incorrect URL match." -msgstr "" +msgstr "Недійсне посилання - некоректний збіг за URL." #: relations.py:242 msgid "Invalid hyperlink - Object does not exist." -msgstr "" +msgstr "Недійсне посилання - об'єкт не існує." #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." -msgstr "" +msgstr "Некоректний тип. Очікувався URL, отримано {data_type}." + +#: relations.py:401 +msgid "Object with {slug_name}={value} does not exist." +msgstr "Об'єкт із {slug_name}={value} не існує." #: relations.py:402 -#, python-brace-format -msgid "Object with {slug_name}={value} does not exist." -msgstr "" - -#: relations.py:403 msgid "Invalid value." -msgstr "" +msgstr "Недійсне значення." #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." -msgstr "" +msgstr "Недопустимі дані. Очікувався словник, але було отримано {datatype}." -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" -msgstr "" +msgstr "Фільтри" #: templates/rest_framework/filters/django_filter.html:2 #: templates/rest_framework/filters/django_filter_crispyforms.html:4 msgid "Field filters" -msgstr "" +msgstr "Фільтри поля" #: templates/rest_framework/filters/ordering.html:3 msgid "Ordering" -msgstr "" +msgstr "Впорядкування" #: templates/rest_framework/filters/search.html:2 msgid "Search" -msgstr "" +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 "" +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 "" +msgstr "Немає елементів для вибору." -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." -msgstr "" +msgstr "Це поле повинне бути унікальним." -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." -msgstr "" +msgstr "Поля {field_names} повинні створювати унікальний масив значень." -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." -msgstr "" +msgstr "Це поле повинне бути унікальним для дати \"{date_field}\"." -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." -msgstr "" +msgstr "Це поле повинне бути унікальним для місяця \"{date_field}\"." -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." -msgstr "" +msgstr "Це поле повинне бути унікальним для року \"{date_field}\"." #: versioning.py:42 msgid "Invalid version in \"Accept\" header." -msgstr "" +msgstr "Недопустима версія в загаловку \"Accept\"." -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." +msgstr "Недопустима версія в шляху URL." + +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." msgstr "" -#: versioning.py:144 +#: versioning.py:147 msgid "Invalid version in hostname." -msgstr "" +msgstr "Недопустима версія в імені хоста." -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." -msgstr "" +msgstr "Недопустима версія в параметрі запиту." #: views.py:88 msgid "Permission denied." -msgstr "" +msgstr "Доступ заборонено." diff --git a/rest_framework/locale/vi/LC_MESSAGES/django.mo b/rest_framework/locale/vi/LC_MESSAGES/django.mo index a055d763a364964c42cb63ea396a2ada7557adaf..578308acfd9abd19134b6dd40f85fb5ecbce465e 100644 GIT binary patch delta 90 zcmeyz{EvCUWG-`ELn8%4Gb=;miF4%~Av{wnLlbQSAmH*zEH2RvDN4*M&PgoEFS1ey h$;i)5ELL#ND9S7@$xKzSDap@u0ODk*z{WpJi~#Ap9o+x` delta 90 zcmeyz{EvCUWG-V}149Kv3oB!biF4%~Av|*+PulKW2=@Mjjsk diff --git a/rest_framework/locale/vi/LC_MESSAGES/django.po b/rest_framework/locale/vi/LC_MESSAGES/django.po index 0f8415b51..ea43efb95 100644 --- a/rest_framework/locale/vi/LC_MESSAGES/django.po +++ b/rest_framework/locale/vi/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: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Vietnamese (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/vi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,40 +17,40 @@ msgstr "" "Language: vi\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "" -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "" -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "" @@ -58,23 +58,23 @@ msgstr "" msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -123,7 +123,6 @@ msgid "Not found." msgstr "" #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "" @@ -132,7 +131,6 @@ msgid "Could not satisfy the request Accept header." msgstr "" #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "" @@ -140,214 +138,201 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "" -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "" -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "" -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "" -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "" -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "" -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "" -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "" -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "" -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "" -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "" -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "" -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "" -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "" -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "" -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "" -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "" -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "" -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "" -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "" -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "" -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "" -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "" -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "" -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "" -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "" -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "" -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" @@ -364,25 +349,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "" #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "" #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "" -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "" @@ -412,27 +394,23 @@ msgstr "" msgid "No items to select." msgstr "" -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "" -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "" -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "" -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "" -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "" @@ -440,15 +418,19 @@ msgstr "" msgid "Invalid version in \"Accept\" header." msgstr "" -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "" -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "" -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "" diff --git a/rest_framework/locale/zh_CN/LC_MESSAGES/django.mo b/rest_framework/locale/zh_CN/LC_MESSAGES/django.mo index ecd7a91eb16f364fa0360fc7fbd39b25a49c22be..5ba81a865ad7aef3a93f1a08a8d83700339ef844 100644 GIT binary patch delta 93 zcmbR4H{EZ;RWUAeT|*-ULo+KwoEH24RRj?_^&vgLeWT?PqJMo+R06wf9w*UYD delta 93 zcmbR4H{EZ;RWUAOT?0b}LklZoi^=!J\n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Chinese (China) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,40 +20,40 @@ msgstr "" "Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "无效的Basic认证头，没有提供认证信息。" -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "认证字符串不应该包含空格（基本认证HTTP头无效）。" -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "认证字符串base64编码错误（基本认证HTTP头无效）。" -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "用户名或者密码错误。" -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "用户未激活或者已删除。" -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "没有提供认证信息（认证令牌HTTP头无效）。" -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "认证令牌字符串不应该包含空格（无效的认证令牌HTTP头）。" -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "无效的Token。Token字符串不能包含非法的字符。" -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "认证令牌无效。" @@ -61,23 +61,23 @@ msgstr "认证令牌无效。" msgid "Auth Token" msgstr "认证令牌" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "用户" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "令牌" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "令牌" @@ -126,7 +126,6 @@ msgid "Not found." msgstr "未找到。" #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "方法 “{method}” 不被允许。" @@ -135,7 +134,6 @@ msgid "Could not satisfy the request Accept header." msgstr "无法满足Accept HTTP头的请求。" #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "不支持请求中的媒体类型 “{media_type}”。" @@ -143,214 +141,201 @@ msgstr "不支持请求中的媒体类型 “{media_type}”。" msgid "Request was throttled." msgstr "请求超过了限速。" -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "该字段是必填项。" -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "该字段不能为 null。" -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "“{input}” 不是合法的布尔值。" -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "该字段不能为空。" -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "请确保这个字段不能超过 {max_length} 个字符。" -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "请确保这个字段至少包含 {min_length} 个字符。" -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "请输入合法的邮件地址。" -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "输入值不匹配要求的模式。" -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "请输入合法的“短语“，只能包含字母，数字，下划线或者中划线。" -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "请输入合法的URL。" -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "“{value}”不是合法的UUID。" -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "请输入一个有效的IPv4或IPv6地址。" -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "请填写合法的整数值。" -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "请确保该值小于或者等于 {max_value}。" -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "请确保该值大于或者等于 {min_value}。" -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "字符串值太长。" -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "请填写合法的数字。" -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "请确保总计不超过 {max_digits} 个数字。" -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "请确保总计不超过 {max_decimal_places} 个小数位。" -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "请确保小数点前不超过 {max_whole_digits} 个数字。" -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "日期时间格式错误。请从这些格式中选择：{format}。" -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "期望为日期时间，得到的是日期。" -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "日期格式错误。请从这些格式中选择：{format}。" -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "期望为日期，得到的是日期时间。" -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "时间格式错误。请从这些格式中选择：{format}。" -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "持续时间的格式错误。使用这些格式中的一个：{format}。" -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "“{input}” 不是合法选项。" -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "多于{count}条记录。" -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "期望为一个包含物件的列表，得到的类型是“{input_type}”。" -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "这项选择不能为空。" -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "“{input}” 不是有效路径选项。" -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "没有提交任何文件。" -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "提交的数据不是一个文件。请检查表单的编码类型。" -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "无法检测到文件名。" -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "提交的是空文件。" -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "确保该文件名最多包含 {max_length} 个字符 ( 当前长度为{length} ) 。" -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "请上传有效图片。您上传的该文件不是图片或者图片已经损坏。" -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "列表字段不能为空值。" -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "期望是包含类目的字典，得到类型为 “{input_type}”。" -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "值必须是有效的 JSON 数据。" -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "保存" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "无效游标" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "无效主键 “{pk_value}” － 对象不存在。" #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "类型错误。期望为主键，得到的类型为 {data_type}。" @@ -367,25 +352,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "无效超链接 －对象不存在。" #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "类型错误。期望为URL字符串，实际的类型是 {data_type}。" -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "属性 {slug_name} 为 {value} 的对象不存在。" -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "无效值。" #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "无效数据。期待为字典类型，得到的是 {datatype} 。" -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "过滤器" @@ -415,27 +397,23 @@ msgstr "无" msgid "No items to select." msgstr "没有可选项。" -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "该字段必须唯一。" -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "字段 {field_names} 必须能构成唯一集合。" -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "该字段必须在日期 “{date_field}” 唯一。" -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "该字段必须在月份 “{date_field}” 唯一。" -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "该字段必须在年 “{date_field}” 唯一。" @@ -443,15 +421,19 @@ msgstr "该字段必须在年 “{date_field}” 唯一。" msgid "Invalid version in \"Accept\" header." msgstr "“Accept” HTTP头包含无效版本。" -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "URL路径包含无效版本。" -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "主机名包含无效版本。" -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "请求参数里包含无效版本。" diff --git a/rest_framework/locale/zh_Hans/LC_MESSAGES/django.mo b/rest_framework/locale/zh_Hans/LC_MESSAGES/django.mo index cffdae362001044baa09a3a24b87ea50bab071ad..396aded071dcd23c423b058c51168a736bea1410 100644 GIT binary patch delta 93 zcmX@&bHrzZnHZP3uAz~Fp_!GT@ni=vIY$WB)XLCA+W-i-d=iUGbVG^~^NMp4OY)1X k6hboca}$ddoHL3ti%T+76>LiKa~*&<87i=OzSvTJ0Qv+S`v3p{ delta 93 zcmX@&bHrzZnHZO`u7RO~p@o&P#bgIDIY$WB9LUu+00J(b#Nra&kfOxA;+({i{30ub lh{UqY)FK7{qLlo?(n, 2015 +# cokky , 2015 # hunter007 , 2015 # nypisces , 2015 msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Chinese Simplified (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/zh-Hans/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,40 +20,40 @@ msgstr "" "Language: zh-Hans\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "无效的Basic认证头，没有提供认证信息。" -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "认证字符串不应该包含空格（基本认证HTTP头无效）。" -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "认证字符串base64编码错误（基本认证HTTP头无效）。" -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "用户名或者密码错误。" -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "用户未激活或者已删除。" -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "没有提供认证信息（认证令牌HTTP头无效）。" -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "认证令牌字符串不应该包含空格（无效的认证令牌HTTP头）。" -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "无效的Token。Token字符串不能包含非法的字符。" -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "认证令牌无效。" @@ -61,23 +61,23 @@ msgstr "认证令牌无效。" msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -126,7 +126,6 @@ msgid "Not found." msgstr "未找到。" #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "方法 “{method}” 不被允许。" @@ -135,7 +134,6 @@ msgid "Could not satisfy the request Accept header." msgstr "无法满足Accept HTTP头的请求。" #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "不支持请求中的媒体类型 “{media_type}”。" @@ -143,214 +141,201 @@ msgstr "不支持请求中的媒体类型 “{media_type}”。" msgid "Request was throttled." msgstr "请求超过了限速。" -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "该字段是必填项。" -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "该字段不能为 null。" -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "“{input}” 不是合法的布尔值。" -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "该字段不能为空。" -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "请确保这个字段不能超过 {max_length} 个字符。" -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "请确保这个字段至少包含 {min_length} 个字符。" -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "请输入合法的邮件地址。" -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "输入值不匹配要求的模式。" -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "请输入合法的“短语“，只能包含字母，数字，下划线或者中划线。" -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "请输入合法的URL。" -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "“{value}”不是合法的UUID。" -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "请输入一个有效的IPv4或IPv6地址。" -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "请填写合法的整数值。" -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "请确保该值小于或者等于 {max_value}。" -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "请确保该值大于或者等于 {min_value}。" -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "字符串值太长。" -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "请填写合法的数字。" -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "请确保总计不超过 {max_digits} 个数字。" -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "请确保总计不超过 {max_decimal_places} 个小数位。" -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "请确保小数点前不超过 {max_whole_digits} 个数字。" -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "日期时间格式错误。请从这些格式中选择：{format}。" -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "期望为日期时间，获得的是日期。" -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "日期格式错误。请从这些格式中选择：{format}。" -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "期望为日期，获得的是日期时间。" -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "时间格式错误。请从这些格式中选择：{format}。" -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "持续时间的格式错误。使用这些格式中的一个：{format}。" -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "“{input}” 不是合法选项。" -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "多于{count}条记录。" -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "期望为一个包含物件的列表，得到的类型是“{input_type}”。" -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "这项选择不能为空。" -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "\"{input}\"不是一个有效路径选项。" -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "没有提交任何文件。" -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "提交的数据不是一个文件。请检查表单的编码类型。" -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "无法检测到文件名。" -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "提交的是空文件。" -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "确保该文件名最多包含 {max_length} 个字符 ( 当前长度为{length} ) 。" -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "请上传有效图片。您上传的该文件不是图片或者图片已经损坏。" -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "列表不能为空。" -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "期望是包含类目的字典，得到类型为 “{input_type}”。" -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "值必须是有效的 JSON 数据。" -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "提交" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "无效游标" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "无效主键 “{pk_value}” － 对象不存在。" #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "类型错误。期望为主键，获得的类型为 {data_type}。" @@ -367,25 +352,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "无效超链接 －对象不存在。" #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "类型错误。期望为URL字符串，实际的类型是 {data_type}。" -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "属性 {slug_name} 为 {value} 的对象不存在。" -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "无效值。" #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "无效数据。期待为字典类型，得到的是 {datatype} 。" -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "过滤器" @@ -415,27 +397,23 @@ msgstr "无" msgid "No items to select." msgstr "没有可选项。" -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "该字段必须唯一。" -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "字段 {field_names} 必须能构成唯一集合。" -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "该字段必须在日期 “{date_field}” 唯一。" -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "该字段必须在月份 “{date_field}” 唯一。" -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "该字段必须在年 “{date_field}” 唯一。" @@ -443,15 +421,19 @@ msgstr "该字段必须在年 “{date_field}” 唯一。" msgid "Invalid version in \"Accept\" header." msgstr "“Accept” HTTP头包含无效版本。" -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "URL路径包含无效版本。" -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "主机名包含无效版本。" -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "请求参数里包含无效版本。" diff --git a/rest_framework/locale/zh_Hant/LC_MESSAGES/django.mo b/rest_framework/locale/zh_Hant/LC_MESSAGES/django.mo index d33604524b1bd71b84486a858d72aeb44b7f192c..08954cc4b5b4a72098439b06e44d3f66a3a0aba6 100644 GIT binary patch delta 90 zcmbQpGLdD%WG-`ELn8%4Gb=;miF4%~Av{wnLlbQSAmH*zEH2RvDN4*M&PgoEFS1ey h$;i)5ELL#ND9S7@$xKzSDap@u0ODk*z{WqKi~yd<9T)%r delta 90 zcmbQpGLdD%WG-V}149Kv3oB!biF4%~Av|*+PulKWU34QXN_V diff --git a/rest_framework/locale/zh_Hant/LC_MESSAGES/django.po b/rest_framework/locale/zh_Hant/LC_MESSAGES/django.po index ea6a45312..1960f1f5d 100644 --- a/rest_framework/locale/zh_Hant/LC_MESSAGES/django.po +++ b/rest_framework/locale/zh_Hant/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: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Chinese Traditional (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/zh-Hant/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,40 +17,40 @@ msgstr "" "Language: zh-Hant\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "" -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "" -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "" @@ -58,23 +58,23 @@ msgstr "" msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -123,7 +123,6 @@ msgid "Not found." msgstr "" #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "" @@ -132,7 +131,6 @@ msgid "Could not satisfy the request Accept header." msgstr "" #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "" @@ -140,214 +138,201 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "" -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "" -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "" -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "" -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "" -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "" -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "" -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "" -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "" -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "" -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "" -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "" -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "" -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "" -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "" -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "" -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "" -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "" -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "" -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "" -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "" -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "" -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "" -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "" -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "" -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "" -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "" -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" @@ -364,25 +349,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "" #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "" #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "" -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "" @@ -412,27 +394,23 @@ msgstr "" msgid "No items to select." msgstr "" -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "" -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "" -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "" -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "" -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "" @@ -440,15 +418,19 @@ msgstr "" msgid "Invalid version in \"Accept\" header." msgstr "" -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "" -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "" -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "" diff --git a/rest_framework/locale/zh_TW/LC_MESSAGES/django.mo b/rest_framework/locale/zh_TW/LC_MESSAGES/django.mo index 6371fcea7fd84e256c8240ad704f5cdbe3ced0c9..b3158f9eb92fc5e7e91b9b98d96ef3e651fe3bf3 100644 GIT binary patch delta 90 zcmeBT>0+5Mnaf<)&`811%*xPs;#@gL2+!2Y&_vq+2)KL_i%WDviW2jRa}rDPi>wqv hGV*g1ixr$RiZY8!GE)_7O7e3ZfH)Z{u<;KcBLJD)9RmOW delta 90 zcmeBT>0+5Mnafz$z)-=^!phiU;#@gL2+thI(>4GCE}z8W65WuZ#Ju91#FG3XD}{)} ivdq*X1^=Ry{KC>o1)GX|2+JWSGcUg^GjZb|K1KkbW*tQU diff --git a/rest_framework/locale/zh_TW/LC_MESSAGES/django.po b/rest_framework/locale/zh_TW/LC_MESSAGES/django.po index 8858ce17c..9bfb23c6b 100644 --- a/rest_framework/locale/zh_TW/LC_MESSAGES/django.po +++ b/rest_framework/locale/zh_TW/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: 2016-03-01 18:38+0100\n" -"PO-Revision-Date: 2016-03-01 17:38+0000\n" -"Last-Translator: Xavier Ordoquy \n" +"POT-Creation-Date: 2016-07-12 16:13+0100\n" +"PO-Revision-Date: 2016-07-12 15:14+0000\n" +"Last-Translator: Thomas Christie \n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,40 +17,40 @@ msgstr "" "Language: zh_TW\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: authentication.py:71 +#: authentication.py:73 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:74 +#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:80 +#: authentication.py:82 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:97 +#: authentication.py:99 msgid "Invalid username/password." msgstr "" -#: authentication.py:100 authentication.py:195 +#: authentication.py:102 authentication.py:198 msgid "User inactive or deleted." msgstr "" -#: authentication.py:173 +#: authentication.py:176 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:176 +#: authentication.py:179 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:182 +#: authentication.py:185 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:192 +#: authentication.py:195 msgid "Invalid token." msgstr "" @@ -58,23 +58,23 @@ msgstr "" msgid "Auth Token" msgstr "" -#: authtoken/models.py:21 +#: authtoken/models.py:15 msgid "Key" msgstr "" -#: authtoken/models.py:23 +#: authtoken/models.py:18 msgid "User" msgstr "" -#: authtoken/models.py:24 +#: authtoken/models.py:20 msgid "Created" msgstr "" -#: authtoken/models.py:33 +#: authtoken/models.py:29 msgid "Token" msgstr "" -#: authtoken/models.py:34 +#: authtoken/models.py:30 msgid "Tokens" msgstr "" @@ -123,7 +123,6 @@ msgid "Not found." msgstr "" #: exceptions.py:109 -#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "" @@ -132,7 +131,6 @@ msgid "Could not satisfy the request Accept header." msgstr "" #: exceptions.py:132 -#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "" @@ -140,214 +138,201 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:266 relations.py:206 relations.py:239 validators.py:79 -#: validators.py:162 +#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 +#: validators.py:181 msgid "This field is required." msgstr "" -#: fields.py:267 +#: fields.py:270 msgid "This field may not be null." msgstr "" -#: fields.py:603 fields.py:634 -#, python-brace-format +#: fields.py:608 fields.py:639 msgid "\"{input}\" is not a valid boolean." msgstr "" -#: fields.py:669 +#: fields.py:674 msgid "This field may not be blank." msgstr "" -#: fields.py:670 fields.py:1664 -#, python-brace-format +#: fields.py:675 fields.py:1675 msgid "Ensure this field has no more than {max_length} characters." msgstr "" -#: fields.py:671 -#, python-brace-format +#: fields.py:676 msgid "Ensure this field has at least {min_length} characters." msgstr "" -#: fields.py:708 +#: fields.py:713 msgid "Enter a valid email address." msgstr "" -#: fields.py:719 +#: fields.py:724 msgid "This value does not match the required pattern." msgstr "" -#: fields.py:730 +#: fields.py:735 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "" -#: fields.py:742 +#: fields.py:747 msgid "Enter a valid URL." msgstr "" -#: fields.py:755 -#, python-brace-format +#: fields.py:760 msgid "\"{value}\" is not a valid UUID." msgstr "" -#: fields.py:791 +#: fields.py:796 msgid "Enter a valid IPv4 or IPv6 address." msgstr "" -#: fields.py:816 +#: fields.py:821 msgid "A valid integer is required." msgstr "" -#: fields.py:817 fields.py:852 fields.py:885 -#, python-brace-format +#: fields.py:822 fields.py:857 fields.py:891 msgid "Ensure this value is less than or equal to {max_value}." msgstr "" -#: fields.py:818 fields.py:853 fields.py:886 -#, python-brace-format +#: fields.py:823 fields.py:858 fields.py:892 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "" -#: fields.py:819 fields.py:854 fields.py:890 +#: fields.py:824 fields.py:859 fields.py:896 msgid "String value too large." msgstr "" -#: fields.py:851 fields.py:884 +#: fields.py:856 fields.py:890 msgid "A valid number is required." msgstr "" -#: fields.py:887 -#, python-brace-format +#: fields.py:893 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "" -#: fields.py:888 -#, python-brace-format +#: fields.py:894 msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "" -#: fields.py:889 -#, python-brace-format +#: fields.py:895 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "" -#: fields.py:1004 -#, python-brace-format +#: fields.py:1025 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1005 +#: fields.py:1026 msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1082 -#, python-brace-format +#: fields.py:1103 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1083 +#: fields.py:1104 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1151 -#, python-brace-format +#: fields.py:1170 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1215 -#, python-brace-format +#: fields.py:1232 msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1240 fields.py:1289 -#, python-brace-format +#: fields.py:1251 fields.py:1300 msgid "\"{input}\" is not a valid choice." msgstr "" -#: fields.py:1243 relations.py:71 relations.py:442 -#, python-brace-format +#: fields.py:1254 relations.py:71 relations.py:441 msgid "More than {count} items..." msgstr "" -#: fields.py:1290 fields.py:1437 relations.py:438 serializers.py:520 -#, python-brace-format +#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1291 +#: fields.py:1302 msgid "This selection may not be empty." msgstr "" -#: fields.py:1328 -#, python-brace-format +#: fields.py:1339 msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1347 +#: fields.py:1358 msgid "No file was submitted." msgstr "" -#: fields.py:1348 +#: fields.py:1359 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1349 +#: fields.py:1360 msgid "No filename could be determined." msgstr "" -#: fields.py:1350 +#: fields.py:1361 msgid "The submitted file is empty." msgstr "" -#: fields.py:1351 -#, python-brace-format +#: fields.py:1362 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1399 +#: fields.py:1410 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: fields.py:1438 relations.py:439 serializers.py:521 +#: fields.py:1449 relations.py:438 serializers.py:525 msgid "This list may not be empty." msgstr "" -#: fields.py:1491 -#, python-brace-format +#: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1538 +#: fields.py:1549 msgid "Value must be valid JSON." msgstr "" -#: filters.py:35 templates/rest_framework/filters/django_filter.html.py:5 +#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 msgid "Submit" msgstr "" -#: pagination.py:189 +#: filters.py:336 +msgid "ascending" +msgstr "" + +#: filters.py:337 +msgid "descending" +msgstr "" + +#: pagination.py:193 msgid "Invalid page." msgstr "" -#: pagination.py:407 +#: pagination.py:427 msgid "Invalid cursor" msgstr "" #: relations.py:207 -#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" #: relations.py:208 -#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" @@ -364,25 +349,22 @@ msgid "Invalid hyperlink - Object does not exist." msgstr "" #: relations.py:243 -#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:402 -#, python-brace-format +#: relations.py:401 msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:403 +#: relations.py:402 msgid "Invalid value." msgstr "" #: serializers.py:326 -#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "" -#: templates/rest_framework/admin.html:118 +#: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:128 msgid "Filters" msgstr "" @@ -412,27 +394,23 @@ msgstr "" msgid "No items to select." msgstr "" -#: validators.py:24 +#: validators.py:43 msgid "This field must be unique." msgstr "" -#: validators.py:78 -#, python-brace-format +#: validators.py:97 msgid "The fields {field_names} must make a unique set." msgstr "" -#: validators.py:226 -#, python-brace-format +#: validators.py:245 msgid "This field must be unique for the \"{date_field}\" date." msgstr "" -#: validators.py:241 -#, python-brace-format +#: validators.py:260 msgid "This field must be unique for the \"{date_field}\" month." msgstr "" -#: validators.py:254 -#, python-brace-format +#: validators.py:273 msgid "This field must be unique for the \"{date_field}\" year." msgstr "" @@ -440,15 +418,19 @@ msgstr "" msgid "Invalid version in \"Accept\" header." msgstr "" -#: versioning.py:73 versioning.py:115 +#: versioning.py:73 msgid "Invalid version in URL path." msgstr "" -#: versioning.py:144 +#: versioning.py:115 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:147 msgid "Invalid version in hostname." msgstr "" -#: versioning.py:166 +#: versioning.py:169 msgid "Invalid version in query parameter." msgstr "" diff --git a/rest_framework/routers.py b/rest_framework/routers.py index a71bb7791..69d73e842 100644 --- a/rest_framework/routers.py +++ b/rest_framework/routers.py @@ -273,10 +273,11 @@ class DefaultRouter(SimpleRouter): include_root_view = True include_format_suffixes = True root_view_name = 'api-root' - schema_renderers = [renderers.CoreJSONRenderer] + default_schema_renderers = [renderers.CoreJSONRenderer] def __init__(self, *args, **kwargs): self.schema_title = kwargs.pop('schema_title', None) + self.schema_renderers = kwargs.pop('schema_renderers', self.default_schema_renderers) super(DefaultRouter, self).__init__(*args, **kwargs) def get_api_root_view(self, schema_urls=None): diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 3fcc85c3b..8c39202f4 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -1013,12 +1013,12 @@ class ModelSerializer(Serializer): if fields is None and exclude is None: warnings.warn( "Creating a ModelSerializer without either the 'fields' " - "attribute or the 'exclude' attribute is pending deprecation " + "attribute or the 'exclude' attribute is deprecated " "since 3.3.0. Add an explicit fields = '__all__' to the " "{serializer_class} serializer.".format( serializer_class=self.__class__.__name__ ), - PendingDeprecationWarning + DeprecationWarning ) if fields == ALL_FIELDS: diff --git a/rest_framework/settings.py b/rest_framework/settings.py index 946b905c6..68c7709e8 100644 --- a/rest_framework/settings.py +++ b/rest_framework/settings.py @@ -19,8 +19,6 @@ back to the defaults. """ from __future__ import unicode_literals -import warnings - from django.conf import settings from django.test.signals import setting_changed from django.utils import six @@ -218,7 +216,7 @@ class APISettings(object): SETTINGS_DOC = "http://www.django-rest-framework.org/api-guide/settings/" for setting in REMOVED_SETTINGS: if setting in user_settings: - warnings.warn("The '%s' setting has been removed. Please refer to '%s' for available settings." % (setting, SETTINGS_DOC), DeprecationWarning) + raise RuntimeError("The '%s' setting has been removed. Please refer to '%s' for available settings." % (setting, SETTINGS_DOC)) return user_settings diff --git a/tests/test_settings.py b/tests/test_settings.py index 658c61997..9ba552d28 100644 --- a/tests/test_settings.py +++ b/tests/test_settings.py @@ -1,7 +1,5 @@ from __future__ import unicode_literals -import warnings - from django.test import TestCase from rest_framework.settings import APISettings @@ -25,13 +23,10 @@ class TestSettings(TestCase): Make sure user is alerted with an error when a removed setting is set. """ - with warnings.catch_warnings(record=True) as w: - warnings.simplefilter("always") + with self.assertRaises(RuntimeError): APISettings({ 'MAX_PAGINATE_BY': 100 }) - self.assertEqual(len(w), 1) - self.assertTrue(issubclass(w[-1].category, DeprecationWarning)) class TestSettingTypes(TestCase): From e107c1dc35896ad11ca662c2379754b36b6c9e30 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 13 Jul 2016 16:33:27 +0100 Subject: [PATCH 150/457] Resize sponsor images --- docs/img/premium/rover-readme.png | Bin 50446 -> 53118 bytes docs/img/premium/sentry-readme.png | Bin 21795 -> 24584 bytes docs/img/premium/stream-readme.png | Bin 13940 -> 19341 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/docs/img/premium/rover-readme.png b/docs/img/premium/rover-readme.png index 3436a049c6c0b8deb7aca2140e7784d43461e476..aeef1de4f4fde08476547984fa27046c2fadaec9 100644 GIT binary patch delta 52469 zcmV)WK(4=ziUaRT4 zGLr!VW&|`jJTH?`0~M2i17-^`GaxZGIxsgnIWv>-1A%|~;++)$06+jqL_t(|0qni! z+h*5w-glXL4GJ{4CBmnjXQlv#+PR zT+^)A@7M^eC!}}m(7#E?YhQQ6piHtNnHbgk!gJgVX1=+q#?4_X+Z!(6T1m0qzeXdl zo{+B5fyFK72rcfFZ3Et5GfzD8_W2FUBo|92orr(tIKj+omN`O7o4$-1Q_nmJoj-q3 zRW{kO-@y2F@Kqmy^@McQ58)d)poQyHpv6rR7~4%=iNRGT1Jfme0AEN#5o1~NM780( zC@n+`-4yMZQh?3zMc;{Nq#HpS>j~*<8nIr0*j#O|MRq~dH)sJq zIX6!d@N6g^i-Jdgk)R(^-#bi`*zH zE7fD$2AB;44UWNK@phifX5jVa)f0jBgmk5j6$@}>amFZMwM{l(tTUPsrv~68B`tqu z`rcHcVR^SaH*-jqLo)$P4}aREgYn!?+bDk1iv(HCYZekt(T)2s(5YY(wBdYFaf$9jqu5*T2yKhzW_4hgga?L}N%lH)`LRsy~3g$mY8uuqAq5*IKhoLFIccsqZQw46~8 zeEdfr%qk0Qcm->pTmyjK2qhgeSxjvT58TLEe-5KPFEbnF;Pv*}M_}{Xt6bMOMqpfV zBjkcc@6|NIEUd`cp2nQUD2UlhFq0As=kA2sQMCQ zEy7c5hiX#EdF(?VeBF0Dgyw%!-*g4<_GpJl!*5Ar!m~Q@STcUn28f)C^&#ydn@!Vw zYIx@T_4Z|p!1^B2WedF&*D9#BHCnRJZyJF5%i>E?0WdBkGkI-AuKFY%^H4cK6bvAo z#Y4k;GQ~pzfpZ)kuY>6qG zuVrIfV1k%W5}kP5u}^={MoV$26PJr-1kZSALf4!N0!9W4>i85i)y3!+2-Z8R8G-eL zw3^X;16iKavx)8HqD|n1sD)!3E3)t`N(i%q6Ra06inY9{Y1xLyboaxRE!KZbd@%^yY$JOx<|~=# z2VoAiZM$$W(X!cu2jZe>9%MBSV&E%XR@gA~(x#X<%?Vij^=hdRSWiex4R3^dqK~t^ z=DQ}n*9I$#MPt%5E=V*X5l!$Bm2H-BIUx{GA4=7V)!LKrmJU`N?j|`+7$u#E42^Y> zh(cjLwM#;C?XQ-rf=Q}Hu8G$hfl1i2-8w%nIekhgX980W5LohC^+

DIv}&Pz^MX9z*=SaG+j{|(L<%Lm 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 af&UKlGyQg`%qwF60000RT4 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 diff --git a/docs/img/premium/sentry-readme.png b/docs/img/premium/sentry-readme.png index a03cc8ee272f0b4ed61487697134f16197bedf02..0b8a80c496c30ad2466e2d9a4fe8c170bb457e12 100644 GIT binary patch delta 23710 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 diff --git a/docs/img/premium/stream-readme.png b/docs/img/premium/stream-readme.png index 619948d6b566302cae2c56e01fdde1b3bfd456e9..a04009d7fc0d1fe4fab5aa77215a94d5150d6354 100644 GIT binary patch literal 19341 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 Hn1%cw??H&q From 6f8a0f2a68c8132b5173720d3354618d488aa4d4 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 13 Jul 2016 16:46:50 +0100 Subject: [PATCH 151/457] Update release docs --- docs/topics/3.4-announcement.md | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/docs/topics/3.4-announcement.md b/docs/topics/3.4-announcement.md index d3af44298..6dd668a63 100644 --- a/docs/topics/3.4-announcement.md +++ b/docs/topics/3.4-announcement.md @@ -119,7 +119,7 @@ The following versions of Python and Django are now supported: The 3.4 release includes very limited deprecation or behavioral changes, and should present a straightforward upgrade. -#### Use fields or exclude on serializer classes. +### Use fields or exclude on serializer classes. The following change in 3.3.0 is now escalated from "pending deprecation" to "deprecated". Its usage will continue to function but will raise warnings: @@ -128,7 +128,7 @@ The following change in 3.3.0 is now escalated from "pending deprecation" to option, or an `exclude` option. The `fields = '__all__'` shortcut may be used to explicitly include all fields. -#### Microsecond precision when returning time or datetime +### Microsecond precision when returning time or datetime. Using the default JSON renderer and directly returning a `datetime` or `time` instance will now render with microsecond precision (6 digits), rather than @@ -145,6 +145,22 @@ and `TIME_FORMAT` settings. The renderer behavior can be modified by setting a custom `encoder_class` attribute on a `JSONRenderer` subclass. +### Relational choices no longer displayed in OPTIONS requests. + +Making an `OPTIONS` request to views that have a serializer choice field +will result in a list of the available choices being returned in the response. + +In cases where there is a relational field, the previous behavior would be +to return a list of available instances to choose from for that relational field. + +In order to minimise exposed information the behavior now is to *not* return +choices information for relational fields. + +If you want to override this new behavior you'll need to [implement a custom +metadata class][metadata]. + +See [issue #3751][gh3751] for more information on this behavioral change. + --- ## Other improvements @@ -170,3 +186,5 @@ The full set of itemized release notes [are available here][release-notes]. [api-clients]: api-clients.md [milestone]: https://github.com/tomchristie/django-rest-framework/milestone/35 [release-notes]: release-notes#34 +[metadata]: ../../api-guide/metadata/#custom-metadata-classes +[gh3751]: https://github.com/tomchristie/django-rest-framework/issues/3751 From 06751f85487e0f753ce59e4773e38c622782463a Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 13 Jul 2016 16:59:15 +0100 Subject: [PATCH 152/457] Minor docs tweaks --- README.md | 2 +- docs/topics/3.4-announcement.md | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 7be1b9880..a8e1afbf1 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,7 @@ There is a live example API for testing purposes, [available here][sandbox]. # Requirements * Python (2.7, 3.2, 3.3, 3.4, 3.5) -* Django (1.8, 1.9) +* Django (1.8, 1.9, 1.10) # Installation diff --git a/docs/topics/3.4-announcement.md b/docs/topics/3.4-announcement.md index 6dd668a63..69343c75e 100644 --- a/docs/topics/3.4-announcement.md +++ b/docs/topics/3.4-announcement.md @@ -77,6 +77,10 @@ the benefits of RESTful Web API design. We're expecting to expand the range of languages that we provide client libraries for over the coming months. +Further work on maturing the API schema support is also planned, including +documentation on supporting file upload and download, and improved support for +documentation generation and parameter annotation. + --- Current support for schema formats is as follows: From df33035a3c10934f153bc5a43042cf78a3dfce52 Mon Sep 17 00:00:00 2001 From: Rashid Al Abri Date: Thu, 14 Jul 2016 15:28:28 +0400 Subject: [PATCH 153/457] Change incorrect example URL (#4261) Changed http://example.com/api/items/4/.json to http://example.com/api/items/4.json --- docs/tutorial/2-requests-and-responses.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/tutorial/2-requests-and-responses.md b/docs/tutorial/2-requests-and-responses.md index 7a12cb5d3..5c020a1f7 100644 --- a/docs/tutorial/2-requests-and-responses.md +++ b/docs/tutorial/2-requests-and-responses.md @@ -96,7 +96,7 @@ Notice that we're no longer explicitly tying our requests or responses to a give ## Adding optional format suffixes to our URLs -To take advantage of the fact that our responses are no longer hardwired to a single content type let's add support for format suffixes to our API endpoints. Using format suffixes gives us URLs that explicitly refer to a given format, and means our API will be able to handle URLs such as [http://example.com/api/items/4/.json][json-url]. +To take advantage of the fact that our responses are no longer hardwired to a single content type let's add support for format suffixes to our API endpoints. Using format suffixes gives us URLs that explicitly refer to a given format, and means our API will be able to handle URLs such as [http://example.com/api/items/4.json][json-url]. Start by adding a `format` keyword argument to both of the views, like so. @@ -202,7 +202,7 @@ See the [browsable api][browsable-api] topic for more information about the brow In [tutorial part 3][tut-3], we'll start using class-based views, and see how generic views reduce the amount of code we need to write. -[json-url]: http://example.com/api/items/4/.json +[json-url]: http://example.com/api/items/4.json [devserver]: http://127.0.0.1:8000/snippets/ [browsable-api]: ../topics/browsable-api.md [tut-1]: 1-serialization.md From 5dd3d1b5d9dcbecf960e484eba9945964418a647 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 14 Jul 2016 12:29:37 +0100 Subject: [PATCH 154/457] Update coreapi version in docs --- docs/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/index.md b/docs/index.md index ccf7a7cd4..f64056cd8 100644 --- a/docs/index.md +++ b/docs/index.md @@ -91,7 +91,7 @@ REST framework requires the following: The following packages are optional: -* [coreapi][coreapi] (1.31.0+) - Schema generation support. +* [coreapi][coreapi] (1.32.0+) - Schema generation support. * [Markdown][markdown] (2.1.0+) - Markdown support for the browsable API. * [django-filter][django-filter] (0.9.2+) - Filtering support. * [django-crispy-forms][django-crispy-forms] - Improved HTML display for filtering. From aa40c58381ed562aafa1969f2d23d90d89f78191 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 14 Jul 2016 12:33:54 +0100 Subject: [PATCH 155/457] Note 'coreapi dump' command --- docs/topics/api-clients.md | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/docs/topics/api-clients.md b/docs/topics/api-clients.md index 25b0c6145..f17f5e4d4 100644 --- a/docs/topics/api-clients.md +++ b/docs/topics/api-clients.md @@ -161,15 +161,17 @@ credentials --help` or `coreapi headers --help`. ## Codecs By default the command line client only includes support for reading Core JSON -schemas, however it for installing additional codecs. +schemas, however it includes a plugin system for installing additional codecs. $ pip install openapi-codec jsonhyperschema-codec hal-codec $ coreapi codecs show Codecs - corejson "application/vnd.coreapi+json" - openapi "application/openapi+json" - jsonhyperschema "application/schema+json" - hal "application/hal+json" + corejson application/vnd.coreapi+json encoding, decoding + hal application/hal+json encoding, decoding + openapi application/openapi+json encoding, decoding + jsonhyperschema application/schema+json decoding + json application/json data + text text/* data ## Utilities @@ -202,6 +204,10 @@ To load a schema file from disk: $ coreapi load my-api-schema.json --format corejson +To dump the current document to console in a given format: + + $ coreapi dump --format openapi + To remove the current document, along with all currently saved history, credentials, headers and bookmarks: From a9218e460f9569a630e0f86f38349cb3e73ca626 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 14 Jul 2016 12:44:13 +0100 Subject: [PATCH 156/457] Minor tutorial updates --- .../5-relationships-and-hyperlinked-apis.md | 6 +++--- docs/tutorial/7-schemas-and-client-libraries.md | 13 +++++++++---- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/docs/tutorial/5-relationships-and-hyperlinked-apis.md b/docs/tutorial/5-relationships-and-hyperlinked-apis.md index 4b9347bfa..8cda09c62 100644 --- a/docs/tutorial/5-relationships-and-hyperlinked-apis.md +++ b/docs/tutorial/5-relationships-and-hyperlinked-apis.md @@ -18,7 +18,7 @@ Right now we have endpoints for 'snippets' and 'users', but we don't have a sing 'snippets': reverse('snippet-list', request=request, format=format) }) -Two things should be noticed here. First, we're using REST framework's `reverse` function in order to return fully-qualified URLs; second, URL patterns are identified by convenience names that we will declare later on in our `snippets/urls.py`. +Two things should be noticed here. First, we're using REST framework's `reverse` function in order to return fully-qualified URLs; second, URL patterns are identified by convenience names that we will declare later on in our `snippets/urls.py`. ## Creating an endpoint for the highlighted snippets @@ -80,7 +80,7 @@ We can easily re-write our existing serializers to use hyperlinking. In your `sn class Meta: model = Snippet - fields = ('url', 'highlight', 'owner', + fields = ('url', 'pk', 'highlight', 'owner', 'title', 'code', 'linenos', 'language', 'style') @@ -89,7 +89,7 @@ We can easily re-write our existing serializers to use hyperlinking. In your `sn class Meta: model = User - fields = ('url', 'username', 'snippets') + fields = ('url', 'pk', 'username', 'snippets') Notice that we've also added a new `'highlight'` field. This field is of the same type as the `url` field, except that it points to the `'snippet-highlight'` url pattern, instead of the `'snippet-detail'` url pattern. diff --git a/docs/tutorial/7-schemas-and-client-libraries.md b/docs/tutorial/7-schemas-and-client-libraries.md index 8d772a5bf..c2141489c 100644 --- a/docs/tutorial/7-schemas-and-client-libraries.md +++ b/docs/tutorial/7-schemas-and-client-libraries.md @@ -67,9 +67,13 @@ also supported. Now that our API is exposing a schema endpoint, we can use a dynamic client library to interact with the API. To demonstrate this, let's use the -Core API command line client. We've already installed the `coreapi` package -using `pip`, so the client tool should already be installed. Check that it -is available on the command line... +Core API command line client. + +The command line client is available as the `coreapi-cli` package: + + $ pip install coreapi-cli + +Now check that it is available on the command line... $ coreapi Usage: coreapi [OPTIONS] COMMAND [ARGS]... @@ -108,6 +112,7 @@ Let's try listing the existing snippets, using the command line client: [ { "url": "http://127.0.0.1:8000/snippets/1/", + "pk": 1, "highlight": "http://127.0.0.1:8000/snippets/1/highlight/", "owner": "lucy", "title": "Example", @@ -166,7 +171,7 @@ snippet: $ coreapi action snippets create --param title "Example" --param code "print('hello, world')" { "url": "http://127.0.0.1:8000/snippets/7/", - "id": 7, + "pk": 7, "highlight": "http://127.0.0.1:8000/snippets/7/highlight/", "owner": "lucy", "title": "Example", From 70e4a43ae3a03b6cf67133c1bb61cf13d0b25a6c Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 14 Jul 2016 12:56:57 +0100 Subject: [PATCH 157/457] Update coreapi requirement --- requirements/requirements-optionals.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/requirements-optionals.txt b/requirements/requirements-optionals.txt index 54c080491..20436e6b4 100644 --- a/requirements/requirements-optionals.txt +++ b/requirements/requirements-optionals.txt @@ -2,4 +2,4 @@ markdown==2.6.4 django-guardian==1.4.3 django-filter==0.13.0 -coreapi==1.21.1 +coreapi==1.32.0 From faf6f226cd001648fc421eea62e7cadcc14597f1 Mon Sep 17 00:00:00 2001 From: anoopmalav Date: Thu, 14 Jul 2016 22:57:38 +0530 Subject: [PATCH 158/457] Fix Typo in index.md Currently generating invalid URL at index page. http://www.django-rest-framework.org/'api-guide/schemas.md' Though it is correct in navigation. --- docs/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/index.md b/docs/index.md index f64056cd8..87e013b8e 100644 --- a/docs/index.md +++ b/docs/index.md @@ -346,7 +346,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. [versioning]: api-guide/versioning.md [contentnegotiation]: api-guide/content-negotiation.md [metadata]: api-guide/metadata.md -[schemas]: 'api-guide/schemas.md' +[schemas]: api-guide/schemas.md [formatsuffixes]: api-guide/format-suffixes.md [reverse]: api-guide/reverse.md [exceptions]: api-guide/exceptions.md From 1a65f72f71e7b4d0e776695fe11800e499af3d44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Germ=C3=A1n=20Larra=C3=ADn?= Date: Fri, 15 Jul 2016 14:34:27 -0400 Subject: [PATCH 159/457] docs.settings: fix name of `VERSION_PARAM` --- docs/api-guide/settings.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/settings.md b/docs/api-guide/settings.md index a73c6c16d..ea018053f 100644 --- a/docs/api-guide/settings.md +++ b/docs/api-guide/settings.md @@ -181,7 +181,7 @@ If set, this value will restrict the set of versions that may be returned by the Default: `None` -#### VERSION_PARAMETER +#### VERSION_PARAM The string that should used for any versioning parameters, such as in the media type or URL query parameters. From a436515196de60ea75ffa39b14a4a82551b79428 Mon Sep 17 00:00:00 2001 From: Aymeric Augustin Date: Sat, 16 Jul 2016 22:44:49 +0200 Subject: [PATCH 160/457] Add missing return statement. Fix #4272. --- rest_framework/compat.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/compat.py b/rest_framework/compat.py index 9c69eaa03..94f64265a 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -125,7 +125,7 @@ def get_related_model(field): def value_from_object(field, obj): if django.VERSION < (1, 9): return field._get_val_from_obj(obj) - field.value_from_object(obj) + return field.value_from_object(obj) # contrib.postgres only supported from 1.8 onwards. From bea243a0cadc36b481a36931f29e4c321f54a36b Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy Date: Mon, 18 Jul 2016 16:56:36 +0200 Subject: [PATCH 161/457] Fix coreapi param arguments. (#4274) --- docs/tutorial/7-schemas-and-client-libraries.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/tutorial/7-schemas-and-client-libraries.md b/docs/tutorial/7-schemas-and-client-libraries.md index c2141489c..77cfdd3b3 100644 --- a/docs/tutorial/7-schemas-and-client-libraries.md +++ b/docs/tutorial/7-schemas-and-client-libraries.md @@ -126,7 +126,7 @@ Let's try listing the existing snippets, using the command line client: Some of the API endpoints require named parameters. For example, to get back the highlight HTML for a particular snippet we need to provide an id. - $ coreapi action snippets highlight --param pk 1 + $ coreapi action snippets highlight --param pk=1 @@ -168,7 +168,7 @@ set of available interactions. We're now able to interact with these endpoints. For example, to create a new snippet: - $ coreapi action snippets create --param title "Example" --param code "print('hello, world')" + $ coreapi action snippets create --param title="Example" --param code="print('hello, world')" { "url": "http://127.0.0.1:8000/snippets/7/", "pk": 7, @@ -183,7 +183,7 @@ snippet: And to delete a snippet: - $ coreapi action snippets destroy --param pk 7 + $ coreapi action snippets destroy --param pk=7 As well as the command line client, developers can also interact with your API using client libraries. The Python client library is the first of these From d80b0eaead9c36c86577f8a0d759e34204b8ea37 Mon Sep 17 00:00:00 2001 From: Marc Gibbons Date: Mon, 18 Jul 2016 11:04:23 -0400 Subject: [PATCH 162/457] Update schema generator example (#4267) 1. The returns from the views needs to be a Response 2. I found that instantiating the generator at the module level caused an import error when starting Django, likely because it is executing before all the app load magic happened. Moving it into the view method solved this. --- docs/api-guide/schemas.md | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/docs/api-guide/schemas.md b/docs/api-guide/schemas.md index b39c35fa0..9d4dce93f 100644 --- a/docs/api-guide/schemas.md +++ b/docs/api-guide/schemas.md @@ -157,14 +157,14 @@ return the schema. **views.py:** from rest_framework.decorators import api_view, renderer_classes - from rest_framework import renderers, schemas + from rest_framework import renderers, response, schemas - generator = schemas.SchemaGenerator(title='Bookings API') @api_view() @renderer_classes([renderers.CoreJSONRenderer]) def schema_view(request): - return generator.get_schema() + generator = schemas.SchemaGenerator(title='Bookings API') + return response.Response(generator.get_schema()) **urls.py:** @@ -185,7 +185,8 @@ you need to pass the `request` argument to the `get_schema()` method, like so: @api_view() @renderer_classes([renderers.CoreJSONRenderer]) def schema_view(request): - return generator.get_schema(request=request) + generator = schemas.SchemaGenerator(title='Bookings API') + return response.Response(generator.get_schema(request=request)) ## Explicit schema definition @@ -196,7 +197,7 @@ representation. import coreapi from rest_framework.decorators import api_view, renderer_classes - from rest_framework import renderers + from rest_framework import renderers, response schema = coreapi.Document( title='Bookings API', @@ -208,7 +209,7 @@ representation. @api_view() @renderer_classes([renderers.CoreJSONRenderer]) def schema_view(request): - return schema + return response.Response(schema) ## Static schema file @@ -273,7 +274,8 @@ Returns a `coreapi.Document` instance that represents the API schema. @api_view @renderer_classes([renderers.CoreJSONRenderer]) def schema_view(request): - return generator.get_schema() + generator = schemas.SchemaGenerator(title='Bookings API') + return Response(generator.get_schema()) Arguments: From e476c222f98c4a455bf806fa05c5d70a9e0f37da Mon Sep 17 00:00:00 2001 From: Philippe Ombredanne Date: Mon, 18 Jul 2016 17:08:44 +0200 Subject: [PATCH 163/457] Add LICENSE.md to the built wheel (#4270) The wheel released on Pypi does not include the license file . The way to do this is by updating the setup.cfg accordingly --- setup.cfg | 3 +++ 1 file changed, 3 insertions(+) diff --git a/setup.cfg b/setup.cfg index 5e4090017..fd8b0682b 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,2 +1,5 @@ [wheel] universal = 1 + +[metadata] +license_file = LICENSE.md From 71cdda93993bb326b13b724b1659f20c81350cd5 Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Tue, 19 Jul 2016 11:31:29 +0600 Subject: [PATCH 164/457] updated minor django versions --- tox.ini | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tox.ini b/tox.ini index 1a160a299..89655aee2 100644 --- a/tox.ini +++ b/tox.ini @@ -15,9 +15,9 @@ setenv = PYTHONDONTWRITEBYTECODE=1 PYTHONWARNINGS=once deps = - django18: Django==1.8.13 - django19: Django==1.9.7 - django110: Django==1.10b1 + django18: Django==1.8.14 + django19: Django==1.9.8 + django110: Django==1.10rc1 djangomaster: https://github.com/django/django/archive/master.tar.gz -rrequirements/requirements-testing.txt -rrequirements/requirements-optionals.txt From 02a81d33621057225d0f3d7b9e3368793f428f28 Mon Sep 17 00:00:00 2001 From: Osvaldo Santana Neto Date: Tue, 19 Jul 2016 14:15:49 -0300 Subject: [PATCH 165/457] Fix SwaggerRenderer implementation example --- docs/api-guide/schemas.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/schemas.md b/docs/api-guide/schemas.md index 9d4dce93f..6585801e7 100644 --- a/docs/api-guide/schemas.md +++ b/docs/api-guide/schemas.md @@ -246,7 +246,7 @@ to the Open API ("Swagger") format: def render(self, data, media_type=None, renderer_context=None): codec = OpenAPICodec() - return OpenAPICodec.dump(data) + return codec.dump(data) --- From 48465a667a5583a2fcd8589793947af7130e3805 Mon Sep 17 00:00:00 2001 From: Hendra Date: Tue, 26 Jul 2016 18:03:05 +0800 Subject: [PATCH 166/457] Remove outdated resources (#4295) Removed links to Youtube videos that are no longer available and updated a link to a tutorial that has moved. --- docs/topics/third-party-resources.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/docs/topics/third-party-resources.md b/docs/topics/third-party-resources.md index 4be88d618..4366269bb 100644 --- a/docs/topics/third-party-resources.md +++ b/docs/topics/third-party-resources.md @@ -273,8 +273,6 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque * [Ember and Django Part 1 (Video)][ember-and-django-part 1-video] * [Django Rest Framework Part 1 (Video)][django-rest-framework-part-1-video] -* [Pyowa July 2013 - Django Rest Framework (Video)][pyowa-july-2013-django-rest-framework-video] -* [django-rest-framework and angularjs (Video)][django-rest-framework-and-angularjs-video] ### Articles @@ -335,7 +333,7 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque [ember-django-adapter]: https://github.com/dustinfarris/ember-django-adapter [beginners-guide-to-the-django-rest-framework]: http://code.tutsplus.com/tutorials/beginners-guide-to-the-django-rest-framework--cms-19786 [getting-started-with-django-rest-framework-and-angularjs]: http://blog.kevinastone.com/getting-started-with-django-rest-framework-and-angularjs.html -[end-to-end-web-app-with-django-rest-framework-angularjs]: http://blog.mourafiq.com/post/55034504632/end-to-end-web-app-with-django-rest-framework +[end-to-end-web-app-with-django-rest-framework-angularjs]: http://mourafiq.com/2013/07/01/end-to-end-web-app-with-django-angular-1.html [start-your-api-django-rest-framework-part-1]: https://godjango.com/41-start-your-api-django-rest-framework-part-1/ [permissions-authentication-django-rest-framework-part-2]: https://godjango.com/43-permissions-authentication-django-rest-framework-part-2/ [viewsets-and-routers-django-rest-framework-part-3]: https://godjango.com/45-viewsets-and-routers-django-rest-framework-part-3/ @@ -343,8 +341,6 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque [check-credentials-using-django-rest-framework]: http://richardtier.com/2014/03/06/110/ [ember-and-django-part 1-video]: http://www.neckbeardrepublic.com/screencasts/ember-and-django-part-1 [django-rest-framework-part-1-video]: http://www.neckbeardrepublic.com/screencasts/django-rest-framework-part-1 -[pyowa-july-2013-django-rest-framework-video]: http://www.youtube.com/watch?v=e1zrehvxpbo -[django-rest-framework-and-angularjs-video]: http://www.youtube.com/watch?v=q8frbgtj020 [web-api-performance-profiling-django-rest-framework]: http://dabapps.com/blog/api-performance-profiling-django-rest-framework/ [api-development-with-django-and-django-rest-framework]: https://bnotions.com/api-development-with-django-and-django-rest-framework/ [django-rest-auth]: https://github.com/Tivix/django-rest-auth/ From 3ca0b15b17182f046555da9348f5c58796b54851 Mon Sep 17 00:00:00 2001 From: Andi Albrecht Date: Tue, 26 Jul 2016 12:07:03 +0200 Subject: [PATCH 167/457] Restore meta information for each search field. (#4298) The meta information stored in opts needs to be restored for each search field. Otherwise it references the wrong model when an attribute of a related model comes before an attribute of the original model in search fields. This doesn't apply to m2m relations since must_call_distinct returns True in that case. --- rest_framework/filters.py | 2 +- tests/test_filters.py | 41 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 1 deletion(-) diff --git a/rest_framework/filters.py b/rest_framework/filters.py index caff1c17f..aaf313491 100644 --- a/rest_framework/filters.py +++ b/rest_framework/filters.py @@ -174,8 +174,8 @@ class SearchFilter(BaseFilterBackend): """ Return True if 'distinct()' should be used to query the given lookups. """ - opts = queryset.model._meta for search_field in search_fields: + opts = queryset.model._meta if search_field[0] in self.lookup_prefixes: search_field = search_field[1:] parts = search_field.split(LOOKUP_SEP) diff --git a/tests/test_filters.py b/tests/test_filters.py index 8bffd215c..175ae5b12 100644 --- a/tests/test_filters.py +++ b/tests/test_filters.py @@ -454,6 +454,47 @@ class AttributeModel(models.Model): label = models.CharField(max_length=32) +class SearchFilterModelFk(models.Model): + title = models.CharField(max_length=20) + attribute = models.ForeignKey(AttributeModel) + + +class SearchFilterFkSerializer(serializers.ModelSerializer): + class Meta: + model = SearchFilterModelFk + fields = '__all__' + + +class SearchFilterFkTests(TestCase): + + def test_must_call_distinct(self): + filter_ = filters.SearchFilter() + prefixes = [''] + list(filter_.lookup_prefixes) + for prefix in prefixes: + self.assertFalse( + filter_.must_call_distinct( + SearchFilterModelFk._meta, ["%stitle" % prefix] + ) + ) + self.assertFalse( + filter_.must_call_distinct( + SearchFilterModelFk._meta, ["%stitle" % prefix, "%sattribute__label" % prefix] + ) + ) + + def test_must_call_distinct_restores_meta_for_each_field(self): + # In this test case the attribute of the fk model comes first in the + # list of search fields. + filter_ = filters.SearchFilter() + prefixes = [''] + list(filter_.lookup_prefixes) + for prefix in prefixes: + self.assertFalse( + filter_.must_call_distinct( + SearchFilterModelFk._meta, ["%sattribute__label" % prefix, "%stitle" % prefix] + ) + ) + + class SearchFilterModelM2M(models.Model): title = models.CharField(max_length=20) text = models.CharField(max_length=100) From da2ff1bc4a6865c8f061e2078b015de28bbcecce Mon Sep 17 00:00:00 2001 From: Gustavo Pantuza Date: Tue, 26 Jul 2016 07:09:12 -0300 Subject: [PATCH 168/457] Adding support for RFC 4918 status codes (#4291) * Added HTTP status codes from RFC 4918 * Updated documentation about status codes * Added reference to RFC 4918 --- docs/api-guide/status-codes.md | 5 +++++ rest_framework/status.py | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/docs/api-guide/status-codes.md b/docs/api-guide/status-codes.md index 398c04804..f6ec3598f 100644 --- a/docs/api-guide/status-codes.md +++ b/docs/api-guide/status-codes.md @@ -50,6 +50,7 @@ This class of status code indicates that the client's request was successfully r HTTP_204_NO_CONTENT HTTP_205_RESET_CONTENT HTTP_206_PARTIAL_CONTENT + HTTP_207_MULTI_STATUS ## Redirection - 3xx @@ -86,6 +87,9 @@ The 4xx class of status code is intended for cases in which the client seems to HTTP_415_UNSUPPORTED_MEDIA_TYPE HTTP_416_REQUESTED_RANGE_NOT_SATISFIABLE HTTP_417_EXPECTATION_FAILED + HTTP_422_UNPROCESSABLE_ENTITY + HTTP_423_LOCKED + HTTP_424_FAILED_DEPENDENCY HTTP_428_PRECONDITION_REQUIRED HTTP_429_TOO_MANY_REQUESTS HTTP_431_REQUEST_HEADER_FIELDS_TOO_LARGE @@ -101,6 +105,7 @@ Response status codes beginning with the digit "5" indicate cases in which the s HTTP_503_SERVICE_UNAVAILABLE HTTP_504_GATEWAY_TIMEOUT HTTP_505_HTTP_VERSION_NOT_SUPPORTED + HTTP_507_INSUFFICIENT_STORAGE HTTP_511_NETWORK_AUTHENTICATION_REQUIRED ## Helper functions diff --git a/rest_framework/status.py b/rest_framework/status.py index ed1b4784b..c016b63c6 100644 --- a/rest_framework/status.py +++ b/rest_framework/status.py @@ -3,6 +3,7 @@ Descriptive HTTP status codes, for code readability. See RFC 2616 - http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html And RFC 6585 - http://tools.ietf.org/html/rfc6585 +And RFC 4918 - https://tools.ietf.org/html/rfc4918 """ from __future__ import unicode_literals @@ -36,6 +37,7 @@ HTTP_203_NON_AUTHORITATIVE_INFORMATION = 203 HTTP_204_NO_CONTENT = 204 HTTP_205_RESET_CONTENT = 205 HTTP_206_PARTIAL_CONTENT = 206 +HTTP_207_MULTI_STATUS = 207 HTTP_300_MULTIPLE_CHOICES = 300 HTTP_301_MOVED_PERMANENTLY = 301 HTTP_302_FOUND = 302 @@ -62,6 +64,9 @@ HTTP_414_REQUEST_URI_TOO_LONG = 414 HTTP_415_UNSUPPORTED_MEDIA_TYPE = 415 HTTP_416_REQUESTED_RANGE_NOT_SATISFIABLE = 416 HTTP_417_EXPECTATION_FAILED = 417 +HTTP_422_UNPROCESSABLE_ENTITY = 422 +HTTP_423_LOCKED = 423 +HTTP_424_FAILED_DEPENDENCY = 424 HTTP_428_PRECONDITION_REQUIRED = 428 HTTP_429_TOO_MANY_REQUESTS = 429 HTTP_431_REQUEST_HEADER_FIELDS_TOO_LARGE = 431 @@ -72,4 +77,5 @@ HTTP_502_BAD_GATEWAY = 502 HTTP_503_SERVICE_UNAVAILABLE = 503 HTTP_504_GATEWAY_TIMEOUT = 504 HTTP_505_HTTP_VERSION_NOT_SUPPORTED = 505 +HTTP_507_INSUFFICIENT_STORAGE = 507 HTTP_511_NETWORK_AUTHENTICATION_REQUIRED = 511 From b63099084f471fe3cd477fc5a5aa90cc97fca827 Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Tue, 26 Jul 2016 19:09:04 +0600 Subject: [PATCH 169/457] twitter bootstrap minor update (#4307) * updated bootstrap min css to 3.3.7 * updated bootstrap min javascript to 3.3.7 --- .../static/rest_framework/css/bootstrap.min.css | 7 ++++--- rest_framework/static/rest_framework/js/bootstrap.min.js | 8 ++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/rest_framework/static/rest_framework/css/bootstrap.min.css b/rest_framework/static/rest_framework/css/bootstrap.min.css index d65c66b1b..ed3905e0e 100644 --- a/rest_framework/static/rest_framework/css/bootstrap.min.css +++ b/rest_framework/static/rest_framework/css/bootstrap.min.css @@ -1,5 +1,6 @@ /*! - * Bootstrap v3.3.5 (http://getbootstrap.com) - * Copyright 2011-2015 Twitter, Inc. + * Bootstrap v3.3.7 (http://getbootstrap.com) + * Copyright 2011-2016 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) - *//*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}h1{margin:.67em 0;font-size:2em}mark{color:#000;background:#ff0}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{height:0;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{margin:0;font:inherit;color:inherit}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}input{line-height:normal}input[type=checkbox],input[type=radio]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}fieldset{padding:.35em .625em .75em;margin:0 2px;border:1px solid silver}legend{padding:0;border:0}textarea{overflow:auto}optgroup{font-weight:700}table{border-spacing:0;border-collapse:collapse}td,th{padding:0}/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */@media print{*,:after,:before{color:#000!important;text-shadow:none!important;background:0 0!important;-webkit-box-shadow:none!important;box-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}a[href^="javascript:"]:after,a[href^="#"]:after{content:""}blockquote,pre{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}img,tr{page-break-inside:avoid}img{max-width:100%!important}h2,h3,p{orphans:3;widows:3}h2,h3{page-break-after:avoid}.navbar{display:none}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000!important}.label{border:1px solid #000}.table{border-collapse:collapse!important}.table td,.table th{background-color:#fff!important}.table-bordered td,.table-bordered th{border:1px solid #ddd!important}}@font-face{font-family:'Glyphicons Halflings';src:url(../fonts/glyphicons-halflings-regular.eot);src:url(../fonts/glyphicons-halflings-regular.eot?#iefix) format('embedded-opentype'),url(../fonts/glyphicons-halflings-regular.woff2) format('woff2'),url(../fonts/glyphicons-halflings-regular.woff) format('woff'),url(../fonts/glyphicons-halflings-regular.ttf) format('truetype'),url(../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular) format('svg')}.glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';font-style:normal;font-weight:400;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.glyphicon-asterisk:before{content:"\2a"}.glyphicon-plus:before{content:"\2b"}.glyphicon-eur:before,.glyphicon-euro:before{content:"\20ac"}.glyphicon-minus:before{content:"\2212"}.glyphicon-cloud:before{content:"\2601"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-pencil:before{content:"\270f"}.glyphicon-glass:before{content:"\e001"}.glyphicon-music:before{content:"\e002"}.glyphicon-search:before{content:"\e003"}.glyphicon-heart:before{content:"\e005"}.glyphicon-star:before{content:"\e006"}.glyphicon-star-empty:before{content:"\e007"}.glyphicon-user:before{content:"\e008"}.glyphicon-film:before{content:"\e009"}.glyphicon-th-large:before{content:"\e010"}.glyphicon-th:before{content:"\e011"}.glyphicon-th-list:before{content:"\e012"}.glyphicon-ok:before{content:"\e013"}.glyphicon-remove:before{content:"\e014"}.glyphicon-zoom-in:before{content:"\e015"}.glyphicon-zoom-out:before{content:"\e016"}.glyphicon-off:before{content:"\e017"}.glyphicon-signal:before{content:"\e018"}.glyphicon-cog:before{content:"\e019"}.glyphicon-trash:before{content:"\e020"}.glyphicon-home:before{content:"\e021"}.glyphicon-file:before{content:"\e022"}.glyphicon-time:before{content:"\e023"}.glyphicon-road:before{content:"\e024"}.glyphicon-download-alt:before{content:"\e025"}.glyphicon-download:before{content:"\e026"}.glyphicon-upload:before{content:"\e027"}.glyphicon-inbox:before{content:"\e028"}.glyphicon-play-circle:before{content:"\e029"}.glyphicon-repeat:before{content:"\e030"}.glyphicon-refresh:before{content:"\e031"}.glyphicon-list-alt:before{content:"\e032"}.glyphicon-lock:before{content:"\e033"}.glyphicon-flag:before{content:"\e034"}.glyphicon-headphones:before{content:"\e035"}.glyphicon-volume-off:before{content:"\e036"}.glyphicon-volume-down:before{content:"\e037"}.glyphicon-volume-up:before{content:"\e038"}.glyphicon-qrcode:before{content:"\e039"}.glyphicon-barcode:before{content:"\e040"}.glyphicon-tag:before{content:"\e041"}.glyphicon-tags:before{content:"\e042"}.glyphicon-book:before{content:"\e043"}.glyphicon-bookmark:before{content:"\e044"}.glyphicon-print:before{content:"\e045"}.glyphicon-camera:before{content:"\e046"}.glyphicon-font:before{content:"\e047"}.glyphicon-bold:before{content:"\e048"}.glyphicon-italic:before{content:"\e049"}.glyphicon-text-height:before{content:"\e050"}.glyphicon-text-width:before{content:"\e051"}.glyphicon-align-left:before{content:"\e052"}.glyphicon-align-center:before{content:"\e053"}.glyphicon-align-right:before{content:"\e054"}.glyphicon-align-justify:before{content:"\e055"}.glyphicon-list:before{content:"\e056"}.glyphicon-indent-left:before{content:"\e057"}.glyphicon-indent-right:before{content:"\e058"}.glyphicon-facetime-video:before{content:"\e059"}.glyphicon-picture:before{content:"\e060"}.glyphicon-map-marker:before{content:"\e062"}.glyphicon-adjust:before{content:"\e063"}.glyphicon-tint:before{content:"\e064"}.glyphicon-edit:before{content:"\e065"}.glyphicon-share:before{content:"\e066"}.glyphicon-check:before{content:"\e067"}.glyphicon-move:before{content:"\e068"}.glyphicon-step-backward:before{content:"\e069"}.glyphicon-fast-backward:before{content:"\e070"}.glyphicon-backward:before{content:"\e071"}.glyphicon-play:before{content:"\e072"}.glyphicon-pause:before{content:"\e073"}.glyphicon-stop:before{content:"\e074"}.glyphicon-forward:before{content:"\e075"}.glyphicon-fast-forward:before{content:"\e076"}.glyphicon-step-forward:before{content:"\e077"}.glyphicon-eject:before{content:"\e078"}.glyphicon-chevron-left:before{content:"\e079"}.glyphicon-chevron-right:before{content:"\e080"}.glyphicon-plus-sign:before{content:"\e081"}.glyphicon-minus-sign:before{content:"\e082"}.glyphicon-remove-sign:before{content:"\e083"}.glyphicon-ok-sign:before{content:"\e084"}.glyphicon-question-sign:before{content:"\e085"}.glyphicon-info-sign:before{content:"\e086"}.glyphicon-screenshot:before{content:"\e087"}.glyphicon-remove-circle:before{content:"\e088"}.glyphicon-ok-circle:before{content:"\e089"}.glyphicon-ban-circle:before{content:"\e090"}.glyphicon-arrow-left:before{content:"\e091"}.glyphicon-arrow-right:before{content:"\e092"}.glyphicon-arrow-up:before{content:"\e093"}.glyphicon-arrow-down:before{content:"\e094"}.glyphicon-share-alt:before{content:"\e095"}.glyphicon-resize-full:before{content:"\e096"}.glyphicon-resize-small:before{content:"\e097"}.glyphicon-exclamation-sign:before{content:"\e101"}.glyphicon-gift:before{content:"\e102"}.glyphicon-leaf:before{content:"\e103"}.glyphicon-fire:before{content:"\e104"}.glyphicon-eye-open:before{content:"\e105"}.glyphicon-eye-close:before{content:"\e106"}.glyphicon-warning-sign:before{content:"\e107"}.glyphicon-plane:before{content:"\e108"}.glyphicon-calendar:before{content:"\e109"}.glyphicon-random:before{content:"\e110"}.glyphicon-comment:before{content:"\e111"}.glyphicon-magnet:before{content:"\e112"}.glyphicon-chevron-up:before{content:"\e113"}.glyphicon-chevron-down:before{content:"\e114"}.glyphicon-retweet:before{content:"\e115"}.glyphicon-shopping-cart:before{content:"\e116"}.glyphicon-folder-close:before{content:"\e117"}.glyphicon-folder-open:before{content:"\e118"}.glyphicon-resize-vertical:before{content:"\e119"}.glyphicon-resize-horizontal:before{content:"\e120"}.glyphicon-hdd:before{content:"\e121"}.glyphicon-bullhorn:before{content:"\e122"}.glyphicon-bell:before{content:"\e123"}.glyphicon-certificate:before{content:"\e124"}.glyphicon-thumbs-up:before{content:"\e125"}.glyphicon-thumbs-down:before{content:"\e126"}.glyphicon-hand-right:before{content:"\e127"}.glyphicon-hand-left:before{content:"\e128"}.glyphicon-hand-up:before{content:"\e129"}.glyphicon-hand-down:before{content:"\e130"}.glyphicon-circle-arrow-right:before{content:"\e131"}.glyphicon-circle-arrow-left:before{content:"\e132"}.glyphicon-circle-arrow-up:before{content:"\e133"}.glyphicon-circle-arrow-down:before{content:"\e134"}.glyphicon-globe:before{content:"\e135"}.glyphicon-wrench:before{content:"\e136"}.glyphicon-tasks:before{content:"\e137"}.glyphicon-filter:before{content:"\e138"}.glyphicon-briefcase:before{content:"\e139"}.glyphicon-fullscreen:before{content:"\e140"}.glyphicon-dashboard:before{content:"\e141"}.glyphicon-paperclip:before{content:"\e142"}.glyphicon-heart-empty:before{content:"\e143"}.glyphicon-link:before{content:"\e144"}.glyphicon-phone:before{content:"\e145"}.glyphicon-pushpin:before{content:"\e146"}.glyphicon-usd:before{content:"\e148"}.glyphicon-gbp:before{content:"\e149"}.glyphicon-sort:before{content:"\e150"}.glyphicon-sort-by-alphabet:before{content:"\e151"}.glyphicon-sort-by-alphabet-alt:before{content:"\e152"}.glyphicon-sort-by-order:before{content:"\e153"}.glyphicon-sort-by-order-alt:before{content:"\e154"}.glyphicon-sort-by-attributes:before{content:"\e155"}.glyphicon-sort-by-attributes-alt:before{content:"\e156"}.glyphicon-unchecked:before{content:"\e157"}.glyphicon-expand:before{content:"\e158"}.glyphicon-collapse-down:before{content:"\e159"}.glyphicon-collapse-up:before{content:"\e160"}.glyphicon-log-in:before{content:"\e161"}.glyphicon-flash:before{content:"\e162"}.glyphicon-log-out:before{content:"\e163"}.glyphicon-new-window:before{content:"\e164"}.glyphicon-record:before{content:"\e165"}.glyphicon-save:before{content:"\e166"}.glyphicon-open:before{content:"\e167"}.glyphicon-saved:before{content:"\e168"}.glyphicon-import:before{content:"\e169"}.glyphicon-export:before{content:"\e170"}.glyphicon-send:before{content:"\e171"}.glyphicon-floppy-disk:before{content:"\e172"}.glyphicon-floppy-saved:before{content:"\e173"}.glyphicon-floppy-remove:before{content:"\e174"}.glyphicon-floppy-save:before{content:"\e175"}.glyphicon-floppy-open:before{content:"\e176"}.glyphicon-credit-card:before{content:"\e177"}.glyphicon-transfer:before{content:"\e178"}.glyphicon-cutlery:before{content:"\e179"}.glyphicon-header:before{content:"\e180"}.glyphicon-compressed:before{content:"\e181"}.glyphicon-earphone:before{content:"\e182"}.glyphicon-phone-alt:before{content:"\e183"}.glyphicon-tower:before{content:"\e184"}.glyphicon-stats:before{content:"\e185"}.glyphicon-sd-video:before{content:"\e186"}.glyphicon-hd-video:before{content:"\e187"}.glyphicon-subtitles:before{content:"\e188"}.glyphicon-sound-stereo:before{content:"\e189"}.glyphicon-sound-dolby:before{content:"\e190"}.glyphicon-sound-5-1:before{content:"\e191"}.glyphicon-sound-6-1:before{content:"\e192"}.glyphicon-sound-7-1:before{content:"\e193"}.glyphicon-copyright-mark:before{content:"\e194"}.glyphicon-registration-mark:before{content:"\e195"}.glyphicon-cloud-download:before{content:"\e197"}.glyphicon-cloud-upload:before{content:"\e198"}.glyphicon-tree-conifer:before{content:"\e199"}.glyphicon-tree-deciduous:before{content:"\e200"}.glyphicon-cd:before{content:"\e201"}.glyphicon-save-file:before{content:"\e202"}.glyphicon-open-file:before{content:"\e203"}.glyphicon-level-up:before{content:"\e204"}.glyphicon-copy:before{content:"\e205"}.glyphicon-paste:before{content:"\e206"}.glyphicon-alert:before{content:"\e209"}.glyphicon-equalizer:before{content:"\e210"}.glyphicon-king:before{content:"\e211"}.glyphicon-queen:before{content:"\e212"}.glyphicon-pawn:before{content:"\e213"}.glyphicon-bishop:before{content:"\e214"}.glyphicon-knight:before{content:"\e215"}.glyphicon-baby-formula:before{content:"\e216"}.glyphicon-tent:before{content:"\26fa"}.glyphicon-blackboard:before{content:"\e218"}.glyphicon-bed:before{content:"\e219"}.glyphicon-apple:before{content:"\f8ff"}.glyphicon-erase:before{content:"\e221"}.glyphicon-hourglass:before{content:"\231b"}.glyphicon-lamp:before{content:"\e223"}.glyphicon-duplicate:before{content:"\e224"}.glyphicon-piggy-bank:before{content:"\e225"}.glyphicon-scissors:before{content:"\e226"}.glyphicon-bitcoin:before{content:"\e227"}.glyphicon-btc:before{content:"\e227"}.glyphicon-xbt:before{content:"\e227"}.glyphicon-yen:before{content:"\00a5"}.glyphicon-jpy:before{content:"\00a5"}.glyphicon-ruble:before{content:"\20bd"}.glyphicon-rub:before{content:"\20bd"}.glyphicon-scale:before{content:"\e230"}.glyphicon-ice-lolly:before{content:"\e231"}.glyphicon-ice-lolly-tasted:before{content:"\e232"}.glyphicon-education:before{content:"\e233"}.glyphicon-option-horizontal:before{content:"\e234"}.glyphicon-option-vertical:before{content:"\e235"}.glyphicon-menu-hamburger:before{content:"\e236"}.glyphicon-modal-window:before{content:"\e237"}.glyphicon-oil:before{content:"\e238"}.glyphicon-grain:before{content:"\e239"}.glyphicon-sunglasses:before{content:"\e240"}.glyphicon-text-size:before{content:"\e241"}.glyphicon-text-color:before{content:"\e242"}.glyphicon-text-background:before{content:"\e243"}.glyphicon-object-align-top:before{content:"\e244"}.glyphicon-object-align-bottom:before{content:"\e245"}.glyphicon-object-align-horizontal:before{content:"\e246"}.glyphicon-object-align-left:before{content:"\e247"}.glyphicon-object-align-vertical:before{content:"\e248"}.glyphicon-object-align-right:before{content:"\e249"}.glyphicon-triangle-right:before{content:"\e250"}.glyphicon-triangle-left:before{content:"\e251"}.glyphicon-triangle-bottom:before{content:"\e252"}.glyphicon-triangle-top:before{content:"\e253"}.glyphicon-console:before{content:"\e254"}.glyphicon-superscript:before{content:"\e255"}.glyphicon-subscript:before{content:"\e256"}.glyphicon-menu-left:before{content:"\e257"}.glyphicon-menu-right:before{content:"\e258"}.glyphicon-menu-down:before{content:"\e259"}.glyphicon-menu-up:before{content:"\e260"}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}:after,:before{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:10px;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.42857143;color:#333;background-color:#fff}button,input,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}a{color:#337ab7;text-decoration:none}a:focus,a:hover{color:#23527c;text-decoration:underline}a:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}figure{margin:0}img{vertical-align:middle}.carousel-inner>.item>a>img,.carousel-inner>.item>img,.img-responsive,.thumbnail a>img,.thumbnail>img{display:block;max-width:100%;height:auto}.img-rounded{border-radius:6px}.img-thumbnail{display:inline-block;max-width:100%;height:auto;padding:4px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.img-circle{border-radius:50%}hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #eee}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}[role=button]{cursor:pointer}.h1,.h2,.h3,.h4,.h5,.h6,h1,h2,h3,h4,h5,h6{font-family:inherit;font-weight:500;line-height:1.1;color:inherit}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-weight:400;line-height:1;color:#777}.h1,.h2,.h3,h1,h2,h3{margin-top:20px;margin-bottom:10px}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small{font-size:65%}.h4,.h5,.h6,h4,h5,h6{margin-top:10px;margin-bottom:10px}.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-size:75%}.h1,h1{font-size:36px}.h2,h2{font-size:30px}.h3,h3{font-size:24px}.h4,h4{font-size:18px}.h5,h5{font-size:14px}.h6,h6{font-size:12px}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:16px;font-weight:300;line-height:1.4}@media (min-width:768px){.lead{font-size:21px}}.small,small{font-size:85%}.mark,mark{padding:.2em;background-color:#fcf8e3}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}.text-justify{text-align:justify}.text-nowrap{white-space:nowrap}.text-lowercase{text-transform:lowercase}.text-uppercase{text-transform:uppercase}.text-capitalize{text-transform:capitalize}.text-muted{color:#777}.text-primary{color:#337ab7}a.text-primary:focus,a.text-primary:hover{color:#286090}.text-success{color:#3c763d}a.text-success:focus,a.text-success:hover{color:#2b542c}.text-info{color:#31708f}a.text-info:focus,a.text-info:hover{color:#245269}.text-warning{color:#8a6d3b}a.text-warning:focus,a.text-warning:hover{color:#66512c}.text-danger{color:#a94442}a.text-danger:focus,a.text-danger:hover{color:#843534}.bg-primary{color:#fff;background-color:#337ab7}a.bg-primary:focus,a.bg-primary:hover{background-color:#286090}.bg-success{background-color:#dff0d8}a.bg-success:focus,a.bg-success:hover{background-color:#c1e2b3}.bg-info{background-color:#d9edf7}a.bg-info:focus,a.bg-info:hover{background-color:#afd9ee}.bg-warning{background-color:#fcf8e3}a.bg-warning:focus,a.bg-warning:hover{background-color:#f7ecb5}.bg-danger{background-color:#f2dede}a.bg-danger:focus,a.bg-danger:hover{background-color:#e4b9b9}.page-header{padding-bottom:9px;margin:40px 0 20px;border-bottom:1px solid #eee}ol,ul{margin-top:0;margin-bottom:10px}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}.list-unstyled{padding-left:0;list-style:none}.list-inline{padding-left:0;margin-left:-5px;list-style:none}.list-inline>li{display:inline-block;padding-right:5px;padding-left:5px}dl{margin-top:0;margin-bottom:20px}dd,dt{line-height:1.42857143}dt{font-weight:700}dd{margin-left:0}@media (min-width:768px){.dl-horizontal dt{float:left;width:160px;overflow:hidden;clear:left;text-align:right;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}}abbr[data-original-title],abbr[title]{cursor:help;border-bottom:1px dotted #777}.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:10px 20px;margin:0 0 20px;font-size:17.5px;border-left:5px solid #eee}blockquote ol:last-child,blockquote p:last-child,blockquote ul:last-child{margin-bottom:0}blockquote .small,blockquote footer,blockquote small{display:block;font-size:80%;line-height:1.42857143;color:#777}blockquote .small:before,blockquote footer:before,blockquote small:before{content:'\2014 \00A0'}.blockquote-reverse,blockquote.pull-right{padding-right:15px;padding-left:0;text-align:right;border-right:5px solid #eee;border-left:0}.blockquote-reverse .small:before,.blockquote-reverse footer:before,.blockquote-reverse small:before,blockquote.pull-right .small:before,blockquote.pull-right footer:before,blockquote.pull-right small:before{content:''}.blockquote-reverse .small:after,.blockquote-reverse footer:after,.blockquote-reverse small:after,blockquote.pull-right .small:after,blockquote.pull-right footer:after,blockquote.pull-right small:after{content:'\00A0 \2014'}address{margin-bottom:20px;font-style:normal;line-height:1.42857143}code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,"Courier New",monospace}code{padding:2px 4px;font-size:90%;color:#c7254e;background-color:#f9f2f4;border-radius:4px}kbd{padding:2px 4px;font-size:90%;color:#fff;background-color:#333;border-radius:3px;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.25);box-shadow:inset 0 -1px 0 rgba(0,0,0,.25)}kbd kbd{padding:0;font-size:100%;font-weight:700;-webkit-box-shadow:none;box-shadow:none}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.42857143;color:#333;word-break:break-all;word-wrap:break-word;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px}pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border-radius:0}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}@media (min-width:768px){.container{width:750px}}@media (min-width:992px){.container{width:970px}}@media (min-width:1200px){.container{width:1170px}}.container-fluid{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}.row{margin-right:-15px;margin-left:-15px}.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{position:relative;min-height:1px;padding-right:15px;padding-left:15px}.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{float:left}.col-xs-12{width:100%}.col-xs-11{width:91.66666667%}.col-xs-10{width:83.33333333%}.col-xs-9{width:75%}.col-xs-8{width:66.66666667%}.col-xs-7{width:58.33333333%}.col-xs-6{width:50%}.col-xs-5{width:41.66666667%}.col-xs-4{width:33.33333333%}.col-xs-3{width:25%}.col-xs-2{width:16.66666667%}.col-xs-1{width:8.33333333%}.col-xs-pull-12{right:100%}.col-xs-pull-11{right:91.66666667%}.col-xs-pull-10{right:83.33333333%}.col-xs-pull-9{right:75%}.col-xs-pull-8{right:66.66666667%}.col-xs-pull-7{right:58.33333333%}.col-xs-pull-6{right:50%}.col-xs-pull-5{right:41.66666667%}.col-xs-pull-4{right:33.33333333%}.col-xs-pull-3{right:25%}.col-xs-pull-2{right:16.66666667%}.col-xs-pull-1{right:8.33333333%}.col-xs-pull-0{right:auto}.col-xs-push-12{left:100%}.col-xs-push-11{left:91.66666667%}.col-xs-push-10{left:83.33333333%}.col-xs-push-9{left:75%}.col-xs-push-8{left:66.66666667%}.col-xs-push-7{left:58.33333333%}.col-xs-push-6{left:50%}.col-xs-push-5{left:41.66666667%}.col-xs-push-4{left:33.33333333%}.col-xs-push-3{left:25%}.col-xs-push-2{left:16.66666667%}.col-xs-push-1{left:8.33333333%}.col-xs-push-0{left:auto}.col-xs-offset-12{margin-left:100%}.col-xs-offset-11{margin-left:91.66666667%}.col-xs-offset-10{margin-left:83.33333333%}.col-xs-offset-9{margin-left:75%}.col-xs-offset-8{margin-left:66.66666667%}.col-xs-offset-7{margin-left:58.33333333%}.col-xs-offset-6{margin-left:50%}.col-xs-offset-5{margin-left:41.66666667%}.col-xs-offset-4{margin-left:33.33333333%}.col-xs-offset-3{margin-left:25%}.col-xs-offset-2{margin-left:16.66666667%}.col-xs-offset-1{margin-left:8.33333333%}.col-xs-offset-0{margin-left:0}@media (min-width:768px){.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9{float:left}.col-sm-12{width:100%}.col-sm-11{width:91.66666667%}.col-sm-10{width:83.33333333%}.col-sm-9{width:75%}.col-sm-8{width:66.66666667%}.col-sm-7{width:58.33333333%}.col-sm-6{width:50%}.col-sm-5{width:41.66666667%}.col-sm-4{width:33.33333333%}.col-sm-3{width:25%}.col-sm-2{width:16.66666667%}.col-sm-1{width:8.33333333%}.col-sm-pull-12{right:100%}.col-sm-pull-11{right:91.66666667%}.col-sm-pull-10{right:83.33333333%}.col-sm-pull-9{right:75%}.col-sm-pull-8{right:66.66666667%}.col-sm-pull-7{right:58.33333333%}.col-sm-pull-6{right:50%}.col-sm-pull-5{right:41.66666667%}.col-sm-pull-4{right:33.33333333%}.col-sm-pull-3{right:25%}.col-sm-pull-2{right:16.66666667%}.col-sm-pull-1{right:8.33333333%}.col-sm-pull-0{right:auto}.col-sm-push-12{left:100%}.col-sm-push-11{left:91.66666667%}.col-sm-push-10{left:83.33333333%}.col-sm-push-9{left:75%}.col-sm-push-8{left:66.66666667%}.col-sm-push-7{left:58.33333333%}.col-sm-push-6{left:50%}.col-sm-push-5{left:41.66666667%}.col-sm-push-4{left:33.33333333%}.col-sm-push-3{left:25%}.col-sm-push-2{left:16.66666667%}.col-sm-push-1{left:8.33333333%}.col-sm-push-0{left:auto}.col-sm-offset-12{margin-left:100%}.col-sm-offset-11{margin-left:91.66666667%}.col-sm-offset-10{margin-left:83.33333333%}.col-sm-offset-9{margin-left:75%}.col-sm-offset-8{margin-left:66.66666667%}.col-sm-offset-7{margin-left:58.33333333%}.col-sm-offset-6{margin-left:50%}.col-sm-offset-5{margin-left:41.66666667%}.col-sm-offset-4{margin-left:33.33333333%}.col-sm-offset-3{margin-left:25%}.col-sm-offset-2{margin-left:16.66666667%}.col-sm-offset-1{margin-left:8.33333333%}.col-sm-offset-0{margin-left:0}}@media (min-width:992px){.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9{float:left}.col-md-12{width:100%}.col-md-11{width:91.66666667%}.col-md-10{width:83.33333333%}.col-md-9{width:75%}.col-md-8{width:66.66666667%}.col-md-7{width:58.33333333%}.col-md-6{width:50%}.col-md-5{width:41.66666667%}.col-md-4{width:33.33333333%}.col-md-3{width:25%}.col-md-2{width:16.66666667%}.col-md-1{width:8.33333333%}.col-md-pull-12{right:100%}.col-md-pull-11{right:91.66666667%}.col-md-pull-10{right:83.33333333%}.col-md-pull-9{right:75%}.col-md-pull-8{right:66.66666667%}.col-md-pull-7{right:58.33333333%}.col-md-pull-6{right:50%}.col-md-pull-5{right:41.66666667%}.col-md-pull-4{right:33.33333333%}.col-md-pull-3{right:25%}.col-md-pull-2{right:16.66666667%}.col-md-pull-1{right:8.33333333%}.col-md-pull-0{right:auto}.col-md-push-12{left:100%}.col-md-push-11{left:91.66666667%}.col-md-push-10{left:83.33333333%}.col-md-push-9{left:75%}.col-md-push-8{left:66.66666667%}.col-md-push-7{left:58.33333333%}.col-md-push-6{left:50%}.col-md-push-5{left:41.66666667%}.col-md-push-4{left:33.33333333%}.col-md-push-3{left:25%}.col-md-push-2{left:16.66666667%}.col-md-push-1{left:8.33333333%}.col-md-push-0{left:auto}.col-md-offset-12{margin-left:100%}.col-md-offset-11{margin-left:91.66666667%}.col-md-offset-10{margin-left:83.33333333%}.col-md-offset-9{margin-left:75%}.col-md-offset-8{margin-left:66.66666667%}.col-md-offset-7{margin-left:58.33333333%}.col-md-offset-6{margin-left:50%}.col-md-offset-5{margin-left:41.66666667%}.col-md-offset-4{margin-left:33.33333333%}.col-md-offset-3{margin-left:25%}.col-md-offset-2{margin-left:16.66666667%}.col-md-offset-1{margin-left:8.33333333%}.col-md-offset-0{margin-left:0}}@media (min-width:1200px){.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9{float:left}.col-lg-12{width:100%}.col-lg-11{width:91.66666667%}.col-lg-10{width:83.33333333%}.col-lg-9{width:75%}.col-lg-8{width:66.66666667%}.col-lg-7{width:58.33333333%}.col-lg-6{width:50%}.col-lg-5{width:41.66666667%}.col-lg-4{width:33.33333333%}.col-lg-3{width:25%}.col-lg-2{width:16.66666667%}.col-lg-1{width:8.33333333%}.col-lg-pull-12{right:100%}.col-lg-pull-11{right:91.66666667%}.col-lg-pull-10{right:83.33333333%}.col-lg-pull-9{right:75%}.col-lg-pull-8{right:66.66666667%}.col-lg-pull-7{right:58.33333333%}.col-lg-pull-6{right:50%}.col-lg-pull-5{right:41.66666667%}.col-lg-pull-4{right:33.33333333%}.col-lg-pull-3{right:25%}.col-lg-pull-2{right:16.66666667%}.col-lg-pull-1{right:8.33333333%}.col-lg-pull-0{right:auto}.col-lg-push-12{left:100%}.col-lg-push-11{left:91.66666667%}.col-lg-push-10{left:83.33333333%}.col-lg-push-9{left:75%}.col-lg-push-8{left:66.66666667%}.col-lg-push-7{left:58.33333333%}.col-lg-push-6{left:50%}.col-lg-push-5{left:41.66666667%}.col-lg-push-4{left:33.33333333%}.col-lg-push-3{left:25%}.col-lg-push-2{left:16.66666667%}.col-lg-push-1{left:8.33333333%}.col-lg-push-0{left:auto}.col-lg-offset-12{margin-left:100%}.col-lg-offset-11{margin-left:91.66666667%}.col-lg-offset-10{margin-left:83.33333333%}.col-lg-offset-9{margin-left:75%}.col-lg-offset-8{margin-left:66.66666667%}.col-lg-offset-7{margin-left:58.33333333%}.col-lg-offset-6{margin-left:50%}.col-lg-offset-5{margin-left:41.66666667%}.col-lg-offset-4{margin-left:33.33333333%}.col-lg-offset-3{margin-left:25%}.col-lg-offset-2{margin-left:16.66666667%}.col-lg-offset-1{margin-left:8.33333333%}.col-lg-offset-0{margin-left:0}}table{background-color:transparent}caption{padding-top:8px;padding-bottom:8px;color:#777;text-align:left}th{text-align:left}.table{width:100%;max-width:100%;margin-bottom:20px}.table>tbody>tr>td,.table>tbody>tr>th,.table>tfoot>tr>td,.table>tfoot>tr>th,.table>thead>tr>td,.table>thead>tr>th{padding:8px;line-height:1.42857143;vertical-align:top;border-top:1px solid #ddd}.table>thead>tr>th{vertical-align:bottom;border-bottom:2px solid #ddd}.table>caption+thead>tr:first-child>td,.table>caption+thead>tr:first-child>th,.table>colgroup+thead>tr:first-child>td,.table>colgroup+thead>tr:first-child>th,.table>thead:first-child>tr:first-child>td,.table>thead:first-child>tr:first-child>th{border-top:0}.table>tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#fff}.table-condensed>tbody>tr>td,.table-condensed>tbody>tr>th,.table-condensed>tfoot>tr>td,.table-condensed>tfoot>tr>th,.table-condensed>thead>tr>td,.table-condensed>thead>tr>th{padding:5px}.table-bordered{border:1px solid #ddd}.table-bordered>tbody>tr>td,.table-bordered>tbody>tr>th,.table-bordered>tfoot>tr>td,.table-bordered>tfoot>tr>th,.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border:1px solid #ddd}.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border-bottom-width:2px}.table-striped>tbody>tr:nth-of-type(odd){background-color:#f9f9f9}.table-hover>tbody>tr:hover{background-color:#f5f5f5}table col[class*=col-]{position:static;display:table-column;float:none}table td[class*=col-],table th[class*=col-]{position:static;display:table-cell;float:none}.table>tbody>tr.active>td,.table>tbody>tr.active>th,.table>tbody>tr>td.active,.table>tbody>tr>th.active,.table>tfoot>tr.active>td,.table>tfoot>tr.active>th,.table>tfoot>tr>td.active,.table>tfoot>tr>th.active,.table>thead>tr.active>td,.table>thead>tr.active>th,.table>thead>tr>td.active,.table>thead>tr>th.active{background-color:#f5f5f5}.table-hover>tbody>tr.active:hover>td,.table-hover>tbody>tr.active:hover>th,.table-hover>tbody>tr:hover>.active,.table-hover>tbody>tr>td.active:hover,.table-hover>tbody>tr>th.active:hover{background-color:#e8e8e8}.table>tbody>tr.success>td,.table>tbody>tr.success>th,.table>tbody>tr>td.success,.table>tbody>tr>th.success,.table>tfoot>tr.success>td,.table>tfoot>tr.success>th,.table>tfoot>tr>td.success,.table>tfoot>tr>th.success,.table>thead>tr.success>td,.table>thead>tr.success>th,.table>thead>tr>td.success,.table>thead>tr>th.success{background-color:#dff0d8}.table-hover>tbody>tr.success:hover>td,.table-hover>tbody>tr.success:hover>th,.table-hover>tbody>tr:hover>.success,.table-hover>tbody>tr>td.success:hover,.table-hover>tbody>tr>th.success:hover{background-color:#d0e9c6}.table>tbody>tr.info>td,.table>tbody>tr.info>th,.table>tbody>tr>td.info,.table>tbody>tr>th.info,.table>tfoot>tr.info>td,.table>tfoot>tr.info>th,.table>tfoot>tr>td.info,.table>tfoot>tr>th.info,.table>thead>tr.info>td,.table>thead>tr.info>th,.table>thead>tr>td.info,.table>thead>tr>th.info{background-color:#d9edf7}.table-hover>tbody>tr.info:hover>td,.table-hover>tbody>tr.info:hover>th,.table-hover>tbody>tr:hover>.info,.table-hover>tbody>tr>td.info:hover,.table-hover>tbody>tr>th.info:hover{background-color:#c4e3f3}.table>tbody>tr.warning>td,.table>tbody>tr.warning>th,.table>tbody>tr>td.warning,.table>tbody>tr>th.warning,.table>tfoot>tr.warning>td,.table>tfoot>tr.warning>th,.table>tfoot>tr>td.warning,.table>tfoot>tr>th.warning,.table>thead>tr.warning>td,.table>thead>tr.warning>th,.table>thead>tr>td.warning,.table>thead>tr>th.warning{background-color:#fcf8e3}.table-hover>tbody>tr.warning:hover>td,.table-hover>tbody>tr.warning:hover>th,.table-hover>tbody>tr:hover>.warning,.table-hover>tbody>tr>td.warning:hover,.table-hover>tbody>tr>th.warning:hover{background-color:#faf2cc}.table>tbody>tr.danger>td,.table>tbody>tr.danger>th,.table>tbody>tr>td.danger,.table>tbody>tr>th.danger,.table>tfoot>tr.danger>td,.table>tfoot>tr.danger>th,.table>tfoot>tr>td.danger,.table>tfoot>tr>th.danger,.table>thead>tr.danger>td,.table>thead>tr.danger>th,.table>thead>tr>td.danger,.table>thead>tr>th.danger{background-color:#f2dede}.table-hover>tbody>tr.danger:hover>td,.table-hover>tbody>tr.danger:hover>th,.table-hover>tbody>tr:hover>.danger,.table-hover>tbody>tr>td.danger:hover,.table-hover>tbody>tr>th.danger:hover{background-color:#ebcccc}.table-responsive{min-height:.01%;overflow-x:auto}@media screen and (max-width:767px){.table-responsive{width:100%;margin-bottom:15px;overflow-y:hidden;-ms-overflow-style:-ms-autohiding-scrollbar;border:1px solid #ddd}.table-responsive>.table{margin-bottom:0}.table-responsive>.table>tbody>tr>td,.table-responsive>.table>tbody>tr>th,.table-responsive>.table>tfoot>tr>td,.table-responsive>.table>tfoot>tr>th,.table-responsive>.table>thead>tr>td,.table-responsive>.table>thead>tr>th{white-space:nowrap}.table-responsive>.table-bordered{border:0}.table-responsive>.table-bordered>tbody>tr>td:first-child,.table-responsive>.table-bordered>tbody>tr>th:first-child,.table-responsive>.table-bordered>tfoot>tr>td:first-child,.table-responsive>.table-bordered>tfoot>tr>th:first-child,.table-responsive>.table-bordered>thead>tr>td:first-child,.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.table-responsive>.table-bordered>tbody>tr>td:last-child,.table-responsive>.table-bordered>tbody>tr>th:last-child,.table-responsive>.table-bordered>tfoot>tr>td:last-child,.table-responsive>.table-bordered>tfoot>tr>th:last-child,.table-responsive>.table-bordered>thead>tr>td:last-child,.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.table-responsive>.table-bordered>tbody>tr:last-child>td,.table-responsive>.table-bordered>tbody>tr:last-child>th,.table-responsive>.table-bordered>tfoot>tr:last-child>td,.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}}fieldset{min-width:0;padding:0;margin:0;border:0}legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:inherit;color:#333;border:0;border-bottom:1px solid #e5e5e5}label{display:inline-block;max-width:100%;margin-bottom:5px;font-weight:700}input[type=search]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type=checkbox],input[type=radio]{margin:4px 0 0;margin-top:1px\9;line-height:normal}input[type=file]{display:block}input[type=range]{display:block;width:100%}select[multiple],select[size]{height:auto}input[type=file]:focus,input[type=checkbox]:focus,input[type=radio]:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}output{display:block;padding-top:7px;font-size:14px;line-height:1.42857143;color:#555}.form-control{display:block;width:100%;height:34px;padding:6px 12px;font-size:14px;line-height:1.42857143;color:#555;background-color:#fff;background-image:none;border:1px solid #ccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075);-webkit-transition:border-color ease-in-out .15s,-webkit-box-shadow ease-in-out .15s;-o-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s}.form-control:focus{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6)}.form-control::-moz-placeholder{color:#999;opacity:1}.form-control:-ms-input-placeholder{color:#999}.form-control::-webkit-input-placeholder{color:#999}.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{background-color:#eee;opacity:1}.form-control[disabled],fieldset[disabled] .form-control{cursor:not-allowed}textarea.form-control{height:auto}input[type=search]{-webkit-appearance:none}@media screen and (-webkit-min-device-pixel-ratio:0){input[type=date].form-control,input[type=time].form-control,input[type=datetime-local].form-control,input[type=month].form-control{line-height:34px}.input-group-sm input[type=date],.input-group-sm input[type=time],.input-group-sm input[type=datetime-local],.input-group-sm input[type=month],input[type=date].input-sm,input[type=time].input-sm,input[type=datetime-local].input-sm,input[type=month].input-sm{line-height:30px}.input-group-lg input[type=date],.input-group-lg input[type=time],.input-group-lg input[type=datetime-local],.input-group-lg input[type=month],input[type=date].input-lg,input[type=time].input-lg,input[type=datetime-local].input-lg,input[type=month].input-lg{line-height:46px}}.form-group{margin-bottom:15px}.checkbox,.radio{position:relative;display:block;margin-top:10px;margin-bottom:10px}.checkbox label,.radio label{min-height:20px;padding-left:20px;margin-bottom:0;font-weight:400;cursor:pointer}.checkbox input[type=checkbox],.checkbox-inline input[type=checkbox],.radio input[type=radio],.radio-inline input[type=radio]{position:absolute;margin-top:4px\9;margin-left:-20px}.checkbox+.checkbox,.radio+.radio{margin-top:-5px}.checkbox-inline,.radio-inline{position:relative;display:inline-block;padding-left:20px;margin-bottom:0;font-weight:400;vertical-align:middle;cursor:pointer}.checkbox-inline+.checkbox-inline,.radio-inline+.radio-inline{margin-top:0;margin-left:10px}fieldset[disabled] input[type=checkbox],fieldset[disabled] input[type=radio],input[type=checkbox].disabled,input[type=checkbox][disabled],input[type=radio].disabled,input[type=radio][disabled]{cursor:not-allowed}.checkbox-inline.disabled,.radio-inline.disabled,fieldset[disabled] .checkbox-inline,fieldset[disabled] .radio-inline{cursor:not-allowed}.checkbox.disabled label,.radio.disabled label,fieldset[disabled] .checkbox label,fieldset[disabled] .radio label{cursor:not-allowed}.form-control-static{min-height:34px;padding-top:7px;padding-bottom:7px;margin-bottom:0}.form-control-static.input-lg,.form-control-static.input-sm{padding-right:0;padding-left:0}.input-sm{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-sm{height:30px;line-height:30px}select[multiple].input-sm,textarea.input-sm{height:auto}.form-group-sm .form-control{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.form-group-sm select.form-control{height:30px;line-height:30px}.form-group-sm select[multiple].form-control,.form-group-sm textarea.form-control{height:auto}.form-group-sm .form-control-static{height:30px;min-height:32px;padding:6px 10px;font-size:12px;line-height:1.5}.input-lg{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.input-lg{height:46px;line-height:46px}select[multiple].input-lg,textarea.input-lg{height:auto}.form-group-lg .form-control{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}.form-group-lg select.form-control{height:46px;line-height:46px}.form-group-lg select[multiple].form-control,.form-group-lg textarea.form-control{height:auto}.form-group-lg .form-control-static{height:46px;min-height:38px;padding:11px 16px;font-size:18px;line-height:1.3333333}.has-feedback{position:relative}.has-feedback .form-control{padding-right:42.5px}.form-control-feedback{position:absolute;top:0;right:0;z-index:2;display:block;width:34px;height:34px;line-height:34px;text-align:center;pointer-events:none}.form-group-lg .form-control+.form-control-feedback,.input-group-lg+.form-control-feedback,.input-lg+.form-control-feedback{width:46px;height:46px;line-height:46px}.form-group-sm .form-control+.form-control-feedback,.input-group-sm+.form-control-feedback,.input-sm+.form-control-feedback{width:30px;height:30px;line-height:30px}.has-success .checkbox,.has-success .checkbox-inline,.has-success .control-label,.has-success .help-block,.has-success .radio,.has-success .radio-inline,.has-success.checkbox label,.has-success.checkbox-inline label,.has-success.radio label,.has-success.radio-inline label{color:#3c763d}.has-success .form-control{border-color:#3c763d;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-success .form-control:focus{border-color:#2b542c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168}.has-success .input-group-addon{color:#3c763d;background-color:#dff0d8;border-color:#3c763d}.has-success .form-control-feedback{color:#3c763d}.has-warning .checkbox,.has-warning .checkbox-inline,.has-warning .control-label,.has-warning .help-block,.has-warning .radio,.has-warning .radio-inline,.has-warning.checkbox label,.has-warning.checkbox-inline label,.has-warning.radio label,.has-warning.radio-inline label{color:#8a6d3b}.has-warning .form-control{border-color:#8a6d3b;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-warning .form-control:focus{border-color:#66512c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b}.has-warning .input-group-addon{color:#8a6d3b;background-color:#fcf8e3;border-color:#8a6d3b}.has-warning .form-control-feedback{color:#8a6d3b}.has-error .checkbox,.has-error .checkbox-inline,.has-error .control-label,.has-error .help-block,.has-error .radio,.has-error .radio-inline,.has-error.checkbox label,.has-error.checkbox-inline label,.has-error.radio label,.has-error.radio-inline label{color:#a94442}.has-error .form-control{border-color:#a94442;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-error .form-control:focus{border-color:#843534;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483}.has-error .input-group-addon{color:#a94442;background-color:#f2dede;border-color:#a94442}.has-error .form-control-feedback{color:#a94442}.has-feedback label~.form-control-feedback{top:25px}.has-feedback label.sr-only~.form-control-feedback{top:0}.help-block{display:block;margin-top:5px;margin-bottom:10px;color:#737373}@media (min-width:768px){.form-inline .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.form-inline .form-control{display:inline-block;width:auto;vertical-align:middle}.form-inline .form-control-static{display:inline-block}.form-inline .input-group{display:inline-table;vertical-align:middle}.form-inline .input-group .form-control,.form-inline .input-group .input-group-addon,.form-inline .input-group .input-group-btn{width:auto}.form-inline .input-group>.form-control{width:100%}.form-inline .control-label{margin-bottom:0;vertical-align:middle}.form-inline .checkbox,.form-inline .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.form-inline .checkbox label,.form-inline .radio label{padding-left:0}.form-inline .checkbox input[type=checkbox],.form-inline .radio input[type=radio]{position:relative;margin-left:0}.form-inline .has-feedback .form-control-feedback{top:0}}.form-horizontal .checkbox,.form-horizontal .checkbox-inline,.form-horizontal .radio,.form-horizontal .radio-inline{padding-top:7px;margin-top:0;margin-bottom:0}.form-horizontal .checkbox,.form-horizontal .radio{min-height:27px}.form-horizontal .form-group{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.form-horizontal .control-label{padding-top:7px;margin-bottom:0;text-align:right}}.form-horizontal .has-feedback .form-control-feedback{right:15px}@media (min-width:768px){.form-horizontal .form-group-lg .control-label{padding-top:14.33px;font-size:18px}}@media (min-width:768px){.form-horizontal .form-group-sm .control-label{padding-top:6px;font-size:12px}}.btn{display:inline-block;padding:6px 12px;margin-bottom:0;font-size:14px;font-weight:400;line-height:1.42857143;text-align:center;white-space:nowrap;vertical-align:middle;-ms-touch-action:manipulation;touch-action:manipulation;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background-image:none;border:1px solid transparent;border-radius:4px}.btn.active.focus,.btn.active:focus,.btn.focus,.btn:active.focus,.btn:active:focus,.btn:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn.focus,.btn:focus,.btn:hover{color:#333;text-decoration:none}.btn.active,.btn:active{background-image:none;outline:0;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn.disabled,.btn[disabled],fieldset[disabled] .btn{cursor:not-allowed;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none;opacity:.65}a.btn.disabled,fieldset[disabled] a.btn{pointer-events:none}.btn-default{color:#333;background-color:#fff;border-color:#ccc}.btn-default.focus,.btn-default:focus{color:#333;background-color:#e6e6e6;border-color:#8c8c8c}.btn-default:hover{color:#333;background-color:#e6e6e6;border-color:#adadad}.btn-default.active,.btn-default:active,.open>.dropdown-toggle.btn-default{color:#333;background-color:#e6e6e6;border-color:#adadad}.btn-default.active.focus,.btn-default.active:focus,.btn-default.active:hover,.btn-default:active.focus,.btn-default:active:focus,.btn-default:active:hover,.open>.dropdown-toggle.btn-default.focus,.open>.dropdown-toggle.btn-default:focus,.open>.dropdown-toggle.btn-default:hover{color:#333;background-color:#d4d4d4;border-color:#8c8c8c}.btn-default.active,.btn-default:active,.open>.dropdown-toggle.btn-default{background-image:none}.btn-default.disabled,.btn-default.disabled.active,.btn-default.disabled.focus,.btn-default.disabled:active,.btn-default.disabled:focus,.btn-default.disabled:hover,.btn-default[disabled],.btn-default[disabled].active,.btn-default[disabled].focus,.btn-default[disabled]:active,.btn-default[disabled]:focus,.btn-default[disabled]:hover,fieldset[disabled] .btn-default,fieldset[disabled] .btn-default.active,fieldset[disabled] .btn-default.focus,fieldset[disabled] .btn-default:active,fieldset[disabled] .btn-default:focus,fieldset[disabled] .btn-default:hover{background-color:#fff;border-color:#ccc}.btn-default .badge{color:#fff;background-color:#333}.btn-primary{color:#fff;background-color:#337ab7;border-color:#2e6da4}.btn-primary.focus,.btn-primary:focus{color:#fff;background-color:#286090;border-color:#122b40}.btn-primary:hover{color:#fff;background-color:#286090;border-color:#204d74}.btn-primary.active,.btn-primary:active,.open>.dropdown-toggle.btn-primary{color:#fff;background-color:#286090;border-color:#204d74}.btn-primary.active.focus,.btn-primary.active:focus,.btn-primary.active:hover,.btn-primary:active.focus,.btn-primary:active:focus,.btn-primary:active:hover,.open>.dropdown-toggle.btn-primary.focus,.open>.dropdown-toggle.btn-primary:focus,.open>.dropdown-toggle.btn-primary:hover{color:#fff;background-color:#204d74;border-color:#122b40}.btn-primary.active,.btn-primary:active,.open>.dropdown-toggle.btn-primary{background-image:none}.btn-primary.disabled,.btn-primary.disabled.active,.btn-primary.disabled.focus,.btn-primary.disabled:active,.btn-primary.disabled:focus,.btn-primary.disabled:hover,.btn-primary[disabled],.btn-primary[disabled].active,.btn-primary[disabled].focus,.btn-primary[disabled]:active,.btn-primary[disabled]:focus,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary,fieldset[disabled] .btn-primary.active,fieldset[disabled] .btn-primary.focus,fieldset[disabled] .btn-primary:active,fieldset[disabled] .btn-primary:focus,fieldset[disabled] .btn-primary:hover{background-color:#337ab7;border-color:#2e6da4}.btn-primary .badge{color:#337ab7;background-color:#fff}.btn-success{color:#fff;background-color:#5cb85c;border-color:#4cae4c}.btn-success.focus,.btn-success:focus{color:#fff;background-color:#449d44;border-color:#255625}.btn-success:hover{color:#fff;background-color:#449d44;border-color:#398439}.btn-success.active,.btn-success:active,.open>.dropdown-toggle.btn-success{color:#fff;background-color:#449d44;border-color:#398439}.btn-success.active.focus,.btn-success.active:focus,.btn-success.active:hover,.btn-success:active.focus,.btn-success:active:focus,.btn-success:active:hover,.open>.dropdown-toggle.btn-success.focus,.open>.dropdown-toggle.btn-success:focus,.open>.dropdown-toggle.btn-success:hover{color:#fff;background-color:#398439;border-color:#255625}.btn-success.active,.btn-success:active,.open>.dropdown-toggle.btn-success{background-image:none}.btn-success.disabled,.btn-success.disabled.active,.btn-success.disabled.focus,.btn-success.disabled:active,.btn-success.disabled:focus,.btn-success.disabled:hover,.btn-success[disabled],.btn-success[disabled].active,.btn-success[disabled].focus,.btn-success[disabled]:active,.btn-success[disabled]:focus,.btn-success[disabled]:hover,fieldset[disabled] .btn-success,fieldset[disabled] .btn-success.active,fieldset[disabled] .btn-success.focus,fieldset[disabled] .btn-success:active,fieldset[disabled] .btn-success:focus,fieldset[disabled] .btn-success:hover{background-color:#5cb85c;border-color:#4cae4c}.btn-success .badge{color:#5cb85c;background-color:#fff}.btn-info{color:#fff;background-color:#5bc0de;border-color:#46b8da}.btn-info.focus,.btn-info:focus{color:#fff;background-color:#31b0d5;border-color:#1b6d85}.btn-info:hover{color:#fff;background-color:#31b0d5;border-color:#269abc}.btn-info.active,.btn-info:active,.open>.dropdown-toggle.btn-info{color:#fff;background-color:#31b0d5;border-color:#269abc}.btn-info.active.focus,.btn-info.active:focus,.btn-info.active:hover,.btn-info:active.focus,.btn-info:active:focus,.btn-info:active:hover,.open>.dropdown-toggle.btn-info.focus,.open>.dropdown-toggle.btn-info:focus,.open>.dropdown-toggle.btn-info:hover{color:#fff;background-color:#269abc;border-color:#1b6d85}.btn-info.active,.btn-info:active,.open>.dropdown-toggle.btn-info{background-image:none}.btn-info.disabled,.btn-info.disabled.active,.btn-info.disabled.focus,.btn-info.disabled:active,.btn-info.disabled:focus,.btn-info.disabled:hover,.btn-info[disabled],.btn-info[disabled].active,.btn-info[disabled].focus,.btn-info[disabled]:active,.btn-info[disabled]:focus,.btn-info[disabled]:hover,fieldset[disabled] .btn-info,fieldset[disabled] .btn-info.active,fieldset[disabled] .btn-info.focus,fieldset[disabled] .btn-info:active,fieldset[disabled] .btn-info:focus,fieldset[disabled] .btn-info:hover{background-color:#5bc0de;border-color:#46b8da}.btn-info .badge{color:#5bc0de;background-color:#fff}.btn-warning{color:#fff;background-color:#f0ad4e;border-color:#eea236}.btn-warning.focus,.btn-warning:focus{color:#fff;background-color:#ec971f;border-color:#985f0d}.btn-warning:hover{color:#fff;background-color:#ec971f;border-color:#d58512}.btn-warning.active,.btn-warning:active,.open>.dropdown-toggle.btn-warning{color:#fff;background-color:#ec971f;border-color:#d58512}.btn-warning.active.focus,.btn-warning.active:focus,.btn-warning.active:hover,.btn-warning:active.focus,.btn-warning:active:focus,.btn-warning:active:hover,.open>.dropdown-toggle.btn-warning.focus,.open>.dropdown-toggle.btn-warning:focus,.open>.dropdown-toggle.btn-warning:hover{color:#fff;background-color:#d58512;border-color:#985f0d}.btn-warning.active,.btn-warning:active,.open>.dropdown-toggle.btn-warning{background-image:none}.btn-warning.disabled,.btn-warning.disabled.active,.btn-warning.disabled.focus,.btn-warning.disabled:active,.btn-warning.disabled:focus,.btn-warning.disabled:hover,.btn-warning[disabled],.btn-warning[disabled].active,.btn-warning[disabled].focus,.btn-warning[disabled]:active,.btn-warning[disabled]:focus,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning,fieldset[disabled] .btn-warning.active,fieldset[disabled] .btn-warning.focus,fieldset[disabled] .btn-warning:active,fieldset[disabled] .btn-warning:focus,fieldset[disabled] .btn-warning:hover{background-color:#f0ad4e;border-color:#eea236}.btn-warning .badge{color:#f0ad4e;background-color:#fff}.btn-danger{color:#fff;background-color:#d9534f;border-color:#d43f3a}.btn-danger.focus,.btn-danger:focus{color:#fff;background-color:#c9302c;border-color:#761c19}.btn-danger:hover{color:#fff;background-color:#c9302c;border-color:#ac2925}.btn-danger.active,.btn-danger:active,.open>.dropdown-toggle.btn-danger{color:#fff;background-color:#c9302c;border-color:#ac2925}.btn-danger.active.focus,.btn-danger.active:focus,.btn-danger.active:hover,.btn-danger:active.focus,.btn-danger:active:focus,.btn-danger:active:hover,.open>.dropdown-toggle.btn-danger.focus,.open>.dropdown-toggle.btn-danger:focus,.open>.dropdown-toggle.btn-danger:hover{color:#fff;background-color:#ac2925;border-color:#761c19}.btn-danger.active,.btn-danger:active,.open>.dropdown-toggle.btn-danger{background-image:none}.btn-danger.disabled,.btn-danger.disabled.active,.btn-danger.disabled.focus,.btn-danger.disabled:active,.btn-danger.disabled:focus,.btn-danger.disabled:hover,.btn-danger[disabled],.btn-danger[disabled].active,.btn-danger[disabled].focus,.btn-danger[disabled]:active,.btn-danger[disabled]:focus,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger,fieldset[disabled] .btn-danger.active,fieldset[disabled] .btn-danger.focus,fieldset[disabled] .btn-danger:active,fieldset[disabled] .btn-danger:focus,fieldset[disabled] .btn-danger:hover{background-color:#d9534f;border-color:#d43f3a}.btn-danger .badge{color:#d9534f;background-color:#fff}.btn-link{font-weight:400;color:#337ab7;border-radius:0}.btn-link,.btn-link.active,.btn-link:active,.btn-link[disabled],fieldset[disabled] .btn-link{background-color:transparent;-webkit-box-shadow:none;box-shadow:none}.btn-link,.btn-link:active,.btn-link:focus,.btn-link:hover{border-color:transparent}.btn-link:focus,.btn-link:hover{color:#23527c;text-decoration:underline;background-color:transparent}.btn-link[disabled]:focus,.btn-link[disabled]:hover,fieldset[disabled] .btn-link:focus,fieldset[disabled] .btn-link:hover{color:#777;text-decoration:none}.btn-group-lg>.btn,.btn-lg{padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}.btn-group-sm>.btn,.btn-sm{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-group-xs>.btn,.btn-xs{padding:1px 5px;font-size:12px;line-height:1.5;border-radius:3px}.btn-block{display:block;width:100%}.btn-block+.btn-block{margin-top:5px}input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-block{width:100%}.fade{opacity:0;-webkit-transition:opacity .15s linear;-o-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{display:none}.collapse.in{display:block}tr.collapse.in{display:table-row}tbody.collapse.in{display:table-row-group}.collapsing{position:relative;height:0;overflow:hidden;-webkit-transition-timing-function:ease;-o-transition-timing-function:ease;transition-timing-function:ease;-webkit-transition-duration:.35s;-o-transition-duration:.35s;transition-duration:.35s;-webkit-transition-property:height,visibility;-o-transition-property:height,visibility;transition-property:height,visibility}.caret{display:inline-block;width:0;height:0;margin-left:2px;vertical-align:middle;border-top:4px dashed;border-top:4px solid\9;border-right:4px solid transparent;border-left:4px solid transparent}.dropdown,.dropup{position:relative}.dropdown-toggle:focus{outline:0}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;font-size:14px;text-align:left;list-style:none;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175)}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:400;line-height:1.42857143;color:#333;white-space:nowrap}.dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover{color:#262626;text-decoration:none;background-color:#f5f5f5}.dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover{color:#fff;text-decoration:none;background-color:#337ab7;outline:0}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{color:#777}.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{text-decoration:none;cursor:not-allowed;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.open>.dropdown-menu{display:block}.open>a{outline:0}.dropdown-menu-right{right:0;left:auto}.dropdown-menu-left{right:auto;left:0}.dropdown-header{display:block;padding:3px 20px;font-size:12px;line-height:1.42857143;color:#777;white-space:nowrap}.dropdown-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:990}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{content:"";border-top:0;border-bottom:4px dashed;border-bottom:4px solid\9}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:2px}@media (min-width:768px){.navbar-right .dropdown-menu{right:0;left:auto}.navbar-right .dropdown-menu-left{right:auto;left:0}}.btn-group,.btn-group-vertical{position:relative;display:inline-block;vertical-align:middle}.btn-group-vertical>.btn,.btn-group>.btn{position:relative;float:left}.btn-group-vertical>.btn.active,.btn-group-vertical>.btn:active,.btn-group-vertical>.btn:focus,.btn-group-vertical>.btn:hover,.btn-group>.btn.active,.btn-group>.btn:active,.btn-group>.btn:focus,.btn-group>.btn:hover{z-index:2}.btn-group .btn+.btn,.btn-group .btn+.btn-group,.btn-group .btn-group+.btn,.btn-group .btn-group+.btn-group{margin-left:-1px}.btn-toolbar{margin-left:-5px}.btn-toolbar .btn,.btn-toolbar .btn-group,.btn-toolbar .input-group{float:left}.btn-toolbar>.btn,.btn-toolbar>.btn-group,.btn-toolbar>.input-group{margin-left:5px}.btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle){border-radius:0}.btn-group>.btn:first-child{margin-left:0}.btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn:last-child:not(:first-child),.btn-group>.dropdown-toggle:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}.btn-group>.btn-group{float:left}.btn-group>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-bottom-left-radius:0}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group>.btn+.dropdown-toggle{padding-right:8px;padding-left:8px}.btn-group>.btn-lg+.dropdown-toggle{padding-right:12px;padding-left:12px}.btn-group.open .dropdown-toggle{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn-group.open .dropdown-toggle.btn-link{-webkit-box-shadow:none;box-shadow:none}.btn .caret{margin-left:0}.btn-lg .caret{border-width:5px 5px 0;border-bottom-width:0}.dropup .btn-lg .caret{border-width:0 5px 5px}.btn-group-vertical>.btn,.btn-group-vertical>.btn-group,.btn-group-vertical>.btn-group>.btn{display:block;float:none;width:100%;max-width:100%}.btn-group-vertical>.btn-group>.btn{float:none}.btn-group-vertical>.btn+.btn,.btn-group-vertical>.btn+.btn-group,.btn-group-vertical>.btn-group+.btn,.btn-group-vertical>.btn-group+.btn-group{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn:not(:first-child):not(:last-child){border-radius:0}.btn-group-vertical>.btn:first-child:not(:last-child){border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn:last-child:not(:first-child){border-top-left-radius:0;border-top-right-radius:0;border-bottom-left-radius:4px}.btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group-vertical>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group-vertical>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-top-right-radius:0}.btn-group-justified{display:table;width:100%;table-layout:fixed;border-collapse:separate}.btn-group-justified>.btn,.btn-group-justified>.btn-group{display:table-cell;float:none;width:1%}.btn-group-justified>.btn-group .btn{width:100%}.btn-group-justified>.btn-group .dropdown-menu{left:auto}[data-toggle=buttons]>.btn input[type=checkbox],[data-toggle=buttons]>.btn input[type=radio],[data-toggle=buttons]>.btn-group>.btn input[type=checkbox],[data-toggle=buttons]>.btn-group>.btn input[type=radio]{position:absolute;clip:rect(0,0,0,0);pointer-events:none}.input-group{position:relative;display:table;border-collapse:separate}.input-group[class*=col-]{float:none;padding-right:0;padding-left:0}.input-group .form-control{position:relative;z-index:2;float:left;width:100%;margin-bottom:0}.input-group-lg>.form-control,.input-group-lg>.input-group-addon,.input-group-lg>.input-group-btn>.btn{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.input-group-lg>.form-control,select.input-group-lg>.input-group-addon,select.input-group-lg>.input-group-btn>.btn{height:46px;line-height:46px}select[multiple].input-group-lg>.form-control,select[multiple].input-group-lg>.input-group-addon,select[multiple].input-group-lg>.input-group-btn>.btn,textarea.input-group-lg>.form-control,textarea.input-group-lg>.input-group-addon,textarea.input-group-lg>.input-group-btn>.btn{height:auto}.input-group-sm>.form-control,.input-group-sm>.input-group-addon,.input-group-sm>.input-group-btn>.btn{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-group-sm>.form-control,select.input-group-sm>.input-group-addon,select.input-group-sm>.input-group-btn>.btn{height:30px;line-height:30px}select[multiple].input-group-sm>.form-control,select[multiple].input-group-sm>.input-group-addon,select[multiple].input-group-sm>.input-group-btn>.btn,textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon,textarea.input-group-sm>.input-group-btn>.btn{height:auto}.input-group .form-control,.input-group-addon,.input-group-btn{display:table-cell}.input-group .form-control:not(:first-child):not(:last-child),.input-group-addon:not(:first-child):not(:last-child),.input-group-btn:not(:first-child):not(:last-child){border-radius:0}.input-group-addon,.input-group-btn{width:1%;white-space:nowrap;vertical-align:middle}.input-group-addon{padding:6px 12px;font-size:14px;font-weight:400;line-height:1;color:#555;text-align:center;background-color:#eee;border:1px solid #ccc;border-radius:4px}.input-group-addon.input-sm{padding:5px 10px;font-size:12px;border-radius:3px}.input-group-addon.input-lg{padding:10px 16px;font-size:18px;border-radius:6px}.input-group-addon input[type=checkbox],.input-group-addon input[type=radio]{margin-top:0}.input-group .form-control:first-child,.input-group-addon:first-child,.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group>.btn,.input-group-btn:first-child>.dropdown-toggle,.input-group-btn:last-child>.btn-group:not(:last-child)>.btn,.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.input-group-addon:first-child{border-right:0}.input-group .form-control:last-child,.input-group-addon:last-child,.input-group-btn:first-child>.btn-group:not(:first-child)>.btn,.input-group-btn:first-child>.btn:not(:first-child),.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group>.btn,.input-group-btn:last-child>.dropdown-toggle{border-top-left-radius:0;border-bottom-left-radius:0}.input-group-addon:last-child{border-left:0}.input-group-btn{position:relative;font-size:0;white-space:nowrap}.input-group-btn>.btn{position:relative}.input-group-btn>.btn+.btn{margin-left:-1px}.input-group-btn>.btn:active,.input-group-btn>.btn:focus,.input-group-btn>.btn:hover{z-index:2}.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group{margin-right:-1px}.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group{z-index:2;margin-left:-1px}.nav{padding-left:0;margin-bottom:0;list-style:none}.nav>li{position:relative;display:block}.nav>li>a{position:relative;display:block;padding:10px 15px}.nav>li>a:focus,.nav>li>a:hover{text-decoration:none;background-color:#eee}.nav>li.disabled>a{color:#777}.nav>li.disabled>a:focus,.nav>li.disabled>a:hover{color:#777;text-decoration:none;cursor:not-allowed;background-color:transparent}.nav .open>a,.nav .open>a:focus,.nav .open>a:hover{background-color:#eee;border-color:#337ab7}.nav .nav-divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.nav>li>a>img{max-width:none}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{float:left;margin-bottom:-1px}.nav-tabs>li>a{margin-right:2px;line-height:1.42857143;border:1px solid transparent;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover{border-color:#eee #eee #ddd}.nav-tabs>li.active>a,.nav-tabs>li.active>a:focus,.nav-tabs>li.active>a:hover{color:#555;cursor:default;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent}.nav-tabs.nav-justified{width:100%;border-bottom:0}.nav-tabs.nav-justified>li{float:none}.nav-tabs.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-tabs.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-tabs.nav-justified>li{display:table-cell;width:1%}.nav-tabs.nav-justified>li>a{margin-bottom:0}}.nav-tabs.nav-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border:1px solid #ddd}@media (min-width:768px){.nav-tabs.nav-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border-bottom-color:#fff}}.nav-pills>li{float:left}.nav-pills>li>a{border-radius:4px}.nav-pills>li+li{margin-left:2px}.nav-pills>li.active>a,.nav-pills>li.active>a:focus,.nav-pills>li.active>a:hover{color:#fff;background-color:#337ab7}.nav-stacked>li{float:none}.nav-stacked>li+li{margin-top:2px;margin-left:0}.nav-justified{width:100%}.nav-justified>li{float:none}.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-justified>li{display:table-cell;width:1%}.nav-justified>li>a{margin-bottom:0}}.nav-tabs-justified{border-bottom:0}.nav-tabs-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border:1px solid #ddd}@media (min-width:768px){.nav-tabs-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border-bottom-color:#fff}}.tab-content>.tab-pane{display:none}.tab-content>.active{display:block}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-left-radius:0;border-top-right-radius:0}.navbar{position:relative;min-height:50px;margin-bottom:20px;border:1px solid transparent}@media (min-width:768px){.navbar{border-radius:4px}}@media (min-width:768px){.navbar-header{float:left}}.navbar-collapse{padding-right:15px;padding-left:15px;overflow-x:visible;-webkit-overflow-scrolling:touch;border-top:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1)}.navbar-collapse.in{overflow-y:auto}@media (min-width:768px){.navbar-collapse{width:auto;border-top:0;-webkit-box-shadow:none;box-shadow:none}.navbar-collapse.collapse{display:block!important;height:auto!important;padding-bottom:0;overflow:visible!important}.navbar-collapse.in{overflow-y:visible}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse,.navbar-static-top .navbar-collapse{padding-right:0;padding-left:0}}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:340px}@media (max-device-width:480px) and (orientation:landscape){.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:200px}}.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:0;margin-left:0}}.navbar-static-top{z-index:1000;border-width:0 0 1px}@media (min-width:768px){.navbar-static-top{border-radius:0}}.navbar-fixed-bottom,.navbar-fixed-top{position:fixed;right:0;left:0;z-index:1030}@media (min-width:768px){.navbar-fixed-bottom,.navbar-fixed-top{border-radius:0}}.navbar-fixed-top{top:0;border-width:0 0 1px}.navbar-fixed-bottom{bottom:0;margin-bottom:0;border-width:1px 0 0}.navbar-brand{float:left;height:50px;padding:15px 15px;font-size:18px;line-height:20px}.navbar-brand:focus,.navbar-brand:hover{text-decoration:none}.navbar-brand>img{display:block}@media (min-width:768px){.navbar>.container .navbar-brand,.navbar>.container-fluid .navbar-brand{margin-left:-15px}}.navbar-toggle{position:relative;float:right;padding:9px 10px;margin-top:8px;margin-right:15px;margin-bottom:8px;background-color:transparent;background-image:none;border:1px solid transparent;border-radius:4px}.navbar-toggle:focus{outline:0}.navbar-toggle .icon-bar{display:block;width:22px;height:2px;border-radius:1px}.navbar-toggle .icon-bar+.icon-bar{margin-top:4px}@media (min-width:768px){.navbar-toggle{display:none}}.navbar-nav{margin:7.5px -15px}.navbar-nav>li>a{padding-top:10px;padding-bottom:10px;line-height:20px}@media (max-width:767px){.navbar-nav .open .dropdown-menu{position:static;float:none;width:auto;margin-top:0;background-color:transparent;border:0;-webkit-box-shadow:none;box-shadow:none}.navbar-nav .open .dropdown-menu .dropdown-header,.navbar-nav .open .dropdown-menu>li>a{padding:5px 15px 5px 25px}.navbar-nav .open .dropdown-menu>li>a{line-height:20px}.navbar-nav .open .dropdown-menu>li>a:focus,.navbar-nav .open .dropdown-menu>li>a:hover{background-image:none}}@media (min-width:768px){.navbar-nav{float:left;margin:0}.navbar-nav>li{float:left}.navbar-nav>li>a{padding-top:15px;padding-bottom:15px}}.navbar-form{padding:10px 15px;margin-top:8px;margin-right:-15px;margin-bottom:8px;margin-left:-15px;border-top:1px solid transparent;border-bottom:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1)}@media (min-width:768px){.navbar-form .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.navbar-form .form-control{display:inline-block;width:auto;vertical-align:middle}.navbar-form .form-control-static{display:inline-block}.navbar-form .input-group{display:inline-table;vertical-align:middle}.navbar-form .input-group .form-control,.navbar-form .input-group .input-group-addon,.navbar-form .input-group .input-group-btn{width:auto}.navbar-form .input-group>.form-control{width:100%}.navbar-form .control-label{margin-bottom:0;vertical-align:middle}.navbar-form .checkbox,.navbar-form .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.navbar-form .checkbox label,.navbar-form .radio label{padding-left:0}.navbar-form .checkbox input[type=checkbox],.navbar-form .radio input[type=radio]{position:relative;margin-left:0}.navbar-form .has-feedback .form-control-feedback{top:0}}@media (max-width:767px){.navbar-form .form-group{margin-bottom:5px}.navbar-form .form-group:last-child{margin-bottom:0}}@media (min-width:768px){.navbar-form{width:auto;padding-top:0;padding-bottom:0;margin-right:0;margin-left:0;border:0;-webkit-box-shadow:none;box-shadow:none}}.navbar-nav>li>.dropdown-menu{margin-top:0;border-top-left-radius:0;border-top-right-radius:0}.navbar-fixed-bottom .navbar-nav>li>.dropdown-menu{margin-bottom:0;border-top-left-radius:4px;border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.navbar-btn{margin-top:8px;margin-bottom:8px}.navbar-btn.btn-sm{margin-top:10px;margin-bottom:10px}.navbar-btn.btn-xs{margin-top:14px;margin-bottom:14px}.navbar-text{margin-top:15px;margin-bottom:15px}@media (min-width:768px){.navbar-text{float:left;margin-right:15px;margin-left:15px}}@media (min-width:768px){.navbar-left{float:left!important}.navbar-right{float:right!important;margin-right:-15px}.navbar-right~.navbar-right{margin-right:0}}.navbar-default{background-color:#f8f8f8;border-color:#e7e7e7}.navbar-default .navbar-brand{color:#777}.navbar-default .navbar-brand:focus,.navbar-default .navbar-brand:hover{color:#5e5e5e;background-color:transparent}.navbar-default .navbar-text{color:#777}.navbar-default .navbar-nav>li>a{color:#777}.navbar-default .navbar-nav>li>a:focus,.navbar-default .navbar-nav>li>a:hover{color:#333;background-color:transparent}.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:focus,.navbar-default .navbar-nav>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav>.disabled>a,.navbar-default .navbar-nav>.disabled>a:focus,.navbar-default .navbar-nav>.disabled>a:hover{color:#ccc;background-color:transparent}.navbar-default .navbar-toggle{border-color:#ddd}.navbar-default .navbar-toggle:focus,.navbar-default .navbar-toggle:hover{background-color:#ddd}.navbar-default .navbar-toggle .icon-bar{background-color:#888}.navbar-default .navbar-collapse,.navbar-default .navbar-form{border-color:#e7e7e7}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:focus,.navbar-default .navbar-nav>.open>a:hover{color:#555;background-color:#e7e7e7}@media (max-width:767px){.navbar-default .navbar-nav .open .dropdown-menu>li>a{color:#777}.navbar-default .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>li>a:hover{color:#333;background-color:transparent}.navbar-default .navbar-nav .open .dropdown-menu>.active>a,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#ccc;background-color:transparent}}.navbar-default .navbar-link{color:#777}.navbar-default .navbar-link:hover{color:#333}.navbar-default .btn-link{color:#777}.navbar-default .btn-link:focus,.navbar-default .btn-link:hover{color:#333}.navbar-default .btn-link[disabled]:focus,.navbar-default .btn-link[disabled]:hover,fieldset[disabled] .navbar-default .btn-link:focus,fieldset[disabled] .navbar-default .btn-link:hover{color:#ccc}.navbar-inverse{background-color:#222;border-color:#080808}.navbar-inverse .navbar-brand{color:#9d9d9d}.navbar-inverse .navbar-brand:focus,.navbar-inverse .navbar-brand:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-text{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a:focus,.navbar-inverse .navbar-nav>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:focus,.navbar-inverse .navbar-nav>.active>a:hover{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav>.disabled>a,.navbar-inverse .navbar-nav>.disabled>a:focus,.navbar-inverse .navbar-nav>.disabled>a:hover{color:#444;background-color:transparent}.navbar-inverse .navbar-toggle{border-color:#333}.navbar-inverse .navbar-toggle:focus,.navbar-inverse .navbar-toggle:hover{background-color:#333}.navbar-inverse .navbar-toggle .icon-bar{background-color:#fff}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#101010}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:focus,.navbar-inverse .navbar-nav>.open>a:hover{color:#fff;background-color:#080808}@media (max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu .divider{background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:hover{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#444;background-color:transparent}}.navbar-inverse .navbar-link{color:#9d9d9d}.navbar-inverse .navbar-link:hover{color:#fff}.navbar-inverse .btn-link{color:#9d9d9d}.navbar-inverse .btn-link:focus,.navbar-inverse .btn-link:hover{color:#fff}.navbar-inverse .btn-link[disabled]:focus,.navbar-inverse .btn-link[disabled]:hover,fieldset[disabled] .navbar-inverse .btn-link:focus,fieldset[disabled] .navbar-inverse .btn-link:hover{color:#444}.breadcrumb{padding:8px 15px;margin-bottom:20px;list-style:none;background-color:#f5f5f5;border-radius:4px}.breadcrumb>li{display:inline-block}.breadcrumb>li+li:before{padding:0 5px;color:#ccc;content:"/\00a0"}.breadcrumb>.active{color:#777}.pagination{display:inline-block;padding-left:0;margin:20px 0;border-radius:4px}.pagination>li{display:inline}.pagination>li>a,.pagination>li>span{position:relative;float:left;padding:6px 12px;margin-left:-1px;line-height:1.42857143;color:#337ab7;text-decoration:none;background-color:#fff;border:1px solid #ddd}.pagination>li:first-child>a,.pagination>li:first-child>span{margin-left:0;border-top-left-radius:4px;border-bottom-left-radius:4px}.pagination>li:last-child>a,.pagination>li:last-child>span{border-top-right-radius:4px;border-bottom-right-radius:4px}.pagination>li>a:focus,.pagination>li>a:hover,.pagination>li>span:focus,.pagination>li>span:hover{z-index:3;color:#23527c;background-color:#eee;border-color:#ddd}.pagination>.active>a,.pagination>.active>a:focus,.pagination>.active>a:hover,.pagination>.active>span,.pagination>.active>span:focus,.pagination>.active>span:hover{z-index:2;color:#fff;cursor:default;background-color:#337ab7;border-color:#337ab7}.pagination>.disabled>a,.pagination>.disabled>a:focus,.pagination>.disabled>a:hover,.pagination>.disabled>span,.pagination>.disabled>span:focus,.pagination>.disabled>span:hover{color:#777;cursor:not-allowed;background-color:#fff;border-color:#ddd}.pagination-lg>li>a,.pagination-lg>li>span{padding:10px 16px;font-size:18px;line-height:1.3333333}.pagination-lg>li:first-child>a,.pagination-lg>li:first-child>span{border-top-left-radius:6px;border-bottom-left-radius:6px}.pagination-lg>li:last-child>a,.pagination-lg>li:last-child>span{border-top-right-radius:6px;border-bottom-right-radius:6px}.pagination-sm>li>a,.pagination-sm>li>span{padding:5px 10px;font-size:12px;line-height:1.5}.pagination-sm>li:first-child>a,.pagination-sm>li:first-child>span{border-top-left-radius:3px;border-bottom-left-radius:3px}.pagination-sm>li:last-child>a,.pagination-sm>li:last-child>span{border-top-right-radius:3px;border-bottom-right-radius:3px}.pager{padding-left:0;margin:20px 0;text-align:center;list-style:none}.pager li{display:inline}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;border-radius:15px}.pager li>a:focus,.pager li>a:hover{text-decoration:none;background-color:#eee}.pager .next>a,.pager .next>span{float:right}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:focus,.pager .disabled>a:hover,.pager .disabled>span{color:#777;cursor:not-allowed;background-color:#fff}.label{display:inline;padding:.2em .6em .3em;font-size:75%;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25em}a.label:focus,a.label:hover{color:#fff;text-decoration:none;cursor:pointer}.label:empty{display:none}.btn .label{position:relative;top:-1px}.label-default{background-color:#777}.label-default[href]:focus,.label-default[href]:hover{background-color:#5e5e5e}.label-primary{background-color:#337ab7}.label-primary[href]:focus,.label-primary[href]:hover{background-color:#286090}.label-success{background-color:#5cb85c}.label-success[href]:focus,.label-success[href]:hover{background-color:#449d44}.label-info{background-color:#5bc0de}.label-info[href]:focus,.label-info[href]:hover{background-color:#31b0d5}.label-warning{background-color:#f0ad4e}.label-warning[href]:focus,.label-warning[href]:hover{background-color:#ec971f}.label-danger{background-color:#d9534f}.label-danger[href]:focus,.label-danger[href]:hover{background-color:#c9302c}.badge{display:inline-block;min-width:10px;padding:3px 7px;font-size:12px;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:middle;background-color:#777;border-radius:10px}.badge:empty{display:none}.btn .badge{position:relative;top:-1px}.btn-group-xs>.btn .badge,.btn-xs .badge{top:0;padding:1px 5px}a.badge:focus,a.badge:hover{color:#fff;text-decoration:none;cursor:pointer}.list-group-item.active>.badge,.nav-pills>.active>a>.badge{color:#337ab7;background-color:#fff}.list-group-item>.badge{float:right}.list-group-item>.badge+.badge{margin-right:5px}.nav-pills>li>a>.badge{margin-left:3px}.jumbotron{padding-top:30px;padding-bottom:30px;margin-bottom:30px;color:inherit;background-color:#eee}.jumbotron .h1,.jumbotron h1{color:inherit}.jumbotron p{margin-bottom:15px;font-size:21px;font-weight:200}.jumbotron>hr{border-top-color:#d5d5d5}.container .jumbotron,.container-fluid .jumbotron{border-radius:6px}.jumbotron .container{max-width:100%}@media screen and (min-width:768px){.jumbotron{padding-top:48px;padding-bottom:48px}.container .jumbotron,.container-fluid .jumbotron{padding-right:60px;padding-left:60px}.jumbotron .h1,.jumbotron h1{font-size:63px}}.thumbnail{display:block;padding:4px;margin-bottom:20px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:border .2s ease-in-out;-o-transition:border .2s ease-in-out;transition:border .2s ease-in-out}.thumbnail a>img,.thumbnail>img{margin-right:auto;margin-left:auto}a.thumbnail.active,a.thumbnail:focus,a.thumbnail:hover{border-color:#337ab7}.thumbnail .caption{padding:9px;color:#333}.alert{padding:15px;margin-bottom:20px;border:1px solid transparent;border-radius:4px}.alert h4{margin-top:0;color:inherit}.alert .alert-link{font-weight:700}.alert>p,.alert>ul{margin-bottom:0}.alert>p+p{margin-top:5px}.alert-dismissable,.alert-dismissible{padding-right:35px}.alert-dismissable .close,.alert-dismissible .close{position:relative;top:-2px;right:-21px;color:inherit}.alert-success{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.alert-success hr{border-top-color:#c9e2b3}.alert-success .alert-link{color:#2b542c}.alert-info{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.alert-info hr{border-top-color:#a6e1ec}.alert-info .alert-link{color:#245269}.alert-warning{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.alert-warning hr{border-top-color:#f7e1b5}.alert-warning .alert-link{color:#66512c}.alert-danger{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.alert-danger hr{border-top-color:#e4b9c0}.alert-danger .alert-link{color:#843534}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-o-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}.progress{height:20px;margin-bottom:20px;overflow:hidden;background-color:#f5f5f5;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1);box-shadow:inset 0 1px 2px rgba(0,0,0,.1)}.progress-bar{float:left;width:0;height:100%;font-size:12px;line-height:20px;color:#fff;text-align:center;background-color:#337ab7;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);-webkit-transition:width .6s ease;-o-transition:width .6s ease;transition:width .6s ease}.progress-bar-striped,.progress-striped .progress-bar{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);-webkit-background-size:40px 40px;background-size:40px 40px}.progress-bar.active,.progress.active .progress-bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}.progress-bar-success{background-color:#5cb85c}.progress-striped .progress-bar-success{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-info{background-color:#5bc0de}.progress-striped .progress-bar-info{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-warning{background-color:#f0ad4e}.progress-striped .progress-bar-warning{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-danger{background-color:#d9534f}.progress-striped .progress-bar-danger{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.media{margin-top:15px}.media:first-child{margin-top:0}.media,.media-body{overflow:hidden;zoom:1}.media-body{width:10000px}.media-object{display:block}.media-object.img-thumbnail{max-width:none}.media-right,.media>.pull-right{padding-left:10px}.media-left,.media>.pull-left{padding-right:10px}.media-body,.media-left,.media-right{display:table-cell;vertical-align:top}.media-middle{vertical-align:middle}.media-bottom{vertical-align:bottom}.media-heading{margin-top:0;margin-bottom:5px}.media-list{padding-left:0;list-style:none}.list-group{padding-left:0;margin-bottom:20px}.list-group-item{position:relative;display:block;padding:10px 15px;margin-bottom:-1px;background-color:#fff;border:1px solid #ddd}.list-group-item:first-child{border-top-left-radius:4px;border-top-right-radius:4px}.list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}a.list-group-item,button.list-group-item{color:#555}a.list-group-item .list-group-item-heading,button.list-group-item .list-group-item-heading{color:#333}a.list-group-item:focus,a.list-group-item:hover,button.list-group-item:focus,button.list-group-item:hover{color:#555;text-decoration:none;background-color:#f5f5f5}button.list-group-item{width:100%;text-align:left}.list-group-item.disabled,.list-group-item.disabled:focus,.list-group-item.disabled:hover{color:#777;cursor:not-allowed;background-color:#eee}.list-group-item.disabled .list-group-item-heading,.list-group-item.disabled:focus .list-group-item-heading,.list-group-item.disabled:hover .list-group-item-heading{color:inherit}.list-group-item.disabled .list-group-item-text,.list-group-item.disabled:focus .list-group-item-text,.list-group-item.disabled:hover .list-group-item-text{color:#777}.list-group-item.active,.list-group-item.active:focus,.list-group-item.active:hover{z-index:2;color:#fff;background-color:#337ab7;border-color:#337ab7}.list-group-item.active .list-group-item-heading,.list-group-item.active .list-group-item-heading>.small,.list-group-item.active .list-group-item-heading>small,.list-group-item.active:focus .list-group-item-heading,.list-group-item.active:focus .list-group-item-heading>.small,.list-group-item.active:focus .list-group-item-heading>small,.list-group-item.active:hover .list-group-item-heading,.list-group-item.active:hover .list-group-item-heading>.small,.list-group-item.active:hover .list-group-item-heading>small{color:inherit}.list-group-item.active .list-group-item-text,.list-group-item.active:focus .list-group-item-text,.list-group-item.active:hover .list-group-item-text{color:#c7ddef}.list-group-item-success{color:#3c763d;background-color:#dff0d8}a.list-group-item-success,button.list-group-item-success{color:#3c763d}a.list-group-item-success .list-group-item-heading,button.list-group-item-success .list-group-item-heading{color:inherit}a.list-group-item-success:focus,a.list-group-item-success:hover,button.list-group-item-success:focus,button.list-group-item-success:hover{color:#3c763d;background-color:#d0e9c6}a.list-group-item-success.active,a.list-group-item-success.active:focus,a.list-group-item-success.active:hover,button.list-group-item-success.active,button.list-group-item-success.active:focus,button.list-group-item-success.active:hover{color:#fff;background-color:#3c763d;border-color:#3c763d}.list-group-item-info{color:#31708f;background-color:#d9edf7}a.list-group-item-info,button.list-group-item-info{color:#31708f}a.list-group-item-info .list-group-item-heading,button.list-group-item-info .list-group-item-heading{color:inherit}a.list-group-item-info:focus,a.list-group-item-info:hover,button.list-group-item-info:focus,button.list-group-item-info:hover{color:#31708f;background-color:#c4e3f3}a.list-group-item-info.active,a.list-group-item-info.active:focus,a.list-group-item-info.active:hover,button.list-group-item-info.active,button.list-group-item-info.active:focus,button.list-group-item-info.active:hover{color:#fff;background-color:#31708f;border-color:#31708f}.list-group-item-warning{color:#8a6d3b;background-color:#fcf8e3}a.list-group-item-warning,button.list-group-item-warning{color:#8a6d3b}a.list-group-item-warning .list-group-item-heading,button.list-group-item-warning .list-group-item-heading{color:inherit}a.list-group-item-warning:focus,a.list-group-item-warning:hover,button.list-group-item-warning:focus,button.list-group-item-warning:hover{color:#8a6d3b;background-color:#faf2cc}a.list-group-item-warning.active,a.list-group-item-warning.active:focus,a.list-group-item-warning.active:hover,button.list-group-item-warning.active,button.list-group-item-warning.active:focus,button.list-group-item-warning.active:hover{color:#fff;background-color:#8a6d3b;border-color:#8a6d3b}.list-group-item-danger{color:#a94442;background-color:#f2dede}a.list-group-item-danger,button.list-group-item-danger{color:#a94442}a.list-group-item-danger .list-group-item-heading,button.list-group-item-danger .list-group-item-heading{color:inherit}a.list-group-item-danger:focus,a.list-group-item-danger:hover,button.list-group-item-danger:focus,button.list-group-item-danger:hover{color:#a94442;background-color:#ebcccc}a.list-group-item-danger.active,a.list-group-item-danger.active:focus,a.list-group-item-danger.active:hover,button.list-group-item-danger.active,button.list-group-item-danger.active:focus,button.list-group-item-danger.active:hover{color:#fff;background-color:#a94442;border-color:#a94442}.list-group-item-heading{margin-top:0;margin-bottom:5px}.list-group-item-text{margin-bottom:0;line-height:1.3}.panel{margin-bottom:20px;background-color:#fff;border:1px solid transparent;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05)}.panel-body{padding:15px}.panel-heading{padding:10px 15px;border-bottom:1px solid transparent;border-top-left-radius:3px;border-top-right-radius:3px}.panel-heading>.dropdown .dropdown-toggle{color:inherit}.panel-title{margin-top:0;margin-bottom:0;font-size:16px;color:inherit}.panel-title>.small,.panel-title>.small>a,.panel-title>a,.panel-title>small,.panel-title>small>a{color:inherit}.panel-footer{padding:10px 15px;background-color:#f5f5f5;border-top:1px solid #ddd;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.list-group,.panel>.panel-collapse>.list-group{margin-bottom:0}.panel>.list-group .list-group-item,.panel>.panel-collapse>.list-group .list-group-item{border-width:1px 0;border-radius:0}.panel>.list-group:first-child .list-group-item:first-child,.panel>.panel-collapse>.list-group:first-child .list-group-item:first-child{border-top:0;border-top-left-radius:3px;border-top-right-radius:3px}.panel>.list-group:last-child .list-group-item:last-child,.panel>.panel-collapse>.list-group:last-child .list-group-item:last-child{border-bottom:0;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.panel-heading+.panel-collapse>.list-group .list-group-item:first-child{border-top-left-radius:0;border-top-right-radius:0}.panel-heading+.list-group .list-group-item:first-child{border-top-width:0}.list-group+.panel-footer{border-top-width:0}.panel>.panel-collapse>.table,.panel>.table,.panel>.table-responsive>.table{margin-bottom:0}.panel>.panel-collapse>.table caption,.panel>.table caption,.panel>.table-responsive>.table caption{padding-right:15px;padding-left:15px}.panel>.table-responsive:first-child>.table:first-child,.panel>.table:first-child{border-top-left-radius:3px;border-top-right-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child,.panel>.table:first-child>thead:first-child>tr:first-child{border-top-left-radius:3px;border-top-right-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table:first-child>thead:first-child>tr:first-child th:first-child{border-top-left-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table:first-child>thead:first-child>tr:first-child th:last-child{border-top-right-radius:3px}.panel>.table-responsive:last-child>.table:last-child,.panel>.table:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:first-child{border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:last-child{border-bottom-right-radius:3px}.panel>.panel-body+.table,.panel>.panel-body+.table-responsive,.panel>.table+.panel-body,.panel>.table-responsive+.panel-body{border-top:1px solid #ddd}.panel>.table>tbody:first-child>tr:first-child td,.panel>.table>tbody:first-child>tr:first-child th{border-top:0}.panel>.table-bordered,.panel>.table-responsive>.table-bordered{border:0}.panel>.table-bordered>tbody>tr>td:first-child,.panel>.table-bordered>tbody>tr>th:first-child,.panel>.table-bordered>tfoot>tr>td:first-child,.panel>.table-bordered>tfoot>tr>th:first-child,.panel>.table-bordered>thead>tr>td:first-child,.panel>.table-bordered>thead>tr>th:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:first-child,.panel>.table-responsive>.table-bordered>thead>tr>td:first-child,.panel>.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.panel>.table-bordered>tbody>tr>td:last-child,.panel>.table-bordered>tbody>tr>th:last-child,.panel>.table-bordered>tfoot>tr>td:last-child,.panel>.table-bordered>tfoot>tr>th:last-child,.panel>.table-bordered>thead>tr>td:last-child,.panel>.table-bordered>thead>tr>th:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:last-child,.panel>.table-responsive>.table-bordered>thead>tr>td:last-child,.panel>.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.panel>.table-bordered>tbody>tr:first-child>td,.panel>.table-bordered>tbody>tr:first-child>th,.panel>.table-bordered>thead>tr:first-child>td,.panel>.table-bordered>thead>tr:first-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>th,.panel>.table-responsive>.table-bordered>thead>tr:first-child>td,.panel>.table-responsive>.table-bordered>thead>tr:first-child>th{border-bottom:0}.panel>.table-bordered>tbody>tr:last-child>td,.panel>.table-bordered>tbody>tr:last-child>th,.panel>.table-bordered>tfoot>tr:last-child>td,.panel>.table-bordered>tfoot>tr:last-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>th,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>td,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}.panel>.table-responsive{margin-bottom:0;border:0}.panel-group{margin-bottom:20px}.panel-group .panel{margin-bottom:0;border-radius:4px}.panel-group .panel+.panel{margin-top:5px}.panel-group .panel-heading{border-bottom:0}.panel-group .panel-heading+.panel-collapse>.list-group,.panel-group .panel-heading+.panel-collapse>.panel-body{border-top:1px solid #ddd}.panel-group .panel-footer{border-top:0}.panel-group .panel-footer+.panel-collapse .panel-body{border-bottom:1px solid #ddd}.panel-default{border-color:#ddd}.panel-default>.panel-heading{color:#333;background-color:#f5f5f5;border-color:#ddd}.panel-default>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ddd}.panel-default>.panel-heading .badge{color:#f5f5f5;background-color:#333}.panel-default>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ddd}.panel-primary{border-color:#337ab7}.panel-primary>.panel-heading{color:#fff;background-color:#337ab7;border-color:#337ab7}.panel-primary>.panel-heading+.panel-collapse>.panel-body{border-top-color:#337ab7}.panel-primary>.panel-heading .badge{color:#337ab7;background-color:#fff}.panel-primary>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#337ab7}.panel-success{border-color:#d6e9c6}.panel-success>.panel-heading{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.panel-success>.panel-heading+.panel-collapse>.panel-body{border-top-color:#d6e9c6}.panel-success>.panel-heading .badge{color:#dff0d8;background-color:#3c763d}.panel-success>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#d6e9c6}.panel-info{border-color:#bce8f1}.panel-info>.panel-heading{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.panel-info>.panel-heading+.panel-collapse>.panel-body{border-top-color:#bce8f1}.panel-info>.panel-heading .badge{color:#d9edf7;background-color:#31708f}.panel-info>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#bce8f1}.panel-warning{border-color:#faebcc}.panel-warning>.panel-heading{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.panel-warning>.panel-heading+.panel-collapse>.panel-body{border-top-color:#faebcc}.panel-warning>.panel-heading .badge{color:#fcf8e3;background-color:#8a6d3b}.panel-warning>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#faebcc}.panel-danger{border-color:#ebccd1}.panel-danger>.panel-heading{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.panel-danger>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ebccd1}.panel-danger>.panel-heading .badge{color:#f2dede;background-color:#a94442}.panel-danger>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ebccd1}.embed-responsive{position:relative;display:block;height:0;padding:0;overflow:hidden}.embed-responsive .embed-responsive-item,.embed-responsive embed,.embed-responsive iframe,.embed-responsive object,.embed-responsive video{position:absolute;top:0;bottom:0;left:0;width:100%;height:100%;border:0}.embed-responsive-16by9{padding-bottom:56.25%}.embed-responsive-4by3{padding-bottom:75%}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.05);box-shadow:inset 0 1px 1px rgba(0,0,0,.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,.15)}.well-lg{padding:24px;border-radius:6px}.well-sm{padding:9px;border-radius:3px}.close{float:right;font-size:21px;font-weight:700;line-height:1;color:#000;text-shadow:0 1px 0 #fff;filter:alpha(opacity=20);opacity:.2}.close:focus,.close:hover{color:#000;text-decoration:none;cursor:pointer;filter:alpha(opacity=50);opacity:.5}button.close{-webkit-appearance:none;padding:0;cursor:pointer;background:0 0;border:0}.modal-open{overflow:hidden}.modal{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1050;display:none;overflow:hidden;-webkit-overflow-scrolling:touch;outline:0}.modal.fade .modal-dialog{-webkit-transition:-webkit-transform .3s ease-out;-o-transition:-o-transform .3s ease-out;transition:transform .3s ease-out;-webkit-transform:translate(0,-25%);-ms-transform:translate(0,-25%);-o-transform:translate(0,-25%);transform:translate(0,-25%)}.modal.in .modal-dialog{-webkit-transform:translate(0,0);-ms-transform:translate(0,0);-o-transform:translate(0,0);transform:translate(0,0)}.modal-open .modal{overflow-x:hidden;overflow-y:auto}.modal-dialog{position:relative;width:auto;margin:10px}.modal-content{position:relative;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #999;border:1px solid rgba(0,0,0,.2);border-radius:6px;outline:0;-webkit-box-shadow:0 3px 9px rgba(0,0,0,.5);box-shadow:0 3px 9px rgba(0,0,0,.5)}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000}.modal-backdrop.fade{filter:alpha(opacity=0);opacity:0}.modal-backdrop.in{filter:alpha(opacity=50);opacity:.5}.modal-header{min-height:16.43px;padding:15px;border-bottom:1px solid #e5e5e5}.modal-header .close{margin-top:-2px}.modal-title{margin:0;line-height:1.42857143}.modal-body{position:relative;padding:15px}.modal-footer{padding:15px;text-align:right;border-top:1px solid #e5e5e5}.modal-footer .btn+.btn{margin-bottom:0;margin-left:5px}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}.modal-scrollbar-measure{position:absolute;top:-9999px;width:50px;height:50px;overflow:scroll}@media (min-width:768px){.modal-dialog{width:600px;margin:30px auto}.modal-content{-webkit-box-shadow:0 5px 15px rgba(0,0,0,.5);box-shadow:0 5px 15px rgba(0,0,0,.5)}.modal-sm{width:300px}}@media (min-width:992px){.modal-lg{width:900px}}.tooltip{position:absolute;z-index:1070;display:block;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:12px;font-style:normal;font-weight:400;line-height:1.42857143;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;word-wrap:normal;white-space:normal;filter:alpha(opacity=0);opacity:0;line-break:auto}.tooltip.in{filter:alpha(opacity=90);opacity:.9}.tooltip.top{padding:5px 0;margin-top:-3px}.tooltip.right{padding:0 5px;margin-left:3px}.tooltip.bottom{padding:5px 0;margin-top:3px}.tooltip.left{padding:0 5px;margin-left:-3px}.tooltip-inner{max-width:200px;padding:3px 8px;color:#fff;text-align:center;background-color:#000;border-radius:4px}.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-left .tooltip-arrow{right:5px;bottom:0;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-right .tooltip-arrow{bottom:0;left:5px;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-width:5px 5px 5px 0;border-right-color:#000}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-width:5px 0 5px 5px;border-left-color:#000}.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-left .tooltip-arrow{top:0;right:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-right .tooltip-arrow{top:0;left:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}.popover{position:absolute;top:0;left:0;z-index:1060;display:none;max-width:276px;padding:1px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;font-style:normal;font-weight:400;line-height:1.42857143;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;word-wrap:normal;white-space:normal;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.2);border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,.2);box-shadow:0 5px 10px rgba(0,0,0,.2);line-break:auto}.popover.top{margin-top:-10px}.popover.right{margin-left:10px}.popover.bottom{margin-top:10px}.popover.left{margin-left:-10px}.popover-title{padding:8px 14px;margin:0;font-size:14px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;border-radius:5px 5px 0 0}.popover-content{padding:9px 14px}.popover>.arrow,.popover>.arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.popover>.arrow{border-width:11px}.popover>.arrow:after{content:"";border-width:10px}.popover.top>.arrow{bottom:-11px;left:50%;margin-left:-11px;border-top-color:#999;border-top-color:rgba(0,0,0,.25);border-bottom-width:0}.popover.top>.arrow:after{bottom:1px;margin-left:-10px;content:" ";border-top-color:#fff;border-bottom-width:0}.popover.right>.arrow{top:50%;left:-11px;margin-top:-11px;border-right-color:#999;border-right-color:rgba(0,0,0,.25);border-left-width:0}.popover.right>.arrow:after{bottom:-10px;left:1px;content:" ";border-right-color:#fff;border-left-width:0}.popover.bottom>.arrow{top:-11px;left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,.25)}.popover.bottom>.arrow:after{top:1px;margin-left:-10px;content:" ";border-top-width:0;border-bottom-color:#fff}.popover.left>.arrow{top:50%;right:-11px;margin-top:-11px;border-right-width:0;border-left-color:#999;border-left-color:rgba(0,0,0,.25)}.popover.left>.arrow:after{right:1px;bottom:-10px;content:" ";border-right-width:0;border-left-color:#fff}.carousel{position:relative}.carousel-inner{position:relative;width:100%;overflow:hidden}.carousel-inner>.item{position:relative;display:none;-webkit-transition:.6s ease-in-out left;-o-transition:.6s ease-in-out left;transition:.6s ease-in-out left}.carousel-inner>.item>a>img,.carousel-inner>.item>img{line-height:1}@media all and (transform-3d),(-webkit-transform-3d){.carousel-inner>.item{-webkit-transition:-webkit-transform .6s ease-in-out;-o-transition:-o-transform .6s ease-in-out;transition:transform .6s ease-in-out;-webkit-backface-visibility:hidden;backface-visibility:hidden;-webkit-perspective:1000px;perspective:1000px}.carousel-inner>.item.active.right,.carousel-inner>.item.next{left:0;-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0)}.carousel-inner>.item.active.left,.carousel-inner>.item.prev{left:0;-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0)}.carousel-inner>.item.active,.carousel-inner>.item.next.left,.carousel-inner>.item.prev.right{left:0;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}}.carousel-inner>.active,.carousel-inner>.next,.carousel-inner>.prev{display:block}.carousel-inner>.active{left:0}.carousel-inner>.next,.carousel-inner>.prev{position:absolute;top:0;width:100%}.carousel-inner>.next{left:100%}.carousel-inner>.prev{left:-100%}.carousel-inner>.next.left,.carousel-inner>.prev.right{left:0}.carousel-inner>.active.left{left:-100%}.carousel-inner>.active.right{left:100%}.carousel-control{position:absolute;top:0;bottom:0;left:0;width:15%;font-size:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6);filter:alpha(opacity=50);opacity:.5}.carousel-control.left{background-image:-webkit-linear-gradient(left,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.5)),to(rgba(0,0,0,.0001)));background-image:linear-gradient(to right,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1);background-repeat:repeat-x}.carousel-control.right{right:0;left:auto;background-image:-webkit-linear-gradient(left,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.0001)),to(rgba(0,0,0,.5)));background-image:linear-gradient(to right,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1);background-repeat:repeat-x}.carousel-control:focus,.carousel-control:hover{color:#fff;text-decoration:none;filter:alpha(opacity=90);outline:0;opacity:.9}.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{position:absolute;top:50%;z-index:5;display:inline-block;margin-top:-10px}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{left:50%;margin-left:-10px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{right:50%;margin-right:-10px}.carousel-control .icon-next,.carousel-control .icon-prev{width:20px;height:20px;font-family:serif;line-height:1}.carousel-control .icon-prev:before{content:'\2039'}.carousel-control .icon-next:before{content:'\203a'}.carousel-indicators{position:absolute;bottom:10px;left:50%;z-index:15;width:60%;padding-left:0;margin-left:-30%;text-align:center;list-style:none}.carousel-indicators li{display:inline-block;width:10px;height:10px;margin:1px;text-indent:-999px;cursor:pointer;background-color:#000\9;background-color:rgba(0,0,0,0);border:1px solid #fff;border-radius:10px}.carousel-indicators .active{width:12px;height:12px;margin:0;background-color:#fff}.carousel-caption{position:absolute;right:15%;bottom:20px;left:15%;z-index:10;padding-top:20px;padding-bottom:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6)}.carousel-caption .btn{text-shadow:none}@media screen and (min-width:768px){.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{width:30px;height:30px;margin-top:-15px;font-size:30px}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{margin-left:-15px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{margin-right:-15px}.carousel-caption{right:20%;left:20%;padding-bottom:30px}.carousel-indicators{bottom:20px}}.btn-group-vertical>.btn-group:after,.btn-group-vertical>.btn-group:before,.btn-toolbar:after,.btn-toolbar:before,.clearfix:after,.clearfix:before,.container-fluid:after,.container-fluid:before,.container:after,.container:before,.dl-horizontal dd:after,.dl-horizontal dd:before,.form-horizontal .form-group:after,.form-horizontal .form-group:before,.modal-footer:after,.modal-footer:before,.nav:after,.nav:before,.navbar-collapse:after,.navbar-collapse:before,.navbar-header:after,.navbar-header:before,.navbar:after,.navbar:before,.pager:after,.pager:before,.panel-body:after,.panel-body:before,.row:after,.row:before{display:table;content:" "}.btn-group-vertical>.btn-group:after,.btn-toolbar:after,.clearfix:after,.container-fluid:after,.container:after,.dl-horizontal dd:after,.form-horizontal .form-group:after,.modal-footer:after,.nav:after,.navbar-collapse:after,.navbar-header:after,.navbar:after,.pager:after,.panel-body:after,.row:after{clear:both}.center-block{display:block;margin-right:auto;margin-left:auto}.pull-right{float:right!important}.pull-left{float:left!important}.hide{display:none!important}.show{display:block!important}.invisible{visibility:hidden}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.hidden{display:none!important}.affix{position:fixed}@-ms-viewport{width:device-width}.visible-lg,.visible-md,.visible-sm,.visible-xs{display:none!important}.visible-lg-block,.visible-lg-inline,.visible-lg-inline-block,.visible-md-block,.visible-md-inline,.visible-md-inline-block,.visible-sm-block,.visible-sm-inline,.visible-sm-inline-block,.visible-xs-block,.visible-xs-inline,.visible-xs-inline-block{display:none!important}@media (max-width:767px){.visible-xs{display:block!important}table.visible-xs{display:table!important}tr.visible-xs{display:table-row!important}td.visible-xs,th.visible-xs{display:table-cell!important}}@media (max-width:767px){.visible-xs-block{display:block!important}}@media (max-width:767px){.visible-xs-inline{display:inline!important}}@media (max-width:767px){.visible-xs-inline-block{display:inline-block!important}}@media (min-width:768px) and (max-width:991px){.visible-sm{display:block!important}table.visible-sm{display:table!important}tr.visible-sm{display:table-row!important}td.visible-sm,th.visible-sm{display:table-cell!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-block{display:block!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-inline{display:inline!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-inline-block{display:inline-block!important}}@media (min-width:992px) and (max-width:1199px){.visible-md{display:block!important}table.visible-md{display:table!important}tr.visible-md{display:table-row!important}td.visible-md,th.visible-md{display:table-cell!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-block{display:block!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-inline{display:inline!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-inline-block{display:inline-block!important}}@media (min-width:1200px){.visible-lg{display:block!important}table.visible-lg{display:table!important}tr.visible-lg{display:table-row!important}td.visible-lg,th.visible-lg{display:table-cell!important}}@media (min-width:1200px){.visible-lg-block{display:block!important}}@media (min-width:1200px){.visible-lg-inline{display:inline!important}}@media (min-width:1200px){.visible-lg-inline-block{display:inline-block!important}}@media (max-width:767px){.hidden-xs{display:none!important}}@media (min-width:768px) and (max-width:991px){.hidden-sm{display:none!important}}@media (min-width:992px) and (max-width:1199px){.hidden-md{display:none!important}}@media (min-width:1200px){.hidden-lg{display:none!important}}.visible-print{display:none!important}@media print{.visible-print{display:block!important}table.visible-print{display:table!important}tr.visible-print{display:table-row!important}td.visible-print,th.visible-print{display:table-cell!important}}.visible-print-block{display:none!important}@media print{.visible-print-block{display:block!important}}.visible-print-inline{display:none!important}@media print{.visible-print-inline{display:inline!important}}.visible-print-inline-block{display:none!important}@media print{.visible-print-inline-block{display:inline-block!important}}@media print{.hidden-print{display:none!important}} \ No newline at end of file + *//*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}h1{margin:.67em 0;font-size:2em}mark{color:#000;background:#ff0}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{height:0;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{margin:0;font:inherit;color:inherit}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}input{line-height:normal}input[type=checkbox],input[type=radio]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}fieldset{padding:.35em .625em .75em;margin:0 2px;border:1px solid silver}legend{padding:0;border:0}textarea{overflow:auto}optgroup{font-weight:700}table{border-spacing:0;border-collapse:collapse}td,th{padding:0}/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */@media print{*,:after,:before{color:#000!important;text-shadow:none!important;background:0 0!important;-webkit-box-shadow:none!important;box-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}a[href^="javascript:"]:after,a[href^="#"]:after{content:""}blockquote,pre{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}img,tr{page-break-inside:avoid}img{max-width:100%!important}h2,h3,p{orphans:3;widows:3}h2,h3{page-break-after:avoid}.navbar{display:none}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000!important}.label{border:1px solid #000}.table{border-collapse:collapse!important}.table td,.table th{background-color:#fff!important}.table-bordered td,.table-bordered th{border:1px solid #ddd!important}}@font-face{font-family:'Glyphicons Halflings';src:url(../fonts/glyphicons-halflings-regular.eot);src:url(../fonts/glyphicons-halflings-regular.eot?#iefix) format('embedded-opentype'),url(../fonts/glyphicons-halflings-regular.woff2) format('woff2'),url(../fonts/glyphicons-halflings-regular.woff) format('woff'),url(../fonts/glyphicons-halflings-regular.ttf) format('truetype'),url(../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular) format('svg')}.glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';font-style:normal;font-weight:400;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.glyphicon-asterisk:before{content:"\002a"}.glyphicon-plus:before{content:"\002b"}.glyphicon-eur:before,.glyphicon-euro:before{content:"\20ac"}.glyphicon-minus:before{content:"\2212"}.glyphicon-cloud:before{content:"\2601"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-pencil:before{content:"\270f"}.glyphicon-glass:before{content:"\e001"}.glyphicon-music:before{content:"\e002"}.glyphicon-search:before{content:"\e003"}.glyphicon-heart:before{content:"\e005"}.glyphicon-star:before{content:"\e006"}.glyphicon-star-empty:before{content:"\e007"}.glyphicon-user:before{content:"\e008"}.glyphicon-film:before{content:"\e009"}.glyphicon-th-large:before{content:"\e010"}.glyphicon-th:before{content:"\e011"}.glyphicon-th-list:before{content:"\e012"}.glyphicon-ok:before{content:"\e013"}.glyphicon-remove:before{content:"\e014"}.glyphicon-zoom-in:before{content:"\e015"}.glyphicon-zoom-out:before{content:"\e016"}.glyphicon-off:before{content:"\e017"}.glyphicon-signal:before{content:"\e018"}.glyphicon-cog:before{content:"\e019"}.glyphicon-trash:before{content:"\e020"}.glyphicon-home:before{content:"\e021"}.glyphicon-file:before{content:"\e022"}.glyphicon-time:before{content:"\e023"}.glyphicon-road:before{content:"\e024"}.glyphicon-download-alt:before{content:"\e025"}.glyphicon-download:before{content:"\e026"}.glyphicon-upload:before{content:"\e027"}.glyphicon-inbox:before{content:"\e028"}.glyphicon-play-circle:before{content:"\e029"}.glyphicon-repeat:before{content:"\e030"}.glyphicon-refresh:before{content:"\e031"}.glyphicon-list-alt:before{content:"\e032"}.glyphicon-lock:before{content:"\e033"}.glyphicon-flag:before{content:"\e034"}.glyphicon-headphones:before{content:"\e035"}.glyphicon-volume-off:before{content:"\e036"}.glyphicon-volume-down:before{content:"\e037"}.glyphicon-volume-up:before{content:"\e038"}.glyphicon-qrcode:before{content:"\e039"}.glyphicon-barcode:before{content:"\e040"}.glyphicon-tag:before{content:"\e041"}.glyphicon-tags:before{content:"\e042"}.glyphicon-book:before{content:"\e043"}.glyphicon-bookmark:before{content:"\e044"}.glyphicon-print:before{content:"\e045"}.glyphicon-camera:before{content:"\e046"}.glyphicon-font:before{content:"\e047"}.glyphicon-bold:before{content:"\e048"}.glyphicon-italic:before{content:"\e049"}.glyphicon-text-height:before{content:"\e050"}.glyphicon-text-width:before{content:"\e051"}.glyphicon-align-left:before{content:"\e052"}.glyphicon-align-center:before{content:"\e053"}.glyphicon-align-right:before{content:"\e054"}.glyphicon-align-justify:before{content:"\e055"}.glyphicon-list:before{content:"\e056"}.glyphicon-indent-left:before{content:"\e057"}.glyphicon-indent-right:before{content:"\e058"}.glyphicon-facetime-video:before{content:"\e059"}.glyphicon-picture:before{content:"\e060"}.glyphicon-map-marker:before{content:"\e062"}.glyphicon-adjust:before{content:"\e063"}.glyphicon-tint:before{content:"\e064"}.glyphicon-edit:before{content:"\e065"}.glyphicon-share:before{content:"\e066"}.glyphicon-check:before{content:"\e067"}.glyphicon-move:before{content:"\e068"}.glyphicon-step-backward:before{content:"\e069"}.glyphicon-fast-backward:before{content:"\e070"}.glyphicon-backward:before{content:"\e071"}.glyphicon-play:before{content:"\e072"}.glyphicon-pause:before{content:"\e073"}.glyphicon-stop:before{content:"\e074"}.glyphicon-forward:before{content:"\e075"}.glyphicon-fast-forward:before{content:"\e076"}.glyphicon-step-forward:before{content:"\e077"}.glyphicon-eject:before{content:"\e078"}.glyphicon-chevron-left:before{content:"\e079"}.glyphicon-chevron-right:before{content:"\e080"}.glyphicon-plus-sign:before{content:"\e081"}.glyphicon-minus-sign:before{content:"\e082"}.glyphicon-remove-sign:before{content:"\e083"}.glyphicon-ok-sign:before{content:"\e084"}.glyphicon-question-sign:before{content:"\e085"}.glyphicon-info-sign:before{content:"\e086"}.glyphicon-screenshot:before{content:"\e087"}.glyphicon-remove-circle:before{content:"\e088"}.glyphicon-ok-circle:before{content:"\e089"}.glyphicon-ban-circle:before{content:"\e090"}.glyphicon-arrow-left:before{content:"\e091"}.glyphicon-arrow-right:before{content:"\e092"}.glyphicon-arrow-up:before{content:"\e093"}.glyphicon-arrow-down:before{content:"\e094"}.glyphicon-share-alt:before{content:"\e095"}.glyphicon-resize-full:before{content:"\e096"}.glyphicon-resize-small:before{content:"\e097"}.glyphicon-exclamation-sign:before{content:"\e101"}.glyphicon-gift:before{content:"\e102"}.glyphicon-leaf:before{content:"\e103"}.glyphicon-fire:before{content:"\e104"}.glyphicon-eye-open:before{content:"\e105"}.glyphicon-eye-close:before{content:"\e106"}.glyphicon-warning-sign:before{content:"\e107"}.glyphicon-plane:before{content:"\e108"}.glyphicon-calendar:before{content:"\e109"}.glyphicon-random:before{content:"\e110"}.glyphicon-comment:before{content:"\e111"}.glyphicon-magnet:before{content:"\e112"}.glyphicon-chevron-up:before{content:"\e113"}.glyphicon-chevron-down:before{content:"\e114"}.glyphicon-retweet:before{content:"\e115"}.glyphicon-shopping-cart:before{content:"\e116"}.glyphicon-folder-close:before{content:"\e117"}.glyphicon-folder-open:before{content:"\e118"}.glyphicon-resize-vertical:before{content:"\e119"}.glyphicon-resize-horizontal:before{content:"\e120"}.glyphicon-hdd:before{content:"\e121"}.glyphicon-bullhorn:before{content:"\e122"}.glyphicon-bell:before{content:"\e123"}.glyphicon-certificate:before{content:"\e124"}.glyphicon-thumbs-up:before{content:"\e125"}.glyphicon-thumbs-down:before{content:"\e126"}.glyphicon-hand-right:before{content:"\e127"}.glyphicon-hand-left:before{content:"\e128"}.glyphicon-hand-up:before{content:"\e129"}.glyphicon-hand-down:before{content:"\e130"}.glyphicon-circle-arrow-right:before{content:"\e131"}.glyphicon-circle-arrow-left:before{content:"\e132"}.glyphicon-circle-arrow-up:before{content:"\e133"}.glyphicon-circle-arrow-down:before{content:"\e134"}.glyphicon-globe:before{content:"\e135"}.glyphicon-wrench:before{content:"\e136"}.glyphicon-tasks:before{content:"\e137"}.glyphicon-filter:before{content:"\e138"}.glyphicon-briefcase:before{content:"\e139"}.glyphicon-fullscreen:before{content:"\e140"}.glyphicon-dashboard:before{content:"\e141"}.glyphicon-paperclip:before{content:"\e142"}.glyphicon-heart-empty:before{content:"\e143"}.glyphicon-link:before{content:"\e144"}.glyphicon-phone:before{content:"\e145"}.glyphicon-pushpin:before{content:"\e146"}.glyphicon-usd:before{content:"\e148"}.glyphicon-gbp:before{content:"\e149"}.glyphicon-sort:before{content:"\e150"}.glyphicon-sort-by-alphabet:before{content:"\e151"}.glyphicon-sort-by-alphabet-alt:before{content:"\e152"}.glyphicon-sort-by-order:before{content:"\e153"}.glyphicon-sort-by-order-alt:before{content:"\e154"}.glyphicon-sort-by-attributes:before{content:"\e155"}.glyphicon-sort-by-attributes-alt:before{content:"\e156"}.glyphicon-unchecked:before{content:"\e157"}.glyphicon-expand:before{content:"\e158"}.glyphicon-collapse-down:before{content:"\e159"}.glyphicon-collapse-up:before{content:"\e160"}.glyphicon-log-in:before{content:"\e161"}.glyphicon-flash:before{content:"\e162"}.glyphicon-log-out:before{content:"\e163"}.glyphicon-new-window:before{content:"\e164"}.glyphicon-record:before{content:"\e165"}.glyphicon-save:before{content:"\e166"}.glyphicon-open:before{content:"\e167"}.glyphicon-saved:before{content:"\e168"}.glyphicon-import:before{content:"\e169"}.glyphicon-export:before{content:"\e170"}.glyphicon-send:before{content:"\e171"}.glyphicon-floppy-disk:before{content:"\e172"}.glyphicon-floppy-saved:before{content:"\e173"}.glyphicon-floppy-remove:before{content:"\e174"}.glyphicon-floppy-save:before{content:"\e175"}.glyphicon-floppy-open:before{content:"\e176"}.glyphicon-credit-card:before{content:"\e177"}.glyphicon-transfer:before{content:"\e178"}.glyphicon-cutlery:before{content:"\e179"}.glyphicon-header:before{content:"\e180"}.glyphicon-compressed:before{content:"\e181"}.glyphicon-earphone:before{content:"\e182"}.glyphicon-phone-alt:before{content:"\e183"}.glyphicon-tower:before{content:"\e184"}.glyphicon-stats:before{content:"\e185"}.glyphicon-sd-video:before{content:"\e186"}.glyphicon-hd-video:before{content:"\e187"}.glyphicon-subtitles:before{content:"\e188"}.glyphicon-sound-stereo:before{content:"\e189"}.glyphicon-sound-dolby:before{content:"\e190"}.glyphicon-sound-5-1:before{content:"\e191"}.glyphicon-sound-6-1:before{content:"\e192"}.glyphicon-sound-7-1:before{content:"\e193"}.glyphicon-copyright-mark:before{content:"\e194"}.glyphicon-registration-mark:before{content:"\e195"}.glyphicon-cloud-download:before{content:"\e197"}.glyphicon-cloud-upload:before{content:"\e198"}.glyphicon-tree-conifer:before{content:"\e199"}.glyphicon-tree-deciduous:before{content:"\e200"}.glyphicon-cd:before{content:"\e201"}.glyphicon-save-file:before{content:"\e202"}.glyphicon-open-file:before{content:"\e203"}.glyphicon-level-up:before{content:"\e204"}.glyphicon-copy:before{content:"\e205"}.glyphicon-paste:before{content:"\e206"}.glyphicon-alert:before{content:"\e209"}.glyphicon-equalizer:before{content:"\e210"}.glyphicon-king:before{content:"\e211"}.glyphicon-queen:before{content:"\e212"}.glyphicon-pawn:before{content:"\e213"}.glyphicon-bishop:before{content:"\e214"}.glyphicon-knight:before{content:"\e215"}.glyphicon-baby-formula:before{content:"\e216"}.glyphicon-tent:before{content:"\26fa"}.glyphicon-blackboard:before{content:"\e218"}.glyphicon-bed:before{content:"\e219"}.glyphicon-apple:before{content:"\f8ff"}.glyphicon-erase:before{content:"\e221"}.glyphicon-hourglass:before{content:"\231b"}.glyphicon-lamp:before{content:"\e223"}.glyphicon-duplicate:before{content:"\e224"}.glyphicon-piggy-bank:before{content:"\e225"}.glyphicon-scissors:before{content:"\e226"}.glyphicon-bitcoin:before{content:"\e227"}.glyphicon-btc:before{content:"\e227"}.glyphicon-xbt:before{content:"\e227"}.glyphicon-yen:before{content:"\00a5"}.glyphicon-jpy:before{content:"\00a5"}.glyphicon-ruble:before{content:"\20bd"}.glyphicon-rub:before{content:"\20bd"}.glyphicon-scale:before{content:"\e230"}.glyphicon-ice-lolly:before{content:"\e231"}.glyphicon-ice-lolly-tasted:before{content:"\e232"}.glyphicon-education:before{content:"\e233"}.glyphicon-option-horizontal:before{content:"\e234"}.glyphicon-option-vertical:before{content:"\e235"}.glyphicon-menu-hamburger:before{content:"\e236"}.glyphicon-modal-window:before{content:"\e237"}.glyphicon-oil:before{content:"\e238"}.glyphicon-grain:before{content:"\e239"}.glyphicon-sunglasses:before{content:"\e240"}.glyphicon-text-size:before{content:"\e241"}.glyphicon-text-color:before{content:"\e242"}.glyphicon-text-background:before{content:"\e243"}.glyphicon-object-align-top:before{content:"\e244"}.glyphicon-object-align-bottom:before{content:"\e245"}.glyphicon-object-align-horizontal:before{content:"\e246"}.glyphicon-object-align-left:before{content:"\e247"}.glyphicon-object-align-vertical:before{content:"\e248"}.glyphicon-object-align-right:before{content:"\e249"}.glyphicon-triangle-right:before{content:"\e250"}.glyphicon-triangle-left:before{content:"\e251"}.glyphicon-triangle-bottom:before{content:"\e252"}.glyphicon-triangle-top:before{content:"\e253"}.glyphicon-console:before{content:"\e254"}.glyphicon-superscript:before{content:"\e255"}.glyphicon-subscript:before{content:"\e256"}.glyphicon-menu-left:before{content:"\e257"}.glyphicon-menu-right:before{content:"\e258"}.glyphicon-menu-down:before{content:"\e259"}.glyphicon-menu-up:before{content:"\e260"}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}:after,:before{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:10px;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.42857143;color:#333;background-color:#fff}button,input,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}a{color:#337ab7;text-decoration:none}a:focus,a:hover{color:#23527c;text-decoration:underline}a:focus{outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}figure{margin:0}img{vertical-align:middle}.carousel-inner>.item>a>img,.carousel-inner>.item>img,.img-responsive,.thumbnail a>img,.thumbnail>img{display:block;max-width:100%;height:auto}.img-rounded{border-radius:6px}.img-thumbnail{display:inline-block;max-width:100%;height:auto;padding:4px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.img-circle{border-radius:50%}hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #eee}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}[role=button]{cursor:pointer}.h1,.h2,.h3,.h4,.h5,.h6,h1,h2,h3,h4,h5,h6{font-family:inherit;font-weight:500;line-height:1.1;color:inherit}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-weight:400;line-height:1;color:#777}.h1,.h2,.h3,h1,h2,h3{margin-top:20px;margin-bottom:10px}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small{font-size:65%}.h4,.h5,.h6,h4,h5,h6{margin-top:10px;margin-bottom:10px}.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-size:75%}.h1,h1{font-size:36px}.h2,h2{font-size:30px}.h3,h3{font-size:24px}.h4,h4{font-size:18px}.h5,h5{font-size:14px}.h6,h6{font-size:12px}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:16px;font-weight:300;line-height:1.4}@media (min-width:768px){.lead{font-size:21px}}.small,small{font-size:85%}.mark,mark{padding:.2em;background-color:#fcf8e3}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}.text-justify{text-align:justify}.text-nowrap{white-space:nowrap}.text-lowercase{text-transform:lowercase}.text-uppercase{text-transform:uppercase}.text-capitalize{text-transform:capitalize}.text-muted{color:#777}.text-primary{color:#337ab7}a.text-primary:focus,a.text-primary:hover{color:#286090}.text-success{color:#3c763d}a.text-success:focus,a.text-success:hover{color:#2b542c}.text-info{color:#31708f}a.text-info:focus,a.text-info:hover{color:#245269}.text-warning{color:#8a6d3b}a.text-warning:focus,a.text-warning:hover{color:#66512c}.text-danger{color:#a94442}a.text-danger:focus,a.text-danger:hover{color:#843534}.bg-primary{color:#fff;background-color:#337ab7}a.bg-primary:focus,a.bg-primary:hover{background-color:#286090}.bg-success{background-color:#dff0d8}a.bg-success:focus,a.bg-success:hover{background-color:#c1e2b3}.bg-info{background-color:#d9edf7}a.bg-info:focus,a.bg-info:hover{background-color:#afd9ee}.bg-warning{background-color:#fcf8e3}a.bg-warning:focus,a.bg-warning:hover{background-color:#f7ecb5}.bg-danger{background-color:#f2dede}a.bg-danger:focus,a.bg-danger:hover{background-color:#e4b9b9}.page-header{padding-bottom:9px;margin:40px 0 20px;border-bottom:1px solid #eee}ol,ul{margin-top:0;margin-bottom:10px}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}.list-unstyled{padding-left:0;list-style:none}.list-inline{padding-left:0;margin-left:-5px;list-style:none}.list-inline>li{display:inline-block;padding-right:5px;padding-left:5px}dl{margin-top:0;margin-bottom:20px}dd,dt{line-height:1.42857143}dt{font-weight:700}dd{margin-left:0}@media (min-width:768px){.dl-horizontal dt{float:left;width:160px;overflow:hidden;clear:left;text-align:right;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}}abbr[data-original-title],abbr[title]{cursor:help;border-bottom:1px dotted #777}.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:10px 20px;margin:0 0 20px;font-size:17.5px;border-left:5px solid #eee}blockquote ol:last-child,blockquote p:last-child,blockquote ul:last-child{margin-bottom:0}blockquote .small,blockquote footer,blockquote small{display:block;font-size:80%;line-height:1.42857143;color:#777}blockquote .small:before,blockquote footer:before,blockquote small:before{content:'\2014 \00A0'}.blockquote-reverse,blockquote.pull-right{padding-right:15px;padding-left:0;text-align:right;border-right:5px solid #eee;border-left:0}.blockquote-reverse .small:before,.blockquote-reverse footer:before,.blockquote-reverse small:before,blockquote.pull-right .small:before,blockquote.pull-right footer:before,blockquote.pull-right small:before{content:''}.blockquote-reverse .small:after,.blockquote-reverse footer:after,.blockquote-reverse small:after,blockquote.pull-right .small:after,blockquote.pull-right footer:after,blockquote.pull-right small:after{content:'\00A0 \2014'}address{margin-bottom:20px;font-style:normal;line-height:1.42857143}code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,"Courier New",monospace}code{padding:2px 4px;font-size:90%;color:#c7254e;background-color:#f9f2f4;border-radius:4px}kbd{padding:2px 4px;font-size:90%;color:#fff;background-color:#333;border-radius:3px;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.25);box-shadow:inset 0 -1px 0 rgba(0,0,0,.25)}kbd kbd{padding:0;font-size:100%;font-weight:700;-webkit-box-shadow:none;box-shadow:none}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.42857143;color:#333;word-break:break-all;word-wrap:break-word;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px}pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border-radius:0}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}@media (min-width:768px){.container{width:750px}}@media (min-width:992px){.container{width:970px}}@media (min-width:1200px){.container{width:1170px}}.container-fluid{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}.row{margin-right:-15px;margin-left:-15px}.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{position:relative;min-height:1px;padding-right:15px;padding-left:15px}.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{float:left}.col-xs-12{width:100%}.col-xs-11{width:91.66666667%}.col-xs-10{width:83.33333333%}.col-xs-9{width:75%}.col-xs-8{width:66.66666667%}.col-xs-7{width:58.33333333%}.col-xs-6{width:50%}.col-xs-5{width:41.66666667%}.col-xs-4{width:33.33333333%}.col-xs-3{width:25%}.col-xs-2{width:16.66666667%}.col-xs-1{width:8.33333333%}.col-xs-pull-12{right:100%}.col-xs-pull-11{right:91.66666667%}.col-xs-pull-10{right:83.33333333%}.col-xs-pull-9{right:75%}.col-xs-pull-8{right:66.66666667%}.col-xs-pull-7{right:58.33333333%}.col-xs-pull-6{right:50%}.col-xs-pull-5{right:41.66666667%}.col-xs-pull-4{right:33.33333333%}.col-xs-pull-3{right:25%}.col-xs-pull-2{right:16.66666667%}.col-xs-pull-1{right:8.33333333%}.col-xs-pull-0{right:auto}.col-xs-push-12{left:100%}.col-xs-push-11{left:91.66666667%}.col-xs-push-10{left:83.33333333%}.col-xs-push-9{left:75%}.col-xs-push-8{left:66.66666667%}.col-xs-push-7{left:58.33333333%}.col-xs-push-6{left:50%}.col-xs-push-5{left:41.66666667%}.col-xs-push-4{left:33.33333333%}.col-xs-push-3{left:25%}.col-xs-push-2{left:16.66666667%}.col-xs-push-1{left:8.33333333%}.col-xs-push-0{left:auto}.col-xs-offset-12{margin-left:100%}.col-xs-offset-11{margin-left:91.66666667%}.col-xs-offset-10{margin-left:83.33333333%}.col-xs-offset-9{margin-left:75%}.col-xs-offset-8{margin-left:66.66666667%}.col-xs-offset-7{margin-left:58.33333333%}.col-xs-offset-6{margin-left:50%}.col-xs-offset-5{margin-left:41.66666667%}.col-xs-offset-4{margin-left:33.33333333%}.col-xs-offset-3{margin-left:25%}.col-xs-offset-2{margin-left:16.66666667%}.col-xs-offset-1{margin-left:8.33333333%}.col-xs-offset-0{margin-left:0}@media (min-width:768px){.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9{float:left}.col-sm-12{width:100%}.col-sm-11{width:91.66666667%}.col-sm-10{width:83.33333333%}.col-sm-9{width:75%}.col-sm-8{width:66.66666667%}.col-sm-7{width:58.33333333%}.col-sm-6{width:50%}.col-sm-5{width:41.66666667%}.col-sm-4{width:33.33333333%}.col-sm-3{width:25%}.col-sm-2{width:16.66666667%}.col-sm-1{width:8.33333333%}.col-sm-pull-12{right:100%}.col-sm-pull-11{right:91.66666667%}.col-sm-pull-10{right:83.33333333%}.col-sm-pull-9{right:75%}.col-sm-pull-8{right:66.66666667%}.col-sm-pull-7{right:58.33333333%}.col-sm-pull-6{right:50%}.col-sm-pull-5{right:41.66666667%}.col-sm-pull-4{right:33.33333333%}.col-sm-pull-3{right:25%}.col-sm-pull-2{right:16.66666667%}.col-sm-pull-1{right:8.33333333%}.col-sm-pull-0{right:auto}.col-sm-push-12{left:100%}.col-sm-push-11{left:91.66666667%}.col-sm-push-10{left:83.33333333%}.col-sm-push-9{left:75%}.col-sm-push-8{left:66.66666667%}.col-sm-push-7{left:58.33333333%}.col-sm-push-6{left:50%}.col-sm-push-5{left:41.66666667%}.col-sm-push-4{left:33.33333333%}.col-sm-push-3{left:25%}.col-sm-push-2{left:16.66666667%}.col-sm-push-1{left:8.33333333%}.col-sm-push-0{left:auto}.col-sm-offset-12{margin-left:100%}.col-sm-offset-11{margin-left:91.66666667%}.col-sm-offset-10{margin-left:83.33333333%}.col-sm-offset-9{margin-left:75%}.col-sm-offset-8{margin-left:66.66666667%}.col-sm-offset-7{margin-left:58.33333333%}.col-sm-offset-6{margin-left:50%}.col-sm-offset-5{margin-left:41.66666667%}.col-sm-offset-4{margin-left:33.33333333%}.col-sm-offset-3{margin-left:25%}.col-sm-offset-2{margin-left:16.66666667%}.col-sm-offset-1{margin-left:8.33333333%}.col-sm-offset-0{margin-left:0}}@media (min-width:992px){.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9{float:left}.col-md-12{width:100%}.col-md-11{width:91.66666667%}.col-md-10{width:83.33333333%}.col-md-9{width:75%}.col-md-8{width:66.66666667%}.col-md-7{width:58.33333333%}.col-md-6{width:50%}.col-md-5{width:41.66666667%}.col-md-4{width:33.33333333%}.col-md-3{width:25%}.col-md-2{width:16.66666667%}.col-md-1{width:8.33333333%}.col-md-pull-12{right:100%}.col-md-pull-11{right:91.66666667%}.col-md-pull-10{right:83.33333333%}.col-md-pull-9{right:75%}.col-md-pull-8{right:66.66666667%}.col-md-pull-7{right:58.33333333%}.col-md-pull-6{right:50%}.col-md-pull-5{right:41.66666667%}.col-md-pull-4{right:33.33333333%}.col-md-pull-3{right:25%}.col-md-pull-2{right:16.66666667%}.col-md-pull-1{right:8.33333333%}.col-md-pull-0{right:auto}.col-md-push-12{left:100%}.col-md-push-11{left:91.66666667%}.col-md-push-10{left:83.33333333%}.col-md-push-9{left:75%}.col-md-push-8{left:66.66666667%}.col-md-push-7{left:58.33333333%}.col-md-push-6{left:50%}.col-md-push-5{left:41.66666667%}.col-md-push-4{left:33.33333333%}.col-md-push-3{left:25%}.col-md-push-2{left:16.66666667%}.col-md-push-1{left:8.33333333%}.col-md-push-0{left:auto}.col-md-offset-12{margin-left:100%}.col-md-offset-11{margin-left:91.66666667%}.col-md-offset-10{margin-left:83.33333333%}.col-md-offset-9{margin-left:75%}.col-md-offset-8{margin-left:66.66666667%}.col-md-offset-7{margin-left:58.33333333%}.col-md-offset-6{margin-left:50%}.col-md-offset-5{margin-left:41.66666667%}.col-md-offset-4{margin-left:33.33333333%}.col-md-offset-3{margin-left:25%}.col-md-offset-2{margin-left:16.66666667%}.col-md-offset-1{margin-left:8.33333333%}.col-md-offset-0{margin-left:0}}@media (min-width:1200px){.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9{float:left}.col-lg-12{width:100%}.col-lg-11{width:91.66666667%}.col-lg-10{width:83.33333333%}.col-lg-9{width:75%}.col-lg-8{width:66.66666667%}.col-lg-7{width:58.33333333%}.col-lg-6{width:50%}.col-lg-5{width:41.66666667%}.col-lg-4{width:33.33333333%}.col-lg-3{width:25%}.col-lg-2{width:16.66666667%}.col-lg-1{width:8.33333333%}.col-lg-pull-12{right:100%}.col-lg-pull-11{right:91.66666667%}.col-lg-pull-10{right:83.33333333%}.col-lg-pull-9{right:75%}.col-lg-pull-8{right:66.66666667%}.col-lg-pull-7{right:58.33333333%}.col-lg-pull-6{right:50%}.col-lg-pull-5{right:41.66666667%}.col-lg-pull-4{right:33.33333333%}.col-lg-pull-3{right:25%}.col-lg-pull-2{right:16.66666667%}.col-lg-pull-1{right:8.33333333%}.col-lg-pull-0{right:auto}.col-lg-push-12{left:100%}.col-lg-push-11{left:91.66666667%}.col-lg-push-10{left:83.33333333%}.col-lg-push-9{left:75%}.col-lg-push-8{left:66.66666667%}.col-lg-push-7{left:58.33333333%}.col-lg-push-6{left:50%}.col-lg-push-5{left:41.66666667%}.col-lg-push-4{left:33.33333333%}.col-lg-push-3{left:25%}.col-lg-push-2{left:16.66666667%}.col-lg-push-1{left:8.33333333%}.col-lg-push-0{left:auto}.col-lg-offset-12{margin-left:100%}.col-lg-offset-11{margin-left:91.66666667%}.col-lg-offset-10{margin-left:83.33333333%}.col-lg-offset-9{margin-left:75%}.col-lg-offset-8{margin-left:66.66666667%}.col-lg-offset-7{margin-left:58.33333333%}.col-lg-offset-6{margin-left:50%}.col-lg-offset-5{margin-left:41.66666667%}.col-lg-offset-4{margin-left:33.33333333%}.col-lg-offset-3{margin-left:25%}.col-lg-offset-2{margin-left:16.66666667%}.col-lg-offset-1{margin-left:8.33333333%}.col-lg-offset-0{margin-left:0}}table{background-color:transparent}caption{padding-top:8px;padding-bottom:8px;color:#777;text-align:left}th{text-align:left}.table{width:100%;max-width:100%;margin-bottom:20px}.table>tbody>tr>td,.table>tbody>tr>th,.table>tfoot>tr>td,.table>tfoot>tr>th,.table>thead>tr>td,.table>thead>tr>th{padding:8px;line-height:1.42857143;vertical-align:top;border-top:1px solid #ddd}.table>thead>tr>th{vertical-align:bottom;border-bottom:2px solid #ddd}.table>caption+thead>tr:first-child>td,.table>caption+thead>tr:first-child>th,.table>colgroup+thead>tr:first-child>td,.table>colgroup+thead>tr:first-child>th,.table>thead:first-child>tr:first-child>td,.table>thead:first-child>tr:first-child>th{border-top:0}.table>tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#fff}.table-condensed>tbody>tr>td,.table-condensed>tbody>tr>th,.table-condensed>tfoot>tr>td,.table-condensed>tfoot>tr>th,.table-condensed>thead>tr>td,.table-condensed>thead>tr>th{padding:5px}.table-bordered{border:1px solid #ddd}.table-bordered>tbody>tr>td,.table-bordered>tbody>tr>th,.table-bordered>tfoot>tr>td,.table-bordered>tfoot>tr>th,.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border:1px solid #ddd}.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border-bottom-width:2px}.table-striped>tbody>tr:nth-of-type(odd){background-color:#f9f9f9}.table-hover>tbody>tr:hover{background-color:#f5f5f5}table col[class*=col-]{position:static;display:table-column;float:none}table td[class*=col-],table th[class*=col-]{position:static;display:table-cell;float:none}.table>tbody>tr.active>td,.table>tbody>tr.active>th,.table>tbody>tr>td.active,.table>tbody>tr>th.active,.table>tfoot>tr.active>td,.table>tfoot>tr.active>th,.table>tfoot>tr>td.active,.table>tfoot>tr>th.active,.table>thead>tr.active>td,.table>thead>tr.active>th,.table>thead>tr>td.active,.table>thead>tr>th.active{background-color:#f5f5f5}.table-hover>tbody>tr.active:hover>td,.table-hover>tbody>tr.active:hover>th,.table-hover>tbody>tr:hover>.active,.table-hover>tbody>tr>td.active:hover,.table-hover>tbody>tr>th.active:hover{background-color:#e8e8e8}.table>tbody>tr.success>td,.table>tbody>tr.success>th,.table>tbody>tr>td.success,.table>tbody>tr>th.success,.table>tfoot>tr.success>td,.table>tfoot>tr.success>th,.table>tfoot>tr>td.success,.table>tfoot>tr>th.success,.table>thead>tr.success>td,.table>thead>tr.success>th,.table>thead>tr>td.success,.table>thead>tr>th.success{background-color:#dff0d8}.table-hover>tbody>tr.success:hover>td,.table-hover>tbody>tr.success:hover>th,.table-hover>tbody>tr:hover>.success,.table-hover>tbody>tr>td.success:hover,.table-hover>tbody>tr>th.success:hover{background-color:#d0e9c6}.table>tbody>tr.info>td,.table>tbody>tr.info>th,.table>tbody>tr>td.info,.table>tbody>tr>th.info,.table>tfoot>tr.info>td,.table>tfoot>tr.info>th,.table>tfoot>tr>td.info,.table>tfoot>tr>th.info,.table>thead>tr.info>td,.table>thead>tr.info>th,.table>thead>tr>td.info,.table>thead>tr>th.info{background-color:#d9edf7}.table-hover>tbody>tr.info:hover>td,.table-hover>tbody>tr.info:hover>th,.table-hover>tbody>tr:hover>.info,.table-hover>tbody>tr>td.info:hover,.table-hover>tbody>tr>th.info:hover{background-color:#c4e3f3}.table>tbody>tr.warning>td,.table>tbody>tr.warning>th,.table>tbody>tr>td.warning,.table>tbody>tr>th.warning,.table>tfoot>tr.warning>td,.table>tfoot>tr.warning>th,.table>tfoot>tr>td.warning,.table>tfoot>tr>th.warning,.table>thead>tr.warning>td,.table>thead>tr.warning>th,.table>thead>tr>td.warning,.table>thead>tr>th.warning{background-color:#fcf8e3}.table-hover>tbody>tr.warning:hover>td,.table-hover>tbody>tr.warning:hover>th,.table-hover>tbody>tr:hover>.warning,.table-hover>tbody>tr>td.warning:hover,.table-hover>tbody>tr>th.warning:hover{background-color:#faf2cc}.table>tbody>tr.danger>td,.table>tbody>tr.danger>th,.table>tbody>tr>td.danger,.table>tbody>tr>th.danger,.table>tfoot>tr.danger>td,.table>tfoot>tr.danger>th,.table>tfoot>tr>td.danger,.table>tfoot>tr>th.danger,.table>thead>tr.danger>td,.table>thead>tr.danger>th,.table>thead>tr>td.danger,.table>thead>tr>th.danger{background-color:#f2dede}.table-hover>tbody>tr.danger:hover>td,.table-hover>tbody>tr.danger:hover>th,.table-hover>tbody>tr:hover>.danger,.table-hover>tbody>tr>td.danger:hover,.table-hover>tbody>tr>th.danger:hover{background-color:#ebcccc}.table-responsive{min-height:.01%;overflow-x:auto}@media screen and (max-width:767px){.table-responsive{width:100%;margin-bottom:15px;overflow-y:hidden;-ms-overflow-style:-ms-autohiding-scrollbar;border:1px solid #ddd}.table-responsive>.table{margin-bottom:0}.table-responsive>.table>tbody>tr>td,.table-responsive>.table>tbody>tr>th,.table-responsive>.table>tfoot>tr>td,.table-responsive>.table>tfoot>tr>th,.table-responsive>.table>thead>tr>td,.table-responsive>.table>thead>tr>th{white-space:nowrap}.table-responsive>.table-bordered{border:0}.table-responsive>.table-bordered>tbody>tr>td:first-child,.table-responsive>.table-bordered>tbody>tr>th:first-child,.table-responsive>.table-bordered>tfoot>tr>td:first-child,.table-responsive>.table-bordered>tfoot>tr>th:first-child,.table-responsive>.table-bordered>thead>tr>td:first-child,.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.table-responsive>.table-bordered>tbody>tr>td:last-child,.table-responsive>.table-bordered>tbody>tr>th:last-child,.table-responsive>.table-bordered>tfoot>tr>td:last-child,.table-responsive>.table-bordered>tfoot>tr>th:last-child,.table-responsive>.table-bordered>thead>tr>td:last-child,.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.table-responsive>.table-bordered>tbody>tr:last-child>td,.table-responsive>.table-bordered>tbody>tr:last-child>th,.table-responsive>.table-bordered>tfoot>tr:last-child>td,.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}}fieldset{min-width:0;padding:0;margin:0;border:0}legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:inherit;color:#333;border:0;border-bottom:1px solid #e5e5e5}label{display:inline-block;max-width:100%;margin-bottom:5px;font-weight:700}input[type=search]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type=checkbox],input[type=radio]{margin:4px 0 0;margin-top:1px\9;line-height:normal}input[type=file]{display:block}input[type=range]{display:block;width:100%}select[multiple],select[size]{height:auto}input[type=file]:focus,input[type=checkbox]:focus,input[type=radio]:focus{outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}output{display:block;padding-top:7px;font-size:14px;line-height:1.42857143;color:#555}.form-control{display:block;width:100%;height:34px;padding:6px 12px;font-size:14px;line-height:1.42857143;color:#555;background-color:#fff;background-image:none;border:1px solid #ccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075);-webkit-transition:border-color ease-in-out .15s,-webkit-box-shadow ease-in-out .15s;-o-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s}.form-control:focus{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6)}.form-control::-moz-placeholder{color:#999;opacity:1}.form-control:-ms-input-placeholder{color:#999}.form-control::-webkit-input-placeholder{color:#999}.form-control::-ms-expand{background-color:transparent;border:0}.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{background-color:#eee;opacity:1}.form-control[disabled],fieldset[disabled] .form-control{cursor:not-allowed}textarea.form-control{height:auto}input[type=search]{-webkit-appearance:none}@media screen and (-webkit-min-device-pixel-ratio:0){input[type=date].form-control,input[type=time].form-control,input[type=datetime-local].form-control,input[type=month].form-control{line-height:34px}.input-group-sm input[type=date],.input-group-sm input[type=time],.input-group-sm input[type=datetime-local],.input-group-sm input[type=month],input[type=date].input-sm,input[type=time].input-sm,input[type=datetime-local].input-sm,input[type=month].input-sm{line-height:30px}.input-group-lg input[type=date],.input-group-lg input[type=time],.input-group-lg input[type=datetime-local],.input-group-lg input[type=month],input[type=date].input-lg,input[type=time].input-lg,input[type=datetime-local].input-lg,input[type=month].input-lg{line-height:46px}}.form-group{margin-bottom:15px}.checkbox,.radio{position:relative;display:block;margin-top:10px;margin-bottom:10px}.checkbox label,.radio label{min-height:20px;padding-left:20px;margin-bottom:0;font-weight:400;cursor:pointer}.checkbox input[type=checkbox],.checkbox-inline input[type=checkbox],.radio input[type=radio],.radio-inline input[type=radio]{position:absolute;margin-top:4px\9;margin-left:-20px}.checkbox+.checkbox,.radio+.radio{margin-top:-5px}.checkbox-inline,.radio-inline{position:relative;display:inline-block;padding-left:20px;margin-bottom:0;font-weight:400;vertical-align:middle;cursor:pointer}.checkbox-inline+.checkbox-inline,.radio-inline+.radio-inline{margin-top:0;margin-left:10px}fieldset[disabled] input[type=checkbox],fieldset[disabled] input[type=radio],input[type=checkbox].disabled,input[type=checkbox][disabled],input[type=radio].disabled,input[type=radio][disabled]{cursor:not-allowed}.checkbox-inline.disabled,.radio-inline.disabled,fieldset[disabled] .checkbox-inline,fieldset[disabled] .radio-inline{cursor:not-allowed}.checkbox.disabled label,.radio.disabled label,fieldset[disabled] .checkbox label,fieldset[disabled] .radio label{cursor:not-allowed}.form-control-static{min-height:34px;padding-top:7px;padding-bottom:7px;margin-bottom:0}.form-control-static.input-lg,.form-control-static.input-sm{padding-right:0;padding-left:0}.input-sm{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-sm{height:30px;line-height:30px}select[multiple].input-sm,textarea.input-sm{height:auto}.form-group-sm .form-control{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.form-group-sm select.form-control{height:30px;line-height:30px}.form-group-sm select[multiple].form-control,.form-group-sm textarea.form-control{height:auto}.form-group-sm .form-control-static{height:30px;min-height:32px;padding:6px 10px;font-size:12px;line-height:1.5}.input-lg{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.input-lg{height:46px;line-height:46px}select[multiple].input-lg,textarea.input-lg{height:auto}.form-group-lg .form-control{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}.form-group-lg select.form-control{height:46px;line-height:46px}.form-group-lg select[multiple].form-control,.form-group-lg textarea.form-control{height:auto}.form-group-lg .form-control-static{height:46px;min-height:38px;padding:11px 16px;font-size:18px;line-height:1.3333333}.has-feedback{position:relative}.has-feedback .form-control{padding-right:42.5px}.form-control-feedback{position:absolute;top:0;right:0;z-index:2;display:block;width:34px;height:34px;line-height:34px;text-align:center;pointer-events:none}.form-group-lg .form-control+.form-control-feedback,.input-group-lg+.form-control-feedback,.input-lg+.form-control-feedback{width:46px;height:46px;line-height:46px}.form-group-sm .form-control+.form-control-feedback,.input-group-sm+.form-control-feedback,.input-sm+.form-control-feedback{width:30px;height:30px;line-height:30px}.has-success .checkbox,.has-success .checkbox-inline,.has-success .control-label,.has-success .help-block,.has-success .radio,.has-success .radio-inline,.has-success.checkbox label,.has-success.checkbox-inline label,.has-success.radio label,.has-success.radio-inline label{color:#3c763d}.has-success .form-control{border-color:#3c763d;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-success .form-control:focus{border-color:#2b542c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168}.has-success .input-group-addon{color:#3c763d;background-color:#dff0d8;border-color:#3c763d}.has-success .form-control-feedback{color:#3c763d}.has-warning .checkbox,.has-warning .checkbox-inline,.has-warning .control-label,.has-warning .help-block,.has-warning .radio,.has-warning .radio-inline,.has-warning.checkbox label,.has-warning.checkbox-inline label,.has-warning.radio label,.has-warning.radio-inline label{color:#8a6d3b}.has-warning .form-control{border-color:#8a6d3b;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-warning .form-control:focus{border-color:#66512c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b}.has-warning .input-group-addon{color:#8a6d3b;background-color:#fcf8e3;border-color:#8a6d3b}.has-warning .form-control-feedback{color:#8a6d3b}.has-error .checkbox,.has-error .checkbox-inline,.has-error .control-label,.has-error .help-block,.has-error .radio,.has-error .radio-inline,.has-error.checkbox label,.has-error.checkbox-inline label,.has-error.radio label,.has-error.radio-inline label{color:#a94442}.has-error .form-control{border-color:#a94442;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-error .form-control:focus{border-color:#843534;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483}.has-error .input-group-addon{color:#a94442;background-color:#f2dede;border-color:#a94442}.has-error .form-control-feedback{color:#a94442}.has-feedback label~.form-control-feedback{top:25px}.has-feedback label.sr-only~.form-control-feedback{top:0}.help-block{display:block;margin-top:5px;margin-bottom:10px;color:#737373}@media (min-width:768px){.form-inline .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.form-inline .form-control{display:inline-block;width:auto;vertical-align:middle}.form-inline .form-control-static{display:inline-block}.form-inline .input-group{display:inline-table;vertical-align:middle}.form-inline .input-group .form-control,.form-inline .input-group .input-group-addon,.form-inline .input-group .input-group-btn{width:auto}.form-inline .input-group>.form-control{width:100%}.form-inline .control-label{margin-bottom:0;vertical-align:middle}.form-inline .checkbox,.form-inline .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.form-inline .checkbox label,.form-inline .radio label{padding-left:0}.form-inline .checkbox input[type=checkbox],.form-inline .radio input[type=radio]{position:relative;margin-left:0}.form-inline .has-feedback .form-control-feedback{top:0}}.form-horizontal .checkbox,.form-horizontal .checkbox-inline,.form-horizontal .radio,.form-horizontal .radio-inline{padding-top:7px;margin-top:0;margin-bottom:0}.form-horizontal .checkbox,.form-horizontal .radio{min-height:27px}.form-horizontal .form-group{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.form-horizontal .control-label{padding-top:7px;margin-bottom:0;text-align:right}}.form-horizontal .has-feedback .form-control-feedback{right:15px}@media (min-width:768px){.form-horizontal .form-group-lg .control-label{padding-top:11px;font-size:18px}}@media (min-width:768px){.form-horizontal .form-group-sm .control-label{padding-top:6px;font-size:12px}}.btn{display:inline-block;padding:6px 12px;margin-bottom:0;font-size:14px;font-weight:400;line-height:1.42857143;text-align:center;white-space:nowrap;vertical-align:middle;-ms-touch-action:manipulation;touch-action:manipulation;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background-image:none;border:1px solid transparent;border-radius:4px}.btn.active.focus,.btn.active:focus,.btn.focus,.btn:active.focus,.btn:active:focus,.btn:focus{outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn.focus,.btn:focus,.btn:hover{color:#333;text-decoration:none}.btn.active,.btn:active{background-image:none;outline:0;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn.disabled,.btn[disabled],fieldset[disabled] .btn{cursor:not-allowed;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none;opacity:.65}a.btn.disabled,fieldset[disabled] a.btn{pointer-events:none}.btn-default{color:#333;background-color:#fff;border-color:#ccc}.btn-default.focus,.btn-default:focus{color:#333;background-color:#e6e6e6;border-color:#8c8c8c}.btn-default:hover{color:#333;background-color:#e6e6e6;border-color:#adadad}.btn-default.active,.btn-default:active,.open>.dropdown-toggle.btn-default{color:#333;background-color:#e6e6e6;border-color:#adadad}.btn-default.active.focus,.btn-default.active:focus,.btn-default.active:hover,.btn-default:active.focus,.btn-default:active:focus,.btn-default:active:hover,.open>.dropdown-toggle.btn-default.focus,.open>.dropdown-toggle.btn-default:focus,.open>.dropdown-toggle.btn-default:hover{color:#333;background-color:#d4d4d4;border-color:#8c8c8c}.btn-default.active,.btn-default:active,.open>.dropdown-toggle.btn-default{background-image:none}.btn-default.disabled.focus,.btn-default.disabled:focus,.btn-default.disabled:hover,.btn-default[disabled].focus,.btn-default[disabled]:focus,.btn-default[disabled]:hover,fieldset[disabled] .btn-default.focus,fieldset[disabled] .btn-default:focus,fieldset[disabled] .btn-default:hover{background-color:#fff;border-color:#ccc}.btn-default .badge{color:#fff;background-color:#333}.btn-primary{color:#fff;background-color:#337ab7;border-color:#2e6da4}.btn-primary.focus,.btn-primary:focus{color:#fff;background-color:#286090;border-color:#122b40}.btn-primary:hover{color:#fff;background-color:#286090;border-color:#204d74}.btn-primary.active,.btn-primary:active,.open>.dropdown-toggle.btn-primary{color:#fff;background-color:#286090;border-color:#204d74}.btn-primary.active.focus,.btn-primary.active:focus,.btn-primary.active:hover,.btn-primary:active.focus,.btn-primary:active:focus,.btn-primary:active:hover,.open>.dropdown-toggle.btn-primary.focus,.open>.dropdown-toggle.btn-primary:focus,.open>.dropdown-toggle.btn-primary:hover{color:#fff;background-color:#204d74;border-color:#122b40}.btn-primary.active,.btn-primary:active,.open>.dropdown-toggle.btn-primary{background-image:none}.btn-primary.disabled.focus,.btn-primary.disabled:focus,.btn-primary.disabled:hover,.btn-primary[disabled].focus,.btn-primary[disabled]:focus,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary.focus,fieldset[disabled] .btn-primary:focus,fieldset[disabled] .btn-primary:hover{background-color:#337ab7;border-color:#2e6da4}.btn-primary .badge{color:#337ab7;background-color:#fff}.btn-success{color:#fff;background-color:#5cb85c;border-color:#4cae4c}.btn-success.focus,.btn-success:focus{color:#fff;background-color:#449d44;border-color:#255625}.btn-success:hover{color:#fff;background-color:#449d44;border-color:#398439}.btn-success.active,.btn-success:active,.open>.dropdown-toggle.btn-success{color:#fff;background-color:#449d44;border-color:#398439}.btn-success.active.focus,.btn-success.active:focus,.btn-success.active:hover,.btn-success:active.focus,.btn-success:active:focus,.btn-success:active:hover,.open>.dropdown-toggle.btn-success.focus,.open>.dropdown-toggle.btn-success:focus,.open>.dropdown-toggle.btn-success:hover{color:#fff;background-color:#398439;border-color:#255625}.btn-success.active,.btn-success:active,.open>.dropdown-toggle.btn-success{background-image:none}.btn-success.disabled.focus,.btn-success.disabled:focus,.btn-success.disabled:hover,.btn-success[disabled].focus,.btn-success[disabled]:focus,.btn-success[disabled]:hover,fieldset[disabled] .btn-success.focus,fieldset[disabled] .btn-success:focus,fieldset[disabled] .btn-success:hover{background-color:#5cb85c;border-color:#4cae4c}.btn-success .badge{color:#5cb85c;background-color:#fff}.btn-info{color:#fff;background-color:#5bc0de;border-color:#46b8da}.btn-info.focus,.btn-info:focus{color:#fff;background-color:#31b0d5;border-color:#1b6d85}.btn-info:hover{color:#fff;background-color:#31b0d5;border-color:#269abc}.btn-info.active,.btn-info:active,.open>.dropdown-toggle.btn-info{color:#fff;background-color:#31b0d5;border-color:#269abc}.btn-info.active.focus,.btn-info.active:focus,.btn-info.active:hover,.btn-info:active.focus,.btn-info:active:focus,.btn-info:active:hover,.open>.dropdown-toggle.btn-info.focus,.open>.dropdown-toggle.btn-info:focus,.open>.dropdown-toggle.btn-info:hover{color:#fff;background-color:#269abc;border-color:#1b6d85}.btn-info.active,.btn-info:active,.open>.dropdown-toggle.btn-info{background-image:none}.btn-info.disabled.focus,.btn-info.disabled:focus,.btn-info.disabled:hover,.btn-info[disabled].focus,.btn-info[disabled]:focus,.btn-info[disabled]:hover,fieldset[disabled] .btn-info.focus,fieldset[disabled] .btn-info:focus,fieldset[disabled] .btn-info:hover{background-color:#5bc0de;border-color:#46b8da}.btn-info .badge{color:#5bc0de;background-color:#fff}.btn-warning{color:#fff;background-color:#f0ad4e;border-color:#eea236}.btn-warning.focus,.btn-warning:focus{color:#fff;background-color:#ec971f;border-color:#985f0d}.btn-warning:hover{color:#fff;background-color:#ec971f;border-color:#d58512}.btn-warning.active,.btn-warning:active,.open>.dropdown-toggle.btn-warning{color:#fff;background-color:#ec971f;border-color:#d58512}.btn-warning.active.focus,.btn-warning.active:focus,.btn-warning.active:hover,.btn-warning:active.focus,.btn-warning:active:focus,.btn-warning:active:hover,.open>.dropdown-toggle.btn-warning.focus,.open>.dropdown-toggle.btn-warning:focus,.open>.dropdown-toggle.btn-warning:hover{color:#fff;background-color:#d58512;border-color:#985f0d}.btn-warning.active,.btn-warning:active,.open>.dropdown-toggle.btn-warning{background-image:none}.btn-warning.disabled.focus,.btn-warning.disabled:focus,.btn-warning.disabled:hover,.btn-warning[disabled].focus,.btn-warning[disabled]:focus,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning.focus,fieldset[disabled] .btn-warning:focus,fieldset[disabled] .btn-warning:hover{background-color:#f0ad4e;border-color:#eea236}.btn-warning .badge{color:#f0ad4e;background-color:#fff}.btn-danger{color:#fff;background-color:#d9534f;border-color:#d43f3a}.btn-danger.focus,.btn-danger:focus{color:#fff;background-color:#c9302c;border-color:#761c19}.btn-danger:hover{color:#fff;background-color:#c9302c;border-color:#ac2925}.btn-danger.active,.btn-danger:active,.open>.dropdown-toggle.btn-danger{color:#fff;background-color:#c9302c;border-color:#ac2925}.btn-danger.active.focus,.btn-danger.active:focus,.btn-danger.active:hover,.btn-danger:active.focus,.btn-danger:active:focus,.btn-danger:active:hover,.open>.dropdown-toggle.btn-danger.focus,.open>.dropdown-toggle.btn-danger:focus,.open>.dropdown-toggle.btn-danger:hover{color:#fff;background-color:#ac2925;border-color:#761c19}.btn-danger.active,.btn-danger:active,.open>.dropdown-toggle.btn-danger{background-image:none}.btn-danger.disabled.focus,.btn-danger.disabled:focus,.btn-danger.disabled:hover,.btn-danger[disabled].focus,.btn-danger[disabled]:focus,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger.focus,fieldset[disabled] .btn-danger:focus,fieldset[disabled] .btn-danger:hover{background-color:#d9534f;border-color:#d43f3a}.btn-danger .badge{color:#d9534f;background-color:#fff}.btn-link{font-weight:400;color:#337ab7;border-radius:0}.btn-link,.btn-link.active,.btn-link:active,.btn-link[disabled],fieldset[disabled] .btn-link{background-color:transparent;-webkit-box-shadow:none;box-shadow:none}.btn-link,.btn-link:active,.btn-link:focus,.btn-link:hover{border-color:transparent}.btn-link:focus,.btn-link:hover{color:#23527c;text-decoration:underline;background-color:transparent}.btn-link[disabled]:focus,.btn-link[disabled]:hover,fieldset[disabled] .btn-link:focus,fieldset[disabled] .btn-link:hover{color:#777;text-decoration:none}.btn-group-lg>.btn,.btn-lg{padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}.btn-group-sm>.btn,.btn-sm{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-group-xs>.btn,.btn-xs{padding:1px 5px;font-size:12px;line-height:1.5;border-radius:3px}.btn-block{display:block;width:100%}.btn-block+.btn-block{margin-top:5px}input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-block{width:100%}.fade{opacity:0;-webkit-transition:opacity .15s linear;-o-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{display:none}.collapse.in{display:block}tr.collapse.in{display:table-row}tbody.collapse.in{display:table-row-group}.collapsing{position:relative;height:0;overflow:hidden;-webkit-transition-timing-function:ease;-o-transition-timing-function:ease;transition-timing-function:ease;-webkit-transition-duration:.35s;-o-transition-duration:.35s;transition-duration:.35s;-webkit-transition-property:height,visibility;-o-transition-property:height,visibility;transition-property:height,visibility}.caret{display:inline-block;width:0;height:0;margin-left:2px;vertical-align:middle;border-top:4px dashed;border-top:4px solid\9;border-right:4px solid transparent;border-left:4px solid transparent}.dropdown,.dropup{position:relative}.dropdown-toggle:focus{outline:0}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;font-size:14px;text-align:left;list-style:none;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175)}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:400;line-height:1.42857143;color:#333;white-space:nowrap}.dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover{color:#262626;text-decoration:none;background-color:#f5f5f5}.dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover{color:#fff;text-decoration:none;background-color:#337ab7;outline:0}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{color:#777}.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{text-decoration:none;cursor:not-allowed;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.open>.dropdown-menu{display:block}.open>a{outline:0}.dropdown-menu-right{right:0;left:auto}.dropdown-menu-left{right:auto;left:0}.dropdown-header{display:block;padding:3px 20px;font-size:12px;line-height:1.42857143;color:#777;white-space:nowrap}.dropdown-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:990}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{content:"";border-top:0;border-bottom:4px dashed;border-bottom:4px solid\9}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:2px}@media (min-width:768px){.navbar-right .dropdown-menu{right:0;left:auto}.navbar-right .dropdown-menu-left{right:auto;left:0}}.btn-group,.btn-group-vertical{position:relative;display:inline-block;vertical-align:middle}.btn-group-vertical>.btn,.btn-group>.btn{position:relative;float:left}.btn-group-vertical>.btn.active,.btn-group-vertical>.btn:active,.btn-group-vertical>.btn:focus,.btn-group-vertical>.btn:hover,.btn-group>.btn.active,.btn-group>.btn:active,.btn-group>.btn:focus,.btn-group>.btn:hover{z-index:2}.btn-group .btn+.btn,.btn-group .btn+.btn-group,.btn-group .btn-group+.btn,.btn-group .btn-group+.btn-group{margin-left:-1px}.btn-toolbar{margin-left:-5px}.btn-toolbar .btn,.btn-toolbar .btn-group,.btn-toolbar .input-group{float:left}.btn-toolbar>.btn,.btn-toolbar>.btn-group,.btn-toolbar>.input-group{margin-left:5px}.btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle){border-radius:0}.btn-group>.btn:first-child{margin-left:0}.btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn:last-child:not(:first-child),.btn-group>.dropdown-toggle:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}.btn-group>.btn-group{float:left}.btn-group>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-bottom-left-radius:0}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group>.btn+.dropdown-toggle{padding-right:8px;padding-left:8px}.btn-group>.btn-lg+.dropdown-toggle{padding-right:12px;padding-left:12px}.btn-group.open .dropdown-toggle{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn-group.open .dropdown-toggle.btn-link{-webkit-box-shadow:none;box-shadow:none}.btn .caret{margin-left:0}.btn-lg .caret{border-width:5px 5px 0;border-bottom-width:0}.dropup .btn-lg .caret{border-width:0 5px 5px}.btn-group-vertical>.btn,.btn-group-vertical>.btn-group,.btn-group-vertical>.btn-group>.btn{display:block;float:none;width:100%;max-width:100%}.btn-group-vertical>.btn-group>.btn{float:none}.btn-group-vertical>.btn+.btn,.btn-group-vertical>.btn+.btn-group,.btn-group-vertical>.btn-group+.btn,.btn-group-vertical>.btn-group+.btn-group{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn:not(:first-child):not(:last-child){border-radius:0}.btn-group-vertical>.btn:first-child:not(:last-child){border-top-left-radius:4px;border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn:last-child:not(:first-child){border-top-left-radius:0;border-top-right-radius:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}.btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group-vertical>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group-vertical>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-top-right-radius:0}.btn-group-justified{display:table;width:100%;table-layout:fixed;border-collapse:separate}.btn-group-justified>.btn,.btn-group-justified>.btn-group{display:table-cell;float:none;width:1%}.btn-group-justified>.btn-group .btn{width:100%}.btn-group-justified>.btn-group .dropdown-menu{left:auto}[data-toggle=buttons]>.btn input[type=checkbox],[data-toggle=buttons]>.btn input[type=radio],[data-toggle=buttons]>.btn-group>.btn input[type=checkbox],[data-toggle=buttons]>.btn-group>.btn input[type=radio]{position:absolute;clip:rect(0,0,0,0);pointer-events:none}.input-group{position:relative;display:table;border-collapse:separate}.input-group[class*=col-]{float:none;padding-right:0;padding-left:0}.input-group .form-control{position:relative;z-index:2;float:left;width:100%;margin-bottom:0}.input-group .form-control:focus{z-index:3}.input-group-lg>.form-control,.input-group-lg>.input-group-addon,.input-group-lg>.input-group-btn>.btn{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.input-group-lg>.form-control,select.input-group-lg>.input-group-addon,select.input-group-lg>.input-group-btn>.btn{height:46px;line-height:46px}select[multiple].input-group-lg>.form-control,select[multiple].input-group-lg>.input-group-addon,select[multiple].input-group-lg>.input-group-btn>.btn,textarea.input-group-lg>.form-control,textarea.input-group-lg>.input-group-addon,textarea.input-group-lg>.input-group-btn>.btn{height:auto}.input-group-sm>.form-control,.input-group-sm>.input-group-addon,.input-group-sm>.input-group-btn>.btn{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-group-sm>.form-control,select.input-group-sm>.input-group-addon,select.input-group-sm>.input-group-btn>.btn{height:30px;line-height:30px}select[multiple].input-group-sm>.form-control,select[multiple].input-group-sm>.input-group-addon,select[multiple].input-group-sm>.input-group-btn>.btn,textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon,textarea.input-group-sm>.input-group-btn>.btn{height:auto}.input-group .form-control,.input-group-addon,.input-group-btn{display:table-cell}.input-group .form-control:not(:first-child):not(:last-child),.input-group-addon:not(:first-child):not(:last-child),.input-group-btn:not(:first-child):not(:last-child){border-radius:0}.input-group-addon,.input-group-btn{width:1%;white-space:nowrap;vertical-align:middle}.input-group-addon{padding:6px 12px;font-size:14px;font-weight:400;line-height:1;color:#555;text-align:center;background-color:#eee;border:1px solid #ccc;border-radius:4px}.input-group-addon.input-sm{padding:5px 10px;font-size:12px;border-radius:3px}.input-group-addon.input-lg{padding:10px 16px;font-size:18px;border-radius:6px}.input-group-addon input[type=checkbox],.input-group-addon input[type=radio]{margin-top:0}.input-group .form-control:first-child,.input-group-addon:first-child,.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group>.btn,.input-group-btn:first-child>.dropdown-toggle,.input-group-btn:last-child>.btn-group:not(:last-child)>.btn,.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.input-group-addon:first-child{border-right:0}.input-group .form-control:last-child,.input-group-addon:last-child,.input-group-btn:first-child>.btn-group:not(:first-child)>.btn,.input-group-btn:first-child>.btn:not(:first-child),.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group>.btn,.input-group-btn:last-child>.dropdown-toggle{border-top-left-radius:0;border-bottom-left-radius:0}.input-group-addon:last-child{border-left:0}.input-group-btn{position:relative;font-size:0;white-space:nowrap}.input-group-btn>.btn{position:relative}.input-group-btn>.btn+.btn{margin-left:-1px}.input-group-btn>.btn:active,.input-group-btn>.btn:focus,.input-group-btn>.btn:hover{z-index:2}.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group{margin-right:-1px}.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group{z-index:2;margin-left:-1px}.nav{padding-left:0;margin-bottom:0;list-style:none}.nav>li{position:relative;display:block}.nav>li>a{position:relative;display:block;padding:10px 15px}.nav>li>a:focus,.nav>li>a:hover{text-decoration:none;background-color:#eee}.nav>li.disabled>a{color:#777}.nav>li.disabled>a:focus,.nav>li.disabled>a:hover{color:#777;text-decoration:none;cursor:not-allowed;background-color:transparent}.nav .open>a,.nav .open>a:focus,.nav .open>a:hover{background-color:#eee;border-color:#337ab7}.nav .nav-divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.nav>li>a>img{max-width:none}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{float:left;margin-bottom:-1px}.nav-tabs>li>a{margin-right:2px;line-height:1.42857143;border:1px solid transparent;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover{border-color:#eee #eee #ddd}.nav-tabs>li.active>a,.nav-tabs>li.active>a:focus,.nav-tabs>li.active>a:hover{color:#555;cursor:default;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent}.nav-tabs.nav-justified{width:100%;border-bottom:0}.nav-tabs.nav-justified>li{float:none}.nav-tabs.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-tabs.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-tabs.nav-justified>li{display:table-cell;width:1%}.nav-tabs.nav-justified>li>a{margin-bottom:0}}.nav-tabs.nav-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border:1px solid #ddd}@media (min-width:768px){.nav-tabs.nav-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border-bottom-color:#fff}}.nav-pills>li{float:left}.nav-pills>li>a{border-radius:4px}.nav-pills>li+li{margin-left:2px}.nav-pills>li.active>a,.nav-pills>li.active>a:focus,.nav-pills>li.active>a:hover{color:#fff;background-color:#337ab7}.nav-stacked>li{float:none}.nav-stacked>li+li{margin-top:2px;margin-left:0}.nav-justified{width:100%}.nav-justified>li{float:none}.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-justified>li{display:table-cell;width:1%}.nav-justified>li>a{margin-bottom:0}}.nav-tabs-justified{border-bottom:0}.nav-tabs-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border:1px solid #ddd}@media (min-width:768px){.nav-tabs-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border-bottom-color:#fff}}.tab-content>.tab-pane{display:none}.tab-content>.active{display:block}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-left-radius:0;border-top-right-radius:0}.navbar{position:relative;min-height:50px;margin-bottom:20px;border:1px solid transparent}@media (min-width:768px){.navbar{border-radius:4px}}@media (min-width:768px){.navbar-header{float:left}}.navbar-collapse{padding-right:15px;padding-left:15px;overflow-x:visible;-webkit-overflow-scrolling:touch;border-top:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1)}.navbar-collapse.in{overflow-y:auto}@media (min-width:768px){.navbar-collapse{width:auto;border-top:0;-webkit-box-shadow:none;box-shadow:none}.navbar-collapse.collapse{display:block!important;height:auto!important;padding-bottom:0;overflow:visible!important}.navbar-collapse.in{overflow-y:visible}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse,.navbar-static-top .navbar-collapse{padding-right:0;padding-left:0}}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:340px}@media (max-device-width:480px) and (orientation:landscape){.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:200px}}.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:0;margin-left:0}}.navbar-static-top{z-index:1000;border-width:0 0 1px}@media (min-width:768px){.navbar-static-top{border-radius:0}}.navbar-fixed-bottom,.navbar-fixed-top{position:fixed;right:0;left:0;z-index:1030}@media (min-width:768px){.navbar-fixed-bottom,.navbar-fixed-top{border-radius:0}}.navbar-fixed-top{top:0;border-width:0 0 1px}.navbar-fixed-bottom{bottom:0;margin-bottom:0;border-width:1px 0 0}.navbar-brand{float:left;height:50px;padding:15px 15px;font-size:18px;line-height:20px}.navbar-brand:focus,.navbar-brand:hover{text-decoration:none}.navbar-brand>img{display:block}@media (min-width:768px){.navbar>.container .navbar-brand,.navbar>.container-fluid .navbar-brand{margin-left:-15px}}.navbar-toggle{position:relative;float:right;padding:9px 10px;margin-top:8px;margin-right:15px;margin-bottom:8px;background-color:transparent;background-image:none;border:1px solid transparent;border-radius:4px}.navbar-toggle:focus{outline:0}.navbar-toggle .icon-bar{display:block;width:22px;height:2px;border-radius:1px}.navbar-toggle .icon-bar+.icon-bar{margin-top:4px}@media (min-width:768px){.navbar-toggle{display:none}}.navbar-nav{margin:7.5px -15px}.navbar-nav>li>a{padding-top:10px;padding-bottom:10px;line-height:20px}@media (max-width:767px){.navbar-nav .open .dropdown-menu{position:static;float:none;width:auto;margin-top:0;background-color:transparent;border:0;-webkit-box-shadow:none;box-shadow:none}.navbar-nav .open .dropdown-menu .dropdown-header,.navbar-nav .open .dropdown-menu>li>a{padding:5px 15px 5px 25px}.navbar-nav .open .dropdown-menu>li>a{line-height:20px}.navbar-nav .open .dropdown-menu>li>a:focus,.navbar-nav .open .dropdown-menu>li>a:hover{background-image:none}}@media (min-width:768px){.navbar-nav{float:left;margin:0}.navbar-nav>li{float:left}.navbar-nav>li>a{padding-top:15px;padding-bottom:15px}}.navbar-form{padding:10px 15px;margin-top:8px;margin-right:-15px;margin-bottom:8px;margin-left:-15px;border-top:1px solid transparent;border-bottom:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1)}@media (min-width:768px){.navbar-form .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.navbar-form .form-control{display:inline-block;width:auto;vertical-align:middle}.navbar-form .form-control-static{display:inline-block}.navbar-form .input-group{display:inline-table;vertical-align:middle}.navbar-form .input-group .form-control,.navbar-form .input-group .input-group-addon,.navbar-form .input-group .input-group-btn{width:auto}.navbar-form .input-group>.form-control{width:100%}.navbar-form .control-label{margin-bottom:0;vertical-align:middle}.navbar-form .checkbox,.navbar-form .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.navbar-form .checkbox label,.navbar-form .radio label{padding-left:0}.navbar-form .checkbox input[type=checkbox],.navbar-form .radio input[type=radio]{position:relative;margin-left:0}.navbar-form .has-feedback .form-control-feedback{top:0}}@media (max-width:767px){.navbar-form .form-group{margin-bottom:5px}.navbar-form .form-group:last-child{margin-bottom:0}}@media (min-width:768px){.navbar-form{width:auto;padding-top:0;padding-bottom:0;margin-right:0;margin-left:0;border:0;-webkit-box-shadow:none;box-shadow:none}}.navbar-nav>li>.dropdown-menu{margin-top:0;border-top-left-radius:0;border-top-right-radius:0}.navbar-fixed-bottom .navbar-nav>li>.dropdown-menu{margin-bottom:0;border-top-left-radius:4px;border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.navbar-btn{margin-top:8px;margin-bottom:8px}.navbar-btn.btn-sm{margin-top:10px;margin-bottom:10px}.navbar-btn.btn-xs{margin-top:14px;margin-bottom:14px}.navbar-text{margin-top:15px;margin-bottom:15px}@media (min-width:768px){.navbar-text{float:left;margin-right:15px;margin-left:15px}}@media (min-width:768px){.navbar-left{float:left!important}.navbar-right{float:right!important;margin-right:-15px}.navbar-right~.navbar-right{margin-right:0}}.navbar-default{background-color:#f8f8f8;border-color:#e7e7e7}.navbar-default .navbar-brand{color:#777}.navbar-default .navbar-brand:focus,.navbar-default .navbar-brand:hover{color:#5e5e5e;background-color:transparent}.navbar-default .navbar-text{color:#777}.navbar-default .navbar-nav>li>a{color:#777}.navbar-default .navbar-nav>li>a:focus,.navbar-default .navbar-nav>li>a:hover{color:#333;background-color:transparent}.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:focus,.navbar-default .navbar-nav>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav>.disabled>a,.navbar-default .navbar-nav>.disabled>a:focus,.navbar-default .navbar-nav>.disabled>a:hover{color:#ccc;background-color:transparent}.navbar-default .navbar-toggle{border-color:#ddd}.navbar-default .navbar-toggle:focus,.navbar-default .navbar-toggle:hover{background-color:#ddd}.navbar-default .navbar-toggle .icon-bar{background-color:#888}.navbar-default .navbar-collapse,.navbar-default .navbar-form{border-color:#e7e7e7}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:focus,.navbar-default .navbar-nav>.open>a:hover{color:#555;background-color:#e7e7e7}@media (max-width:767px){.navbar-default .navbar-nav .open .dropdown-menu>li>a{color:#777}.navbar-default .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>li>a:hover{color:#333;background-color:transparent}.navbar-default .navbar-nav .open .dropdown-menu>.active>a,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#ccc;background-color:transparent}}.navbar-default .navbar-link{color:#777}.navbar-default .navbar-link:hover{color:#333}.navbar-default .btn-link{color:#777}.navbar-default .btn-link:focus,.navbar-default .btn-link:hover{color:#333}.navbar-default .btn-link[disabled]:focus,.navbar-default .btn-link[disabled]:hover,fieldset[disabled] .navbar-default .btn-link:focus,fieldset[disabled] .navbar-default .btn-link:hover{color:#ccc}.navbar-inverse{background-color:#222;border-color:#080808}.navbar-inverse .navbar-brand{color:#9d9d9d}.navbar-inverse .navbar-brand:focus,.navbar-inverse .navbar-brand:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-text{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a:focus,.navbar-inverse .navbar-nav>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:focus,.navbar-inverse .navbar-nav>.active>a:hover{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav>.disabled>a,.navbar-inverse .navbar-nav>.disabled>a:focus,.navbar-inverse .navbar-nav>.disabled>a:hover{color:#444;background-color:transparent}.navbar-inverse .navbar-toggle{border-color:#333}.navbar-inverse .navbar-toggle:focus,.navbar-inverse .navbar-toggle:hover{background-color:#333}.navbar-inverse .navbar-toggle .icon-bar{background-color:#fff}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#101010}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:focus,.navbar-inverse .navbar-nav>.open>a:hover{color:#fff;background-color:#080808}@media (max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu .divider{background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:hover{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#444;background-color:transparent}}.navbar-inverse .navbar-link{color:#9d9d9d}.navbar-inverse .navbar-link:hover{color:#fff}.navbar-inverse .btn-link{color:#9d9d9d}.navbar-inverse .btn-link:focus,.navbar-inverse .btn-link:hover{color:#fff}.navbar-inverse .btn-link[disabled]:focus,.navbar-inverse .btn-link[disabled]:hover,fieldset[disabled] .navbar-inverse .btn-link:focus,fieldset[disabled] .navbar-inverse .btn-link:hover{color:#444}.breadcrumb{padding:8px 15px;margin-bottom:20px;list-style:none;background-color:#f5f5f5;border-radius:4px}.breadcrumb>li{display:inline-block}.breadcrumb>li+li:before{padding:0 5px;color:#ccc;content:"/\00a0"}.breadcrumb>.active{color:#777}.pagination{display:inline-block;padding-left:0;margin:20px 0;border-radius:4px}.pagination>li{display:inline}.pagination>li>a,.pagination>li>span{position:relative;float:left;padding:6px 12px;margin-left:-1px;line-height:1.42857143;color:#337ab7;text-decoration:none;background-color:#fff;border:1px solid #ddd}.pagination>li:first-child>a,.pagination>li:first-child>span{margin-left:0;border-top-left-radius:4px;border-bottom-left-radius:4px}.pagination>li:last-child>a,.pagination>li:last-child>span{border-top-right-radius:4px;border-bottom-right-radius:4px}.pagination>li>a:focus,.pagination>li>a:hover,.pagination>li>span:focus,.pagination>li>span:hover{z-index:2;color:#23527c;background-color:#eee;border-color:#ddd}.pagination>.active>a,.pagination>.active>a:focus,.pagination>.active>a:hover,.pagination>.active>span,.pagination>.active>span:focus,.pagination>.active>span:hover{z-index:3;color:#fff;cursor:default;background-color:#337ab7;border-color:#337ab7}.pagination>.disabled>a,.pagination>.disabled>a:focus,.pagination>.disabled>a:hover,.pagination>.disabled>span,.pagination>.disabled>span:focus,.pagination>.disabled>span:hover{color:#777;cursor:not-allowed;background-color:#fff;border-color:#ddd}.pagination-lg>li>a,.pagination-lg>li>span{padding:10px 16px;font-size:18px;line-height:1.3333333}.pagination-lg>li:first-child>a,.pagination-lg>li:first-child>span{border-top-left-radius:6px;border-bottom-left-radius:6px}.pagination-lg>li:last-child>a,.pagination-lg>li:last-child>span{border-top-right-radius:6px;border-bottom-right-radius:6px}.pagination-sm>li>a,.pagination-sm>li>span{padding:5px 10px;font-size:12px;line-height:1.5}.pagination-sm>li:first-child>a,.pagination-sm>li:first-child>span{border-top-left-radius:3px;border-bottom-left-radius:3px}.pagination-sm>li:last-child>a,.pagination-sm>li:last-child>span{border-top-right-radius:3px;border-bottom-right-radius:3px}.pager{padding-left:0;margin:20px 0;text-align:center;list-style:none}.pager li{display:inline}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;border-radius:15px}.pager li>a:focus,.pager li>a:hover{text-decoration:none;background-color:#eee}.pager .next>a,.pager .next>span{float:right}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:focus,.pager .disabled>a:hover,.pager .disabled>span{color:#777;cursor:not-allowed;background-color:#fff}.label{display:inline;padding:.2em .6em .3em;font-size:75%;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25em}a.label:focus,a.label:hover{color:#fff;text-decoration:none;cursor:pointer}.label:empty{display:none}.btn .label{position:relative;top:-1px}.label-default{background-color:#777}.label-default[href]:focus,.label-default[href]:hover{background-color:#5e5e5e}.label-primary{background-color:#337ab7}.label-primary[href]:focus,.label-primary[href]:hover{background-color:#286090}.label-success{background-color:#5cb85c}.label-success[href]:focus,.label-success[href]:hover{background-color:#449d44}.label-info{background-color:#5bc0de}.label-info[href]:focus,.label-info[href]:hover{background-color:#31b0d5}.label-warning{background-color:#f0ad4e}.label-warning[href]:focus,.label-warning[href]:hover{background-color:#ec971f}.label-danger{background-color:#d9534f}.label-danger[href]:focus,.label-danger[href]:hover{background-color:#c9302c}.badge{display:inline-block;min-width:10px;padding:3px 7px;font-size:12px;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:middle;background-color:#777;border-radius:10px}.badge:empty{display:none}.btn .badge{position:relative;top:-1px}.btn-group-xs>.btn .badge,.btn-xs .badge{top:0;padding:1px 5px}a.badge:focus,a.badge:hover{color:#fff;text-decoration:none;cursor:pointer}.list-group-item.active>.badge,.nav-pills>.active>a>.badge{color:#337ab7;background-color:#fff}.list-group-item>.badge{float:right}.list-group-item>.badge+.badge{margin-right:5px}.nav-pills>li>a>.badge{margin-left:3px}.jumbotron{padding-top:30px;padding-bottom:30px;margin-bottom:30px;color:inherit;background-color:#eee}.jumbotron .h1,.jumbotron h1{color:inherit}.jumbotron p{margin-bottom:15px;font-size:21px;font-weight:200}.jumbotron>hr{border-top-color:#d5d5d5}.container .jumbotron,.container-fluid .jumbotron{padding-right:15px;padding-left:15px;border-radius:6px}.jumbotron .container{max-width:100%}@media screen and (min-width:768px){.jumbotron{padding-top:48px;padding-bottom:48px}.container .jumbotron,.container-fluid .jumbotron{padding-right:60px;padding-left:60px}.jumbotron .h1,.jumbotron h1{font-size:63px}}.thumbnail{display:block;padding:4px;margin-bottom:20px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:border .2s ease-in-out;-o-transition:border .2s ease-in-out;transition:border .2s ease-in-out}.thumbnail a>img,.thumbnail>img{margin-right:auto;margin-left:auto}a.thumbnail.active,a.thumbnail:focus,a.thumbnail:hover{border-color:#337ab7}.thumbnail .caption{padding:9px;color:#333}.alert{padding:15px;margin-bottom:20px;border:1px solid transparent;border-radius:4px}.alert h4{margin-top:0;color:inherit}.alert .alert-link{font-weight:700}.alert>p,.alert>ul{margin-bottom:0}.alert>p+p{margin-top:5px}.alert-dismissable,.alert-dismissible{padding-right:35px}.alert-dismissable .close,.alert-dismissible .close{position:relative;top:-2px;right:-21px;color:inherit}.alert-success{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.alert-success hr{border-top-color:#c9e2b3}.alert-success .alert-link{color:#2b542c}.alert-info{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.alert-info hr{border-top-color:#a6e1ec}.alert-info .alert-link{color:#245269}.alert-warning{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.alert-warning hr{border-top-color:#f7e1b5}.alert-warning .alert-link{color:#66512c}.alert-danger{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.alert-danger hr{border-top-color:#e4b9c0}.alert-danger .alert-link{color:#843534}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-o-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}.progress{height:20px;margin-bottom:20px;overflow:hidden;background-color:#f5f5f5;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1);box-shadow:inset 0 1px 2px rgba(0,0,0,.1)}.progress-bar{float:left;width:0;height:100%;font-size:12px;line-height:20px;color:#fff;text-align:center;background-color:#337ab7;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);-webkit-transition:width .6s ease;-o-transition:width .6s ease;transition:width .6s ease}.progress-bar-striped,.progress-striped .progress-bar{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);-webkit-background-size:40px 40px;background-size:40px 40px}.progress-bar.active,.progress.active .progress-bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}.progress-bar-success{background-color:#5cb85c}.progress-striped .progress-bar-success{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-info{background-color:#5bc0de}.progress-striped .progress-bar-info{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-warning{background-color:#f0ad4e}.progress-striped .progress-bar-warning{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-danger{background-color:#d9534f}.progress-striped .progress-bar-danger{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.media{margin-top:15px}.media:first-child{margin-top:0}.media,.media-body{overflow:hidden;zoom:1}.media-body{width:10000px}.media-object{display:block}.media-object.img-thumbnail{max-width:none}.media-right,.media>.pull-right{padding-left:10px}.media-left,.media>.pull-left{padding-right:10px}.media-body,.media-left,.media-right{display:table-cell;vertical-align:top}.media-middle{vertical-align:middle}.media-bottom{vertical-align:bottom}.media-heading{margin-top:0;margin-bottom:5px}.media-list{padding-left:0;list-style:none}.list-group{padding-left:0;margin-bottom:20px}.list-group-item{position:relative;display:block;padding:10px 15px;margin-bottom:-1px;background-color:#fff;border:1px solid #ddd}.list-group-item:first-child{border-top-left-radius:4px;border-top-right-radius:4px}.list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}a.list-group-item,button.list-group-item{color:#555}a.list-group-item .list-group-item-heading,button.list-group-item .list-group-item-heading{color:#333}a.list-group-item:focus,a.list-group-item:hover,button.list-group-item:focus,button.list-group-item:hover{color:#555;text-decoration:none;background-color:#f5f5f5}button.list-group-item{width:100%;text-align:left}.list-group-item.disabled,.list-group-item.disabled:focus,.list-group-item.disabled:hover{color:#777;cursor:not-allowed;background-color:#eee}.list-group-item.disabled .list-group-item-heading,.list-group-item.disabled:focus .list-group-item-heading,.list-group-item.disabled:hover .list-group-item-heading{color:inherit}.list-group-item.disabled .list-group-item-text,.list-group-item.disabled:focus .list-group-item-text,.list-group-item.disabled:hover .list-group-item-text{color:#777}.list-group-item.active,.list-group-item.active:focus,.list-group-item.active:hover{z-index:2;color:#fff;background-color:#337ab7;border-color:#337ab7}.list-group-item.active .list-group-item-heading,.list-group-item.active .list-group-item-heading>.small,.list-group-item.active .list-group-item-heading>small,.list-group-item.active:focus .list-group-item-heading,.list-group-item.active:focus .list-group-item-heading>.small,.list-group-item.active:focus .list-group-item-heading>small,.list-group-item.active:hover .list-group-item-heading,.list-group-item.active:hover .list-group-item-heading>.small,.list-group-item.active:hover .list-group-item-heading>small{color:inherit}.list-group-item.active .list-group-item-text,.list-group-item.active:focus .list-group-item-text,.list-group-item.active:hover .list-group-item-text{color:#c7ddef}.list-group-item-success{color:#3c763d;background-color:#dff0d8}a.list-group-item-success,button.list-group-item-success{color:#3c763d}a.list-group-item-success .list-group-item-heading,button.list-group-item-success .list-group-item-heading{color:inherit}a.list-group-item-success:focus,a.list-group-item-success:hover,button.list-group-item-success:focus,button.list-group-item-success:hover{color:#3c763d;background-color:#d0e9c6}a.list-group-item-success.active,a.list-group-item-success.active:focus,a.list-group-item-success.active:hover,button.list-group-item-success.active,button.list-group-item-success.active:focus,button.list-group-item-success.active:hover{color:#fff;background-color:#3c763d;border-color:#3c763d}.list-group-item-info{color:#31708f;background-color:#d9edf7}a.list-group-item-info,button.list-group-item-info{color:#31708f}a.list-group-item-info .list-group-item-heading,button.list-group-item-info .list-group-item-heading{color:inherit}a.list-group-item-info:focus,a.list-group-item-info:hover,button.list-group-item-info:focus,button.list-group-item-info:hover{color:#31708f;background-color:#c4e3f3}a.list-group-item-info.active,a.list-group-item-info.active:focus,a.list-group-item-info.active:hover,button.list-group-item-info.active,button.list-group-item-info.active:focus,button.list-group-item-info.active:hover{color:#fff;background-color:#31708f;border-color:#31708f}.list-group-item-warning{color:#8a6d3b;background-color:#fcf8e3}a.list-group-item-warning,button.list-group-item-warning{color:#8a6d3b}a.list-group-item-warning .list-group-item-heading,button.list-group-item-warning .list-group-item-heading{color:inherit}a.list-group-item-warning:focus,a.list-group-item-warning:hover,button.list-group-item-warning:focus,button.list-group-item-warning:hover{color:#8a6d3b;background-color:#faf2cc}a.list-group-item-warning.active,a.list-group-item-warning.active:focus,a.list-group-item-warning.active:hover,button.list-group-item-warning.active,button.list-group-item-warning.active:focus,button.list-group-item-warning.active:hover{color:#fff;background-color:#8a6d3b;border-color:#8a6d3b}.list-group-item-danger{color:#a94442;background-color:#f2dede}a.list-group-item-danger,button.list-group-item-danger{color:#a94442}a.list-group-item-danger .list-group-item-heading,button.list-group-item-danger .list-group-item-heading{color:inherit}a.list-group-item-danger:focus,a.list-group-item-danger:hover,button.list-group-item-danger:focus,button.list-group-item-danger:hover{color:#a94442;background-color:#ebcccc}a.list-group-item-danger.active,a.list-group-item-danger.active:focus,a.list-group-item-danger.active:hover,button.list-group-item-danger.active,button.list-group-item-danger.active:focus,button.list-group-item-danger.active:hover{color:#fff;background-color:#a94442;border-color:#a94442}.list-group-item-heading{margin-top:0;margin-bottom:5px}.list-group-item-text{margin-bottom:0;line-height:1.3}.panel{margin-bottom:20px;background-color:#fff;border:1px solid transparent;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05)}.panel-body{padding:15px}.panel-heading{padding:10px 15px;border-bottom:1px solid transparent;border-top-left-radius:3px;border-top-right-radius:3px}.panel-heading>.dropdown .dropdown-toggle{color:inherit}.panel-title{margin-top:0;margin-bottom:0;font-size:16px;color:inherit}.panel-title>.small,.panel-title>.small>a,.panel-title>a,.panel-title>small,.panel-title>small>a{color:inherit}.panel-footer{padding:10px 15px;background-color:#f5f5f5;border-top:1px solid #ddd;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.list-group,.panel>.panel-collapse>.list-group{margin-bottom:0}.panel>.list-group .list-group-item,.panel>.panel-collapse>.list-group .list-group-item{border-width:1px 0;border-radius:0}.panel>.list-group:first-child .list-group-item:first-child,.panel>.panel-collapse>.list-group:first-child .list-group-item:first-child{border-top:0;border-top-left-radius:3px;border-top-right-radius:3px}.panel>.list-group:last-child .list-group-item:last-child,.panel>.panel-collapse>.list-group:last-child .list-group-item:last-child{border-bottom:0;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.panel-heading+.panel-collapse>.list-group .list-group-item:first-child{border-top-left-radius:0;border-top-right-radius:0}.panel-heading+.list-group .list-group-item:first-child{border-top-width:0}.list-group+.panel-footer{border-top-width:0}.panel>.panel-collapse>.table,.panel>.table,.panel>.table-responsive>.table{margin-bottom:0}.panel>.panel-collapse>.table caption,.panel>.table caption,.panel>.table-responsive>.table caption{padding-right:15px;padding-left:15px}.panel>.table-responsive:first-child>.table:first-child,.panel>.table:first-child{border-top-left-radius:3px;border-top-right-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child,.panel>.table:first-child>thead:first-child>tr:first-child{border-top-left-radius:3px;border-top-right-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table:first-child>thead:first-child>tr:first-child th:first-child{border-top-left-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table:first-child>thead:first-child>tr:first-child th:last-child{border-top-right-radius:3px}.panel>.table-responsive:last-child>.table:last-child,.panel>.table:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:first-child{border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:last-child{border-bottom-right-radius:3px}.panel>.panel-body+.table,.panel>.panel-body+.table-responsive,.panel>.table+.panel-body,.panel>.table-responsive+.panel-body{border-top:1px solid #ddd}.panel>.table>tbody:first-child>tr:first-child td,.panel>.table>tbody:first-child>tr:first-child th{border-top:0}.panel>.table-bordered,.panel>.table-responsive>.table-bordered{border:0}.panel>.table-bordered>tbody>tr>td:first-child,.panel>.table-bordered>tbody>tr>th:first-child,.panel>.table-bordered>tfoot>tr>td:first-child,.panel>.table-bordered>tfoot>tr>th:first-child,.panel>.table-bordered>thead>tr>td:first-child,.panel>.table-bordered>thead>tr>th:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:first-child,.panel>.table-responsive>.table-bordered>thead>tr>td:first-child,.panel>.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.panel>.table-bordered>tbody>tr>td:last-child,.panel>.table-bordered>tbody>tr>th:last-child,.panel>.table-bordered>tfoot>tr>td:last-child,.panel>.table-bordered>tfoot>tr>th:last-child,.panel>.table-bordered>thead>tr>td:last-child,.panel>.table-bordered>thead>tr>th:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:last-child,.panel>.table-responsive>.table-bordered>thead>tr>td:last-child,.panel>.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.panel>.table-bordered>tbody>tr:first-child>td,.panel>.table-bordered>tbody>tr:first-child>th,.panel>.table-bordered>thead>tr:first-child>td,.panel>.table-bordered>thead>tr:first-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>th,.panel>.table-responsive>.table-bordered>thead>tr:first-child>td,.panel>.table-responsive>.table-bordered>thead>tr:first-child>th{border-bottom:0}.panel>.table-bordered>tbody>tr:last-child>td,.panel>.table-bordered>tbody>tr:last-child>th,.panel>.table-bordered>tfoot>tr:last-child>td,.panel>.table-bordered>tfoot>tr:last-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>th,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>td,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}.panel>.table-responsive{margin-bottom:0;border:0}.panel-group{margin-bottom:20px}.panel-group .panel{margin-bottom:0;border-radius:4px}.panel-group .panel+.panel{margin-top:5px}.panel-group .panel-heading{border-bottom:0}.panel-group .panel-heading+.panel-collapse>.list-group,.panel-group .panel-heading+.panel-collapse>.panel-body{border-top:1px solid #ddd}.panel-group .panel-footer{border-top:0}.panel-group .panel-footer+.panel-collapse .panel-body{border-bottom:1px solid #ddd}.panel-default{border-color:#ddd}.panel-default>.panel-heading{color:#333;background-color:#f5f5f5;border-color:#ddd}.panel-default>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ddd}.panel-default>.panel-heading .badge{color:#f5f5f5;background-color:#333}.panel-default>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ddd}.panel-primary{border-color:#337ab7}.panel-primary>.panel-heading{color:#fff;background-color:#337ab7;border-color:#337ab7}.panel-primary>.panel-heading+.panel-collapse>.panel-body{border-top-color:#337ab7}.panel-primary>.panel-heading .badge{color:#337ab7;background-color:#fff}.panel-primary>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#337ab7}.panel-success{border-color:#d6e9c6}.panel-success>.panel-heading{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.panel-success>.panel-heading+.panel-collapse>.panel-body{border-top-color:#d6e9c6}.panel-success>.panel-heading .badge{color:#dff0d8;background-color:#3c763d}.panel-success>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#d6e9c6}.panel-info{border-color:#bce8f1}.panel-info>.panel-heading{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.panel-info>.panel-heading+.panel-collapse>.panel-body{border-top-color:#bce8f1}.panel-info>.panel-heading .badge{color:#d9edf7;background-color:#31708f}.panel-info>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#bce8f1}.panel-warning{border-color:#faebcc}.panel-warning>.panel-heading{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.panel-warning>.panel-heading+.panel-collapse>.panel-body{border-top-color:#faebcc}.panel-warning>.panel-heading .badge{color:#fcf8e3;background-color:#8a6d3b}.panel-warning>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#faebcc}.panel-danger{border-color:#ebccd1}.panel-danger>.panel-heading{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.panel-danger>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ebccd1}.panel-danger>.panel-heading .badge{color:#f2dede;background-color:#a94442}.panel-danger>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ebccd1}.embed-responsive{position:relative;display:block;height:0;padding:0;overflow:hidden}.embed-responsive .embed-responsive-item,.embed-responsive embed,.embed-responsive iframe,.embed-responsive object,.embed-responsive video{position:absolute;top:0;bottom:0;left:0;width:100%;height:100%;border:0}.embed-responsive-16by9{padding-bottom:56.25%}.embed-responsive-4by3{padding-bottom:75%}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.05);box-shadow:inset 0 1px 1px rgba(0,0,0,.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,.15)}.well-lg{padding:24px;border-radius:6px}.well-sm{padding:9px;border-radius:3px}.close{float:right;font-size:21px;font-weight:700;line-height:1;color:#000;text-shadow:0 1px 0 #fff;filter:alpha(opacity=20);opacity:.2}.close:focus,.close:hover{color:#000;text-decoration:none;cursor:pointer;filter:alpha(opacity=50);opacity:.5}button.close{-webkit-appearance:none;padding:0;cursor:pointer;background:0 0;border:0}.modal-open{overflow:hidden}.modal{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1050;display:none;overflow:hidden;-webkit-overflow-scrolling:touch;outline:0}.modal.fade .modal-dialog{-webkit-transition:-webkit-transform .3s ease-out;-o-transition:-o-transform .3s ease-out;transition:transform .3s ease-out;-webkit-transform:translate(0,-25%);-ms-transform:translate(0,-25%);-o-transform:translate(0,-25%);transform:translate(0,-25%)}.modal.in .modal-dialog{-webkit-transform:translate(0,0);-ms-transform:translate(0,0);-o-transform:translate(0,0);transform:translate(0,0)}.modal-open .modal{overflow-x:hidden;overflow-y:auto}.modal-dialog{position:relative;width:auto;margin:10px}.modal-content{position:relative;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #999;border:1px solid rgba(0,0,0,.2);border-radius:6px;outline:0;-webkit-box-shadow:0 3px 9px rgba(0,0,0,.5);box-shadow:0 3px 9px rgba(0,0,0,.5)}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000}.modal-backdrop.fade{filter:alpha(opacity=0);opacity:0}.modal-backdrop.in{filter:alpha(opacity=50);opacity:.5}.modal-header{padding:15px;border-bottom:1px solid #e5e5e5}.modal-header .close{margin-top:-2px}.modal-title{margin:0;line-height:1.42857143}.modal-body{position:relative;padding:15px}.modal-footer{padding:15px;text-align:right;border-top:1px solid #e5e5e5}.modal-footer .btn+.btn{margin-bottom:0;margin-left:5px}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}.modal-scrollbar-measure{position:absolute;top:-9999px;width:50px;height:50px;overflow:scroll}@media (min-width:768px){.modal-dialog{width:600px;margin:30px auto}.modal-content{-webkit-box-shadow:0 5px 15px rgba(0,0,0,.5);box-shadow:0 5px 15px rgba(0,0,0,.5)}.modal-sm{width:300px}}@media (min-width:992px){.modal-lg{width:900px}}.tooltip{position:absolute;z-index:1070;display:block;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:12px;font-style:normal;font-weight:400;line-height:1.42857143;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;word-wrap:normal;white-space:normal;filter:alpha(opacity=0);opacity:0;line-break:auto}.tooltip.in{filter:alpha(opacity=90);opacity:.9}.tooltip.top{padding:5px 0;margin-top:-3px}.tooltip.right{padding:0 5px;margin-left:3px}.tooltip.bottom{padding:5px 0;margin-top:3px}.tooltip.left{padding:0 5px;margin-left:-3px}.tooltip-inner{max-width:200px;padding:3px 8px;color:#fff;text-align:center;background-color:#000;border-radius:4px}.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-left .tooltip-arrow{right:5px;bottom:0;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-right .tooltip-arrow{bottom:0;left:5px;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-width:5px 5px 5px 0;border-right-color:#000}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-width:5px 0 5px 5px;border-left-color:#000}.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-left .tooltip-arrow{top:0;right:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-right .tooltip-arrow{top:0;left:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}.popover{position:absolute;top:0;left:0;z-index:1060;display:none;max-width:276px;padding:1px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;font-style:normal;font-weight:400;line-height:1.42857143;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;word-wrap:normal;white-space:normal;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.2);border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,.2);box-shadow:0 5px 10px rgba(0,0,0,.2);line-break:auto}.popover.top{margin-top:-10px}.popover.right{margin-left:10px}.popover.bottom{margin-top:10px}.popover.left{margin-left:-10px}.popover-title{padding:8px 14px;margin:0;font-size:14px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;border-radius:5px 5px 0 0}.popover-content{padding:9px 14px}.popover>.arrow,.popover>.arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.popover>.arrow{border-width:11px}.popover>.arrow:after{content:"";border-width:10px}.popover.top>.arrow{bottom:-11px;left:50%;margin-left:-11px;border-top-color:#999;border-top-color:rgba(0,0,0,.25);border-bottom-width:0}.popover.top>.arrow:after{bottom:1px;margin-left:-10px;content:" ";border-top-color:#fff;border-bottom-width:0}.popover.right>.arrow{top:50%;left:-11px;margin-top:-11px;border-right-color:#999;border-right-color:rgba(0,0,0,.25);border-left-width:0}.popover.right>.arrow:after{bottom:-10px;left:1px;content:" ";border-right-color:#fff;border-left-width:0}.popover.bottom>.arrow{top:-11px;left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,.25)}.popover.bottom>.arrow:after{top:1px;margin-left:-10px;content:" ";border-top-width:0;border-bottom-color:#fff}.popover.left>.arrow{top:50%;right:-11px;margin-top:-11px;border-right-width:0;border-left-color:#999;border-left-color:rgba(0,0,0,.25)}.popover.left>.arrow:after{right:1px;bottom:-10px;content:" ";border-right-width:0;border-left-color:#fff}.carousel{position:relative}.carousel-inner{position:relative;width:100%;overflow:hidden}.carousel-inner>.item{position:relative;display:none;-webkit-transition:.6s ease-in-out left;-o-transition:.6s ease-in-out left;transition:.6s ease-in-out left}.carousel-inner>.item>a>img,.carousel-inner>.item>img{line-height:1}@media all and (transform-3d),(-webkit-transform-3d){.carousel-inner>.item{-webkit-transition:-webkit-transform .6s ease-in-out;-o-transition:-o-transform .6s ease-in-out;transition:transform .6s ease-in-out;-webkit-backface-visibility:hidden;backface-visibility:hidden;-webkit-perspective:1000px;perspective:1000px}.carousel-inner>.item.active.right,.carousel-inner>.item.next{left:0;-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0)}.carousel-inner>.item.active.left,.carousel-inner>.item.prev{left:0;-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0)}.carousel-inner>.item.active,.carousel-inner>.item.next.left,.carousel-inner>.item.prev.right{left:0;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}}.carousel-inner>.active,.carousel-inner>.next,.carousel-inner>.prev{display:block}.carousel-inner>.active{left:0}.carousel-inner>.next,.carousel-inner>.prev{position:absolute;top:0;width:100%}.carousel-inner>.next{left:100%}.carousel-inner>.prev{left:-100%}.carousel-inner>.next.left,.carousel-inner>.prev.right{left:0}.carousel-inner>.active.left{left:-100%}.carousel-inner>.active.right{left:100%}.carousel-control{position:absolute;top:0;bottom:0;left:0;width:15%;font-size:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6);background-color:rgba(0,0,0,0);filter:alpha(opacity=50);opacity:.5}.carousel-control.left{background-image:-webkit-linear-gradient(left,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.5)),to(rgba(0,0,0,.0001)));background-image:linear-gradient(to right,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1);background-repeat:repeat-x}.carousel-control.right{right:0;left:auto;background-image:-webkit-linear-gradient(left,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.0001)),to(rgba(0,0,0,.5)));background-image:linear-gradient(to right,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1);background-repeat:repeat-x}.carousel-control:focus,.carousel-control:hover{color:#fff;text-decoration:none;filter:alpha(opacity=90);outline:0;opacity:.9}.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{position:absolute;top:50%;z-index:5;display:inline-block;margin-top:-10px}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{left:50%;margin-left:-10px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{right:50%;margin-right:-10px}.carousel-control .icon-next,.carousel-control .icon-prev{width:20px;height:20px;font-family:serif;line-height:1}.carousel-control .icon-prev:before{content:'\2039'}.carousel-control .icon-next:before{content:'\203a'}.carousel-indicators{position:absolute;bottom:10px;left:50%;z-index:15;width:60%;padding-left:0;margin-left:-30%;text-align:center;list-style:none}.carousel-indicators li{display:inline-block;width:10px;height:10px;margin:1px;text-indent:-999px;cursor:pointer;background-color:#000\9;background-color:rgba(0,0,0,0);border:1px solid #fff;border-radius:10px}.carousel-indicators .active{width:12px;height:12px;margin:0;background-color:#fff}.carousel-caption{position:absolute;right:15%;bottom:20px;left:15%;z-index:10;padding-top:20px;padding-bottom:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6)}.carousel-caption .btn{text-shadow:none}@media screen and (min-width:768px){.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{width:30px;height:30px;margin-top:-10px;font-size:30px}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{margin-left:-10px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{margin-right:-10px}.carousel-caption{right:20%;left:20%;padding-bottom:30px}.carousel-indicators{bottom:20px}}.btn-group-vertical>.btn-group:after,.btn-group-vertical>.btn-group:before,.btn-toolbar:after,.btn-toolbar:before,.clearfix:after,.clearfix:before,.container-fluid:after,.container-fluid:before,.container:after,.container:before,.dl-horizontal dd:after,.dl-horizontal dd:before,.form-horizontal .form-group:after,.form-horizontal .form-group:before,.modal-footer:after,.modal-footer:before,.modal-header:after,.modal-header:before,.nav:after,.nav:before,.navbar-collapse:after,.navbar-collapse:before,.navbar-header:after,.navbar-header:before,.navbar:after,.navbar:before,.pager:after,.pager:before,.panel-body:after,.panel-body:before,.row:after,.row:before{display:table;content:" "}.btn-group-vertical>.btn-group:after,.btn-toolbar:after,.clearfix:after,.container-fluid:after,.container:after,.dl-horizontal dd:after,.form-horizontal .form-group:after,.modal-footer:after,.modal-header:after,.nav:after,.navbar-collapse:after,.navbar-header:after,.navbar:after,.pager:after,.panel-body:after,.row:after{clear:both}.center-block{display:block;margin-right:auto;margin-left:auto}.pull-right{float:right!important}.pull-left{float:left!important}.hide{display:none!important}.show{display:block!important}.invisible{visibility:hidden}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.hidden{display:none!important}.affix{position:fixed}@-ms-viewport{width:device-width}.visible-lg,.visible-md,.visible-sm,.visible-xs{display:none!important}.visible-lg-block,.visible-lg-inline,.visible-lg-inline-block,.visible-md-block,.visible-md-inline,.visible-md-inline-block,.visible-sm-block,.visible-sm-inline,.visible-sm-inline-block,.visible-xs-block,.visible-xs-inline,.visible-xs-inline-block{display:none!important}@media (max-width:767px){.visible-xs{display:block!important}table.visible-xs{display:table!important}tr.visible-xs{display:table-row!important}td.visible-xs,th.visible-xs{display:table-cell!important}}@media (max-width:767px){.visible-xs-block{display:block!important}}@media (max-width:767px){.visible-xs-inline{display:inline!important}}@media (max-width:767px){.visible-xs-inline-block{display:inline-block!important}}@media (min-width:768px) and (max-width:991px){.visible-sm{display:block!important}table.visible-sm{display:table!important}tr.visible-sm{display:table-row!important}td.visible-sm,th.visible-sm{display:table-cell!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-block{display:block!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-inline{display:inline!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-inline-block{display:inline-block!important}}@media (min-width:992px) and (max-width:1199px){.visible-md{display:block!important}table.visible-md{display:table!important}tr.visible-md{display:table-row!important}td.visible-md,th.visible-md{display:table-cell!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-block{display:block!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-inline{display:inline!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-inline-block{display:inline-block!important}}@media (min-width:1200px){.visible-lg{display:block!important}table.visible-lg{display:table!important}tr.visible-lg{display:table-row!important}td.visible-lg,th.visible-lg{display:table-cell!important}}@media (min-width:1200px){.visible-lg-block{display:block!important}}@media (min-width:1200px){.visible-lg-inline{display:inline!important}}@media (min-width:1200px){.visible-lg-inline-block{display:inline-block!important}}@media (max-width:767px){.hidden-xs{display:none!important}}@media (min-width:768px) and (max-width:991px){.hidden-sm{display:none!important}}@media (min-width:992px) and (max-width:1199px){.hidden-md{display:none!important}}@media (min-width:1200px){.hidden-lg{display:none!important}}.visible-print{display:none!important}@media print{.visible-print{display:block!important}table.visible-print{display:table!important}tr.visible-print{display:table-row!important}td.visible-print,th.visible-print{display:table-cell!important}}.visible-print-block{display:none!important}@media print{.visible-print-block{display:block!important}}.visible-print-inline{display:none!important}@media print{.visible-print-inline{display:inline!important}}.visible-print-inline-block{display:none!important}@media print{.visible-print-inline-block{display:inline-block!important}}@media print{.hidden-print{display:none!important}} +/*# sourceMappingURL=bootstrap.min.css.map */ \ No newline at end of file diff --git a/rest_framework/static/rest_framework/js/bootstrap.min.js b/rest_framework/static/rest_framework/js/bootstrap.min.js index 133aeecb9..9bcd2fcca 100644 --- a/rest_framework/static/rest_framework/js/bootstrap.min.js +++ b/rest_framework/static/rest_framework/js/bootstrap.min.js @@ -1,7 +1,7 @@ /*! - * Bootstrap v3.3.5 (http://getbootstrap.com) - * Copyright 2011-2015 Twitter, Inc. + * Bootstrap v3.3.7 (http://getbootstrap.com) + * Copyright 2011-2016 Twitter, Inc. * Licensed under the MIT license */ -if("undefined"==typeof jQuery)throw new Error("Bootstrap's JavaScript requires jQuery");+function(a){"use strict";var b=a.fn.jquery.split(" ")[0].split(".");if(b[0]<2&&b[1]<9||1==b[0]&&9==b[1]&&b[2]<1)throw new Error("Bootstrap's JavaScript requires jQuery version 1.9.1 or higher")}(jQuery),+function(a){"use strict";function b(){var a=document.createElement("bootstrap"),b={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"};for(var c in b)if(void 0!==a.style[c])return{end:b[c]};return!1}a.fn.emulateTransitionEnd=function(b){var c=!1,d=this;a(this).one("bsTransitionEnd",function(){c=!0});var e=function(){c||a(d).trigger(a.support.transition.end)};return setTimeout(e,b),this},a(function(){a.support.transition=b(),a.support.transition&&(a.event.special.bsTransitionEnd={bindType:a.support.transition.end,delegateType:a.support.transition.end,handle:function(b){return a(b.target).is(this)?b.handleObj.handler.apply(this,arguments):void 0}})})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var c=a(this),e=c.data("bs.alert");e||c.data("bs.alert",e=new d(this)),"string"==typeof b&&e[b].call(c)})}var c='[data-dismiss="alert"]',d=function(b){a(b).on("click",c,this.close)};d.VERSION="3.3.5",d.TRANSITION_DURATION=150,d.prototype.close=function(b){function c(){g.detach().trigger("closed.bs.alert").remove()}var e=a(this),f=e.attr("data-target");f||(f=e.attr("href"),f=f&&f.replace(/.*(?=#[^\s]*$)/,""));var g=a(f);b&&b.preventDefault(),g.length||(g=e.closest(".alert")),g.trigger(b=a.Event("close.bs.alert")),b.isDefaultPrevented()||(g.removeClass("in"),a.support.transition&&g.hasClass("fade")?g.one("bsTransitionEnd",c).emulateTransitionEnd(d.TRANSITION_DURATION):c())};var e=a.fn.alert;a.fn.alert=b,a.fn.alert.Constructor=d,a.fn.alert.noConflict=function(){return a.fn.alert=e,this},a(document).on("click.bs.alert.data-api",c,d.prototype.close)}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.button"),f="object"==typeof b&&b;e||d.data("bs.button",e=new c(this,f)),"toggle"==b?e.toggle():b&&e.setState(b)})}var c=function(b,d){this.$element=a(b),this.options=a.extend({},c.DEFAULTS,d),this.isLoading=!1};c.VERSION="3.3.5",c.DEFAULTS={loadingText:"loading..."},c.prototype.setState=function(b){var c="disabled",d=this.$element,e=d.is("input")?"val":"html",f=d.data();b+="Text",null==f.resetText&&d.data("resetText",d[e]()),setTimeout(a.proxy(function(){d[e](null==f[b]?this.options[b]:f[b]),"loadingText"==b?(this.isLoading=!0,d.addClass(c).attr(c,c)):this.isLoading&&(this.isLoading=!1,d.removeClass(c).removeAttr(c))},this),0)},c.prototype.toggle=function(){var a=!0,b=this.$element.closest('[data-toggle="buttons"]');if(b.length){var c=this.$element.find("input");"radio"==c.prop("type")?(c.prop("checked")&&(a=!1),b.find(".active").removeClass("active"),this.$element.addClass("active")):"checkbox"==c.prop("type")&&(c.prop("checked")!==this.$element.hasClass("active")&&(a=!1),this.$element.toggleClass("active")),c.prop("checked",this.$element.hasClass("active")),a&&c.trigger("change")}else this.$element.attr("aria-pressed",!this.$element.hasClass("active")),this.$element.toggleClass("active")};var d=a.fn.button;a.fn.button=b,a.fn.button.Constructor=c,a.fn.button.noConflict=function(){return a.fn.button=d,this},a(document).on("click.bs.button.data-api",'[data-toggle^="button"]',function(c){var d=a(c.target);d.hasClass("btn")||(d=d.closest(".btn")),b.call(d,"toggle"),a(c.target).is('input[type="radio"]')||a(c.target).is('input[type="checkbox"]')||c.preventDefault()}).on("focus.bs.button.data-api blur.bs.button.data-api",'[data-toggle^="button"]',function(b){a(b.target).closest(".btn").toggleClass("focus",/^focus(in)?$/.test(b.type))})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.carousel"),f=a.extend({},c.DEFAULTS,d.data(),"object"==typeof b&&b),g="string"==typeof b?b:f.slide;e||d.data("bs.carousel",e=new c(this,f)),"number"==typeof b?e.to(b):g?e[g]():f.interval&&e.pause().cycle()})}var c=function(b,c){this.$element=a(b),this.$indicators=this.$element.find(".carousel-indicators"),this.options=c,this.paused=null,this.sliding=null,this.interval=null,this.$active=null,this.$items=null,this.options.keyboard&&this.$element.on("keydown.bs.carousel",a.proxy(this.keydown,this)),"hover"==this.options.pause&&!("ontouchstart"in document.documentElement)&&this.$element.on("mouseenter.bs.carousel",a.proxy(this.pause,this)).on("mouseleave.bs.carousel",a.proxy(this.cycle,this))};c.VERSION="3.3.5",c.TRANSITION_DURATION=600,c.DEFAULTS={interval:5e3,pause:"hover",wrap:!0,keyboard:!0},c.prototype.keydown=function(a){if(!/input|textarea/i.test(a.target.tagName)){switch(a.which){case 37:this.prev();break;case 39:this.next();break;default:return}a.preventDefault()}},c.prototype.cycle=function(b){return b||(this.paused=!1),this.interval&&clearInterval(this.interval),this.options.interval&&!this.paused&&(this.interval=setInterval(a.proxy(this.next,this),this.options.interval)),this},c.prototype.getItemIndex=function(a){return this.$items=a.parent().children(".item"),this.$items.index(a||this.$active)},c.prototype.getItemForDirection=function(a,b){var c=this.getItemIndex(b),d="prev"==a&&0===c||"next"==a&&c==this.$items.length-1;if(d&&!this.options.wrap)return b;var e="prev"==a?-1:1,f=(c+e)%this.$items.length;return this.$items.eq(f)},c.prototype.to=function(a){var b=this,c=this.getItemIndex(this.$active=this.$element.find(".item.active"));return a>this.$items.length-1||0>a?void 0:this.sliding?this.$element.one("slid.bs.carousel",function(){b.to(a)}):c==a?this.pause().cycle():this.slide(a>c?"next":"prev",this.$items.eq(a))},c.prototype.pause=function(b){return b||(this.paused=!0),this.$element.find(".next, .prev").length&&a.support.transition&&(this.$element.trigger(a.support.transition.end),this.cycle(!0)),this.interval=clearInterval(this.interval),this},c.prototype.next=function(){return this.sliding?void 0:this.slide("next")},c.prototype.prev=function(){return this.sliding?void 0:this.slide("prev")},c.prototype.slide=function(b,d){var e=this.$element.find(".item.active"),f=d||this.getItemForDirection(b,e),g=this.interval,h="next"==b?"left":"right",i=this;if(f.hasClass("active"))return this.sliding=!1;var j=f[0],k=a.Event("slide.bs.carousel",{relatedTarget:j,direction:h});if(this.$element.trigger(k),!k.isDefaultPrevented()){if(this.sliding=!0,g&&this.pause(),this.$indicators.length){this.$indicators.find(".active").removeClass("active");var l=a(this.$indicators.children()[this.getItemIndex(f)]);l&&l.addClass("active")}var m=a.Event("slid.bs.carousel",{relatedTarget:j,direction:h});return a.support.transition&&this.$element.hasClass("slide")?(f.addClass(b),f[0].offsetWidth,e.addClass(h),f.addClass(h),e.one("bsTransitionEnd",function(){f.removeClass([b,h].join(" ")).addClass("active"),e.removeClass(["active",h].join(" ")),i.sliding=!1,setTimeout(function(){i.$element.trigger(m)},0)}).emulateTransitionEnd(c.TRANSITION_DURATION)):(e.removeClass("active"),f.addClass("active"),this.sliding=!1,this.$element.trigger(m)),g&&this.cycle(),this}};var d=a.fn.carousel;a.fn.carousel=b,a.fn.carousel.Constructor=c,a.fn.carousel.noConflict=function(){return a.fn.carousel=d,this};var e=function(c){var d,e=a(this),f=a(e.attr("data-target")||(d=e.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,""));if(f.hasClass("carousel")){var g=a.extend({},f.data(),e.data()),h=e.attr("data-slide-to");h&&(g.interval=!1),b.call(f,g),h&&f.data("bs.carousel").to(h),c.preventDefault()}};a(document).on("click.bs.carousel.data-api","[data-slide]",e).on("click.bs.carousel.data-api","[data-slide-to]",e),a(window).on("load",function(){a('[data-ride="carousel"]').each(function(){var c=a(this);b.call(c,c.data())})})}(jQuery),+function(a){"use strict";function b(b){var c,d=b.attr("data-target")||(c=b.attr("href"))&&c.replace(/.*(?=#[^\s]+$)/,"");return a(d)}function c(b){return this.each(function(){var c=a(this),e=c.data("bs.collapse"),f=a.extend({},d.DEFAULTS,c.data(),"object"==typeof b&&b);!e&&f.toggle&&/show|hide/.test(b)&&(f.toggle=!1),e||c.data("bs.collapse",e=new d(this,f)),"string"==typeof b&&e[b]()})}var d=function(b,c){this.$element=a(b),this.options=a.extend({},d.DEFAULTS,c),this.$trigger=a('[data-toggle="collapse"][href="#'+b.id+'"],[data-toggle="collapse"][data-target="#'+b.id+'"]'),this.transitioning=null,this.options.parent?this.$parent=this.getParent():this.addAriaAndCollapsedClass(this.$element,this.$trigger),this.options.toggle&&this.toggle()};d.VERSION="3.3.5",d.TRANSITION_DURATION=350,d.DEFAULTS={toggle:!0},d.prototype.dimension=function(){var a=this.$element.hasClass("width");return a?"width":"height"},d.prototype.show=function(){if(!this.transitioning&&!this.$element.hasClass("in")){var b,e=this.$parent&&this.$parent.children(".panel").children(".in, .collapsing");if(!(e&&e.length&&(b=e.data("bs.collapse"),b&&b.transitioning))){var f=a.Event("show.bs.collapse");if(this.$element.trigger(f),!f.isDefaultPrevented()){e&&e.length&&(c.call(e,"hide"),b||e.data("bs.collapse",null));var g=this.dimension();this.$element.removeClass("collapse").addClass("collapsing")[g](0).attr("aria-expanded",!0),this.$trigger.removeClass("collapsed").attr("aria-expanded",!0),this.transitioning=1;var h=function(){this.$element.removeClass("collapsing").addClass("collapse in")[g](""),this.transitioning=0,this.$element.trigger("shown.bs.collapse")};if(!a.support.transition)return h.call(this);var i=a.camelCase(["scroll",g].join("-"));this.$element.one("bsTransitionEnd",a.proxy(h,this)).emulateTransitionEnd(d.TRANSITION_DURATION)[g](this.$element[0][i])}}}},d.prototype.hide=function(){if(!this.transitioning&&this.$element.hasClass("in")){var b=a.Event("hide.bs.collapse");if(this.$element.trigger(b),!b.isDefaultPrevented()){var c=this.dimension();this.$element[c](this.$element[c]())[0].offsetHeight,this.$element.addClass("collapsing").removeClass("collapse in").attr("aria-expanded",!1),this.$trigger.addClass("collapsed").attr("aria-expanded",!1),this.transitioning=1;var e=function(){this.transitioning=0,this.$element.removeClass("collapsing").addClass("collapse").trigger("hidden.bs.collapse")};return a.support.transition?void this.$element[c](0).one("bsTransitionEnd",a.proxy(e,this)).emulateTransitionEnd(d.TRANSITION_DURATION):e.call(this)}}},d.prototype.toggle=function(){this[this.$element.hasClass("in")?"hide":"show"]()},d.prototype.getParent=function(){return a(this.options.parent).find('[data-toggle="collapse"][data-parent="'+this.options.parent+'"]').each(a.proxy(function(c,d){var e=a(d);this.addAriaAndCollapsedClass(b(e),e)},this)).end()},d.prototype.addAriaAndCollapsedClass=function(a,b){var c=a.hasClass("in");a.attr("aria-expanded",c),b.toggleClass("collapsed",!c).attr("aria-expanded",c)};var e=a.fn.collapse;a.fn.collapse=c,a.fn.collapse.Constructor=d,a.fn.collapse.noConflict=function(){return a.fn.collapse=e,this},a(document).on("click.bs.collapse.data-api",'[data-toggle="collapse"]',function(d){var e=a(this);e.attr("data-target")||d.preventDefault();var f=b(e),g=f.data("bs.collapse"),h=g?"toggle":e.data();c.call(f,h)})}(jQuery),+function(a){"use strict";function b(b){var c=b.attr("data-target");c||(c=b.attr("href"),c=c&&/#[A-Za-z]/.test(c)&&c.replace(/.*(?=#[^\s]*$)/,""));var d=c&&a(c);return d&&d.length?d:b.parent()}function c(c){c&&3===c.which||(a(e).remove(),a(f).each(function(){var d=a(this),e=b(d),f={relatedTarget:this};e.hasClass("open")&&(c&&"click"==c.type&&/input|textarea/i.test(c.target.tagName)&&a.contains(e[0],c.target)||(e.trigger(c=a.Event("hide.bs.dropdown",f)),c.isDefaultPrevented()||(d.attr("aria-expanded","false"),e.removeClass("open").trigger("hidden.bs.dropdown",f))))}))}function d(b){return this.each(function(){var c=a(this),d=c.data("bs.dropdown");d||c.data("bs.dropdown",d=new g(this)),"string"==typeof b&&d[b].call(c)})}var e=".dropdown-backdrop",f='[data-toggle="dropdown"]',g=function(b){a(b).on("click.bs.dropdown",this.toggle)};g.VERSION="3.3.5",g.prototype.toggle=function(d){var e=a(this);if(!e.is(".disabled, :disabled")){var f=b(e),g=f.hasClass("open");if(c(),!g){"ontouchstart"in document.documentElement&&!f.closest(".navbar-nav").length&&a(document.createElement("div")).addClass("dropdown-backdrop").insertAfter(a(this)).on("click",c);var h={relatedTarget:this};if(f.trigger(d=a.Event("show.bs.dropdown",h)),d.isDefaultPrevented())return;e.trigger("focus").attr("aria-expanded","true"),f.toggleClass("open").trigger("shown.bs.dropdown",h)}return!1}},g.prototype.keydown=function(c){if(/(38|40|27|32)/.test(c.which)&&!/input|textarea/i.test(c.target.tagName)){var d=a(this);if(c.preventDefault(),c.stopPropagation(),!d.is(".disabled, :disabled")){var e=b(d),g=e.hasClass("open");if(!g&&27!=c.which||g&&27==c.which)return 27==c.which&&e.find(f).trigger("focus"),d.trigger("click");var h=" li:not(.disabled):visible a",i=e.find(".dropdown-menu"+h);if(i.length){var j=i.index(c.target);38==c.which&&j>0&&j--,40==c.which&&jdocument.documentElement.clientHeight;this.$element.css({paddingLeft:!this.bodyIsOverflowing&&a?this.scrollbarWidth:"",paddingRight:this.bodyIsOverflowing&&!a?this.scrollbarWidth:""})},c.prototype.resetAdjustments=function(){this.$element.css({paddingLeft:"",paddingRight:""})},c.prototype.checkScrollbar=function(){var a=window.innerWidth;if(!a){var b=document.documentElement.getBoundingClientRect();a=b.right-Math.abs(b.left)}this.bodyIsOverflowing=document.body.clientWidth

',trigger:"hover focus",title:"",delay:0,html:!1,container:!1,viewport:{selector:"body",padding:0}},c.prototype.init=function(b,c,d){if(this.enabled=!0,this.type=b,this.$element=a(c),this.options=this.getOptions(d),this.$viewport=this.options.viewport&&a(a.isFunction(this.options.viewport)?this.options.viewport.call(this,this.$element):this.options.viewport.selector||this.options.viewport),this.inState={click:!1,hover:!1,focus:!1},this.$element[0]instanceof document.constructor&&!this.options.selector)throw new Error("`selector` option must be specified when initializing "+this.type+" on the window.document object!");for(var e=this.options.trigger.split(" "),f=e.length;f--;){var g=e[f];if("click"==g)this.$element.on("click."+this.type,this.options.selector,a.proxy(this.toggle,this));else if("manual"!=g){var h="hover"==g?"mouseenter":"focusin",i="hover"==g?"mouseleave":"focusout";this.$element.on(h+"."+this.type,this.options.selector,a.proxy(this.enter,this)),this.$element.on(i+"."+this.type,this.options.selector,a.proxy(this.leave,this))}}this.options.selector?this._options=a.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},c.prototype.getDefaults=function(){return c.DEFAULTS},c.prototype.getOptions=function(b){return b=a.extend({},this.getDefaults(),this.$element.data(),b),b.delay&&"number"==typeof b.delay&&(b.delay={show:b.delay,hide:b.delay}),b},c.prototype.getDelegateOptions=function(){var b={},c=this.getDefaults();return this._options&&a.each(this._options,function(a,d){c[a]!=d&&(b[a]=d)}),b},c.prototype.enter=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget).data("bs."+this.type);return c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c)),b instanceof a.Event&&(c.inState["focusin"==b.type?"focus":"hover"]=!0),c.tip().hasClass("in")||"in"==c.hoverState?void(c.hoverState="in"):(clearTimeout(c.timeout),c.hoverState="in",c.options.delay&&c.options.delay.show?void(c.timeout=setTimeout(function(){"in"==c.hoverState&&c.show()},c.options.delay.show)):c.show())},c.prototype.isInStateTrue=function(){for(var a in this.inState)if(this.inState[a])return!0;return!1},c.prototype.leave=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget).data("bs."+this.type);return c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c)),b instanceof a.Event&&(c.inState["focusout"==b.type?"focus":"hover"]=!1),c.isInStateTrue()?void 0:(clearTimeout(c.timeout),c.hoverState="out",c.options.delay&&c.options.delay.hide?void(c.timeout=setTimeout(function(){"out"==c.hoverState&&c.hide()},c.options.delay.hide)):c.hide())},c.prototype.show=function(){var b=a.Event("show.bs."+this.type);if(this.hasContent()&&this.enabled){this.$element.trigger(b);var d=a.contains(this.$element[0].ownerDocument.documentElement,this.$element[0]);if(b.isDefaultPrevented()||!d)return;var e=this,f=this.tip(),g=this.getUID(this.type);this.setContent(),f.attr("id",g),this.$element.attr("aria-describedby",g),this.options.animation&&f.addClass("fade");var h="function"==typeof this.options.placement?this.options.placement.call(this,f[0],this.$element[0]):this.options.placement,i=/\s?auto?\s?/i,j=i.test(h);j&&(h=h.replace(i,"")||"top"),f.detach().css({top:0,left:0,display:"block"}).addClass(h).data("bs."+this.type,this),this.options.container?f.appendTo(this.options.container):f.insertAfter(this.$element),this.$element.trigger("inserted.bs."+this.type);var k=this.getPosition(),l=f[0].offsetWidth,m=f[0].offsetHeight;if(j){var n=h,o=this.getPosition(this.$viewport);h="bottom"==h&&k.bottom+m>o.bottom?"top":"top"==h&&k.top-mo.width?"left":"left"==h&&k.left-lg.top+g.height&&(e.top=g.top+g.height-i)}else{var j=b.left-f,k=b.left+f+c;jg.right&&(e.left=g.left+g.width-k)}return e},c.prototype.getTitle=function(){var a,b=this.$element,c=this.options;return a=b.attr("data-original-title")||("function"==typeof c.title?c.title.call(b[0]):c.title)},c.prototype.getUID=function(a){do a+=~~(1e6*Math.random());while(document.getElementById(a));return a},c.prototype.tip=function(){if(!this.$tip&&(this.$tip=a(this.options.template),1!=this.$tip.length))throw new Error(this.type+" `template` option must consist of exactly 1 top-level element!");return this.$tip},c.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".tooltip-arrow")},c.prototype.enable=function(){this.enabled=!0},c.prototype.disable=function(){this.enabled=!1},c.prototype.toggleEnabled=function(){this.enabled=!this.enabled},c.prototype.toggle=function(b){var c=this;b&&(c=a(b.currentTarget).data("bs."+this.type),c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c))),b?(c.inState.click=!c.inState.click,c.isInStateTrue()?c.enter(c):c.leave(c)):c.tip().hasClass("in")?c.leave(c):c.enter(c)},c.prototype.destroy=function(){var a=this;clearTimeout(this.timeout),this.hide(function(){a.$element.off("."+a.type).removeData("bs."+a.type),a.$tip&&a.$tip.detach(),a.$tip=null,a.$arrow=null,a.$viewport=null})};var d=a.fn.tooltip;a.fn.tooltip=b,a.fn.tooltip.Constructor=c,a.fn.tooltip.noConflict=function(){return a.fn.tooltip=d,this}}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.popover"),f="object"==typeof b&&b;(e||!/destroy|hide/.test(b))&&(e||d.data("bs.popover",e=new c(this,f)),"string"==typeof b&&e[b]())})}var c=function(a,b){this.init("popover",a,b)};if(!a.fn.tooltip)throw new Error("Popover requires tooltip.js");c.VERSION="3.3.5",c.DEFAULTS=a.extend({},a.fn.tooltip.Constructor.DEFAULTS,{placement:"right",trigger:"click",content:"",template:''}),c.prototype=a.extend({},a.fn.tooltip.Constructor.prototype),c.prototype.constructor=c,c.prototype.getDefaults=function(){return c.DEFAULTS},c.prototype.setContent=function(){var a=this.tip(),b=this.getTitle(),c=this.getContent();a.find(".popover-title")[this.options.html?"html":"text"](b),a.find(".popover-content").children().detach().end()[this.options.html?"string"==typeof c?"html":"append":"text"](c),a.removeClass("fade top bottom left right in"),a.find(".popover-title").html()||a.find(".popover-title").hide()},c.prototype.hasContent=function(){return this.getTitle()||this.getContent()},c.prototype.getContent=function(){var a=this.$element,b=this.options;return a.attr("data-content")||("function"==typeof b.content?b.content.call(a[0]):b.content)},c.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".arrow")};var d=a.fn.popover;a.fn.popover=b,a.fn.popover.Constructor=c,a.fn.popover.noConflict=function(){return a.fn.popover=d,this}}(jQuery),+function(a){"use strict";function b(c,d){this.$body=a(document.body),this.$scrollElement=a(a(c).is(document.body)?window:c),this.options=a.extend({},b.DEFAULTS,d),this.selector=(this.options.target||"")+" .nav li > a",this.offsets=[],this.targets=[],this.activeTarget=null,this.scrollHeight=0,this.$scrollElement.on("scroll.bs.scrollspy",a.proxy(this.process,this)),this.refresh(),this.process()}function c(c){return this.each(function(){var d=a(this),e=d.data("bs.scrollspy"),f="object"==typeof c&&c;e||d.data("bs.scrollspy",e=new b(this,f)),"string"==typeof c&&e[c]()})}b.VERSION="3.3.5",b.DEFAULTS={offset:10},b.prototype.getScrollHeight=function(){return this.$scrollElement[0].scrollHeight||Math.max(this.$body[0].scrollHeight,document.documentElement.scrollHeight)},b.prototype.refresh=function(){var b=this,c="offset",d=0;this.offsets=[],this.targets=[],this.scrollHeight=this.getScrollHeight(),a.isWindow(this.$scrollElement[0])||(c="position",d=this.$scrollElement.scrollTop()),this.$body.find(this.selector).map(function(){var b=a(this),e=b.data("target")||b.attr("href"),f=/^#./.test(e)&&a(e);return f&&f.length&&f.is(":visible")&&[[f[c]().top+d,e]]||null}).sort(function(a,b){return a[0]-b[0]}).each(function(){b.offsets.push(this[0]),b.targets.push(this[1])})},b.prototype.process=function(){var a,b=this.$scrollElement.scrollTop()+this.options.offset,c=this.getScrollHeight(),d=this.options.offset+c-this.$scrollElement.height(),e=this.offsets,f=this.targets,g=this.activeTarget;if(this.scrollHeight!=c&&this.refresh(),b>=d)return g!=(a=f[f.length-1])&&this.activate(a);if(g&&b=e[a]&&(void 0===e[a+1]||b .dropdown-menu > .active").removeClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!1),b.addClass("active").find('[data-toggle="tab"]').attr("aria-expanded",!0),h?(b[0].offsetWidth,b.addClass("in")):b.removeClass("fade"),b.parent(".dropdown-menu").length&&b.closest("li.dropdown").addClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!0),e&&e()}var g=d.find("> .active"),h=e&&a.support.transition&&(g.length&&g.hasClass("fade")||!!d.find("> .fade").length);g.length&&h?g.one("bsTransitionEnd",f).emulateTransitionEnd(c.TRANSITION_DURATION):f(),g.removeClass("in")};var d=a.fn.tab;a.fn.tab=b,a.fn.tab.Constructor=c,a.fn.tab.noConflict=function(){return a.fn.tab=d,this};var e=function(c){c.preventDefault(),b.call(a(this),"show")};a(document).on("click.bs.tab.data-api",'[data-toggle="tab"]',e).on("click.bs.tab.data-api",'[data-toggle="pill"]',e)}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.affix"),f="object"==typeof b&&b;e||d.data("bs.affix",e=new c(this,f)),"string"==typeof b&&e[b]()})}var c=function(b,d){this.options=a.extend({},c.DEFAULTS,d),this.$target=a(this.options.target).on("scroll.bs.affix.data-api",a.proxy(this.checkPosition,this)).on("click.bs.affix.data-api",a.proxy(this.checkPositionWithEventLoop,this)),this.$element=a(b),this.affixed=null,this.unpin=null,this.pinnedOffset=null,this.checkPosition()};c.VERSION="3.3.5",c.RESET="affix affix-top affix-bottom",c.DEFAULTS={offset:0,target:window},c.prototype.getState=function(a,b,c,d){var e=this.$target.scrollTop(),f=this.$element.offset(),g=this.$target.height();if(null!=c&&"top"==this.affixed)return c>e?"top":!1;if("bottom"==this.affixed)return null!=c?e+this.unpin<=f.top?!1:"bottom":a-d>=e+g?!1:"bottom";var h=null==this.affixed,i=h?e:f.top,j=h?g:b;return null!=c&&c>=e?"top":null!=d&&i+j>=a-d?"bottom":!1},c.prototype.getPinnedOffset=function(){if(this.pinnedOffset)return this.pinnedOffset;this.$element.removeClass(c.RESET).addClass("affix");var a=this.$target.scrollTop(),b=this.$element.offset();return this.pinnedOffset=b.top-a},c.prototype.checkPositionWithEventLoop=function(){setTimeout(a.proxy(this.checkPosition,this),1)},c.prototype.checkPosition=function(){if(this.$element.is(":visible")){var b=this.$element.height(),d=this.options.offset,e=d.top,f=d.bottom,g=Math.max(a(document).height(),a(document.body).height());"object"!=typeof d&&(f=e=d),"function"==typeof e&&(e=d.top(this.$element)),"function"==typeof f&&(f=d.bottom(this.$element));var h=this.getState(g,b,e,f);if(this.affixed!=h){null!=this.unpin&&this.$element.css("top","");var i="affix"+(h?"-"+h:""),j=a.Event(i+".bs.affix");if(this.$element.trigger(j),j.isDefaultPrevented())return;this.affixed=h,this.unpin="bottom"==h?this.getPinnedOffset():null,this.$element.removeClass(c.RESET).addClass(i).trigger(i.replace("affix","affixed")+".bs.affix")}"bottom"==h&&this.$element.offset({top:g-b-f})}};var d=a.fn.affix;a.fn.affix=b,a.fn.affix.Constructor=c,a.fn.affix.noConflict=function(){return a.fn.affix=d,this},a(window).on("load",function(){a('[data-spy="affix"]').each(function(){var c=a(this),d=c.data();d.offset=d.offset||{},null!=d.offsetBottom&&(d.offset.bottom=d.offsetBottom),null!=d.offsetTop&&(d.offset.top=d.offsetTop),b.call(c,d)})})}(jQuery); \ No newline at end of file +if("undefined"==typeof jQuery)throw new Error("Bootstrap's JavaScript requires jQuery");+function(a){"use strict";var b=a.fn.jquery.split(" ")[0].split(".");if(b[0]<2&&b[1]<9||1==b[0]&&9==b[1]&&b[2]<1||b[0]>3)throw new Error("Bootstrap's JavaScript requires jQuery version 1.9.1 or higher, but lower than version 4")}(jQuery),+function(a){"use strict";function b(){var a=document.createElement("bootstrap"),b={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"};for(var c in b)if(void 0!==a.style[c])return{end:b[c]};return!1}a.fn.emulateTransitionEnd=function(b){var c=!1,d=this;a(this).one("bsTransitionEnd",function(){c=!0});var e=function(){c||a(d).trigger(a.support.transition.end)};return setTimeout(e,b),this},a(function(){a.support.transition=b(),a.support.transition&&(a.event.special.bsTransitionEnd={bindType:a.support.transition.end,delegateType:a.support.transition.end,handle:function(b){if(a(b.target).is(this))return b.handleObj.handler.apply(this,arguments)}})})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var c=a(this),e=c.data("bs.alert");e||c.data("bs.alert",e=new d(this)),"string"==typeof b&&e[b].call(c)})}var c='[data-dismiss="alert"]',d=function(b){a(b).on("click",c,this.close)};d.VERSION="3.3.7",d.TRANSITION_DURATION=150,d.prototype.close=function(b){function c(){g.detach().trigger("closed.bs.alert").remove()}var e=a(this),f=e.attr("data-target");f||(f=e.attr("href"),f=f&&f.replace(/.*(?=#[^\s]*$)/,""));var g=a("#"===f?[]:f);b&&b.preventDefault(),g.length||(g=e.closest(".alert")),g.trigger(b=a.Event("close.bs.alert")),b.isDefaultPrevented()||(g.removeClass("in"),a.support.transition&&g.hasClass("fade")?g.one("bsTransitionEnd",c).emulateTransitionEnd(d.TRANSITION_DURATION):c())};var e=a.fn.alert;a.fn.alert=b,a.fn.alert.Constructor=d,a.fn.alert.noConflict=function(){return a.fn.alert=e,this},a(document).on("click.bs.alert.data-api",c,d.prototype.close)}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.button"),f="object"==typeof b&&b;e||d.data("bs.button",e=new c(this,f)),"toggle"==b?e.toggle():b&&e.setState(b)})}var c=function(b,d){this.$element=a(b),this.options=a.extend({},c.DEFAULTS,d),this.isLoading=!1};c.VERSION="3.3.7",c.DEFAULTS={loadingText:"loading..."},c.prototype.setState=function(b){var c="disabled",d=this.$element,e=d.is("input")?"val":"html",f=d.data();b+="Text",null==f.resetText&&d.data("resetText",d[e]()),setTimeout(a.proxy(function(){d[e](null==f[b]?this.options[b]:f[b]),"loadingText"==b?(this.isLoading=!0,d.addClass(c).attr(c,c).prop(c,!0)):this.isLoading&&(this.isLoading=!1,d.removeClass(c).removeAttr(c).prop(c,!1))},this),0)},c.prototype.toggle=function(){var a=!0,b=this.$element.closest('[data-toggle="buttons"]');if(b.length){var c=this.$element.find("input");"radio"==c.prop("type")?(c.prop("checked")&&(a=!1),b.find(".active").removeClass("active"),this.$element.addClass("active")):"checkbox"==c.prop("type")&&(c.prop("checked")!==this.$element.hasClass("active")&&(a=!1),this.$element.toggleClass("active")),c.prop("checked",this.$element.hasClass("active")),a&&c.trigger("change")}else this.$element.attr("aria-pressed",!this.$element.hasClass("active")),this.$element.toggleClass("active")};var d=a.fn.button;a.fn.button=b,a.fn.button.Constructor=c,a.fn.button.noConflict=function(){return a.fn.button=d,this},a(document).on("click.bs.button.data-api",'[data-toggle^="button"]',function(c){var d=a(c.target).closest(".btn");b.call(d,"toggle"),a(c.target).is('input[type="radio"], input[type="checkbox"]')||(c.preventDefault(),d.is("input,button")?d.trigger("focus"):d.find("input:visible,button:visible").first().trigger("focus"))}).on("focus.bs.button.data-api blur.bs.button.data-api",'[data-toggle^="button"]',function(b){a(b.target).closest(".btn").toggleClass("focus",/^focus(in)?$/.test(b.type))})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.carousel"),f=a.extend({},c.DEFAULTS,d.data(),"object"==typeof b&&b),g="string"==typeof b?b:f.slide;e||d.data("bs.carousel",e=new c(this,f)),"number"==typeof b?e.to(b):g?e[g]():f.interval&&e.pause().cycle()})}var c=function(b,c){this.$element=a(b),this.$indicators=this.$element.find(".carousel-indicators"),this.options=c,this.paused=null,this.sliding=null,this.interval=null,this.$active=null,this.$items=null,this.options.keyboard&&this.$element.on("keydown.bs.carousel",a.proxy(this.keydown,this)),"hover"==this.options.pause&&!("ontouchstart"in document.documentElement)&&this.$element.on("mouseenter.bs.carousel",a.proxy(this.pause,this)).on("mouseleave.bs.carousel",a.proxy(this.cycle,this))};c.VERSION="3.3.7",c.TRANSITION_DURATION=600,c.DEFAULTS={interval:5e3,pause:"hover",wrap:!0,keyboard:!0},c.prototype.keydown=function(a){if(!/input|textarea/i.test(a.target.tagName)){switch(a.which){case 37:this.prev();break;case 39:this.next();break;default:return}a.preventDefault()}},c.prototype.cycle=function(b){return b||(this.paused=!1),this.interval&&clearInterval(this.interval),this.options.interval&&!this.paused&&(this.interval=setInterval(a.proxy(this.next,this),this.options.interval)),this},c.prototype.getItemIndex=function(a){return this.$items=a.parent().children(".item"),this.$items.index(a||this.$active)},c.prototype.getItemForDirection=function(a,b){var c=this.getItemIndex(b),d="prev"==a&&0===c||"next"==a&&c==this.$items.length-1;if(d&&!this.options.wrap)return b;var e="prev"==a?-1:1,f=(c+e)%this.$items.length;return this.$items.eq(f)},c.prototype.to=function(a){var b=this,c=this.getItemIndex(this.$active=this.$element.find(".item.active"));if(!(a>this.$items.length-1||a<0))return this.sliding?this.$element.one("slid.bs.carousel",function(){b.to(a)}):c==a?this.pause().cycle():this.slide(a>c?"next":"prev",this.$items.eq(a))},c.prototype.pause=function(b){return b||(this.paused=!0),this.$element.find(".next, .prev").length&&a.support.transition&&(this.$element.trigger(a.support.transition.end),this.cycle(!0)),this.interval=clearInterval(this.interval),this},c.prototype.next=function(){if(!this.sliding)return this.slide("next")},c.prototype.prev=function(){if(!this.sliding)return this.slide("prev")},c.prototype.slide=function(b,d){var e=this.$element.find(".item.active"),f=d||this.getItemForDirection(b,e),g=this.interval,h="next"==b?"left":"right",i=this;if(f.hasClass("active"))return this.sliding=!1;var j=f[0],k=a.Event("slide.bs.carousel",{relatedTarget:j,direction:h});if(this.$element.trigger(k),!k.isDefaultPrevented()){if(this.sliding=!0,g&&this.pause(),this.$indicators.length){this.$indicators.find(".active").removeClass("active");var l=a(this.$indicators.children()[this.getItemIndex(f)]);l&&l.addClass("active")}var m=a.Event("slid.bs.carousel",{relatedTarget:j,direction:h});return a.support.transition&&this.$element.hasClass("slide")?(f.addClass(b),f[0].offsetWidth,e.addClass(h),f.addClass(h),e.one("bsTransitionEnd",function(){f.removeClass([b,h].join(" ")).addClass("active"),e.removeClass(["active",h].join(" ")),i.sliding=!1,setTimeout(function(){i.$element.trigger(m)},0)}).emulateTransitionEnd(c.TRANSITION_DURATION)):(e.removeClass("active"),f.addClass("active"),this.sliding=!1,this.$element.trigger(m)),g&&this.cycle(),this}};var d=a.fn.carousel;a.fn.carousel=b,a.fn.carousel.Constructor=c,a.fn.carousel.noConflict=function(){return a.fn.carousel=d,this};var e=function(c){var d,e=a(this),f=a(e.attr("data-target")||(d=e.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,""));if(f.hasClass("carousel")){var g=a.extend({},f.data(),e.data()),h=e.attr("data-slide-to");h&&(g.interval=!1),b.call(f,g),h&&f.data("bs.carousel").to(h),c.preventDefault()}};a(document).on("click.bs.carousel.data-api","[data-slide]",e).on("click.bs.carousel.data-api","[data-slide-to]",e),a(window).on("load",function(){a('[data-ride="carousel"]').each(function(){var c=a(this);b.call(c,c.data())})})}(jQuery),+function(a){"use strict";function b(b){var c,d=b.attr("data-target")||(c=b.attr("href"))&&c.replace(/.*(?=#[^\s]+$)/,"");return a(d)}function c(b){return this.each(function(){var c=a(this),e=c.data("bs.collapse"),f=a.extend({},d.DEFAULTS,c.data(),"object"==typeof b&&b);!e&&f.toggle&&/show|hide/.test(b)&&(f.toggle=!1),e||c.data("bs.collapse",e=new d(this,f)),"string"==typeof b&&e[b]()})}var d=function(b,c){this.$element=a(b),this.options=a.extend({},d.DEFAULTS,c),this.$trigger=a('[data-toggle="collapse"][href="#'+b.id+'"],[data-toggle="collapse"][data-target="#'+b.id+'"]'),this.transitioning=null,this.options.parent?this.$parent=this.getParent():this.addAriaAndCollapsedClass(this.$element,this.$trigger),this.options.toggle&&this.toggle()};d.VERSION="3.3.7",d.TRANSITION_DURATION=350,d.DEFAULTS={toggle:!0},d.prototype.dimension=function(){var a=this.$element.hasClass("width");return a?"width":"height"},d.prototype.show=function(){if(!this.transitioning&&!this.$element.hasClass("in")){var b,e=this.$parent&&this.$parent.children(".panel").children(".in, .collapsing");if(!(e&&e.length&&(b=e.data("bs.collapse"),b&&b.transitioning))){var f=a.Event("show.bs.collapse");if(this.$element.trigger(f),!f.isDefaultPrevented()){e&&e.length&&(c.call(e,"hide"),b||e.data("bs.collapse",null));var g=this.dimension();this.$element.removeClass("collapse").addClass("collapsing")[g](0).attr("aria-expanded",!0),this.$trigger.removeClass("collapsed").attr("aria-expanded",!0),this.transitioning=1;var h=function(){this.$element.removeClass("collapsing").addClass("collapse in")[g](""),this.transitioning=0,this.$element.trigger("shown.bs.collapse")};if(!a.support.transition)return h.call(this);var i=a.camelCase(["scroll",g].join("-"));this.$element.one("bsTransitionEnd",a.proxy(h,this)).emulateTransitionEnd(d.TRANSITION_DURATION)[g](this.$element[0][i])}}}},d.prototype.hide=function(){if(!this.transitioning&&this.$element.hasClass("in")){var b=a.Event("hide.bs.collapse");if(this.$element.trigger(b),!b.isDefaultPrevented()){var c=this.dimension();this.$element[c](this.$element[c]())[0].offsetHeight,this.$element.addClass("collapsing").removeClass("collapse in").attr("aria-expanded",!1),this.$trigger.addClass("collapsed").attr("aria-expanded",!1),this.transitioning=1;var e=function(){this.transitioning=0,this.$element.removeClass("collapsing").addClass("collapse").trigger("hidden.bs.collapse")};return a.support.transition?void this.$element[c](0).one("bsTransitionEnd",a.proxy(e,this)).emulateTransitionEnd(d.TRANSITION_DURATION):e.call(this)}}},d.prototype.toggle=function(){this[this.$element.hasClass("in")?"hide":"show"]()},d.prototype.getParent=function(){return a(this.options.parent).find('[data-toggle="collapse"][data-parent="'+this.options.parent+'"]').each(a.proxy(function(c,d){var e=a(d);this.addAriaAndCollapsedClass(b(e),e)},this)).end()},d.prototype.addAriaAndCollapsedClass=function(a,b){var c=a.hasClass("in");a.attr("aria-expanded",c),b.toggleClass("collapsed",!c).attr("aria-expanded",c)};var e=a.fn.collapse;a.fn.collapse=c,a.fn.collapse.Constructor=d,a.fn.collapse.noConflict=function(){return a.fn.collapse=e,this},a(document).on("click.bs.collapse.data-api",'[data-toggle="collapse"]',function(d){var e=a(this);e.attr("data-target")||d.preventDefault();var f=b(e),g=f.data("bs.collapse"),h=g?"toggle":e.data();c.call(f,h)})}(jQuery),+function(a){"use strict";function b(b){var c=b.attr("data-target");c||(c=b.attr("href"),c=c&&/#[A-Za-z]/.test(c)&&c.replace(/.*(?=#[^\s]*$)/,""));var d=c&&a(c);return d&&d.length?d:b.parent()}function c(c){c&&3===c.which||(a(e).remove(),a(f).each(function(){var d=a(this),e=b(d),f={relatedTarget:this};e.hasClass("open")&&(c&&"click"==c.type&&/input|textarea/i.test(c.target.tagName)&&a.contains(e[0],c.target)||(e.trigger(c=a.Event("hide.bs.dropdown",f)),c.isDefaultPrevented()||(d.attr("aria-expanded","false"),e.removeClass("open").trigger(a.Event("hidden.bs.dropdown",f)))))}))}function d(b){return this.each(function(){var c=a(this),d=c.data("bs.dropdown");d||c.data("bs.dropdown",d=new g(this)),"string"==typeof b&&d[b].call(c)})}var e=".dropdown-backdrop",f='[data-toggle="dropdown"]',g=function(b){a(b).on("click.bs.dropdown",this.toggle)};g.VERSION="3.3.7",g.prototype.toggle=function(d){var e=a(this);if(!e.is(".disabled, :disabled")){var f=b(e),g=f.hasClass("open");if(c(),!g){"ontouchstart"in document.documentElement&&!f.closest(".navbar-nav").length&&a(document.createElement("div")).addClass("dropdown-backdrop").insertAfter(a(this)).on("click",c);var h={relatedTarget:this};if(f.trigger(d=a.Event("show.bs.dropdown",h)),d.isDefaultPrevented())return;e.trigger("focus").attr("aria-expanded","true"),f.toggleClass("open").trigger(a.Event("shown.bs.dropdown",h))}return!1}},g.prototype.keydown=function(c){if(/(38|40|27|32)/.test(c.which)&&!/input|textarea/i.test(c.target.tagName)){var d=a(this);if(c.preventDefault(),c.stopPropagation(),!d.is(".disabled, :disabled")){var e=b(d),g=e.hasClass("open");if(!g&&27!=c.which||g&&27==c.which)return 27==c.which&&e.find(f).trigger("focus"),d.trigger("click");var h=" li:not(.disabled):visible a",i=e.find(".dropdown-menu"+h);if(i.length){var j=i.index(c.target);38==c.which&&j>0&&j--,40==c.which&&jdocument.documentElement.clientHeight;this.$element.css({paddingLeft:!this.bodyIsOverflowing&&a?this.scrollbarWidth:"",paddingRight:this.bodyIsOverflowing&&!a?this.scrollbarWidth:""})},c.prototype.resetAdjustments=function(){this.$element.css({paddingLeft:"",paddingRight:""})},c.prototype.checkScrollbar=function(){var a=window.innerWidth;if(!a){var b=document.documentElement.getBoundingClientRect();a=b.right-Math.abs(b.left)}this.bodyIsOverflowing=document.body.clientWidth
',trigger:"hover focus",title:"",delay:0,html:!1,container:!1,viewport:{selector:"body",padding:0}},c.prototype.init=function(b,c,d){if(this.enabled=!0,this.type=b,this.$element=a(c),this.options=this.getOptions(d),this.$viewport=this.options.viewport&&a(a.isFunction(this.options.viewport)?this.options.viewport.call(this,this.$element):this.options.viewport.selector||this.options.viewport),this.inState={click:!1,hover:!1,focus:!1},this.$element[0]instanceof document.constructor&&!this.options.selector)throw new Error("`selector` option must be specified when initializing "+this.type+" on the window.document object!");for(var e=this.options.trigger.split(" "),f=e.length;f--;){var g=e[f];if("click"==g)this.$element.on("click."+this.type,this.options.selector,a.proxy(this.toggle,this));else if("manual"!=g){var h="hover"==g?"mouseenter":"focusin",i="hover"==g?"mouseleave":"focusout";this.$element.on(h+"."+this.type,this.options.selector,a.proxy(this.enter,this)),this.$element.on(i+"."+this.type,this.options.selector,a.proxy(this.leave,this))}}this.options.selector?this._options=a.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},c.prototype.getDefaults=function(){return c.DEFAULTS},c.prototype.getOptions=function(b){return b=a.extend({},this.getDefaults(),this.$element.data(),b),b.delay&&"number"==typeof b.delay&&(b.delay={show:b.delay,hide:b.delay}),b},c.prototype.getDelegateOptions=function(){var b={},c=this.getDefaults();return this._options&&a.each(this._options,function(a,d){c[a]!=d&&(b[a]=d)}),b},c.prototype.enter=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget).data("bs."+this.type);return c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c)),b instanceof a.Event&&(c.inState["focusin"==b.type?"focus":"hover"]=!0),c.tip().hasClass("in")||"in"==c.hoverState?void(c.hoverState="in"):(clearTimeout(c.timeout),c.hoverState="in",c.options.delay&&c.options.delay.show?void(c.timeout=setTimeout(function(){"in"==c.hoverState&&c.show()},c.options.delay.show)):c.show())},c.prototype.isInStateTrue=function(){for(var a in this.inState)if(this.inState[a])return!0;return!1},c.prototype.leave=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget).data("bs."+this.type);if(c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c)),b instanceof a.Event&&(c.inState["focusout"==b.type?"focus":"hover"]=!1),!c.isInStateTrue())return clearTimeout(c.timeout),c.hoverState="out",c.options.delay&&c.options.delay.hide?void(c.timeout=setTimeout(function(){"out"==c.hoverState&&c.hide()},c.options.delay.hide)):c.hide()},c.prototype.show=function(){var b=a.Event("show.bs."+this.type);if(this.hasContent()&&this.enabled){this.$element.trigger(b);var d=a.contains(this.$element[0].ownerDocument.documentElement,this.$element[0]);if(b.isDefaultPrevented()||!d)return;var e=this,f=this.tip(),g=this.getUID(this.type);this.setContent(),f.attr("id",g),this.$element.attr("aria-describedby",g),this.options.animation&&f.addClass("fade");var h="function"==typeof this.options.placement?this.options.placement.call(this,f[0],this.$element[0]):this.options.placement,i=/\s?auto?\s?/i,j=i.test(h);j&&(h=h.replace(i,"")||"top"),f.detach().css({top:0,left:0,display:"block"}).addClass(h).data("bs."+this.type,this),this.options.container?f.appendTo(this.options.container):f.insertAfter(this.$element),this.$element.trigger("inserted.bs."+this.type);var k=this.getPosition(),l=f[0].offsetWidth,m=f[0].offsetHeight;if(j){var n=h,o=this.getPosition(this.$viewport);h="bottom"==h&&k.bottom+m>o.bottom?"top":"top"==h&&k.top-mo.width?"left":"left"==h&&k.left-lg.top+g.height&&(e.top=g.top+g.height-i)}else{var j=b.left-f,k=b.left+f+c;jg.right&&(e.left=g.left+g.width-k)}return e},c.prototype.getTitle=function(){var a,b=this.$element,c=this.options;return a=b.attr("data-original-title")||("function"==typeof c.title?c.title.call(b[0]):c.title)},c.prototype.getUID=function(a){do a+=~~(1e6*Math.random());while(document.getElementById(a));return a},c.prototype.tip=function(){if(!this.$tip&&(this.$tip=a(this.options.template),1!=this.$tip.length))throw new Error(this.type+" `template` option must consist of exactly 1 top-level element!");return this.$tip},c.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".tooltip-arrow")},c.prototype.enable=function(){this.enabled=!0},c.prototype.disable=function(){this.enabled=!1},c.prototype.toggleEnabled=function(){this.enabled=!this.enabled},c.prototype.toggle=function(b){var c=this;b&&(c=a(b.currentTarget).data("bs."+this.type),c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c))),b?(c.inState.click=!c.inState.click,c.isInStateTrue()?c.enter(c):c.leave(c)):c.tip().hasClass("in")?c.leave(c):c.enter(c)},c.prototype.destroy=function(){var a=this;clearTimeout(this.timeout),this.hide(function(){a.$element.off("."+a.type).removeData("bs."+a.type),a.$tip&&a.$tip.detach(),a.$tip=null,a.$arrow=null,a.$viewport=null,a.$element=null})};var d=a.fn.tooltip;a.fn.tooltip=b,a.fn.tooltip.Constructor=c,a.fn.tooltip.noConflict=function(){return a.fn.tooltip=d,this}}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.popover"),f="object"==typeof b&&b;!e&&/destroy|hide/.test(b)||(e||d.data("bs.popover",e=new c(this,f)),"string"==typeof b&&e[b]())})}var c=function(a,b){this.init("popover",a,b)};if(!a.fn.tooltip)throw new Error("Popover requires tooltip.js");c.VERSION="3.3.7",c.DEFAULTS=a.extend({},a.fn.tooltip.Constructor.DEFAULTS,{placement:"right",trigger:"click",content:"",template:''}),c.prototype=a.extend({},a.fn.tooltip.Constructor.prototype),c.prototype.constructor=c,c.prototype.getDefaults=function(){return c.DEFAULTS},c.prototype.setContent=function(){var a=this.tip(),b=this.getTitle(),c=this.getContent();a.find(".popover-title")[this.options.html?"html":"text"](b),a.find(".popover-content").children().detach().end()[this.options.html?"string"==typeof c?"html":"append":"text"](c),a.removeClass("fade top bottom left right in"),a.find(".popover-title").html()||a.find(".popover-title").hide()},c.prototype.hasContent=function(){return this.getTitle()||this.getContent()},c.prototype.getContent=function(){var a=this.$element,b=this.options;return a.attr("data-content")||("function"==typeof b.content?b.content.call(a[0]):b.content)},c.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".arrow")};var d=a.fn.popover;a.fn.popover=b,a.fn.popover.Constructor=c,a.fn.popover.noConflict=function(){return a.fn.popover=d,this}}(jQuery),+function(a){"use strict";function b(c,d){this.$body=a(document.body),this.$scrollElement=a(a(c).is(document.body)?window:c),this.options=a.extend({},b.DEFAULTS,d),this.selector=(this.options.target||"")+" .nav li > a",this.offsets=[],this.targets=[],this.activeTarget=null,this.scrollHeight=0,this.$scrollElement.on("scroll.bs.scrollspy",a.proxy(this.process,this)),this.refresh(),this.process()}function c(c){return this.each(function(){var d=a(this),e=d.data("bs.scrollspy"),f="object"==typeof c&&c;e||d.data("bs.scrollspy",e=new b(this,f)),"string"==typeof c&&e[c]()})}b.VERSION="3.3.7",b.DEFAULTS={offset:10},b.prototype.getScrollHeight=function(){return this.$scrollElement[0].scrollHeight||Math.max(this.$body[0].scrollHeight,document.documentElement.scrollHeight)},b.prototype.refresh=function(){var b=this,c="offset",d=0;this.offsets=[],this.targets=[],this.scrollHeight=this.getScrollHeight(),a.isWindow(this.$scrollElement[0])||(c="position",d=this.$scrollElement.scrollTop()),this.$body.find(this.selector).map(function(){var b=a(this),e=b.data("target")||b.attr("href"),f=/^#./.test(e)&&a(e);return f&&f.length&&f.is(":visible")&&[[f[c]().top+d,e]]||null}).sort(function(a,b){return a[0]-b[0]}).each(function(){b.offsets.push(this[0]),b.targets.push(this[1])})},b.prototype.process=function(){var a,b=this.$scrollElement.scrollTop()+this.options.offset,c=this.getScrollHeight(),d=this.options.offset+c-this.$scrollElement.height(),e=this.offsets,f=this.targets,g=this.activeTarget;if(this.scrollHeight!=c&&this.refresh(),b>=d)return g!=(a=f[f.length-1])&&this.activate(a);if(g&&b=e[a]&&(void 0===e[a+1]||b .dropdown-menu > .active").removeClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!1),b.addClass("active").find('[data-toggle="tab"]').attr("aria-expanded",!0),h?(b[0].offsetWidth,b.addClass("in")):b.removeClass("fade"),b.parent(".dropdown-menu").length&&b.closest("li.dropdown").addClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!0),e&&e()}var g=d.find("> .active"),h=e&&a.support.transition&&(g.length&&g.hasClass("fade")||!!d.find("> .fade").length);g.length&&h?g.one("bsTransitionEnd",f).emulateTransitionEnd(c.TRANSITION_DURATION):f(),g.removeClass("in")};var d=a.fn.tab;a.fn.tab=b,a.fn.tab.Constructor=c,a.fn.tab.noConflict=function(){return a.fn.tab=d,this};var e=function(c){c.preventDefault(),b.call(a(this),"show")};a(document).on("click.bs.tab.data-api",'[data-toggle="tab"]',e).on("click.bs.tab.data-api",'[data-toggle="pill"]',e)}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.affix"),f="object"==typeof b&&b;e||d.data("bs.affix",e=new c(this,f)),"string"==typeof b&&e[b]()})}var c=function(b,d){this.options=a.extend({},c.DEFAULTS,d),this.$target=a(this.options.target).on("scroll.bs.affix.data-api",a.proxy(this.checkPosition,this)).on("click.bs.affix.data-api",a.proxy(this.checkPositionWithEventLoop,this)),this.$element=a(b),this.affixed=null,this.unpin=null,this.pinnedOffset=null,this.checkPosition()};c.VERSION="3.3.7",c.RESET="affix affix-top affix-bottom",c.DEFAULTS={offset:0,target:window},c.prototype.getState=function(a,b,c,d){var e=this.$target.scrollTop(),f=this.$element.offset(),g=this.$target.height();if(null!=c&&"top"==this.affixed)return e=a-d&&"bottom"},c.prototype.getPinnedOffset=function(){if(this.pinnedOffset)return this.pinnedOffset;this.$element.removeClass(c.RESET).addClass("affix");var a=this.$target.scrollTop(),b=this.$element.offset();return this.pinnedOffset=b.top-a},c.prototype.checkPositionWithEventLoop=function(){setTimeout(a.proxy(this.checkPosition,this),1)},c.prototype.checkPosition=function(){if(this.$element.is(":visible")){var b=this.$element.height(),d=this.options.offset,e=d.top,f=d.bottom,g=Math.max(a(document).height(),a(document.body).height());"object"!=typeof d&&(f=e=d),"function"==typeof e&&(e=d.top(this.$element)),"function"==typeof f&&(f=d.bottom(this.$element));var h=this.getState(g,b,e,f);if(this.affixed!=h){null!=this.unpin&&this.$element.css("top","");var i="affix"+(h?"-"+h:""),j=a.Event(i+".bs.affix");if(this.$element.trigger(j),j.isDefaultPrevented())return;this.affixed=h,this.unpin="bottom"==h?this.getPinnedOffset():null,this.$element.removeClass(c.RESET).addClass(i).trigger(i.replace("affix","affixed")+".bs.affix")}"bottom"==h&&this.$element.offset({top:g-b-f})}};var d=a.fn.affix;a.fn.affix=b,a.fn.affix.Constructor=c,a.fn.affix.noConflict=function(){return a.fn.affix=d,this},a(window).on("load",function(){a('[data-spy="affix"]').each(function(){var c=a(this),d=c.data();d.offset=d.offset||{},null!=d.offsetBottom&&(d.offset.bottom=d.offsetBottom),null!=d.offsetTop&&(d.offset.top=d.offsetTop),b.call(c,d)})})}(jQuery); \ No newline at end of file From f0f61aa077ba49f3f107ec012f021cb8fa27ac07 Mon Sep 17 00:00:00 2001 From: Sassan Haradji Date: Tue, 26 Jul 2016 18:42:51 +0430 Subject: [PATCH 170/457] use verbose_name instead of object_name in field_mapping (#4299) * use verbose_name instead of object_name in error messages --- rest_framework/utils/field_mapping.py | 2 +- tests/test_validators.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rest_framework/utils/field_mapping.py b/rest_framework/utils/field_mapping.py index af7ab0231..311d58317 100644 --- a/rest_framework/utils/field_mapping.py +++ b/rest_framework/utils/field_mapping.py @@ -220,7 +220,7 @@ def get_field_kwargs(field_name, model_field): unique_error_message = model_field.error_messages.get('unique', None) if unique_error_message: unique_error_message = unique_error_message % { - 'model_name': model_field.model._meta.object_name, + 'model_name': model_field.model._meta.verbose_name, 'field_label': model_field.verbose_name } validator = UniqueValidator( diff --git a/tests/test_validators.py b/tests/test_validators.py index 32d41f2ba..ebc8b899f 100644 --- a/tests/test_validators.py +++ b/tests/test_validators.py @@ -77,7 +77,7 @@ class TestUniquenessValidation(TestCase): data = {'username': 'existing'} serializer = UniquenessSerializer(data=data) assert not serializer.is_valid() - assert serializer.errors == {'username': ['UniquenessModel with this username already exists.']} + assert serializer.errors == {'username': ['uniqueness model with this username already exists.']} def test_is_unique(self): data = {'username': 'other'} From 5d3b56f957d5ba6d5cb6e680c853a2e0da026fbb Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 26 Jul 2016 16:28:10 +0100 Subject: [PATCH 171/457] Test case for #4272 (#4310) * Test case for #4272 --- tests/test_model_serializer.py | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/tests/test_model_serializer.py b/tests/test_model_serializer.py index f24d1d515..2cf6cb04c 100644 --- a/tests/test_model_serializer.py +++ b/tests/test_model_serializer.py @@ -955,3 +955,24 @@ class TestMetaInheritance(TestCase): self.assertEqual(unicode_repr(ChildSerializer()), child_expected) self.assertEqual(unicode_repr(TestSerializer()), test_expected) self.assertEqual(unicode_repr(ChildSerializer()), child_expected) + + +class OneToOneTargetTestModel(models.Model): + text = models.CharField(max_length=100) + + +class OneToOneSourceTestModel(models.Model): + target = models.OneToOneField(OneToOneTargetTestModel, primary_key=True) + + +class TestModelFieldValues(TestCase): + def test_model_field(self): + class ExampleSerializer(serializers.ModelSerializer): + class Meta: + model = OneToOneSourceTestModel + fields = ('target',) + + target = OneToOneTargetTestModel(id=1, text='abc') + source = OneToOneSourceTestModel(target=target) + serializer = ExampleSerializer(source) + self.assertEqual(serializer.data, {'target': 1}) From 19b415ec25089d16d7b78c99712522adf6a5ea02 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 26 Jul 2016 16:45:27 +0100 Subject: [PATCH 172/457] Improve pagination docs. Refs #4304 [ci skip] --- docs/api-guide/pagination.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/docs/api-guide/pagination.md b/docs/api-guide/pagination.md index 0dd935ba3..088e07184 100644 --- a/docs/api-guide/pagination.md +++ b/docs/api-guide/pagination.md @@ -21,12 +21,15 @@ Pagination can be turned off by setting the pagination class to `None`. ## Setting the pagination style -The default pagination style may be set globally, using the `DEFAULT_PAGINATION_CLASS` settings key. For example, to use the built-in limit/offset pagination, you would do: +The default pagination style may be set globally, using the `DEFAULT_PAGINATION_CLASS` and `PAGE_SIZE` setting keys. For example, to use the built-in limit/offset pagination, you would do something like this: REST_FRAMEWORK = { - 'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.LimitOffsetPagination' + 'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.LimitOffsetPagination', + 'PAGE_SIZE': 100 } +Note that you need to set both the pagination class, and the page size that should be used. + You can also set the pagination class on an individual view by using the `pagination_class` attribute. Typically you'll want to use the same pagination style throughout your API, although you might want to vary individual aspects of the pagination, such as default or maximum page size, on a per-view basis. ## Modifying the pagination style @@ -109,7 +112,7 @@ To set these attributes you should override the `PageNumberPagination` class, an ## LimitOffsetPagination -This pagination style mirrors the syntax used when looking up multiple database records. The client includes both a "limit" and an +This pagination style mirrors the syntax used when looking up multiple database records. The client includes both a "limit" and an "offset" query parameter. The limit indicates the maximum number of items to return, and is equivalent to the `page_size` in other styles. The offset indicates the starting position of the query in relation to the complete set of unpaginated items. **Request**: From 351e0a4a99a6505b01718aa8926b6e466e43dcb0 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 27 Jul 2016 11:49:01 +0100 Subject: [PATCH 173/457] Fix json indent parameter. Closes #4281 (#4313) --- docs/api-guide/schemas.md | 2 +- rest_framework/response.py | 4 +++- rest_framework/routers.py | 2 ++ tests/test_negotiation.py | 13 ++++++++++++- 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/docs/api-guide/schemas.md b/docs/api-guide/schemas.md index 6585801e7..8abd74646 100644 --- a/docs/api-guide/schemas.md +++ b/docs/api-guide/schemas.md @@ -241,7 +241,7 @@ to the Open API ("Swagger") format: from openapi_codec import OpenAPICodec class SwaggerRenderer(renderers.BaseRenderer): - media_type = 'application/openapi+json;version=2.0' + media_type = 'application/openapi+json' format = 'swagger' def render(self, data, media_type=None, renderer_context=None): diff --git a/rest_framework/response.py b/rest_framework/response.py index ab8aff114..4b863cb99 100644 --- a/rest_framework/response.py +++ b/rest_framework/response.py @@ -51,9 +51,11 @@ class Response(SimpleTemplateResponse): @property def rendered_content(self): renderer = getattr(self, 'accepted_renderer', None) + accepted_media_type = getattr(self, 'accepted_media_type', None) context = getattr(self, 'renderer_context', None) assert renderer, ".accepted_renderer not set on Response" + assert accepted_media_type, ".accepted_media_type not set on Response" assert context, ".renderer_context not set on Response" context['response'] = self @@ -67,7 +69,7 @@ class Response(SimpleTemplateResponse): content_type = media_type self['Content-Type'] = content_type - ret = renderer.render(self.data, media_type, context) + ret = renderer.render(self.data, accepted_media_type, context) if isinstance(ret, six.text_type): assert charset, ( 'renderer returned unicode, and did not specify ' diff --git a/rest_framework/routers.py b/rest_framework/routers.py index 69d73e842..9561fa4db 100644 --- a/rest_framework/routers.py +++ b/rest_framework/routers.py @@ -276,6 +276,8 @@ class DefaultRouter(SimpleRouter): default_schema_renderers = [renderers.CoreJSONRenderer] def __init__(self, *args, **kwargs): + if 'schema_renderers' in kwargs: + assert 'schema_title' in kwargs, 'Missing "schema_title" argument.' self.schema_title = kwargs.pop('schema_title', None) self.schema_renderers = kwargs.pop('schema_renderers', self.default_schema_renderers) super(DefaultRouter, self).__init__(*args, **kwargs) diff --git a/tests/test_negotiation.py b/tests/test_negotiation.py index 434fba496..96ef83eab 100644 --- a/tests/test_negotiation.py +++ b/tests/test_negotiation.py @@ -10,6 +10,11 @@ from rest_framework.test import APIRequestFactory factory = APIRequestFactory() +class MockOpenAPIRenderer(BaseRenderer): + media_type = 'application/openapi+json;version=2.0' + format = 'swagger' + + class MockJSONRenderer(BaseRenderer): media_type = 'application/json' @@ -24,7 +29,7 @@ class NoCharsetSpecifiedRenderer(BaseRenderer): class TestAcceptedMediaType(TestCase): def setUp(self): - self.renderers = [MockJSONRenderer(), MockHTMLRenderer()] + self.renderers = [MockJSONRenderer(), MockHTMLRenderer(), MockOpenAPIRenderer()] self.negotiator = DefaultContentNegotiation() def select_renderer(self, request): @@ -44,3 +49,9 @@ class TestAcceptedMediaType(TestCase): request = Request(factory.get('/', HTTP_ACCEPT='application/json; indent=8')) accepted_renderer, accepted_media_type = self.select_renderer(request) self.assertEqual(accepted_media_type, 'application/json; indent=8') + + def test_client_specifies_parameter(self): + request = Request(factory.get('/', HTTP_ACCEPT='application/openapi+json;version=2.0')) + accepted_renderer, accepted_media_type = self.select_renderer(request) + self.assertEqual(accepted_media_type, 'application/openapi+json;version=2.0') + self.assertEqual(accepted_renderer.format, 'swagger') From 8ebf81b1502bee067fe842fa23442aa4bc176473 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 27 Jul 2016 13:02:48 +0100 Subject: [PATCH 174/457] Schema support should function when 'pagination_class = None' (#4314) --- rest_framework/schemas.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/schemas.py b/rest_framework/schemas.py index cf84aca74..523b2f1ec 100644 --- a/rest_framework/schemas.py +++ b/rest_framework/schemas.py @@ -278,7 +278,7 @@ class SchemaGenerator(object): if hasattr(callback, 'actions') and ('list' not in callback.actions.values()): return [] - if not hasattr(view, 'pagination_class'): + if not getattr(view, 'pagination_class', None): return [] paginator = view.pagination_class() From 3586c8a61ae0dd3424c49b50f22a7699e999bae7 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 27 Jul 2016 14:43:45 +0100 Subject: [PATCH 175/457] Set view.format_kwarg in schema generator (#4315) --- rest_framework/schemas.py | 1 + 1 file changed, 1 insertion(+) diff --git a/rest_framework/schemas.py b/rest_framework/schemas.py index 523b2f1ec..91fdc76a0 100644 --- a/rest_framework/schemas.py +++ b/rest_framework/schemas.py @@ -84,6 +84,7 @@ class SchemaGenerator(object): method = link.action.upper() view = callback.cls() view.request = clone_request(request, method) + view.format_kwarg = None try: view.check_permissions(view.request) except exceptions.APIException: From 46a870c002ff7b079fd70a7730b666d16b2ba9e1 Mon Sep 17 00:00:00 2001 From: Alexander Gaevsky Date: Wed, 27 Jul 2016 17:36:36 +0300 Subject: [PATCH 176/457] Fix schema generation for APIView, since it does not have get_serializer_class method. (#4285) --- rest_framework/schemas.py | 4 +++- tests/test_schemas.py | 42 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 1 deletion(-) diff --git a/rest_framework/schemas.py b/rest_framework/schemas.py index 91fdc76a0..cdf2d5f3e 100644 --- a/rest_framework/schemas.py +++ b/rest_framework/schemas.py @@ -112,7 +112,6 @@ class SchemaGenerator(object): for pattern in patterns: path_regex = prefix + pattern.regex.pattern - if isinstance(pattern, RegexURLPattern): path = self.get_path(path_regex) callback = pattern.callback @@ -254,6 +253,9 @@ class SchemaGenerator(object): fields = [] + if not (hasattr(view, 'get_serializer_class') and callable(getattr(view, 'get_serializer_class'))): + return [] + serializer_class = view.get_serializer_class() serializer = serializer_class() diff --git a/tests/test_schemas.py b/tests/test_schemas.py index 7d3308ed9..a32b8a117 100644 --- a/tests/test_schemas.py +++ b/tests/test_schemas.py @@ -5,8 +5,11 @@ from django.test import TestCase, override_settings from rest_framework import filters, pagination, permissions, serializers from rest_framework.compat import coreapi +from rest_framework.response import Response from rest_framework.routers import DefaultRouter +from rest_framework.schemas import SchemaGenerator from rest_framework.test import APIClient +from rest_framework.views import APIView from rest_framework.viewsets import ModelViewSet @@ -31,11 +34,24 @@ class ExampleViewSet(ModelViewSet): serializer_class = ExampleSerializer +class ExampleView(APIView): + permission_classes = [permissions.IsAuthenticatedOrReadOnly] + + def get(self, request, *args, **kwargs): + return Response() + + def post(self, request, *args, **kwargs): + return Response() + + router = DefaultRouter(schema_title='Example API' if coreapi else None) router.register('example', ExampleViewSet, base_name='example') urlpatterns = [ url(r'^', include(router.urls)) ] +urlpatterns2 = [ + url(r'^example-view/$', ExampleView.as_view(), name='example-view') +] @unittest.skipUnless(coreapi, 'coreapi is not installed') @@ -135,3 +151,29 @@ class TestRouterGeneratedSchema(TestCase): } ) self.assertEqual(response.data, expected) + + +@unittest.skipUnless(coreapi, 'coreapi is not installed') +class TestSchemaGenerator(TestCase): + def test_view(self): + schema_generator = SchemaGenerator(title='Test View', patterns=urlpatterns2) + schema = schema_generator.get_schema() + expected = coreapi.Document( + url='', + title='Test View', + content={ + 'example-view': { + 'create': coreapi.Link( + url='/example-view/', + action='post', + fields=[] + ), + 'read': coreapi.Link( + url='/example-view/', + action='get', + fields=[] + ) + } + } + ) + self.assertEquals(schema, expected) From 1acbc29d580e7f36552c838d83ec3b80419d51da Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 27 Jul 2016 15:39:46 +0100 Subject: [PATCH 177/457] Minor style tweak. [ci skip] --- rest_framework/schemas.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rest_framework/schemas.py b/rest_framework/schemas.py index cdf2d5f3e..ee99a1c45 100644 --- a/rest_framework/schemas.py +++ b/rest_framework/schemas.py @@ -251,11 +251,11 @@ class SchemaGenerator(object): if method not in ('PUT', 'PATCH', 'POST'): return [] - fields = [] - - if not (hasattr(view, 'get_serializer_class') and callable(getattr(view, 'get_serializer_class'))): + if not hasattr(view, 'get_serializer_class'): return [] + fields = [] + serializer_class = view.get_serializer_class() serializer = serializer_class() From 6a7d34ec3452d4e8534f5c9bd238405548485a7a Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 27 Jul 2016 15:40:04 +0100 Subject: [PATCH 178/457] Unique together checks should apply to fields that are read only, but have a default. (#4316) --- rest_framework/serializers.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 8c39202f4..d5e6b66ed 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -1396,9 +1396,8 @@ class ModelSerializer(Serializer): # cannot map to a field, and must be a traversal, so we're not # including those. field_names = { - field.source for field in self.fields.values() + field.source for field in self._writable_fields if (field.source != '*') and ('.' not in field.source) - and not field.read_only } # Note that we make sure to check `unique_together` both on the From 061e0ed0841274da930f61838c60af1324ea04bc Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 28 Jul 2016 12:08:34 +0100 Subject: [PATCH 179/457] Added url and schema_url arguments (#4321) --- docs/api-guide/schemas.md | 20 +++++++++++++++++--- rest_framework/compat.py | 6 ++++++ rest_framework/routers.py | 12 ++++++++---- rest_framework/schemas.py | 12 ++++++++---- 4 files changed, 39 insertions(+), 11 deletions(-) diff --git a/docs/api-guide/schemas.md b/docs/api-guide/schemas.md index 8abd74646..848e57420 100644 --- a/docs/api-guide/schemas.md +++ b/docs/api-guide/schemas.md @@ -128,9 +128,11 @@ that include the Core JSON media type in their `Accept` header. This is a great zero-configuration option for when you want to get up and running really quickly. -The only other available option to `DefaultRouter` is `schema_renderers`, which -may be used to pass the set of renderer classes that can be used to render -schema output. +The other available options to `DefaultRouter` are: + +#### schema_renderers + +May be used to pass the set of renderer classes that can be used to render schema output. from rest_framework.renderers import CoreJSONRenderer from my_custom_package import APIBlueprintRenderer @@ -139,6 +141,17 @@ schema output. CoreJSONRenderer, APIBlueprintRenderer ]) +#### schema_url + +May be used to pass the root URL for the schema. This can either be used to ensure that +the schema URLs include a canonical hostname and schema, or to ensure that all the +schema URLs include a path prefix. + + router = DefaultRouter( + schema_title='Server Monitoring API', + schema_url='https://www.example.org/api/' + ) + If you want more flexibility over the schema output then you'll need to consider using `SchemaGenerator` instead. @@ -264,6 +277,7 @@ Typically you'll instantiate `SchemaGenerator` with a single argument, like so: Arguments: * `title` - The name of the API. **required** +* `url` - The root URL of the API schema. This option is not required unless the schema is included under path prefix. * `patterns` - A list of URLs to inspect when generating the schema. Defaults to the project's URL conf. * `urlconf` - A URL conf module name to use when generating the schema. Defaults to `settings.ROOT_URLCONF`. diff --git a/rest_framework/compat.py b/rest_framework/compat.py index 94f64265a..3143e7654 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -23,6 +23,12 @@ except ImportError: from django.utils import importlib # Will be removed in Django 1.9 +try: + import urlparse # Python 2.x +except ImportError: + import urllib.parse as urlparse + + def unicode_repr(instance): # Get the repr of an instance, but ensure it is a unicode string # on both python 3 (already the case) and 2 (not the case). diff --git a/rest_framework/routers.py b/rest_framework/routers.py index 9561fa4db..099c56d6c 100644 --- a/rest_framework/routers.py +++ b/rest_framework/routers.py @@ -278,11 +278,14 @@ class DefaultRouter(SimpleRouter): def __init__(self, *args, **kwargs): if 'schema_renderers' in kwargs: assert 'schema_title' in kwargs, 'Missing "schema_title" argument.' + if 'schema_url' in kwargs: + assert 'schema_title' in kwargs, 'Missing "schema_title" argument.' self.schema_title = kwargs.pop('schema_title', None) + self.schema_url = kwargs.pop('schema_url', None) self.schema_renderers = kwargs.pop('schema_renderers', self.default_schema_renderers) super(DefaultRouter, self).__init__(*args, **kwargs) - def get_api_root_view(self, schema_urls=None): + def get_api_root_view(self, api_urls=None): """ Return a view to use as the API root. """ @@ -294,11 +297,12 @@ class DefaultRouter(SimpleRouter): view_renderers = list(api_settings.DEFAULT_RENDERER_CLASSES) schema_media_types = [] - if schema_urls and self.schema_title: + if api_urls and self.schema_title: view_renderers += list(self.schema_renderers) schema_generator = SchemaGenerator( title=self.schema_title, - patterns=schema_urls + url=self.schema_url, + patterns=api_urls ) schema_media_types = [ renderer.media_type @@ -347,7 +351,7 @@ class DefaultRouter(SimpleRouter): urls = super(DefaultRouter, self).get_urls() if self.include_root_view: - view = self.get_api_root_view(schema_urls=urls) + view = self.get_api_root_view(api_urls=urls) root_url = url(r'^$', view, name=self.root_view_name) urls.append(root_url) diff --git a/rest_framework/schemas.py b/rest_framework/schemas.py index ee99a1c45..41dc82da1 100644 --- a/rest_framework/schemas.py +++ b/rest_framework/schemas.py @@ -6,7 +6,7 @@ from django.core.urlresolvers import RegexURLPattern, RegexURLResolver from django.utils import six from rest_framework import exceptions, serializers -from rest_framework.compat import coreapi, uritemplate +from rest_framework.compat import coreapi, uritemplate, urlparse from rest_framework.request import clone_request from rest_framework.views import APIView @@ -57,7 +57,7 @@ class SchemaGenerator(object): 'delete': 'destroy', } - def __init__(self, title=None, patterns=None, urlconf=None): + def __init__(self, title=None, url=None, patterns=None, urlconf=None): assert coreapi, '`coreapi` must be installed for schema support.' if patterns is None and urlconf is not None: @@ -70,7 +70,11 @@ class SchemaGenerator(object): urls = import_module(settings.ROOT_URLCONF) patterns = urls.urlpatterns + if url and not url.endswith('/'): + url += '/' + self.title = title + self.url = url self.endpoints = self.get_api_endpoints(patterns) def get_schema(self, request=None): @@ -102,7 +106,7 @@ class SchemaGenerator(object): insert_into(content, key, link) # Return the schema document. - return coreapi.Document(title=self.title, content=content) + return coreapi.Document(title=self.title, content=content, url=self.url) def get_api_endpoints(self, patterns, prefix=''): """ @@ -203,7 +207,7 @@ class SchemaGenerator(object): encoding = None return coreapi.Link( - url=path, + url=urlparse.urljoin(self.url, path), action=method.lower(), encoding=encoding, fields=fields From 306726d9e8645aeb9528a3f6c6674d0fe5471374 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 28 Jul 2016 12:25:21 +0100 Subject: [PATCH 180/457] Improve datetime format docs (#4322) --- docs/api-guide/fields.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/api-guide/fields.md b/docs/api-guide/fields.md index f95608afb..a7ad4f70c 100644 --- a/docs/api-guide/fields.md +++ b/docs/api-guide/fields.md @@ -290,9 +290,9 @@ A date and time representation. Corresponds to `django.db.models.fields.DateTimeField`. -**Signature:** `DateTimeField(format=None, input_formats=None)` +**Signature:** `DateTimeField(format=api_settings.DATETIME_FORMAT, input_formats=None)` -* `format` - A string representing the output format. If not specified, this defaults to the same value as the `DATETIME_FORMAT` settings key, which will be `'iso-8601'` unless set. Setting to a format string indicates that `to_representation` return values should be coerced to string output. Format strings are described below. Setting this value to `None` indicates that Python `datetime` objects should be returned by `to_representation`. In this case the datetime encoding will be determined by the renderer. +* `format` - A string representing the output format. If not specified, this defaults to the same value as the `DATETIME_FORMAT` settings key, which will be `'iso-8601'` unless set. Setting to a format string indicates that `to_representation` return values should be coerced to string output. Format strings are described below. Setting this value to `None` indicates that Python `datetime` objects should be returned by `to_representation`. In this case the datetime encoding will be determined by the renderer. * `input_formats` - A list of strings representing the input formats which may be used to parse the date. If not specified, the `DATETIME_INPUT_FORMATS` setting will be used, which defaults to `['iso-8601']`. #### `DateTimeField` format strings. @@ -321,7 +321,7 @@ A date representation. Corresponds to `django.db.models.fields.DateField` -**Signature:** `DateField(format=None, input_formats=None)` +**Signature:** `DateField(format=api_settings.DATE_FORMAT, input_formats=None)` * `format` - A string representing the output format. If not specified, this defaults to the same value as the `DATE_FORMAT` settings key, which will be `'iso-8601'` unless set. Setting to a format string indicates that `to_representation` return values should be coerced to string output. Format strings are described below. Setting this value to `None` indicates that Python `date` objects should be returned by `to_representation`. In this case the date encoding will be determined by the renderer. * `input_formats` - A list of strings representing the input formats which may be used to parse the date. If not specified, the `DATE_INPUT_FORMATS` setting will be used, which defaults to `['iso-8601']`. @@ -336,7 +336,7 @@ A time representation. Corresponds to `django.db.models.fields.TimeField` -**Signature:** `TimeField(format=None, input_formats=None)` +**Signature:** `TimeField(format=api_settings.TIME_FORMAT, input_formats=None)` * `format` - A string representing the output format. If not specified, this defaults to the same value as the `TIME_FORMAT` settings key, which will be `'iso-8601'` unless set. Setting to a format string indicates that `to_representation` return values should be coerced to string output. Format strings are described below. Setting this value to `None` indicates that Python `time` objects should be returned by `to_representation`. In this case the time encoding will be determined by the renderer. * `input_formats` - A list of strings representing the input formats which may be used to parse the date. If not specified, the `TIME_INPUT_FORMATS` setting will be used, which defaults to `['iso-8601']`. From e407dc7f019120540f57dc9a37bcc53a99ff2d9d Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 28 Jul 2016 12:50:51 +0100 Subject: [PATCH 181/457] Added root_renderers argument (#4323) --- docs/api-guide/schemas.md | 4 ++++ rest_framework/routers.py | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/docs/api-guide/schemas.md b/docs/api-guide/schemas.md index 848e57420..7f8af723e 100644 --- a/docs/api-guide/schemas.md +++ b/docs/api-guide/schemas.md @@ -155,6 +155,10 @@ schema URLs include a path prefix. If you want more flexibility over the schema output then you'll need to consider using `SchemaGenerator` instead. +#### root_renderers + +May be used to pass the set of renderer classes that can be used to render the API root endpoint. + ## Using SchemaGenerator The most common way to add a schema to your API is to use the `SchemaGenerator` diff --git a/rest_framework/routers.py b/rest_framework/routers.py index 099c56d6c..4eec70bda 100644 --- a/rest_framework/routers.py +++ b/rest_framework/routers.py @@ -283,6 +283,10 @@ class DefaultRouter(SimpleRouter): self.schema_title = kwargs.pop('schema_title', None) self.schema_url = kwargs.pop('schema_url', None) self.schema_renderers = kwargs.pop('schema_renderers', self.default_schema_renderers) + if 'root_renderers' in kwargs: + self.root_renderers = kwargs.pop('root_renderers') + else: + self.root_renderers = list(api_settings.DEFAULT_RENDERER_CLASSES) super(DefaultRouter, self).__init__(*args, **kwargs) def get_api_root_view(self, api_urls=None): @@ -294,7 +298,7 @@ class DefaultRouter(SimpleRouter): for prefix, viewset, basename in self.registry: api_root_dict[prefix] = list_name.format(basename=basename) - view_renderers = list(api_settings.DEFAULT_RENDERER_CLASSES) + view_renderers = list(self.root_renderers) schema_media_types = [] if api_urls and self.schema_title: From 449ec1d724987885caa295e97ff98a50a06c718c Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 28 Jul 2016 13:34:35 +0100 Subject: [PATCH 182/457] Version 3.4.1 [ci skip] (#4326) --- docs/topics/release-notes.md | 47 ++++++++++++++++++++++++++++++++++++ rest_framework/__init__.py | 2 +- 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index 5bfdad09b..831bf3446 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -40,6 +40,24 @@ You can determine your currently installed version using `pip freeze`: ## 3.4.x series + ### 3.4.1 + + **Date**: [28th July 2016][3.4.1-milestone] + +* Added `root_renderers` argument to `DefaultRouter`. ([#4323][gh4323], [#4268][gh4268]) +* Added `url` and `schema_url` arguments. ([#4321][gh4321], [#4308][gh4308], [#4305][gh4305]) +* Unique together checks should apply to read-only fields which have a default. ([#4316][gh4316], [#4294][gh4294]) +* Set view.format_kwarg in schema generator. ([#4293][gh4293], [#4315][gh4315]) +* Fix schema generator for views with `pagination_class = None`. ([#4314][gh4314], [#4289][gh4289]) +* Fix schema generator for views with no `get_serializer_class`. ([#4265][gh4265], [#4285][gh4285]) +* Fixes for media type parameters in `Accept` and `Content-Type` headers. ([#4287][gh4287], [#4313][gh4313], [#4281][gh4281]) +* Use verbose_name instead of object_name in error messages. ([#4299][gh4299]) +* Minor version update to Twitter Bootstrap. ([#4307][gh4307]) +* SearchFilter raises error when using with related field. ([#4302][gh4302], [#4303][gh4303], [#4298][gh4298]) +* Adding support for RFC 4918 status codes. ([#4291][gh4291]) +* Add LICENSE.md to the built wheel. ([#4270][gh4270]) +* Serializing "complex" field returns None instead of the value since 3.4 ([#4272][gh4272], [#4273][gh4273], [#4288][gh4288]) + ### 3.4.0 **Date**: [14th July 2016][3.4.0-milestone] @@ -495,6 +513,7 @@ For older release notes, [please see the version 2.x documentation][old-release- [3.3.2-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.3.2+Release%22 [3.3.3-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.3.3+Release%22 [3.4.0-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.4.0+Release%22 +[3.4.1-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.4.1+Release%22 [gh2013]: https://github.com/tomchristie/django-rest-framework/issues/2013 @@ -896,3 +915,31 @@ For older release notes, [please see the version 2.x documentation][old-release- [gh4255]: https://github.com/tomchristie/django-rest-framework/issues/4255 [gh4256]: https://github.com/tomchristie/django-rest-framework/issues/4256 [gh4259]: https://github.com/tomchristie/django-rest-framework/issues/4259 + + +[gh4323]: https://github.com/tomchristie/django-rest-framework/issues/4323 +[gh4268]: https://github.com/tomchristie/django-rest-framework/issues/4268 +[gh4321]: https://github.com/tomchristie/django-rest-framework/issues/4321 +[gh4308]: https://github.com/tomchristie/django-rest-framework/issues/4308 +[gh4305]: https://github.com/tomchristie/django-rest-framework/issues/4305 +[gh4316]: https://github.com/tomchristie/django-rest-framework/issues/4316 +[gh4294]: https://github.com/tomchristie/django-rest-framework/issues/4294 +[gh4293]: https://github.com/tomchristie/django-rest-framework/issues/4293 +[gh4315]: https://github.com/tomchristie/django-rest-framework/issues/4315 +[gh4314]: https://github.com/tomchristie/django-rest-framework/issues/4314 +[gh4289]: https://github.com/tomchristie/django-rest-framework/issues/4289 +[gh4265]: https://github.com/tomchristie/django-rest-framework/issues/4265 +[gh4285]: https://github.com/tomchristie/django-rest-framework/issues/4285 +[gh4287]: https://github.com/tomchristie/django-rest-framework/issues/4287 +[gh4313]: https://github.com/tomchristie/django-rest-framework/issues/4313 +[gh4281]: https://github.com/tomchristie/django-rest-framework/issues/4281 +[gh4299]: https://github.com/tomchristie/django-rest-framework/issues/4299 +[gh4307]: https://github.com/tomchristie/django-rest-framework/issues/4307 +[gh4302]: https://github.com/tomchristie/django-rest-framework/issues/4302 +[gh4303]: https://github.com/tomchristie/django-rest-framework/issues/4303 +[gh4298]: https://github.com/tomchristie/django-rest-framework/issues/4298 +[gh4291]: https://github.com/tomchristie/django-rest-framework/issues/4291 +[gh4270]: https://github.com/tomchristie/django-rest-framework/issues/4270 +[gh4272]: https://github.com/tomchristie/django-rest-framework/issues/4272 +[gh4273]: https://github.com/tomchristie/django-rest-framework/issues/4273 +[gh4288]: https://github.com/tomchristie/django-rest-framework/issues/4288 diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py index ab1a16597..5c61f8d7f 100644 --- a/rest_framework/__init__.py +++ b/rest_framework/__init__.py @@ -8,7 +8,7 @@ ______ _____ _____ _____ __ """ __title__ = 'Django REST framework' -__version__ = '3.4.0' +__version__ = '3.4.1' __author__ = 'Tom Christie' __license__ = 'BSD 2-Clause' __copyright__ = 'Copyright 2011-2016 Tom Christie' From 48a2f084aa2a616673c9adc5786f710acdc97d22 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 28 Jul 2016 13:38:05 +0100 Subject: [PATCH 183/457] Minor docs tweak [ci skip] --- docs/topics/release-notes.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index 831bf3446..025231ccf 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -40,9 +40,9 @@ You can determine your currently installed version using `pip freeze`: ## 3.4.x series - ### 3.4.1 +### 3.4.1 - **Date**: [28th July 2016][3.4.1-milestone] +**Date**: [28th July 2016][3.4.1-milestone] * Added `root_renderers` argument to `DefaultRouter`. ([#4323][gh4323], [#4268][gh4268]) * Added `url` and `schema_url` arguments. ([#4321][gh4321], [#4308][gh4308], [#4305][gh4305]) From 5b071ab35e9f3b1d3f06e90741ded0e10e8a1651 Mon Sep 17 00:00:00 2001 From: Jaap Roes Date: Mon, 1 Aug 2016 13:05:47 +0200 Subject: [PATCH 184/457] Remove note about Django 1.3 (#4334) Remove note about Django 1.3 --- docs/api-guide/filtering.md | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/api-guide/filtering.md b/docs/api-guide/filtering.md index 8664dcc8a..0ccd51dd3 100644 --- a/docs/api-guide/filtering.md +++ b/docs/api-guide/filtering.md @@ -241,7 +241,6 @@ For more details on using filter sets see the [django-filter documentation][djan * By default filtering is not enabled. If you want to use `DjangoFilterBackend` remember to make sure it is installed by using the `'DEFAULT_FILTER_BACKENDS'` setting. * When using boolean fields, you should use the values `True` and `False` in the URL query parameters, rather than `0`, `1`, `true` or `false`. (The allowed boolean values are currently hardwired in Django's [NullBooleanSelect implementation][nullbooleanselect].) * `django-filter` supports filtering across relationships, using Django's double-underscore syntax. -* For Django 1.3 support, make sure to install `django-filter` version 0.5.4, as later versions drop support for 1.3. --- From e997713313c36808ac7052a218b253087622e179 Mon Sep 17 00:00:00 2001 From: jsurloppe Date: Mon, 1 Aug 2016 15:14:55 +0200 Subject: [PATCH 185/457] urljoin with leading slash remove part of path (#4332) --- rest_framework/schemas.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rest_framework/schemas.py b/rest_framework/schemas.py index 41dc82da1..02960083c 100644 --- a/rest_framework/schemas.py +++ b/rest_framework/schemas.py @@ -206,6 +206,9 @@ class SchemaGenerator(object): else: encoding = None + if self.url and path.startswith('/'): + path = path[1:] + return coreapi.Link( url=urlparse.urljoin(self.url, path), action=method.lower(), From aa349fe76729dbea1b8becf1846ce58c70871f35 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 1 Aug 2016 16:14:26 +0100 Subject: [PATCH 186/457] Handle non-string input for IP fields (#4338) --- rest_framework/fields.py | 5 ++++- tests/test_fields.py | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 46d7ed09b..69cf9740b 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -804,7 +804,10 @@ class IPAddressField(CharField): self.validators.extend(validators) def to_internal_value(self, data): - if data and ':' in data: + if not isinstance(data, six.string_types): + self.fail('invalid', value=data) + + if ':' in data: try: if self.protocol in ('both', 'ipv6'): return clean_ipv6_address(data, self.unpack_ipv4) diff --git a/tests/test_fields.py b/tests/test_fields.py index 1149cc4b3..24ff25588 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -663,6 +663,7 @@ class TestIPAddressField(FieldValues): '127.122.111.2231': ['Enter a valid IPv4 or IPv6 address.'], '2001:::9652': ['Enter a valid IPv4 or IPv6 address.'], '2001:0db8:85a3:0042:1000:8a2e:0370:73341': ['Enter a valid IPv4 or IPv6 address.'], + 1000: ['Enter a valid IPv4 or IPv6 address.'], } outputs = {} field = serializers.IPAddressField() From 46a44e52aa8a0eae82cc9c1e290a83ecf156f81a Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 1 Aug 2016 17:15:41 +0100 Subject: [PATCH 187/457] Quantize incoming digitals (#4339) --- rest_framework/fields.py | 5 +++-- tests/test_fields.py | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 69cf9740b..cbf12010c 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -955,7 +955,7 @@ class DecimalField(Field): if value in (decimal.Decimal('Inf'), decimal.Decimal('-Inf')): self.fail('invalid') - return self.validate_precision(value) + return self.quantize(self.validate_precision(value)) def validate_precision(self, value): """ @@ -1018,7 +1018,8 @@ class DecimalField(Field): context.prec = self.max_digits return value.quantize( decimal.Decimal('.1') ** self.decimal_places, - context=context) + context=context + ) # Date & time fields... diff --git a/tests/test_fields.py b/tests/test_fields.py index 24ff25588..105a51973 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -912,6 +912,26 @@ class TestLocalizedDecimalField(TestCase): self.assertTrue(isinstance(field.to_representation(Decimal('1.1')), six.string_types)) +class TestQuantizedValueForDecimal(TestCase): + def test_int_quantized_value_for_decimal(self): + field = serializers.DecimalField(max_digits=4, decimal_places=2) + value = field.to_internal_value(12).as_tuple() + expected_digit_tuple = (0, (1, 2, 0, 0), -2) + self.assertEqual(value, expected_digit_tuple) + + def test_string_quantized_value_for_decimal(self): + field = serializers.DecimalField(max_digits=4, decimal_places=2) + value = field.to_internal_value('12').as_tuple() + expected_digit_tuple = (0, (1, 2, 0, 0), -2) + self.assertEqual(value, expected_digit_tuple) + + def test_part_precision_string_quantized_value_for_decimal(self): + field = serializers.DecimalField(max_digits=4, decimal_places=2) + value = field.to_internal_value('12.0').as_tuple() + expected_digit_tuple = (0, (1, 2, 0, 0), -2) + self.assertEqual(value, expected_digit_tuple) + + class TestNoDecimalPlaces(FieldValues): valid_inputs = { '0.12345': Decimal('0.12345'), From 3ef3fee92627d832962d1e5aed02c19a3eaa554b Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 1 Aug 2016 18:44:58 +0100 Subject: [PATCH 188/457] Descriptive error from FileUploadParser when filename not included. (#4340) * Descriptive error from FileUploadParser when filename not included. * Consistent handling of upload filenames --- rest_framework/parsers.py | 15 +++++++++++---- tests/test_parsers.py | 25 ++++++++++++++++++++++--- 2 files changed, 33 insertions(+), 7 deletions(-) diff --git a/rest_framework/parsers.py b/rest_framework/parsers.py index ab74a6e58..238382364 100644 --- a/rest_framework/parsers.py +++ b/rest_framework/parsers.py @@ -118,6 +118,10 @@ class FileUploadParser(BaseParser): Parser for file upload data. """ media_type = '*/*' + errors = { + 'unhandled': 'FileUpload parse error - none of upload handlers can handle the stream', + 'no_filename': 'Missing filename. Request should include a Content-Disposition header with a filename parameter.', + } def parse(self, stream, media_type=None, parser_context=None): """ @@ -134,6 +138,9 @@ class FileUploadParser(BaseParser): upload_handlers = request.upload_handlers filename = self.get_filename(stream, media_type, parser_context) + if not filename: + raise ParseError(self.errors['no_filename']) + # Note that this code is extracted from Django's handling of # file uploads in MultiPartParser. content_type = meta.get('HTTP_CONTENT_TYPE', @@ -146,7 +153,7 @@ class FileUploadParser(BaseParser): # See if the handler will want to take care of the parsing. for handler in upload_handlers: - result = handler.handle_raw_input(None, + result = handler.handle_raw_input(stream, meta, content_length, None, @@ -178,10 +185,10 @@ class FileUploadParser(BaseParser): for index, handler in enumerate(upload_handlers): file_obj = handler.file_complete(counters[index]) - if file_obj: + if file_obj is not None: return DataAndFiles({}, {'file': file_obj}) - raise ParseError("FileUpload parse error - " - "none of upload handlers can handle the stream") + + raise ParseError(self.errors['unhandled']) def get_filename(self, stream, media_type, parser_context): """ diff --git a/tests/test_parsers.py b/tests/test_parsers.py index 1e0f2e17f..f3af6817f 100644 --- a/tests/test_parsers.py +++ b/tests/test_parsers.py @@ -2,8 +2,11 @@ from __future__ import unicode_literals +import pytest from django import forms -from django.core.files.uploadhandler import MemoryFileUploadHandler +from django.core.files.uploadhandler import ( + MemoryFileUploadHandler, TemporaryFileUploadHandler +) from django.test import TestCase from django.utils.six.moves import StringIO @@ -63,8 +66,9 @@ class TestFileUploadParser(TestCase): parser = FileUploadParser() self.stream.seek(0) self.parser_context['request'].META['HTTP_CONTENT_DISPOSITION'] = '' - with self.assertRaises(ParseError): + with pytest.raises(ParseError) as excinfo: parser.parse(self.stream, None, self.parser_context) + assert str(excinfo.value) == 'Missing filename. Request should include a Content-Disposition header with a filename parameter.' def test_parse_missing_filename_multiple_upload_handlers(self): """ @@ -78,8 +82,23 @@ class TestFileUploadParser(TestCase): MemoryFileUploadHandler() ) self.parser_context['request'].META['HTTP_CONTENT_DISPOSITION'] = '' - with self.assertRaises(ParseError): + with pytest.raises(ParseError) as excinfo: parser.parse(self.stream, None, self.parser_context) + assert str(excinfo.value) == 'Missing filename. Request should include a Content-Disposition header with a filename parameter.' + + def test_parse_missing_filename_large_file(self): + """ + Parse raw file upload when filename is missing with TemporaryFileUploadHandler. + """ + parser = FileUploadParser() + self.stream.seek(0) + self.parser_context['request'].upload_handlers = ( + TemporaryFileUploadHandler(), + ) + self.parser_context['request'].META['HTTP_CONTENT_DISPOSITION'] = '' + with pytest.raises(ParseError) as excinfo: + parser.parse(self.stream, None, self.parser_context) + assert str(excinfo.value) == 'Missing filename. Request should include a Content-Disposition header with a filename parameter.' def test_get_filename(self): parser = FileUploadParser() From 296e47a9f8f5303d7862b68db7277aa87886e8a9 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 2 Aug 2016 10:23:56 +0100 Subject: [PATCH 189/457] Update from Django 1.10 beta to Django 1.10 (#4344) --- tox.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index 89655aee2..1e8a7e5c4 100644 --- a/tox.ini +++ b/tox.ini @@ -16,8 +16,8 @@ setenv = PYTHONWARNINGS=once deps = django18: Django==1.8.14 - django19: Django==1.9.8 - django110: Django==1.10rc1 + django19: Django==1.9.9 + django110: Django==1.10 djangomaster: https://github.com/django/django/archive/master.tar.gz -rrequirements/requirements-testing.txt -rrequirements/requirements-optionals.txt From e37619f7410bcfc472db56635aa573b33f83e92a Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 2 Aug 2016 13:05:12 +0100 Subject: [PATCH 190/457] Serializer defaults should not be included in partial updates. (#4346) Serializer default values should not be included in partial updates --- docs/api-guide/fields.md | 4 +++- rest_framework/fields.py | 3 ++- tests/test_serializer.py | 28 ++++++++++++++++++++++++++++ 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/docs/api-guide/fields.md b/docs/api-guide/fields.md index a7ad4f70c..4b566d37e 100644 --- a/docs/api-guide/fields.md +++ b/docs/api-guide/fields.md @@ -49,7 +49,9 @@ Defaults to `False` ### `default` -If set, this gives the default value that will be used for the field if no input value is supplied. If not set the default behavior is to not populate the attribute at all. +If set, this gives the default value that will be used for the field if no input value is supplied. If not set the default behaviour is to not populate the attribute at all. + +The `default` is not applied during partial update operations. In the partial update case only fields that are provided in the incoming data will have a validated value returned. May be set to a function or other callable, in which case the value will be evaluated each time it is used. When called, it will receive no arguments. If the callable has a `set_context` method, that will be called each time before getting the value with the field instance as only argument. This works the same way as for [validators](validators.md#using-set_context). diff --git a/rest_framework/fields.py b/rest_framework/fields.py index cbf12010c..704dbaf3f 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -435,7 +435,8 @@ class Field(object): return `empty`, indicating that no value should be set in the validated data for this field. """ - if self.default is empty: + if self.default is empty or getattr(self.root, 'partial', False): + # No default, or this is a partial update. raise SkipField() if callable(self.default): if hasattr(self.default, 'set_context'): diff --git a/tests/test_serializer.py b/tests/test_serializer.py index 741c6ab17..4e9080909 100644 --- a/tests/test_serializer.py +++ b/tests/test_serializer.py @@ -309,3 +309,31 @@ class TestCacheSerializerData: pickled = pickle.dumps(serializer.data) data = pickle.loads(pickled) assert data == {'field1': 'a', 'field2': 'b'} + + +class TestDefaultInclusions: + def setup(self): + class ExampleSerializer(serializers.Serializer): + char = serializers.CharField(read_only=True, default='abc') + integer = serializers.IntegerField() + self.Serializer = ExampleSerializer + + def test_default_should_included_on_create(self): + serializer = self.Serializer(data={'integer': 456}) + assert serializer.is_valid() + assert serializer.validated_data == {'char': 'abc', 'integer': 456} + assert serializer.errors == {} + + def test_default_should_be_included_on_update(self): + instance = MockObject(char='def', integer=123) + serializer = self.Serializer(instance, data={'integer': 456}) + assert serializer.is_valid() + assert serializer.validated_data == {'char': 'abc', 'integer': 456} + assert serializer.errors == {} + + def test_default_should_not_be_included_on_partial_update(self): + instance = MockObject(char='def', integer=123) + serializer = self.Serializer(instance, data={'integer': 456}, partial=True) + assert serializer.is_valid() + assert serializer.validated_data == {'integer': 456} + assert serializer.errors == {} From 9f5e841daf8e086de2b2b90153356a52ce783283 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Fleschenberg?= Date: Tue, 2 Aug 2016 14:11:41 +0200 Subject: [PATCH 191/457] Change template context generation in TemplateHTMLRenderer (#4236) - Change the name of ``resolve_context()`` to ``get_template_context()``. - Pass the renderer context to this method, to give subclasses more flexibility when overriding. --- rest_framework/renderers.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index e313998d1..ef7747eaf 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -166,13 +166,14 @@ class TemplateHTMLRenderer(BaseRenderer): template_names = self.get_template_names(response, view) template = self.resolve_template(template_names) - context = self.resolve_context(data, request, response) + context = self.get_template_context(data, renderer_context) return template_render(template, context, request=request) def resolve_template(self, template_names): return loader.select_template(template_names) - def resolve_context(self, data, request, response): + def get_template_context(self, data, renderer_context): + response = renderer_context['response'] if response.exception: data['status_code'] = response.status_code return data From bda16a518a03ca79c912c8b90adfce3626cf1069 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 2 Aug 2016 13:33:14 +0100 Subject: [PATCH 192/457] Dedent tabs. (#4347) --- rest_framework/utils/formatting.py | 13 +++++++++++-- tests/test_description.py | 5 +++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/rest_framework/utils/formatting.py b/rest_framework/utils/formatting.py index 67aabd3f1..ca5b33c5e 100644 --- a/rest_framework/utils/formatting.py +++ b/rest_framework/utils/formatting.py @@ -32,13 +32,22 @@ def dedent(content): unindented text on the initial line. """ content = force_text(content) - whitespace_counts = [len(line) - len(line.lstrip(' ')) - for line in content.splitlines()[1:] if line.lstrip()] + whitespace_counts = [ + len(line) - len(line.lstrip(' ')) + for line in content.splitlines()[1:] if line.lstrip() + ] + tab_counts = [ + len(line) - len(line.lstrip('\t')) + for line in content.splitlines()[1:] if line.lstrip() + ] # unindent the content if needed if whitespace_counts: whitespace_pattern = '^' + (' ' * min(whitespace_counts)) content = re.sub(re.compile(whitespace_pattern, re.MULTILINE), '', content) + elif tab_counts: + whitespace_pattern = '^' + ('\t' * min(whitespace_counts)) + content = re.sub(re.compile(whitespace_pattern, re.MULTILINE), '', content) return content.strip() diff --git a/tests/test_description.py b/tests/test_description.py index 1683e106b..fcb88287b 100644 --- a/tests/test_description.py +++ b/tests/test_description.py @@ -6,6 +6,7 @@ from django.test import TestCase from django.utils.encoding import python_2_unicode_compatible from rest_framework.compat import apply_markdown +from rest_framework.utils.formatting import dedent from rest_framework.views import APIView @@ -120,3 +121,7 @@ class TestViewNamesAndDescriptions(TestCase): gte_21_match = apply_markdown(DESCRIPTION) == MARKED_DOWN_gte_21 lt_21_match = apply_markdown(DESCRIPTION) == MARKED_DOWN_lt_21 self.assertTrue(gte_21_match or lt_21_match) + + +def test_dedent_tabs(): + assert dedent("\tfirst string\n\n\tsecond string") == 'first string\n\n\tsecond string' From 5500b265bceb1d964725d3fd13f60429b834dbf4 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 2 Aug 2016 14:14:36 +0100 Subject: [PATCH 193/457] Test cases for DictField with allow_null options (#4348) --- tests/test_fields.py | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/tests/test_fields.py b/tests/test_fields.py index 105a51973..92f4548e5 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -1594,6 +1594,29 @@ class TestDictField(FieldValues): "Remove `source=` from the field declaration." ) + def test_allow_null(self): + """ + If `allow_null=True` then `None` is a valid input. + """ + field = serializers.DictField(allow_null=True) + output = field.run_validation(None) + assert output is None + + +class TestDictFieldWithNullChild(FieldValues): + """ + Values for `ListField` with allow_null CharField as child. + """ + valid_inputs = [ + ({'a': None, 'b': '2', 3: 3}, {'a': None, 'b': '2', '3': '3'}), + ] + invalid_inputs = [ + ] + outputs = [ + ({'a': None, 'b': '2', 3: 3}, {'a': None, 'b': '2', '3': '3'}), + ] + field = serializers.DictField(child=serializers.CharField(allow_null=True)) + class TestUnvalidatedDictField(FieldValues): """ From a9a097496ec86d4b5e7db756fe51a39a57f5b370 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 2 Aug 2016 14:33:15 +0100 Subject: [PATCH 194/457] extra_kwargs takes precedence over uniqueness kwargs (#4349) --- rest_framework/serializers.py | 5 ++--- tests/test_model_serializer.py | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index d5e6b66ed..27c8cc229 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -1324,9 +1324,8 @@ class ModelSerializer(Serializer): # Update `extra_kwargs` with any new options. for key, value in uniqueness_extra_kwargs.items(): if key in extra_kwargs: - extra_kwargs[key].update(value) - else: - extra_kwargs[key] = value + value.update(extra_kwargs[key]) + extra_kwargs[key] = value return extra_kwargs, hidden_fields diff --git a/tests/test_model_serializer.py b/tests/test_model_serializer.py index 2cf6cb04c..b2d336d84 100644 --- a/tests/test_model_serializer.py +++ b/tests/test_model_serializer.py @@ -976,3 +976,22 @@ class TestModelFieldValues(TestCase): source = OneToOneSourceTestModel(target=target) serializer = ExampleSerializer(source) self.assertEqual(serializer.data, {'target': 1}) + + +class TestUniquenessOverride(TestCase): + def test_required_not_overwritten(self): + class TestModel(models.Model): + field_1 = models.IntegerField(null=True) + field_2 = models.IntegerField() + + class Meta: + unique_together = (('field_1', 'field_2'),) + + class TestSerializer(serializers.ModelSerializer): + class Meta: + model = TestModel + extra_kwargs = {'field_1': {'required': False}} + + fields = TestSerializer().fields + self.assertFalse(fields['field_1'].required) + self.assertTrue(fields['field_2'].required) From 54096dc22f255140f148906e85da5e4be0048f10 Mon Sep 17 00:00:00 2001 From: Corentin Smith Date: Thu, 4 Aug 2016 23:06:35 +0200 Subject: [PATCH 195/457] Add imports in validators docs (#4355) --- docs/api-guide/validators.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/docs/api-guide/validators.md b/docs/api-guide/validators.md index a059f1197..f04c74c3c 100644 --- a/docs/api-guide/validators.md +++ b/docs/api-guide/validators.md @@ -64,6 +64,8 @@ It takes a single required argument, and an optional `messages` argument: This validator should be applied to *serializer fields*, like so: + from rest_framework.validators import UniqueValidator + slug = SlugField( max_length=100, validators=[UniqueValidator(queryset=BlogPost.objects.all())] @@ -80,6 +82,8 @@ It has two required arguments, and a single optional `messages` argument: The validator should be applied to *serializer classes*, like so: + from rest_framework.validators import UniqueTogetherValidator + class ExampleSerializer(serializers.Serializer): # ... class Meta: @@ -114,6 +118,8 @@ These validators can be used to enforce the `unique_for_date`, `unique_for_month The validator should be applied to *serializer classes*, like so: + from rest_framework.validators import UniqueForYearValidator + class ExampleSerializer(serializers.Serializer): # ... class Meta: @@ -183,7 +189,7 @@ It takes a single argument, which is the default value or callable that should b created_at = serializers.DateTimeField( read_only=True, - default=CreateOnlyDefault(timezone.now) + default=serializers.CreateOnlyDefault(timezone.now) ) --- From aff146ae83a64676cdcaf169832c29f4132cac6a Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 5 Aug 2016 10:23:40 +0100 Subject: [PATCH 196/457] Filter HEAD out from schemas (#4357) --- rest_framework/schemas.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/schemas.py b/rest_framework/schemas.py index 02960083c..b5d2e0254 100644 --- a/rest_framework/schemas.py +++ b/rest_framework/schemas.py @@ -167,7 +167,7 @@ class SchemaGenerator(object): return [ method for method in - callback.cls().allowed_methods if method != 'OPTIONS' + callback.cls().allowed_methods if method not in ('OPTIONS', 'HEAD') ] def get_key(self, path, method, callback): From 11a2468379496a4e9ed29d84d135825a927a5595 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 5 Aug 2016 11:04:01 +0100 Subject: [PATCH 197/457] Access `request.user.is_authenticated` as property not method, under Django 1.10+ (#4358) * For Django >=1.10 use user.is_authenticated, not user.is_authenticated() --- rest_framework/compat.py | 6 ++++++ rest_framework/permissions.py | 9 ++++++--- rest_framework/throttling.py | 7 ++++--- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/rest_framework/compat.py b/rest_framework/compat.py index 3143e7654..1ab1478f1 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -122,6 +122,12 @@ def _resolve_model(obj): raise ValueError("{0} is not a Django model".format(obj)) +def is_authenticated(user): + if django.VERSION < (1, 10): + return user.is_authenticated() + return user.is_authenticated + + def get_related_model(field): if django.VERSION < (1, 9): return _resolve_model(field.rel.to) diff --git a/rest_framework/permissions.py b/rest_framework/permissions.py index 8f5de0256..dd2d35ccd 100644 --- a/rest_framework/permissions.py +++ b/rest_framework/permissions.py @@ -5,6 +5,9 @@ from __future__ import unicode_literals from django.http import Http404 +from rest_framework.compat import is_authenticated + + SAFE_METHODS = ('GET', 'HEAD', 'OPTIONS') @@ -44,7 +47,7 @@ class IsAuthenticated(BasePermission): """ def has_permission(self, request, view): - return request.user and request.user.is_authenticated() + return request.user and is_authenticated(request.user) class IsAdminUser(BasePermission): @@ -65,7 +68,7 @@ class IsAuthenticatedOrReadOnly(BasePermission): return ( request.method in SAFE_METHODS or request.user and - request.user.is_authenticated() + is_authenticated(request.user) ) @@ -127,7 +130,7 @@ class DjangoModelPermissions(BasePermission): return ( request.user and - (request.user.is_authenticated() or not self.authenticated_users_only) and + (is_authenticated(request.user) or not self.authenticated_users_only) and request.user.has_perms(perms) ) diff --git a/rest_framework/throttling.py b/rest_framework/throttling.py index 1449f501b..57f24d13f 100644 --- a/rest_framework/throttling.py +++ b/rest_framework/throttling.py @@ -8,6 +8,7 @@ import time from django.core.cache import cache as default_cache from django.core.exceptions import ImproperlyConfigured +from rest_framework.compat import is_authenticated from rest_framework.settings import api_settings @@ -173,7 +174,7 @@ class AnonRateThrottle(SimpleRateThrottle): scope = 'anon' def get_cache_key(self, request, view): - if request.user.is_authenticated(): + if is_authenticated(request.user): return None # Only throttle unauthenticated requests. return self.cache_format % { @@ -193,7 +194,7 @@ class UserRateThrottle(SimpleRateThrottle): scope = 'user' def get_cache_key(self, request, view): - if request.user.is_authenticated(): + if is_authenticated(request.user): ident = request.user.pk else: ident = self.get_ident(request) @@ -241,7 +242,7 @@ class ScopedRateThrottle(SimpleRateThrottle): Otherwise generate the unique cache key by concatenating the user id with the '.throttle_scope` property of the view. """ - if request.user.is_authenticated(): + if is_authenticated(request.user): ident = request.user.pk else: ident = self.get_ident(request) From d5178c92462f6d18337fb0d85b6f230e812ed2fb Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 5 Aug 2016 11:19:39 +0100 Subject: [PATCH 198/457] Include kwargs passed to 'as_view' when generating schemas (#4359) --- rest_framework/schemas.py | 2 ++ rest_framework/viewsets.py | 1 + tests/test_schemas.py | 20 ++++++++++++++++++++ 3 files changed, 23 insertions(+) diff --git a/rest_framework/schemas.py b/rest_framework/schemas.py index b5d2e0254..688deec88 100644 --- a/rest_framework/schemas.py +++ b/rest_framework/schemas.py @@ -195,6 +195,8 @@ class SchemaGenerator(object): Return a `coreapi.Link` instance for the given endpoint. """ view = callback.cls() + for attr, val in getattr(callback, 'initkwargs', {}).items(): + setattr(view, attr, val) fields = self.get_path_fields(path, method, callback, view) fields += self.get_serializer_fields(path, method, callback, view) diff --git a/rest_framework/viewsets.py b/rest_framework/viewsets.py index 7687448c4..2f440c567 100644 --- a/rest_framework/viewsets.py +++ b/rest_framework/viewsets.py @@ -97,6 +97,7 @@ class ViewSetMixin(object): # generation can pick out these bits of information from a # resolved URL. view.cls = cls + view.initkwargs = initkwargs view.suffix = initkwargs.get('suffix', None) view.actions = actions return csrf_exempt(view) diff --git a/tests/test_schemas.py b/tests/test_schemas.py index a32b8a117..6c02c9d23 100644 --- a/tests/test_schemas.py +++ b/tests/test_schemas.py @@ -5,6 +5,7 @@ from django.test import TestCase, override_settings from rest_framework import filters, pagination, permissions, serializers from rest_framework.compat import coreapi +from rest_framework.decorators import detail_route from rest_framework.response import Response from rest_framework.routers import DefaultRouter from rest_framework.schemas import SchemaGenerator @@ -27,12 +28,21 @@ class ExampleSerializer(serializers.Serializer): b = serializers.CharField(required=False) +class AnotherSerializer(serializers.Serializer): + c = serializers.CharField(required=True) + d = serializers.CharField(required=False) + + class ExampleViewSet(ModelViewSet): pagination_class = ExamplePagination permission_classes = [permissions.IsAuthenticatedOrReadOnly] filter_backends = [filters.OrderingFilter] serializer_class = ExampleSerializer + @detail_route(methods=['post'], serializer_class=AnotherSerializer) + def custom_action(self, request, pk): + return super(ExampleSerializer, self).retrieve(self, request) + class ExampleView(APIView): permission_classes = [permissions.IsAuthenticatedOrReadOnly] @@ -120,6 +130,16 @@ class TestRouterGeneratedSchema(TestCase): coreapi.Field('pk', required=True, location='path') ] ), + 'custom_action': coreapi.Link( + url='/example/{pk}/custom_action/', + action='post', + encoding='application/json', + fields=[ + coreapi.Field('pk', required=True, location='path'), + coreapi.Field('c', required=True, location='form'), + coreapi.Field('d', required=False, location='form'), + ] + ), 'update': coreapi.Link( url='/example/{pk}/', action='put', From f9cf22edc88a19e83b70fc72de7844c948023f44 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 5 Aug 2016 12:38:19 +0100 Subject: [PATCH 199/457] Version 3.4.2 (#4360) --- docs/topics/release-notes.md | 47 ++++++++++++++++++++++++++++++++++++ rest_framework/__init__.py | 2 +- 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index 025231ccf..7baff2277 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -40,6 +40,24 @@ You can determine your currently installed version using `pip freeze`: ## 3.4.x series +### 3.4.2 + +**Date**: [5th August 2016][3.4.2-milestone] + +Include kwargs passed to 'as_view' when generating schemas. ([#4359][gh4359], [#4330][gh4330], [#4331][gh4331]) +Access `request.user.is_authenticated` as property not method, under Django 1.10+ ([#4358][gh4358], [#4354][gh4354]) +Filter HEAD out from schemas. ([#4357][gh4357]) +extra_kwargs takes precedence over uniqueness kwargs. ([#4198][gh4198], [#4199][gh4199], [#4349][gh4349]) +Correct descriptions when tabs are used in code indentation. ([#4345][gh4345], [#4347][gh4347]) +Change template context generation in TemplateHTMLRenderer. ([#4236][gh4236]) +Serializer defaults should not be included in partial updates. ([#4346][gh4346], [#3565][gh3565]) +Consistent behavior & descriptive error from FileUploadParser when filename not included. ([#4340][gh4340], [#3610][gh3610], [#4292][gh4292], [#4296][gh4296]) +DecimalField quantizes incoming digitals. ([#4339][gh4339], [#4318][gh4318]) +Handle non-string input for IP fields. ([#4335][gh4335], [#4336][gh4336], [#4338][gh4338]) +Fix leading slash handling when Schema generation includes a root URL. ([#4332][gh4332]) +Test cases for DictField with allow_null options. ([#4348][gh4348]) +Update tests from Django 1.10 beta to Django 1.10. ([#4344][gh4344]) + ### 3.4.1 **Date**: [28th July 2016][3.4.1-milestone] @@ -514,6 +532,7 @@ For older release notes, [please see the version 2.x documentation][old-release- [3.3.3-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.3.3+Release%22 [3.4.0-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.4.0+Release%22 [3.4.1-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.4.1+Release%22 +[3.4.2-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.4.2+Release%22 [gh2013]: https://github.com/tomchristie/django-rest-framework/issues/2013 @@ -943,3 +962,31 @@ For older release notes, [please see the version 2.x documentation][old-release- [gh4272]: https://github.com/tomchristie/django-rest-framework/issues/4272 [gh4273]: https://github.com/tomchristie/django-rest-framework/issues/4273 [gh4288]: https://github.com/tomchristie/django-rest-framework/issues/4288 + + +[gh3565]: https://github.com/tomchristie/django-rest-framework/issues/3565 +[gh3610]: https://github.com/tomchristie/django-rest-framework/issues/3610 +[gh4198]: https://github.com/tomchristie/django-rest-framework/issues/4198 +[gh4199]: https://github.com/tomchristie/django-rest-framework/issues/4199 +[gh4236]: https://github.com/tomchristie/django-rest-framework/issues/4236 +[gh4292]: https://github.com/tomchristie/django-rest-framework/issues/4292 +[gh4296]: https://github.com/tomchristie/django-rest-framework/issues/4296 +[gh4318]: https://github.com/tomchristie/django-rest-framework/issues/4318 +[gh4330]: https://github.com/tomchristie/django-rest-framework/issues/4330 +[gh4331]: https://github.com/tomchristie/django-rest-framework/issues/4331 +[gh4332]: https://github.com/tomchristie/django-rest-framework/issues/4332 +[gh4335]: https://github.com/tomchristie/django-rest-framework/issues/4335 +[gh4336]: https://github.com/tomchristie/django-rest-framework/issues/4336 +[gh4338]: https://github.com/tomchristie/django-rest-framework/issues/4338 +[gh4339]: https://github.com/tomchristie/django-rest-framework/issues/4339 +[gh4340]: https://github.com/tomchristie/django-rest-framework/issues/4340 +[gh4344]: https://github.com/tomchristie/django-rest-framework/issues/4344 +[gh4345]: https://github.com/tomchristie/django-rest-framework/issues/4345 +[gh4346]: https://github.com/tomchristie/django-rest-framework/issues/4346 +[gh4347]: https://github.com/tomchristie/django-rest-framework/issues/4347 +[gh4348]: https://github.com/tomchristie/django-rest-framework/issues/4348 +[gh4349]: https://github.com/tomchristie/django-rest-framework/issues/4349 +[gh4354]: https://github.com/tomchristie/django-rest-framework/issues/4354 +[gh4357]: https://github.com/tomchristie/django-rest-framework/issues/4357 +[gh4358]: https://github.com/tomchristie/django-rest-framework/issues/4358 +[gh4359]: https://github.com/tomchristie/django-rest-framework/issues/4359 diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py index 5c61f8d7f..fb6da68ce 100644 --- a/rest_framework/__init__.py +++ b/rest_framework/__init__.py @@ -8,7 +8,7 @@ ______ _____ _____ _____ __ """ __title__ = 'Django REST framework' -__version__ = '3.4.1' +__version__ = '3.4.2' __author__ = 'Tom Christie' __license__ = 'BSD 2-Clause' __copyright__ = 'Copyright 2011-2016 Tom Christie' From 35320b1f2d07fcc20b21f5ebc71629c1fc4ebb21 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 5 Aug 2016 12:41:15 +0100 Subject: [PATCH 200/457] Add bullet points to release notes [ci skip] --- docs/topics/release-notes.md | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index 7baff2277..692af57e9 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -44,19 +44,19 @@ You can determine your currently installed version using `pip freeze`: **Date**: [5th August 2016][3.4.2-milestone] -Include kwargs passed to 'as_view' when generating schemas. ([#4359][gh4359], [#4330][gh4330], [#4331][gh4331]) -Access `request.user.is_authenticated` as property not method, under Django 1.10+ ([#4358][gh4358], [#4354][gh4354]) -Filter HEAD out from schemas. ([#4357][gh4357]) -extra_kwargs takes precedence over uniqueness kwargs. ([#4198][gh4198], [#4199][gh4199], [#4349][gh4349]) -Correct descriptions when tabs are used in code indentation. ([#4345][gh4345], [#4347][gh4347]) -Change template context generation in TemplateHTMLRenderer. ([#4236][gh4236]) -Serializer defaults should not be included in partial updates. ([#4346][gh4346], [#3565][gh3565]) -Consistent behavior & descriptive error from FileUploadParser when filename not included. ([#4340][gh4340], [#3610][gh3610], [#4292][gh4292], [#4296][gh4296]) -DecimalField quantizes incoming digitals. ([#4339][gh4339], [#4318][gh4318]) -Handle non-string input for IP fields. ([#4335][gh4335], [#4336][gh4336], [#4338][gh4338]) -Fix leading slash handling when Schema generation includes a root URL. ([#4332][gh4332]) -Test cases for DictField with allow_null options. ([#4348][gh4348]) -Update tests from Django 1.10 beta to Django 1.10. ([#4344][gh4344]) +* Include kwargs passed to 'as_view' when generating schemas. ([#4359][gh4359], [#4330][gh4330], [#4331][gh4331]) +* Access `request.user.is_authenticated` as property not method, under Django 1.10+ ([#4358][gh4358], [#4354][gh4354]) +* Filter HEAD out from schemas. ([#4357][gh4357]) +* extra_kwargs takes precedence over uniqueness kwargs. ([#4198][gh4198], [#4199][gh4199], [#4349][gh4349]) +* Correct descriptions when tabs are used in code indentation. ([#4345][gh4345], [#4347][gh4347])* +* Change template context generation in TemplateHTMLRenderer. ([#4236][gh4236]) +* Serializer defaults should not be included in partial updates. ([#4346][gh4346], [#3565][gh3565]) +* Consistent behavior & descriptive error from FileUploadParser when filename not included. ([#4340][gh4340], [#3610][gh3610], [#4292][gh4292], [#4296][gh4296]) +* DecimalField quantizes incoming digitals. ([#4339][gh4339], [#4318][gh4318]) +* Handle non-string input for IP fields. ([#4335][gh4335], [#4336][gh4336], [#4338][gh4338]) +* Fix leading slash handling when Schema generation includes a root URL. ([#4332][gh4332]) +* Test cases for DictField with allow_null options. ([#4348][gh4348]) +* Update tests from Django 1.10 beta to Django 1.10. ([#4344][gh4344]) ### 3.4.1 From bb613c5ad19bb10a8e85a2bb3520bd4c4e6879a5 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 5 Aug 2016 13:33:25 +0100 Subject: [PATCH 201/457] Version 3.4.3 (#4361) * Version 3.4.3 --- docs/topics/release-notes.md | 10 ++++++++++ rest_framework/__init__.py | 2 +- rest_framework/renderers.py | 11 +++++++++-- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index 692af57e9..6edbd2544 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -40,6 +40,12 @@ You can determine your currently installed version using `pip freeze`: ## 3.4.x series +### 3.4.3 + +**Date**: [5th August 2016][3.4.3-milestone] + +* Include fallaback for users of older TemplateHTMLRenderer internal API. ([#4361][gh4361]) + ### 3.4.2 **Date**: [5th August 2016][3.4.2-milestone] @@ -533,6 +539,7 @@ For older release notes, [please see the version 2.x documentation][old-release- [3.4.0-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.4.0+Release%22 [3.4.1-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.4.1+Release%22 [3.4.2-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.4.2+Release%22 +[3.4.3-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.4.3+Release%22 [gh2013]: https://github.com/tomchristie/django-rest-framework/issues/2013 @@ -990,3 +997,6 @@ For older release notes, [please see the version 2.x documentation][old-release- [gh4357]: https://github.com/tomchristie/django-rest-framework/issues/4357 [gh4358]: https://github.com/tomchristie/django-rest-framework/issues/4358 [gh4359]: https://github.com/tomchristie/django-rest-framework/issues/4359 + + +[gh4361]: https://github.com/tomchristie/django-rest-framework/issues/4361 diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py index fb6da68ce..19f83ecab 100644 --- a/rest_framework/__init__.py +++ b/rest_framework/__init__.py @@ -8,7 +8,7 @@ ______ _____ _____ _____ __ """ __title__ = 'Django REST framework' -__version__ = '3.4.2' +__version__ = '3.4.3' __author__ = 'Tom Christie' __license__ = 'BSD 2-Clause' __copyright__ = 'Copyright 2011-2016 Tom Christie' diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index ef7747eaf..91d9e9072 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -166,7 +166,11 @@ class TemplateHTMLRenderer(BaseRenderer): template_names = self.get_template_names(response, view) template = self.resolve_template(template_names) - context = self.get_template_context(data, renderer_context) + if hasattr(self, 'resolve_context'): + # Fallback for older versions. + context = self.resolve_context(self, data, request, response) + else: + context = self.get_template_context(data, renderer_context) return template_render(template, context, request=request) def resolve_template(self, template_names): @@ -229,7 +233,10 @@ class StaticHTMLRenderer(TemplateHTMLRenderer): if response and response.exception: request = renderer_context['request'] template = self.get_exception_template(response) - context = self.resolve_context(data, request, response) + if hasattr(self, 'resolve_context'): + context = self.resolve_context(data, request, response) + else: + context = self.get_template_context(data, renderer_context) return template_render(template, context, request=request) return data From 672e5a0f96c4e860f4eeee85f9cd26c8c4070d63 Mon Sep 17 00:00:00 2001 From: Marlon Date: Fri, 5 Aug 2016 11:57:43 -0700 Subject: [PATCH 202/457] Fix minor typo --- docs/api-guide/fields.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/fields.md b/docs/api-guide/fields.md index 4b566d37e..f986f1508 100644 --- a/docs/api-guide/fields.md +++ b/docs/api-guide/fields.md @@ -488,7 +488,7 @@ This field is used by default with `ModelSerializer` when including field names **Signature**: `ReadOnlyField()` -For example, is `has_expired` was a property on the `Account` model, then the following serializer would automatically generate it as a `ReadOnlyField`: +For example, if `has_expired` was a property on the `Account` model, then the following serializer would automatically generate it as a `ReadOnlyField`: class AccountSerializer(serializers.ModelSerializer): class Meta: From febaa4db00c322d169a5e60ecd22c909e8a836c2 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 8 Aug 2016 09:28:15 +0100 Subject: [PATCH 203/457] Add import in docs. [ci skip] --- docs/api-guide/throttling.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/api-guide/throttling.md b/docs/api-guide/throttling.md index 4eef4fd5d..51d2beef1 100644 --- a/docs/api-guide/throttling.md +++ b/docs/api-guide/throttling.md @@ -184,6 +184,8 @@ If the `.wait()` method is implemented and the request is throttled, then a `Ret The following is an example of a rate throttle, that will randomly throttle 1 in every 10 requests. + import random + class RandomRateThrottle(throttling.BaseThrottle): def allow_request(self, request, view): return random.randint(1, 10) == 1 From e1768bdc161ee6c4fab422d0f47e54f9bf257ce2 Mon Sep 17 00:00:00 2001 From: Dmitry Dygalo Date: Mon, 8 Aug 2016 10:32:22 +0200 Subject: [PATCH 204/457] Fixed various typos (#4366) --- rest_framework/compat.py | 2 +- rest_framework/fields.py | 6 +++--- rest_framework/negotiation.py | 2 +- rest_framework/pagination.py | 16 ++++++++-------- rest_framework/serializers.py | 4 ++-- rest_framework/templatetags/rest_framework.py | 2 +- rest_framework/utils/field_mapping.py | 2 +- rest_framework/utils/html.py | 2 +- rest_framework/versioning.py | 4 ++-- rest_framework/viewsets.py | 2 +- tests/test_authentication.py | 2 +- tests/test_fields.py | 4 ++-- tests/test_filters.py | 6 +++--- tests/test_model_serializer.py | 2 +- tests/test_pagination.py | 6 +++--- tests/test_templatetags.py | 2 +- tests/test_testing.py | 2 +- 17 files changed, 33 insertions(+), 33 deletions(-) diff --git a/rest_framework/compat.py b/rest_framework/compat.py index 1ab1478f1..cee430a84 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -168,7 +168,7 @@ except ImportError: crispy_forms = None -# coreapi is optional (Note that uritemplate is a dependancy of coreapi) +# coreapi is optional (Note that uritemplate is a dependency of coreapi) try: import coreapi import uritemplate diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 704dbaf3f..b4346cd85 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -395,8 +395,8 @@ class Field(object): # determine if we should use null instead. return '' if getattr(self, 'allow_blank', False) else None elif ret == '' and not self.required: - # If the field is blank, and emptyness is valid then - # determine if we should use emptyness instead. + # If the field is blank, and emptiness is valid then + # determine if we should use emptiness instead. return '' if getattr(self, 'allow_blank', False) else empty return ret return dictionary.get(self.field_name, empty) @@ -1346,7 +1346,7 @@ class FilePathField(ChoiceField): def __init__(self, path, match=None, recursive=False, allow_files=True, allow_folders=False, required=None, **kwargs): - # Defer to Django's FilePathField implmentation to get the + # Defer to Django's FilePathField implementation to get the # valid set of choices. field = DjangoFilePathField( path, match=match, recursive=recursive, allow_files=allow_files, diff --git a/rest_framework/negotiation.py b/rest_framework/negotiation.py index 2a2b6f168..ca1b59f12 100644 --- a/rest_framework/negotiation.py +++ b/rest_framework/negotiation.py @@ -90,7 +90,7 @@ class DefaultContentNegotiation(BaseContentNegotiation): def get_accept_list(self, request): """ - Given the incoming request, return a tokenised list of media + Given the incoming request, return a tokenized list of media type strings. """ header = request.META.get('HTTP_ACCEPT', '*/*') diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py index 6ad10d860..77c10337e 100644 --- a/rest_framework/pagination.py +++ b/rest_framework/pagination.py @@ -64,10 +64,10 @@ def _get_displayed_page_numbers(current, final): This implementation gives one page to each side of the cursor, or two pages to the side when the cursor is at the edge, then - ensures that any breaks between non-continous page numbers never + ensures that any breaks between non-continuous page numbers never remove only a single page. - For an alernativative implementation which gives two pages to each side of + For an alternative implementation which gives two pages to each side of the cursor, eg. as in GitHub issue list pagination, see: https://gist.github.com/tomchristie/321140cebb1c4a558b15 @@ -476,10 +476,10 @@ class CursorPagination(BasePagination): # Determine the position of the final item following the page. if len(results) > len(self.page): - has_following_postion = True + has_following_position = True following_position = self._get_position_from_instance(results[-1], self.ordering) else: - has_following_postion = False + has_following_position = False following_position = None # If we have a reverse queryset, then the query ordering was in reverse @@ -490,14 +490,14 @@ class CursorPagination(BasePagination): if reverse: # Determine next and previous positions for reverse cursors. self.has_next = (current_position is not None) or (offset > 0) - self.has_previous = has_following_postion + self.has_previous = has_following_position if self.has_next: self.next_position = current_position if self.has_previous: self.previous_position = following_position else: # Determine next and previous positions for forward cursors. - self.has_next = has_following_postion + self.has_next = has_following_position self.has_previous = (current_position is not None) or (offset > 0) if self.has_next: self.next_position = following_position @@ -534,7 +534,7 @@ class CursorPagination(BasePagination): # our marker. break - # The item in this postion has the same position as the item + # The item in this position has the same position as the item # following it, we can't use it as a marker position, so increment # the offset and keep seeking to the previous item. compare = position @@ -582,7 +582,7 @@ class CursorPagination(BasePagination): # our marker. break - # The item in this postion has the same position as the item + # The item in this position has the same position as the item # following it, we can't use it as a marker position, so increment # the offset and keep seeking to the previous item. compare = position diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 27c8cc229..41412af8a 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -1383,7 +1383,7 @@ class ModelSerializer(Serializer): def get_unique_together_validators(self): """ - Determine a default set of validators for any unique_together contraints. + Determine a default set of validators for any unique_together constraints. """ model_class_inheritance_tree = ( [self.Meta.model] + @@ -1414,7 +1414,7 @@ class ModelSerializer(Serializer): def get_unique_for_date_validators(self): """ - Determine a default set of validators for the following contraints: + Determine a default set of validators for the following constraints: * unique_for_date * unique_for_month diff --git a/rest_framework/templatetags/rest_framework.py b/rest_framework/templatetags/rest_framework.py index 05a7ce04f..225edcbee 100644 --- a/rest_framework/templatetags/rest_framework.py +++ b/rest_framework/templatetags/rest_framework.py @@ -189,7 +189,7 @@ def urlize_quoted_links(text, trim_url_limit=None, nofollow=True, autoescape=Tru leading punctuation (opening parens) and it'll still do the right thing. If trim_url_limit is not None, the URLs in link text longer than this limit - will truncated to trim_url_limit-3 characters and appended with an elipsis. + will truncated to trim_url_limit-3 characters and appended with an ellipsis. If nofollow is True, the URLs in link text will get a rel="nofollow" attribute. diff --git a/rest_framework/utils/field_mapping.py b/rest_framework/utils/field_mapping.py index 311d58317..64df9a08e 100644 --- a/rest_framework/utils/field_mapping.py +++ b/rest_framework/utils/field_mapping.py @@ -1,6 +1,6 @@ """ Helper functions for mapping model fields to a dictionary of default -keyword arguments that should be used for their equivelent serializer fields. +keyword arguments that should be used for their equivalent serializer fields. """ import inspect diff --git a/rest_framework/utils/html.py b/rest_framework/utils/html.py index 121c825c7..ca062c9fc 100644 --- a/rest_framework/utils/html.py +++ b/rest_framework/utils/html.py @@ -14,7 +14,7 @@ def is_html_input(dictionary): def parse_html_list(dictionary, prefix=''): """ - Used to suport list values in HTML forms. + Used to support list values in HTML forms. Supports lists of primitives and/or dictionaries. * List of primitives. diff --git a/rest_framework/versioning.py b/rest_framework/versioning.py index 763a92b4c..f533ef580 100644 --- a/rest_framework/versioning.py +++ b/rest_framework/versioning.py @@ -94,7 +94,7 @@ class NamespaceVersioning(BaseVersioning): The difference is in the backend - this implementation uses Django's URL namespaces to determine the version. - An example URL conf that is namespaced into two seperate versions + An example URL conf that is namespaced into two separate versions # users/urls.py urlpatterns = [ @@ -147,7 +147,7 @@ class HostNameVersioning(BaseVersioning): invalid_version_message = _('Invalid version in hostname.') def determine_version(self, request, *args, **kwargs): - hostname, seperator, port = request.get_host().partition(':') + hostname, separator, port = request.get_host().partition(':') match = self.hostname_regex.match(hostname) if not match: return self.default_version diff --git a/rest_framework/viewsets.py b/rest_framework/viewsets.py index 2f440c567..bd8333504 100644 --- a/rest_framework/viewsets.py +++ b/rest_framework/viewsets.py @@ -112,7 +112,7 @@ class ViewSetMixin(object): if method == 'options': # This is a special case as we always provide handling for the # options method in the base `View` class. - # Unlike the other explicitly defined actions, 'metadata' is implict. + # Unlike the other explicitly defined actions, 'metadata' is implicit. self.action = 'metadata' else: self.action = self.action_map.get(method) diff --git a/tests/test_authentication.py b/tests/test_authentication.py index 1f95396aa..5ef620abe 100644 --- a/tests/test_authentication.py +++ b/tests/test_authentication.py @@ -440,7 +440,7 @@ class FailingAuthAccessedInRenderer(TestCase): class NoAuthenticationClassesTests(TestCase): def test_permission_message_with_no_authentication_classes(self): """ - An unauthenticated request made against a view that containes no + An unauthenticated request made against a view that contains no `authentication_classes` but do contain `permissions_classes` the error code returned should be 403 with the exception's message. """ diff --git a/tests/test_fields.py b/tests/test_fields.py index 92f4548e5..60f02777a 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -974,7 +974,7 @@ class TestDateField(FieldValues): class TestCustomInputFormatDateField(FieldValues): """ - Valid and invalid values for `DateField` with a cutom input format. + Valid and invalid values for `DateField` with a custom input format. """ valid_inputs = { '1 Jan 2001': datetime.date(2001, 1, 1), @@ -1041,7 +1041,7 @@ class TestDateTimeField(FieldValues): class TestCustomInputFormatDateTimeField(FieldValues): """ - Valid and invalid values for `DateTimeField` with a cutom input format. + Valid and invalid values for `DateTimeField` with a custom input format. """ valid_inputs = { '1:35pm, 1 Jan 2001': datetime.datetime(2001, 1, 1, 13, 35, tzinfo=timezone.UTC()), diff --git a/tests/test_filters.py b/tests/test_filters.py index 175ae5b12..03d61fc37 100644 --- a/tests/test_filters.py +++ b/tests/test_filters.py @@ -711,7 +711,7 @@ class OrderingFilterTests(TestCase): serializer_class = OrderingFilterSerializer filter_backends = (filters.OrderingFilter,) ordering = ('title',) - oredering_fields = ('text',) + ordering_fields = ('text',) view = OrderingListView.as_view() request = factory.get('') @@ -819,7 +819,7 @@ class OrderingFilterTests(TestCase): queryset = OrderingFilterModel.objects.all() filter_backends = (filters.OrderingFilter,) ordering = ('title',) - # note: no ordering_fields and serializer_class speficied + # note: no ordering_fields and serializer_class specified def get_serializer_class(self): return OrderingFilterSerializer @@ -842,7 +842,7 @@ class OrderingFilterTests(TestCase): filter_backends = (filters.OrderingFilter,) ordering = ('title',) # note: no ordering_fields and serializer_class - # or get_serializer_class speficied + # or get_serializer_class specified view = OrderingListView.as_view() request = factory.get('/', {'ordering': 'text'}) diff --git a/tests/test_model_serializer.py b/tests/test_model_serializer.py index b2d336d84..a14972f04 100644 --- a/tests/test_model_serializer.py +++ b/tests/test_model_serializer.py @@ -136,7 +136,7 @@ class TestModelSerializer(TestCase): class TestRegularFieldMappings(TestCase): def test_regular_fields(self): """ - Model fields should map to their equivelent serializer fields. + Model fields should map to their equivalent serializer fields. """ class TestSerializer(serializers.ModelSerializer): class Meta: diff --git a/tests/test_pagination.py b/tests/test_pagination.py index 4ea706429..f7feb4006 100644 --- a/tests/test_pagination.py +++ b/tests/test_pagination.py @@ -67,8 +67,8 @@ class TestPaginationIntegration: def test_setting_page_size_over_maximum(self): """ - When page_size parameter exceeds maxiumum allowable, - then it should be capped to the maxiumum. + When page_size parameter exceeds maximum allowable, + then it should be capped to the maximum. """ request = factory.get('/', {'page_size': 1000}) response = self.view(request) @@ -259,7 +259,7 @@ class TestPageNumberPaginationOverride: def setup(self): class OverriddenDjangoPaginator(DjangoPaginator): - # override the count in our overriden Django Paginator + # override the count in our overridden Django Paginator # we will only return one page, with one item count = 1 diff --git a/tests/test_templatetags.py b/tests/test_templatetags.py index 746f51b7e..ac218df21 100644 --- a/tests/test_templatetags.py +++ b/tests/test_templatetags.py @@ -13,7 +13,7 @@ factory = APIRequestFactory() class TemplateTagTests(TestCase): - def test_add_query_param_with_non_latin_charactor(self): + def test_add_query_param_with_non_latin_character(self): # Ensure we don't double-escape non-latin characters # that are present in the querystring. # See #1314. diff --git a/tests/test_testing.py b/tests/test_testing.py index e6c8de22d..3adcc55f8 100644 --- a/tests/test_testing.py +++ b/tests/test_testing.py @@ -78,7 +78,7 @@ class TestAPITestClient(TestCase): response = self.client.get('/session-view/') self.assertEqual(response.data['active_session'], False) - # Subsequant requests have an active session + # Subsequent requests have an active session response = self.client.get('/session-view/') self.assertEqual(response.data['active_session'], True) From 0781182646e4b292e88ec46b74cc5b709c190753 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 9 Aug 2016 17:48:29 +0100 Subject: [PATCH 205/457] Fix call to .resolve_context (#4371) --- rest_framework/renderers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index 91d9e9072..371cd6ec7 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -168,7 +168,7 @@ class TemplateHTMLRenderer(BaseRenderer): if hasattr(self, 'resolve_context'): # Fallback for older versions. - context = self.resolve_context(self, data, request, response) + context = self.resolve_context(data, request, response) else: context = self.get_template_context(data, renderer_context) return template_render(template, context, request=request) From 8105a4ac5abc9760ac5dea8e567f333feb6f8e2a Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 10 Aug 2016 12:02:33 +0100 Subject: [PATCH 206/457] Resolve form display with ChoiceField, MultipleChoiceField and non-string choices. (#4374) * Add tests for html-form-rendering choice fields * Resolve issues with ChoiceField, MultipleChoiceField and non-string options * Ensure None template comparisons don't match string None --- .../horizontal/checkbox_multiple.html | 6 +- .../rest_framework/horizontal/radio.html | 6 +- .../rest_framework/horizontal/select.html | 4 +- .../horizontal/select_multiple.html | 4 +- .../inline/checkbox_multiple.html | 4 +- .../rest_framework/inline/radio.html | 3 +- .../rest_framework/inline/select.html | 4 +- .../inline/select_multiple.html | 3 +- .../vertical/checkbox_multiple.html | 6 +- .../rest_framework/vertical/radio.html | 5 +- .../rest_framework/vertical/select.html | 4 +- .../vertical/select_multiple.html | 3 +- rest_framework/templatetags/rest_framework.py | 15 ++++ rest_framework/utils/serializer_helpers.py | 2 +- tests/test_renderers.py | 87 +++++++++++++++++++ 15 files changed, 139 insertions(+), 17 deletions(-) diff --git a/rest_framework/templates/rest_framework/horizontal/checkbox_multiple.html b/rest_framework/templates/rest_framework/horizontal/checkbox_multiple.html index f01071297..7c7e57326 100644 --- a/rest_framework/templates/rest_framework/horizontal/checkbox_multiple.html +++ b/rest_framework/templates/rest_framework/horizontal/checkbox_multiple.html @@ -1,3 +1,5 @@ +{% load rest_framework %} +
{% if field.label %}
@@ -19,7 +21,7 @@ {% for key, text in field.choices.items %} {% endfor %} @@ -35,7 +37,7 @@ {% for key, text in field.choices.items %}
diff --git a/rest_framework/templates/rest_framework/horizontal/select.html b/rest_framework/templates/rest_framework/horizontal/select.html index 3c9e36bbb..7a3db2db8 100644 --- a/rest_framework/templates/rest_framework/horizontal/select.html +++ b/rest_framework/templates/rest_framework/horizontal/select.html @@ -1,3 +1,5 @@ +{% load rest_framework %} +
{% if field.label %}
@@ -16,7 +18,7 @@ {% elif select.end_option_group %} {% else %} - + {% endif %} {% empty %} diff --git a/rest_framework/templates/rest_framework/inline/checkbox_multiple.html b/rest_framework/templates/rest_framework/inline/checkbox_multiple.html index b02425a62..4c544ff8a 100644 --- a/rest_framework/templates/rest_framework/inline/checkbox_multiple.html +++ b/rest_framework/templates/rest_framework/inline/checkbox_multiple.html @@ -1,3 +1,5 @@ +{% load rest_framework %} +
{% if field.label %} @@ -6,7 +8,7 @@ {% for key, text in field.choices.items %}
diff --git a/rest_framework/templates/rest_framework/inline/radio.html b/rest_framework/templates/rest_framework/inline/radio.html index efaef6c9b..8d43cb390 100644 --- a/rest_framework/templates/rest_framework/inline/radio.html +++ b/rest_framework/templates/rest_framework/inline/radio.html @@ -1,4 +1,5 @@ {% load i18n %} +{% load rest_framework %} {% trans "None" as none_choice %}
@@ -20,7 +21,7 @@ {% for key, text in field.choices.items %}
diff --git a/rest_framework/templates/rest_framework/inline/select.html b/rest_framework/templates/rest_framework/inline/select.html index 99f10ae71..5023c2203 100644 --- a/rest_framework/templates/rest_framework/inline/select.html +++ b/rest_framework/templates/rest_framework/inline/select.html @@ -1,3 +1,5 @@ +{% load rest_framework %} +
{% if field.label %}
@@ -15,7 +16,7 @@ {% elif select.end_option_group %} {% else %} - + {% endif %} {% empty %} diff --git a/rest_framework/templates/rest_framework/vertical/checkbox_multiple.html b/rest_framework/templates/rest_framework/vertical/checkbox_multiple.html index 8412f8e2d..b933f4ff5 100644 --- a/rest_framework/templates/rest_framework/vertical/checkbox_multiple.html +++ b/rest_framework/templates/rest_framework/vertical/checkbox_multiple.html @@ -1,3 +1,5 @@ +{% load rest_framework %} +
{% if field.label %} @@ -7,7 +9,7 @@
{% for key, text in field.choices.items %} {% endfor %} @@ -16,7 +18,7 @@ {% for key, text in field.choices.items %}
diff --git a/rest_framework/templates/rest_framework/vertical/radio.html b/rest_framework/templates/rest_framework/vertical/radio.html index 9922ef6a1..6e5d2232c 100644 --- a/rest_framework/templates/rest_framework/vertical/radio.html +++ b/rest_framework/templates/rest_framework/vertical/radio.html @@ -1,4 +1,5 @@ {% load i18n %} +{% load rest_framework %} {% trans "None" as none_choice %}
@@ -19,7 +20,7 @@ {% for key, text in field.choices.items %} {% endfor %} @@ -37,7 +38,7 @@ {% for key, text in field.choices.items %}
diff --git a/rest_framework/templates/rest_framework/vertical/select.html b/rest_framework/templates/rest_framework/vertical/select.html index 9736fc072..6ccaaf27f 100644 --- a/rest_framework/templates/rest_framework/vertical/select.html +++ b/rest_framework/templates/rest_framework/vertical/select.html @@ -1,3 +1,5 @@ +{% load rest_framework %} +
{% if field.label %}
' + ) + rendered_packed = ''.join(rendered.split()) + assert rendered_packed == expected_packed + class TestNestedBoundField: def test_nested_empty_bound_field(self): From f1a2eeb818366b11c44c86d2ccfa1d6822d216b9 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 10 Aug 2016 16:38:59 +0100 Subject: [PATCH 212/457] .choices property of RelatedField should preserve non-string values. (#4379) Update RelatedField.choices to support non-string values --- rest_framework/relations.py | 2 +- tests/test_model_serializer.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rest_framework/relations.py b/rest_framework/relations.py index ad74d1f35..4b6b3bea4 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -168,7 +168,7 @@ class RelatedField(Field): return OrderedDict([ ( - six.text_type(self.to_representation(item)), + self.to_representation(item), self.display_value(item) ) for item in queryset diff --git a/tests/test_model_serializer.py b/tests/test_model_serializer.py index a14972f04..01243ff6e 100644 --- a/tests/test_model_serializer.py +++ b/tests/test_model_serializer.py @@ -614,7 +614,7 @@ class TestRelationalFieldDisplayValue(TestCase): fields = '__all__' serializer = TestSerializer() - expected = OrderedDict([('1', 'Red Color'), ('2', 'Yellow Color'), ('3', 'Green Color')]) + expected = OrderedDict([(1, 'Red Color'), (2, 'Yellow Color'), (3, 'Green Color')]) self.assertEqual(serializer.fields['color'].choices, expected) def test_custom_display_value(self): @@ -630,7 +630,7 @@ class TestRelationalFieldDisplayValue(TestCase): fields = '__all__' serializer = TestSerializer() - expected = OrderedDict([('1', 'My Red Color'), ('2', 'My Yellow Color'), ('3', 'My Green Color')]) + expected = OrderedDict([(1, 'My Red Color'), (2, 'My Yellow Color'), (3, 'My Green Color')]) self.assertEqual(serializer.fields['color'].choices, expected) From f16e8801679c81b60696d10428e172f0800f4bea Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 10 Aug 2016 17:22:19 +0100 Subject: [PATCH 213/457] Stricter type validation for CharField. (#4380) Stricter type validation for CharField --- rest_framework/fields.py | 6 ++++++ tests/test_fields.py | 2 ++ 2 files changed, 8 insertions(+) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 3a2f27205..fab79808f 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -672,6 +672,7 @@ class NullBooleanField(Field): class CharField(Field): default_error_messages = { + 'invalid': _('Not a valid string.'), 'blank': _('This field may not be blank.'), 'max_length': _('Ensure this field has no more than {max_length} characters.'), 'min_length': _('Ensure this field has at least {min_length} characters.') @@ -702,6 +703,11 @@ class CharField(Field): return super(CharField, self).run_validation(data) def to_internal_value(self, data): + # We're lenient with allowing basic numerics to be coerced into strings, + # but other types should fail. Eg. unclear if booleans should represent as `true` or `True`, + # and composites such as lists are likely user error. + if isinstance(data, bool) or not isinstance(data, six.string_types + six.integer_types + (float,)): + self.fail('invalid') value = six.text_type(data) return value.strip() if self.trim_whitespace else value diff --git a/tests/test_fields.py b/tests/test_fields.py index 1cbff9909..f1a588c27 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -535,6 +535,8 @@ class TestCharField(FieldValues): 'abc': 'abc' } invalid_inputs = { + (): ['Not a valid string.'], + True: ['Not a valid string.'], '': ['This field may not be blank.'] } outputs = { From 3698d9ea2ef95a6823b1bc98863ba7b49e2b6937 Mon Sep 17 00:00:00 2001 From: Kyle Hornberg Date: Wed, 10 Aug 2016 11:23:10 -0500 Subject: [PATCH 214/457] Update permissions.md (#4381) --- docs/api-guide/permissions.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/permissions.md b/docs/api-guide/permissions.md index 402875cd5..e0838e94a 100644 --- a/docs/api-guide/permissions.md +++ b/docs/api-guide/permissions.md @@ -132,7 +132,7 @@ This permission is suitable if you want to your API to allow read permissions to ## DjangoModelPermissions -This permission class ties into Django's standard `django.contrib.auth` [model permissions][contribauth]. This permission must only be applied to views that has a `.queryset` property set. Authorization will only be granted if the user *is authenticated* and has the *relevant model permissions* assigned. +This permission class ties into Django's standard `django.contrib.auth` [model permissions][contribauth]. This permission must only be applied to views that have a `.queryset` property set. Authorization will only be granted if the user *is authenticated* and has the *relevant model permissions* assigned. * `POST` requests require the user to have the `add` permission on the model. * `PUT` and `PATCH` requests require the user to have the `change` permission on the model. From b50d8950eeeac03843b9da1cb96ba52b5b98c8bc Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 11 Aug 2016 11:27:28 +0100 Subject: [PATCH 215/457] Pass request to schema generation (#4383) Pass request to schema generation --- rest_framework/schemas.py | 63 ++++++++++++++++++++------------------- tests/test_schemas.py | 4 +++ 2 files changed, 36 insertions(+), 31 deletions(-) diff --git a/rest_framework/schemas.py b/rest_framework/schemas.py index 688deec88..28f5dc8a1 100644 --- a/rest_framework/schemas.py +++ b/rest_framework/schemas.py @@ -65,44 +65,52 @@ class SchemaGenerator(object): urls = import_module(urlconf) else: urls = urlconf - patterns = urls.urlpatterns + self.patterns = urls.urlpatterns elif patterns is None and urlconf is None: urls = import_module(settings.ROOT_URLCONF) - patterns = urls.urlpatterns + self.patterns = urls.urlpatterns + else: + self.patterns = patterns if url and not url.endswith('/'): url += '/' self.title = title self.url = url - self.endpoints = self.get_api_endpoints(patterns) + self.endpoints = None def get_schema(self, request=None): - if request is None: - endpoints = self.endpoints - else: - # Filter the list of endpoints to only include those that - # the user has permission on. - endpoints = [] - for key, link, callback in self.endpoints: - method = link.action.upper() - view = callback.cls() + if self.endpoints is None: + self.endpoints = self.get_api_endpoints(self.patterns) + + links = [] + for key, path, method, callback in self.endpoints: + view = callback.cls() + for attr, val in getattr(callback, 'initkwargs', {}).items(): + setattr(view, attr, val) + view.args = () + view.kwargs = {} + view.format_kwarg = None + + if request is not None: view.request = clone_request(request, method) - view.format_kwarg = None try: view.check_permissions(view.request) except exceptions.APIException: - pass - else: - endpoints.append((key, link, callback)) + continue + else: + view.request = None - if not endpoints: + link = self.get_link(path, method, callback, view) + links.append((key, link)) + + if not link: return None # Generate the schema content structure, from the endpoints. # ('users', 'list'), Link -> {'users': {'list': Link()}} content = {} - for key, link, callback in endpoints: + for key, link in links: insert_into(content, key, link) # Return the schema document. @@ -122,8 +130,7 @@ class SchemaGenerator(object): if self.should_include_endpoint(path, callback): for method in self.get_allowed_methods(callback): key = self.get_key(path, method, callback) - link = self.get_link(path, method, callback) - endpoint = (key, link, callback) + endpoint = (key, path, method, callback) api_endpoints.append(endpoint) elif isinstance(pattern, RegexURLResolver): @@ -190,14 +197,10 @@ class SchemaGenerator(object): # Methods for generating each individual `Link` instance... - def get_link(self, path, method, callback): + def get_link(self, path, method, callback, view): """ Return a `coreapi.Link` instance for the given endpoint. """ - view = callback.cls() - for attr, val in getattr(callback, 'initkwargs', {}).items(): - setattr(view, attr, val) - fields = self.get_path_fields(path, method, callback, view) fields += self.get_serializer_fields(path, method, callback, view) fields += self.get_pagination_fields(path, method, callback, view) @@ -260,20 +263,18 @@ class SchemaGenerator(object): if method not in ('PUT', 'PATCH', 'POST'): return [] - if not hasattr(view, 'get_serializer_class'): + if not hasattr(view, 'get_serializer'): return [] - fields = [] - - serializer_class = view.get_serializer_class() - serializer = serializer_class() + serializer = view.get_serializer() if isinstance(serializer, serializers.ListSerializer): - return coreapi.Field(name='data', location='body', required=True) + return [coreapi.Field(name='data', location='body', required=True)] if not isinstance(serializer, serializers.Serializer): return [] + fields = [] for field in serializer.fields.values(): if field.read_only: continue diff --git a/tests/test_schemas.py b/tests/test_schemas.py index 6c02c9d23..d8c0f2209 100644 --- a/tests/test_schemas.py +++ b/tests/test_schemas.py @@ -43,6 +43,10 @@ class ExampleViewSet(ModelViewSet): def custom_action(self, request, pk): return super(ExampleSerializer, self).retrieve(self, request) + def get_serializer(self, *args, **kwargs): + assert self.request + return super(ExampleViewSet, self).get_serializer(*args, **kwargs) + class ExampleView(APIView): permission_classes = [permissions.IsAuthenticatedOrReadOnly] From 01b498ec5109da22bf1b79d86efaecf45426ad51 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 11 Aug 2016 14:07:40 +0100 Subject: [PATCH 216/457] Fix schema categories for custom list actions (#4386) --- rest_framework/schemas.py | 98 +++++++++++++++++++++++---------------- tests/test_schemas.py | 14 +++++- 2 files changed, 70 insertions(+), 42 deletions(-) diff --git a/rest_framework/schemas.py b/rest_framework/schemas.py index 28f5dc8a1..c3a811bfb 100644 --- a/rest_framework/schemas.py +++ b/rest_framework/schemas.py @@ -30,24 +30,6 @@ def is_api_view(callback): return (cls is not None) and issubclass(cls, APIView) -def insert_into(target, keys, item): - """ - Insert `item` into the nested dictionary `target`. - - For example: - - target = {} - insert_into(target, ('users', 'list'), Link(...)) - insert_into(target, ('users', 'detail'), Link(...)) - assert target == {'users': {'list': Link(...), 'detail': Link(...)}} - """ - for key in keys[:1]: - if key not in target: - target[key] = {} - target = target[key] - target[keys[-1]] = item - - class SchemaGenerator(object): default_mapping = { 'get': 'read', @@ -84,7 +66,7 @@ class SchemaGenerator(object): self.endpoints = self.get_api_endpoints(self.patterns) links = [] - for key, path, method, callback in self.endpoints: + for path, method, category, action, callback in self.endpoints: view = callback.cls() for attr, val in getattr(callback, 'initkwargs', {}).items(): setattr(view, attr, val) @@ -102,16 +84,21 @@ class SchemaGenerator(object): view.request = None link = self.get_link(path, method, callback, view) - links.append((key, link)) + links.append((category, action, link)) - if not link: + if not links: return None - # Generate the schema content structure, from the endpoints. - # ('users', 'list'), Link -> {'users': {'list': Link()}} + # Generate the schema content structure, eg: + # {'users': {'list': Link()}} content = {} - for key, link in links: - insert_into(content, key, link) + for category, action, link in links: + if category is None: + content[action] = link + elif category in content: + content[category][action] = link + else: + content[category] = {action: link} # Return the schema document. return coreapi.Document(title=self.title, content=content, url=self.url) @@ -129,8 +116,8 @@ class SchemaGenerator(object): callback = pattern.callback if self.should_include_endpoint(path, callback): for method in self.get_allowed_methods(callback): - key = self.get_key(path, method, callback) - endpoint = (key, path, method, callback) + action = self.get_action(path, method, callback) + endpoint = (path, method, action, callback) api_endpoints.append(endpoint) elif isinstance(pattern, RegexURLResolver): @@ -140,7 +127,21 @@ class SchemaGenerator(object): ) api_endpoints.extend(nested_endpoints) - return api_endpoints + return self.add_categories(api_endpoints) + + def add_categories(self, api_endpoints): + """ + (path, method, action, callback) -> (path, method, category, action, callback) + """ + # Determine the top level categories for the schema content, + # based on the URLs of the endpoints. Eg `set(['users', 'organisations'])` + paths = [endpoint[0] for endpoint in api_endpoints] + categories = self.get_categories(paths) + + return [ + (path, method, self.get_category(categories, path), action, callback) + for (path, method, action, callback) in api_endpoints + ] def get_path(self, path_regex): """ @@ -177,23 +178,38 @@ class SchemaGenerator(object): callback.cls().allowed_methods if method not in ('OPTIONS', 'HEAD') ] - def get_key(self, path, method, callback): + def get_action(self, path, method, callback): """ - Return a tuple of strings, indicating the identity to use for a - given endpoint. eg. ('users', 'list'). + Return a description action string for the endpoint, eg. 'list'. """ - category = None - for item in path.strip('/').split('/'): - if '{' in item: - break - category = item - actions = getattr(callback, 'actions', self.default_mapping) - action = actions[method.lower()] + return actions[method.lower()] - if category: - return (category, action) - return (action,) + def get_categories(self, paths): + categories = set() + split_paths = set([ + tuple(path.split("{")[0].strip('/').split('/')) + for path in paths + ]) + + while split_paths: + for split_path in list(split_paths): + if len(split_path) == 0: + split_paths.remove(split_path) + elif len(split_path) == 1: + categories.add(split_path[0]) + split_paths.remove(split_path) + elif split_path[0] in categories: + split_paths.remove(split_path) + + return categories + + def get_category(self, categories, path): + path_components = path.split("{")[0].strip('/').split('/') + for path_component in path_components: + if path_component in categories: + return path_component + return None # Methods for generating each individual `Link` instance... diff --git a/tests/test_schemas.py b/tests/test_schemas.py index d8c0f2209..5e588483d 100644 --- a/tests/test_schemas.py +++ b/tests/test_schemas.py @@ -5,7 +5,7 @@ from django.test import TestCase, override_settings from rest_framework import filters, pagination, permissions, serializers from rest_framework.compat import coreapi -from rest_framework.decorators import detail_route +from rest_framework.decorators import detail_route, list_route from rest_framework.response import Response from rest_framework.routers import DefaultRouter from rest_framework.schemas import SchemaGenerator @@ -43,6 +43,10 @@ class ExampleViewSet(ModelViewSet): def custom_action(self, request, pk): return super(ExampleSerializer, self).retrieve(self, request) + @list_route() + def custom_list_action(self, request): + return super(ExampleViewSet, self).list(self, request) + def get_serializer(self, *args, **kwargs): assert self.request return super(ExampleViewSet, self).get_serializer(*args, **kwargs) @@ -88,6 +92,10 @@ class TestRouterGeneratedSchema(TestCase): coreapi.Field('ordering', required=False, location='query') ] ), + 'custom_list_action': coreapi.Link( + url='/example/custom_list_action/', + action='get' + ), 'retrieve': coreapi.Link( url='/example/{pk}/', action='get', @@ -144,6 +152,10 @@ class TestRouterGeneratedSchema(TestCase): coreapi.Field('d', required=False, location='form'), ] ), + 'custom_list_action': coreapi.Link( + url='/example/custom_list_action/', + action='get' + ), 'update': coreapi.Link( url='/example/{pk}/', action='put', From 116917dbed76ab37ab2d07f7b938d13f2c6e3efd Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 11 Aug 2016 16:18:33 +0100 Subject: [PATCH 217/457] Add form field descriptions to schemas (#4387) --- rest_framework/schemas.py | 9 ++++++++- tests/test_schemas.py | 8 ++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/rest_framework/schemas.py b/rest_framework/schemas.py index c3a811bfb..6b6324033 100644 --- a/rest_framework/schemas.py +++ b/rest_framework/schemas.py @@ -4,6 +4,7 @@ from django.conf import settings from django.contrib.admindocs.views import simplify_regex from django.core.urlresolvers import RegexURLPattern, RegexURLResolver from django.utils import six +from django.utils.encoding import force_text from rest_framework import exceptions, serializers from rest_framework.compat import coreapi, uritemplate, urlparse @@ -295,7 +296,13 @@ class SchemaGenerator(object): if field.read_only: continue required = field.required and method != 'PATCH' - field = coreapi.Field(name=field.source, location='form', required=required) + description = force_text(field.help_text) if field.help_text else '' + field = coreapi.Field( + name=field.source, + location='form', + required=required, + description=description + ) fields.append(field) return fields diff --git a/tests/test_schemas.py b/tests/test_schemas.py index 5e588483d..81b796c35 100644 --- a/tests/test_schemas.py +++ b/tests/test_schemas.py @@ -24,7 +24,7 @@ class ExamplePagination(pagination.PageNumberPagination): class ExampleSerializer(serializers.Serializer): - a = serializers.CharField(required=True) + a = serializers.CharField(required=True, help_text='A field description') b = serializers.CharField(required=False) @@ -131,7 +131,7 @@ class TestRouterGeneratedSchema(TestCase): action='post', encoding='application/json', fields=[ - coreapi.Field('a', required=True, location='form'), + coreapi.Field('a', required=True, location='form', description='A field description'), coreapi.Field('b', required=False, location='form') ] ), @@ -162,7 +162,7 @@ class TestRouterGeneratedSchema(TestCase): encoding='application/json', fields=[ coreapi.Field('pk', required=True, location='path'), - coreapi.Field('a', required=True, location='form'), + coreapi.Field('a', required=True, location='form', description='A field description'), coreapi.Field('b', required=False, location='form') ] ), @@ -172,7 +172,7 @@ class TestRouterGeneratedSchema(TestCase): encoding='application/json', fields=[ coreapi.Field('pk', required=True, location='path'), - coreapi.Field('a', required=False, location='form'), + coreapi.Field('a', required=False, location='form', description='A field description'), coreapi.Field('b', required=False, location='form') ] ), From 1312acaf8b0ef2cdea1f6b296196899e890c8064 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 11 Aug 2016 16:53:34 +0100 Subject: [PATCH 218/457] Minor docs update [ci skip] --- README.md | 3 +-- docs/index.md | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index a8e1afbf1..179f2891a 100644 --- a/README.md +++ b/README.md @@ -18,8 +18,7 @@ REST framework commercially we strongly encourage you to invest in its continued development by **[signing up for a paid plan][funding]**. The initial aim is to provide a single full-time position on REST framework. -Right now we're over 58% of the way towards achieving that. -*Every single sign-up makes a significant impact.* +*Every single sign-up makes a significant impact towards making that possible.*

diff --git a/docs/index.md b/docs/index.md index 87e013b8e..88276e678 100644 --- a/docs/index.md +++ b/docs/index.md @@ -68,8 +68,7 @@ REST framework commercially we strongly encourage you to invest in its continued development by **[signing up for a paid plan][funding]**. The initial aim is to provide a single full-time position on REST framework. -Right now we're over 58% of the way towards achieving that. -*Every single sign-up makes a significant impact.* +*Every single sign-up makes a significant impact towards making that possible.*

-*Many thanks to all our [wonderful sponsors][sponsors], and in particular to our premium backers, [Rover](http://jobs.rover.com/), [Sentry](https://getsentry.com/welcome/), and [Stream](https://getstream.io/?utm_source=drf&utm_medium=banner&utm_campaign=drf).* +*Many thanks to all our [wonderful sponsors][sponsors], and in particular to our premium backers, [Rover](http://jobs.rover.com/), [Sentry](https://getsentry.com/welcome/), [Stream](https://getstream.io/?utm_source=drf&utm_medium=banner&utm_campaign=drf), and [Machinalis](http://www.machinalis.com/#services).* --- From b683cd7afc9e03ac5287172348346ff2e61cc348 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 25 Aug 2016 22:29:38 +0100 Subject: [PATCH 241/457] Update sponsor info [ci skip] --- docs/img/premium/stream-readme.png | Bin 19341 -> 20667 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/docs/img/premium/stream-readme.png b/docs/img/premium/stream-readme.png index a04009d7fc0d1fe4fab5aa77215a94d5150d6354..955c11429c53bd18cbfbf888dca7663e134264eb 100644 GIT binary patch literal 20667 zcmeEuWmKHYvM4gRyTf21!3THOU;IwTEQx#a&!GBG%Fvw{{`(&&;N>MY4P7uxp=xc{3Vm61(%hBm7|rD zhdUe(^dHH=b^G6l{}+=!W-fmd`%8&`%O>`Ra}iA|cV`FBKPu36vh$GO5&KJ^e{cRD zjr@%z>+I;_X65b( z4zKs02>i409|(U`FY?OH$I3xh&JM27zog*f6%yn6k3Ij6DeLUu?55>nW?}V*v%gUO z(e&@of6>wVA38jI!vCc6kDh;ET3U#>dzyo-EIj@(U+`J`%lc)^Y`Ff>EXMU8p~c{~ zAfo1MX=m*#XXarg!NUy_5aAXQ;o%4J@cen;77*k5H<*8L@TW)C&C1Nf+3k(9vxCH6 zVmSVJ1@dyjXZ+v$|Ai{X^~aC?;a7h#M*&OB^j+-z9qH3J@Qu3WiV zG%%h+wdWXqUnZwa%p6Os9D}I}#J~qiF)4DAS-FDZHGJJfbz;_)V+bN8uSjc|LpW~N}iWVTtNTH)6 z(gOiQ+j;cV;k!QZ1nl0u?6=!j?t{(z!~@+e64yzNUZt;9n7Gn$kH5<`7}s)yYF zC;UgX|6kSr?;02SC)c$ZPkQckg6MGYS57c#(yXpprXK5*wc2Os9O9a<=PUI0FW~0P zlP%=wzs`ssH$C5SMh{!>N~_2rsCzZwu#{XYUMFltg-SE~X8 zvGCUQw)R_~pSGf=dwx0}g9BbwSxxh<0tYJ6d$=c0)W99rk5r@X?KXP2y?tJO#9=Di zX1&kLZ_<|57V{EqVoq!};WP|i-RAiM=qC#QKohI;za2#nKW(?W`>hYr&#uU!sLROc zTAc41B!B_<8g7YX6=ePzoEIG+sR>nuf#uQPpdf7(pLNSXW3*kHv7Yt4N|vhwEA&)8 zJNWuy(g8MR$+4tQ;$jDp$Bb?$b7fG!GkypCo`$Ng&wz|zT=X_=ISm6tb_I9oPgm?skvZJk0MWBb>$gv4=O{DJLQ}J)<+aUa3 zvctawzUPxZ8_C(vUL-)8iILiS!YU_XNzg~XVR)6)aR4JIg(4`~=?2a{i6-Npm{8Z? zam6gG3k{53gGHXhwF*M_cnCHJRUA;$zv@KqAqWW^AARlb;yXea1-$!_$%C}Gh^(^d zwZ=ifqNOaDIW-<3HNyZjFJJsT*U=n?FdF4O;&ctp68W+l@U0IIZ=wI=i@pj`_rf(y zM1ss?MEX|@NZ1|5kqCzx9TmaHH(f=uu{{h;If((|77=nFr-+G3Z<#!I_{y4XQN$bG z;Rzsj?z>OQl|g`}AR*4*OA}%w;bjfZ52`F2v`e}($64svA2WUUXue!2TOufvX9>q- zmMx)s!v-gl^VSlJeu4nLZ77OeDx+`FOUc+p&j>Zqh+=i@JT7oT7Vzc- zMT_muDVx1a`>W$+ot$aLJm$kLa!&dhE7D2o{4S-pcI1_EBj7tigm>G;_#6TKD{XX$ zlCF+p?`3pgSt`Pz0A!Kg)*`8O)xqAoRJ7Ob;gN6P3q_Hhvta&vHAqu3$jPL&8TWI8 z{?V29Pxb1b>h~HVt@Y~oNFU-u`08Kg7$sCJp-&*YO>TXAIBPy|ApbS;E?mz2T(exf zz6}Lt^J18EP>kzDeIaSKZr<#$JDEJp5~&NJ%}*zLg$Dy8b&@3pzCw4R1D-T+9uwLK zkhDWX4iIli@P|e~g0T^IIFB+~- zWYt`2dd}{BUnoN)GelSci*V!KgR>}sKH+LHo2C!@MRPSVUm#(#EabsIX|3V-axwL0 z6Q&s0J1lj8( zS43PV%AtEihD2BJhF`YU;3rTLf9Ludvk;~

pjlIcQ4o>(`XbcjU>*qQ2?ZI)oLo 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 literal 19341 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 dQepYy|C1zl-M+ID`#}d}dAj Date: Tue, 30 Aug 2016 11:37:48 +0200 Subject: [PATCH 242/457] [documentation] Throttling random request code example fix (#4451) --- docs/api-guide/throttling.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/throttling.md b/docs/api-guide/throttling.md index 51d2beef1..da4d5f725 100644 --- a/docs/api-guide/throttling.md +++ b/docs/api-guide/throttling.md @@ -188,7 +188,7 @@ The following is an example of a rate throttle, that will randomly throttle 1 in class RandomRateThrottle(throttling.BaseThrottle): def allow_request(self, request, view): - return random.randint(1, 10) == 1 + return random.randint(1, 10) != 1 [cite]: https://dev.twitter.com/docs/error-codes-responses [permissions]: permissions.md From 07efbdb45e5c7ef70249e985b3c1ef1cead455ba Mon Sep 17 00:00:00 2001 From: Mathieu Pillard Date: Fri, 2 Sep 2016 18:00:03 +0200 Subject: [PATCH 243/457] Fix APIClient.get() when path contains unicode arguments (#4458) --- rest_framework/test.py | 9 ++++++--- tests/test_testing.py | 7 +++++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/rest_framework/test.py b/rest_framework/test.py index 3ba4059a9..fd9f6ab13 100644 --- a/rest_framework/test.py +++ b/rest_framework/test.py @@ -79,10 +79,13 @@ class APIRequestFactory(DjangoRequestFactory): r = { 'QUERY_STRING': urlencode(data or {}, doseq=True), } - # Fix to support old behavior where you have the arguments in the url - # See #1461 if not data and '?' in path: - r['QUERY_STRING'] = path.split('?')[1] + # Fix to support old behavior where you have the arguments in the + # url. See #1461. + query_string = force_bytes(path.split('?')[1]) + if six.PY3: + query_string = query_string.decode('iso-8859-1') + r['QUERY_STRING'] = query_string r.update(extra) return self.generic('GET', path, **r) diff --git a/tests/test_testing.py b/tests/test_testing.py index 3adcc55f8..6683ae6ed 100644 --- a/tests/test_testing.py +++ b/tests/test_testing.py @@ -245,3 +245,10 @@ class TestAPIRequestFactory(TestCase): self.assertEqual(dict(request.GET), {'demo': ['test']}) request = factory.get('/view/', {'demo': 'test'}) self.assertEqual(dict(request.GET), {'demo': ['test']}) + + def test_request_factory_url_arguments_with_unicode(self): + factory = APIRequestFactory() + request = factory.get('/view/?demo=testé') + self.assertEqual(dict(request.GET), {'demo': ['testé']}) + request = factory.get('/view/', {'demo': 'testé'}) + self.assertEqual(dict(request.GET), {'demo': ['testé']}) From 5df54a711f3770de28c0aaed9350e589df082117 Mon Sep 17 00:00:00 2001 From: TakesxiSximada Date: Mon, 5 Sep 2016 19:16:41 +0900 Subject: [PATCH 244/457] Set a view function's __module__ value to the WrappedAPIView object's __module__ (#4465) --- rest_framework/decorators.py | 1 + 1 file changed, 1 insertion(+) diff --git a/rest_framework/decorators.py b/rest_framework/decorators.py index 1b21e643b..554e5236c 100644 --- a/rest_framework/decorators.py +++ b/rest_framework/decorators.py @@ -55,6 +55,7 @@ def api_view(http_method_names=None): setattr(WrappedAPIView, method.lower(), handler) WrappedAPIView.__name__ = func.__name__ + WrappedAPIView.__module__ = func.__module__ WrappedAPIView.renderer_classes = getattr(func, 'renderer_classes', APIView.renderer_classes) From 6b6f3195092cb7f12cddf0dee2bfa4a0eaf3b15c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= Date: Thu, 8 Sep 2016 09:01:26 -0400 Subject: [PATCH 245/457] Add missing comma (#4473) --- rest_framework/templates/rest_framework/admin.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/templates/rest_framework/admin.html b/rest_framework/templates/rest_framework/admin.html index eb2b8f1c7..de011cd09 100644 --- a/rest_framework/templates/rest_framework/admin.html +++ b/rest_framework/templates/rest_framework/admin.html @@ -232,7 +232,7 @@ {% block script %} From e91ffc87cb1e5b1148e839a0c3536de4da8efeef Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy Date: Tue, 13 Sep 2016 07:21:10 +0200 Subject: [PATCH 246/457] Ignore empty args in the `MultipleFieldLookupMixin` definition - Closes #4484 --- docs/api-guide/generic-views.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/api-guide/generic-views.md b/docs/api-guide/generic-views.md index d7dc30ce1..5fea8d7e0 100644 --- a/docs/api-guide/generic-views.md +++ b/docs/api-guide/generic-views.md @@ -330,7 +330,8 @@ For example, if you need to lookup objects based on multiple fields in the URL c queryset = self.filter_queryset(queryset) # Apply any filter backends filter = {} for field in self.lookup_fields: - filter[field] = self.kwargs[field] + if self.kwargs[field]: # Ignore empty fields. + filter[field] = self.kwargs[field] return get_object_or_404(queryset, **filter) # Lookup the object You can then simply apply this mixin to a view or viewset anytime you need to apply the custom behavior. From a68b37d8bc432fae37ef5880aec500002b59f565 Mon Sep 17 00:00:00 2001 From: Jeff Willette Date: Tue, 13 Sep 2016 17:31:48 +0900 Subject: [PATCH 247/457] Update to correct location of reverse relation doc (#4481) --- docs/api-guide/serializers.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md index 70fab448c..5772d940a 100644 --- a/docs/api-guide/serializers.md +++ b/docs/api-guide/serializers.md @@ -442,7 +442,7 @@ Declaring a `ModelSerializer` looks like this: By default, all the model fields on the class will be mapped to a corresponding serializer fields. -Any relationships such as foreign keys on the model will be mapped to `PrimaryKeyRelatedField`. Reverse relationships are not included by default unless explicitly included as described below. +Any relationships such as foreign keys on the model will be mapped to `PrimaryKeyRelatedField`. Reverse relationships are not included by default unless explicitly included as specified in the [serializer relations][relations] documentation. #### Inspecting a `ModelSerializer` From 4655501d51080fbc7733a81fab1a227229a33e3f Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 15 Sep 2016 12:44:45 +0100 Subject: [PATCH 248/457] Fix regression of `RegexField`. (#4490) * Don't deepcopy 'regex' arguments, instead treat as immutable. --- rest_framework/fields.py | 21 ++++++++++++--------- tests/test_fields.py | 15 +++++++++++++++ tests/test_serializer.py | 14 ++++++++++++++ 3 files changed, 41 insertions(+), 9 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index f76e4e801..917a151e5 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -252,6 +252,8 @@ class SkipField(Exception): pass +REGEX_TYPE = type(re.compile('')) + NOT_READ_ONLY_WRITE_ONLY = 'May not set both `read_only` and `write_only`' NOT_READ_ONLY_REQUIRED = 'May not set both `read_only` and `required`' NOT_REQUIRED_DEFAULT = 'May not set both `required` and `default`' @@ -581,16 +583,17 @@ class Field(object): When cloning fields we instantiate using the arguments it was originally created with, rather than copying the complete state. """ - args = copy.deepcopy(self._args) - kwargs = dict(self._kwargs) - # Bit ugly, but we need to special case 'validators' as Django's - # RegexValidator does not support deepcopy. - # We treat validator callables as immutable objects. + # Treat regexes and validators as immutable. # See https://github.com/tomchristie/django-rest-framework/issues/1954 - validators = kwargs.pop('validators', None) - kwargs = copy.deepcopy(kwargs) - if validators is not None: - kwargs['validators'] = validators + # and https://github.com/tomchristie/django-rest-framework/pull/4489 + args = [ + copy.deepcopy(item) if not isinstance(item, REGEX_TYPE) else item + for item in self._args + ] + kwargs = { + key: (copy.deepcopy(value) if (key not in ('validators', 'regex')) else value) + for key, value in self._kwargs.items() + } return self.__class__(*args, **kwargs) def __repr__(self): diff --git a/tests/test_fields.py b/tests/test_fields.py index f1a588c27..4a4b741c5 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -1,5 +1,6 @@ import datetime import os +import re import uuid from decimal import Decimal @@ -590,6 +591,20 @@ class TestRegexField(FieldValues): field = serializers.RegexField(regex='[a-z][0-9]') +class TestiCompiledRegexField(FieldValues): + """ + Valid and invalid values for `RegexField`. + """ + valid_inputs = { + 'a9': 'a9', + } + invalid_inputs = { + 'A9': ["This value does not match the required pattern."] + } + outputs = {} + field = serializers.RegexField(regex=re.compile('[a-z][0-9]')) + + class TestSlugField(FieldValues): """ Valid and invalid values for `SlugField`. diff --git a/tests/test_serializer.py b/tests/test_serializer.py index 4e9080909..bd9ef9500 100644 --- a/tests/test_serializer.py +++ b/tests/test_serializer.py @@ -2,6 +2,7 @@ from __future__ import unicode_literals import pickle +import re import pytest @@ -337,3 +338,16 @@ class TestDefaultInclusions: assert serializer.is_valid() assert serializer.validated_data == {'integer': 456} assert serializer.errors == {} + + +class TestSerializerValidationWithCompiledRegexField: + def setup(self): + class ExampleSerializer(serializers.Serializer): + name = serializers.RegexField(re.compile(r'\d'), required=True) + self.Serializer = ExampleSerializer + + def test_validation_success(self): + serializer = self.Serializer(data={'name': '2'}) + assert serializer.is_valid() + assert serializer.validated_data == {'name': '2'} + assert serializer.errors == {} From fe4c4fa75147f114e014c3d6623d84de35c01fe7 Mon Sep 17 00:00:00 2001 From: Tanner Hobson Date: Fri, 16 Sep 2016 22:09:49 -0400 Subject: [PATCH 249/457] Fix indentation regression in API listing (#4493) In commit 5392be4ddba37da3e50c3feabc8b3b1c944481a8, there was a change made when cleaning up the template for the API listing that caused 2 spaces to appear before every header item (except the first) and before the first line of the body of the response. This meant that it often looked like: HTTP 200 OK Allow: GET, OPTIONS Content-Type: application/json Vary: Accept { "key": "value", "key2": "value2" } This change removes those leading spaces, so that it will now look like: HTTP 200 OK Allow: GET, OPTIONS Content-Type: application/json Vary: Accept { "key": "value", "key2": "value2" } --- rest_framework/templates/rest_framework/base.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rest_framework/templates/rest_framework/base.html b/rest_framework/templates/rest_framework/base.html index 7f5170a62..5df23b767 100644 --- a/rest_framework/templates/rest_framework/base.html +++ b/rest_framework/templates/rest_framework/base.html @@ -150,10 +150,10 @@

- 
HTTP {{ response.status_code }} {{ response.status_text }}{% autoescape off %}
-  {% for key, val in response_headers.items %}{{ key }}: {{ val|break_long_headers|urlize_quoted_links }}
-  {% endfor %}
-  {{ content|urlize_quoted_links }}
{% endautoescape %} + 
HTTP {{ response.status_code }} {{ response.status_text }}{% autoescape off %}{% for key, val in response_headers.items %}
+{{ key }}: {{ val|break_long_headers|urlize_quoted_links }}{% endfor %}
+
+{{ content|urlize_quoted_links }}
{% endautoescape %}
From fe96ceced08fa36db122deeb53e525e25e3f3daf Mon Sep 17 00:00:00 2001 From: Ollie Ford Date: Sat, 17 Sep 2016 03:13:34 +0100 Subject: [PATCH 250/457] fixes response rendering with empty context (#4495) This commit allows `response.render` to be called when `response.rendered_context == {}`. This should be allowed, since if [the JSONRenderer, for example](https://github.com/tomchristie/django-rest-framework/blob/master/rest_framework/renderers.py#L85-L92) receives a `None` context, it sets it to an empty dictionary itself. --- rest_framework/response.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/response.py b/rest_framework/response.py index 4b863cb99..cb0f290ce 100644 --- a/rest_framework/response.py +++ b/rest_framework/response.py @@ -56,7 +56,7 @@ class Response(SimpleTemplateResponse): assert renderer, ".accepted_renderer not set on Response" assert accepted_media_type, ".accepted_media_type not set on Response" - assert context, ".renderer_context not set on Response" + assert context is not None, ".renderer_context not set on Response" context['response'] = self media_type = renderer.media_type From 76cc2f031940c2440f27c0070ee709f7f1304fe5 Mon Sep 17 00:00:00 2001 From: Jozef Knaperek Date: Mon, 19 Sep 2016 21:52:06 +0200 Subject: [PATCH 251/457] Rename an invalid reference to BasicToken in the docs --- docs/api-guide/authentication.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/authentication.md b/docs/api-guide/authentication.md index 8d880b037..bf3a31eb7 100644 --- a/docs/api-guide/authentication.md +++ b/docs/api-guide/authentication.md @@ -148,7 +148,7 @@ For clients to authenticate, the token key should be included in the `Authorizat If successfully authenticated, `TokenAuthentication` provides the following credentials. * `request.user` will be a Django `User` instance. -* `request.auth` will be a `rest_framework.authtoken.models.BasicToken` instance. +* `request.auth` will be a `rest_framework.authtoken.models.Token` instance. Unauthenticated responses that are denied permission will result in an `HTTP 401 Unauthorized` response with an appropriate WWW-Authenticate header. For example: From be74d11165c364687ecc41bc6eb0970af24670fa Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 21 Sep 2016 11:49:09 +0100 Subject: [PATCH 252/457] Fallback behavior for request parsing when request.POST already accessed. (#4500) --- rest_framework/request.py | 27 +++++++++++++++++++++--- tests/test_parsers.py | 43 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 66 insertions(+), 4 deletions(-) diff --git a/rest_framework/request.py b/rest_framework/request.py index 355cccad7..0a827728a 100644 --- a/rest_framework/request.py +++ b/rest_framework/request.py @@ -15,6 +15,7 @@ import sys from django.conf import settings from django.http import QueryDict from django.http.multipartparser import parse_header +from django.http.request import RawPostDataException from django.utils import six from django.utils.datastructures import MultiValueDict @@ -263,10 +264,20 @@ class Request(object): if content_length == 0: self._stream = None - elif hasattr(self._request, 'read'): + elif not self._request._read_started: self._stream = self._request else: - self._stream = six.BytesIO(self.raw_post_data) + self._stream = six.BytesIO(self.body) + + def _supports_form_parsing(self): + """ + Return True if this requests supports parsing form data. + """ + form_media = ( + 'application/x-www-form-urlencoded', + 'multipart/form-data' + ) + return any([parser.media_type in form_media for parser in self.parsers]) def _parse(self): """ @@ -274,8 +285,18 @@ class Request(object): May raise an `UnsupportedMediaType`, or `ParseError` exception. """ - stream = self.stream media_type = self.content_type + try: + stream = self.stream + except RawPostDataException: + if not hasattr(self._request, '_post'): + raise + # If request.POST has been accessed in middleware, and a method='POST' + # request was made with 'multipart/form-data', then the request stream + # will already have been exhausted. + if self._supports_form_parsing(): + return (self._request.POST, self._request.FILES) + stream = None if stream is None or media_type is None: empty_data = QueryDict('', encoding=self._request._encoding) diff --git a/tests/test_parsers.py b/tests/test_parsers.py index f3af6817f..5052e2e53 100644 --- a/tests/test_parsers.py +++ b/tests/test_parsers.py @@ -7,11 +7,16 @@ from django import forms from django.core.files.uploadhandler import ( MemoryFileUploadHandler, TemporaryFileUploadHandler ) +from django.http.request import RawPostDataException from django.test import TestCase from django.utils.six.moves import StringIO from rest_framework.exceptions import ParseError -from rest_framework.parsers import FileUploadParser, FormParser +from rest_framework.parsers import ( + FileUploadParser, FormParser, JSONParser, MultiPartParser +) +from rest_framework.request import Request +from rest_framework.test import APIRequestFactory class Form(forms.Form): @@ -122,3 +127,39 @@ class TestFileUploadParser(TestCase): def __replace_content_disposition(self, disposition): self.parser_context['request'].META['HTTP_CONTENT_DISPOSITION'] = disposition + + +class TestPOSTAccessed(TestCase): + def setUp(self): + self.factory = APIRequestFactory() + + def test_post_accessed_in_post_method(self): + django_request = self.factory.post('/', {'foo': 'bar'}) + request = Request(django_request, parsers=[FormParser(), MultiPartParser()]) + django_request.POST + assert request.POST == {'foo': ['bar']} + assert request.data == {'foo': ['bar']} + + def test_post_accessed_in_post_method_with_json_parser(self): + django_request = self.factory.post('/', {'foo': 'bar'}) + request = Request(django_request, parsers=[JSONParser()]) + django_request.POST + assert request.POST == {} + assert request.data == {} + + def test_post_accessed_in_put_method(self): + django_request = self.factory.put('/', {'foo': 'bar'}) + request = Request(django_request, parsers=[FormParser(), MultiPartParser()]) + django_request.POST + assert request.POST == {'foo': ['bar']} + assert request.data == {'foo': ['bar']} + + def test_request_read_before_parsing(self): + django_request = self.factory.put('/', {'foo': 'bar'}) + request = Request(django_request, parsers=[FormParser(), MultiPartParser()]) + django_request.read() + with pytest.raises(RawPostDataException): + request.POST + with pytest.raises(RawPostDataException): + request.POST + request.data From 7ab4a587d981f45ca440c53fa5514ad57e80abc3 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 21 Sep 2016 12:24:26 +0100 Subject: [PATCH 253/457] Version 3.4.7 (#4501) --- docs/topics/release-notes.md | 28 ++++++++++++++++++++++++++++ rest_framework/__init__.py | 2 +- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index 63aa4e4a3..446abdd14 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -40,6 +40,18 @@ You can determine your currently installed version using `pip freeze`: ## 3.4.x series +### 3.4.7 + +**Date**: [21st September 2016][3.4.7-milestone] + +* Fallback behavior for request parsing when request.POST already accessed. ([#3951][gh3951], [#4500][gh4500]) +* Fix regression of `RegexField`. ([#4489][gh4489], [#4490][gh4490], [#2617][gh2617]) +* Missing comma in `admin.html` causing CSRF error. ([#4472][gh4472], [#4473][gh4473]) +* Fix response rendering with empty context. ([#4495][gh4495]) +* Fix indentation regression in API listing. ([#4493][gh4493]) +* Fixed an issue where the incorrect value is set to `ResolverMatch.func_name` of api_view decorated view. ([#4465][gh4465], [#4462][gh4462]) +* Fix `APIClient.get()` when path contains unicode arguments ([#4458][gh4458]) + ### 3.4.6 **Date**: [23rd August 2016][3.4.6-milestone] @@ -583,6 +595,7 @@ For older release notes, [please see the version 2.x documentation][old-release- [3.4.4-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.4.4+Release%22 [3.4.5-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.4.5+Release%22 [3.4.6-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.4.6+Release%22 +[3.4.7-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.4.7+Release%22 [gh2013]: https://github.com/tomchristie/django-rest-framework/issues/2013 @@ -1109,3 +1122,18 @@ For older release notes, [please see the version 2.x documentation][old-release- [gh3508]: https://github.com/tomchristie/django-rest-framework/issues/3508 [gh4419]: https://github.com/tomchristie/django-rest-framework/issues/4419 [gh4423]: https://github.com/tomchristie/django-rest-framework/issues/4423 + + + +[gh3951]: https://github.com/tomchristie/django-rest-framework/issues/3951 +[gh4500]: https://github.com/tomchristie/django-rest-framework/issues/4500 +[gh4489]: https://github.com/tomchristie/django-rest-framework/issues/4489 +[gh4490]: https://github.com/tomchristie/django-rest-framework/issues/4490 +[gh2617]: https://github.com/tomchristie/django-rest-framework/issues/2617 +[gh4472]: https://github.com/tomchristie/django-rest-framework/issues/4472 +[gh4473]: https://github.com/tomchristie/django-rest-framework/issues/4473 +[gh4495]: https://github.com/tomchristie/django-rest-framework/issues/4495 +[gh4493]: https://github.com/tomchristie/django-rest-framework/issues/4493 +[gh4465]: https://github.com/tomchristie/django-rest-framework/issues/4465 +[gh4462]: https://github.com/tomchristie/django-rest-framework/issues/4462 +[gh4458]: https://github.com/tomchristie/django-rest-framework/issues/4458 diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py index d99d82d23..457af6c88 100644 --- a/rest_framework/__init__.py +++ b/rest_framework/__init__.py @@ -8,7 +8,7 @@ ______ _____ _____ _____ __ """ __title__ = 'Django REST framework' -__version__ = '3.4.6' +__version__ = '3.4.7' __author__ = 'Tom Christie' __license__ = 'BSD 2-Clause' __copyright__ = 'Copyright 2011-2016 Tom Christie' From b82ec540ad447dcf703a9b21e9e94976109fd175 Mon Sep 17 00:00:00 2001 From: Dmitry Dygalo Date: Sat, 24 Sep 2016 00:03:02 +0200 Subject: [PATCH 254/457] Remove code for old Django versions (#4513) --- rest_framework/views.py | 1 - rest_framework/viewsets.py | 4 ---- 2 files changed, 5 deletions(-) diff --git a/rest_framework/views.py b/rest_framework/views.py index 15d8c6cde..e178a209f 100644 --- a/rest_framework/views.py +++ b/rest_framework/views.py @@ -126,7 +126,6 @@ class APIView(View): 'Use `.all()` or call `.get_queryset()` instead.' ) cls.queryset._fetch_all = force_evaluation - cls.queryset._result_iter = force_evaluation # Django <= 1.5 view = super(APIView, cls).as_view(**initkwargs) view.cls = cls diff --git a/rest_framework/viewsets.py b/rest_framework/viewsets.py index bd8333504..a9dc632ff 100644 --- a/rest_framework/viewsets.py +++ b/rest_framework/viewsets.py @@ -79,10 +79,6 @@ class ViewSetMixin(object): handler = getattr(self, action) setattr(self, method, handler) - # Patch this in as it's otherwise only present from 1.5 onwards - if hasattr(self, 'get') and not hasattr(self, 'head'): - self.head = self.get - # And continue as usual return self.dispatch(request, *args, **kwargs) From 38aa0ac28131f6c32cc3359efcf734012fb435d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= Date: Wed, 28 Sep 2016 00:05:22 -0400 Subject: [PATCH 255/457] Update Django security releases 1.9.10 and 1.8.15 --- tox.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index 1e8a7e5c4..8c20faa2b 100644 --- a/tox.ini +++ b/tox.ini @@ -15,8 +15,8 @@ setenv = PYTHONDONTWRITEBYTECODE=1 PYTHONWARNINGS=once deps = - django18: Django==1.8.14 - django19: Django==1.9.9 + django18: Django==1.8.15 + django19: Django==1.9.10 django110: Django==1.10 djangomaster: https://github.com/django/django/archive/master.tar.gz -rrequirements/requirements-testing.txt From e7fd166048de8017c11152b102a80602a80d20c1 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 29 Sep 2016 21:29:21 +0100 Subject: [PATCH 256/457] Docs tweaks --- docs/api-guide/relations.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/docs/api-guide/relations.md b/docs/api-guide/relations.md index 8695b2c1e..42533823c 100644 --- a/docs/api-guide/relations.md +++ b/docs/api-guide/relations.md @@ -286,7 +286,7 @@ Would serialize to a nested representation like this: ], } -# Writable nested serializers +## Writable nested serializers By default nested serializers are read-only. If you want to support write-operations to a nested serializer field you'll need to create `create()` and/or `update()` methods in order to explicitly specify how the child relationships should be saved. @@ -324,8 +324,14 @@ By default nested serializers are read-only. If you want to support write-operat >>> serializer.save() +--- + # Custom relational fields +In rare cases where none of the existing relational styles fit the representation you need, +you can implement a completely custom relational field, that describes exactly how the +output representation should be generated from the model instance. + 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. If you want to implement a read-write relational field, you must also implement the `.to_internal_value(self, data)` method. From 73fd1ff4e71bec2cb70e8e0bd659712af98fa6d4 Mon Sep 17 00:00:00 2001 From: Manjit Kumar Date: Fri, 30 Sep 2016 16:32:23 +0530 Subject: [PATCH 257/457] add drf-url-filters app to django-rest-framework in filtering docs (#4528) - enabling validtions on incoming query params with the ease of adding new filters as easy as adding a new key in a dict. --- docs/api-guide/filtering.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/api-guide/filtering.md b/docs/api-guide/filtering.md index 0ccd51dd3..bc502e970 100644 --- a/docs/api-guide/filtering.md +++ b/docs/api-guide/filtering.md @@ -432,6 +432,10 @@ The [djangorestframework-word-filter][django-rest-framework-word-search-filter] [django-url-filter][django-url-filter] provides a safe way to filter data via human-friendly URLs. It works very similar to DRF serializers and fields in a sense that they can be nested except they are called filtersets and filters. That provides easy way to filter related data. Also this library is generic-purpose so it can be used to filter other sources of data and not only Django `QuerySet`s. +## drf-url-filters + +[drf-url-filter][drf-url-filter] is a simple Django app to apply filters on drf `ModelViewSet`'s `Queryset` in a clean, simple and configurable way. It also supports validations on incoming query params and their values. A beautiful python package `Voluptouos` is being used for validations on the incoming query parameters. The best part about voluptouos is you can define your own validations as per your query params requirements. + [cite]: https://docs.djangoproject.com/en/dev/topics/db/queries/#retrieving-specific-objects-with-filters [django-filter]: https://github.com/alex/django-filter [django-filter-docs]: https://django-filter.readthedocs.io/en/latest/index.html @@ -443,3 +447,5 @@ The [djangorestframework-word-filter][django-rest-framework-word-search-filter] [django-rest-framework-filters]: https://github.com/philipn/django-rest-framework-filters [django-rest-framework-word-search-filter]: https://github.com/trollknurr/django-rest-framework-word-search-filter [django-url-filter]: https://github.com/miki725/django-url-filter +[drf-url-filter]: https://github.com/manjitkumar/drf-url-filters + From 1b882f7281b475a8cb6eb993299d3ec2248dc535 Mon Sep 17 00:00:00 2001 From: Danilo Bargen Date: Fri, 30 Sep 2016 18:06:36 +0200 Subject: [PATCH 258/457] Add drf-dynamic-fields to third party packages (#4530) --- docs/api-guide/serializers.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md index 5772d940a..290e32f4f 100644 --- a/docs/api-guide/serializers.md +++ b/docs/api-guide/serializers.md @@ -1089,6 +1089,7 @@ The following third party packages are also available. The [django-rest-marshmallow][django-rest-marshmallow] package provides an alternative implementation for serializers, using the python [marshmallow][marshmallow] library. It exposes the same API as the REST framework serializers, and can be used as a drop-in replacement in some use-cases. ## Serpy + The [serpy][serpy] package is an alternative implementation for serializers that is built for speed. [Serpy][serpy] serializes complex datatypes to simple native types. The native types can be easily converted to JSON or any other format needed. ## MongoengineModelSerializer @@ -1107,7 +1108,12 @@ The [django-rest-framework-hstore][django-rest-framework-hstore] package provide The [dynamic-rest][dynamic-rest] package extends the ModelSerializer and ModelViewSet interfaces, adding API query parameters for filtering, sorting, and including / excluding all fields and relationships defined by your serializers. +## Dynamic Fields Mixin + +The [drf-dynamic-fields][drf-dynamic-fields] package provides a mixin to dynamically limit the fields per serializer to a subset specified by an URL parameter. + ## HTML JSON Forms + The [html-json-forms][html-json-forms] package provides an algorithm and serializer for processing `
` submissions per the (inactive) [HTML JSON Form specification][json-form-spec]. The serializer facilitates processing of arbitrarily nested JSON structures within HTML. For example, `` will be interpreted as `{"items": [{"id": "5"}]}`. [cite]: https://groups.google.com/d/topic/django-users/sVFaOfQi4wY/discussion @@ -1124,3 +1130,4 @@ The [html-json-forms][html-json-forms] package provides an algorithm and seriali [dynamic-rest]: https://github.com/AltSchool/dynamic-rest [html-json-forms]: https://github.com/wq/html-json-forms [json-form-spec]: https://www.w3.org/TR/html-json-forms/ +[drf-dynamic-fields]: https://github.com/dbrgn/drf-dynamic-fields From b8fcb7807a11f37c88e9bfc6eaf999875e392114 Mon Sep 17 00:00:00 2001 From: Angel Velasquez Date: Sun, 2 Oct 2016 03:11:40 -0300 Subject: [PATCH 259/457] Update Django security release 1.10.2 --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 8c20faa2b..48cecccf7 100644 --- a/tox.ini +++ b/tox.ini @@ -17,7 +17,7 @@ setenv = deps = django18: Django==1.8.15 django19: Django==1.9.10 - django110: Django==1.10 + django110: Django==1.10.2 djangomaster: https://github.com/django/django/archive/master.tar.gz -rrequirements/requirements-testing.txt -rrequirements/requirements-optionals.txt From 883efbc19fb124db7741caad512afb5b482e291d Mon Sep 17 00:00:00 2001 From: Rowan Seymour Date: Tue, 4 Oct 2016 14:44:50 +0200 Subject: [PATCH 260/457] Case insensitive uniqueness validation (#4534) --- docs/api-guide/validators.md | 1 + rest_framework/validators.py | 5 +++-- tests/test_validators.py | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/docs/api-guide/validators.md b/docs/api-guide/validators.md index f04c74c3c..9df15ec15 100644 --- a/docs/api-guide/validators.md +++ b/docs/api-guide/validators.md @@ -61,6 +61,7 @@ It takes a single required argument, and an optional `messages` argument: * `queryset` *required* - This is the queryset against which uniqueness should be enforced. * `message` - The error message that should be used when validation fails. +* `lookup` - The lookup used to find an existing instance with the value being validated. Defaults to `'exact'`. This validator should be applied to *serializer fields*, like so: diff --git a/rest_framework/validators.py b/rest_framework/validators.py index ef23b9bd7..84af0b9d5 100644 --- a/rest_framework/validators.py +++ b/rest_framework/validators.py @@ -42,10 +42,11 @@ class UniqueValidator(object): """ message = _('This field must be unique.') - def __init__(self, queryset, message=None): + def __init__(self, queryset, message=None, lookup='exact'): self.queryset = queryset self.serializer_field = None self.message = message or self.message + self.lookup = lookup def set_context(self, serializer_field): """ @@ -62,7 +63,7 @@ class UniqueValidator(object): """ Filter the queryset to all instances matching the given attribute. """ - filter_kwargs = {self.field_name: value} + filter_kwargs = {'%s__%s' % (self.field_name, self.lookup): value} return qs_filter(queryset, **filter_kwargs) def exclude_current_instance(self, queryset): diff --git a/tests/test_validators.py b/tests/test_validators.py index ebc8b899f..ab2c87c11 100644 --- a/tests/test_validators.py +++ b/tests/test_validators.py @@ -31,7 +31,7 @@ class RelatedModel(models.Model): class RelatedModelSerializer(serializers.ModelSerializer): username = serializers.CharField(source='user.username', - validators=[UniqueValidator(queryset=UniquenessModel.objects.all())]) # NOQA + validators=[UniqueValidator(queryset=UniquenessModel.objects.all(), lookup='iexact')]) # NOQA class Meta: model = RelatedModel @@ -103,7 +103,7 @@ class TestUniquenessValidation(TestCase): AnotherUniquenessModel._meta.get_field('code').validators, []) def test_related_model_is_unique(self): - data = {'username': 'existing', 'email': 'new-email@example.com'} + data = {'username': 'Existing', 'email': 'new-email@example.com'} rs = RelatedModelSerializer(data=data) self.assertFalse(rs.is_valid()) self.assertEqual(rs.errors, From 915ac22aeb5cce447ea20863c594387d71159826 Mon Sep 17 00:00:00 2001 From: Alex Kahan Date: Tue, 4 Oct 2016 16:22:56 -0400 Subject: [PATCH 261/457] Adding tests for rest_framework.py (#4523) --- tests/test_templatetags.py | 145 ++++++++++++++++++++++++++++++++++++- 1 file changed, 144 insertions(+), 1 deletion(-) diff --git a/tests/test_templatetags.py b/tests/test_templatetags.py index ac218df21..28390320b 100644 --- a/tests/test_templatetags.py +++ b/tests/test_templatetags.py @@ -3,14 +3,24 @@ from __future__ import unicode_literals from django.test import TestCase +from rest_framework.relations import Hyperlink from rest_framework.templatetags.rest_framework import ( - add_query_param, urlize_quoted_links + add_nested_class, add_query_param, format_value, urlize_quoted_links ) from rest_framework.test import APIRequestFactory factory = APIRequestFactory() +def format_html(html): + """ + Helper function that formats HTML in order for easier comparison + :param html: raw HTML text to be formatted + :return: Cleaned HTML with no newlines or spaces + """ + return html.replace('\n', '').replace(' ', '') + + class TemplateTagTests(TestCase): def test_add_query_param_with_non_latin_character(self): @@ -22,6 +32,139 @@ class TemplateTagTests(TestCase): self.assertIn("q=%E6%9F%A5%E8%AF%A2", json_url) self.assertIn("format=json", json_url) + def test_format_value_boolean_or_none(self): + """ + Tests format_value with booleans and None + """ + self.assertEqual(format_value(True), 'true') + self.assertEqual(format_value(False), 'false') + self.assertEqual(format_value(None), 'null') + + def test_format_value_hyperlink(self): + url = 'http://url.com' + name = 'name_of_url' + hyperlink = Hyperlink(url, name) + self.assertEqual(format_value(hyperlink), '%s' % (url, name)) + + def test_format_value_list(self): + """ + Tests format_value with a list of strings + """ + list_items = ['item1', 'item2', 'item3'] + self.assertEqual(format_value(list_items), '\n item1, item2, item3\n') + self.assertEqual(format_value([]), '\n\n') + + def test_format_value_table(self): + """ + Tests format_value with a list of lists/dicts + """ + list_of_lists = [['list1'], ['list2'], ['list3']] + expected_list_format = """ + + + + 0 + list1 + + + 1 + list2 + + + 2 + list3 + + + """ + self.assertEqual( + format_html(format_value(list_of_lists)), + format_html(expected_list_format) + ) + + expected_dict_format = """ + + + + 0 + + + + 1 + + + + 2 + + + + """ + + list_of_dicts = [{'item1': 'value1'}, {'item2': 'value2'}, {'item3': 'value3'}] + self.assertEqual( + format_html(format_value(list_of_dicts)), + format_html(expected_dict_format) + ) + + def test_format_value_simple_string(self): + """ + Tests format_value with a simple string + """ + simple_string = 'this is an example of a string' + self.assertEqual(format_value(simple_string), simple_string) + + def test_format_value_string_hyperlink(self): + """ + Tests format_value with a url + """ + url = 'http://www.example.com' + self.assertEqual(format_value(url), 'http://www.example.com') + + def test_format_value_string_email(self): + """ + Tests format_value with an email address + """ + email = 'something@somewhere.com' + self.assertEqual(format_value(email), 'something@somewhere.com') + + def test_format_value_string_newlines(self): + """ + Tests format_value with a string with newline characters + :return: + """ + text = 'Dear user, \n this is a message \n from,\nsomeone' + self.assertEqual(format_value(text), '
Dear user, \n this is a message \n from,\nsomeone
') + + def test_format_value_object(self): + """ + Tests that format_value with a object returns the object's __str__ method + """ + obj = object() + self.assertEqual(format_value(obj), obj.__str__()) + + def test_add_nested_class(self): + """ + Tests that add_nested_class returns the proper class + """ + positive_cases = [ + [['item']], + [{'item1': 'value1'}], + {'item1': 'value1'} + ] + + negative_cases = [ + ['list'], + '', + None, + True, + False + ] + + for case in positive_cases: + self.assertEqual(add_nested_class(case), 'class=nested') + + for case in negative_cases: + self.assertEqual(add_nested_class(case), '') + class Issue1386Tests(TestCase): """ From 4ff9e96b4c3e75b9f799c7c401a4560f97e21b3a Mon Sep 17 00:00:00 2001 From: Alex Kahan Date: Wed, 5 Oct 2016 04:54:59 -0400 Subject: [PATCH 262/457] Adding tests to encoder.py (#4536) --- tests/test_encoders.py | 81 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 tests/test_encoders.py diff --git a/tests/test_encoders.py b/tests/test_encoders.py new file mode 100644 index 000000000..d6f681932 --- /dev/null +++ b/tests/test_encoders.py @@ -0,0 +1,81 @@ +from datetime import date, datetime, timedelta, tzinfo +from decimal import Decimal +from uuid import uuid4 + +from django.test import TestCase + +from rest_framework.utils.encoders import JSONEncoder + + +class JSONEncoderTests(TestCase): + """ + Tests the JSONEncoder method + """ + + def setUp(self): + self.encoder = JSONEncoder() + + def test_encode_decimal(self): + """ + Tests encoding a decimal + """ + d = Decimal(3.14) + self.assertEqual(d, float(d)) + + def test_encode_datetime(self): + """ + Tests encoding a datetime object + """ + current_time = datetime.now() + self.assertEqual(self.encoder.default(current_time), current_time.isoformat()) + + def test_encode_time(self): + """ + Tests encoding a timezone + """ + current_time = datetime.now().time() + self.assertEqual(self.encoder.default(current_time), current_time.isoformat()[:12]) + + def test_encode_time_tz(self): + """ + Tests encoding a timezone aware timestamp + """ + + class UTC(tzinfo): + """ + Class extending tzinfo to mimic UTC time + """ + def utcoffset(self, dt): + return timedelta(0) + + def tzname(self, dt): + return "UTC" + + def dst(self, dt): + return timedelta(0) + + current_time = datetime.now().time() + current_time = current_time.replace(tzinfo=UTC()) + with self.assertRaises(ValueError): + self.encoder.default(current_time) + + def test_encode_date(self): + """ + Tests encoding a date object + """ + current_date = date.today() + self.assertEqual(self.encoder.default(current_date), current_date.isoformat()) + + def test_encode_timedelta(self): + """ + Tests encoding a timedelta object + """ + delta = timedelta(hours=1) + self.assertEqual(self.encoder.default(delta), str(delta.total_seconds())) + + def test_encode_uuid(self): + """ + Tests encoding a UUID object + """ + unique_id = uuid4() + self.assertEqual(self.encoder.default(unique_id), str(unique_id)) From e99b30d28b9173c38bb238b6d5af50a1797884eb Mon Sep 17 00:00:00 2001 From: Camille Harang Date: Mon, 10 Oct 2016 12:59:02 +0200 Subject: [PATCH 263/457] =?UTF-8?q?Fix=20rest=5Fframework.filters.Ordering?= =?UTF-8?q?Filter=20doesn't=20pass=20context=20to=20ser=E2=80=A6=20(#4543)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fix rest_framework.filters.OrderingFilter doesn't pass context to serializers #4541 * #4541 Additional fix for remove_invalid_fields() --- rest_framework/filters.py | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/rest_framework/filters.py b/rest_framework/filters.py index aaf313491..0050ee7cd 100644 --- a/rest_framework/filters.py +++ b/rest_framework/filters.py @@ -252,7 +252,7 @@ class OrderingFilter(BaseFilterBackend): params = request.query_params.get(self.ordering_param) if params: fields = [param.strip() for param in params.split(',')] - ordering = self.remove_invalid_fields(queryset, fields, view) + ordering = self.remove_invalid_fields(queryset, fields, view, request) if ordering: return ordering @@ -265,7 +265,7 @@ class OrderingFilter(BaseFilterBackend): return (ordering,) return ordering - def get_default_valid_fields(self, queryset, view): + def get_default_valid_fields(self, queryset, view, context={}): # If `ordering_fields` is not specified, then we determine a default # based on the serializer class, if one exists on the view. if hasattr(view, 'get_serializer_class'): @@ -288,16 +288,16 @@ class OrderingFilter(BaseFilterBackend): return [ (field.source or field_name, field.label) - for field_name, field in serializer_class().fields.items() + for field_name, field in serializer_class(context=context).fields.items() if not getattr(field, 'write_only', False) and not field.source == '*' ] - def get_valid_fields(self, queryset, view): + def get_valid_fields(self, queryset, view, context={}): valid_fields = getattr(view, 'ordering_fields', self.ordering_fields) if valid_fields is None: # Default to allowing filtering on serializer fields - return self.get_default_valid_fields(queryset, view) + return self.get_default_valid_fields(queryset, view, context) elif valid_fields == '__all__': # View explicitly allows filtering on any model field @@ -316,8 +316,8 @@ class OrderingFilter(BaseFilterBackend): return valid_fields - def remove_invalid_fields(self, queryset, fields, view): - valid_fields = [item[0] for item in self.get_valid_fields(queryset, view)] + def remove_invalid_fields(self, queryset, fields, view, request): + valid_fields = [item[0] for item in self.get_valid_fields(queryset, view, {'request': request})] return [term for term in fields if term.lstrip('-') in valid_fields] def filter_queryset(self, request, queryset, view): @@ -332,15 +332,16 @@ class OrderingFilter(BaseFilterBackend): current = self.get_ordering(request, queryset, view) current = None if current is None else current[0] options = [] - for key, label in self.get_valid_fields(queryset, view): - options.append((key, '%s - %s' % (label, _('ascending')))) - options.append(('-' + key, '%s - %s' % (label, _('descending')))) - return { + context = { 'request': request, 'current': current, 'param': self.ordering_param, - 'options': options, } + for key, label in self.get_valid_fields(queryset, view, context): + options.append((key, '%s - %s' % (label, _('ascending')))) + options.append(('-' + key, '%s - %s' % (label, _('descending')))) + context['options'] = options + return context def to_html(self, request, queryset, view): template = loader.get_template(self.template) From d49e26f1279adb8f36818358281279dc124522c6 Mon Sep 17 00:00:00 2001 From: Manjit Kumar Date: Mon, 10 Oct 2016 17:05:38 +0530 Subject: [PATCH 264/457] add drf-url-filters in third party filtering resources and fixed typo (#4548) --- docs/api-guide/filtering.md | 2 +- docs/topics/third-party-resources.md | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/api-guide/filtering.md b/docs/api-guide/filtering.md index bc502e970..ab7e5fa77 100644 --- a/docs/api-guide/filtering.md +++ b/docs/api-guide/filtering.md @@ -434,7 +434,7 @@ The [djangorestframework-word-filter][django-rest-framework-word-search-filter] ## drf-url-filters -[drf-url-filter][drf-url-filter] is a simple Django app to apply filters on drf `ModelViewSet`'s `Queryset` in a clean, simple and configurable way. It also supports validations on incoming query params and their values. A beautiful python package `Voluptouos` is being used for validations on the incoming query parameters. The best part about voluptouos is you can define your own validations as per your query params requirements. +[drf-url-filter][drf-url-filter] is a simple Django app to apply filters on drf `ModelViewSet`'s `Queryset` in a clean, simple and configurable way. It also supports validations on incoming query params and their values. A beautiful python package `Voluptuous` is being used for validations on the incoming query parameters. The best part about voluptuous is you can define your own validations as per your query params requirements. [cite]: https://docs.djangoproject.com/en/dev/topics/db/queries/#retrieving-specific-objects-with-filters [django-filter]: https://github.com/alex/django-filter diff --git a/docs/topics/third-party-resources.md b/docs/topics/third-party-resources.md index 4366269bb..3fba9b5da 100644 --- a/docs/topics/third-party-resources.md +++ b/docs/topics/third-party-resources.md @@ -238,6 +238,7 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque * [djangorestframework-chain][djangorestframework-chain] - Allows arbitrary chaining of both relations and lookup filters. * [django-url-filter][django-url-filter] - Allows a safe way to filter data via human-friendly URLs. It is a generic library which is not tied to DRF but it provides easy integration with DRF. +* [drf-url-filter][drf-url-filter] is a simple Django app to apply filters on drf `ModelViewSet`'s `Queryset` in a clean, simple and configurable way. It also supports validations on incoming query params and their values. ### Misc @@ -351,6 +352,7 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque [django-rest-framework-braces]: https://github.com/dealertrack/django-rest-framework-braces [dry-rest-permissions]: https://github.com/Helioscene/dry-rest-permissions [django-url-filter]: https://github.com/miki725/django-url-filter +[drf-url-filter]: https://github.com/manjitkumar/drf-url-filters [cookiecutter-django-rest]: https://github.com/agconti/cookiecutter-django-rest [drf-haystack]: https://drf-haystack.readthedocs.io/en/latest/ [django-rest-framework-version-transforms]: https://github.com/mrhwick/django-rest-framework-version-transforms From 0dec36eb413c98902d997ebd2f9cb2b7111e6e56 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 10 Oct 2016 13:03:46 +0100 Subject: [PATCH 265/457] Version 3.5 (#4525) * Start test case * Added 'requests' test client * Address typos * Graceful fallback if requests is not installed. * Add cookie support * Tests for auth and CSRF * Py3 compat * py3 compat * py3 compat * Add get_requests_client * Added SchemaGenerator.should_include_link * add settings for html cutoff on related fields * Router doesn't work if prefix is blank, though project urls.py handles prefix * Fix Django 1.10 to-many deprecation * Add django.core.urlresolvers compatibility * Update django-filter & django-guardian * Check for empty router prefix; adjust URL accordingly It's easiest to fix this issue after we have made the regex. To try to fix it before would require doing something different for List vs Detail, which means we'd have to know which type of url we're constructing before acting accordingly. * Fix misc django deprecations * Use TOC extension instead of header * Fix deprecations for py3k * Add py3k compatibility to is_simple_callable * Add is_simple_callable tests * Drop python 3.2 support (EOL, Dropped by Django) * schema_renderers= should *set* the renderers, not append to them. * API client (#4424) * Fix release notes * Add note about 'User account is disabled.' vs 'Unable to log in' * Clean up schema generation (#4527) * Handle multiple methods on custom action (#4529) * RequestsClient, CoreAPIClient * exclude_from_schema * Added 'get_schema_view()' shortcut * Added schema descriptions * Better descriptions for schemas * Add type annotation to schema generation * Coerce schema 'pk' in path to actual field name * Deprecations move into assertion errors * Use get_schema_view in tests * Updte CoreJSON media type * Handle schema structure correctly when path prefixs exist. Closes #4401 * Add PendingDeprecation to Router schema generation. * Added SCHEMA_COERCE_PATH_PK and SCHEMA_COERCE_METHOD_NAMES * Renamed and documented 'get_schema_fields' interface. --- .travis.yml | 1 - docs/api-guide/filtering.md | 6 + docs/api-guide/pagination.md | 6 + docs/api-guide/relations.md | 2 + docs/api-guide/reverse.md | 4 +- docs/api-guide/schemas.md | 140 +++-- docs/api-guide/settings.md | 38 ++ docs/api-guide/testing.md | 95 ++- docs/api-guide/views.md | 12 +- docs/tutorial/1-serialization.md | 14 +- docs/tutorial/2-requests-and-responses.md | 8 +- docs/tutorial/3-class-based-views.md | 18 +- .../4-authentication-and-permissions.md | 4 +- .../5-relationships-and-hyperlinked-apis.md | 14 +- docs/tutorial/6-viewsets-and-routers.md | 6 +- .../7-schemas-and-client-libraries.md | 47 +- requirements/requirements-optionals.txt | 6 +- rest_framework/__init__.py | 2 +- rest_framework/authtoken/serializers.py | 3 + rest_framework/compat.py | 40 +- rest_framework/decorators.py | 3 +- rest_framework/fields.py | 38 +- rest_framework/filters.py | 28 +- rest_framework/pagination.py | 34 +- rest_framework/relations.py | 37 +- rest_framework/renderers.py | 6 +- rest_framework/reverse.py | 6 +- rest_framework/routers.py | 79 ++- rest_framework/schemas.py | 551 +++++++++++++----- rest_framework/serializers.py | 29 +- rest_framework/settings.py | 11 + rest_framework/templatetags/rest_framework.py | 3 +- rest_framework/test.py | 127 ++++ rest_framework/urlpatterns.py | 2 +- rest_framework/utils/breadcrumbs.py | 2 +- rest_framework/views.py | 4 + tests/browsable_api/test_form_rendering.py | 1 + tests/conftest.py | 15 +- tests/test_api_client.py | 474 +++++++++++++++ tests/test_atomic_requests.py | 32 +- tests/test_authentication.py | 3 +- tests/test_fields.py | 62 ++ tests/test_filters.py | 6 +- tests/test_model_serializer.py | 7 +- tests/test_permissions.py | 11 +- tests/test_request.py | 5 +- tests/test_requests_client.py | 256 ++++++++ tests/test_reverse.py | 2 +- tests/test_routers.py | 49 ++ tests/test_schemas.py | 217 +++++-- tests/test_urlpatterns.py | 8 +- tests/utils.py | 2 +- tox.ini | 3 +- 53 files changed, 2132 insertions(+), 447 deletions(-) create mode 100644 tests/test_api_client.py create mode 100644 tests/test_requests_client.py diff --git a/.travis.yml b/.travis.yml index c9d9a1648..100a7cd8b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,6 @@ env: - TOX_ENV=py35-django18 - TOX_ENV=py34-django18 - TOX_ENV=py33-django18 - - TOX_ENV=py32-django18 - TOX_ENV=py27-django18 - TOX_ENV=py27-django110 - TOX_ENV=py35-django110 diff --git a/docs/api-guide/filtering.md b/docs/api-guide/filtering.md index ab7e5fa77..40a097174 100644 --- a/docs/api-guide/filtering.md +++ b/docs/api-guide/filtering.md @@ -416,6 +416,12 @@ Generic filters may also present an interface in the browsable API. To do so you The method should return a rendered HTML string. +## Pagination & schemas + +You can also make the filter controls available to the schema autogeneration +that REST framework provides, by implementing a `get_schema_fields()` method, +which should return a list of `coreapi.Field` instances. + # Third party packages The following third party packages provide additional filter implementations. diff --git a/docs/api-guide/pagination.md b/docs/api-guide/pagination.md index 088e07184..f990128c5 100644 --- a/docs/api-guide/pagination.md +++ b/docs/api-guide/pagination.md @@ -276,6 +276,12 @@ To have your custom pagination class be used by default, use the `DEFAULT_PAGINA API responses for list endpoints will now include a `Link` header, instead of including the pagination links as part of the body of the response, for example: +## Pagination & schemas + +You can also make the pagination controls available to the schema autogeneration +that REST framework provides, by implementing a `get_schema_fields()` method, +which should return a list of `coreapi.Field` instances. + --- ![Link Header][link-header] diff --git a/docs/api-guide/relations.md b/docs/api-guide/relations.md index 42533823c..8fde53d3a 100644 --- a/docs/api-guide/relations.md +++ b/docs/api-guide/relations.md @@ -463,6 +463,8 @@ There are two keyword arguments you can use to control this behavior: - `html_cutoff` - If set this will be the maximum number of choices that will be displayed by a HTML select drop down. Set to `None` to disable any limiting. Defaults to `1000`. - `html_cutoff_text` - If set this will display a textual indicator if the maximum number of items have been cutoff in an HTML select drop down. Defaults to `"More than {count} items…"` +You can also control these globally using the settings `HTML_SELECT_CUTOFF` and `HTML_SELECT_CUTOFF_TEXT`. + In cases where the cutoff is being enforced you may want to instead use a plain input field in the HTML form. You can do so using the `style` keyword argument. For example: assigned_to = serializers.SlugRelatedField( diff --git a/docs/api-guide/reverse.md b/docs/api-guide/reverse.md index 71fb83f9e..35d88e2db 100644 --- a/docs/api-guide/reverse.md +++ b/docs/api-guide/reverse.md @@ -23,7 +23,7 @@ There's no requirement for you to use them, but if you do then the self-describi **Signature:** `reverse(viewname, *args, **kwargs)` -Has the same behavior as [`django.core.urlresolvers.reverse`][reverse], except that it returns a fully qualified URL, using the request to determine the host and port. +Has the same behavior as [`django.urls.reverse`][reverse], except that it returns a fully qualified URL, using the request to determine the host and port. You should **include the request as a keyword argument** to the function, for example: @@ -44,7 +44,7 @@ You should **include the request as a keyword argument** to the function, for ex **Signature:** `reverse_lazy(viewname, *args, **kwargs)` -Has the same behavior as [`django.core.urlresolvers.reverse_lazy`][reverse-lazy], except that it returns a fully qualified URL, using the request to determine the host and port. +Has the same behavior as [`django.urls.reverse_lazy`][reverse-lazy], except that it returns a fully qualified URL, using the request to determine the host and port. As with the `reverse` function, you should **include the request as a keyword argument** to the function, for example: diff --git a/docs/api-guide/schemas.md b/docs/api-guide/schemas.md index 7f8af723e..16d2bbb01 100644 --- a/docs/api-guide/schemas.md +++ b/docs/api-guide/schemas.md @@ -102,15 +102,20 @@ REST framework includes functionality for auto-generating a schema, or allows you to specify one explicitly. There are a few different ways to add a schema to your API, depending on exactly what you need. -## Using DefaultRouter +## The get_schema_view shortcut -If you're using `DefaultRouter` then you can include an auto-generated schema, -simply by adding a `schema_title` argument to the router. +The simplest way to include a schema in your project is to use the +`get_schema_view()` function. - router = DefaultRouter(schema_title='Server Monitoring API') + schema_view = get_schema_view(title="Server Monitoring API") -The schema will be included at the root URL, `/`, and presented to clients -that include the Core JSON media type in their `Accept` header. + urlpatterns = [ + url('^$', schema_view), + ... + ] + +Once the view has been added, you'll be able to make API requests to retrieve +the auto-generated schema definition. $ http http://127.0.0.1:8000/ Accept:application/vnd.coreapi+json HTTP/1.0 200 OK @@ -125,48 +130,43 @@ that include the Core JSON media type in their `Accept` header. ... } -This is a great zero-configuration option for when you want to get up and -running really quickly. +The arguments to `get_schema_view()` are: -The other available options to `DefaultRouter` are: +#### `title` -#### schema_renderers +May be used to provide a descriptive title for the schema definition. -May be used to pass the set of renderer classes that can be used to render schema output. +#### `url` + +May be used to pass a canonical URL for the schema. + + schema_view = get_schema_view( + title='Server Monitoring API', + url='https://www.example.org/api/' + ) + +#### `renderer_classes` + +May be used to pass the set of renderer classes that can be used to render the API root endpoint. from rest_framework.renderers import CoreJSONRenderer from my_custom_package import APIBlueprintRenderer - router = DefaultRouter(schema_title='Server Monitoring API', schema_renderers=[ - CoreJSONRenderer, APIBlueprintRenderer - ]) - -#### schema_url - -May be used to pass the root URL for the schema. This can either be used to ensure that -the schema URLs include a canonical hostname and schema, or to ensure that all the -schema URLs include a path prefix. - - router = DefaultRouter( - schema_title='Server Monitoring API', - schema_url='https://www.example.org/api/' + schema_view = get_schema_view( + title='Server Monitoring API', + url='https://www.example.org/api/', + renderer_classes=[CoreJSONRenderer, APIBlueprintRenderer] ) -If you want more flexibility over the schema output then you'll need to consider -using `SchemaGenerator` instead. +## Using an explicit schema view -#### root_renderers - -May be used to pass the set of renderer classes that can be used to render the API root endpoint. - -## Using SchemaGenerator - -The most common way to add a schema to your API is to use the `SchemaGenerator` -class to auto-generate the `Document` instance, and to return that from a view. +If you need a little more control than the `get_schema_view()` shortcut gives you, +then you can use the `SchemaGenerator` class directly to auto-generate the +`Document` instance, and to return that from a view. This option gives you the flexibility of setting up the schema endpoint -with whatever behavior you want. For example, you can apply different -permission, throttling or authentication policies to the schema endpoint. +with whatever behaviour you want. For example, you can apply different +permission, throttling, or authentication policies to the schema endpoint. Here's an example of using `SchemaGenerator` together with a view to return the schema. @@ -176,12 +176,13 @@ return the schema. from rest_framework.decorators import api_view, renderer_classes from rest_framework import renderers, response, schemas + generator = schemas.SchemaGenerator(title='Bookings API') @api_view() @renderer_classes([renderers.CoreJSONRenderer]) def schema_view(request): - generator = schemas.SchemaGenerator(title='Bookings API') - return response.Response(generator.get_schema()) + schema = generator.get_schema(request) + return response.Response(schema) **urls.py:** @@ -241,6 +242,69 @@ You could then either: --- +# Schemas as documentation + +One common usage of API schemas is to use them to build documentation pages. + +The schema generation in REST framework uses docstrings to automatically +populate descriptions in the schema document. + +These descriptions will be based on: + +* The corresponding method docstring if one exists. +* A named section within the class docstring, which can be either single line or multi-line. +* The class docstring. + +## Examples + +An `APIView`, with an explicit method docstring. + + class ListUsernames(APIView): + def get(self, request): + """ + Return a list of all user names in the system. + """ + usernames = [user.username for user in User.objects.all()] + return Response(usernames) + +A `ViewSet`, with an explict action docstring. + + class ListUsernames(ViewSet): + def list(self, request): + """ + Return a list of all user names in the system. + """ + usernames = [user.username for user in User.objects.all()] + return Response(usernames) + +A generic view with sections in the class docstring, using single-line style. + + class UserList(generics.ListCreateAPIView): + """ + get: Create a new user. + post: List all the users. + """ + queryset = User.objects.all() + serializer_class = UserSerializer + permission_classes = (IsAdminUser,) + +A generic viewset with sections in the class docstring, using multi-line style. + + class UserViewSet(viewsets.ModelViewSet): + """ + API endpoint that allows users to be viewed or edited. + + retrieve: + Return a user instance. + + list: + Return all users, ordered by most recently joined. + """ + queryset = User.objects.all().order_by('-date_joined') + serializer_class = UserSerializer + +--- + # Alternate schema formats In order to support an alternate schema format, you need to implement a custom renderer diff --git a/docs/api-guide/settings.md b/docs/api-guide/settings.md index ea018053f..58ceeeeb4 100644 --- a/docs/api-guide/settings.md +++ b/docs/api-guide/settings.md @@ -234,6 +234,28 @@ Default: --- +## Schema generation controls + +#### SCHEMA_COERCE_PATH_PK + +If set, this maps the `'pk'` identifier in the URL conf onto the actual field +name when generating a schema path parameter. Typically this will be `'id'`. +This gives a more suitable representation as "primary key" is an implementation +detail, wheras "identifier" is a more general concept. + +Default: `True` + +#### SCHEMA_COERCE_METHOD_NAMES + +If set, this is used to map internal viewset method names onto external action +names used in the schema generation. This allows us to generate names that +are more suitable for an external representation than those that are used +internally in the codebase. + +Default: `{'retrieve': 'read', 'destroy': 'delete'}` + +--- + ## Content type controls #### URL_FORMAT_OVERRIDE @@ -382,6 +404,22 @@ This should be a function with the following signature: Default: `'rest_framework.views.get_view_description'` +## HTML Select Field cutoffs + +Global settings for [select field cutoffs for rendering relational fields](relations.md#select-field-cutoffs) in the browsable API. + +#### HTML_SELECT_CUTOFF + +Global setting for the `html_cutoff` value. Must be an integer. + +Default: 1000 + +#### HTML_SELECT_CUTOFF_TEXT + +A string representing a global setting for `html_cutoff_text`. + +Default: `"More than {count} items..."` + --- ## Miscellaneous settings diff --git a/docs/api-guide/testing.md b/docs/api-guide/testing.md index 69da7d105..fdd60b7f4 100644 --- a/docs/api-guide/testing.md +++ b/docs/api-guide/testing.md @@ -184,6 +184,99 @@ As usual CSRF validation will only apply to any session authenticated views. Th --- +# RequestsClient + +REST framework also includes a client for interacting with your application +using the popular Python library, `requests`. + +This exposes exactly the same interface as if you were using a requests session +directly. + + client = RequestsClient() + response = client.get('http://testserver/users/') + +Note that the requests client requires you to pass fully qualified URLs. + +## Headers & Authentication + +Custom headers and authentication credentials can be provided in the same way +as [when using a standard `requests.Session` instance](http://docs.python-requests.org/en/master/user/advanced/#session-objects). + + from requests.auth import HTTPBasicAuth + + client.auth = HTTPBasicAuth('user', 'pass') + client.headers.update({'x-test': 'true'}) + +## CSRF + +If you're using `SessionAuthentication` then you'll need to include a CSRF token +for any `POST`, `PUT`, `PATCH` or `DELETE` requests. + +You can do so by following the same flow that a JavaScript based client would use. +First make a `GET` request in order to obtain a CRSF token, then present that +token in the following request. + +For example... + + client = RequestsClient() + + # Obtain a CSRF token. + response = client.get('/homepage/') + assert response.status_code == 200 + csrftoken = response.cookies['csrftoken'] + + # Interact with the API. + response = client.post('/organisations/', json={ + 'name': 'MegaCorp', + 'status': 'active' + }, headers={'X-CSRFToken': csrftoken}) + assert response.status_code == 200 + +## Live tests + +With careful usage both the `RequestsClient` and the `CoreAPIClient` provide +the ability to write test cases that can run either in development, or be run +directly against your staging server or production environment. + +Using this style to create basic tests of a few core piece of functionality is +a powerful way to validate your live service. Doing so may require some careful +attention to setup and teardown to ensure that the tests run in a way that they +do not directly affect customer data. + +--- + +# CoreAPIClient + +The CoreAPIClient allows you to interact with your API using the Python +`coreapi` client library. + + # Fetch the API schema + url = reverse('schema') + client = CoreAPIClient() + schema = client.get(url) + + # Create a new organisation + params = {'name': 'MegaCorp', 'status': 'active'} + client.action(schema, ['organisations', 'create'], params) + + # Ensure that the organisation exists in the listing + data = client.action(schema, ['organisations', 'list']) + assert(len(data) == 1) + assert(data == [{'name': 'MegaCorp', 'status': 'active'}]) + +## Headers & Authentication + +Custom headers and authentication may be used with `CoreAPIClient` in a +similar way as with `RequestsClient`. + + from requests.auth import HTTPBasicAuth + + client = CoreAPIClient() + client.session.auth = HTTPBasicAuth('user', 'pass') + client.session.headers.update({'x-test': 'true'}) + +--- + # Test cases REST framework includes the following test case classes, that mirror the existing Django test case classes, but use `APIClient` instead of Django's default `Client`. @@ -197,7 +290,7 @@ REST framework includes the following test case classes, that mirror the existin You can use any of REST framework's test case classes as you would for the regular Django test case classes. The `self.client` attribute will be an `APIClient` instance. - from django.core.urlresolvers import reverse + from django.urls import reverse from rest_framework import status from rest_framework.test import APITestCase from myproject.apps.core.models import Account diff --git a/docs/api-guide/views.md b/docs/api-guide/views.md index 62f14087f..55f6664e0 100644 --- a/docs/api-guide/views.md +++ b/docs/api-guide/views.md @@ -127,7 +127,7 @@ REST framework also allows you to work with regular function based views. It pr ## @api_view() -**Signature:** `@api_view(http_method_names=['GET'])` +**Signature:** `@api_view(http_method_names=['GET'], exclude_from_schema=False)` The core of this functionality is the `api_view` decorator, which takes a list of HTTP methods that your view should respond to. For example, this is how you would write a very simple view that just manually returns some data: @@ -139,7 +139,7 @@ The core of this functionality is the `api_view` decorator, which takes a list o This view will use the default renderers, parsers, authentication classes etc specified in the [settings]. -By default only `GET` methods will be accepted. Other methods will respond with "405 Method Not Allowed". To alter this behavior, specify which methods the view allows, like so: +By default only `GET` methods will be accepted. Other methods will respond with "405 Method Not Allowed". To alter this behaviour, specify which methods the view allows, like so: @api_view(['GET', 'POST']) def hello_world(request): @@ -147,6 +147,13 @@ By default only `GET` methods will be accepted. Other methods will respond with return Response({"message": "Got some data!", "data": request.data}) return Response({"message": "Hello, world!"}) +You can also mark an API view as being omitted from any [auto-generated schema][schemas], +using the `exclude_from_schema` argument.: + + @api_view(['GET'], exclude_from_schema=True) + def api_docs(request): + ... + ## API policy decorators To override the default settings, REST framework provides a set of additional decorators which can be added to your views. These must come *after* (below) the `@api_view` decorator. For example, to create a view that uses a [throttle][throttling] to ensure it can only be called once per day by a particular user, use the `@throttle_classes` decorator, passing a list of throttle classes: @@ -178,3 +185,4 @@ Each of these decorators takes a single argument which must be a list or tuple o [cite2]: http://www.boredomandlaziness.org/2012/05/djangos-cbvs-are-not-mistake-but.html [settings]: settings.md [throttling]: throttling.md +[schemas]: schemas.md diff --git a/docs/tutorial/1-serialization.md b/docs/tutorial/1-serialization.md index 87856e037..434072e11 100644 --- a/docs/tutorial/1-serialization.md +++ b/docs/tutorial/1-serialization.md @@ -88,7 +88,7 @@ The first thing we need to get started on our Web API is to provide a way of ser class SnippetSerializer(serializers.Serializer): - pk = serializers.IntegerField(read_only=True) + id = serializers.IntegerField(read_only=True) title = serializers.CharField(required=False, allow_blank=True, max_length=100) code = serializers.CharField(style={'base_template': 'textarea.html'}) linenos = serializers.BooleanField(required=False) @@ -144,13 +144,13 @@ We've now got a few snippet instances to play with. Let's take a look at serial serializer = SnippetSerializer(snippet) serializer.data - # {'pk': 2, 'title': u'', 'code': u'print "hello, world"\n', 'linenos': False, 'language': u'python', 'style': u'friendly'} + # {'id': 2, 'title': u'', 'code': u'print "hello, world"\n', 'linenos': False, 'language': u'python', 'style': u'friendly'} At this point we've translated the model instance into Python native datatypes. To finalize the serialization process we render the data into `json`. content = JSONRenderer().render(serializer.data) content - # '{"pk": 2, "title": "", "code": "print \\"hello, world\\"\\n", "linenos": false, "language": "python", "style": "friendly"}' + # '{"id": 2, "title": "", "code": "print \\"hello, world\\"\\n", "linenos": false, "language": "python", "style": "friendly"}' Deserialization is similar. First we parse a stream into Python native datatypes... @@ -175,7 +175,7 @@ We can also serialize querysets instead of model instances. To do so we simply serializer = SnippetSerializer(Snippet.objects.all(), many=True) serializer.data - # [OrderedDict([('pk', 1), ('title', u''), ('code', u'foo = "bar"\n'), ('linenos', False), ('language', 'python'), ('style', 'friendly')]), OrderedDict([('pk', 2), ('title', u''), ('code', u'print "hello, world"\n'), ('linenos', False), ('language', 'python'), ('style', 'friendly')]), OrderedDict([('pk', 3), ('title', u''), ('code', u'print "hello, world"'), ('linenos', False), ('language', 'python'), ('style', 'friendly')])] + # [OrderedDict([('id', 1), ('title', u''), ('code', u'foo = "bar"\n'), ('linenos', False), ('language', 'python'), ('style', 'friendly')]), OrderedDict([('id', 2), ('title', u''), ('code', u'print "hello, world"\n'), ('linenos', False), ('language', 'python'), ('style', 'friendly')]), OrderedDict([('id', 3), ('title', u''), ('code', u'print "hello, world"'), ('linenos', False), ('language', 'python'), ('style', 'friendly')])] ## Using ModelSerializers @@ -259,12 +259,12 @@ Note that because we want to be able to POST to this view from clients that won' We'll also need a view which corresponds to an individual snippet, and can be used to retrieve, update or delete the snippet. @csrf_exempt - def snippet_detail(request, pk): + def snippet_detail(request, id): """ Retrieve, update or delete a code snippet. """ try: - snippet = Snippet.objects.get(pk=pk) + snippet = Snippet.objects.get(id=id) except Snippet.DoesNotExist: return HttpResponse(status=404) @@ -291,7 +291,7 @@ Finally we need to wire these views up. Create the `snippets/urls.py` file: urlpatterns = [ url(r'^snippets/$', views.snippet_list), - url(r'^snippets/(?P[0-9]+)/$', views.snippet_detail), + url(r'^snippets/(?P[0-9]+)/$', views.snippet_detail), ] We also need to wire up the root urlconf, in the `tutorial/urls.py` file, to include our snippet app's URLs. diff --git a/docs/tutorial/2-requests-and-responses.md b/docs/tutorial/2-requests-and-responses.md index 5c020a1f7..4aa0062a3 100644 --- a/docs/tutorial/2-requests-and-responses.md +++ b/docs/tutorial/2-requests-and-responses.md @@ -66,12 +66,12 @@ Our instance view is an improvement over the previous example. It's a little mo Here is the view for an individual snippet, in the `views.py` module. @api_view(['GET', 'PUT', 'DELETE']) - def snippet_detail(request, pk): + def snippet_detail(request, id): """ Retrieve, update or delete a snippet instance. """ try: - snippet = Snippet.objects.get(pk=pk) + snippet = Snippet.objects.get(id=id) except Snippet.DoesNotExist: return Response(status=status.HTTP_404_NOT_FOUND) @@ -104,7 +104,7 @@ Start by adding a `format` keyword argument to both of the views, like so. and - def snippet_detail(request, pk, format=None): + def snippet_detail(request, id, format=None): Now update the `urls.py` file slightly, to append a set of `format_suffix_patterns` in addition to the existing URLs. @@ -114,7 +114,7 @@ Now update the `urls.py` file slightly, to append a set of `format_suffix_patter urlpatterns = [ url(r'^snippets/$', views.snippet_list), - url(r'^snippets/(?P[0-9]+)$', views.snippet_detail), + url(r'^snippets/(?P[0-9]+)$', views.snippet_detail), ] urlpatterns = format_suffix_patterns(urlpatterns) diff --git a/docs/tutorial/3-class-based-views.md b/docs/tutorial/3-class-based-views.md index f018666f5..6303994cd 100644 --- a/docs/tutorial/3-class-based-views.md +++ b/docs/tutorial/3-class-based-views.md @@ -36,27 +36,27 @@ So far, so good. It looks pretty similar to the previous case, but we've got be """ Retrieve, update or delete a snippet instance. """ - def get_object(self, pk): + def get_object(self, id): try: - return Snippet.objects.get(pk=pk) + return Snippet.objects.get(id=id) except Snippet.DoesNotExist: raise Http404 - def get(self, request, pk, format=None): - snippet = self.get_object(pk) + def get(self, request, id, format=None): + snippet = self.get_object(id) serializer = SnippetSerializer(snippet) return Response(serializer.data) - def put(self, request, pk, format=None): - snippet = self.get_object(pk) + def put(self, request, id, format=None): + snippet = self.get_object(id) serializer = SnippetSerializer(snippet, data=request.data) if serializer.is_valid(): serializer.save() return Response(serializer.data) return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) - def delete(self, request, pk, format=None): - snippet = self.get_object(pk) + def delete(self, request, id, format=None): + snippet = self.get_object(id) snippet.delete() return Response(status=status.HTTP_204_NO_CONTENT) @@ -70,7 +70,7 @@ We'll also need to refactor our `urls.py` slightly now we're using class-based v urlpatterns = [ url(r'^snippets/$', views.SnippetList.as_view()), - url(r'^snippets/(?P[0-9]+)/$', views.SnippetDetail.as_view()), + url(r'^snippets/(?P[0-9]+)/$', views.SnippetDetail.as_view()), ] urlpatterns = format_suffix_patterns(urlpatterns) diff --git a/docs/tutorial/4-authentication-and-permissions.md b/docs/tutorial/4-authentication-and-permissions.md index d69c38552..958f9d3f0 100644 --- a/docs/tutorial/4-authentication-and-permissions.md +++ b/docs/tutorial/4-authentication-and-permissions.md @@ -88,7 +88,7 @@ Make sure to also import the `UserSerializer` class Finally we need to add those views into the API, by referencing them from the URL conf. Add the following to the patterns in `urls.py`. url(r'^users/$', views.UserList.as_view()), - url(r'^users/(?P[0-9]+)/$', views.UserDetail.as_view()), + url(r'^users/(?P[0-9]+)/$', views.UserDetail.as_view()), ## Associating Snippets with Users @@ -150,7 +150,7 @@ The `r'^api-auth/'` part of pattern can actually be whatever URL you want to use Now if you open up the browser again and refresh the page you'll see a 'Login' link in the top right of the page. If you log in as one of the users you created earlier, you'll be able to create code snippets again. -Once you've created a few code snippets, navigate to the '/users/' endpoint, and notice that the representation includes a list of the snippet pks that are associated with each user, in each user's 'snippets' field. +Once you've created a few code snippets, navigate to the '/users/' endpoint, and notice that the representation includes a list of the snippet ids that are associated with each user, in each user's 'snippets' field. ## Object level permissions diff --git a/docs/tutorial/5-relationships-and-hyperlinked-apis.md b/docs/tutorial/5-relationships-and-hyperlinked-apis.md index 8cda09c62..9fb6c53e0 100644 --- a/docs/tutorial/5-relationships-and-hyperlinked-apis.md +++ b/docs/tutorial/5-relationships-and-hyperlinked-apis.md @@ -48,7 +48,7 @@ We'll add a url pattern for our new API root in `snippets/urls.py`: And then add a url pattern for the snippet highlights: - url(r'^snippets/(?P[0-9]+)/highlight/$', views.SnippetHighlight.as_view()), + url(r'^snippets/(?P[0-9]+)/highlight/$', views.SnippetHighlight.as_view()), ## Hyperlinking our API @@ -67,7 +67,7 @@ In this case we'd like to use a hyperlinked style between entities. In order to The `HyperlinkedModelSerializer` has the following differences from `ModelSerializer`: -* It does not include the `pk` field by default. +* It does not include the `id` field by default. * It includes a `url` field, using `HyperlinkedIdentityField`. * Relationships use `HyperlinkedRelatedField`, instead of `PrimaryKeyRelatedField`. @@ -80,7 +80,7 @@ We can easily re-write our existing serializers to use hyperlinking. In your `sn class Meta: model = Snippet - fields = ('url', 'pk', 'highlight', 'owner', + fields = ('url', 'id', 'highlight', 'owner', 'title', 'code', 'linenos', 'language', 'style') @@ -89,7 +89,7 @@ We can easily re-write our existing serializers to use hyperlinking. In your `sn class Meta: model = User - fields = ('url', 'pk', 'username', 'snippets') + fields = ('url', 'id', 'username', 'snippets') Notice that we've also added a new `'highlight'` field. This field is of the same type as the `url` field, except that it points to the `'snippet-highlight'` url pattern, instead of the `'snippet-detail'` url pattern. @@ -116,16 +116,16 @@ After adding all those names into our URLconf, our final `snippets/urls.py` file url(r'^snippets/$', views.SnippetList.as_view(), name='snippet-list'), - url(r'^snippets/(?P[0-9]+)/$', + url(r'^snippets/(?P[0-9]+)/$', views.SnippetDetail.as_view(), name='snippet-detail'), - url(r'^snippets/(?P[0-9]+)/highlight/$', + url(r'^snippets/(?P[0-9]+)/highlight/$', views.SnippetHighlight.as_view(), name='snippet-highlight'), url(r'^users/$', views.UserList.as_view(), name='user-list'), - url(r'^users/(?P[0-9]+)/$', + url(r'^users/(?P[0-9]+)/$', views.UserDetail.as_view(), name='user-detail') ]) diff --git a/docs/tutorial/6-viewsets-and-routers.md b/docs/tutorial/6-viewsets-and-routers.md index 00152cc17..6e1321093 100644 --- a/docs/tutorial/6-viewsets-and-routers.md +++ b/docs/tutorial/6-viewsets-and-routers.md @@ -92,10 +92,10 @@ Now that we've bound our resources into concrete views, we can register the view urlpatterns = format_suffix_patterns([ url(r'^$', api_root), url(r'^snippets/$', snippet_list, name='snippet-list'), - url(r'^snippets/(?P[0-9]+)/$', snippet_detail, name='snippet-detail'), - url(r'^snippets/(?P[0-9]+)/highlight/$', snippet_highlight, name='snippet-highlight'), + url(r'^snippets/(?P[0-9]+)/$', snippet_detail, name='snippet-detail'), + url(r'^snippets/(?P[0-9]+)/highlight/$', snippet_highlight, name='snippet-highlight'), url(r'^users/$', user_list, name='user-list'), - url(r'^users/(?P[0-9]+)/$', user_detail, name='user-detail') + url(r'^users/(?P[0-9]+)/$', user_detail, name='user-detail') ]) ## Using Routers diff --git a/docs/tutorial/7-schemas-and-client-libraries.md b/docs/tutorial/7-schemas-and-client-libraries.md index 77cfdd3b3..705b79da6 100644 --- a/docs/tutorial/7-schemas-and-client-libraries.md +++ b/docs/tutorial/7-schemas-and-client-libraries.md @@ -33,10 +33,17 @@ API schema. $ pip install coreapi -We can now include a schema for our API, by adding a `schema_title` argument to -the router instantiation. +We can now include a schema for our API, by including an autogenerated schema +view in our URL configuration. - router = DefaultRouter(schema_title='Pastebin API') + from rest_framework.schemas import get_schema_view + + schema_view = get_schema_view(title='Pastebin API') + + urlpatterns = [ + url('^schema/$', schema_view), + ... + ] If you visit the API root endpoint in a browser you should now see `corejson` representation become available as an option. @@ -46,7 +53,7 @@ representation become available as an option. We can also request the schema from the command line, by specifying the desired content type in the `Accept` header. - $ http http://127.0.0.1:8000/ Accept:application/vnd.coreapi+json + $ http http://127.0.0.1:8000/schema/ Accept:application/vnd.coreapi+json HTTP/1.0 200 OK Allow: GET, HEAD, OPTIONS Content-Type: application/vnd.coreapi+json @@ -91,16 +98,16 @@ Now check that it is available on the command line... First we'll load the API schema using the command line client. - $ coreapi get http://127.0.0.1:8000/ - + $ coreapi get http://127.0.0.1:8000/schema/ + snippets: { - highlight(pk) + highlight(id) list() - retrieve(pk) + read(id) } users: { list() - retrieve(pk) + read(id) } We haven't authenticated yet, so right now we're only able to see the read only @@ -112,7 +119,7 @@ Let's try listing the existing snippets, using the command line client: [ { "url": "http://127.0.0.1:8000/snippets/1/", - "pk": 1, + "id": 1, "highlight": "http://127.0.0.1:8000/snippets/1/highlight/", "owner": "lucy", "title": "Example", @@ -126,7 +133,7 @@ Let's try listing the existing snippets, using the command line client: Some of the API endpoints require named parameters. For example, to get back the highlight HTML for a particular snippet we need to provide an id. - $ coreapi action snippets highlight --param pk=1 + $ coreapi action snippets highlight --param id=1 @@ -150,19 +157,19 @@ Now if we fetch the schema again, we should be able to see the full set of available interactions. $ coreapi reload - Pastebin API "http://127.0.0.1:8000/"> + Pastebin API "http://127.0.0.1:8000/schema/"> snippets: { create(code, [title], [linenos], [language], [style]) - destroy(pk) - highlight(pk) + delete(id) + highlight(id) list() - partial_update(pk, [title], [code], [linenos], [language], [style]) - retrieve(pk) - update(pk, code, [title], [linenos], [language], [style]) + partial_update(id, [title], [code], [linenos], [language], [style]) + read(id) + update(id, code, [title], [linenos], [language], [style]) } users: { list() - retrieve(pk) + read(id) } We're now able to interact with these endpoints. For example, to create a new @@ -171,7 +178,7 @@ snippet: $ coreapi action snippets create --param title="Example" --param code="print('hello, world')" { "url": "http://127.0.0.1:8000/snippets/7/", - "pk": 7, + "id": 7, "highlight": "http://127.0.0.1:8000/snippets/7/highlight/", "owner": "lucy", "title": "Example", @@ -183,7 +190,7 @@ snippet: And to delete a snippet: - $ coreapi action snippets destroy --param pk=7 + $ coreapi action snippets delete --param id=7 As well as the command line client, developers can also interact with your API using client libraries. The Python client library is the first of these diff --git a/requirements/requirements-optionals.txt b/requirements/requirements-optionals.txt index 20436e6b4..31f24f4b7 100644 --- a/requirements/requirements-optionals.txt +++ b/requirements/requirements-optionals.txt @@ -1,5 +1,5 @@ # Optional packages which may be used with REST framework. markdown==2.6.4 -django-guardian==1.4.3 -django-filter==0.13.0 -coreapi==1.32.0 +django-guardian==1.4.6 +django-filter==0.14.0 +coreapi==2.0.8 diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py index 457af6c88..68e96703f 100644 --- a/rest_framework/__init__.py +++ b/rest_framework/__init__.py @@ -8,7 +8,7 @@ ______ _____ _____ _____ __ """ __title__ = 'Django REST framework' -__version__ = '3.4.7' +__version__ = '3.5.0' __author__ = 'Tom Christie' __license__ = 'BSD 2-Clause' __copyright__ = 'Copyright 2011-2016 Tom Christie' diff --git a/rest_framework/authtoken/serializers.py b/rest_framework/authtoken/serializers.py index df0c48b86..90d3bd96e 100644 --- a/rest_framework/authtoken/serializers.py +++ b/rest_framework/authtoken/serializers.py @@ -16,6 +16,9 @@ class AuthTokenSerializer(serializers.Serializer): user = authenticate(username=username, password=password) if user: + # From Django 1.10 onwards the `authenticate` call simply + # returns `None` for is_active=False users. + # (Assuming the default `ModelBackend` authentication backend.) if not user.is_active: msg = _('User account is disabled.') raise serializers.ValidationError(msg) diff --git a/rest_framework/compat.py b/rest_framework/compat.py index cee430a84..7ec39ba63 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -23,6 +23,16 @@ except ImportError: from django.utils import importlib # Will be removed in Django 1.9 +try: + from django.urls import ( + NoReverseMatch, RegexURLPattern, RegexURLResolver, ResolverMatch, Resolver404, get_script_prefix, reverse, reverse_lazy, resolve + ) +except ImportError: + from django.core.urlresolvers import ( # Will be removed in Django 2.0 + NoReverseMatch, RegexURLPattern, RegexURLResolver, ResolverMatch, Resolver404, get_script_prefix, reverse, reverse_lazy, resolve + ) + + try: import urlparse # Python 2.x except ImportError: @@ -128,6 +138,12 @@ def is_authenticated(user): return user.is_authenticated +def is_anonymous(user): + if django.VERSION < (1, 10): + return user.is_anonymous() + return user.is_anonymous + + def get_related_model(field): if django.VERSION < (1, 9): return _resolve_model(field.rel.to) @@ -178,6 +194,13 @@ except (ImportError, SyntaxError): uritemplate = None +# requests is optional +try: + import requests +except ImportError: + requests = None + + # Django-guardian is optional. Import only if guardian is in INSTALLED_APPS # Fixes (#1712). We keep the try/except for the test suite. guardian = None @@ -200,8 +223,13 @@ try: if markdown.version <= '2.2': HEADERID_EXT_PATH = 'headerid' - else: + LEVEL_PARAM = 'level' + elif markdown.version < '2.6': HEADERID_EXT_PATH = 'markdown.extensions.headerid' + LEVEL_PARAM = 'level' + else: + HEADERID_EXT_PATH = 'markdown.extensions.toc' + LEVEL_PARAM = 'baselevel' def apply_markdown(text): """ @@ -211,7 +239,7 @@ try: extensions = [HEADERID_EXT_PATH] extension_configs = { HEADERID_EXT_PATH: { - 'level': '2' + LEVEL_PARAM: '2' } } md = markdown.Markdown( @@ -277,3 +305,11 @@ def template_render(template, context=None, request=None): # backends template, e.g. django.template.backends.django.Template else: return template.render(context, request=request) + + +def set_many(instance, field, value): + if django.VERSION < (1, 10): + setattr(instance, field, value) + else: + field = getattr(instance, field) + field.set(value) diff --git a/rest_framework/decorators.py b/rest_framework/decorators.py index 554e5236c..bf9b32aaa 100644 --- a/rest_framework/decorators.py +++ b/rest_framework/decorators.py @@ -15,7 +15,7 @@ from django.utils import six from rest_framework.views import APIView -def api_view(http_method_names=None): +def api_view(http_method_names=None, exclude_from_schema=False): """ Decorator that converts a function-based view into an APIView subclass. Takes a list of allowed methods for the view as an argument. @@ -72,6 +72,7 @@ def api_view(http_method_names=None): WrappedAPIView.permission_classes = getattr(func, 'permission_classes', APIView.permission_classes) + WrappedAPIView.exclude_from_schema = exclude_from_schema return WrappedAPIView.as_view() return decorator diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 917a151e5..7f8391b8a 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -49,20 +49,34 @@ class empty: pass -def is_simple_callable(obj): - """ - True if the object is a callable that takes no arguments. - """ - function = inspect.isfunction(obj) - method = inspect.ismethod(obj) +if six.PY3: + def is_simple_callable(obj): + """ + True if the object is a callable that takes no arguments. + """ + if not callable(obj): + return False - if not (function or method): - return False + sig = inspect.signature(obj) + params = sig.parameters.values() + return all(param.default != param.empty for param in params) - args, _, _, defaults = inspect.getargspec(obj) - len_args = len(args) if function else len(args) - 1 - len_defaults = len(defaults) if defaults else 0 - return len_args <= len_defaults +else: + def is_simple_callable(obj): + function = inspect.isfunction(obj) + method = inspect.ismethod(obj) + + if not (function or method): + return False + + if method: + is_unbound = obj.im_self is None + + args, _, _, defaults = inspect.getargspec(obj) + + len_args = len(args) if function or is_unbound else len(args) - 1 + len_defaults = len(defaults) if defaults else 0 + return len_args <= len_defaults def get_attribute(instance, attrs): diff --git a/rest_framework/filters.py b/rest_framework/filters.py index 0050ee7cd..65233978e 100644 --- a/rest_framework/filters.py +++ b/rest_framework/filters.py @@ -16,7 +16,7 @@ from django.utils import six from django.utils.translation import ugettext_lazy as _ from rest_framework.compat import ( - crispy_forms, distinct, django_filters, guardian, template_render + coreapi, crispy_forms, distinct, django_filters, guardian, template_render ) from rest_framework.settings import api_settings @@ -72,7 +72,8 @@ class BaseFilterBackend(object): """ raise NotImplementedError(".filter_queryset() must be overridden.") - def get_fields(self, view): + def get_schema_fields(self, view): + assert coreapi is not None, 'coreapi must be installed to use `get_schema_fields()`' return [] @@ -131,14 +132,21 @@ class DjangoFilterBackend(BaseFilterBackend): template = loader.get_template(self.template) return template_render(template, context) - def get_fields(self, view): + def get_schema_fields(self, view): + assert coreapi is not None, 'coreapi must be installed to use `get_schema_fields()`' filter_class = getattr(view, 'filter_class', None) if filter_class: - return list(filter_class().filters.keys()) + return [ + coreapi.Field(name=field_name, required=False, location='query') + for field_name in filter_class().filters.keys() + ] filter_fields = getattr(view, 'filter_fields', None) if filter_fields: - return filter_fields + return [ + coreapi.Field(name=field_name, required=False, location='query') + for field_name in filter_fields + ] return [] @@ -231,8 +239,9 @@ class SearchFilter(BaseFilterBackend): template = loader.get_template(self.template) return template_render(template, context) - def get_fields(self, view): - return [self.search_param] + def get_schema_fields(self, view): + assert coreapi is not None, 'coreapi must be installed to use `get_schema_fields()`' + return [coreapi.Field(name=self.search_param, required=False, location='query')] class OrderingFilter(BaseFilterBackend): @@ -348,8 +357,9 @@ class OrderingFilter(BaseFilterBackend): context = self.get_template_context(request, queryset, view) return template_render(template, context) - def get_fields(self, view): - return [self.ordering_param] + def get_schema_fields(self, view): + assert coreapi is not None, 'coreapi must be installed to use `get_schema_fields()`' + return [coreapi.Field(name=self.ordering_param, required=False, location='query')] class DjangoObjectPermissionsFilter(BaseFilterBackend): diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py index c54894efc..6b539b900 100644 --- a/rest_framework/pagination.py +++ b/rest_framework/pagination.py @@ -15,7 +15,7 @@ from django.utils import six from django.utils.six.moves.urllib import parse as urlparse from django.utils.translation import ugettext_lazy as _ -from rest_framework.compat import template_render +from rest_framework.compat import coreapi, template_render from rest_framework.exceptions import NotFound from rest_framework.response import Response from rest_framework.settings import api_settings @@ -157,7 +157,8 @@ class BasePagination(object): def get_results(self, data): return data['results'] - def get_fields(self, view): + def get_schema_fields(self, view): + assert coreapi is not None, 'coreapi must be installed to use `get_schema_fields()`' return [] @@ -283,10 +284,16 @@ class PageNumberPagination(BasePagination): context = self.get_html_context() return template_render(template, context) - def get_fields(self, view): - if self.page_size_query_param is None: - return [self.page_query_param] - return [self.page_query_param, self.page_size_query_param] + def get_schema_fields(self, view): + assert coreapi is not None, 'coreapi must be installed to use `get_schema_fields()`' + fields = [ + coreapi.Field(name=self.page_query_param, required=False, location='query') + ] + if self.page_size_query_param is not None: + fields.append([ + coreapi.Field(name=self.page_size_query_param, required=False, location='query') + ]) + return fields class LimitOffsetPagination(BasePagination): @@ -415,8 +422,12 @@ class LimitOffsetPagination(BasePagination): context = self.get_html_context() return template_render(template, context) - def get_fields(self, view): - return [self.limit_query_param, self.offset_query_param] + def get_schema_fields(self, view): + assert coreapi is not None, 'coreapi must be installed to use `get_schema_fields()`' + return [ + coreapi.Field(name=self.limit_query_param, required=False, location='query'), + coreapi.Field(name=self.offset_query_param, required=False, location='query') + ] class CursorPagination(BasePagination): @@ -721,5 +732,8 @@ class CursorPagination(BasePagination): context = self.get_html_context() return template_render(template, context) - def get_fields(self, view): - return [self.cursor_query_param] + def get_schema_fields(self, view): + assert coreapi is not None, 'coreapi must be installed to use `get_schema_fields()`' + return [ + coreapi.Field(name=self.cursor_query_param, required=False, location='query') + ] diff --git a/rest_framework/relations.py b/rest_framework/relations.py index 65c4c0318..c6eb92a24 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -4,9 +4,6 @@ from __future__ import unicode_literals from collections import OrderedDict from django.core.exceptions import ImproperlyConfigured, ObjectDoesNotExist -from django.core.urlresolvers import ( - NoReverseMatch, Resolver404, get_script_prefix, resolve -) from django.db.models import Manager from django.db.models.query import QuerySet from django.utils import six @@ -14,10 +11,14 @@ from django.utils.encoding import python_2_unicode_compatible, smart_text from django.utils.six.moves.urllib import parse as urlparse from django.utils.translation import ugettext_lazy as _ +from rest_framework.compat import ( + NoReverseMatch, Resolver404, get_script_prefix, resolve +) from rest_framework.fields import ( Field, empty, get_attribute, is_simple_callable, iter_options ) from rest_framework.reverse import reverse +from rest_framework.settings import api_settings from rest_framework.utils import html @@ -71,14 +72,19 @@ MANY_RELATION_KWARGS = ( class RelatedField(Field): queryset = None - html_cutoff = 1000 - html_cutoff_text = _('More than {count} items...') + html_cutoff = None + html_cutoff_text = None def __init__(self, **kwargs): self.queryset = kwargs.pop('queryset', self.queryset) - self.html_cutoff = kwargs.pop('html_cutoff', self.html_cutoff) - self.html_cutoff_text = kwargs.pop('html_cutoff_text', self.html_cutoff_text) - + self.html_cutoff = kwargs.pop( + 'html_cutoff', + self.html_cutoff or int(api_settings.HTML_SELECT_CUTOFF) + ) + self.html_cutoff_text = kwargs.pop( + 'html_cutoff_text', + self.html_cutoff_text or _(api_settings.HTML_SELECT_CUTOFF_TEXT) + ) if not method_overridden('get_queryset', RelatedField, self): assert self.queryset is not None or kwargs.get('read_only', None), ( 'Relational field must provide a `queryset` argument, ' @@ -447,15 +453,20 @@ class ManyRelatedField(Field): 'not_a_list': _('Expected a list of items but got type "{input_type}".'), 'empty': _('This list may not be empty.') } - html_cutoff = 1000 - html_cutoff_text = _('More than {count} items...') + html_cutoff = None + html_cutoff_text = None def __init__(self, child_relation=None, *args, **kwargs): self.child_relation = child_relation self.allow_empty = kwargs.pop('allow_empty', True) - self.html_cutoff = kwargs.pop('html_cutoff', self.html_cutoff) - self.html_cutoff_text = kwargs.pop('html_cutoff_text', self.html_cutoff_text) - + self.html_cutoff = kwargs.pop( + 'html_cutoff', + self.html_cutoff or int(api_settings.HTML_SELECT_CUTOFF) + ) + self.html_cutoff_text = kwargs.pop( + 'html_cutoff_text', + self.html_cutoff_text or _(api_settings.HTML_SELECT_CUTOFF_TEXT) + ) assert child_relation is not None, '`child_relation` is a required argument.' super(ManyRelatedField, self).__init__(*args, **kwargs) self.child_relation.bind(field_name='', parent=self) diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index 11e9fb960..97984daf9 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -276,6 +276,10 @@ class HTMLFormRenderer(BaseRenderer): 'base_template': 'input.html', 'input_type': 'number' }, + serializers.FloatField: { + 'base_template': 'input.html', + 'input_type': 'number' + }, serializers.DateTimeField: { 'base_template': 'input.html', 'input_type': 'datetime-local' @@ -809,7 +813,7 @@ class MultiPartRenderer(BaseRenderer): class CoreJSONRenderer(BaseRenderer): - media_type = 'application/vnd.coreapi+json' + media_type = 'application/coreapi+json' charset = None format = 'corejson' diff --git a/rest_framework/reverse.py b/rest_framework/reverse.py index 5a7ba09a8..fd418dcca 100644 --- a/rest_framework/reverse.py +++ b/rest_framework/reverse.py @@ -3,11 +3,11 @@ Provide urlresolver functions that return fully qualified URLs or view names """ from __future__ import unicode_literals -from django.core.urlresolvers import reverse as django_reverse -from django.core.urlresolvers import NoReverseMatch from django.utils import six from django.utils.functional import lazy +from rest_framework.compat import reverse as django_reverse +from rest_framework.compat import NoReverseMatch from rest_framework.settings import api_settings from rest_framework.utils.urls import replace_query_param @@ -54,7 +54,7 @@ def reverse(viewname, args=None, kwargs=None, request=None, format=None, **extra def _reverse(viewname, args=None, kwargs=None, request=None, format=None, **extra): """ - Same as `django.core.urlresolvers.reverse`, but optionally takes a request + Same as `django.urls.reverse`, but optionally takes a request and returns a fully qualified URL, using the request to get the base URL. """ if format is not None: diff --git a/rest_framework/routers.py b/rest_framework/routers.py index 4eec70bda..7a2d981a3 100644 --- a/rest_framework/routers.py +++ b/rest_framework/routers.py @@ -16,13 +16,15 @@ For example, you might have a `urls.py` that looks something like this: from __future__ import unicode_literals import itertools +import warnings from collections import OrderedDict, namedtuple from django.conf.urls import url from django.core.exceptions import ImproperlyConfigured -from django.core.urlresolvers import NoReverseMatch from rest_framework import exceptions, renderers, views +from rest_framework.compat import NoReverseMatch +from rest_framework.renderers import BrowsableAPIRenderer from rest_framework.response import Response from rest_framework.reverse import reverse from rest_framework.schemas import SchemaGenerator @@ -83,6 +85,7 @@ class BaseRouter(object): class SimpleRouter(BaseRouter): + routes = [ # List route. Route( @@ -258,6 +261,13 @@ class SimpleRouter(BaseRouter): trailing_slash=self.trailing_slash ) + # If there is no prefix, the first part of the url is probably + # controlled by project's urls.py and the router is in an app, + # so a slash in the beginning will (A) cause Django to give + # warnings and (B) generate URLS that will require using '//'. + if not prefix and regex[:2] == '^/': + regex = '^' + regex[2:] + view = viewset.as_view(mapping, **route.initkwargs) name = route.name.format(basename=basename) ret.append(url(regex, view, name=name)) @@ -273,9 +283,15 @@ class DefaultRouter(SimpleRouter): include_root_view = True include_format_suffixes = True root_view_name = 'api-root' - default_schema_renderers = [renderers.CoreJSONRenderer] + default_schema_renderers = [renderers.CoreJSONRenderer, BrowsableAPIRenderer] def __init__(self, *args, **kwargs): + if 'schema_title' in kwargs: + warnings.warn( + "Including a schema directly via a router is now pending " + "deprecation. Use `get_schema_view()` instead.", + PendingDeprecationWarning + ) if 'schema_renderers' in kwargs: assert 'schema_title' in kwargs, 'Missing "schema_title" argument.' if 'schema_url' in kwargs: @@ -289,42 +305,44 @@ class DefaultRouter(SimpleRouter): self.root_renderers = list(api_settings.DEFAULT_RENDERER_CLASSES) super(DefaultRouter, self).__init__(*args, **kwargs) + def get_schema_root_view(self, api_urls=None): + """ + Return a schema root view. + """ + schema_renderers = self.schema_renderers + schema_generator = SchemaGenerator( + title=self.schema_title, + url=self.schema_url, + patterns=api_urls + ) + + class APISchemaView(views.APIView): + _ignore_model_permissions = True + exclude_from_schema = True + renderer_classes = schema_renderers + + def get(self, request, *args, **kwargs): + schema = schema_generator.get_schema(request) + if schema is None: + raise exceptions.PermissionDenied() + return Response(schema) + + return APISchemaView.as_view() + def get_api_root_view(self, api_urls=None): """ - Return a view to use as the API root. + Return a basic root view. """ api_root_dict = OrderedDict() list_name = self.routes[0].name for prefix, viewset, basename in self.registry: api_root_dict[prefix] = list_name.format(basename=basename) - view_renderers = list(self.root_renderers) - schema_media_types = [] - - if api_urls and self.schema_title: - view_renderers += list(self.schema_renderers) - schema_generator = SchemaGenerator( - title=self.schema_title, - url=self.schema_url, - patterns=api_urls - ) - schema_media_types = [ - renderer.media_type - for renderer in self.schema_renderers - ] - - class APIRoot(views.APIView): + class APIRootView(views.APIView): _ignore_model_permissions = True - renderer_classes = view_renderers + exclude_from_schema = True def get(self, request, *args, **kwargs): - if request.accepted_renderer.media_type in schema_media_types: - # Return a schema response. - schema = schema_generator.get_schema(request) - if schema is None: - raise exceptions.PermissionDenied() - return Response(schema) - # Return a plain {"name": "hyperlink"} response. ret = OrderedDict() namespace = request.resolver_match.namespace @@ -345,7 +363,7 @@ class DefaultRouter(SimpleRouter): return Response(ret) - return APIRoot.as_view() + return APIRootView.as_view() def get_urls(self): """ @@ -355,7 +373,10 @@ class DefaultRouter(SimpleRouter): urls = super(DefaultRouter, self).get_urls() if self.include_root_view: - view = self.get_api_root_view(api_urls=urls) + if self.schema_title: + view = self.get_schema_root_view(api_urls=urls) + else: + view = self.get_api_root_view(api_urls=urls) root_url = url(r'^$', view, name=self.root_view_name) urls.append(root_url) diff --git a/rest_framework/schemas.py b/rest_framework/schemas.py index 1b899450f..69698db0e 100644 --- a/rest_framework/schemas.py +++ b/rest_framework/schemas.py @@ -1,26 +1,45 @@ +import os +import re +from collections import OrderedDict from importlib import import_module from django.conf import settings from django.contrib.admindocs.views import simplify_regex -from django.core.urlresolvers import RegexURLPattern, RegexURLResolver from django.utils import six -from django.utils.encoding import force_text +from django.utils.encoding import force_text, smart_text -from rest_framework import exceptions, serializers -from rest_framework.compat import coreapi, uritemplate, urlparse +from rest_framework import exceptions, renderers, serializers +from rest_framework.compat import ( + RegexURLPattern, RegexURLResolver, coreapi, uritemplate, urlparse +) from rest_framework.request import clone_request +from rest_framework.response import Response +from rest_framework.settings import api_settings +from rest_framework.utils import formatting +from rest_framework.utils.field_mapping import ClassLookupDict +from rest_framework.utils.model_meta import _get_pk from rest_framework.views import APIView -def as_query_fields(items): - """ - Take a list of Fields and plain strings. - Convert any pain strings into `location='query'` Field instances. - """ - return [ - item if isinstance(item, coreapi.Field) else coreapi.Field(name=item, required=False, location='query') - for item in items - ] +header_regex = re.compile('^[a-zA-Z][0-9A-Za-z_]*:') + +types_lookup = ClassLookupDict({ + serializers.Field: 'string', + serializers.IntegerField: 'integer', + serializers.FloatField: 'number', + serializers.DecimalField: 'number', + serializers.BooleanField: 'boolean', + serializers.FileField: 'file', + serializers.MultipleChoiceField: 'array', + serializers.ManyRelatedField: 'array', + serializers.Serializer: 'object', + serializers.ListSerializer: 'array' +}) + + +def get_pk_name(model): + meta = model._meta.concrete_model._meta + return _get_pk(meta).name def is_api_view(callback): @@ -31,106 +50,92 @@ def is_api_view(callback): return (cls is not None) and issubclass(cls, APIView) -class SchemaGenerator(object): - default_mapping = { - 'get': 'read', - 'post': 'create', - 'put': 'update', - 'patch': 'partial_update', - 'delete': 'destroy', - } - known_actions = ( - 'create', 'read', 'retrieve', 'list', - 'update', 'partial_update', 'destroy' - ) +def insert_into(target, keys, value): + """ + Nested dictionary insertion. - def __init__(self, title=None, url=None, patterns=None, urlconf=None): - assert coreapi, '`coreapi` must be installed for schema support.' + >>> example = {} + >>> insert_into(example, ['a', 'b', 'c'], 123) + >>> example + {'a': {'b': {'c': 123}}} + """ + for key in keys[:-1]: + if key not in target: + target[key] = {} + target = target[key] + target[keys[-1]] = value - if patterns is None and urlconf is not None: + +def is_custom_action(action): + return action not in set([ + 'retrieve', 'list', 'create', 'update', 'partial_update', 'destroy' + ]) + + +def is_list_view(path, method, view): + """ + Return True if the given path/method appears to represent a list view. + """ + if hasattr(view, 'action'): + # Viewsets have an explicitly defined action, which we can inspect. + return view.action == 'list' + + if method.lower() != 'get': + return False + path_components = path.strip('/').split('/') + if path_components and '{' in path_components[-1]: + return False + return True + + +def endpoint_ordering(endpoint): + path, method, callback = endpoint + method_priority = { + 'GET': 0, + 'POST': 1, + 'PUT': 2, + 'PATCH': 3, + 'DELETE': 4 + }.get(method, 5) + return (path, method_priority) + + +class EndpointInspector(object): + """ + A class to determine the available API endpoints that a project exposes. + """ + def __init__(self, patterns=None, urlconf=None): + if patterns is None: + if urlconf is None: + # Use the default Django URL conf + urlconf = settings.ROOT_URLCONF + + # Load the given URLconf module if isinstance(urlconf, six.string_types): urls = import_module(urlconf) else: urls = urlconf - self.patterns = urls.urlpatterns - elif patterns is None and urlconf is None: - urls = import_module(settings.ROOT_URLCONF) - self.patterns = urls.urlpatterns - else: - self.patterns = patterns + patterns = urls.urlpatterns - if url and not url.endswith('/'): - url += '/' + self.patterns = patterns - self.title = title - self.url = url - self.endpoints = None - - def get_schema(self, request=None): - if self.endpoints is None: - self.endpoints = self.get_api_endpoints(self.patterns) - - links = [] - for path, method, category, action, callback in self.endpoints: - view = callback.cls() - for attr, val in getattr(callback, 'initkwargs', {}).items(): - setattr(view, attr, val) - view.args = () - view.kwargs = {} - view.format_kwarg = None - - actions = getattr(callback, 'actions', None) - if actions is not None: - if method == 'OPTIONS': - view.action = 'metadata' - else: - view.action = actions.get(method.lower()) - - if request is not None: - view.request = clone_request(request, method) - try: - view.check_permissions(view.request) - except exceptions.APIException: - continue - else: - view.request = None - - link = self.get_link(path, method, callback, view) - links.append((category, action, link)) - - if not links: - return None - - # Generate the schema content structure, eg: - # {'users': {'list': Link()}} - content = {} - for category, action, link in links: - if category is None: - content[action] = link - elif category in content: - content[category][action] = link - else: - content[category] = {action: link} - - # Return the schema document. - return coreapi.Document(title=self.title, content=content, url=self.url) - - def get_api_endpoints(self, patterns, prefix=''): + def get_api_endpoints(self, patterns=None, prefix=''): """ Return a list of all available API endpoints by inspecting the URL conf. """ + if patterns is None: + patterns = self.patterns + api_endpoints = [] for pattern in patterns: path_regex = prefix + pattern.regex.pattern if isinstance(pattern, RegexURLPattern): - path = self.get_path(path_regex) + path = self.get_path_from_regex(path_regex) callback = pattern.callback if self.should_include_endpoint(path, callback): for method in self.get_allowed_methods(callback): - action = self.get_action(path, method, callback) - category = self.get_category(path, method, callback, action) - endpoint = (path, method, category, action, callback) + endpoint = (path, method, callback) api_endpoints.append(endpoint) elif isinstance(pattern, RegexURLResolver): @@ -140,9 +145,11 @@ class SchemaGenerator(object): ) api_endpoints.extend(nested_endpoints) + api_endpoints = sorted(api_endpoints, key=endpoint_ordering) + return api_endpoints - def get_path(self, path_regex): + def get_path_from_regex(self, path_regex): """ Given a URL conf regex, return a URI template string. """ @@ -160,9 +167,6 @@ class SchemaGenerator(object): if path.endswith('.{format}') or path.endswith('.{format}/'): return False # Ignore .json style URLs. - if path == '/': - return False # Ignore the root endpoint. - return True def get_allowed_methods(self, callback): @@ -177,60 +181,190 @@ class SchemaGenerator(object): callback.cls().allowed_methods if method not in ('OPTIONS', 'HEAD') ] - def get_action(self, path, method, callback): - """ - Return a descriptive action string for the endpoint, eg. 'list'. - """ - actions = getattr(callback, 'actions', self.default_mapping) - return actions[method.lower()] - def get_category(self, path, method, callback, action): - """ - Return a descriptive category string for the endpoint, eg. 'users'. +class SchemaGenerator(object): + # Map HTTP methods onto actions. + default_mapping = { + 'get': 'retrieve', + 'post': 'create', + 'put': 'update', + 'patch': 'partial_update', + 'delete': 'destroy', + } + endpoint_inspector_cls = EndpointInspector - Examples of category/action pairs that should be generated for various - endpoints: + # Map the method names we use for viewset actions onto external schema names. + # These give us names that are more suitable for the external representation. + # Set by 'SCHEMA_COERCE_METHOD_NAMES'. + coerce_method_names = None - /users/ [users][list], [users][create] - /users/{pk}/ [users][read], [users][update], [users][destroy] - /users/enabled/ [users][enabled] (custom action) - /users/{pk}/star/ [users][star] (custom action) - /users/{pk}/groups/ [groups][list], [groups][create] - /users/{pk}/groups/{pk}/ [groups][read], [groups][update], [groups][destroy] + # 'pk' isn't great as an externally exposed name for an identifier, + # so by default we prefer to use the actual model field name for schemas. + # Set by 'SCHEMA_COERCE_PATH_PK'. + coerce_path_pk = None + + def __init__(self, title=None, url=None, patterns=None, urlconf=None): + assert coreapi, '`coreapi` must be installed for schema support.' + + if url and not url.endswith('/'): + url += '/' + + self.coerce_method_names = api_settings.SCHEMA_COERCE_METHOD_NAMES + self.coerce_path_pk = api_settings.SCHEMA_COERCE_PATH_PK + + self.patterns = patterns + self.urlconf = urlconf + self.title = title + self.url = url + self.endpoints = None + + def get_schema(self, request=None): """ - path_components = path.strip('/').split('/') - path_components = [ - component for component in path_components - if '{' not in component - ] - if action in self.known_actions: - # Default action, eg "/users/", "/users/{pk}/" - idx = -1 - else: - # Custom action, eg "/users/{pk}/activate/", "/users/active/" - idx = -2 + Generate a `coreapi.Document` representing the API schema. + """ + if self.endpoints is None: + inspector = self.endpoint_inspector_cls(self.patterns, self.urlconf) + self.endpoints = inspector.get_api_endpoints() + + links = self.get_links(request) + if not links: + return None + return coreapi.Document(title=self.title, url=self.url, content=links) + + def get_links(self, request=None): + """ + Return a dictionary containing all the links that should be + included in the API schema. + """ + links = OrderedDict() + + # Generate (path, method, view) given (path, method, callback). + paths = [] + view_endpoints = [] + for path, method, callback in self.endpoints: + view = self.create_view(callback, method, request) + if getattr(view, 'exclude_from_schema', False): + continue + path = self.coerce_path(path, method, view) + paths.append(path) + view_endpoints.append((path, method, view)) + + # Only generate the path prefix for paths that will be included + prefix = self.determine_path_prefix(paths) + + for path, method, view in view_endpoints: + if not self.has_view_permissions(path, method, view): + continue + link = self.get_link(path, method, view) + subpath = path[len(prefix):] + keys = self.get_keys(subpath, method, view) + insert_into(links, keys, link) + return links + + # Methods used when we generate a view instance from the raw callback... + + def determine_path_prefix(self, paths): + """ + Given a list of all paths, return the common prefix which should be + discounted when generating a schema structure. + + This will be the longest common string that does not include that last + component of the URL, or the last component before a path parameter. + + For example: + + /api/v1/users/ + /api/v1/users/{pk}/ + + The path prefix is '/api/v1/' + """ + prefixes = [] + for path in paths: + components = path.strip('/').split('/') + initial_components = [] + for component in components: + if '{' in component: + break + initial_components.append(component) + prefix = '/'.join(initial_components[:-1]) + if not prefix: + # We can just break early in the case that there's at least + # one URL that doesn't have a path prefix. + return '/' + prefixes.append('/' + prefix + '/') + return os.path.commonprefix(prefixes) + + def create_view(self, callback, method, request=None): + """ + Given a callback, return an actual view instance. + """ + view = callback.cls() + for attr, val in getattr(callback, 'initkwargs', {}).items(): + setattr(view, attr, val) + view.args = () + view.kwargs = {} + view.format_kwarg = None + view.request = None + view.action_map = getattr(callback, 'actions', None) + + actions = getattr(callback, 'actions', None) + if actions is not None: + if method == 'OPTIONS': + view.action = 'metadata' + else: + view.action = actions.get(method.lower()) + + if request is not None: + view.request = clone_request(request, method) + + return view + + def has_view_permissions(self, path, method, view): + """ + Return `True` if the incoming request has the correct view permissions. + """ + if view.request is None: + return True try: - return path_components[idx] - except IndexError: - return None + view.check_permissions(view.request) + except exceptions.APIException: + return False + return True + + def coerce_path(self, path, method, view): + """ + Coerce {pk} path arguments into the name of the model field, + where possible. This is cleaner for an external representation. + (Ie. "this is an identifier", not "this is a database primary key") + """ + if not self.coerce_path_pk or '{pk}' not in path: + return path + model = getattr(getattr(view, 'queryset', None), 'model', None) + if model: + field_name = get_pk_name(model) + else: + field_name = 'id' + return path.replace('{pk}', '{%s}' % field_name) # Methods for generating each individual `Link` instance... - def get_link(self, path, method, callback, view): + def get_link(self, path, method, view): """ Return a `coreapi.Link` instance for the given endpoint. """ - fields = self.get_path_fields(path, method, callback, view) - fields += self.get_serializer_fields(path, method, callback, view) - fields += self.get_pagination_fields(path, method, callback, view) - fields += self.get_filter_fields(path, method, callback, view) + fields = self.get_path_fields(path, method, view) + fields += self.get_serializer_fields(path, method, view) + fields += self.get_pagination_fields(path, method, view) + fields += self.get_filter_fields(path, method, view) if fields and any([field.location in ('form', 'body') for field in fields]): - encoding = self.get_encoding(path, method, callback, view) + encoding = self.get_encoding(path, method, view) else: encoding = None + description = self.get_description(path, method, view) + if self.url and path.startswith('/'): path = path[1:] @@ -238,10 +372,44 @@ class SchemaGenerator(object): url=urlparse.urljoin(self.url, path), action=method.lower(), encoding=encoding, - fields=fields + fields=fields, + description=description ) - def get_encoding(self, path, method, callback, view): + def get_description(self, path, method, view): + """ + Determine a link description. + + This will be based on the method docstring if one exists, + or else the class docstring. + """ + method_name = getattr(view, 'action', method.lower()) + method_docstring = getattr(view, method_name, None).__doc__ + if method_docstring: + # An explicit docstring on the method or action. + return formatting.dedent(smart_text(method_docstring)) + + description = view.get_view_description() + lines = [line.strip() for line in description.splitlines()] + current_section = '' + sections = {'': ''} + + for line in lines: + if header_regex.match(line): + current_section, seperator, lead = line.partition(':') + sections[current_section] = lead.strip() + else: + sections[current_section] += line + '\n' + + header = getattr(view, 'action', method.lower()) + if header in sections: + return sections[header].strip() + if header in self.coerce_method_names: + if self.coerce_method_names[header] in sections: + return sections[self.coerce_method_names[header]].strip() + return sections[''].strip() + + def get_encoding(self, path, method, view): """ Return the 'encoding' parameter to use for a given endpoint. """ @@ -262,7 +430,7 @@ class SchemaGenerator(object): return None - def get_path_fields(self, path, method, callback, view): + def get_path_fields(self, path, method, view): """ Return a list of `coreapi.Field` instances corresponding to any templated path variables. @@ -275,7 +443,7 @@ class SchemaGenerator(object): return fields - def get_serializer_fields(self, path, method, callback, view): + def get_serializer_fields(self, path, method, view): """ Return a list of `coreapi.Field` instances corresponding to any request body input, as determined by the serializer class. @@ -289,7 +457,14 @@ class SchemaGenerator(object): serializer = view.get_serializer() if isinstance(serializer, serializers.ListSerializer): - return [coreapi.Field(name='data', location='body', required=True)] + return [ + coreapi.Field( + name='data', + location='body', + required=True, + type='array' + ) + ] if not isinstance(serializer, serializers.Serializer): return [] @@ -305,36 +480,104 @@ class SchemaGenerator(object): name=field.source, location='form', required=required, - description=description + description=description, + type=types_lookup[field] ) fields.append(field) return fields - def get_pagination_fields(self, path, method, callback, view): - if method != 'GET': - return [] - - if hasattr(callback, 'actions') and ('list' not in callback.actions.values()): + def get_pagination_fields(self, path, method, view): + if not is_list_view(path, method, view): return [] if not getattr(view, 'pagination_class', None): return [] paginator = view.pagination_class() - return as_query_fields(paginator.get_fields(view)) + return paginator.get_schema_fields(view) - def get_filter_fields(self, path, method, callback, view): - if method != 'GET': + def get_filter_fields(self, path, method, view): + if not is_list_view(path, method, view): return [] - if hasattr(callback, 'actions') and ('list' not in callback.actions.values()): - return [] - - if not hasattr(view, 'filter_backends'): + if not getattr(view, 'filter_backends', None): return [] fields = [] for filter_backend in view.filter_backends: - fields += as_query_fields(filter_backend().get_fields(view)) + fields += filter_backend().get_schema_fields(view) return fields + + # Method for generating the link layout.... + + def get_keys(self, subpath, method, view): + """ + Return a list of keys that should be used to layout a link within + the schema document. + + /users/ ("users", "list"), ("users", "create") + /users/{pk}/ ("users", "read"), ("users", "update"), ("users", "delete") + /users/enabled/ ("users", "enabled") # custom viewset list action + /users/{pk}/star/ ("users", "star") # custom viewset detail action + /users/{pk}/groups/ ("users", "groups", "list"), ("users", "groups", "create") + /users/{pk}/groups/{pk}/ ("users", "groups", "read"), ("users", "groups", "update"), ("users", "groups", "delete") + """ + if hasattr(view, 'action'): + # Viewsets have explicitly named actions. + action = view.action + else: + # Views have no associated action, so we determine one from the method. + if is_list_view(subpath, method, view): + action = 'list' + else: + action = self.default_mapping[method.lower()] + + named_path_components = [ + component for component + in subpath.strip('/').split('/') + if '{' not in component + ] + + if is_custom_action(action): + # Custom action, eg "/users/{pk}/activate/", "/users/active/" + if len(view.action_map) > 1: + action = self.default_mapping[method.lower()] + if action in self.coerce_method_names: + action = self.coerce_method_names[action] + return named_path_components + [action] + else: + return named_path_components[:-1] + [action] + + if action in self.coerce_method_names: + action = self.coerce_method_names[action] + + # Default action, eg "/users/", "/users/{pk}/" + return named_path_components + [action] + + +def get_schema_view(title=None, url=None, renderer_classes=None): + """ + Return a schema view. + """ + generator = SchemaGenerator(title=title, url=url) + if renderer_classes is None: + if renderers.BrowsableAPIRenderer in api_settings.DEFAULT_RENDERER_CLASSES: + rclasses = [renderers.CoreJSONRenderer, renderers.BrowsableAPIRenderer] + else: + rclasses = [renderers.CoreJSONRenderer] + else: + rclasses = renderer_classes + + class SchemaView(APIView): + _ignore_model_permissions = True + exclude_from_schema = True + renderer_classes = rclasses + + def get(self, request, *args, **kwargs): + schema = generator.get_schema(request) + if schema is None: + raise exceptions.PermissionDenied() + return Response(schema) + + return SchemaView.as_view() diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 4d1ed63ae..7e99d40b3 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -13,7 +13,6 @@ response content is handled by parsers and renderers. from __future__ import unicode_literals import traceback -import warnings from django.db import models from django.db.models import DurationField as ModelDurationField @@ -23,7 +22,7 @@ from django.utils.functional import cached_property from django.utils.translation import ugettext_lazy as _ from rest_framework.compat import JSONField as ModelJSONField -from rest_framework.compat import postgres_fields, unicode_to_repr +from rest_framework.compat import postgres_fields, set_many, unicode_to_repr from rest_framework.utils import model_meta from rest_framework.utils.field_mapping import ( ClassLookupDict, get_field_kwargs, get_nested_relation_kwargs, @@ -892,19 +891,23 @@ class ModelSerializer(Serializer): # Save many-to-many relationships after the instance is created. if many_to_many: for field_name, value in many_to_many.items(): - setattr(instance, field_name, value) + set_many(instance, field_name, value) return instance def update(self, instance, validated_data): raise_errors_on_nested_writes('update', self, validated_data) + info = model_meta.get_field_info(instance) # Simply set each attribute on the instance, and then save it. # Note that unlike `.create()` we don't need to treat many-to-many # relationships as being a special case. During updates we already # have an instance pk for the relationships to be associated with. for attr, value in validated_data.items(): - setattr(instance, attr, value) + if attr in info.relations and info.relations[attr].to_many: + set_many(instance, attr, value) + else: + setattr(instance, attr, value) instance.save() return instance @@ -1012,16 +1015,14 @@ class ModelSerializer(Serializer): ) ) - if fields is None and exclude is None: - warnings.warn( - "Creating a ModelSerializer without either the 'fields' " - "attribute or the 'exclude' attribute is deprecated " - "since 3.3.0. Add an explicit fields = '__all__' to the " - "{serializer_class} serializer.".format( - serializer_class=self.__class__.__name__ - ), - DeprecationWarning - ) + assert not (fields is None and exclude is None), ( + "Creating a ModelSerializer without either the 'fields' attribute " + "or the 'exclude' attribute has been deprecated since 3.3.0, " + "and is now disallowed. Add an explicit fields = '__all__' to the " + "{serializer_class} serializer.".format( + serializer_class=self.__class__.__name__ + ), + ) if fields == ALL_FIELDS: fields = None diff --git a/rest_framework/settings.py b/rest_framework/settings.py index 68c7709e8..6d9ed2355 100644 --- a/rest_framework/settings.py +++ b/rest_framework/settings.py @@ -111,6 +111,17 @@ DEFAULTS = { 'COMPACT_JSON': True, 'COERCE_DECIMAL_TO_STRING': True, 'UPLOADED_FILES_USE_URL': True, + + # Browseable API + 'HTML_SELECT_CUTOFF': 1000, + 'HTML_SELECT_CUTOFF_TEXT': "More than {count} items...", + + # Schemas + 'SCHEMA_COERCE_PATH_PK': True, + 'SCHEMA_COERCE_METHOD_NAMES': { + 'retrieve': 'read', + 'destroy': 'delete' + }, } diff --git a/rest_framework/templatetags/rest_framework.py b/rest_framework/templatetags/rest_framework.py index 3bb85e472..c1c8a5396 100644 --- a/rest_framework/templatetags/rest_framework.py +++ b/rest_framework/templatetags/rest_framework.py @@ -3,14 +3,13 @@ from __future__ import absolute_import, unicode_literals import re from django import template -from django.core.urlresolvers import NoReverseMatch, reverse from django.template import loader from django.utils import six from django.utils.encoding import force_text, iri_to_uri from django.utils.html import escape, format_html, smart_urlquote from django.utils.safestring import SafeData, mark_safe -from rest_framework.compat import template_render +from rest_framework.compat import NoReverseMatch, reverse, template_render from rest_framework.renderers import HTMLFormRenderer from rest_framework.utils.urls import replace_query_param diff --git a/rest_framework/test.py b/rest_framework/test.py index fd9f6ab13..16b1b4cd5 100644 --- a/rest_framework/test.py +++ b/rest_framework/test.py @@ -4,7 +4,11 @@ # to make it harder for the user to import the wrong thing without realizing. from __future__ import unicode_literals +import io + from django.conf import settings +from django.core.exceptions import ImproperlyConfigured +from django.core.handlers.wsgi import WSGIHandler from django.test import testcases from django.test.client import Client as DjangoClient from django.test.client import RequestFactory as DjangoRequestFactory @@ -13,6 +17,7 @@ from django.utils import six from django.utils.encoding import force_bytes from django.utils.http import urlencode +from rest_framework.compat import coreapi, requests from rest_framework.settings import api_settings @@ -21,6 +26,128 @@ def force_authenticate(request, user=None, token=None): request._force_auth_token = token +if requests is not None: + class HeaderDict(requests.packages.urllib3._collections.HTTPHeaderDict): + def get_all(self, key, default): + return self.getheaders(key) + + class MockOriginalResponse(object): + def __init__(self, headers): + self.msg = HeaderDict(headers) + self.closed = False + + def isclosed(self): + return self.closed + + def close(self): + self.closed = True + + class DjangoTestAdapter(requests.adapters.HTTPAdapter): + """ + A transport adapter for `requests`, that makes requests via the + Django WSGI app, rather than making actual HTTP requests over the network. + """ + def __init__(self): + self.app = WSGIHandler() + self.factory = DjangoRequestFactory() + + def get_environ(self, request): + """ + Given a `requests.PreparedRequest` instance, return a WSGI environ dict. + """ + method = request.method + url = request.url + kwargs = {} + + # Set request content, if any exists. + if request.body is not None: + if hasattr(request.body, 'read'): + kwargs['data'] = request.body.read() + else: + kwargs['data'] = request.body + if 'content-type' in request.headers: + kwargs['content_type'] = request.headers['content-type'] + + # Set request headers. + for key, value in request.headers.items(): + key = key.upper() + if key in ('CONNECTION', 'CONTENT-LENGTH', 'CONTENT-TYPE'): + continue + kwargs['HTTP_%s' % key.replace('-', '_')] = value + + return self.factory.generic(method, url, **kwargs).environ + + def send(self, request, *args, **kwargs): + """ + Make an outgoing request to the Django WSGI application. + """ + raw_kwargs = {} + + def start_response(wsgi_status, wsgi_headers): + status, _, reason = wsgi_status.partition(' ') + raw_kwargs['status'] = int(status) + raw_kwargs['reason'] = reason + raw_kwargs['headers'] = wsgi_headers + raw_kwargs['version'] = 11 + raw_kwargs['preload_content'] = False + raw_kwargs['original_response'] = MockOriginalResponse(wsgi_headers) + + # Make the outgoing request via WSGI. + environ = self.get_environ(request) + wsgi_response = self.app(environ, start_response) + + # Build the underlying urllib3.HTTPResponse + raw_kwargs['body'] = io.BytesIO(b''.join(wsgi_response)) + raw = requests.packages.urllib3.HTTPResponse(**raw_kwargs) + + # Build the requests.Response + return self.build_response(request, raw) + + def close(self): + pass + + class NoExternalRequestsAdapter(requests.adapters.HTTPAdapter): + def send(self, request, *args, **kwargs): + msg = ( + 'RequestsClient refusing to make an outgoing network request ' + 'to "%s". Only "testserver" or hostnames in your ALLOWED_HOSTS ' + 'setting are valid.' % request.url + ) + raise RuntimeError(msg) + + class RequestsClient(requests.Session): + def __init__(self, *args, **kwargs): + super(RequestsClient, self).__init__(*args, **kwargs) + adapter = DjangoTestAdapter() + self.mount('http://', adapter) + self.mount('https://', adapter) + + def request(self, method, url, *args, **kwargs): + if ':' not in url: + raise ValueError('Missing "http:" or "https:". Use a fully qualified URL, eg "http://testserver%s"' % url) + return super(RequestsClient, self).request(method, url, *args, **kwargs) + +else: + def RequestsClient(*args, **kwargs): + raise ImproperlyConfigured('requests must be installed in order to use RequestsClient.') + + +if coreapi is not None: + class CoreAPIClient(coreapi.Client): + def __init__(self, *args, **kwargs): + self._session = RequestsClient() + kwargs['transports'] = [coreapi.transports.HTTPTransport(session=self.session)] + return super(CoreAPIClient, self).__init__(*args, **kwargs) + + @property + def session(self): + return self._session + +else: + def CoreAPIClient(*args, **kwargs): + raise ImproperlyConfigured('coreapi must be installed in order to use CoreAPIClient.') + + class APIRequestFactory(DjangoRequestFactory): renderer_classes_list = api_settings.TEST_REQUEST_RENDERER_CLASSES default_format = api_settings.TEST_REQUEST_DEFAULT_FORMAT diff --git a/rest_framework/urlpatterns.py b/rest_framework/urlpatterns.py index 7a02bb0f0..4ea55300e 100644 --- a/rest_framework/urlpatterns.py +++ b/rest_framework/urlpatterns.py @@ -1,8 +1,8 @@ from __future__ import unicode_literals from django.conf.urls import include, url -from django.core.urlresolvers import RegexURLResolver +from rest_framework.compat import RegexURLResolver from rest_framework.settings import api_settings diff --git a/rest_framework/utils/breadcrumbs.py b/rest_framework/utils/breadcrumbs.py index 2e3ab9084..74f4f7840 100644 --- a/rest_framework/utils/breadcrumbs.py +++ b/rest_framework/utils/breadcrumbs.py @@ -1,6 +1,6 @@ from __future__ import unicode_literals -from django.core.urlresolvers import get_script_prefix, resolve +from rest_framework.compat import get_script_prefix, resolve def get_breadcrumbs(url, request=None): diff --git a/rest_framework/views.py b/rest_framework/views.py index e178a209f..a8710c7a0 100644 --- a/rest_framework/views.py +++ b/rest_framework/views.py @@ -110,6 +110,9 @@ class APIView(View): # Allow dependency injection of other settings to make testing easier. settings = api_settings + # Mark the view as being included or excluded from schema generation. + exclude_from_schema = False + @classmethod def as_view(cls, **initkwargs): """ @@ -129,6 +132,7 @@ class APIView(View): view = super(APIView, cls).as_view(**initkwargs) view.cls = cls + view.initkwargs = initkwargs # Note: session based authentication is explicitly CSRF validated, # all other authentication is CSRF exempt. diff --git a/tests/browsable_api/test_form_rendering.py b/tests/browsable_api/test_form_rendering.py index 5a31ae0dd..8b79ab6ff 100644 --- a/tests/browsable_api/test_form_rendering.py +++ b/tests/browsable_api/test_form_rendering.py @@ -11,6 +11,7 @@ factory = APIRequestFactory() class BasicSerializer(serializers.ModelSerializer): class Meta: model = BasicModel + fields = '__all__' class ManyPostView(generics.GenericAPIView): diff --git a/tests/conftest.py b/tests/conftest.py index a5123b9d8..256678226 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,6 +1,13 @@ def pytest_configure(): from django.conf import settings + MIDDLEWARE = ( + 'django.middleware.common.CommonMiddleware', + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', + ) + settings.configure( DEBUG_PROPAGATE_EXCEPTIONS=True, DATABASES={ @@ -21,12 +28,8 @@ def pytest_configure(): 'APP_DIRS': True, }, ], - MIDDLEWARE_CLASSES=( - 'django.middleware.common.CommonMiddleware', - 'django.contrib.sessions.middleware.SessionMiddleware', - 'django.contrib.auth.middleware.AuthenticationMiddleware', - 'django.contrib.messages.middleware.MessageMiddleware', - ), + MIDDLEWARE=MIDDLEWARE, + MIDDLEWARE_CLASSES=MIDDLEWARE, INSTALLED_APPS=( 'django.contrib.auth', 'django.contrib.contenttypes', diff --git a/tests/test_api_client.py b/tests/test_api_client.py new file mode 100644 index 000000000..a6d72357a --- /dev/null +++ b/tests/test_api_client.py @@ -0,0 +1,474 @@ +from __future__ import unicode_literals + +import os +import tempfile +import unittest + +from django.conf.urls import url +from django.http import HttpResponse +from django.test import override_settings + +from rest_framework.compat import coreapi +from rest_framework.parsers import FileUploadParser +from rest_framework.renderers import CoreJSONRenderer +from rest_framework.response import Response +from rest_framework.test import APITestCase, CoreAPIClient +from rest_framework.views import APIView + + +def get_schema(): + return coreapi.Document( + url='https://api.example.com/', + title='Example API', + content={ + 'simple_link': coreapi.Link('/example/', description='example link'), + 'headers': coreapi.Link('/headers/'), + 'location': { + 'query': coreapi.Link('/example/', fields=[ + coreapi.Field(name='example', description='example field') + ]), + 'form': coreapi.Link('/example/', action='post', fields=[ + coreapi.Field(name='example'), + ]), + 'body': coreapi.Link('/example/', action='post', fields=[ + coreapi.Field(name='example', location='body') + ]), + 'path': coreapi.Link('/example/{id}', fields=[ + coreapi.Field(name='id', location='path') + ]) + }, + 'encoding': { + 'multipart': coreapi.Link('/example/', action='post', encoding='multipart/form-data', fields=[ + coreapi.Field(name='example') + ]), + 'multipart-body': coreapi.Link('/example/', action='post', encoding='multipart/form-data', fields=[ + coreapi.Field(name='example', location='body') + ]), + 'urlencoded': coreapi.Link('/example/', action='post', encoding='application/x-www-form-urlencoded', fields=[ + coreapi.Field(name='example') + ]), + 'urlencoded-body': coreapi.Link('/example/', action='post', encoding='application/x-www-form-urlencoded', fields=[ + coreapi.Field(name='example', location='body') + ]), + 'raw_upload': coreapi.Link('/upload/', action='post', encoding='application/octet-stream', fields=[ + coreapi.Field(name='example', location='body') + ]), + }, + 'response': { + 'download': coreapi.Link('/download/'), + 'text': coreapi.Link('/text/') + } + } + ) + + +def _iterlists(querydict): + if hasattr(querydict, 'iterlists'): + return querydict.iterlists() + return querydict.lists() + + +def _get_query_params(request): + # Return query params in a plain dict, using a list value if more + # than one item is present for a given key. + return { + key: (value[0] if len(value) == 1 else value) + for key, value in + _iterlists(request.query_params) + } + + +def _get_data(request): + if not isinstance(request.data, dict): + return request.data + # Coerce multidict into regular dict, and remove files to + # make assertions simpler. + if hasattr(request.data, 'iterlists') or hasattr(request.data, 'lists'): + # Use a list value if a QueryDict contains multiple items for a key. + return { + key: value[0] if len(value) == 1 else value + for key, value in _iterlists(request.data) + if key not in request.FILES + } + return { + key: value + for key, value in request.data.items() + if key not in request.FILES + } + + +def _get_files(request): + if not request.FILES: + return {} + return { + key: {'name': value.name, 'content': value.read()} + for key, value in request.FILES.items() + } + + +class SchemaView(APIView): + renderer_classes = [CoreJSONRenderer] + + def get(self, request): + schema = get_schema() + return Response(schema) + + +class ListView(APIView): + def get(self, request): + return Response({ + 'method': request.method, + 'query_params': _get_query_params(request) + }) + + def post(self, request): + if request.content_type: + content_type = request.content_type.split(';')[0] + else: + content_type = None + + return Response({ + 'method': request.method, + 'query_params': _get_query_params(request), + 'data': _get_data(request), + 'files': _get_files(request), + 'content_type': content_type + }) + + +class DetailView(APIView): + def get(self, request, id): + return Response({ + 'id': id, + 'method': request.method, + 'query_params': _get_query_params(request) + }) + + +class UploadView(APIView): + parser_classes = [FileUploadParser] + + def post(self, request): + return Response({ + 'method': request.method, + 'files': _get_files(request), + 'content_type': request.content_type + }) + + +class DownloadView(APIView): + def get(self, request): + return HttpResponse('some file content', content_type='image/png') + + +class TextView(APIView): + def get(self, request): + return HttpResponse('123', content_type='text/plain') + + +class HeadersView(APIView): + def get(self, request): + headers = { + key[5:].replace('_', '-'): value + for key, value in request.META.items() + if key.startswith('HTTP_') + } + return Response({ + 'method': request.method, + 'headers': headers + }) + + +urlpatterns = [ + url(r'^$', SchemaView.as_view()), + url(r'^example/$', ListView.as_view()), + url(r'^example/(?P[0-9]+)/$', DetailView.as_view()), + url(r'^upload/$', UploadView.as_view()), + url(r'^download/$', DownloadView.as_view()), + url(r'^text/$', TextView.as_view()), + url(r'^headers/$', HeadersView.as_view()), +] + + +@unittest.skipUnless(coreapi, 'coreapi not installed') +@override_settings(ROOT_URLCONF='tests.test_api_client') +class APIClientTests(APITestCase): + def test_api_client(self): + client = CoreAPIClient() + schema = client.get('http://api.example.com/') + assert schema.title == 'Example API' + assert schema.url == 'https://api.example.com/' + assert schema['simple_link'].description == 'example link' + assert schema['location']['query'].fields[0].description == 'example field' + data = client.action(schema, ['simple_link']) + expected = { + 'method': 'GET', + 'query_params': {} + } + assert data == expected + + def test_query_params(self): + client = CoreAPIClient() + schema = client.get('http://api.example.com/') + data = client.action(schema, ['location', 'query'], params={'example': 123}) + expected = { + 'method': 'GET', + 'query_params': {'example': '123'} + } + assert data == expected + + def test_session_headers(self): + client = CoreAPIClient() + client.session.headers.update({'X-Custom-Header': 'foo'}) + schema = client.get('http://api.example.com/') + data = client.action(schema, ['headers']) + assert data['headers']['X-CUSTOM-HEADER'] == 'foo' + + def test_query_params_with_multiple_values(self): + client = CoreAPIClient() + schema = client.get('http://api.example.com/') + data = client.action(schema, ['location', 'query'], params={'example': [1, 2, 3]}) + expected = { + 'method': 'GET', + 'query_params': {'example': ['1', '2', '3']} + } + assert data == expected + + def test_form_params(self): + client = CoreAPIClient() + schema = client.get('http://api.example.com/') + data = client.action(schema, ['location', 'form'], params={'example': 123}) + expected = { + 'method': 'POST', + 'content_type': 'application/json', + 'query_params': {}, + 'data': {'example': 123}, + 'files': {} + } + assert data == expected + + def test_body_params(self): + client = CoreAPIClient() + schema = client.get('http://api.example.com/') + data = client.action(schema, ['location', 'body'], params={'example': 123}) + expected = { + 'method': 'POST', + 'content_type': 'application/json', + 'query_params': {}, + 'data': 123, + 'files': {} + } + assert data == expected + + def test_path_params(self): + client = CoreAPIClient() + schema = client.get('http://api.example.com/') + data = client.action(schema, ['location', 'path'], params={'id': 123}) + expected = { + 'method': 'GET', + 'query_params': {}, + 'id': '123' + } + assert data == expected + + def test_multipart_encoding(self): + client = CoreAPIClient() + schema = client.get('http://api.example.com/') + + temp = tempfile.NamedTemporaryFile() + temp.write(b'example file content') + temp.flush() + + with open(temp.name, 'rb') as upload: + name = os.path.basename(upload.name) + data = client.action(schema, ['encoding', 'multipart'], params={'example': upload}) + + expected = { + 'method': 'POST', + 'content_type': 'multipart/form-data', + 'query_params': {}, + 'data': {}, + 'files': {'example': {'name': name, 'content': 'example file content'}} + } + assert data == expected + + def test_multipart_encoding_no_file(self): + # When no file is included, multipart encoding should still be used. + client = CoreAPIClient() + schema = client.get('http://api.example.com/') + + data = client.action(schema, ['encoding', 'multipart'], params={'example': 123}) + + expected = { + 'method': 'POST', + 'content_type': 'multipart/form-data', + 'query_params': {}, + 'data': {'example': '123'}, + 'files': {} + } + assert data == expected + + def test_multipart_encoding_multiple_values(self): + client = CoreAPIClient() + schema = client.get('http://api.example.com/') + + data = client.action(schema, ['encoding', 'multipart'], params={'example': [1, 2, 3]}) + + expected = { + 'method': 'POST', + 'content_type': 'multipart/form-data', + 'query_params': {}, + 'data': {'example': ['1', '2', '3']}, + 'files': {} + } + assert data == expected + + def test_multipart_encoding_string_file_content(self): + # Test for `coreapi.utils.File` support. + from coreapi.utils import File + + client = CoreAPIClient() + schema = client.get('http://api.example.com/') + + example = File(name='example.txt', content='123') + data = client.action(schema, ['encoding', 'multipart'], params={'example': example}) + + expected = { + 'method': 'POST', + 'content_type': 'multipart/form-data', + 'query_params': {}, + 'data': {}, + 'files': {'example': {'name': 'example.txt', 'content': '123'}} + } + assert data == expected + + def test_multipart_encoding_in_body(self): + from coreapi.utils import File + + client = CoreAPIClient() + schema = client.get('http://api.example.com/') + + example = {'foo': File(name='example.txt', content='123'), 'bar': 'abc'} + data = client.action(schema, ['encoding', 'multipart-body'], params={'example': example}) + + expected = { + 'method': 'POST', + 'content_type': 'multipart/form-data', + 'query_params': {}, + 'data': {'bar': 'abc'}, + 'files': {'foo': {'name': 'example.txt', 'content': '123'}} + } + assert data == expected + + # URLencoded + + def test_urlencoded_encoding(self): + client = CoreAPIClient() + schema = client.get('http://api.example.com/') + data = client.action(schema, ['encoding', 'urlencoded'], params={'example': 123}) + expected = { + 'method': 'POST', + 'content_type': 'application/x-www-form-urlencoded', + 'query_params': {}, + 'data': {'example': '123'}, + 'files': {} + } + assert data == expected + + def test_urlencoded_encoding_multiple_values(self): + client = CoreAPIClient() + schema = client.get('http://api.example.com/') + data = client.action(schema, ['encoding', 'urlencoded'], params={'example': [1, 2, 3]}) + expected = { + 'method': 'POST', + 'content_type': 'application/x-www-form-urlencoded', + 'query_params': {}, + 'data': {'example': ['1', '2', '3']}, + 'files': {} + } + assert data == expected + + def test_urlencoded_encoding_in_body(self): + client = CoreAPIClient() + schema = client.get('http://api.example.com/') + data = client.action(schema, ['encoding', 'urlencoded-body'], params={'example': {'foo': 123, 'bar': True}}) + expected = { + 'method': 'POST', + 'content_type': 'application/x-www-form-urlencoded', + 'query_params': {}, + 'data': {'foo': '123', 'bar': 'true'}, + 'files': {} + } + assert data == expected + + # Raw uploads + + def test_raw_upload(self): + client = CoreAPIClient() + schema = client.get('http://api.example.com/') + + temp = tempfile.NamedTemporaryFile() + temp.write(b'example file content') + temp.flush() + + with open(temp.name, 'rb') as upload: + name = os.path.basename(upload.name) + data = client.action(schema, ['encoding', 'raw_upload'], params={'example': upload}) + + expected = { + 'method': 'POST', + 'files': {'file': {'name': name, 'content': 'example file content'}}, + 'content_type': 'application/octet-stream' + } + assert data == expected + + def test_raw_upload_string_file_content(self): + from coreapi.utils import File + + client = CoreAPIClient() + schema = client.get('http://api.example.com/') + + example = File('example.txt', '123') + data = client.action(schema, ['encoding', 'raw_upload'], params={'example': example}) + + expected = { + 'method': 'POST', + 'files': {'file': {'name': 'example.txt', 'content': '123'}}, + 'content_type': 'text/plain' + } + assert data == expected + + def test_raw_upload_explicit_content_type(self): + from coreapi.utils import File + + client = CoreAPIClient() + schema = client.get('http://api.example.com/') + + example = File('example.txt', '123', 'text/html') + data = client.action(schema, ['encoding', 'raw_upload'], params={'example': example}) + + expected = { + 'method': 'POST', + 'files': {'file': {'name': 'example.txt', 'content': '123'}}, + 'content_type': 'text/html' + } + assert data == expected + + # Responses + + def test_text_response(self): + client = CoreAPIClient() + schema = client.get('http://api.example.com/') + + data = client.action(schema, ['response', 'text']) + + expected = '123' + assert data == expected + + def test_download_response(self): + client = CoreAPIClient() + schema = client.get('http://api.example.com/') + + data = client.action(schema, ['response', 'download']) + assert data.basename == 'download.png' + assert data.read() == b'some file content' diff --git a/tests/test_atomic_requests.py b/tests/test_atomic_requests.py index 8342ad3af..09d7f2fb1 100644 --- a/tests/test_atomic_requests.py +++ b/tests/test_atomic_requests.py @@ -5,7 +5,7 @@ import unittest from django.conf.urls import url from django.db import connection, connections, transaction from django.http import Http404 -from django.test import TestCase, TransactionTestCase +from django.test import TestCase, TransactionTestCase, override_settings from django.utils.decorators import method_decorator from rest_framework import status @@ -36,6 +36,20 @@ class APIExceptionView(APIView): raise APIException +class NonAtomicAPIExceptionView(APIView): + @method_decorator(transaction.non_atomic_requests) + def dispatch(self, *args, **kwargs): + return super(NonAtomicAPIExceptionView, self).dispatch(*args, **kwargs) + + def get(self, request, *args, **kwargs): + BasicModel.objects.all() + raise Http404 + +urlpatterns = ( + url(r'^$', NonAtomicAPIExceptionView.as_view()), +) + + @unittest.skipUnless( connection.features.uses_savepoints, "'atomic' requires transactions and savepoints." @@ -124,22 +138,8 @@ class DBTransactionAPIExceptionTests(TestCase): connection.features.uses_savepoints, "'atomic' requires transactions and savepoints." ) +@override_settings(ROOT_URLCONF='tests.test_atomic_requests') class NonAtomicDBTransactionAPIExceptionTests(TransactionTestCase): - @property - def urls(self): - class NonAtomicAPIExceptionView(APIView): - @method_decorator(transaction.non_atomic_requests) - def dispatch(self, *args, **kwargs): - return super(NonAtomicAPIExceptionView, self).dispatch(*args, **kwargs) - - def get(self, request, *args, **kwargs): - BasicModel.objects.all() - raise Http404 - - return ( - url(r'^$', NonAtomicAPIExceptionView.as_view()), - ) - def setUp(self): connections.databases['default']['ATOMIC_REQUESTS'] = True diff --git a/tests/test_authentication.py b/tests/test_authentication.py index 5ef620abe..6f17ea14f 100644 --- a/tests/test_authentication.py +++ b/tests/test_authentication.py @@ -20,6 +20,7 @@ from rest_framework.authentication import ( ) from rest_framework.authtoken.models import Token from rest_framework.authtoken.views import obtain_auth_token +from rest_framework.compat import is_authenticated from rest_framework.response import Response from rest_framework.test import APIClient, APIRequestFactory from rest_framework.views import APIView @@ -408,7 +409,7 @@ class FailingAuthAccessedInRenderer(TestCase): def render(self, data, media_type=None, renderer_context=None): request = renderer_context['request'] - if request.user.is_authenticated(): + if is_authenticated(request.user): return b'authenticated' return b'not authenticated' diff --git a/tests/test_fields.py b/tests/test_fields.py index 4a4b741c5..c271afa9e 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -1,6 +1,7 @@ import datetime import os import re +import unittest import uuid from decimal import Decimal @@ -11,6 +12,67 @@ from django.utils import six, timezone import rest_framework from rest_framework import serializers +from rest_framework.fields import is_simple_callable + +try: + import typings +except ImportError: + typings = False + + +# Tests for helper functions. +# --------------------------- + +class TestIsSimpleCallable: + + def test_method(self): + class Foo: + @classmethod + def classmethod(cls): + pass + + def valid(self): + pass + + def valid_kwargs(self, param='value'): + pass + + def invalid(self, param): + pass + + assert is_simple_callable(Foo.classmethod) + + # unbound methods + assert not is_simple_callable(Foo.valid) + assert not is_simple_callable(Foo.valid_kwargs) + assert not is_simple_callable(Foo.invalid) + + # bound methods + assert is_simple_callable(Foo().valid) + assert is_simple_callable(Foo().valid_kwargs) + assert not is_simple_callable(Foo().invalid) + + def test_function(self): + def simple(): + pass + + def valid(param='value', param2='value'): + pass + + def invalid(param, param2='value'): + pass + + assert is_simple_callable(simple) + assert is_simple_callable(valid) + assert not is_simple_callable(invalid) + + @unittest.skipUnless(typings, 'requires python 3.5') + def test_type_annotation(self): + # The annotation will otherwise raise a syntax error in python < 3.5 + exec("def valid(param: str='value'): pass", locals()) + valid = locals()['valid'] + + assert is_simple_callable(valid) # Tests for field keyword arguments and core functionality. diff --git a/tests/test_filters.py b/tests/test_filters.py index 03d61fc37..c67412dd7 100644 --- a/tests/test_filters.py +++ b/tests/test_filters.py @@ -6,7 +6,6 @@ from decimal import Decimal from django.conf.urls import url from django.core.exceptions import ImproperlyConfigured -from django.core.urlresolvers import reverse from django.db import models from django.test import TestCase from django.test.utils import override_settings @@ -14,7 +13,7 @@ from django.utils.dateparse import parse_date from django.utils.six.moves import reload_module from rest_framework import filters, generics, serializers, status -from rest_framework.compat import django_filters +from rest_framework.compat import django_filters, reverse from rest_framework.test import APIRequestFactory from .models import BaseFilterableItem, BasicModel, FilterableItem @@ -77,6 +76,7 @@ if django_filters: class Meta: model = BaseFilterableItem + fields = '__all__' class BaseFilterableItemFilterRootView(generics.ListCreateAPIView): queryset = FilterableItem.objects.all() @@ -456,7 +456,7 @@ class AttributeModel(models.Model): class SearchFilterModelFk(models.Model): title = models.CharField(max_length=20) - attribute = models.ForeignKey(AttributeModel) + attribute = models.ForeignKey(AttributeModel, on_delete=models.CASCADE) class SearchFilterFkSerializer(serializers.ModelSerializer): diff --git a/tests/test_model_serializer.py b/tests/test_model_serializer.py index 01243ff6e..cd9b2dfc3 100644 --- a/tests/test_model_serializer.py +++ b/tests/test_model_serializer.py @@ -20,7 +20,7 @@ from django.test import TestCase from django.utils import six from rest_framework import serializers -from rest_framework.compat import unicode_repr +from rest_framework.compat import set_many, unicode_repr def dedent(blocktext): @@ -651,7 +651,7 @@ class TestIntegration(TestCase): foreign_key=self.foreign_key_target, one_to_one=self.one_to_one_target, ) - self.instance.many_to_many = self.many_to_many_targets + set_many(self.instance, 'many_to_many', self.many_to_many_targets) self.instance.save() def test_pk_retrival(self): @@ -962,7 +962,7 @@ class OneToOneTargetTestModel(models.Model): class OneToOneSourceTestModel(models.Model): - target = models.OneToOneField(OneToOneTargetTestModel, primary_key=True) + target = models.OneToOneField(OneToOneTargetTestModel, primary_key=True, on_delete=models.CASCADE) class TestModelFieldValues(TestCase): @@ -990,6 +990,7 @@ class TestUniquenessOverride(TestCase): class TestSerializer(serializers.ModelSerializer): class Meta: model = TestModel + fields = '__all__' extra_kwargs = {'field_1': {'required': False}} fields = TestSerializer().fields diff --git a/tests/test_permissions.py b/tests/test_permissions.py index 5cef22628..f8561e61d 100644 --- a/tests/test_permissions.py +++ b/tests/test_permissions.py @@ -4,7 +4,6 @@ import base64 import unittest from django.contrib.auth.models import Group, Permission, User -from django.core.urlresolvers import ResolverMatch from django.db import models from django.test import TestCase @@ -12,7 +11,7 @@ from rest_framework import ( HTTP_HEADER_ENCODING, authentication, generics, permissions, serializers, status ) -from rest_framework.compat import guardian +from rest_framework.compat import ResolverMatch, guardian, set_many from rest_framework.filters import DjangoObjectPermissionsFilter from rest_framework.routers import DefaultRouter from rest_framework.test import APIRequestFactory @@ -74,15 +73,15 @@ class ModelPermissionsIntegrationTests(TestCase): def setUp(self): User.objects.create_user('disallowed', 'disallowed@example.com', 'password') user = User.objects.create_user('permitted', 'permitted@example.com', 'password') - user.user_permissions = [ + set_many(user, 'user_permissions', [ Permission.objects.get(codename='add_basicmodel'), Permission.objects.get(codename='change_basicmodel'), Permission.objects.get(codename='delete_basicmodel') - ] + ]) user = User.objects.create_user('updateonly', 'updateonly@example.com', 'password') - user.user_permissions = [ + set_many(user, 'user_permissions', [ Permission.objects.get(codename='change_basicmodel'), - ] + ]) self.permitted_credentials = basic_auth_header('permitted', 'password') self.disallowed_credentials = basic_auth_header('disallowed', 'password') diff --git a/tests/test_request.py b/tests/test_request.py index dbfa695fd..32fbbc50b 100644 --- a/tests/test_request.py +++ b/tests/test_request.py @@ -13,6 +13,7 @@ from django.utils import six from rest_framework import status from rest_framework.authentication import SessionAuthentication +from rest_framework.compat import is_anonymous from rest_framework.parsers import BaseParser, FormParser, MultiPartParser from rest_framework.request import Request from rest_framework.response import Response @@ -169,9 +170,9 @@ class TestUserSetter(TestCase): def test_user_can_logout(self): self.request.user = self.user - self.assertFalse(self.request.user.is_anonymous()) + self.assertFalse(is_anonymous(self.request.user)) logout(self.request) - self.assertTrue(self.request.user.is_anonymous()) + self.assertTrue(is_anonymous(self.request.user)) def test_logged_in_user_is_set_on_wrapped_request(self): login(self.request, self.user) diff --git a/tests/test_requests_client.py b/tests/test_requests_client.py new file mode 100644 index 000000000..791ca4ff2 --- /dev/null +++ b/tests/test_requests_client.py @@ -0,0 +1,256 @@ +from __future__ import unicode_literals + +import unittest + +from django.conf.urls import url +from django.contrib.auth import authenticate, login +from django.contrib.auth.models import User +from django.shortcuts import redirect +from django.test import override_settings +from django.utils.decorators import method_decorator +from django.views.decorators.csrf import csrf_protect, ensure_csrf_cookie + +from rest_framework.compat import is_authenticated, requests +from rest_framework.response import Response +from rest_framework.test import APITestCase, RequestsClient +from rest_framework.views import APIView + + +class Root(APIView): + def get(self, request): + return Response({ + 'method': request.method, + 'query_params': request.query_params, + }) + + def post(self, request): + files = { + key: (value.name, value.read()) + for key, value in request.FILES.items() + } + post = request.POST + json = None + if request.META.get('CONTENT_TYPE') == 'application/json': + json = request.data + + return Response({ + 'method': request.method, + 'query_params': request.query_params, + 'POST': post, + 'FILES': files, + 'JSON': json + }) + + +class HeadersView(APIView): + def get(self, request): + headers = { + key[5:].replace('_', '-'): value + for key, value in request.META.items() + if key.startswith('HTTP_') + } + return Response({ + 'method': request.method, + 'headers': headers + }) + + +class SessionView(APIView): + def get(self, request): + return Response({ + key: value for key, value in request.session.items() + }) + + def post(self, request): + for key, value in request.data.items(): + request.session[key] = value + return Response({ + key: value for key, value in request.session.items() + }) + + +class AuthView(APIView): + @method_decorator(ensure_csrf_cookie) + def get(self, request): + if is_authenticated(request.user): + username = request.user.username + else: + username = None + return Response({ + 'username': username + }) + + @method_decorator(csrf_protect) + def post(self, request): + username = request.data['username'] + password = request.data['password'] + user = authenticate(username=username, password=password) + if user is None: + return Response({'error': 'incorrect credentials'}) + login(request, user) + return redirect('/auth/') + + +urlpatterns = [ + url(r'^$', Root.as_view(), name='root'), + url(r'^headers/$', HeadersView.as_view(), name='headers'), + url(r'^session/$', SessionView.as_view(), name='session'), + url(r'^auth/$', AuthView.as_view(), name='auth'), +] + + +@unittest.skipUnless(requests, 'requests not installed') +@override_settings(ROOT_URLCONF='tests.test_requests_client') +class RequestsClientTests(APITestCase): + def test_get_request(self): + client = RequestsClient() + response = client.get('http://testserver/') + assert response.status_code == 200 + assert response.headers['Content-Type'] == 'application/json' + expected = { + 'method': 'GET', + 'query_params': {} + } + assert response.json() == expected + + def test_get_request_query_params_in_url(self): + client = RequestsClient() + response = client.get('http://testserver/?key=value') + assert response.status_code == 200 + assert response.headers['Content-Type'] == 'application/json' + expected = { + 'method': 'GET', + 'query_params': {'key': 'value'} + } + assert response.json() == expected + + def test_get_request_query_params_by_kwarg(self): + client = RequestsClient() + response = client.get('http://testserver/', params={'key': 'value'}) + assert response.status_code == 200 + assert response.headers['Content-Type'] == 'application/json' + expected = { + 'method': 'GET', + 'query_params': {'key': 'value'} + } + assert response.json() == expected + + def test_get_with_headers(self): + client = RequestsClient() + response = client.get('http://testserver/headers/', headers={'User-Agent': 'example'}) + assert response.status_code == 200 + assert response.headers['Content-Type'] == 'application/json' + headers = response.json()['headers'] + assert headers['USER-AGENT'] == 'example' + + def test_get_with_session_headers(self): + client = RequestsClient() + client.headers.update({'User-Agent': 'example'}) + response = client.get('http://testserver/headers/') + assert response.status_code == 200 + assert response.headers['Content-Type'] == 'application/json' + headers = response.json()['headers'] + assert headers['USER-AGENT'] == 'example' + + def test_post_form_request(self): + client = RequestsClient() + response = client.post('http://testserver/', data={'key': 'value'}) + assert response.status_code == 200 + assert response.headers['Content-Type'] == 'application/json' + expected = { + 'method': 'POST', + 'query_params': {}, + 'POST': {'key': 'value'}, + 'FILES': {}, + 'JSON': None + } + assert response.json() == expected + + def test_post_json_request(self): + client = RequestsClient() + response = client.post('http://testserver/', json={'key': 'value'}) + assert response.status_code == 200 + assert response.headers['Content-Type'] == 'application/json' + expected = { + 'method': 'POST', + 'query_params': {}, + 'POST': {}, + 'FILES': {}, + 'JSON': {'key': 'value'} + } + assert response.json() == expected + + def test_post_multipart_request(self): + client = RequestsClient() + files = { + 'file': ('report.csv', 'some,data,to,send\nanother,row,to,send\n') + } + response = client.post('http://testserver/', files=files) + assert response.status_code == 200 + assert response.headers['Content-Type'] == 'application/json' + expected = { + 'method': 'POST', + 'query_params': {}, + 'FILES': {'file': ['report.csv', 'some,data,to,send\nanother,row,to,send\n']}, + 'POST': {}, + 'JSON': None + } + assert response.json() == expected + + def test_session(self): + client = RequestsClient() + response = client.get('http://testserver/session/') + assert response.status_code == 200 + assert response.headers['Content-Type'] == 'application/json' + expected = {} + assert response.json() == expected + + response = client.post('http://testserver/session/', json={'example': 'abc'}) + assert response.status_code == 200 + assert response.headers['Content-Type'] == 'application/json' + expected = {'example': 'abc'} + assert response.json() == expected + + response = client.get('http://testserver/session/') + assert response.status_code == 200 + assert response.headers['Content-Type'] == 'application/json' + expected = {'example': 'abc'} + assert response.json() == expected + + def test_auth(self): + # Confirm session is not authenticated + client = RequestsClient() + response = client.get('http://testserver/auth/') + assert response.status_code == 200 + assert response.headers['Content-Type'] == 'application/json' + expected = { + 'username': None + } + assert response.json() == expected + assert 'csrftoken' in response.cookies + csrftoken = response.cookies['csrftoken'] + + user = User.objects.create(username='tom') + user.set_password('password') + user.save() + + # Perform a login + response = client.post('http://testserver/auth/', json={ + 'username': 'tom', + 'password': 'password' + }, headers={'X-CSRFToken': csrftoken}) + assert response.status_code == 200 + assert response.headers['Content-Type'] == 'application/json' + expected = { + 'username': 'tom' + } + assert response.json() == expected + + # Confirm session is authenticated + response = client.get('http://testserver/auth/') + assert response.status_code == 200 + assert response.headers['Content-Type'] == 'application/json' + expected = { + 'username': 'tom' + } + assert response.json() == expected diff --git a/tests/test_reverse.py b/tests/test_reverse.py index 03d31f1f9..f30a8bf9a 100644 --- a/tests/test_reverse.py +++ b/tests/test_reverse.py @@ -1,9 +1,9 @@ from __future__ import unicode_literals from django.conf.urls import url -from django.core.urlresolvers import NoReverseMatch from django.test import TestCase, override_settings +from rest_framework.compat import NoReverseMatch from rest_framework.reverse import reverse from rest_framework.test import APIRequestFactory diff --git a/tests/test_routers.py b/tests/test_routers.py index f45039f80..d28e301a0 100644 --- a/tests/test_routers.py +++ b/tests/test_routers.py @@ -1,5 +1,6 @@ from __future__ import unicode_literals +import json from collections import namedtuple from django.conf.urls import include, url @@ -47,6 +48,21 @@ class MockViewSet(viewsets.ModelViewSet): serializer_class = None +class EmptyPrefixSerializer(serializers.HyperlinkedModelSerializer): + class Meta: + model = RouterTestModel + fields = ('uuid', 'text') + + +class EmptyPrefixViewSet(viewsets.ModelViewSet): + queryset = [RouterTestModel(id=1, uuid='111', text='First'), RouterTestModel(id=2, uuid='222', text='Second')] + serializer_class = EmptyPrefixSerializer + + def get_object(self, *args, **kwargs): + index = int(self.kwargs['pk']) - 1 + return self.queryset[index] + + notes_router = SimpleRouter() notes_router.register(r'notes', NoteViewSet) @@ -56,11 +72,19 @@ kwarged_notes_router.register(r'notes', KWargedNoteViewSet) namespaced_router = DefaultRouter() namespaced_router.register(r'example', MockViewSet, base_name='example') +empty_prefix_router = SimpleRouter() +empty_prefix_router.register(r'', EmptyPrefixViewSet, base_name='empty_prefix') +empty_prefix_urls = [ + url(r'^', include(empty_prefix_router.urls)), +] + urlpatterns = [ url(r'^non-namespaced/', include(namespaced_router.urls)), url(r'^namespaced/', include(namespaced_router.urls, namespace='example')), url(r'^example/', include(notes_router.urls)), url(r'^example2/', include(kwarged_notes_router.urls)), + + url(r'^empty-prefix/', include(empty_prefix_urls)), ] @@ -384,3 +408,28 @@ class TestDynamicListAndDetailRouter(TestCase): def test_inherited_list_and_detail_route_decorators(self): self._test_list_and_detail_route_decorators(SubDynamicListAndDetailViewSet) + + +@override_settings(ROOT_URLCONF='tests.test_routers') +class TestEmptyPrefix(TestCase): + def test_empty_prefix_list(self): + response = self.client.get('/empty-prefix/') + self.assertEqual(200, response.status_code) + self.assertEqual( + json.loads(response.content.decode('utf-8')), + [ + {'uuid': '111', 'text': 'First'}, + {'uuid': '222', 'text': 'Second'} + ] + ) + + def test_empty_prefix_detail(self): + response = self.client.get('/empty-prefix/1/') + self.assertEqual(200, response.status_code) + self.assertEqual( + json.loads(response.content.decode('utf-8')), + { + 'uuid': '111', + 'text': 'First' + } + ) diff --git a/tests/test_schemas.py b/tests/test_schemas.py index 197e62eb0..c43fc1eff 100644 --- a/tests/test_schemas.py +++ b/tests/test_schemas.py @@ -6,9 +6,8 @@ from django.test import TestCase, override_settings from rest_framework import filters, pagination, permissions, serializers from rest_framework.compat import coreapi from rest_framework.decorators import detail_route, list_route -from rest_framework.response import Response from rest_framework.routers import DefaultRouter -from rest_framework.schemas import SchemaGenerator +from rest_framework.schemas import SchemaGenerator, get_schema_view from rest_framework.test import APIClient from rest_framework.views import APIView from rest_framework.viewsets import ModelViewSet @@ -23,6 +22,10 @@ class ExamplePagination(pagination.PageNumberPagination): page_size = 100 +class EmptySerializer(serializers.Serializer): + pass + + class ExampleSerializer(serializers.Serializer): a = serializers.CharField(required=True, help_text='A field description') b = serializers.CharField(required=False) @@ -43,36 +46,37 @@ class ExampleViewSet(ModelViewSet): @detail_route(methods=['post'], serializer_class=AnotherSerializer) def custom_action(self, request, pk): + """ + A description of custom action. + """ return super(ExampleSerializer, self).retrieve(self, request) @list_route() def custom_list_action(self, request): return super(ExampleViewSet, self).list(self, request) + @list_route(methods=['post', 'get'], serializer_class=EmptySerializer) + def custom_list_action_multiple_methods(self, request): + return super(ExampleViewSet, self).list(self, request) + def get_serializer(self, *args, **kwargs): assert self.request assert self.action return super(ExampleViewSet, self).get_serializer(*args, **kwargs) -class ExampleView(APIView): - permission_classes = [permissions.IsAuthenticatedOrReadOnly] +if coreapi: + schema_view = get_schema_view(title='Example API') +else: + def schema_view(request): + pass - def get(self, request, *args, **kwargs): - return Response() - - def post(self, request, *args, **kwargs): - return Response() - - -router = DefaultRouter(schema_title='Example API' if coreapi else None) +router = DefaultRouter() router.register('example', ExampleViewSet, base_name='example') urlpatterns = [ + url(r'^$', schema_view), url(r'^', include(router.urls)) ] -urlpatterns2 = [ - url(r'^example-view/$', ExampleView.as_view(), name='example-view') -] @unittest.skipUnless(coreapi, 'coreapi is not installed') @@ -80,7 +84,7 @@ urlpatterns2 = [ class TestRouterGeneratedSchema(TestCase): def test_anonymous_request(self): client = APIClient() - response = client.get('/', HTTP_ACCEPT='application/vnd.coreapi+json') + response = client.get('/', HTTP_ACCEPT='application/coreapi+json') self.assertEqual(response.status_code, 200) expected = coreapi.Document( url='', @@ -99,11 +103,17 @@ class TestRouterGeneratedSchema(TestCase): url='/example/custom_list_action/', action='get' ), - 'retrieve': coreapi.Link( - url='/example/{pk}/', + 'custom_list_action_multiple_methods': { + 'read': coreapi.Link( + url='/example/custom_list_action_multiple_methods/', + action='get' + ) + }, + 'read': coreapi.Link( + url='/example/{id}/', action='get', fields=[ - coreapi.Field('pk', required=True, location='path') + coreapi.Field('id', required=True, location='path') ] ) } @@ -114,7 +124,7 @@ class TestRouterGeneratedSchema(TestCase): def test_authenticated_request(self): client = APIClient() client.force_authenticate(MockUser()) - response = client.get('/', HTTP_ACCEPT='application/vnd.coreapi+json') + response = client.get('/', HTTP_ACCEPT='application/coreapi+json') self.assertEqual(response.status_code, 200) expected = coreapi.Document( url='', @@ -134,56 +144,67 @@ class TestRouterGeneratedSchema(TestCase): action='post', encoding='application/json', fields=[ - coreapi.Field('a', required=True, location='form', description='A field description'), - coreapi.Field('b', required=False, location='form') + coreapi.Field('a', required=True, location='form', type='string', description='A field description'), + coreapi.Field('b', required=False, location='form', type='string') ] ), - 'retrieve': coreapi.Link( - url='/example/{pk}/', + 'read': coreapi.Link( + url='/example/{id}/', action='get', fields=[ - coreapi.Field('pk', required=True, location='path') + coreapi.Field('id', required=True, location='path') ] ), 'custom_action': coreapi.Link( - url='/example/{pk}/custom_action/', + url='/example/{id}/custom_action/', action='post', encoding='application/json', + description='A description of custom action.', fields=[ - coreapi.Field('pk', required=True, location='path'), - coreapi.Field('c', required=True, location='form'), - coreapi.Field('d', required=False, location='form'), + coreapi.Field('id', required=True, location='path'), + coreapi.Field('c', required=True, location='form', type='string'), + coreapi.Field('d', required=False, location='form', type='string'), ] ), 'custom_list_action': coreapi.Link( url='/example/custom_list_action/', action='get' ), + 'custom_list_action_multiple_methods': { + 'read': coreapi.Link( + url='/example/custom_list_action_multiple_methods/', + action='get' + ), + 'create': coreapi.Link( + url='/example/custom_list_action_multiple_methods/', + action='post' + ) + }, 'update': coreapi.Link( - url='/example/{pk}/', + url='/example/{id}/', action='put', encoding='application/json', fields=[ - coreapi.Field('pk', required=True, location='path'), - coreapi.Field('a', required=True, location='form', description='A field description'), - coreapi.Field('b', required=False, location='form') + coreapi.Field('id', required=True, location='path'), + coreapi.Field('a', required=True, location='form', type='string', description='A field description'), + coreapi.Field('b', required=False, location='form', type='string') ] ), 'partial_update': coreapi.Link( - url='/example/{pk}/', + url='/example/{id}/', action='patch', encoding='application/json', fields=[ - coreapi.Field('pk', required=True, location='path'), - coreapi.Field('a', required=False, location='form', description='A field description'), - coreapi.Field('b', required=False, location='form') + coreapi.Field('id', required=True, location='path'), + coreapi.Field('a', required=False, location='form', type='string', description='A field description'), + coreapi.Field('b', required=False, location='form', type='string') ] ), - 'destroy': coreapi.Link( - url='/example/{pk}/', + 'delete': coreapi.Link( + url='/example/{id}/', action='delete', fields=[ - coreapi.Field('pk', required=True, location='path') + coreapi.Field('id', required=True, location='path') ] ) } @@ -192,27 +213,123 @@ class TestRouterGeneratedSchema(TestCase): self.assertEqual(response.data, expected) +class ExampleListView(APIView): + permission_classes = [permissions.IsAuthenticatedOrReadOnly] + + def get(self, *args, **kwargs): + pass + + def post(self, request, *args, **kwargs): + pass + + +class ExampleDetailView(APIView): + permission_classes = [permissions.IsAuthenticatedOrReadOnly] + + def get(self, *args, **kwargs): + pass + + @unittest.skipUnless(coreapi, 'coreapi is not installed') class TestSchemaGenerator(TestCase): - def test_view(self): - schema_generator = SchemaGenerator(title='Test View', patterns=urlpatterns2) - schema = schema_generator.get_schema() + def setUp(self): + self.patterns = [ + url('^example/?$', ExampleListView.as_view()), + url('^example/(?P\d+)/?$', ExampleDetailView.as_view()), + url('^example/(?P\d+)/sub/?$', ExampleDetailView.as_view()), + ] + + def test_schema_for_regular_views(self): + """ + Ensure that schema generation works for APIView classes. + """ + generator = SchemaGenerator(title='Example API', patterns=self.patterns) + schema = generator.get_schema() expected = coreapi.Document( url='', - title='Test View', + title='Example API', content={ - 'example-view': { + 'example': { 'create': coreapi.Link( - url='/example-view/', + url='/example/', action='post', fields=[] ), - 'read': coreapi.Link( - url='/example-view/', + 'list': coreapi.Link( + url='/example/', action='get', fields=[] - ) + ), + 'read': coreapi.Link( + url='/example/{id}/', + action='get', + fields=[ + coreapi.Field('id', required=True, location='path') + ] + ), + 'sub': { + 'list': coreapi.Link( + url='/example/{id}/sub/', + action='get', + fields=[ + coreapi.Field('id', required=True, location='path') + ] + ) + } } } ) - self.assertEquals(schema, expected) + self.assertEqual(schema, expected) + + +@unittest.skipUnless(coreapi, 'coreapi is not installed') +class TestSchemaGeneratorNotAtRoot(TestCase): + def setUp(self): + self.patterns = [ + url('^api/v1/example/?$', ExampleListView.as_view()), + url('^api/v1/example/(?P\d+)/?$', ExampleDetailView.as_view()), + url('^api/v1/example/(?P\d+)/sub/?$', ExampleDetailView.as_view()), + ] + + def test_schema_for_regular_views(self): + """ + Ensure that schema generation with an API that is not at the URL + root continues to use correct structure for link keys. + """ + generator = SchemaGenerator(title='Example API', patterns=self.patterns) + schema = generator.get_schema() + expected = coreapi.Document( + url='', + title='Example API', + content={ + 'example': { + 'create': coreapi.Link( + url='/api/v1/example/', + action='post', + fields=[] + ), + 'list': coreapi.Link( + url='/api/v1/example/', + action='get', + fields=[] + ), + 'read': coreapi.Link( + url='/api/v1/example/{id}/', + action='get', + fields=[ + coreapi.Field('id', required=True, location='path') + ] + ), + 'sub': { + 'list': coreapi.Link( + url='/api/v1/example/{id}/sub/', + action='get', + fields=[ + coreapi.Field('id', required=True, location='path') + ] + ) + } + } + } + ) + self.assertEqual(schema, expected) diff --git a/tests/test_urlpatterns.py b/tests/test_urlpatterns.py index 78d37c1a8..33d367e1d 100644 --- a/tests/test_urlpatterns.py +++ b/tests/test_urlpatterns.py @@ -3,9 +3,9 @@ from __future__ import unicode_literals from collections import namedtuple from django.conf.urls import include, url -from django.core import urlresolvers from django.test import TestCase +from rest_framework.compat import RegexURLResolver, Resolver404 from rest_framework.test import APIRequestFactory from rest_framework.urlpatterns import format_suffix_patterns @@ -28,7 +28,7 @@ class FormatSuffixTests(TestCase): urlpatterns = format_suffix_patterns(urlpatterns) except Exception: self.fail("Failed to apply `format_suffix_patterns` on the supplied urlpatterns") - resolver = urlresolvers.RegexURLResolver(r'^/', urlpatterns) + resolver = RegexURLResolver(r'^/', urlpatterns) for test_path in test_paths: request = factory.get(test_path.path) try: @@ -43,7 +43,7 @@ class FormatSuffixTests(TestCase): urlpatterns = format_suffix_patterns([ url(r'^test/$', dummy_view), ]) - resolver = urlresolvers.RegexURLResolver(r'^/', urlpatterns) + resolver = RegexURLResolver(r'^/', urlpatterns) test_paths = [ (URLTestPath('/test.api', (), {'format': 'api'}), True), @@ -55,7 +55,7 @@ class FormatSuffixTests(TestCase): request = factory.get(test_path.path) try: callback, callback_args, callback_kwargs = resolver.resolve(request.path_info) - except urlresolvers.Resolver404: + except Resolver404: callback, callback_args, callback_kwargs = (None, None, None) if not expected_resolved: assert callback is None diff --git a/tests/utils.py b/tests/utils.py index 5b2d75864..52582f093 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -1,5 +1,5 @@ from django.core.exceptions import ObjectDoesNotExist -from django.core.urlresolvers import NoReverseMatch +from rest_framework.compat import NoReverseMatch class MockObject(object): diff --git a/tox.ini b/tox.ini index 48cecccf7..bac1569a0 100644 --- a/tox.ini +++ b/tox.ini @@ -4,7 +4,7 @@ addopts=--tb=short [tox] envlist = py27-{lint,docs}, - {py27,py32,py33,py34,py35}-django18, + {py27,py33,py34,py35}-django18, {py27,py34,py35}-django19, {py27,py34,py35}-django110, {py27,py34,py35}-django{master} @@ -25,7 +25,6 @@ basepython = py35: python3.5 py34: python3.4 py33: python3.3 - py32: python3.2 py27: python2.7 [testenv:py27-lint] From 072d14c2e1d4cf5d0b57196296657f19dd807e8c Mon Sep 17 00:00:00 2001 From: Steven Johns Date: Tue, 11 Oct 2016 11:20:48 +1100 Subject: [PATCH 266/457] Corrected `artist` and `album_name` `The Roots` are the band: https://en.wikipedia.org/wiki/The_Roots `Undun` is their album: https://en.wikipedia.org/wiki/Undun --- docs/api-guide/relations.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/api-guide/relations.md b/docs/api-guide/relations.md index 8fde53d3a..aeefae8b1 100644 --- a/docs/api-guide/relations.md +++ b/docs/api-guide/relations.md @@ -99,8 +99,8 @@ For example, the following serializer: Would serialize to a representation like this: { - 'album_name': 'The Roots', - 'artist': 'Undun', + 'album_name': 'Undun', + 'artist': 'The Roots', 'tracks': [ 89, 90, From a3802504a0a26f1d03d2cf6f851030314b7372fd Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 11 Oct 2016 10:25:21 +0100 Subject: [PATCH 267/457] Error codes (#4550) Add error codes to `APIException` --- docs/api-guide/exceptions.md | 54 ++++++++-- rest_framework/authtoken/serializers.py | 6 +- rest_framework/exceptions.py | 132 +++++++++++++++++------- rest_framework/fields.py | 18 +++- rest_framework/serializers.py | 35 +++---- rest_framework/validators.py | 21 ++-- tests/test_exceptions.py | 38 +++++-- tests/test_validation.py | 2 +- tests/test_validation_error.py | 101 ++++++++++++++++++ 9 files changed, 316 insertions(+), 91 deletions(-) create mode 100644 tests/test_validation_error.py diff --git a/docs/api-guide/exceptions.md b/docs/api-guide/exceptions.md index 3e4b3e8be..f0f178d92 100644 --- a/docs/api-guide/exceptions.md +++ b/docs/api-guide/exceptions.md @@ -98,7 +98,7 @@ Note that the exception handler will only be called for responses generated by r The **base class** for all exceptions raised inside an `APIView` class or `@api_view`. -To provide a custom exception, subclass `APIException` and set the `.status_code` and `.default_detail` properties on the class. +To provide a custom exception, subclass `APIException` and set the `.status_code`, `.default_detail`, and `default_code` attributes on the class. For example, if your API relies on a third party service that may sometimes be unreachable, you might want to implement an exception for the "503 Service Unavailable" HTTP response code. You could do this like so: @@ -107,10 +107,42 @@ For example, if your API relies on a third party service that may sometimes be u class ServiceUnavailable(APIException): status_code = 503 default_detail = 'Service temporarily unavailable, try again later.' + default_code = 'service_unavailable' + +#### Inspecting API exceptions + +There are a number of different properties available for inspecting the status +of an API exception. You can use these to build custom exception handling +for your project. + +The available attributes and methods are: + +* `.detail` - Return the textual description of the error. +* `.get_codes()` - Return the code identifier of the error. +* `.full_details()` - Return both the textual description and the code identifier. + +In most cases the error detail will be a simple item: + + >>> print(exc.detail) + You do not have permission to perform this action. + >>> print(exc.get_codes()) + permission_denied + >>> print(exc.full_details()) + {'message':'You do not have permission to perform this action.','code':'permission_denied'} + +In the case of validation errors the error detail will be either a list or +dictionary of items: + + >>> print(exc.detail) + {"name":"This field is required.","age":"A valid integer is required."} + >>> print(exc.get_codes()) + {"name":"required","age":"invalid"} + >>> print(exc.get_full_details()) + {"name":{"message":"This field is required.","code":"required"},"age":{"message":"A valid integer is required.","code":"invalid"}} ## ParseError -**Signature:** `ParseError(detail=None)` +**Signature:** `ParseError(detail=None, code=None)` Raised if the request contains malformed data when accessing `request.data`. @@ -118,7 +150,7 @@ By default this exception results in a response with the HTTP status code "400 B ## AuthenticationFailed -**Signature:** `AuthenticationFailed(detail=None)` +**Signature:** `AuthenticationFailed(detail=None, code=None)` Raised when an incoming request includes incorrect authentication. @@ -126,7 +158,7 @@ By default this exception results in a response with the HTTP status code "401 U ## NotAuthenticated -**Signature:** `NotAuthenticated(detail=None)` +**Signature:** `NotAuthenticated(detail=None, code=None)` Raised when an unauthenticated request fails the permission checks. @@ -134,7 +166,7 @@ By default this exception results in a response with the HTTP status code "401 U ## PermissionDenied -**Signature:** `PermissionDenied(detail=None)` +**Signature:** `PermissionDenied(detail=None, code=None)` Raised when an authenticated request fails the permission checks. @@ -142,7 +174,7 @@ By default this exception results in a response with the HTTP status code "403 F ## NotFound -**Signature:** `NotFound(detail=None)` +**Signature:** `NotFound(detail=None, code=None)` Raised when a resource does not exists at the given URL. This exception is equivalent to the standard `Http404` Django exception. @@ -150,7 +182,7 @@ By default this exception results in a response with the HTTP status code "404 N ## MethodNotAllowed -**Signature:** `MethodNotAllowed(method, detail=None)` +**Signature:** `MethodNotAllowed(method, detail=None, code=None)` Raised when an incoming request occurs that does not map to a handler method on the view. @@ -158,7 +190,7 @@ By default this exception results in a response with the HTTP status code "405 M ## NotAcceptable -**Signature:** `NotAcceptable(detail=None)` +**Signature:** `NotAcceptable(detail=None, code=None)` Raised when an incoming request occurs with an `Accept` header that cannot be satisfied by any of the available renderers. @@ -166,7 +198,7 @@ By default this exception results in a response with the HTTP status code "406 N ## UnsupportedMediaType -**Signature:** `UnsupportedMediaType(media_type, detail=None)` +**Signature:** `UnsupportedMediaType(media_type, detail=None, code=None)` Raised if there are no parsers that can handle the content type of the request data when accessing `request.data`. @@ -174,7 +206,7 @@ By default this exception results in a response with the HTTP status code "415 U ## Throttled -**Signature:** `Throttled(wait=None, detail=None)` +**Signature:** `Throttled(wait=None, detail=None, code=None)` Raised when an incoming request fails the throttling checks. @@ -182,7 +214,7 @@ By default this exception results in a response with the HTTP status code "429 T ## ValidationError -**Signature:** `ValidationError(detail)` +**Signature:** `ValidationError(detail, code=None)` The `ValidationError` exception is slightly different from the other `APIException` classes: diff --git a/rest_framework/authtoken/serializers.py b/rest_framework/authtoken/serializers.py index 90d3bd96e..b91a8454f 100644 --- a/rest_framework/authtoken/serializers.py +++ b/rest_framework/authtoken/serializers.py @@ -21,13 +21,13 @@ class AuthTokenSerializer(serializers.Serializer): # (Assuming the default `ModelBackend` authentication backend.) if not user.is_active: msg = _('User account is disabled.') - raise serializers.ValidationError(msg) + raise serializers.ValidationError(msg, code='authorization') else: msg = _('Unable to log in with provided credentials.') - raise serializers.ValidationError(msg) + raise serializers.ValidationError(msg, code='authorization') else: msg = _('Must include "username" and "password".') - raise serializers.ValidationError(msg) + raise serializers.ValidationError(msg, code='authorization') attrs['user'] = user return attrs diff --git a/rest_framework/exceptions.py b/rest_framework/exceptions.py index 29afaffe0..e41655fef 100644 --- a/rest_framework/exceptions.py +++ b/rest_framework/exceptions.py @@ -17,27 +17,61 @@ from rest_framework import status from rest_framework.utils.serializer_helpers import ReturnDict, ReturnList -def _force_text_recursive(data): +def _get_error_details(data, default_code=None): """ Descend into a nested data structure, forcing any - lazy translation strings into plain text. + lazy translation strings or strings into `ErrorDetail`. """ if isinstance(data, list): ret = [ - _force_text_recursive(item) for item in data + _get_error_details(item, default_code) for item in data ] if isinstance(data, ReturnList): return ReturnList(ret, serializer=data.serializer) return ret elif isinstance(data, dict): ret = { - key: _force_text_recursive(value) + key: _get_error_details(value, default_code) for key, value in data.items() } if isinstance(data, ReturnDict): return ReturnDict(ret, serializer=data.serializer) return ret - return force_text(data) + + text = force_text(data) + code = getattr(data, 'code', default_code) + return ErrorDetail(text, code) + + +def _get_codes(detail): + if isinstance(detail, list): + return [_get_codes(item) for item in detail] + elif isinstance(detail, dict): + return {key: _get_codes(value) for key, value in detail.items()} + return detail.code + + +def _get_full_details(detail): + if isinstance(detail, list): + return [_get_full_details(item) for item in detail] + elif isinstance(detail, dict): + return {key: _get_full_details(value) for key, value in detail.items()} + return { + 'message': detail, + 'code': detail.code + } + + +class ErrorDetail(six.text_type): + """ + A string-like object that can additionally + """ + code = None + + def __new__(cls, string, code=None): + self = super(ErrorDetail, cls).__new__(cls, string) + self.code = code + return self class APIException(Exception): @@ -47,16 +81,35 @@ class APIException(Exception): """ status_code = status.HTTP_500_INTERNAL_SERVER_ERROR default_detail = _('A server error occurred.') + default_code = 'error' - def __init__(self, detail=None): - if detail is not None: - self.detail = force_text(detail) - else: - self.detail = force_text(self.default_detail) + def __init__(self, detail=None, code=None): + if detail is None: + detail = self.default_detail + if code is None: + code = self.default_code + + self.detail = _get_error_details(detail, code) def __str__(self): return self.detail + def get_codes(self): + """ + Return only the code part of the error details. + + Eg. {"name": ["required"]} + """ + return _get_codes(self.detail) + + def get_full_details(self): + """ + Return both the message & code parts of the error details. + + Eg. {"name": [{"message": "This field is required.", "code": "required"}]} + """ + return _get_full_details(self.detail) + # The recommended style for using `ValidationError` is to keep it namespaced # under `serializers`, in order to minimize potential confusion with Django's @@ -67,13 +120,21 @@ class APIException(Exception): class ValidationError(APIException): status_code = status.HTTP_400_BAD_REQUEST + default_detail = _('Invalid input.') + default_code = 'invalid' - def __init__(self, detail): - # For validation errors the 'detail' key is always required. - # The details should always be coerced to a list if not already. + def __init__(self, detail, code=None): + if detail is None: + detail = self.default_detail + if code is None: + code = self.default_code + + # For validation failures, we may collect may errors together, so the + # details should always be coerced to a list if not already. if not isinstance(detail, dict) and not isinstance(detail, list): detail = [detail] - self.detail = _force_text_recursive(detail) + + self.detail = _get_error_details(detail, code) def __str__(self): return six.text_type(self.detail) @@ -82,62 +143,63 @@ class ValidationError(APIException): class ParseError(APIException): status_code = status.HTTP_400_BAD_REQUEST default_detail = _('Malformed request.') + default_code = 'parse_error' class AuthenticationFailed(APIException): status_code = status.HTTP_401_UNAUTHORIZED default_detail = _('Incorrect authentication credentials.') + default_code = 'authentication_failed' class NotAuthenticated(APIException): status_code = status.HTTP_401_UNAUTHORIZED default_detail = _('Authentication credentials were not provided.') + default_code = 'not_authenticated' class PermissionDenied(APIException): status_code = status.HTTP_403_FORBIDDEN default_detail = _('You do not have permission to perform this action.') + default_code = 'permission_denied' class NotFound(APIException): status_code = status.HTTP_404_NOT_FOUND default_detail = _('Not found.') + default_code = 'not_found' class MethodNotAllowed(APIException): status_code = status.HTTP_405_METHOD_NOT_ALLOWED default_detail = _('Method "{method}" not allowed.') + default_code = 'method_not_allowed' - def __init__(self, method, detail=None): - if detail is not None: - self.detail = force_text(detail) - else: - self.detail = force_text(self.default_detail).format(method=method) + def __init__(self, method, detail=None, code=None): + if detail is None: + detail = force_text(self.default_detail).format(method=method) + super(MethodNotAllowed, self).__init__(detail, code) class NotAcceptable(APIException): status_code = status.HTTP_406_NOT_ACCEPTABLE default_detail = _('Could not satisfy the request Accept header.') + default_code = 'not_acceptable' - def __init__(self, detail=None, available_renderers=None): - if detail is not None: - self.detail = force_text(detail) - else: - self.detail = force_text(self.default_detail) + def __init__(self, detail=None, code=None, available_renderers=None): self.available_renderers = available_renderers + super(NotAcceptable, self).__init__(detail, code) class UnsupportedMediaType(APIException): status_code = status.HTTP_415_UNSUPPORTED_MEDIA_TYPE default_detail = _('Unsupported media type "{media_type}" in request.') + default_code = 'unsupported_media_type' - def __init__(self, media_type, detail=None): - if detail is not None: - self.detail = force_text(detail) - else: - self.detail = force_text(self.default_detail).format( - media_type=media_type - ) + def __init__(self, media_type, detail=None, code=None): + if detail is None: + detail = force_text(self.default_detail).format(media_type=media_type) + super(UnsupportedMediaType, self).__init__(detail, code) class Throttled(APIException): @@ -145,12 +207,10 @@ class Throttled(APIException): default_detail = _('Request was throttled.') extra_detail_singular = 'Expected available in {wait} second.' extra_detail_plural = 'Expected available in {wait} seconds.' + default_code = 'throttled' - def __init__(self, wait=None, detail=None): - if detail is not None: - self.detail = force_text(detail) - else: - self.detail = force_text(self.default_detail) + def __init__(self, wait=None, detail=None, code=None): + super(Throttled, self).__init__(detail, code) if wait is None: self.wait = None diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 7f8391b8a..1894b064c 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -34,7 +34,7 @@ from rest_framework import ISO_8601 from rest_framework.compat import ( get_remote_field, unicode_repr, unicode_to_repr, value_from_object ) -from rest_framework.exceptions import ValidationError +from rest_framework.exceptions import ErrorDetail, ValidationError from rest_framework.settings import api_settings from rest_framework.utils import html, humanize_datetime, representation @@ -224,6 +224,18 @@ def iter_options(grouped_choices, cutoff=None, cutoff_text=None): yield Option(value='n/a', display_text=cutoff_text, disabled=True) +def get_error_detail(exc_info): + """ + Given a Django ValidationError, return a list of ErrorDetail, + with the `code` populated. + """ + code = getattr(exc_info, 'code', None) or 'invalid' + return [ + ErrorDetail(msg, code=code) + for msg in exc_info.messages + ] + + class CreateOnlyDefault(object): """ This class may be used to provide default values that are only used @@ -525,7 +537,7 @@ class Field(object): raise errors.extend(exc.detail) except DjangoValidationError as exc: - errors.extend(exc.messages) + errors.extend(get_error_detail(exc)) if errors: raise ValidationError(errors) @@ -563,7 +575,7 @@ class Field(object): msg = MISSING_ERROR_MESSAGE.format(class_name=class_name, key=key) raise AssertionError(msg) message_string = msg.format(**kwargs) - raise ValidationError(message_string) + raise ValidationError(message_string, code=key) @cached_property def root(self): diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 7e99d40b3..a6ed7d87e 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -291,32 +291,29 @@ class SerializerMetaclass(type): return super(SerializerMetaclass, cls).__new__(cls, name, bases, attrs) -def get_validation_error_detail(exc): +def as_serializer_error(exc): assert isinstance(exc, (ValidationError, DjangoValidationError)) if isinstance(exc, DjangoValidationError): - # Normally you should raise `serializers.ValidationError` - # inside your codebase, but we handle Django's validation - # exception class as well for simpler compat. - # Eg. Calling Model.clean() explicitly inside Serializer.validate() - return { - api_settings.NON_FIELD_ERRORS_KEY: list(exc.messages) - } - elif isinstance(exc.detail, dict): + detail = get_error_detail(exc) + else: + detail = exc.detail + + if isinstance(detail, dict): # If errors may be a dict we use the standard {key: list of values}. # Here we ensure that all the values are *lists* of errors. return { key: value if isinstance(value, (list, dict)) else [value] - for key, value in exc.detail.items() + for key, value in detail.items() } - elif isinstance(exc.detail, list): + elif isinstance(detail, list): # Errors raised as a list are non-field errors. return { - api_settings.NON_FIELD_ERRORS_KEY: exc.detail + api_settings.NON_FIELD_ERRORS_KEY: detail } # Errors raised as a string are non-field errors. return { - api_settings.NON_FIELD_ERRORS_KEY: [exc.detail] + api_settings.NON_FIELD_ERRORS_KEY: [detail] } @@ -410,7 +407,7 @@ class Serializer(BaseSerializer): value = self.validate(value) assert value is not None, '.validate() should return the validated data' except (ValidationError, DjangoValidationError) as exc: - raise ValidationError(detail=get_validation_error_detail(exc)) + raise ValidationError(detail=as_serializer_error(exc)) return value @@ -424,7 +421,7 @@ class Serializer(BaseSerializer): ) raise ValidationError({ api_settings.NON_FIELD_ERRORS_KEY: [message] - }) + }, code='invalid') ret = OrderedDict() errors = OrderedDict() @@ -440,7 +437,7 @@ class Serializer(BaseSerializer): except ValidationError as exc: errors[field.field_name] = exc.detail except DjangoValidationError as exc: - errors[field.field_name] = list(exc.messages) + errors[field.field_name] = get_error_detail(exc) except SkipField: pass else: @@ -564,7 +561,7 @@ class ListSerializer(BaseSerializer): value = self.validate(value) assert value is not None, '.validate() should return the validated data' except (ValidationError, DjangoValidationError) as exc: - raise ValidationError(detail=get_validation_error_detail(exc)) + raise ValidationError(detail=as_serializer_error(exc)) return value @@ -581,13 +578,13 @@ class ListSerializer(BaseSerializer): ) raise ValidationError({ api_settings.NON_FIELD_ERRORS_KEY: [message] - }) + }, code='not_a_list') if not self.allow_empty and len(data) == 0: message = self.error_messages['empty'] raise ValidationError({ api_settings.NON_FIELD_ERRORS_KEY: [message] - }) + }, code='empty') ret = [] errors = [] diff --git a/rest_framework/validators.py b/rest_framework/validators.py index 84af0b9d5..57f8bad53 100644 --- a/rest_framework/validators.py +++ b/rest_framework/validators.py @@ -80,7 +80,7 @@ class UniqueValidator(object): queryset = self.filter_queryset(value, queryset) queryset = self.exclude_current_instance(queryset) if qs_exists(queryset): - raise ValidationError(self.message) + raise ValidationError(self.message, code='unique') def __repr__(self): return unicode_to_repr('<%s(queryset=%s)>' % ( @@ -120,13 +120,13 @@ class UniqueTogetherValidator(object): if self.instance is not None: return - missing = { + missing_items = { field_name: self.missing_message for field_name in self.fields if field_name not in attrs } - if missing: - raise ValidationError(missing) + if missing_items: + raise ValidationError(missing_items, code='required') def filter_queryset(self, attrs, queryset): """ @@ -167,7 +167,8 @@ class UniqueTogetherValidator(object): ] if None not in checked_values and qs_exists(queryset): field_names = ', '.join(self.fields) - raise ValidationError(self.message.format(field_names=field_names)) + message = self.message.format(field_names=field_names) + raise ValidationError(message, code='unique') def __repr__(self): return unicode_to_repr('<%s(queryset=%s, fields=%s)>' % ( @@ -204,13 +205,13 @@ class BaseUniqueForValidator(object): The `UniqueForValidator` classes always force an implied 'required' state on the fields they are applied to. """ - missing = { + missing_items = { field_name: self.missing_message for field_name in [self.field, self.date_field] if field_name not in attrs } - if missing: - raise ValidationError(missing) + if missing_items: + raise ValidationError(missing_items, code='required') def filter_queryset(self, attrs, queryset): raise NotImplementedError('`filter_queryset` must be implemented.') @@ -231,7 +232,9 @@ class BaseUniqueForValidator(object): queryset = self.exclude_current_instance(attrs, queryset) if qs_exists(queryset): message = self.message.format(date_field=self.date_field) - raise ValidationError({self.field: message}) + raise ValidationError({ + self.field: message + }, code='unique') def __repr__(self): return unicode_to_repr('<%s(queryset=%s, field=%s, date_field=%s)>' % ( diff --git a/tests/test_exceptions.py b/tests/test_exceptions.py index cec050eb8..29703cb77 100644 --- a/tests/test_exceptions.py +++ b/tests/test_exceptions.py @@ -3,19 +3,39 @@ from __future__ import unicode_literals from django.test import TestCase from django.utils.translation import ugettext_lazy as _ -from rest_framework.exceptions import _force_text_recursive +from rest_framework.exceptions import ErrorDetail, _get_error_details class ExceptionTestCase(TestCase): - def test_force_text_recursive(self): + def test_get_error_details(self): - s = "sfdsfggiuytraetfdlklj" - self.assertEqual(_force_text_recursive(_(s)), s) - self.assertEqual(type(_force_text_recursive(_(s))), type(s)) + example = "string" + lazy_example = _(example) - self.assertEqual(_force_text_recursive({'a': _(s)})['a'], s) - self.assertEqual(type(_force_text_recursive({'a': _(s)})['a']), type(s)) + self.assertEqual( + _get_error_details(lazy_example), + example + ) + assert isinstance( + _get_error_details(lazy_example), + ErrorDetail + ) - self.assertEqual(_force_text_recursive([[_(s)]])[0][0], s) - self.assertEqual(type(_force_text_recursive([[_(s)]])[0][0]), type(s)) + self.assertEqual( + _get_error_details({'nested': lazy_example})['nested'], + example + ) + assert isinstance( + _get_error_details({'nested': lazy_example})['nested'], + ErrorDetail + ) + + self.assertEqual( + _get_error_details([[lazy_example]])[0][0], + example + ) + assert isinstance( + _get_error_details([[lazy_example]])[0][0], + ErrorDetail + ) diff --git a/tests/test_validation.py b/tests/test_validation.py index ab04d59e6..bc950dd22 100644 --- a/tests/test_validation.py +++ b/tests/test_validation.py @@ -60,7 +60,7 @@ class TestNestedValidationError(TestCase): } }) - self.assertEqual(serializers.get_validation_error_detail(e), { + self.assertEqual(serializers.as_serializer_error(e), { 'nested': { 'field': ['error'], } diff --git a/tests/test_validation_error.py b/tests/test_validation_error.py new file mode 100644 index 000000000..8e371a349 --- /dev/null +++ b/tests/test_validation_error.py @@ -0,0 +1,101 @@ +from django.test import TestCase + +from rest_framework import serializers, status +from rest_framework.decorators import api_view +from rest_framework.response import Response +from rest_framework.settings import api_settings +from rest_framework.test import APIRequestFactory +from rest_framework.views import APIView + +factory = APIRequestFactory() + + +class ExampleSerializer(serializers.Serializer): + char = serializers.CharField() + integer = serializers.IntegerField() + + +class ErrorView(APIView): + def get(self, request, *args, **kwargs): + ExampleSerializer(data={}).is_valid(raise_exception=True) + + +@api_view(['GET']) +def error_view(request): + ExampleSerializer(data={}).is_valid(raise_exception=True) + + +class TestValidationErrorWithFullDetails(TestCase): + def setUp(self): + self.DEFAULT_HANDLER = api_settings.EXCEPTION_HANDLER + + def exception_handler(exc, request): + data = exc.get_full_details() + return Response(data, status=status.HTTP_400_BAD_REQUEST) + + api_settings.EXCEPTION_HANDLER = exception_handler + + self.expected_response_data = { + 'char': [{ + 'message': 'This field is required.', + 'code': 'required', + }], + 'integer': [{ + 'message': 'This field is required.', + 'code': 'required' + }], + } + + def tearDown(self): + api_settings.EXCEPTION_HANDLER = self.DEFAULT_HANDLER + + def test_class_based_view_exception_handler(self): + view = ErrorView.as_view() + + request = factory.get('/', content_type='application/json') + response = view(request) + self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST) + self.assertEqual(response.data, self.expected_response_data) + + def test_function_based_view_exception_handler(self): + view = error_view + + request = factory.get('/', content_type='application/json') + response = view(request) + self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST) + self.assertEqual(response.data, self.expected_response_data) + + +class TestValidationErrorWithCodes(TestCase): + def setUp(self): + self.DEFAULT_HANDLER = api_settings.EXCEPTION_HANDLER + + def exception_handler(exc, request): + data = exc.get_codes() + return Response(data, status=status.HTTP_400_BAD_REQUEST) + + api_settings.EXCEPTION_HANDLER = exception_handler + + self.expected_response_data = { + 'char': ['required'], + 'integer': ['required'], + } + + def tearDown(self): + api_settings.EXCEPTION_HANDLER = self.DEFAULT_HANDLER + + def test_class_based_view_exception_handler(self): + view = ErrorView.as_view() + + request = factory.get('/', content_type='application/json') + response = view(request) + self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST) + self.assertEqual(response.data, self.expected_response_data) + + def test_function_based_view_exception_handler(self): + view = error_view + + request = factory.get('/', content_type='application/json') + response = view(request) + self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST) + self.assertEqual(response.data, self.expected_response_data) From aed4ed5e73638025ae3c9d591e2731b1e792a344 Mon Sep 17 00:00:00 2001 From: Akshay Sharma Date: Tue, 11 Oct 2016 15:29:00 +0530 Subject: [PATCH 268/457] Browsable API navbar gets overlapped by highlighted pagination item fix (#4547) --- rest_framework/static/rest_framework/css/bootstrap-tweaks.css | 1 - 1 file changed, 1 deletion(-) diff --git a/rest_framework/static/rest_framework/css/bootstrap-tweaks.css b/rest_framework/static/rest_framework/css/bootstrap-tweaks.css index 17085b49d..c2fcb303d 100644 --- a/rest_framework/static/rest_framework/css/bootstrap-tweaks.css +++ b/rest_framework/static/rest_framework/css/bootstrap-tweaks.css @@ -32,7 +32,6 @@ a single block in the template. position: fixed; left: 0; top: 0; - z-index: 3; } .navbar { From d0b3b6470a4f16d8256d0db5ed1be0f5a65dc0dc Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 11 Oct 2016 11:07:40 +0100 Subject: [PATCH 269/457] Fix prefetch_related updates. (#4553) --- rest_framework/mixins.py | 7 ++++++ tests/test_prefetch_related.py | 41 ++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 tests/test_prefetch_related.py diff --git a/rest_framework/mixins.py b/rest_framework/mixins.py index 1104aa29c..47a4923a1 100644 --- a/rest_framework/mixins.py +++ b/rest_framework/mixins.py @@ -68,6 +68,13 @@ class UpdateModelMixin(object): serializer = self.get_serializer(instance, data=request.data, partial=partial) serializer.is_valid(raise_exception=True) self.perform_update(serializer) + + if getattr(instance, '_prefetched_objects_cache', None): + # If 'prefetch_related' has been applied to a queryset, we need to + # refresh the instance from the database. + instance = self.get_object() + serializer = self.get_serializer(instance) + return Response(serializer.data) def perform_update(self, serializer): diff --git a/tests/test_prefetch_related.py b/tests/test_prefetch_related.py new file mode 100644 index 000000000..fc697adc1 --- /dev/null +++ b/tests/test_prefetch_related.py @@ -0,0 +1,41 @@ +from django.contrib.auth.models import Group, User +from django.test import TestCase + +from rest_framework import generics, serializers +from rest_framework.test import APIRequestFactory + +factory = APIRequestFactory() + + +class UserSerializer(serializers.ModelSerializer): + class Meta: + model = User + fields = ('id', 'username', 'email', 'groups') + + +class UserUpdate(generics.UpdateAPIView): + queryset = User.objects.all().prefetch_related('groups') + serializer_class = UserSerializer + + +class TestPrefetchRelatedUpdates(TestCase): + def setUp(self): + self.user = User.objects.create(username='tom', email='tom@example.com') + self.groups = [Group.objects.create(name='a'), Group.objects.create(name='b')] + self.user.groups = self.groups + self.user.save() + + def test_prefetch_related_updates(self): + view = UserUpdate.as_view() + pk = self.user.pk + groups_pk = self.groups[0].pk + request = factory.put('/', {'username': 'new', 'groups': [groups_pk]}, format='json') + response = view(request, pk=pk) + assert User.objects.get(pk=pk).groups.count() == 1 + expected = { + 'id': pk, + 'username': 'new', + 'groups': [1], + 'email': 'tom@example.com' + } + assert response.data == expected From 7f29cfc931110078d5b915fe0001a6ce06998c86 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 11 Oct 2016 12:18:00 +0100 Subject: [PATCH 270/457] Lazy hyperlink names (#4554) --- rest_framework/relations.py | 17 ++++--- rest_framework/templatetags/rest_framework.py | 3 +- tests/test_lazy_hyperlinks.py | 49 +++++++++++++++++++ 3 files changed, 61 insertions(+), 8 deletions(-) create mode 100644 tests/test_lazy_hyperlinks.py diff --git a/rest_framework/relations.py b/rest_framework/relations.py index c6eb92a24..c1898d0d8 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -37,14 +37,21 @@ class Hyperlink(six.text_type): We use this for hyperlinked URLs that may render as a named link in some contexts, or render as a plain URL in others. """ - def __new__(self, url, name): + def __new__(self, url, obj): ret = six.text_type.__new__(self, url) - ret.name = name + ret.obj = obj return ret def __getnewargs__(self): return(str(self), self.name,) + @property + def name(self): + # This ensures that we only called `__str__` lazily, + # as in some cases calling __str__ on a model instances *might* + # involve a database lookup. + return six.text_type(self.obj) + is_hyperlink = True @@ -303,9 +310,6 @@ class HyperlinkedRelatedField(RelatedField): kwargs = {self.lookup_url_kwarg: lookup_value} return self.reverse(view_name, kwargs=kwargs, request=request, format=format) - def get_name(self, obj): - return six.text_type(obj) - def to_internal_value(self, data): request = self.context.get('request', None) try: @@ -384,8 +388,7 @@ class HyperlinkedRelatedField(RelatedField): if url is None: return None - name = self.get_name(value) - return Hyperlink(url, name) + return Hyperlink(url, value) class HyperlinkedIdentityField(HyperlinkedRelatedField): diff --git a/rest_framework/templatetags/rest_framework.py b/rest_framework/templatetags/rest_framework.py index c1c8a5396..cfba054f6 100644 --- a/rest_framework/templatetags/rest_framework.py +++ b/rest_framework/templatetags/rest_framework.py @@ -135,7 +135,8 @@ def add_class(value, css_class): @register.filter def format_value(value): if getattr(value, 'is_hyperlink', False): - return mark_safe('%s' % (value, escape(value.name))) + name = six.text_type(value.obj) + return mark_safe('%s' % (value, escape(name))) if value is None or isinstance(value, bool): return mark_safe('%s' % {True: 'true', False: 'false', None: 'null'}[value]) elif isinstance(value, list): diff --git a/tests/test_lazy_hyperlinks.py b/tests/test_lazy_hyperlinks.py new file mode 100644 index 000000000..cf3ee735f --- /dev/null +++ b/tests/test_lazy_hyperlinks.py @@ -0,0 +1,49 @@ +from django.conf.urls import url +from django.db import models +from django.test import TestCase, override_settings + +from rest_framework import serializers +from rest_framework.renderers import JSONRenderer +from rest_framework.templatetags.rest_framework import format_value + +str_called = False + + +class Example(models.Model): + text = models.CharField(max_length=100) + + def __str__(self): + global str_called + str_called = True + return 'An example' + + +class ExampleSerializer(serializers.HyperlinkedModelSerializer): + class Meta: + model = Example + fields = ('url', 'id', 'text') + + +def dummy_view(request): + pass + + +urlpatterns = [ + url(r'^example/(?P[0-9]+)/$', dummy_view, name='example-detail'), +] + + +@override_settings(ROOT_URLCONF='tests.test_lazy_hyperlinks') +class TestLazyHyperlinkNames(TestCase): + def setUp(self): + self.example = Example.objects.create(text='foo') + + def test_lazy_hyperlink_names(self): + global str_called + context = {'request': None} + serializer = ExampleSerializer(self.example, context=context) + JSONRenderer().render(serializer.data) + assert not str_called + hyperlink_string = format_value(serializer.data['url']) + assert hyperlink_string == 'An example' + assert str_called From 02fcf6a3346a9d47a6c4297fd562708feb27ed89 Mon Sep 17 00:00:00 2001 From: SerenityCode Date: Wed, 12 Oct 2016 09:46:59 +0100 Subject: [PATCH 271/457] Use field name instead of source when generating docs (#4559) --- rest_framework/schemas.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/schemas.py b/rest_framework/schemas.py index 69698db0e..af861426c 100644 --- a/rest_framework/schemas.py +++ b/rest_framework/schemas.py @@ -477,7 +477,7 @@ class SchemaGenerator(object): required = field.required and method != 'PATCH' description = force_text(field.help_text) if field.help_text else '' field = coreapi.Field( - name=field.source, + name=field.field_name, location='form', required=required, description=description, From 11a89ebff42773452d2d6382ef96e8b33a24424c Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 12 Oct 2016 10:02:21 +0100 Subject: [PATCH 272/457] Removous erronous duplicate Danish translation file (#4563) --- .../locale/da_DK/LC_MESSAGES/django.mo | Bin 529 -> 0 bytes .../locale/da_DK/LC_MESSAGES/django.po | 439 ------------------ 2 files changed, 439 deletions(-) delete mode 100644 rest_framework/locale/da_DK/LC_MESSAGES/django.mo delete mode 100644 rest_framework/locale/da_DK/LC_MESSAGES/django.po diff --git a/rest_framework/locale/da_DK/LC_MESSAGES/django.mo b/rest_framework/locale/da_DK/LC_MESSAGES/django.mo deleted file mode 100644 index f34583e4c20fbd84e69fe3c25847ea9bc43df310..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 529 zcmZut!A=`75T$BQd+fP~snkOvnCvd4ZHTrc1ZXTzOA=@ zOJ@TL7oPNFd;G@FZ~lG$^t{LT!2H7e#{9@UV73@A|MKMzUR%u$b7$`<3wV{|Z*pE+ zBVlr{OkrU$y-i{1R84E^9-;*`)&-pTLg#p~Dm@+(Q>SWeAOo}=- BpPB#w diff --git a/rest_framework/locale/da_DK/LC_MESSAGES/django.po b/rest_framework/locale/da_DK/LC_MESSAGES/django.po deleted file mode 100644 index bb512e284..000000000 --- a/rest_framework/locale/da_DK/LC_MESSAGES/django.po +++ /dev/null @@ -1,439 +0,0 @@ -# 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: 2016-07-12 16:13+0100\n" -"PO-Revision-Date: 2016-07-12 15:14+0000\n" -"Last-Translator: Thomas Christie \n" -"Language-Team: Danish (Denmark) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/da_DK/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: da_DK\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: authentication.py:73 -msgid "Invalid basic header. No credentials provided." -msgstr "" - -#: authentication.py:76 -msgid "Invalid basic header. Credentials string should not contain spaces." -msgstr "" - -#: authentication.py:82 -msgid "Invalid basic header. Credentials not correctly base64 encoded." -msgstr "" - -#: authentication.py:99 -msgid "Invalid username/password." -msgstr "" - -#: authentication.py:102 authentication.py:198 -msgid "User inactive or deleted." -msgstr "" - -#: authentication.py:176 -msgid "Invalid token header. No credentials provided." -msgstr "" - -#: authentication.py:179 -msgid "Invalid token header. Token string should not contain spaces." -msgstr "" - -#: authentication.py:185 -msgid "" -"Invalid token header. Token string should not contain invalid characters." -msgstr "" - -#: authentication.py:195 -msgid "Invalid token." -msgstr "" - -#: authtoken/apps.py:7 -msgid "Auth Token" -msgstr "" - -#: authtoken/models.py:15 -msgid "Key" -msgstr "" - -#: authtoken/models.py:18 -msgid "User" -msgstr "" - -#: authtoken/models.py:20 -msgid "Created" -msgstr "" - -#: authtoken/models.py:29 -msgid "Token" -msgstr "" - -#: authtoken/models.py:30 -msgid "Tokens" -msgstr "" - -#: authtoken/serializers.py:8 -msgid "Username" -msgstr "" - -#: authtoken/serializers.py:9 -msgid "Password" -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:49 -msgid "A server error occurred." -msgstr "" - -#: exceptions.py:84 -msgid "Malformed request." -msgstr "" - -#: exceptions.py:89 -msgid "Incorrect authentication credentials." -msgstr "" - -#: exceptions.py:94 -msgid "Authentication credentials were not provided." -msgstr "" - -#: exceptions.py:99 -msgid "You do not have permission to perform this action." -msgstr "" - -#: exceptions.py:104 views.py:81 -msgid "Not found." -msgstr "" - -#: exceptions.py:109 -msgid "Method \"{method}\" not allowed." -msgstr "" - -#: exceptions.py:120 -msgid "Could not satisfy the request Accept header." -msgstr "" - -#: exceptions.py:132 -msgid "Unsupported media type \"{media_type}\" in request." -msgstr "" - -#: exceptions.py:145 -msgid "Request was throttled." -msgstr "" - -#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 -#: validators.py:181 -msgid "This field is required." -msgstr "" - -#: fields.py:270 -msgid "This field may not be null." -msgstr "" - -#: fields.py:608 fields.py:639 -msgid "\"{input}\" is not a valid boolean." -msgstr "" - -#: fields.py:674 -msgid "This field may not be blank." -msgstr "" - -#: fields.py:675 fields.py:1675 -msgid "Ensure this field has no more than {max_length} characters." -msgstr "" - -#: fields.py:676 -msgid "Ensure this field has at least {min_length} characters." -msgstr "" - -#: fields.py:713 -msgid "Enter a valid email address." -msgstr "" - -#: fields.py:724 -msgid "This value does not match the required pattern." -msgstr "" - -#: fields.py:735 -msgid "" -"Enter a valid \"slug\" consisting of letters, numbers, underscores or " -"hyphens." -msgstr "" - -#: fields.py:747 -msgid "Enter a valid URL." -msgstr "" - -#: fields.py:760 -msgid "\"{value}\" is not a valid UUID." -msgstr "" - -#: fields.py:796 -msgid "Enter a valid IPv4 or IPv6 address." -msgstr "" - -#: fields.py:821 -msgid "A valid integer is required." -msgstr "" - -#: fields.py:822 fields.py:857 fields.py:891 -msgid "Ensure this value is less than or equal to {max_value}." -msgstr "" - -#: fields.py:823 fields.py:858 fields.py:892 -msgid "Ensure this value is greater than or equal to {min_value}." -msgstr "" - -#: fields.py:824 fields.py:859 fields.py:896 -msgid "String value too large." -msgstr "" - -#: fields.py:856 fields.py:890 -msgid "A valid number is required." -msgstr "" - -#: fields.py:893 -msgid "Ensure that there are no more than {max_digits} digits in total." -msgstr "" - -#: fields.py:894 -msgid "" -"Ensure that there are no more than {max_decimal_places} decimal places." -msgstr "" - -#: fields.py:895 -msgid "" -"Ensure that there are no more than {max_whole_digits} digits before the " -"decimal point." -msgstr "" - -#: fields.py:1025 -msgid "Datetime has wrong format. Use one of these formats instead: {format}." -msgstr "" - -#: fields.py:1026 -msgid "Expected a datetime but got a date." -msgstr "" - -#: fields.py:1103 -msgid "Date has wrong format. Use one of these formats instead: {format}." -msgstr "" - -#: fields.py:1104 -msgid "Expected a date but got a datetime." -msgstr "" - -#: fields.py:1170 -msgid "Time has wrong format. Use one of these formats instead: {format}." -msgstr "" - -#: fields.py:1232 -msgid "Duration has wrong format. Use one of these formats instead: {format}." -msgstr "" - -#: fields.py:1251 fields.py:1300 -msgid "\"{input}\" is not a valid choice." -msgstr "" - -#: fields.py:1254 relations.py:71 relations.py:441 -msgid "More than {count} items..." -msgstr "" - -#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 -msgid "Expected a list of items but got type \"{input_type}\"." -msgstr "" - -#: fields.py:1302 -msgid "This selection may not be empty." -msgstr "" - -#: fields.py:1339 -msgid "\"{input}\" is not a valid path choice." -msgstr "" - -#: fields.py:1358 -msgid "No file was submitted." -msgstr "" - -#: fields.py:1359 -msgid "" -"The submitted data was not a file. Check the encoding type on the form." -msgstr "" - -#: fields.py:1360 -msgid "No filename could be determined." -msgstr "" - -#: fields.py:1361 -msgid "The submitted file is empty." -msgstr "" - -#: fields.py:1362 -msgid "" -"Ensure this filename has at most {max_length} characters (it has {length})." -msgstr "" - -#: fields.py:1410 -msgid "" -"Upload a valid image. The file you uploaded was either not an image or a " -"corrupted image." -msgstr "" - -#: fields.py:1449 relations.py:438 serializers.py:525 -msgid "This list may not be empty." -msgstr "" - -#: fields.py:1502 -msgid "Expected a dictionary of items but got type \"{input_type}\"." -msgstr "" - -#: fields.py:1549 -msgid "Value must be valid JSON." -msgstr "" - -#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 -msgid "Submit" -msgstr "" - -#: filters.py:336 -msgid "ascending" -msgstr "" - -#: filters.py:337 -msgid "descending" -msgstr "" - -#: pagination.py:193 -msgid "Invalid page." -msgstr "" - -#: pagination.py:427 -msgid "Invalid cursor" -msgstr "" - -#: relations.py:207 -msgid "Invalid pk \"{pk_value}\" - object does not exist." -msgstr "" - -#: relations.py:208 -msgid "Incorrect type. Expected pk value, received {data_type}." -msgstr "" - -#: relations.py:240 -msgid "Invalid hyperlink - No URL match." -msgstr "" - -#: relations.py:241 -msgid "Invalid hyperlink - Incorrect URL match." -msgstr "" - -#: relations.py:242 -msgid "Invalid hyperlink - Object does not exist." -msgstr "" - -#: relations.py:243 -msgid "Incorrect type. Expected URL string, received {data_type}." -msgstr "" - -#: relations.py:401 -msgid "Object with {slug_name}={value} does not exist." -msgstr "" - -#: relations.py:402 -msgid "Invalid value." -msgstr "" - -#: serializers.py:326 -msgid "Invalid data. Expected a dictionary, but got {datatype}." -msgstr "" - -#: templates/rest_framework/admin.html:116 -#: templates/rest_framework/base.html:128 -msgid "Filters" -msgstr "" - -#: templates/rest_framework/filters/django_filter.html:2 -#: templates/rest_framework/filters/django_filter_crispyforms.html:4 -msgid "Field filters" -msgstr "" - -#: templates/rest_framework/filters/ordering.html:3 -msgid "Ordering" -msgstr "" - -#: templates/rest_framework/filters/search.html:2 -msgid "Search" -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:43 -msgid "This field must be unique." -msgstr "" - -#: validators.py:97 -msgid "The fields {field_names} must make a unique set." -msgstr "" - -#: validators.py:245 -msgid "This field must be unique for the \"{date_field}\" date." -msgstr "" - -#: validators.py:260 -msgid "This field must be unique for the \"{date_field}\" month." -msgstr "" - -#: validators.py:273 -msgid "This field must be unique for the \"{date_field}\" year." -msgstr "" - -#: versioning.py:42 -msgid "Invalid version in \"Accept\" header." -msgstr "" - -#: versioning.py:73 -msgid "Invalid version in URL path." -msgstr "" - -#: versioning.py:115 -msgid "Invalid version in URL path. Does not match any version namespace." -msgstr "" - -#: versioning.py:147 -msgid "Invalid version in hostname." -msgstr "" - -#: versioning.py:169 -msgid "Invalid version in query parameter." -msgstr "" - -#: views.py:88 -msgid "Permission denied." -msgstr "" From 4c9b14bd972f1c74fc400297be5ecd1a1e0317f0 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 12 Oct 2016 10:13:46 +0100 Subject: [PATCH 273/457] Add --minimum-perc to transifex pull command [ci skip] --- docs/topics/project-management.md | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/topics/project-management.md b/docs/topics/project-management.md index e84f2acfb..37e5c6882 100644 --- a/docs/topics/project-management.md +++ b/docs/topics/project-management.md @@ -6,7 +6,7 @@ This document outlines our project management processes for REST framework. -The aim is to ensure that the project has a high +The aim is to ensure that the project has a high ["bus factor"][bus-factor], and can continue to remain well supported for the foreseeable future. Suggestions for improvements to our process are welcome. --- @@ -38,27 +38,27 @@ Members of the maintenance team will be added as collaborators to the repository The following template should be used for the description of the issue, and serves as the formal process for selecting the team. This issue is for determining the maintenance team for the *** period. - + Please see the [Project management](http://www.django-rest-framework.org/topics/project-management/) section of our documentation for more details. - + --- - + #### Renewing existing members. - + The following people are the current maintenance team. Please checkmark your name if you wish to continue to have write permission on the repository for the *** period. - + - [ ] @*** - [ ] @*** - [ ] @*** - [ ] @*** - [ ] @*** - + --- - + #### New members. - + If you wish to be considered for this or a future date, please comment against this or subsequent issues. - + To modify this process for future maintenance cycles make a pull request to the [project management](http://www.django-rest-framework.org/topics/project-management/) documentation. #### Responsibilities of team members @@ -116,7 +116,7 @@ The following template should be used for the description of the issue, and serv - [ ] Make a release announcement on the [discussion group](https://groups.google.com/forum/?fromgroups#!forum/django-rest-framework). - [ ] Make a release announcement on twitter. - [ ] Close the milestone on GitHub. - + To modify this process for future releases make a pull request to the [project management](http://www.django-rest-framework.org/topics/project-management/) documentation. When pushing the release to PyPI ensure that your environment has been installed from our development `requirement.txt`, so that documentation and PyPI installs are consistently being built against a pinned set of packages. @@ -165,7 +165,7 @@ Here's how differences between the old and new source files will be handled: When a translator has finished translating their work needs to be downloaded from Transifex into the REST framework repository. To do this, run: # 3. Pull the translated django.po files from Transifex. - tx pull -a + tx pull -a --minimum-perc 10 cd rest_framework # 4. Compile the binary .mo files for all supported languages. django-admin.py compilemessages From b4199704316bd2d67281cbc3cf946eab9bded407 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 12 Oct 2016 10:47:17 +0100 Subject: [PATCH 274/457] Handle empty data with serializer (#4564) --- rest_framework/serializers.py | 10 ++++++++++ tests/test_serializer.py | 6 ++++++ tests/test_serializer_nested.py | 6 ++++++ 3 files changed, 22 insertions(+) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index a6ed7d87e..02c21da15 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -507,6 +507,11 @@ class Serializer(BaseSerializer): @property def errors(self): ret = super(Serializer, self).errors + if isinstance(ret, list) and len(ret) == 1 and ret[0].code == 'null': + # Edge case. Provide a more descriptive error than + # "this field may not be null", when no data is passed. + detail = ErrorDetail('No data provided', code='null') + ret = {api_settings.NON_FIELD_ERRORS_KEY: [detail]} return ReturnDict(ret, serializer=self) @@ -700,6 +705,11 @@ class ListSerializer(BaseSerializer): @property def errors(self): ret = super(ListSerializer, self).errors + if isinstance(ret, list) and len(ret) == 1 and ret[0].code == 'null': + # Edge case. Provide a more descriptive error than + # "this field may not be null", when no data is passed. + detail = ErrorDetail('No data provided', code='null') + ret = {api_settings.NON_FIELD_ERRORS_KEY: [detail]} if isinstance(ret, dict): return ReturnDict(ret, serializer=self) return ReturnList(ret, serializer=self) diff --git a/tests/test_serializer.py b/tests/test_serializer.py index bd9ef9500..a2817f6a4 100644 --- a/tests/test_serializer.py +++ b/tests/test_serializer.py @@ -62,6 +62,12 @@ class TestSerializer: with pytest.raises(AssertionError): serializer.save() + def test_validate_none_data(self): + data = None + serializer = self.Serializer(data=data) + assert not serializer.is_valid() + assert serializer.errors == {'non_field_errors': ['No data provided']} + class TestValidateMethod: def test_non_field_error_validate_method(self): diff --git a/tests/test_serializer_nested.py b/tests/test_serializer_nested.py index 133600399..efb671918 100644 --- a/tests/test_serializer_nested.py +++ b/tests/test_serializer_nested.py @@ -41,6 +41,12 @@ class TestNestedSerializer: serializer = self.Serializer() assert serializer.data == expected_data + def test_nested_serialize_no_data(self): + data = None + serializer = self.Serializer(data=data) + assert not serializer.is_valid() + assert serializer.errors == {'non_field_errors': ['No data provided']} + class TestNotRequiredNestedSerializer: def setup(self): From 26e51ecd6c0805770615e768e46ecc6716872670 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 12 Oct 2016 14:04:10 +0100 Subject: [PATCH 275/457] When HTML form input is used with JSONField, treat the input as a JSON encoded string, not a JSON primative. (#4565) --- rest_framework/fields.py | 14 +++++++++++++- tests/test_fields.py | 13 +++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 1894b064c..e48285005 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -1594,9 +1594,21 @@ class JSONField(Field): self.binary = kwargs.pop('binary', False) super(JSONField, self).__init__(*args, **kwargs) + def get_value(self, dictionary): + if html.is_html_input(dictionary) and self.field_name in dictionary: + # When HTML form input is used, mark up the input + # as being a JSON string, rather than a JSON primative. + class JSONString(six.text_type): + def __new__(self, value): + ret = six.text_type.__new__(self, value) + ret.is_json_string = True + return ret + return JSONString(dictionary[self.field_name]) + return dictionary.get(self.field_name, empty) + def to_internal_value(self, data): try: - if self.binary: + if self.binary or getattr(data, 'is_json_string', False): if isinstance(data, six.binary_type): data = data.decode('utf-8') return json.loads(data) diff --git a/tests/test_fields.py b/tests/test_fields.py index c271afa9e..6fea249ba 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -1756,6 +1756,19 @@ class TestJSONField(FieldValues): ] field = serializers.JSONField() + def test_html_input_as_json_string(self): + """ + HTML inputs should be treated as a serialized JSON string. + """ + class TestSerializer(serializers.Serializer): + config = serializers.JSONField() + + data = QueryDict(mutable=True) + data.update({'config': '{"a":1}'}) + serializer = TestSerializer(data=data) + assert serializer.is_valid() + assert serializer.validated_data == {'config': {"a": 1}} + class TestBinaryJSONField(FieldValues): """ From 5677d063d8027bcacba07c203b7772816b78fb47 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 12 Oct 2016 15:46:24 +0100 Subject: [PATCH 276/457] Do not treat empty non-form input as HTML. (#4566) --- rest_framework/request.py | 5 ++++- tests/test_testing.py | 22 ++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/rest_framework/request.py b/rest_framework/request.py index 0a827728a..7121689d2 100644 --- a/rest_framework/request.py +++ b/rest_framework/request.py @@ -299,7 +299,10 @@ class Request(object): stream = None if stream is None or media_type is None: - empty_data = QueryDict('', encoding=self._request._encoding) + if media_type and not is_form_media_type(media_type): + empty_data = QueryDict('', encoding=self._request._encoding) + else: + empty_data = {} empty_files = MultiValueDict() return (empty_data, empty_files) diff --git a/tests/test_testing.py b/tests/test_testing.py index 6683ae6ed..e6a47d914 100644 --- a/tests/test_testing.py +++ b/tests/test_testing.py @@ -8,6 +8,7 @@ from django.contrib.auth.models import User from django.shortcuts import redirect from django.test import TestCase, override_settings +from rest_framework import fields, serializers from rest_framework.decorators import api_view from rest_framework.response import Response from rest_framework.test import ( @@ -37,10 +38,22 @@ def redirect_view(request): return redirect('/view/') +class BasicSerializer(serializers.Serializer): + flag = fields.BooleanField(default=lambda: True) + + +@api_view(['POST']) +def post_view(request): + serializer = BasicSerializer(data=request.data) + serializer.is_valid(raise_exception=True) + return Response(serializer.validated_data) + + urlpatterns = [ url(r'^view/$', view), url(r'^session-view/$', session_view), url(r'^redirect-view/$', redirect_view), + url(r'^post-view/$', post_view) ] @@ -181,6 +194,15 @@ class TestAPITestClient(TestCase): path='/view/', data={'valid': 123, 'invalid': {'a': 123}} ) + def test_empty_post_uses_default_boolean_value(self): + response = self.client.post( + '/post-view/', + data=None, + content_type='application/json' + ) + self.assertEqual(response.status_code, 200, response.content) + self.assertEqual(response.data, {"flag": True}) + class TestAPIRequestFactory(TestCase): def test_csrf_exempt_by_default(self): From 2519ce9128e4e870e28d77c0f388e3d2deb130c7 Mon Sep 17 00:00:00 2001 From: Alexey Evseev Date: Wed, 12 Oct 2016 18:09:45 +0300 Subject: [PATCH 277/457] Fix schema generation with custom page_size pagination param (#4567) --- rest_framework/pagination.py | 4 ++-- tests/test_schemas.py | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py index 6b539b900..708da29cd 100644 --- a/rest_framework/pagination.py +++ b/rest_framework/pagination.py @@ -290,9 +290,9 @@ class PageNumberPagination(BasePagination): coreapi.Field(name=self.page_query_param, required=False, location='query') ] if self.page_size_query_param is not None: - fields.append([ + fields.append( coreapi.Field(name=self.page_size_query_param, required=False, location='query') - ]) + ) return fields diff --git a/tests/test_schemas.py b/tests/test_schemas.py index c43fc1eff..7188087c4 100644 --- a/tests/test_schemas.py +++ b/tests/test_schemas.py @@ -20,6 +20,7 @@ class MockUser(object): class ExamplePagination(pagination.PageNumberPagination): page_size = 100 + page_size_query_param = 'page_size' class EmptySerializer(serializers.Serializer): @@ -64,7 +65,6 @@ class ExampleViewSet(ModelViewSet): assert self.action return super(ExampleViewSet, self).get_serializer(*args, **kwargs) - if coreapi: schema_view = get_schema_view(title='Example API') else: @@ -96,6 +96,7 @@ class TestRouterGeneratedSchema(TestCase): action='get', fields=[ coreapi.Field('page', required=False, location='query'), + coreapi.Field('page_size', required=False, location='query'), coreapi.Field('ordering', required=False, location='query') ] ), @@ -136,6 +137,7 @@ class TestRouterGeneratedSchema(TestCase): action='get', fields=[ coreapi.Field('page', required=False, location='query'), + coreapi.Field('page_size', required=False, location='query'), coreapi.Field('ordering', required=False, location='query') ] ), From 88c6c380c54d163d140485c8b53c923b7ec539e3 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 12 Oct 2016 16:51:01 +0100 Subject: [PATCH 278/457] Use field.source to perform check for writable nested field, not key (#4568) --- rest_framework/serializers.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 02c21da15..f13c92a44 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -744,8 +744,8 @@ def raise_errors_on_nested_writes(method_name, serializer, validated_data): # profile = ProfileSerializer() assert not any( isinstance(field, BaseSerializer) and - (key in validated_data) and - isinstance(validated_data[key], (list, dict)) + (field.source in validated_data) and + isinstance(validated_data[field.source], (list, dict)) for key, field in serializer.fields.items() ), ( 'The `.{method_name}()` method does not support writable nested ' From 8d0a91b002d7d18a1526e80e9cea0702e18be90e Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 13 Oct 2016 12:43:43 +0100 Subject: [PATCH 279/457] Fix 3674 (#4571) Handle ModelSerializer case for relationships to models with custom pk. --- rest_framework/serializers.py | 2 +- rest_framework/utils/field_mapping.py | 2 +- rest_framework/utils/model_meta.py | 15 ++++-- tests/test_model_serializer.py | 68 +++++++++++++++++++++++++++ 4 files changed, 80 insertions(+), 7 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index f13c92a44..098c3cd23 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -1167,7 +1167,7 @@ class ModelSerializer(Serializer): field_kwargs = get_relation_kwargs(field_name, relation_info) to_field = field_kwargs.pop('to_field', None) - if to_field and not relation_info.related_model._meta.get_field(to_field).primary_key: + if to_field and not relation_info.reverse and not relation_info.related_model._meta.get_field(to_field).primary_key: field_kwargs['slug_field'] = to_field field_class = self.serializer_related_to_field diff --git a/rest_framework/utils/field_mapping.py b/rest_framework/utils/field_mapping.py index 64df9a08e..29005f6b7 100644 --- a/rest_framework/utils/field_mapping.py +++ b/rest_framework/utils/field_mapping.py @@ -238,7 +238,7 @@ def get_relation_kwargs(field_name, relation_info): """ Creates a default instance of a flat relational field. """ - model_field, related_model, to_many, to_field, has_through_model = relation_info + model_field, related_model, to_many, to_field, has_through_model, reverse = relation_info kwargs = { 'queryset': related_model._default_manager, 'view_name': get_detail_view_name(related_model) diff --git a/rest_framework/utils/model_meta.py b/rest_framework/utils/model_meta.py index 94aa46e72..3e3e434e6 100644 --- a/rest_framework/utils/model_meta.py +++ b/rest_framework/utils/model_meta.py @@ -23,7 +23,8 @@ RelationInfo = namedtuple('RelationInfo', [ 'related_model', 'to_many', 'to_field', - 'has_through_model' + 'has_through_model', + 'reverse' ]) @@ -81,7 +82,8 @@ def _get_forward_relationships(opts): related_model=get_related_model(field), to_many=False, to_field=_get_to_field(field), - has_through_model=False + has_through_model=False, + reverse=False ) # Deal with forward many-to-many relationships. @@ -94,7 +96,8 @@ def _get_forward_relationships(opts): to_field=None, has_through_model=( not get_remote_field(field).through._meta.auto_created - ) + ), + reverse=False ) return forward_relations @@ -118,7 +121,8 @@ def _get_reverse_relationships(opts): related_model=related, to_many=get_remote_field(relation.field).multiple, to_field=_get_to_field(relation.field), - has_through_model=False + has_through_model=False, + reverse=True ) # Deal with reverse many-to-many relationships. @@ -135,7 +139,8 @@ def _get_reverse_relationships(opts): has_through_model=( (getattr(get_remote_field(relation.field), 'through', None) is not None) and not get_remote_field(relation.field).through._meta.auto_created - ) + ), + reverse=True ) return reverse_relations diff --git a/tests/test_model_serializer.py b/tests/test_model_serializer.py index cd9b2dfc3..06848302f 100644 --- a/tests/test_model_serializer.py +++ b/tests/test_model_serializer.py @@ -89,6 +89,15 @@ class ChoicesModel(models.Model): choices_field_with_nonstandard_args = models.DecimalField(max_digits=3, decimal_places=1, choices=DECIMAL_CHOICES, verbose_name='A label') +class Issue3674ParentModel(models.Model): + title = models.CharField(max_length=64) + + +class Issue3674ChildModel(models.Model): + parent = models.ForeignKey(Issue3674ParentModel, related_name='children') + value = models.CharField(primary_key=True, max_length=64) + + class TestModelSerializer(TestCase): def test_create_method(self): class TestSerializer(serializers.ModelSerializer): @@ -996,3 +1005,62 @@ class TestUniquenessOverride(TestCase): fields = TestSerializer().fields self.assertFalse(fields['field_1'].required) self.assertTrue(fields['field_2'].required) + + +class Issue3674Test(TestCase): + def test_nonPK_foreignkey_model_serializer(self): + class TestParentModel(models.Model): + title = models.CharField(max_length=64) + + class TestChildModel(models.Model): + parent = models.ForeignKey(TestParentModel, related_name='children') + value = models.CharField(primary_key=True, max_length=64) + + class TestChildModelSerializer(serializers.ModelSerializer): + class Meta: + model = TestChildModel + fields = ('value', 'parent') + + class TestParentModelSerializer(serializers.ModelSerializer): + class Meta: + model = TestParentModel + fields = ('id', 'title', 'children') + + parent_expected = dedent(""" + TestParentModelSerializer(): + id = IntegerField(label='ID', read_only=True) + title = CharField(max_length=64) + children = PrimaryKeyRelatedField(many=True, queryset=TestChildModel.objects.all()) + """) + self.assertEqual(unicode_repr(TestParentModelSerializer()), parent_expected) + + child_expected = dedent(""" + TestChildModelSerializer(): + value = CharField(max_length=64, validators=[]) + parent = PrimaryKeyRelatedField(queryset=TestParentModel.objects.all()) + """) + self.assertEqual(unicode_repr(TestChildModelSerializer()), child_expected) + + def test_nonID_PK_foreignkey_model_serializer(self): + + class TestChildModelSerializer(serializers.ModelSerializer): + class Meta: + model = Issue3674ChildModel + fields = ('value', 'parent') + + class TestParentModelSerializer(serializers.ModelSerializer): + class Meta: + model = Issue3674ParentModel + fields = ('id', 'title', 'children') + + parent = Issue3674ParentModel.objects.create(title='abc') + child = Issue3674ChildModel.objects.create(value='def', parent=parent) + + parent_serializer = TestParentModelSerializer(parent) + child_serializer = TestChildModelSerializer(child) + + parent_expected = {'children': ['def'], 'id': 1, 'title': 'abc'} + self.assertEqual(parent_serializer.data, parent_expected) + + child_expected = {'parent': 1, 'value': 'def'} + self.assertEqual(child_serializer.data, child_expected) From de08f28a9185c09667eace53b637b1cb4529c695 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 13 Oct 2016 14:21:23 +0100 Subject: [PATCH 280/457] Test one to one with inheritance (#4575) --- tests/test_one_to_one_with_inheritance.py | 46 +++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 tests/test_one_to_one_with_inheritance.py diff --git a/tests/test_one_to_one_with_inheritance.py b/tests/test_one_to_one_with_inheritance.py new file mode 100644 index 000000000..06e1cd8b8 --- /dev/null +++ b/tests/test_one_to_one_with_inheritance.py @@ -0,0 +1,46 @@ +from __future__ import unicode_literals + +from django.db import models +from django.test import TestCase + +from rest_framework import serializers +from tests.models import RESTFrameworkModel + + +# Models +from tests.test_multitable_inheritance import ChildModel + + +# Regression test for #4290 + +class ChildAssociatedModel(RESTFrameworkModel): + child_model = models.OneToOneField(ChildModel) + child_name = models.CharField(max_length=100) + + +# Serializers +class DerivedModelSerializer(serializers.ModelSerializer): + class Meta: + model = ChildModel + fields = ['id', 'name1', 'name2', 'childassociatedmodel'] + + +class ChildAssociatedModelSerializer(serializers.ModelSerializer): + + class Meta: + model = ChildAssociatedModel + fields = ['id', 'child_name'] + + +# Tests +class InheritedModelSerializationTests(TestCase): + + def test_multitable_inherited_model_fields_as_expected(self): + """ + Assert that the parent pointer field is not included in the fields + serialized fields + """ + child = ChildModel(name1='parent name', name2='child name') + serializer = DerivedModelSerializer(child) + self.assertEqual(set(serializer.data.keys()), + set(['name1', 'name2', 'id', 'childassociatedmodel'])) From cca9792ae75f586f76b5de32c0c7e1f489719e8f Mon Sep 17 00:00:00 2001 From: Akshay Sharma Date: Fri, 14 Oct 2016 15:50:09 +0530 Subject: [PATCH 281/457] contributing.md django fix. (#4581) * installation for django added in requirements.txt * added line to install django first in contributing.md * added line to install django first in contributing.md and CONTRIBUTING.md --- CONTRIBUTING.md | 1 + docs/topics/contributing.md | 1 + 2 files changed, 2 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 03865b755..415e42ac0 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -61,6 +61,7 @@ To run the tests, clone the repository, and then: # Setup the virtual environment virtualenv env source env/bin/activate + pip install django pip install -r requirements.txt # Run the tests diff --git a/docs/topics/contributing.md b/docs/topics/contributing.md index c4ef0efdf..ed7717ae2 100644 --- a/docs/topics/contributing.md +++ b/docs/topics/contributing.md @@ -61,6 +61,7 @@ To run the tests, clone the repository, and then: # Setup the virtual environment virtualenv env source env/bin/activate + pip install django pip install -r requirements.txt # Run the tests From a83997e1edde4d7ea18d8fdd9dec747e5f1a3044 Mon Sep 17 00:00:00 2001 From: Alex Poleha Date: Fri, 14 Oct 2016 13:29:48 +0300 Subject: [PATCH 282/457] Removed incorrect line from generic-views.md (#4583) --- docs/api-guide/generic-views.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/docs/api-guide/generic-views.md b/docs/api-guide/generic-views.md index 5fea8d7e0..c368d0b46 100644 --- a/docs/api-guide/generic-views.md +++ b/docs/api-guide/generic-views.md @@ -220,8 +220,6 @@ Also provides a `.partial_update(request, *args, **kwargs)` method, which is sim If an object is updated this returns a `200 OK` response, with a serialized representation of the object as the body of the response. -If an object is created, for example when making a `DELETE` request followed by a `PUT` request to the same URL, this returns a `201 Created` response, with a serialized representation of the object as the body of the response. - If the request data provided for updating the object was invalid, a `400 Bad Request` response will be returned, with the error details as the body of the response. ## DestroyModelMixin From d5e63d2d7f6570d6306e755bd7366c75dd1b845b Mon Sep 17 00:00:00 2001 From: Fa773N M0nK Date: Tue, 18 Oct 2016 15:36:04 +0530 Subject: [PATCH 283/457] Reflect that '@detail_route' responds to GET only by default. (#4582) --- docs/tutorial/6-viewsets-and-routers.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/tutorial/6-viewsets-and-routers.md b/docs/tutorial/6-viewsets-and-routers.md index 6e1321093..f4eb918bf 100644 --- a/docs/tutorial/6-viewsets-and-routers.md +++ b/docs/tutorial/6-viewsets-and-routers.md @@ -51,7 +51,7 @@ This time we've used the `ModelViewSet` class in order to get the complete set o Notice that we've also used the `@detail_route` decorator to create a custom action, named `highlight`. This decorator can be used to add any custom endpoints that don't fit into the standard `create`/`update`/`delete` style. -Custom actions which use the `@detail_route` decorator will respond to `GET` requests. We can use the `methods` argument if we wanted an action that responded to `POST` requests. +Custom actions which use the `@detail_route` decorator will respond to `GET` requests by default. We can use the `methods` argument if we wanted an action that responded to `POST` requests. The URLs for custom actions by default depend on the method name itself. If you want to change the way url should be constructed, you can include url_path as a decorator keyword argument. From fcff16c5c658fc3033b7ecefdd74221a596ae24c Mon Sep 17 00:00:00 2001 From: Zach Wernberg Date: Tue, 18 Oct 2016 23:14:55 -0500 Subject: [PATCH 284/457] minor typo --- rest_framework/filters.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/filters.py b/rest_framework/filters.py index 65233978e..c377cec0d 100644 --- a/rest_framework/filters.py +++ b/rest_framework/filters.py @@ -222,7 +222,7 @@ class SearchFilter(BaseFilterBackend): # Filtering against a many-to-many field requires us to # call queryset.distinct() in order to avoid duplicate items # in the resulting queryset. - # We try to avoid this is possible, for performance reasons. + # We try to avoid this if possible, for performance reasons. queryset = distinct(queryset, base) return queryset From 3f6004c5a9edab6336e93da85ce3849dee0b1311 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 20 Oct 2016 09:42:40 +0100 Subject: [PATCH 285/457] Use pk for URL conf and views. (#4592) --- docs/tutorial/1-serialization.md | 6 +++--- docs/tutorial/2-requests-and-responses.md | 8 ++++---- docs/tutorial/3-class-based-views.md | 18 +++++++++--------- .../4-authentication-and-permissions.md | 2 +- .../5-relationships-and-hyperlinked-apis.md | 8 ++++---- docs/tutorial/6-viewsets-and-routers.md | 6 +++--- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/docs/tutorial/1-serialization.md b/docs/tutorial/1-serialization.md index 434072e11..04fb6914a 100644 --- a/docs/tutorial/1-serialization.md +++ b/docs/tutorial/1-serialization.md @@ -259,12 +259,12 @@ Note that because we want to be able to POST to this view from clients that won' We'll also need a view which corresponds to an individual snippet, and can be used to retrieve, update or delete the snippet. @csrf_exempt - def snippet_detail(request, id): + def snippet_detail(request, pk): """ Retrieve, update or delete a code snippet. """ try: - snippet = Snippet.objects.get(id=id) + snippet = Snippet.objects.get(pk=pk) except Snippet.DoesNotExist: return HttpResponse(status=404) @@ -291,7 +291,7 @@ Finally we need to wire these views up. Create the `snippets/urls.py` file: urlpatterns = [ url(r'^snippets/$', views.snippet_list), - url(r'^snippets/(?P[0-9]+)/$', views.snippet_detail), + url(r'^snippets/(?P[0-9]+)/$', views.snippet_detail), ] We also need to wire up the root urlconf, in the `tutorial/urls.py` file, to include our snippet app's URLs. diff --git a/docs/tutorial/2-requests-and-responses.md b/docs/tutorial/2-requests-and-responses.md index 4aa0062a3..5c020a1f7 100644 --- a/docs/tutorial/2-requests-and-responses.md +++ b/docs/tutorial/2-requests-and-responses.md @@ -66,12 +66,12 @@ Our instance view is an improvement over the previous example. It's a little mo Here is the view for an individual snippet, in the `views.py` module. @api_view(['GET', 'PUT', 'DELETE']) - def snippet_detail(request, id): + def snippet_detail(request, pk): """ Retrieve, update or delete a snippet instance. """ try: - snippet = Snippet.objects.get(id=id) + snippet = Snippet.objects.get(pk=pk) except Snippet.DoesNotExist: return Response(status=status.HTTP_404_NOT_FOUND) @@ -104,7 +104,7 @@ Start by adding a `format` keyword argument to both of the views, like so. and - def snippet_detail(request, id, format=None): + def snippet_detail(request, pk, format=None): Now update the `urls.py` file slightly, to append a set of `format_suffix_patterns` in addition to the existing URLs. @@ -114,7 +114,7 @@ Now update the `urls.py` file slightly, to append a set of `format_suffix_patter urlpatterns = [ url(r'^snippets/$', views.snippet_list), - url(r'^snippets/(?P[0-9]+)$', views.snippet_detail), + url(r'^snippets/(?P[0-9]+)$', views.snippet_detail), ] urlpatterns = format_suffix_patterns(urlpatterns) diff --git a/docs/tutorial/3-class-based-views.md b/docs/tutorial/3-class-based-views.md index 6303994cd..f018666f5 100644 --- a/docs/tutorial/3-class-based-views.md +++ b/docs/tutorial/3-class-based-views.md @@ -36,27 +36,27 @@ So far, so good. It looks pretty similar to the previous case, but we've got be """ Retrieve, update or delete a snippet instance. """ - def get_object(self, id): + def get_object(self, pk): try: - return Snippet.objects.get(id=id) + return Snippet.objects.get(pk=pk) except Snippet.DoesNotExist: raise Http404 - def get(self, request, id, format=None): - snippet = self.get_object(id) + def get(self, request, pk, format=None): + snippet = self.get_object(pk) serializer = SnippetSerializer(snippet) return Response(serializer.data) - def put(self, request, id, format=None): - snippet = self.get_object(id) + def put(self, request, pk, format=None): + snippet = self.get_object(pk) serializer = SnippetSerializer(snippet, data=request.data) if serializer.is_valid(): serializer.save() return Response(serializer.data) return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) - def delete(self, request, id, format=None): - snippet = self.get_object(id) + def delete(self, request, pk, format=None): + snippet = self.get_object(pk) snippet.delete() return Response(status=status.HTTP_204_NO_CONTENT) @@ -70,7 +70,7 @@ We'll also need to refactor our `urls.py` slightly now we're using class-based v urlpatterns = [ url(r'^snippets/$', views.SnippetList.as_view()), - url(r'^snippets/(?P[0-9]+)/$', views.SnippetDetail.as_view()), + url(r'^snippets/(?P[0-9]+)/$', views.SnippetDetail.as_view()), ] urlpatterns = format_suffix_patterns(urlpatterns) diff --git a/docs/tutorial/4-authentication-and-permissions.md b/docs/tutorial/4-authentication-and-permissions.md index 958f9d3f0..098194c29 100644 --- a/docs/tutorial/4-authentication-and-permissions.md +++ b/docs/tutorial/4-authentication-and-permissions.md @@ -88,7 +88,7 @@ Make sure to also import the `UserSerializer` class Finally we need to add those views into the API, by referencing them from the URL conf. Add the following to the patterns in `urls.py`. url(r'^users/$', views.UserList.as_view()), - url(r'^users/(?P[0-9]+)/$', views.UserDetail.as_view()), + url(r'^users/(?P[0-9]+)/$', views.UserDetail.as_view()), ## Associating Snippets with Users diff --git a/docs/tutorial/5-relationships-and-hyperlinked-apis.md b/docs/tutorial/5-relationships-and-hyperlinked-apis.md index 9fb6c53e0..9fd61b414 100644 --- a/docs/tutorial/5-relationships-and-hyperlinked-apis.md +++ b/docs/tutorial/5-relationships-and-hyperlinked-apis.md @@ -48,7 +48,7 @@ We'll add a url pattern for our new API root in `snippets/urls.py`: And then add a url pattern for the snippet highlights: - url(r'^snippets/(?P[0-9]+)/highlight/$', views.SnippetHighlight.as_view()), + url(r'^snippets/(?P[0-9]+)/highlight/$', views.SnippetHighlight.as_view()), ## Hyperlinking our API @@ -116,16 +116,16 @@ After adding all those names into our URLconf, our final `snippets/urls.py` file url(r'^snippets/$', views.SnippetList.as_view(), name='snippet-list'), - url(r'^snippets/(?P[0-9]+)/$', + url(r'^snippets/(?P[0-9]+)/$', views.SnippetDetail.as_view(), name='snippet-detail'), - url(r'^snippets/(?P[0-9]+)/highlight/$', + url(r'^snippets/(?P[0-9]+)/highlight/$', views.SnippetHighlight.as_view(), name='snippet-highlight'), url(r'^users/$', views.UserList.as_view(), name='user-list'), - url(r'^users/(?P[0-9]+)/$', + url(r'^users/(?P[0-9]+)/$', views.UserDetail.as_view(), name='user-detail') ]) diff --git a/docs/tutorial/6-viewsets-and-routers.md b/docs/tutorial/6-viewsets-and-routers.md index f4eb918bf..6189c7771 100644 --- a/docs/tutorial/6-viewsets-and-routers.md +++ b/docs/tutorial/6-viewsets-and-routers.md @@ -92,10 +92,10 @@ Now that we've bound our resources into concrete views, we can register the view urlpatterns = format_suffix_patterns([ url(r'^$', api_root), url(r'^snippets/$', snippet_list, name='snippet-list'), - url(r'^snippets/(?P[0-9]+)/$', snippet_detail, name='snippet-detail'), - url(r'^snippets/(?P[0-9]+)/highlight/$', snippet_highlight, name='snippet-highlight'), + url(r'^snippets/(?P[0-9]+)/$', snippet_detail, name='snippet-detail'), + url(r'^snippets/(?P[0-9]+)/highlight/$', snippet_highlight, name='snippet-highlight'), url(r'^users/$', user_list, name='user-list'), - url(r'^users/(?P[0-9]+)/$', user_detail, name='user-detail') + url(r'^users/(?P[0-9]+)/$', user_detail, name='user-detail') ]) ## Using Routers From 2395fb53867538ad83db335f3aaaef472eb2f0f4 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 20 Oct 2016 10:47:09 +0100 Subject: [PATCH 286/457] Deprecate DjangoFilter backend (#4593) Deprecate the built-in `rest_framework.filters.DjangoFilterBackend` in favour of the third-party `django_filters.rest_framework.DjangoFilterBackend`. --- docs/api-guide/filtering.md | 40 +++++--- requirements/requirements-optionals.txt | 2 +- rest_framework/filters.py | 128 ++++-------------------- tests/test_filters.py | 34 +++++++ 4 files changed, 83 insertions(+), 121 deletions(-) diff --git a/docs/api-guide/filtering.md b/docs/api-guide/filtering.md index 40a097174..1b49d3a73 100644 --- a/docs/api-guide/filtering.md +++ b/docs/api-guide/filtering.md @@ -89,24 +89,24 @@ Generic filters can also present themselves as HTML controls in the browsable AP ## Setting filter backends -The default filter backends may be set globally, using the `DEFAULT_FILTER_BACKENDS` setting. For example. +The default filter backends may be set globally, using the `DEFAULT_FILTER_BACKENDS` setting. For example. REST_FRAMEWORK = { - 'DEFAULT_FILTER_BACKENDS': ('rest_framework.filters.DjangoFilterBackend',) + 'DEFAULT_FILTER_BACKENDS': ('django_filters.rest_framework.DjangoFilterBackend',) } You can also set the filter backends on a per-view, or per-viewset basis, using the `GenericAPIView` class-based views. + import django_filters from django.contrib.auth.models import User from myapp.serializers import UserSerializer - from rest_framework import filters from rest_framework import generics class UserListView(generics.ListAPIView): queryset = User.objects.all() serializer_class = UserSerializer - filter_backends = (filters.DjangoFilterBackend,) + filter_backends = (django_filters.rest_framework.DjangoFilterBackend,) ## Filtering and object lookups @@ -139,12 +139,27 @@ Note that you can use both an overridden `.get_queryset()` and generic filtering ## DjangoFilterBackend -The `DjangoFilterBackend` class supports highly customizable field filtering, using the [django-filter package][django-filter]. +The `django-filter` library includes a `DjangoFilterBackend` class which +supports highly customizable field filtering for REST framework. -To use REST framework's `DjangoFilterBackend`, first install `django-filter`. +To use `DjangoFilterBackend`, first install `django-filter`. pip install django-filter +You should now either add the filter backend to your settings: + + REST_FRAMEWORK = { + 'DEFAULT_FILTER_BACKENDS': ('django_filters.rest_framework.DjangoFilterBackend',) + } + +Or add the filter backend to an individual View or ViewSet. + + from django_filters.rest_framework import DjangoFilterBackend + + class UserListView(generics.ListAPIView): + ... + filter_backends = (DjangoFilterBackend,) + If you are using the browsable API or admin API you may also want to install `django-crispy-forms`, which will enhance the presentation of the filter forms in HTML views, by allowing them to render Bootstrap 3 HTML. pip install django-crispy-forms @@ -174,10 +189,9 @@ For more advanced filtering requirements you can specify a `FilterSet` class tha import django_filters from myapp.models import Product from myapp.serializers import ProductSerializer - from rest_framework import filters from rest_framework import generics - class ProductFilter(filters.FilterSet): + class ProductFilter(django_filters.rest_framework.FilterSet): min_price = django_filters.NumberFilter(name="price", lookup_expr='gte') max_price = django_filters.NumberFilter(name="price", lookup_expr='lte') class Meta: @@ -187,7 +201,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_backends = (django_filters.rest_framework.DjangoFilterBackend,) filter_class = ProductFilter @@ -199,12 +213,12 @@ You can also span relationships using `django-filter`, let's assume that each product has foreign key to `Manufacturer` model, so we create filter that filters using `Manufacturer` name. For example: + import django_filters from myapp.models import Product from myapp.serializers import ProductSerializer - from rest_framework import filters from rest_framework import generics - class ProductFilter(filters.FilterSet): + class ProductFilter(django_filters.rest_framework.FilterSet): class Meta: model = Product fields = ['category', 'in_stock', 'manufacturer__name'] @@ -218,10 +232,9 @@ This is nice, but it exposes the Django's double underscore convention as part o import django_filters from myapp.models import Product from myapp.serializers import ProductSerializer - from rest_framework import filters from rest_framework import generics - class ProductFilter(filters.FilterSet): + class ProductFilter(django_filters.rest_framework.FilterSet): manufacturer = django_filters.CharFilter(name="manufacturer__name") class Meta: @@ -454,4 +467,3 @@ The [djangorestframework-word-filter][django-rest-framework-word-search-filter] [django-rest-framework-word-search-filter]: https://github.com/trollknurr/django-rest-framework-word-search-filter [django-url-filter]: https://github.com/miki725/django-url-filter [drf-url-filter]: https://github.com/manjitkumar/drf-url-filters - diff --git a/requirements/requirements-optionals.txt b/requirements/requirements-optionals.txt index 31f24f4b7..86c4f7709 100644 --- a/requirements/requirements-optionals.txt +++ b/requirements/requirements-optionals.txt @@ -1,5 +1,5 @@ # Optional packages which may be used with REST framework. markdown==2.6.4 django-guardian==1.4.6 -django-filter==0.14.0 +django-filter==0.15.3 coreapi==2.0.8 diff --git a/rest_framework/filters.py b/rest_framework/filters.py index c377cec0d..f55297b39 100644 --- a/rest_framework/filters.py +++ b/rest_framework/filters.py @@ -5,9 +5,9 @@ returned by list views. from __future__ import unicode_literals import operator +import warnings from functools import reduce -from django.conf import settings from django.core.exceptions import ImproperlyConfigured from django.db import models from django.db.models.constants import LOOKUP_SEP @@ -16,50 +16,10 @@ from django.utils import six from django.utils.translation import ugettext_lazy as _ from rest_framework.compat import ( - coreapi, crispy_forms, distinct, django_filters, guardian, template_render + coreapi, distinct, django_filters, guardian, template_render ) from rest_framework.settings import api_settings -if 'crispy_forms' in settings.INSTALLED_APPS and crispy_forms and django_filters: - # If django-crispy-forms is installed, use it to get a bootstrap3 rendering - # of the DjangoFilterBackend controls when displayed as HTML. - from crispy_forms.helper import FormHelper - from crispy_forms.layout import Layout, Submit - - class FilterSet(django_filters.FilterSet): - def __init__(self, *args, **kwargs): - super(FilterSet, self).__init__(*args, **kwargs) - for field in self.form.fields.values(): - field.help_text = None - - layout_components = list(self.form.fields.keys()) + [ - Submit('', _('Submit'), css_class='btn-default'), - ] - - helper = FormHelper() - helper.form_method = 'GET' - helper.template_pack = 'bootstrap3' - helper.layout = Layout(*layout_components) - - self.form.helper = helper - - filter_template = 'rest_framework/filters/django_filter_crispyforms.html' - -elif django_filters: - # If django-crispy-forms is not installed, use the standard - # 'form.as_p' rendering when DjangoFilterBackend is displayed as HTML. - class FilterSet(django_filters.FilterSet): - def __init__(self, *args, **kwargs): - super(FilterSet, self).__init__(*args, **kwargs) - for field in self.form.fields.values(): - field.help_text = None - - filter_template = 'rest_framework/filters/django_filter.html' - -else: - FilterSet = None - filter_template = None - class BaseFilterBackend(object): """ @@ -77,78 +37,34 @@ class BaseFilterBackend(object): return [] +class FilterSet(object): + def __new__(cls, *args, **kwargs): + warnings.warn( + "The built in 'rest_framework.filters.FilterSet' is pending deprecation. " + "You should use 'django_filters.rest_framework.FilterSet' instead.", + PendingDeprecationWarning + ) + from django_filters.rest_framework import FilterSet + return FilterSet(*args, **kwargs) + + class DjangoFilterBackend(BaseFilterBackend): """ A filter backend that uses django-filter. """ - default_filter_set = FilterSet - template = filter_template - - def __init__(self): + def __new__(cls, *args, **kwargs): assert django_filters, 'Using DjangoFilterBackend, but django-filter is not installed' + assert django_filters.VERSION >= (0, 15, 3), 'django-filter 0.15.3 and above is required' - def get_filter_class(self, view, queryset=None): - """ - Return the django-filters `FilterSet` used to filter the queryset. - """ - filter_class = getattr(view, 'filter_class', None) - filter_fields = getattr(view, 'filter_fields', None) + warnings.warn( + "The built in 'rest_framework.filters.DjangoFilterBackend' is pending deprecation. " + "You should use 'django_filters.rest_framework.DjangoFilterBackend' instead.", + PendingDeprecationWarning + ) - if filter_class: - filter_model = filter_class.Meta.model + from django_filters.rest_framework import DjangoFilterBackend - assert issubclass(queryset.model, filter_model), \ - 'FilterSet model %s does not match queryset model %s' % \ - (filter_model, queryset.model) - - return filter_class - - if filter_fields: - class AutoFilterSet(self.default_filter_set): - class Meta: - model = queryset.model - fields = filter_fields - - return AutoFilterSet - - return None - - def filter_queryset(self, request, queryset, view): - filter_class = self.get_filter_class(view, queryset) - - if filter_class: - return filter_class(request.query_params, queryset=queryset).qs - - return queryset - - def to_html(self, request, queryset, view): - filter_class = self.get_filter_class(view, queryset) - if not filter_class: - return None - filter_instance = filter_class(request.query_params, queryset=queryset) - context = { - 'filter': filter_instance - } - template = loader.get_template(self.template) - return template_render(template, context) - - def get_schema_fields(self, view): - assert coreapi is not None, 'coreapi must be installed to use `get_schema_fields()`' - filter_class = getattr(view, 'filter_class', None) - if filter_class: - return [ - coreapi.Field(name=field_name, required=False, location='query') - for field_name in filter_class().filters.keys() - ] - - filter_fields = getattr(view, 'filter_fields', None) - if filter_fields: - return [ - coreapi.Field(name=field_name, required=False, location='query') - for field_name in filter_fields - ] - - return [] + return DjangoFilterBackend(*args, **kwargs) class SearchFilter(BaseFilterBackend): diff --git a/tests/test_filters.py b/tests/test_filters.py index c67412dd7..9795230d6 100644 --- a/tests/test_filters.py +++ b/tests/test_filters.py @@ -2,6 +2,7 @@ from __future__ import unicode_literals import datetime import unittest +import warnings from decimal import Decimal from django.conf.urls import url @@ -134,6 +135,39 @@ class IntegrationTestFiltering(CommonFilteringTestCase): Integration tests for filtered list views. """ + @unittest.skipUnless(django_filters, 'django-filter not installed') + def test_backend_deprecation(self): + with warnings.catch_warnings(record=True) as w: + warnings.simplefilter("always") + + view = FilterFieldsRootView.as_view() + request = factory.get('/') + response = view(request).render() + + self.assertEqual(response.status_code, status.HTTP_200_OK) + self.assertEqual(response.data, self.data) + + self.assertTrue(issubclass(w[-1].category, PendingDeprecationWarning)) + self.assertIn("'rest_framework.filters.DjangoFilterBackend' is pending deprecation.", str(w[-1].message)) + + @unittest.skipUnless(django_filters, 'django-filter not installed') + def test_no_df_deprecation(self): + with warnings.catch_warnings(record=True) as w: + warnings.simplefilter("always") + + import django_filters.rest_framework + + class DFFilterFieldsRootView(FilterFieldsRootView): + filter_backends = (django_filters.rest_framework.DjangoFilterBackend,) + + view = DFFilterFieldsRootView.as_view() + request = factory.get('/') + response = view(request).render() + + self.assertEqual(response.status_code, status.HTTP_200_OK) + self.assertEqual(response.data, self.data) + self.assertEqual(len(w), 0) + @unittest.skipUnless(django_filters, 'django-filter not installed') def test_get_filtered_fields_root_view(self): """ From 3b9afb571b6e7c2a445be675163c9f43d680d899 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 20 Oct 2016 16:25:40 +0100 Subject: [PATCH 287/457] Version 3.5.0 (#4596) --- docs/api-guide/schemas.md | 47 +++++- docs/api-guide/testing.md | 4 +- docs/img/raml.png | Bin 0 -> 37216 bytes docs/index.md | 2 + docs/topics/3.5-announcement.md | 266 ++++++++++++++++++++++++++++++++ docs/topics/api-clients.md | 2 +- docs/topics/release-notes.md | 9 ++ mkdocs.yml | 1 + 8 files changed, 324 insertions(+), 7 deletions(-) create mode 100644 docs/img/raml.png create mode 100644 docs/topics/3.5-announcement.md diff --git a/docs/api-guide/schemas.md b/docs/api-guide/schemas.md index 16d2bbb01..7da619034 100644 --- a/docs/api-guide/schemas.md +++ b/docs/api-guide/schemas.md @@ -344,12 +344,12 @@ Typically you'll instantiate `SchemaGenerator` with a single argument, like so: Arguments: -* `title` - The name of the API. **required** +* `title` **required** - The name of the API. * `url` - The root URL of the API schema. This option is not required unless the schema is included under path prefix. * `patterns` - A list of URLs to inspect when generating the schema. Defaults to the project's URL conf. * `urlconf` - A URL conf module name to use when generating the schema. Defaults to `settings.ROOT_URLCONF`. -### get_schema() +### get_schema(self, request) Returns a `coreapi.Document` instance that represents the API schema. @@ -359,9 +359,48 @@ Returns a `coreapi.Document` instance that represents the API schema. generator = schemas.SchemaGenerator(title='Bookings API') return Response(generator.get_schema()) -Arguments: +The `request` argument is optional, and may be used if you want to apply per-user +permissions to the resulting schema generation. -* `request` - The incoming request. Optionally used if you want to apply per-user permissions to the schema-generation. +### get_links(self, request) + +Return a nested dictionary containing all the links that should be included in the API schema. + +This is a good point to override if you want to modify the resulting structure of the generated schema, +as you can build a new dictionary with a different layout. + +### get_link(self, path, method, view) + +Returns a `coreapi.Link` instance corresponding to the given view. + +You can override this if you need to provide custom behaviors for particular views. + +### get_description(self, path, method, view) + +Returns a string to use as the link description. By default this is based on the +view docstring as described in the "Schemas as Documentation" section above. + +### get_encoding(self, path, method, view) + +Returns a string to indicate the encoding for any request body, when interacting +with the given view. Eg. `'application/json'`. May return a blank string for views +that do not expect a request body. + +### get_path_fields(self, path, method, view): + +Return a list of `coreapi.Link()` instances. One for each path parameter in the URL. + +### get_serializer_fields(self, path, method, view) + +Return a list of `coreapi.Link()` instances. One for each field in the serializer class used by the view. + +### get_pagination_fields(self, path, method, view + +Return a list of `coreapi.Link()` instances, as returned by the `get_schema_fields()` method on any pagination class used by the view. + +### get_filter_fields(self, path, method, view) + +Return a list of `coreapi.Link()` instances, as returned by the `get_schema_fields()` method of any filter classes used by the view. --- diff --git a/docs/api-guide/testing.md b/docs/api-guide/testing.md index fdd60b7f4..1f8c89233 100644 --- a/docs/api-guide/testing.md +++ b/docs/api-guide/testing.md @@ -194,6 +194,7 @@ directly. client = RequestsClient() response = client.get('http://testserver/users/') + assert response.status_code == 200 Note that the requests client requires you to pass fully qualified URLs. @@ -251,9 +252,8 @@ The CoreAPIClient allows you to interact with your API using the Python `coreapi` client library. # Fetch the API schema - url = reverse('schema') client = CoreAPIClient() - schema = client.get(url) + schema = client.get('http://testserver/schema/') # Create a new organisation params = {'name': 'MegaCorp', 'status': 'active'} diff --git a/docs/img/raml.png b/docs/img/raml.png new file mode 100644 index 0000000000000000000000000000000000000000..87790dc484f9c6c0617189ae2766bdc1e00a3bfa GIT binary patch literal 37216 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 literal 0 HcmV?d00001 diff --git a/docs/index.md b/docs/index.md index 3019467ed..9b0913f00 100644 --- a/docs/index.md +++ b/docs/index.md @@ -244,6 +244,7 @@ General guides to using REST framework. * [3.2 Announcement][3.2-announcement] * [3.3 Announcement][3.3-announcement] * [3.4 Announcement][3.4-announcement] +* [3.5 Announcement][3.5-announcement] * [Kickstarter Announcement][kickstarter-announcement] * [Mozilla Grant][mozilla-grant] * [Funding][funding] @@ -370,6 +371,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. [3.2-announcement]: topics/3.2-announcement.md [3.3-announcement]: topics/3.3-announcement.md [3.4-announcement]: topics/3.4-announcement.md +[3.5-announcement]: topics/3.5-announcement.md [kickstarter-announcement]: topics/kickstarter-announcement.md [mozilla-grant]: topics/mozilla-grant.md [funding]: topics/funding.md diff --git a/docs/topics/3.5-announcement.md b/docs/topics/3.5-announcement.md new file mode 100644 index 000000000..2ed8adf8e --- /dev/null +++ b/docs/topics/3.5-announcement.md @@ -0,0 +1,266 @@ + + +# Django REST framework 3.5 + +The 3.5 release is the second in a planned series that is addressing schema +generation, hypermedia support, API client libraries, and finally realtime support. + +--- + +## Funding + +The 3.5 release would not have been possible without our [collaborative funding model][funding]. +If you use REST framework commercially and would like to see this work continue, +we strongly encourage you to invest in its continued development by +**[signing up for a paid plan][funding]**. + + +
+ +*Many thanks to all our [sponsors][sponsors], and in particular to our premium backers, [Rover](http://jobs.rover.com/), [Sentry](https://getsentry.com/welcome/), [Stream](https://getstream.io/?utm_source=drf&utm_medium=banner&utm_campaign=drf), and [Machinalis](http://www.machinalis.com/#services).* + +--- + +## Improved schema generation + +Docstrings on views are now pulled through into schema definitions, allowing +you to [use the schema definition to document your API][schema-docs]. + +There is now also a shortcut function, `get_schema_view()`, which makes it easier to +[adding schema views][schema-view] to your API. + +For example, to include a swagger schema to your API, you would do the following: + +* Run `pip install django-rest-swagger`. + +* Add `'rest_framework_swagger'` to your `INSTALLED_APPS` setting. + +* Include the schema view in your URL conf: + +```py +from rest_framework.schemas import get_schema_view +from rest_framework_swagger.renderers import OpenAPIRenderer, SwaggerUIRenderer + +schema_view = get_schema_view( + title='Example API', + renderer_classes=[OpenAPIRenderer, SwaggerUIRenderer] +) + +urlpatterns = [ + url(r'^swagger/$', schema_view), + ... +] +``` + +There have been a large number of fixes to the schema generation. These should +resolve issues for anyone using the latest version of the `django-rest-swagger` +package. + +Some of these changes do affect the resulting schema structure, +so if you're already using schema generation you should make sure to review +[the deprecation notes](#deprecations), particularly if you're currently using +a dynamic client library to interact with your API. + +Finally, we're also now exposing the schema generation as a +[publicly documented API][schema-generation-api], allowing you to more easily +override the behaviour. + +## Requests test client + +You can now test your project using the `requests` library. + +This exposes exactly the same interface as if you were using a standard +requests session instance. + + client = RequestsClient() + response = client.get('http://testserver/users/') + assert response.status_code == 200 + +Rather than sending any HTTP requests to the network, this interface will +coerce all outgoing requests into WSGI, and call into your application directly. + +## Core API client + +You can also now test your project by interacting with it using the `coreapi` +client library. + + # Fetch the API schema + client = CoreAPIClient() + schema = client.get('http://testserver/schema/') + + # Create a new organisation + params = {'name': 'MegaCorp', 'status': 'active'} + client.action(schema, ['organisations', 'create'], params) + + # Ensure that the organisation exists in the listing + data = client.action(schema, ['organisations', 'list']) + assert(len(data) == 1) + assert(data == [{'name': 'MegaCorp', 'status': 'active'}]) + +Again, this will call directly into the application using the WSGI interface, +rather than making actual network calls. + +This is a good option if you are planning for clients to mainly interact with +your API using the `coreapi` client library, or some other auto-generated client. + +## Live tests + +One interesting aspect of both the `requests` client and the `coreapi` client +is that they allow you to write tests in such a way that they can also be made +to run against a live service. + +By switching the WSGI based client instances to actual instances of `requests.Session` +or `coreapi.Client` you can have the test cases make actual network calls. + +Being able to write test cases that can exercise your staging or production +environment is a powerful tool. However in order to do this, you'll need to pay +close attention to how you handle setup and teardown to ensure a strict isolation +of test data from other live or staging data. + +## RAML support + +We now have preliminary support for [RAML documentation generation][django-rest-raml]. + +![RAML Example][raml-image] + +Further work on the encoding and documentation generation is planned, in order to +make features such as the 'Try it now' support available at a later date. + +This work also now means that you can use the Core API client libraries to interact +with APIs that expose a RAML specification. The [RAML codec][raml-codec] gives some examples of +interacting with the Spotify API in this way. + +## Validation codes + +Exceptions raised by REST framework now include short code identifiers. +When used together with our customizable error handling, this now allows you to +modify the style of API error messages. + +As an example, this allows for the following style of error responses: + + { + "message": "You do not have permission to perform this action.", + "code": "permission_denied" + } + +This is particularly useful with validation errors, which use appropriate +codes to identify differing kinds of failure... + + { + "name": {"message": "This field is required.", "code": "required"}, + "age": {"message": "A valid integer is required.", "code": "invalid"} + } + +## Client upload & download support + +The Python `coreapi` client library and the Core API command line tool both +now fully support file [uploads][uploads] and [downloads][downloads]. + +--- + +## Deprecations + +### Generating schemas from Router + +The router arguments for generating a schema view, such as `schema_title`, +are now pending deprecation. + +Instead of using `DefaultRouter(schema_title='Example API')`, you should use +the `get_schema_view()` function, and include the view in your URL conf. + +Make sure to include the view before your router urls. For example: + + from rest_framework.schemas import get_schema_view + from my_project.routers import router + + schema_view = get_schema_view(title='Example API') + + urlpatterns = [ + url('^$', schema_view), + url(r'^', include(router.urls)), + ] + +### Schema path representations + +The `'pk'` identifier in schema paths is now mapped onto the actually model field +name by default. This will typically be `'id'`. + +This gives a better external representation for schemas, with less implementation +detail being exposed. It also reflects the behaviour of using a ModelSerializer +class with `fields = '__all__'`. + +You can revert to the previous behaviour by setting `'SCHEMA_COERCE_PATH_PK': False` +in the REST framework settings. + +### Schema action name representations + +The internal `retrieve()` and `destroy()` method names are now coerced to an +external representation of `read` and `delete`. + +You can revert to the previous behaviour by setting `'SCHEMA_COERCE_METHOD_NAMES': {}` +in the REST framework settings. + +### DjangoFilterBackend + +The functionality of the built-in `DjangoFilterBackend` is now completely +included by the `django-filter` package. + +You should change your imports and REST framework filter settings as follows: + +* `rest_framework.filters.DjangoFilterBackend` becomes `django_filters.rest_framework.DjangoFilterBackend`. +* `rest_framework.filters.FilterSet` becomes `django_filters.rest_framework.FilterSet`. + +The existing imports will continue to work but are now pending deprecation. + +### CoreJSON media type + +The media type for `CoreJSON` is now `application/json+coreapi`, rather than +the previous `application/vnd.json+coreapi`. This brings it more into line with +other custom media types, such as those used by Swagger and RAML. + +The clients currently accept either media type. The old style-media type will +be deprecated at a later date. + +### ModelSerializer 'fields' and 'exclude' + +ModelSerializer and HyperlinkedModelSerializer must include either a fields +option, or an exclude option. The fields = '__all__' shortcut may be used to +explicitly include all fields. + +Failing to set either `fields` or `exclude` raised a pending deprecation warning +in version 3.3 and raised a deprecation warning in 3.4. Its usage is now mandatory. + +--- + +[sponsors]: https://fund.django-rest-framework.org/topics/funding/#our-sponsors +[funding]: funding.md +[uploads]: http://core-api.github.io/python-client/api-guide/utils/#file +[downloads]: http://core-api.github.io/python-client/api-guide/codecs/#downloadcodec +[schema-generation-api]: ../api-guide/schemas/#schemagenerator +[schema-docs]: ../api-guide/schemas/#schemas-as-documentation +[schema-view]: ../api-guide/schemas/#the-get_schema_view-shortcut +[django-rest-raml]: https://github.com/tomchristie/django-rest-raml +[raml-image]: ../img/raml.png +[raml-codec]: https://github.com/core-api/python-raml-codec diff --git a/docs/topics/api-clients.md b/docs/topics/api-clients.md index f17f5e4d4..c12551aa6 100644 --- a/docs/topics/api-clients.md +++ b/docs/topics/api-clients.md @@ -257,7 +257,7 @@ Codecs are responsible for encoding or decoding Documents. The decoding process is used by a client to take a bytestring of an API schema definition, and returning the Core API `Document` that represents that interface. -A codec should be associated with a particular media type, such as **TODO**. +A codec should be associated with a particular media type, such as `'application/coreapi+json'`. This media type is used by the server in the response `Content-Type` header, in order to indicate what kind of data is being returned in the response. diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index 446abdd14..30244f6d2 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -38,6 +38,14 @@ You can determine your currently installed version using `pip freeze`: --- +## 3.5.x series + +### 3.5.0 + +**Date**: [20th October 2016][3.5.0-milestone] + +--- + ## 3.4.x series ### 3.4.7 @@ -596,6 +604,7 @@ For older release notes, [please see the version 2.x documentation][old-release- [3.4.5-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.4.5+Release%22 [3.4.6-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.4.6+Release%22 [3.4.7-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.4.7+Release%22 +[3.5.0-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.5.0+Release%22 [gh2013]: https://github.com/tomchristie/django-rest-framework/issues/2013 diff --git a/mkdocs.yml b/mkdocs.yml index 0b89988b1..01c59caaa 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -66,6 +66,7 @@ pages: - '3.2 Announcement': 'topics/3.2-announcement.md' - '3.3 Announcement': 'topics/3.3-announcement.md' - '3.4 Announcement': 'topics/3.4-announcement.md' + - '3.5 Announcement': 'topics/3.5-announcement.md' - 'Kickstarter Announcement': 'topics/kickstarter-announcement.md' - 'Mozilla Grant': 'topics/mozilla-grant.md' - 'Funding': 'topics/funding.md' From c6f1686571026d1f2f3bb6bf9d73ca9a61b93182 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 20 Oct 2016 16:26:56 +0100 Subject: [PATCH 288/457] Remove erronous file [ci skip] --- schema-support | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 schema-support diff --git a/schema-support b/schema-support deleted file mode 100644 index e69de29bb..000000000 From 1aa6dff0b54e39d1fe7a0c7058f6f74ee01475fd Mon Sep 17 00:00:00 2001 From: Maxime Lorant Date: Thu, 20 Oct 2016 17:47:59 +0200 Subject: [PATCH 289/457] Fix code formatting missing in 3.5 announcement (#4597) ... in section ModelSerializer 'fields' and 'exclude' --- docs/topics/3.5-announcement.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/topics/3.5-announcement.md b/docs/topics/3.5-announcement.md index 2ed8adf8e..ea50b2418 100644 --- a/docs/topics/3.5-announcement.md +++ b/docs/topics/3.5-announcement.md @@ -246,7 +246,7 @@ be deprecated at a later date. ### ModelSerializer 'fields' and 'exclude' ModelSerializer and HyperlinkedModelSerializer must include either a fields -option, or an exclude option. The fields = '__all__' shortcut may be used to +option, or an exclude option. The `fields = '__all__'` shortcut may be used to explicitly include all fields. Failing to set either `fields` or `exclude` raised a pending deprecation warning From 856f086ce35e1b8e2abda16c860371543a8b12f2 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 21 Oct 2016 14:42:42 +0100 Subject: [PATCH 290/457] Remove broken wheel check in setup.py [ci skip] --- setup.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/setup.py b/setup.py index 86870489f..ca62366ed 100755 --- a/setup.py +++ b/setup.py @@ -61,9 +61,6 @@ if sys.argv[-1] == 'publish': import pypandoc except ImportError: print("pypandoc not installed.\nUse `pip install pypandoc`.\nExiting.") - if os.system("pip freeze | grep wheel"): - print("wheel not installed.\nUse `pip install wheel`.\nExiting.") - sys.exit() if os.system("pip freeze | grep twine"): print("twine not installed.\nUse `pip install twine`.\nExiting.") sys.exit() From e3686aca93a8224280b38b7669342bcadb24176e Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 21 Oct 2016 14:47:26 +0100 Subject: [PATCH 291/457] Don't use bare 'raise'. [ci skip] --- rest_framework/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/views.py b/rest_framework/views.py index a8710c7a0..07575fba7 100644 --- a/rest_framework/views.py +++ b/rest_framework/views.py @@ -445,7 +445,7 @@ class APIView(View): renderer_format = getattr(request.accepted_renderer, 'format') use_plaintext_traceback = renderer_format not in ('html', 'api', 'admin') request.force_plaintext_errors(use_plaintext_traceback) - raise + raise exc # Note: Views are made CSRF exempt from within `as_view` as to prevent # accidental removal of this exemption in cases where `dispatch` needs to From 0b346e94b1ed3016e79dd39be3ee48691cecb035 Mon Sep 17 00:00:00 2001 From: Lukasz Karolewski Date: Fri, 21 Oct 2016 07:00:25 -0700 Subject: [PATCH 292/457] changing order of imports (#4601) when using with django-filter and rest_framework_swagger need to import coreapi before django-filter as django filter tries to load rest_framework.coreapi which is undefined at this point --- rest_framework/compat.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/rest_framework/compat.py b/rest_framework/compat.py index 7ec39ba63..2d6e7843c 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -170,6 +170,16 @@ except ImportError: JSONField = None +# coreapi is optional (Note that uritemplate is a dependency of coreapi) +try: + import coreapi + import uritemplate +except (ImportError, SyntaxError): + # SyntaxError is possible under python 3.2 + coreapi = None + uritemplate = None + + # django-filter is optional try: import django_filters @@ -184,16 +194,6 @@ except ImportError: crispy_forms = None -# coreapi is optional (Note that uritemplate is a dependency of coreapi) -try: - import coreapi - import uritemplate -except (ImportError, SyntaxError): - # SyntaxError is possible under python 3.2 - coreapi = None - uritemplate = None - - # requests is optional try: import requests From f1bdce17b547859a6d59e5c0fe85b9c46d061f44 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 21 Oct 2016 15:21:23 +0100 Subject: [PATCH 293/457] Fix for case of ListSerializer with single item (#4609) --- rest_framework/serializers.py | 4 ++-- tests/test_serializer.py | 13 +++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 098c3cd23..39987cd07 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -507,7 +507,7 @@ class Serializer(BaseSerializer): @property def errors(self): ret = super(Serializer, self).errors - if isinstance(ret, list) and len(ret) == 1 and ret[0].code == 'null': + if isinstance(ret, list) and len(ret) == 1 and getattr(ret[0], 'code', None) == 'null': # Edge case. Provide a more descriptive error than # "this field may not be null", when no data is passed. detail = ErrorDetail('No data provided', code='null') @@ -705,7 +705,7 @@ class ListSerializer(BaseSerializer): @property def errors(self): ret = super(ListSerializer, self).errors - if isinstance(ret, list) and len(ret) == 1 and ret[0].code == 'null': + if isinstance(ret, list) and len(ret) == 1 and getattr(ret[0], 'code', None) == 'null': # Edge case. Provide a more descriptive error than # "this field may not be null", when no data is passed. detail = ErrorDetail('No data provided', code='null') diff --git a/tests/test_serializer.py b/tests/test_serializer.py index a2817f6a4..32be39faa 100644 --- a/tests/test_serializer.py +++ b/tests/test_serializer.py @@ -357,3 +357,16 @@ class TestSerializerValidationWithCompiledRegexField: assert serializer.is_valid() assert serializer.validated_data == {'name': '2'} assert serializer.errors == {} + + +class Test4606Regression: + def setup(self): + class ExampleSerializer(serializers.Serializer): + name = serializers.CharField(required=True) + choices = serializers.CharField(required=True) + self.Serializer = ExampleSerializer + + def test_4606_regression(self): + serializer = self.Serializer(data=[{"name": "liz"}], many=True) + with pytest.raises(serializers.ValidationError): + serializer.is_valid(raise_exception=True) From d647d37a99df3673000f17f7d565a8dab0770805 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 21 Oct 2016 15:45:28 +0100 Subject: [PATCH 294/457] Fix Accept header in tutorial. Closes #4604. [ci skip] --- docs/tutorial/7-schemas-and-client-libraries.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/tutorial/7-schemas-and-client-libraries.md b/docs/tutorial/7-schemas-and-client-libraries.md index 705b79da6..eb1982955 100644 --- a/docs/tutorial/7-schemas-and-client-libraries.md +++ b/docs/tutorial/7-schemas-and-client-libraries.md @@ -53,10 +53,10 @@ representation become available as an option. We can also request the schema from the command line, by specifying the desired content type in the `Accept` header. - $ http http://127.0.0.1:8000/schema/ Accept:application/vnd.coreapi+json + $ http http://127.0.0.1:8000/schema/ Accept:application/coreapi+json HTTP/1.0 200 OK Allow: GET, HEAD, OPTIONS - Content-Type: application/vnd.coreapi+json + Content-Type: application/coreapi+json { "_meta": { From 0fe0e1e7038e74f071e93a77bd5900dc191b086d Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 21 Oct 2016 16:59:34 +0100 Subject: [PATCH 295/457] Fix schema base paths (#4611) --- rest_framework/schemas.py | 15 +++++++++++++-- tests/test_schemas.py | 11 +++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/rest_framework/schemas.py b/rest_framework/schemas.py index af861426c..9b9984699 100644 --- a/rest_framework/schemas.py +++ b/rest_framework/schemas.py @@ -1,4 +1,3 @@ -import os import re from collections import OrderedDict from importlib import import_module @@ -37,6 +36,18 @@ types_lookup = ClassLookupDict({ }) +def common_path(paths): + split_paths = [path.strip('/').split('/') for path in paths] + s1 = min(split_paths) + s2 = max(split_paths) + common = s1 + for i, c in enumerate(s1): + if c != s2[i]: + common = s1[:i] + break + return '/' + '/'.join(common) + + def get_pk_name(model): meta = model._meta.concrete_model._meta return _get_pk(meta).name @@ -292,7 +303,7 @@ class SchemaGenerator(object): # one URL that doesn't have a path prefix. return '/' prefixes.append('/' + prefix + '/') - return os.path.commonprefix(prefixes) + return common_path(prefixes) def create_view(self, callback, method, request=None): """ diff --git a/tests/test_schemas.py b/tests/test_schemas.py index 7188087c4..80b456ea0 100644 --- a/tests/test_schemas.py +++ b/tests/test_schemas.py @@ -335,3 +335,14 @@ class TestSchemaGeneratorNotAtRoot(TestCase): } ) self.assertEqual(schema, expected) + + +@unittest.skipUnless(coreapi, 'coreapi is not installed') +class Test4605Regression(TestCase): + def test_4605_regression(self): + generator = SchemaGenerator() + prefix = generator.determine_path_prefix([ + '/api/v1/items/', + '/auth/convert-token/' + ]) + assert prefix == '/' From 30bf9df5d0dc983d180000e413ec2254d7946ff8 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 21 Oct 2016 16:59:43 +0100 Subject: [PATCH 296/457] Fix guardian import (#4612) --- rest_framework/compat.py | 1 - rest_framework/filters.py | 7 ++++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/rest_framework/compat.py b/rest_framework/compat.py index 2d6e7843c..b0e076203 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -207,7 +207,6 @@ guardian = None try: if 'guardian' in settings.INSTALLED_APPS: import guardian - import guardian.shortcuts # Fixes #1624 except ImportError: pass diff --git a/rest_framework/filters.py b/rest_framework/filters.py index f55297b39..47d9a0342 100644 --- a/rest_framework/filters.py +++ b/rest_framework/filters.py @@ -289,6 +289,11 @@ class DjangoObjectPermissionsFilter(BaseFilterBackend): perm_format = '%(app_label)s.view_%(model_name)s' def filter_queryset(self, request, queryset, view): + # We want to defer this import until run-time, rather than import-time. + # See https://github.com/tomchristie/django-rest-framework/issues/4608 + # (Also see #1624 for why we need to make this import explicitly) + from guardian.shortcuts import get_objects_for_user + extra = {} user = request.user model_cls = queryset.model @@ -302,4 +307,4 @@ class DjangoObjectPermissionsFilter(BaseFilterBackend): extra = {'accept_global_perms': False} else: extra = {} - return guardian.shortcuts.get_objects_for_user(user, permission, queryset, **extra) + return get_objects_for_user(user, permission, queryset, **extra) From 3b39d2d13a227b1f159663530ad754b183b7225c Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 21 Oct 2016 17:10:38 +0100 Subject: [PATCH 297/457] Version 3.5.1 [ci skip] --- docs/topics/release-notes.md | 21 +++++++++++++++++++++ rest_framework/__init__.py | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index 30244f6d2..3d3935684 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -40,6 +40,15 @@ You can determine your currently installed version using `pip freeze`: ## 3.5.x series +### 3.5.1 + +**Date**: [21st October 2016][3.5.1-milestone] + +* Make `rest_framework/compat.py` imports. ([#4612][gh4612], [#4608][gh4608], [#4601][gh4601]) +* Fix bug in schema base path generation. ([#4611][gh4611], [#4605][gh4605]) +* Fix broken case of ListSerializer with single item. ([#4609][gh4609], [#4606][gh4606]) +* Remove bare `raise` for Python 3.5 compat. ([#4600][gh4600]) + ### 3.5.0 **Date**: [20th October 2016][3.5.0-milestone] @@ -605,6 +614,7 @@ For older release notes, [please see the version 2.x documentation][old-release- [3.4.6-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.4.6+Release%22 [3.4.7-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.4.7+Release%22 [3.5.0-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.5.0+Release%22 +[3.5.1-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.5.1+Release%22 [gh2013]: https://github.com/tomchristie/django-rest-framework/issues/2013 @@ -1146,3 +1156,14 @@ For older release notes, [please see the version 2.x documentation][old-release- [gh4465]: https://github.com/tomchristie/django-rest-framework/issues/4465 [gh4462]: https://github.com/tomchristie/django-rest-framework/issues/4462 [gh4458]: https://github.com/tomchristie/django-rest-framework/issues/4458 + + + +[gh4612]: https://github.com/tomchristie/django-rest-framework/issues/4612 +[gh4608]: https://github.com/tomchristie/django-rest-framework/issues/4608 +[gh4601]: https://github.com/tomchristie/django-rest-framework/issues/4601 +[gh4611]: https://github.com/tomchristie/django-rest-framework/issues/4611 +[gh4605]: https://github.com/tomchristie/django-rest-framework/issues/4605 +[gh4609]: https://github.com/tomchristie/django-rest-framework/issues/4609 +[gh4606]: https://github.com/tomchristie/django-rest-framework/issues/4606 +[gh4600]: https://github.com/tomchristie/django-rest-framework/issues/4600 diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py index 68e96703f..0a520bf80 100644 --- a/rest_framework/__init__.py +++ b/rest_framework/__init__.py @@ -8,7 +8,7 @@ ______ _____ _____ _____ __ """ __title__ = 'Django REST framework' -__version__ = '3.5.0' +__version__ = '3.5.1' __author__ = 'Tom Christie' __license__ = 'BSD 2-Clause' __copyright__ = 'Copyright 2011-2016 Tom Christie' From 8ac524915ca3759d7728206da101b63c6f33b6d3 Mon Sep 17 00:00:00 2001 From: Mads Jensen Date: Sat, 22 Oct 2016 17:37:23 +0200 Subject: [PATCH 298/457] added on_delete=models.CASCADE to models.ForeignKey in the documentation (#4614) --- docs/api-guide/relations.md | 6 +++--- docs/tutorial/4-authentication-and-permissions.md | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/api-guide/relations.md b/docs/api-guide/relations.md index aeefae8b1..aabe49412 100644 --- a/docs/api-guide/relations.md +++ b/docs/api-guide/relations.md @@ -39,7 +39,7 @@ In order to explain the various types of relational fields, we'll use a couple o artist = models.CharField(max_length=100) class Track(models.Model): - album = models.ForeignKey(Album, related_name='tracks') + album = models.ForeignKey(Album, related_name='tracks', on_delete=models.CASCADE) order = models.IntegerField() title = models.CharField(max_length=100) duration = models.IntegerField() @@ -484,7 +484,7 @@ Note that reverse relationships are not automatically included by the `ModelSeri You'll normally want to ensure that you've set an appropriate `related_name` argument on the relationship, that you can use as the field name. For example: class Track(models.Model): - album = models.ForeignKey(Album, related_name='tracks') + album = models.ForeignKey(Album, related_name='tracks', on_delete=models.CASCADE) ... If you have not set a related name for the reverse relationship, you'll need to use the automatically generated related name in the `fields` argument. For example: @@ -508,7 +508,7 @@ For example, given the following model for a tag, which has a generic relationsh See: https://docs.djangoproject.com/en/dev/ref/contrib/contenttypes/ """ tag_name = models.SlugField() - content_type = models.ForeignKey(ContentType) + content_type = models.ForeignKey(ContentType, on_delete=models.CASCADE) object_id = models.PositiveIntegerField() tagged_object = GenericForeignKey('content_type', 'object_id') diff --git a/docs/tutorial/4-authentication-and-permissions.md b/docs/tutorial/4-authentication-and-permissions.md index 098194c29..43ccf9186 100644 --- a/docs/tutorial/4-authentication-and-permissions.md +++ b/docs/tutorial/4-authentication-and-permissions.md @@ -14,7 +14,7 @@ First, let's add a couple of fields. One of those fields will be used to repres Add the following two fields to the `Snippet` model in `models.py`. - owner = models.ForeignKey('auth.User', related_name='snippets') + owner = models.ForeignKey('auth.User', related_name='snippets', on_delete=models.CASCADE) highlighted = models.TextField() We'd also need to make sure that when the model is saved, that we populate the highlighted field, using the `pygments` code highlighting library. From 72dc6d1d5cae32353e87b7724e666afbd8f04312 Mon Sep 17 00:00:00 2001 From: Phil Krylov Date: Sun, 23 Oct 2016 04:36:36 +0300 Subject: [PATCH 299/457] Add `drf-proxy-pagination` reference to Pagination docs --- docs/api-guide/pagination.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/api-guide/pagination.md b/docs/api-guide/pagination.md index f990128c5..f82614eca 100644 --- a/docs/api-guide/pagination.md +++ b/docs/api-guide/pagination.md @@ -321,9 +321,14 @@ The following third party packages are also available. The [`DRF-extensions` package][drf-extensions] includes a [`PaginateByMaxMixin` mixin class][paginate-by-max-mixin] that allows your API clients to specify `?page_size=max` to obtain the maximum allowed page size. +## drf-proxy-pagination + +The [`drf-proxy-pagination` package][drf-proxy-pagination] includes a `ProxyPagination` class which allows to choose pagination class with a query parameter. + [cite]: https://docs.djangoproject.com/en/dev/topics/pagination/ [github-link-pagination]: https://developer.github.com/guides/traversing-with-pagination/ [link-header]: ../img/link-header-pagination.png [drf-extensions]: http://chibisov.github.io/drf-extensions/docs/ [paginate-by-max-mixin]: http://chibisov.github.io/drf-extensions/docs/#paginatebymaxmixin +[drf-proxy-pagination]: https://github.com/tuffnatty/drf-proxy-pagination [disqus-cursor-api]: http://cramer.io/2011/03/08/building-cursors-for-the-disqus-api From eafc9a2393139445815feafe0392c170f1172532 Mon Sep 17 00:00:00 2001 From: Ryan P Kilby Date: Tue, 25 Oct 2016 15:47:24 -0400 Subject: [PATCH 300/457] Fix is_simple_callable with variable args, kwargs (#4622) --- rest_framework/fields.py | 9 +++++++-- tests/test_fields.py | 23 +++++++++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index e48285005..f75fcfe05 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -54,12 +54,17 @@ if six.PY3: """ True if the object is a callable that takes no arguments. """ - if not callable(obj): + if not (inspect.isfunction(obj) or inspect.ismethod(obj)): return False sig = inspect.signature(obj) params = sig.parameters.values() - return all(param.default != param.empty for param in params) + return all( + param.kind == param.VAR_POSITIONAL or + param.kind == param.VAR_KEYWORD or + param.default != param.empty + for param in params + ) else: def is_simple_callable(obj): diff --git a/tests/test_fields.py b/tests/test_fields.py index 6fea249ba..92030e3ca 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -37,6 +37,9 @@ class TestIsSimpleCallable: def valid_kwargs(self, param='value'): pass + def valid_vargs_kwargs(self, *args, **kwargs): + pass + def invalid(self, param): pass @@ -45,11 +48,13 @@ class TestIsSimpleCallable: # unbound methods assert not is_simple_callable(Foo.valid) assert not is_simple_callable(Foo.valid_kwargs) + assert not is_simple_callable(Foo.valid_vargs_kwargs) assert not is_simple_callable(Foo.invalid) # bound methods assert is_simple_callable(Foo().valid) assert is_simple_callable(Foo().valid_kwargs) + assert is_simple_callable(Foo().valid_vargs_kwargs) assert not is_simple_callable(Foo().invalid) def test_function(self): @@ -59,13 +64,31 @@ class TestIsSimpleCallable: def valid(param='value', param2='value'): pass + def valid_vargs_kwargs(*args, **kwargs): + pass + def invalid(param, param2='value'): pass assert is_simple_callable(simple) assert is_simple_callable(valid) + assert is_simple_callable(valid_vargs_kwargs) assert not is_simple_callable(invalid) + def test_4602_regression(self): + from django.db import models + + class ChoiceModel(models.Model): + choice_field = models.CharField( + max_length=1, default='a', + choices=(('a', 'A'), ('b', 'B')), + ) + + class Meta: + app_label = 'tests' + + assert is_simple_callable(ChoiceModel().get_choice_field_display) + @unittest.skipUnless(typings, 'requires python 3.5') def test_type_annotation(self): # The annotation will otherwise raise a syntax error in python < 3.5 From 46f837a9d13d5f02fabfa49aef33c16c561a68cf Mon Sep 17 00:00:00 2001 From: Josep Cugat Date: Fri, 28 Oct 2016 13:05:32 +0200 Subject: [PATCH 301/457] Fix APIException full_details() typo in documentation (#4633) APIException has a get_full_details() method but the documentation refers to full_details(). --- docs/api-guide/exceptions.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/api-guide/exceptions.md b/docs/api-guide/exceptions.md index f0f178d92..df8cad42d 100644 --- a/docs/api-guide/exceptions.md +++ b/docs/api-guide/exceptions.md @@ -119,7 +119,7 @@ The available attributes and methods are: * `.detail` - Return the textual description of the error. * `.get_codes()` - Return the code identifier of the error. -* `.full_details()` - Return both the textual description and the code identifier. +* `.get_full_details()` - Return both the textual description and the code identifier. In most cases the error detail will be a simple item: @@ -127,7 +127,7 @@ In most cases the error detail will be a simple item: You do not have permission to perform this action. >>> print(exc.get_codes()) permission_denied - >>> print(exc.full_details()) + >>> print(exc.get_full_details()) {'message':'You do not have permission to perform this action.','code':'permission_denied'} In the case of validation errors the error detail will be either a list or From 895c67c9a22eff1057703a8c578c4833f63a9d70 Mon Sep 17 00:00:00 2001 From: Alex Kahan Date: Mon, 31 Oct 2016 16:41:54 -0400 Subject: [PATCH 302/457] Fixes #4532 (#4636) --- .../rest_framework/admin/dict_value.html | 11 +++ tests/test_templatetags.py | 75 +++++++++++++++---- 2 files changed, 73 insertions(+), 13 deletions(-) diff --git a/rest_framework/templates/rest_framework/admin/dict_value.html b/rest_framework/templates/rest_framework/admin/dict_value.html index e69de29bb..3392c901b 100644 --- a/rest_framework/templates/rest_framework/admin/dict_value.html +++ b/rest_framework/templates/rest_framework/admin/dict_value.html @@ -0,0 +1,11 @@ +{% load rest_framework %} + + + {% for key, value in value.items %} + + + + + {% endfor %} + +
{{ key|format_value }}{{ value|format_value }}
diff --git a/tests/test_templatetags.py b/tests/test_templatetags.py index 28390320b..cac1abf50 100644 --- a/tests/test_templatetags.py +++ b/tests/test_templatetags.py @@ -41,6 +41,9 @@ class TemplateTagTests(TestCase): self.assertEqual(format_value(None), 'null') def test_format_value_hyperlink(self): + """ + Tests format_value with a URL + """ url = 'http://url.com' name = 'name_of_url' hyperlink = Hyperlink(url, name) @@ -54,6 +57,25 @@ class TemplateTagTests(TestCase): self.assertEqual(format_value(list_items), '\n item1, item2, item3\n') self.assertEqual(format_value([]), '\n\n') + def test_format_value_dict(self): + """ + Tests format_value with a dict + """ + test_dict = {'a': 'b'} + expected_dict_format = """ + + + + + + + +
ab
""" + self.assertEqual( + format_html(format_value(test_dict)), + format_html(expected_dict_format) + ) + def test_format_value_table(self): """ Tests format_value with a list of lists/dicts @@ -84,20 +106,47 @@ class TemplateTagTests(TestCase): expected_dict_format = """ - - 0 - - - - 1 - - - - 2 - - + + 0 + + + + + item1 + value1 + + + + + + + 1 + + + + + item2 + value2 + + + + + + + 2 + + + + + item3 + value3 + + + + + - """ + """ list_of_dicts = [{'item1': 'value1'}, {'item2': 'value2'}, {'item3': 'value3'}] self.assertEqual( From 7eb6cdca0080e0f321e660c48fa1d4ac5a6e7dab Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 1 Nov 2016 10:22:30 +0000 Subject: [PATCH 303/457] Don't lose exception info (#4638) --- rest_framework/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/views.py b/rest_framework/views.py index 07575fba7..a8710c7a0 100644 --- a/rest_framework/views.py +++ b/rest_framework/views.py @@ -445,7 +445,7 @@ class APIView(View): renderer_format = getattr(request.accepted_renderer, 'format') use_plaintext_traceback = renderer_format not in ('html', 'api', 'admin') request.force_plaintext_errors(use_plaintext_traceback) - raise exc + raise # Note: Views are made CSRF exempt from within `as_view` as to prevent # accidental removal of this exemption in cases where `dispatch` needs to From 5c54b227c11688f12ce17f8aa9575e4ab52463d3 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 1 Nov 2016 10:24:53 +0000 Subject: [PATCH 304/457] Drop redundant requests adapter (#4639) --- rest_framework/test.py | 9 --------- 1 file changed, 9 deletions(-) diff --git a/rest_framework/test.py b/rest_framework/test.py index 16b1b4cd5..241f94c91 100644 --- a/rest_framework/test.py +++ b/rest_framework/test.py @@ -106,15 +106,6 @@ if requests is not None: def close(self): pass - class NoExternalRequestsAdapter(requests.adapters.HTTPAdapter): - def send(self, request, *args, **kwargs): - msg = ( - 'RequestsClient refusing to make an outgoing network request ' - 'to "%s". Only "testserver" or hostnames in your ALLOWED_HOSTS ' - 'setting are valid.' % request.url - ) - raise RuntimeError(msg) - class RequestsClient(requests.Session): def __init__(self, *args, **kwargs): super(RequestsClient, self).__init__(*args, **kwargs) From d92b24a0b74f681a538f6faff59bb00c6cd447e2 Mon Sep 17 00:00:00 2001 From: Ryan P Kilby Date: Tue, 1 Nov 2016 06:27:11 -0400 Subject: [PATCH 305/457] Make serializer fields import explicit (#4628) --- rest_framework/serializers.py | 29 +++++++++++++++++++--- tests/test_serializer.py | 45 ++++++++++++++++++++++++++++++++++- 2 files changed, 70 insertions(+), 4 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 39987cd07..1bdcd12c3 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -12,18 +12,27 @@ response content is handled by parsers and renderers. """ from __future__ import unicode_literals +import copy +import inspect import traceback +from collections import OrderedDict +from django.core.exceptions import ValidationError as DjangoValidationError +from django.core.exceptions import ImproperlyConfigured from django.db import models from django.db.models import DurationField as ModelDurationField from django.db.models.fields import Field as DjangoModelField from django.db.models.fields import FieldDoesNotExist +from django.utils import six, timezone from django.utils.functional import cached_property from django.utils.translation import ugettext_lazy as _ from rest_framework.compat import JSONField as ModelJSONField from rest_framework.compat import postgres_fields, set_many, unicode_to_repr -from rest_framework.utils import model_meta +from rest_framework.exceptions import ErrorDetail, ValidationError +from rest_framework.fields import get_error_detail, set_value +from rest_framework.settings import api_settings +from rest_framework.utils import html, model_meta, representation from rest_framework.utils.field_mapping import ( ClassLookupDict, get_field_kwargs, get_nested_relation_kwargs, get_relation_kwargs, get_url_kwargs @@ -42,9 +51,23 @@ from rest_framework.validators import ( # # This helps keep the separation between model fields, form fields, and # serializer fields more explicit. +from rest_framework.fields import ( # NOQA # isort:skip + BooleanField, CharField, ChoiceField, DateField, DateTimeField, DecimalField, + DictField, DurationField, EmailField, Field, FileField, FilePathField, FloatField, + HiddenField, IPAddressField, ImageField, IntegerField, JSONField, ListField, + ModelField, MultipleChoiceField, NullBooleanField, ReadOnlyField, RegexField, + SerializerMethodField, SlugField, TimeField, URLField, UUIDField, +) +from rest_framework.relations import ( # NOQA # isort:skip + HyperlinkedIdentityField, HyperlinkedRelatedField, ManyRelatedField, + PrimaryKeyRelatedField, RelatedField, SlugRelatedField, StringRelatedField, +) -from rest_framework.fields import * # NOQA # isort:skip -from rest_framework.relations import * # NOQA # isort:skip +# Non-field imports, but public API +from rest_framework.fields import ( # NOQA # isort:skip + CreateOnlyDefault, CurrentUserDefault, SkipField, empty +) +from rest_framework.relations import Hyperlink, PKOnlyObject # NOQA # isort:skip # We assume that 'validators' are intended for the child serializer, # rather than the parent serializer. diff --git a/tests/test_serializer.py b/tests/test_serializer.py index 32be39faa..8c8b5b163 100644 --- a/tests/test_serializer.py +++ b/tests/test_serializer.py @@ -1,17 +1,60 @@ # coding: utf-8 from __future__ import unicode_literals +import inspect import pickle import re import pytest -from rest_framework import serializers +from rest_framework import fields, relations, serializers from rest_framework.compat import unicode_repr +from rest_framework.fields import Field from .utils import MockObject +# Test serializer fields imports. +# ------------------------------- + +class TestFieldImports: + def is_field(self, name, value): + return ( + isinstance(value, type) and + issubclass(value, Field) and + not name.startswith('_') + ) + + def test_fields(self): + msg = "Expected `fields.%s` to be imported in `serializers`" + field_classes = [ + key for key, value + in inspect.getmembers(fields) + if self.is_field(key, value) + ] + + # sanity check + assert 'Field' in field_classes + assert 'BooleanField' in field_classes + + for field in field_classes: + assert hasattr(serializers, field), msg % field + + def test_relations(self): + msg = "Expected `relations.%s` to be imported in `serializers`" + field_classes = [ + key for key, value + in inspect.getmembers(relations) + if self.is_field(key, value) + ] + + # sanity check + assert 'RelatedField' in field_classes + + for field in field_classes: + assert hasattr(serializers, field), msg % field + + # Tests for core functionality. # ----------------------------- From 98df932194722d6fc81becedc55eb695a32f925f Mon Sep 17 00:00:00 2001 From: Kieran Spear Date: Tue, 1 Nov 2016 18:30:17 +0800 Subject: [PATCH 306/457] Fix FilterSet proxy (#4620) --- rest_framework/filters.py | 35 ++++++++++++++++++++++++++--------- tests/test_filters.py | 23 +++++++++++++++++++++++ 2 files changed, 49 insertions(+), 9 deletions(-) diff --git a/rest_framework/filters.py b/rest_framework/filters.py index 47d9a0342..531531efc 100644 --- a/rest_framework/filters.py +++ b/rest_framework/filters.py @@ -37,15 +37,32 @@ class BaseFilterBackend(object): return [] -class FilterSet(object): - def __new__(cls, *args, **kwargs): - warnings.warn( - "The built in 'rest_framework.filters.FilterSet' is pending deprecation. " - "You should use 'django_filters.rest_framework.FilterSet' instead.", - PendingDeprecationWarning - ) - from django_filters.rest_framework import FilterSet - return FilterSet(*args, **kwargs) +if django_filters: + from django_filters.filterset import FilterSetMetaclass as DFFilterSetMetaclass + from django_filters.rest_framework.filterset import FilterSet as DFFilterSet + + class FilterSetMetaclass(DFFilterSetMetaclass): + def __new__(cls, name, bases, attrs): + warnings.warn( + "The built in 'rest_framework.filters.FilterSet' is pending deprecation. " + "You should use 'django_filters.rest_framework.FilterSet' instead.", + PendingDeprecationWarning + ) + return super(FilterSetMetaclass, cls).__new__(cls, name, bases, attrs) + _BaseFilterSet = DFFilterSet +else: + # Dummy metaclass just so we can give a user-friendly error message. + class FilterSetMetaclass(type): + def __init__(self, name, bases, attrs): + # Assert only on subclasses, so we can define FilterSet below. + if bases != (object,): + assert False, 'django-filter must be installed to use the `FilterSet` class' + super(FilterSetMetaclass, self).__init__(name, bases, attrs) + _BaseFilterSet = object + + +class FilterSet(six.with_metaclass(FilterSetMetaclass, _BaseFilterSet)): + pass class DjangoFilterBackend(BaseFilterBackend): diff --git a/tests/test_filters.py b/tests/test_filters.py index 9795230d6..12fb85895 100644 --- a/tests/test_filters.py +++ b/tests/test_filters.py @@ -79,12 +79,23 @@ if django_filters: model = BaseFilterableItem fields = '__all__' + # Test the same filter using the deprecated internal FilterSet class. + class BaseFilterableItemFilterWithProxy(filters.FilterSet): + text = django_filters.CharFilter() + + class Meta: + model = BaseFilterableItem + fields = '__all__' + class BaseFilterableItemFilterRootView(generics.ListCreateAPIView): queryset = FilterableItem.objects.all() serializer_class = FilterableItemSerializer filter_class = BaseFilterableItemFilter filter_backends = (filters.DjangoFilterBackend,) + class BaseFilterableItemFilterWithProxyRootView(BaseFilterableItemFilterRootView): + filter_class = BaseFilterableItemFilterWithProxy + # Regression test for #814 class FilterFieldsQuerysetView(generics.ListCreateAPIView): queryset = FilterableItem.objects.all() @@ -296,6 +307,18 @@ class IntegrationTestFiltering(CommonFilteringTestCase): self.assertEqual(response.status_code, status.HTTP_200_OK) self.assertEqual(len(response.data), 1) + @unittest.skipUnless(django_filters, 'django-filter not installed') + def test_base_model_filter_with_proxy(self): + """ + The `get_filter_class` model checks should allow base model filters. + """ + view = BaseFilterableItemFilterWithProxyRootView.as_view() + + request = factory.get('/?text=aaa') + response = view(request).render() + self.assertEqual(response.status_code, status.HTTP_200_OK) + self.assertEqual(len(response.data), 1) + @unittest.skipUnless(django_filters, 'django-filter not installed') def test_unknown_filter(self): """ From 97d848413e5e13e9de83b7e840fc719b9ec0d9c7 Mon Sep 17 00:00:00 2001 From: Nicolas Delaby Date: Tue, 1 Nov 2016 11:38:56 +0100 Subject: [PATCH 307/457] Fix support of get_full_details() for Throttled exceptions (#4627) Since `str` objects are immutable, appending to existing `str` creates in fact a new `str` instance. Thus `ErrorDetail.detail.code` attribute is lost after `str` concatenation operation. --- rest_framework/exceptions.py | 20 ++++++++++---------- tests/test_exceptions.py | 20 +++++++++++++++++++- 2 files changed, 29 insertions(+), 11 deletions(-) diff --git a/rest_framework/exceptions.py b/rest_framework/exceptions.py index e41655fef..e84074a07 100644 --- a/rest_framework/exceptions.py +++ b/rest_framework/exceptions.py @@ -210,14 +210,14 @@ class Throttled(APIException): default_code = 'throttled' def __init__(self, wait=None, detail=None, code=None): + if detail is None: + detail = force_text(self.default_detail) + if wait is not None: + wait = math.ceil(wait) + detail = ' '.join(( + detail, + force_text(ungettext(self.extra_detail_singular.format(wait=wait), + self.extra_detail_plural.format(wait=wait), + wait)))) + self.wait = wait super(Throttled, self).__init__(detail, code) - - if wait is None: - self.wait = None - else: - self.wait = math.ceil(wait) - self.detail += ' ' + force_text(ungettext( - self.extra_detail_singular.format(wait=self.wait), - self.extra_detail_plural.format(wait=self.wait), - self.wait - )) diff --git a/tests/test_exceptions.py b/tests/test_exceptions.py index 29703cb77..f1d172211 100644 --- a/tests/test_exceptions.py +++ b/tests/test_exceptions.py @@ -1,9 +1,12 @@ from __future__ import unicode_literals from django.test import TestCase +from django.utils import six from django.utils.translation import ugettext_lazy as _ -from rest_framework.exceptions import ErrorDetail, _get_error_details +from rest_framework.exceptions import ( + ErrorDetail, Throttled, _get_error_details +) class ExceptionTestCase(TestCase): @@ -39,3 +42,18 @@ class ExceptionTestCase(TestCase): _get_error_details([[lazy_example]])[0][0], ErrorDetail ) + + def test_get_full_details_with_throttling(self): + exception = Throttled() + assert exception.get_full_details() == { + 'message': 'Request was throttled.', 'code': 'throttled'} + + exception = Throttled(wait=2) + assert exception.get_full_details() == { + 'message': 'Request was throttled. Expected available in {} seconds.'.format(2 if six.PY3 else 2.), + 'code': 'throttled'} + + exception = Throttled(wait=2, detail='Slow down!') + assert exception.get_full_details() == { + 'message': 'Slow down! Expected available in {} seconds.'.format(2 if six.PY3 else 2.), + 'code': 'throttled'} From 70385711572e7ea141644f349b7180c68b4c15d2 Mon Sep 17 00:00:00 2001 From: Kennedy Mwenja Date: Tue, 1 Nov 2016 13:42:01 +0300 Subject: [PATCH 308/457] Enable cursor pagination of value querysets. (#4569) To do `GROUP_BY` queries in django requires one to use `.values()` eg this groups posts by user getting a count of posts per user. ``` Posts.objects.order_by('user').values('user').annotate(post_count=Count('post')) ``` This would produce a value queryset which serializes its result objects as dictionaries while `CursorPagination` requires a queryset with result objects that are model instances. This commit enables cursor pagination for value querysets. - had to mangle the tests a bit to test it out. They might need some refactoring. - tried the same for `.values_list()` but it turned out to be trickier than I expected since you have to use tuple indexes. --- rest_framework/pagination.py | 6 +- tests/test_pagination.py | 221 ++++++++++++++++++++++------------- 2 files changed, 147 insertions(+), 80 deletions(-) diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py index 708da29cd..8ccdc342c 100644 --- a/rest_framework/pagination.py +++ b/rest_framework/pagination.py @@ -711,7 +711,11 @@ class CursorPagination(BasePagination): return replace_query_param(self.base_url, self.cursor_query_param, encoded) def _get_position_from_instance(self, instance, ordering): - attr = getattr(instance, ordering[0].lstrip('-')) + field_name = ordering[0].lstrip('-') + if isinstance(instance, dict): + attr = instance[field_name] + else: + attr = getattr(instance, field_name) return six.text_type(attr) def get_paginated_response(self, data): diff --git a/tests/test_pagination.py b/tests/test_pagination.py index 170d95899..9f2e1c57c 100644 --- a/tests/test_pagination.py +++ b/tests/test_pagination.py @@ -3,6 +3,8 @@ from __future__ import unicode_literals import pytest from django.core.paginator import Paginator as DjangoPaginator +from django.db import models +from django.test import TestCase from rest_framework import ( exceptions, filters, generics, pagination, serializers, status @@ -530,85 +532,7 @@ class TestLimitOffset: assert content.get('previous') == prev_url -class TestCursorPagination: - """ - Unit tests for `pagination.CursorPagination`. - """ - - def setup(self): - class MockObject(object): - def __init__(self, idx): - self.created = idx - - class MockQuerySet(object): - def __init__(self, items): - self.items = items - - def filter(self, created__gt=None, created__lt=None): - if created__gt is not None: - return MockQuerySet([ - item for item in self.items - if item.created > int(created__gt) - ]) - - assert created__lt is not None - return MockQuerySet([ - item for item in self.items - if item.created < int(created__lt) - ]) - - def order_by(self, *ordering): - if ordering[0].startswith('-'): - return MockQuerySet(list(reversed(self.items))) - return self - - def __getitem__(self, sliced): - return self.items[sliced] - - class ExamplePagination(pagination.CursorPagination): - page_size = 5 - ordering = 'created' - - self.pagination = ExamplePagination() - self.queryset = MockQuerySet([ - MockObject(idx) for idx in [ - 1, 1, 1, 1, 1, - 1, 2, 3, 4, 4, - 4, 4, 5, 6, 7, - 7, 7, 7, 7, 7, - 7, 7, 7, 8, 9, - 9, 9, 9, 9, 9 - ] - ]) - - def get_pages(self, url): - """ - Given a URL return a tuple of: - - (previous page, current page, next page, previous url, next url) - """ - request = Request(factory.get(url)) - queryset = self.pagination.paginate_queryset(self.queryset, request) - current = [item.created for item in queryset] - - next_url = self.pagination.get_next_link() - previous_url = self.pagination.get_previous_link() - - if next_url is not None: - request = Request(factory.get(next_url)) - queryset = self.pagination.paginate_queryset(self.queryset, request) - next = [item.created for item in queryset] - else: - next = None - - if previous_url is not None: - request = Request(factory.get(previous_url)) - queryset = self.pagination.paginate_queryset(self.queryset, request) - previous = [item.created for item in queryset] - else: - previous = None - - return (previous, current, next, previous_url, next_url) +class CursorPaginationTestsMixin: def test_invalid_cursor(self): request = Request(factory.get('/', {'cursor': '123'})) @@ -703,6 +627,145 @@ class TestCursorPagination: assert isinstance(self.pagination.to_html(), type('')) +class TestCursorPagination(CursorPaginationTestsMixin): + """ + Unit tests for `pagination.CursorPagination`. + """ + + def setup(self): + class MockObject(object): + def __init__(self, idx): + self.created = idx + + class MockQuerySet(object): + def __init__(self, items): + self.items = items + + def filter(self, created__gt=None, created__lt=None): + if created__gt is not None: + return MockQuerySet([ + item for item in self.items + if item.created > int(created__gt) + ]) + + assert created__lt is not None + return MockQuerySet([ + item for item in self.items + if item.created < int(created__lt) + ]) + + def order_by(self, *ordering): + if ordering[0].startswith('-'): + return MockQuerySet(list(reversed(self.items))) + return self + + def __getitem__(self, sliced): + return self.items[sliced] + + class ExamplePagination(pagination.CursorPagination): + page_size = 5 + ordering = 'created' + + self.pagination = ExamplePagination() + self.queryset = MockQuerySet([ + MockObject(idx) for idx in [ + 1, 1, 1, 1, 1, + 1, 2, 3, 4, 4, + 4, 4, 5, 6, 7, + 7, 7, 7, 7, 7, + 7, 7, 7, 8, 9, + 9, 9, 9, 9, 9 + ] + ]) + + def get_pages(self, url): + """ + Given a URL return a tuple of: + + (previous page, current page, next page, previous url, next url) + """ + request = Request(factory.get(url)) + queryset = self.pagination.paginate_queryset(self.queryset, request) + current = [item.created for item in queryset] + + next_url = self.pagination.get_next_link() + previous_url = self.pagination.get_previous_link() + + if next_url is not None: + request = Request(factory.get(next_url)) + queryset = self.pagination.paginate_queryset(self.queryset, request) + next = [item.created for item in queryset] + else: + next = None + + if previous_url is not None: + request = Request(factory.get(previous_url)) + queryset = self.pagination.paginate_queryset(self.queryset, request) + previous = [item.created for item in queryset] + else: + previous = None + + return (previous, current, next, previous_url, next_url) + + +class CursorPaginationModel(models.Model): + created = models.IntegerField() + + +class TestCursorPaginationWithValueQueryset(CursorPaginationTestsMixin, TestCase): + """ + Unit tests for `pagination.CursorPagination` for value querysets. + """ + + def setUp(self): + class ExamplePagination(pagination.CursorPagination): + page_size = 5 + ordering = 'created' + + self.pagination = ExamplePagination() + data = [ + 1, 1, 1, 1, 1, + 1, 2, 3, 4, 4, + 4, 4, 5, 6, 7, + 7, 7, 7, 7, 7, + 7, 7, 7, 8, 9, + 9, 9, 9, 9, 9 + ] + for idx in data: + CursorPaginationModel.objects.create(created=idx) + + self.queryset = CursorPaginationModel.objects.values() + + def get_pages(self, url): + """ + Given a URL return a tuple of: + + (previous page, current page, next page, previous url, next url) + """ + request = Request(factory.get(url)) + queryset = self.pagination.paginate_queryset(self.queryset, request) + current = [item['created'] for item in queryset] + + next_url = self.pagination.get_next_link() + previous_url = self.pagination.get_previous_link() + + if next_url is not None: + request = Request(factory.get(next_url)) + queryset = self.pagination.paginate_queryset(self.queryset, request) + next = [item['created'] for item in queryset] + else: + next = None + + if previous_url is not None: + request = Request(factory.get(previous_url)) + queryset = self.pagination.paginate_queryset(self.queryset, request) + previous = [item['created'] for item in queryset] + else: + previous = None + + return (previous, current, next, previous_url, next_url) + + def test_get_displayed_page_numbers(): """ Test our contextual page display function. From 276ed80fd302184dddb3af01e53d43be4aef15e4 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 1 Nov 2016 11:11:34 +0000 Subject: [PATCH 309/457] Support 'on'/'off' literals with BooleanField. Closes #4624 (#4640) --- rest_framework/fields.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index f75fcfe05..13b5145ba 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -644,8 +644,20 @@ class BooleanField(Field): } default_empty_html = False initial = False - TRUE_VALUES = {'t', 'T', 'true', 'True', 'TRUE', '1', 1, True} - FALSE_VALUES = {'f', 'F', 'false', 'False', 'FALSE', '0', 0, 0.0, False} + TRUE_VALUES = { + 't', 'T', + 'true', 'True', 'TRUE', + 'on', 'On', 'ON', + '1', 1, + True + } + FALSE_VALUES = { + 'f', 'F', + 'false', 'False', 'FALSE', + 'off', 'Off', 'OFF', + '0', 0, 0.0, + False + } def __init__(self, **kwargs): assert 'allow_null' not in kwargs, '`allow_null` is not a valid option. Use `NullBooleanField` instead.' From 2bf082a6236cf979d2d125f1f5a60f18509323fc Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 1 Nov 2016 11:31:20 +0000 Subject: [PATCH 310/457] Version 3.5.2 [ci skip] (#4641) --- docs/topics/release-notes.md | 31 +++++++++++++++++++++++++++++++ rest_framework/__init__.py | 2 +- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index 3d3935684..d25a46ba0 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -40,6 +40,20 @@ You can determine your currently installed version using `pip freeze`: ## 3.5.x series +### 3.5.2 + +**Date**: [1st November 2016][3.5.2-milestone] + +* Restore exception tracebacks in Python 2.7. ([#4631][gh4631], [#4638][gh4638]) +* Properly display dicts in the admin console. ([#4532][gh4532], [#4636][gh4636]) +* Fix is_simple_callable with variable args, kwargs. ([#4622][gh4622], [#4602][gh4602]) +* Support 'on'/'off' literals with BooleanField. ([#4640][gh4640], [#4624][gh4624]) +* Enable cursor pagination of value querysets. ([#4569][gh4569]) +* Fix support of get_full_details() for Throttled exceptions. ([#4627][gh4627]) +* Fix FilterSet proxy. ([#4620][gh4620]) +* Make serializer fields import explicit. ([#4628][gh4628]) +* Drop redundant requests adapter. ([#4639][gh4639]) + ### 3.5.1 **Date**: [21st October 2016][3.5.1-milestone] @@ -615,6 +629,7 @@ For older release notes, [please see the version 2.x documentation][old-release- [3.4.7-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.4.7+Release%22 [3.5.0-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.5.0+Release%22 [3.5.1-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.5.1+Release%22 +[3.5.2-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.5.2+Release%22 [gh2013]: https://github.com/tomchristie/django-rest-framework/issues/2013 @@ -1167,3 +1182,19 @@ For older release notes, [please see the version 2.x documentation][old-release- [gh4609]: https://github.com/tomchristie/django-rest-framework/issues/4609 [gh4606]: https://github.com/tomchristie/django-rest-framework/issues/4606 [gh4600]: https://github.com/tomchristie/django-rest-framework/issues/4600 + + + +[gh4631]: https://github.com/tomchristie/django-rest-framework/issues/4631 +[gh4638]: https://github.com/tomchristie/django-rest-framework/issues/4638 +[gh4532]: https://github.com/tomchristie/django-rest-framework/issues/4532 +[gh4636]: https://github.com/tomchristie/django-rest-framework/issues/4636 +[gh4622]: https://github.com/tomchristie/django-rest-framework/issues/4622 +[gh4602]: https://github.com/tomchristie/django-rest-framework/issues/4602 +[gh4640]: https://github.com/tomchristie/django-rest-framework/issues/4640 +[gh4624]: https://github.com/tomchristie/django-rest-framework/issues/4624 +[gh4569]: https://github.com/tomchristie/django-rest-framework/issues/4569 +[gh4627]: https://github.com/tomchristie/django-rest-framework/issues/4627 +[gh4620]: https://github.com/tomchristie/django-rest-framework/issues/4620 +[gh4628]: https://github.com/tomchristie/django-rest-framework/issues/4628 +[gh4639]: https://github.com/tomchristie/django-rest-framework/issues/4639 diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py index 0a520bf80..fe82763a9 100644 --- a/rest_framework/__init__.py +++ b/rest_framework/__init__.py @@ -8,7 +8,7 @@ ______ _____ _____ _____ __ """ __title__ = 'Django REST framework' -__version__ = '3.5.1' +__version__ = '3.5.2' __author__ = 'Tom Christie' __license__ = 'BSD 2-Clause' __copyright__ = 'Copyright 2011-2016 Tom Christie' From 45e058d7bace860300d3edf537b86996aec15c33 Mon Sep 17 00:00:00 2001 From: Andrzej Pragacz Date: Wed, 2 Nov 2016 10:04:01 +0100 Subject: [PATCH 311/457] Fix unhandled Http404, PermissionDenied in schema generation (#4645) (#4646) --- rest_framework/schemas.py | 4 ++- tests/test_schemas.py | 68 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 70 insertions(+), 2 deletions(-) diff --git a/rest_framework/schemas.py b/rest_framework/schemas.py index 9b9984699..9439cb691 100644 --- a/rest_framework/schemas.py +++ b/rest_framework/schemas.py @@ -4,6 +4,8 @@ from importlib import import_module from django.conf import settings from django.contrib.admindocs.views import simplify_regex +from django.core.exceptions import PermissionDenied +from django.http import Http404 from django.utils import six from django.utils.encoding import force_text, smart_text @@ -339,7 +341,7 @@ class SchemaGenerator(object): try: view.check_permissions(view.request) - except exceptions.APIException: + except (exceptions.APIException, Http404, PermissionDenied): return False return True diff --git a/tests/test_schemas.py b/tests/test_schemas.py index 80b456ea0..e196a1f61 100644 --- a/tests/test_schemas.py +++ b/tests/test_schemas.py @@ -1,17 +1,22 @@ import unittest from django.conf.urls import include, url +from django.core.exceptions import PermissionDenied +from django.http import Http404 from django.test import TestCase, override_settings from rest_framework import filters, pagination, permissions, serializers from rest_framework.compat import coreapi from rest_framework.decorators import detail_route, list_route +from rest_framework.request import Request from rest_framework.routers import DefaultRouter from rest_framework.schemas import SchemaGenerator, get_schema_view -from rest_framework.test import APIClient +from rest_framework.test import APIClient, APIRequestFactory from rest_framework.views import APIView from rest_framework.viewsets import ModelViewSet +factory = APIRequestFactory() + class MockUser(object): def is_authenticated(self): @@ -215,6 +220,32 @@ class TestRouterGeneratedSchema(TestCase): self.assertEqual(response.data, expected) +class DenyAllUsingHttp404(permissions.BasePermission): + + def has_permission(self, request, view): + raise Http404() + + def has_object_permission(self, request, view, obj): + raise Http404() + + +class DenyAllUsingPermissionDenied(permissions.BasePermission): + + def has_permission(self, request, view): + raise PermissionDenied() + + def has_object_permission(self, request, view, obj): + raise PermissionDenied() + + +class Http404ExampleViewSet(ExampleViewSet): + permission_classes = [DenyAllUsingHttp404] + + +class PermissionDeniedExampleViewSet(ExampleViewSet): + permission_classes = [DenyAllUsingPermissionDenied] + + class ExampleListView(APIView): permission_classes = [permissions.IsAuthenticatedOrReadOnly] @@ -337,6 +368,41 @@ class TestSchemaGeneratorNotAtRoot(TestCase): self.assertEqual(schema, expected) +@unittest.skipUnless(coreapi, 'coreapi is not installed') +class TestSchemaGeneratorWithRestrictedViewSets(TestCase): + def setUp(self): + router = DefaultRouter() + router.register('example1', Http404ExampleViewSet, base_name='example1') + router.register('example2', PermissionDeniedExampleViewSet, base_name='example2') + self.patterns = [ + url('^example/?$', ExampleListView.as_view()), + url(r'^', include(router.urls)) + ] + + def test_schema_for_regular_views(self): + """ + Ensure that schema generation works for ViewSet classes + with permission classes raising exceptions. + """ + generator = SchemaGenerator(title='Example API', patterns=self.patterns) + request = factory.get('/') + schema = generator.get_schema(Request(request)) + expected = coreapi.Document( + url='', + title='Example API', + content={ + 'example': { + 'list': coreapi.Link( + url='/example/', + action='get', + fields=[] + ), + }, + } + ) + self.assertEqual(schema, expected) + + @unittest.skipUnless(coreapi, 'coreapi is not installed') class Test4605Regression(TestCase): def test_4605_regression(self): From d55e176a1e882d498b63b46a01f0ac389428f084 Mon Sep 17 00:00:00 2001 From: Carlos de la Torre Date: Wed, 2 Nov 2016 11:03:53 -0300 Subject: [PATCH 312/457] Fix documentation error: removed unused variable (#4647) --- docs/api-guide/fields.md | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/api-guide/fields.md b/docs/api-guide/fields.md index f986f1508..17168b721 100644 --- a/docs/api-guide/fields.md +++ b/docs/api-guide/fields.md @@ -626,7 +626,6 @@ The `.fail()` method is a shortcut for raising `ValidationError` that takes a me def to_internal_value(self, data): if not isinstance(data, six.text_type): - msg = 'Incorrect type. Expected a string, but got %s' self.fail('incorrect_type', input_type=type(data).__name__) if not re.match(r'^rgb\([0-9]+,[0-9]+,[0-9]+\)$', data): From 7f437123bdd6f81c3f6c1216e6308aad4aac5068 Mon Sep 17 00:00:00 2001 From: pkrzyzaniak Date: Mon, 7 Nov 2016 06:12:52 +0800 Subject: [PATCH 313/457] Added "drf_tweaks" to third party packages (#4659) --- docs/topics/third-party-resources.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/topics/third-party-resources.md b/docs/topics/third-party-resources.md index 3fba9b5da..1713da1a1 100644 --- a/docs/topics/third-party-resources.md +++ b/docs/topics/third-party-resources.md @@ -251,6 +251,7 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque * [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. +* [drf_tweaks][drf_tweaks] - Serializers with one-step validation (and more), pagination without counts and other tweaks. * [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.io/en/latest/overview.html#formserializer) and [SerializerForm](https://django-rest-framework-braces.readthedocs.io/en/latest/overview.html#serializerform), which are adapters between DRF serializers and Django forms. * [drf-haystack][drf-haystack] - Haystack search for Django Rest Framework * [django-rest-framework-version-transforms][django-rest-framework-version-transforms] - Enables the use of delta transformations for versioning of DRF resource representations. @@ -363,3 +364,4 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque [django-rest-messaging-js]: https://github.com/raphaelgyory/django-rest-messaging-js [medium-django-rest-framework]: https://medium.com/django-rest-framework [django-rest-framework-course]: https://teamtreehouse.com/library/django-rest-framework +[drf_tweaks]: https://github.com/ArabellaTech/drf_tweaks From 0b9304014d4505cec6c4a7df09bc66616d3827b8 Mon Sep 17 00:00:00 2001 From: Aaron Lelevier Date: Mon, 7 Nov 2016 12:30:46 +0100 Subject: [PATCH 314/457] Add documentation link for single 'field-level validation' to the Validator docs page (#3772) (#4657) --- docs/api-guide/validators.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/api-guide/validators.md b/docs/api-guide/validators.md index 9df15ec15..1af9f02a5 100644 --- a/docs/api-guide/validators.md +++ b/docs/api-guide/validators.md @@ -272,6 +272,12 @@ A validator may be any callable that raises a `serializers.ValidationError` on f if value % 2 != 0: raise serializers.ValidationError('This field must be an even number.') +#### Field-level validation + +You can specify custom field-level validation by adding `.validate_` methods +to your `Serializer` subclass. This is documented in the +[Serializer docs](http://www.django-rest-framework.org/api-guide/serializers/#field-level-validation) + ## Class-based To write a class-based validator, use the `__call__` method. Class-based validators are useful as they allow you to parameterize and reuse behavior. From befacfb00d4c39436a307ddc4bf1edb6f82a1a5e Mon Sep 17 00:00:00 2001 From: James Beith Date: Mon, 7 Nov 2016 22:34:53 +1100 Subject: [PATCH 315/457] Add autofocus support for input.html templates (#4650) This change adds support to use `'autofocus': True` in the style options and have the `autofocus` attribute included on the input field when rendered. --- docs/topics/html-and-forms.md | 6 +++--- .../templates/rest_framework/horizontal/input.html | 2 +- rest_framework/templates/rest_framework/inline/input.html | 2 +- rest_framework/templates/rest_framework/vertical/input.html | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/topics/html-and-forms.md b/docs/topics/html-and-forms.md index 6660607fe..f77ae3af7 100644 --- a/docs/topics/html-and-forms.md +++ b/docs/topics/html-and-forms.md @@ -108,7 +108,7 @@ Let's take a look at how to render each of the three available template packs. F class LoginSerializer(serializers.Serializer): email = serializers.EmailField( max_length=100, - style={'placeholder': 'Email'} + style={'placeholder': 'Email', 'autofocus': True} ) password = serializers.CharField( max_length=100, @@ -207,9 +207,9 @@ Field templates can also use additional style properties, depending on their typ The complete list of `base_template` options and their associated style options is listed below. -base_template | Valid field types | Additional style options +base_template | Valid field types | Additional style options ----|----|---- -input.html | Any string, numeric or date/time field | input_type, placeholder, hide_label +input.html | Any string, numeric or date/time field | input_type, placeholder, hide_label, autofocus textarea.html | `CharField` | rows, placeholder, hide_label select.html | `ChoiceField` or relational field types | hide_label radio.html | `ChoiceField` or relational field types | inline, hide_label diff --git a/rest_framework/templates/rest_framework/horizontal/input.html b/rest_framework/templates/rest_framework/horizontal/input.html index 9e5bbd0f7..a6d657d7d 100644 --- a/rest_framework/templates/rest_framework/horizontal/input.html +++ b/rest_framework/templates/rest_framework/horizontal/input.html @@ -6,7 +6,7 @@ {% endif %}
- + {% if field.errors %} {% for error in field.errors %} diff --git a/rest_framework/templates/rest_framework/inline/input.html b/rest_framework/templates/rest_framework/inline/input.html index f28e8f11c..085c63cb3 100644 --- a/rest_framework/templates/rest_framework/inline/input.html +++ b/rest_framework/templates/rest_framework/inline/input.html @@ -5,5 +5,5 @@ {% endif %} - +
diff --git a/rest_framework/templates/rest_framework/vertical/input.html b/rest_framework/templates/rest_framework/vertical/input.html index 504dcc28e..a7cff2ca6 100644 --- a/rest_framework/templates/rest_framework/vertical/input.html +++ b/rest_framework/templates/rest_framework/vertical/input.html @@ -3,7 +3,7 @@ {% endif %} - + {% if field.errors %} {% for error in field.errors %} From ee60aaa945213723f9574317fa81ca43b7170454 Mon Sep 17 00:00:00 2001 From: Angel Velasquez Date: Mon, 7 Nov 2016 08:37:58 -0300 Subject: [PATCH 316/457] Update versions of Django on tox.ini (#4651) Bump release versions to 1.10.3, 1.9.11 and 1.8.16 More info on: https://www.djangoproject.com/weblog/2016/nov/01/security-releases/ --- tox.ini | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tox.ini b/tox.ini index bac1569a0..e89274661 100644 --- a/tox.ini +++ b/tox.ini @@ -15,9 +15,9 @@ setenv = PYTHONDONTWRITEBYTECODE=1 PYTHONWARNINGS=once deps = - django18: Django==1.8.15 - django19: Django==1.9.10 - django110: Django==1.10.2 + django18: Django==1.8.16 + django19: Django==1.9.11 + django110: Django==1.10.3 djangomaster: https://github.com/django/django/archive/master.tar.gz -rrequirements/requirements-testing.txt -rrequirements/requirements-optionals.txt From 06df61e38c6ed99732007b0e9f3cc26e8317389e Mon Sep 17 00:00:00 2001 From: Rex Salisbury Date: Mon, 7 Nov 2016 03:41:10 -0800 Subject: [PATCH 317/457] handle error when no links are found (#4649) This is to address https://github.com/tomchristie/django-rest-raml/issues/5 The problem is that if you try to generate RAML docs when you haven't set up any views, you get the above error (min called on an empty list). unfortunately, this PR is not very helpful since it doesn't actually surface a readable error to the user. Not sure what the best way to address this would be... --- rest_framework/schemas.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rest_framework/schemas.py b/rest_framework/schemas.py index 9439cb691..773df6261 100644 --- a/rest_framework/schemas.py +++ b/rest_framework/schemas.py @@ -263,6 +263,8 @@ class SchemaGenerator(object): view_endpoints.append((path, method, view)) # Only generate the path prefix for paths that will be included + if not paths: + return None prefix = self.determine_path_prefix(paths) for path, method, view in view_endpoints: From 8d72535be9d7ab31c8a46ce5fbbdb39a6d8e0209 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 7 Nov 2016 12:55:18 +0000 Subject: [PATCH 318/457] Fix FilterSet warnings. (#4660) --- rest_framework/filters.py | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/rest_framework/filters.py b/rest_framework/filters.py index 531531efc..00e753d42 100644 --- a/rest_framework/filters.py +++ b/rest_framework/filters.py @@ -38,31 +38,19 @@ class BaseFilterBackend(object): if django_filters: - from django_filters.filterset import FilterSetMetaclass as DFFilterSetMetaclass from django_filters.rest_framework.filterset import FilterSet as DFFilterSet - class FilterSetMetaclass(DFFilterSetMetaclass): - def __new__(cls, name, bases, attrs): + class FilterSet(DFFilterSet): + def __init__(self, *args, **kwargs): warnings.warn( "The built in 'rest_framework.filters.FilterSet' is pending deprecation. " "You should use 'django_filters.rest_framework.FilterSet' instead.", PendingDeprecationWarning ) - return super(FilterSetMetaclass, cls).__new__(cls, name, bases, attrs) - _BaseFilterSet = DFFilterSet + return super(FilterSet, self).__init__(*args, **kwargs) else: - # Dummy metaclass just so we can give a user-friendly error message. - class FilterSetMetaclass(type): - def __init__(self, name, bases, attrs): - # Assert only on subclasses, so we can define FilterSet below. - if bases != (object,): - assert False, 'django-filter must be installed to use the `FilterSet` class' - super(FilterSetMetaclass, self).__init__(name, bases, attrs) - _BaseFilterSet = object - - -class FilterSet(six.with_metaclass(FilterSetMetaclass, _BaseFilterSet)): - pass + def FilterSet(): + assert False, 'django-filter must be installed to use the `FilterSet` class' class DjangoFilterBackend(BaseFilterBackend): From ea60872e9e18909577a2603f5ff630a7c9d04b16 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 7 Nov 2016 13:38:48 +0000 Subject: [PATCH 319/457] Version 3.5.3 [ci skip] --- docs/topics/release-notes.md | 18 ++++++++++++++++++ rest_framework/__init__.py | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index d25a46ba0..e5683360b 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -40,6 +40,14 @@ You can determine your currently installed version using `pip freeze`: ## 3.5.x series +### 3.5.3 + +**Date**: [7th November 2016][3.5.3-milestone] + +* Don't raise incorrect FilterSet deprecation warnings. ([#4660][gh4660], [#4643][gh4643], [#4644][gh4644]) +* Schema generation should not raise 404 when a view permission class does. ([#4645][gh4645], [#4646][gh4646]) +* Add `autofocus` support for input controls. ([#4650][gh4650]) + ### 3.5.2 **Date**: [1st November 2016][3.5.2-milestone] @@ -630,6 +638,7 @@ For older release notes, [please see the version 2.x documentation][old-release- [3.5.0-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.5.0+Release%22 [3.5.1-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.5.1+Release%22 [3.5.2-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.5.2+Release%22 +[3.5.3-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.5.3+Release%22 [gh2013]: https://github.com/tomchristie/django-rest-framework/issues/2013 @@ -1198,3 +1207,12 @@ For older release notes, [please see the version 2.x documentation][old-release- [gh4620]: https://github.com/tomchristie/django-rest-framework/issues/4620 [gh4628]: https://github.com/tomchristie/django-rest-framework/issues/4628 [gh4639]: https://github.com/tomchristie/django-rest-framework/issues/4639 + + + +[gh4660]: https://github.com/tomchristie/django-rest-framework/issues/4660 +[gh4643]: https://github.com/tomchristie/django-rest-framework/issues/4643 +[gh4644]: https://github.com/tomchristie/django-rest-framework/issues/4644 +[gh4645]: https://github.com/tomchristie/django-rest-framework/issues/4645 +[gh4646]: https://github.com/tomchristie/django-rest-framework/issues/4646 +[gh4650]: https://github.com/tomchristie/django-rest-framework/issues/4650 diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py index fe82763a9..795b84e95 100644 --- a/rest_framework/__init__.py +++ b/rest_framework/__init__.py @@ -8,7 +8,7 @@ ______ _____ _____ _____ __ """ __title__ = 'Django REST framework' -__version__ = '3.5.2' +__version__ = '3.5.3' __author__ = 'Tom Christie' __license__ = 'BSD 2-Clause' __copyright__ = 'Copyright 2011-2016 Tom Christie' From 388cf7622c24fee33f998cbe44198bada1872ebb Mon Sep 17 00:00:00 2001 From: Michael Barr Date: Wed, 9 Nov 2016 07:59:11 -0500 Subject: [PATCH 320/457] Adds Django/Python Trove Classifiers (#4662) --- setup.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/setup.py b/setup.py index ca62366ed..5d14ddf6a 100755 --- a/setup.py +++ b/setup.py @@ -92,11 +92,19 @@ setup( 'Development Status :: 5 - Production/Stable', 'Environment :: Web Environment', 'Framework :: Django', + 'Framework :: Django :: 1.8', + 'Framework :: Django :: 1.9', + 'Framework :: Django :: 1.10', 'Intended Audience :: Developers', 'License :: OSI Approved :: BSD License', 'Operating System :: OS Independent', 'Programming Language :: Python', + 'Programming Language :: Python :: 2', + 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', + 'Programming Language :: Python :: 3.3', + 'Programming Language :: Python :: 3.4', + 'Programming Language :: Python :: 3.5', 'Topic :: Internet :: WWW/HTTP', ] ) From 8bab7f8d582c6c8c25e913ec4092899c78875a2c Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 10 Nov 2016 16:36:56 +0000 Subject: [PATCH 321/457] Only apply the nested writes test to writable fields. (#4669) --- rest_framework/serializers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 1bdcd12c3..02c24b70e 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -769,7 +769,7 @@ def raise_errors_on_nested_writes(method_name, serializer, validated_data): isinstance(field, BaseSerializer) and (field.source in validated_data) and isinstance(validated_data[field.source], (list, dict)) - for key, field in serializer.fields.items() + for field in serializer._writable_fields ), ( 'The `.{method_name}()` method does not support writable nested ' 'fields by default.\nWrite an explicit `.{method_name}()` method for ' From 24791cb353d1924086b30abe2188280547d9a6c4 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 11 Nov 2016 09:44:35 +0000 Subject: [PATCH 322/457] Invalidate any existing prefetch cache on PUT requests. (#4668) --- docs/api-guide/testing.md | 11 ++++++++++- rest_framework/mixins.py | 5 ++--- tests/test_prefetch_related.py | 20 +++++++++++++++++++- 3 files changed, 31 insertions(+), 5 deletions(-) diff --git a/docs/api-guide/testing.md b/docs/api-guide/testing.md index 1f8c89233..de79a1e2f 100644 --- a/docs/api-guide/testing.md +++ b/docs/api-guide/testing.md @@ -187,7 +187,12 @@ As usual CSRF validation will only apply to any session authenticated views. Th # RequestsClient REST framework also includes a client for interacting with your application -using the popular Python library, `requests`. +using the popular Python library, `requests`. This may be useful if: + +* You are expecting to interface with the API primarily from another Python service, +and want to test the service at the same level as the client will see. +* You want to write tests in such a way that they can also be run against a staging or +live environment. (See "Live tests" below.) This exposes exactly the same interface as if you were using a requests session directly. @@ -198,6 +203,10 @@ directly. Note that the requests client requires you to pass fully qualified URLs. +## `RequestsClient` and working with the database + +The `RequestsClient` class is useful if + ## Headers & Authentication Custom headers and authentication credentials can be provided in the same way diff --git a/rest_framework/mixins.py b/rest_framework/mixins.py index 47a4923a1..f3695e665 100644 --- a/rest_framework/mixins.py +++ b/rest_framework/mixins.py @@ -71,9 +71,8 @@ class UpdateModelMixin(object): if getattr(instance, '_prefetched_objects_cache', None): # If 'prefetch_related' has been applied to a queryset, we need to - # refresh the instance from the database. - instance = self.get_object() - serializer = self.get_serializer(instance) + # forcibly invalidate the prefetch cache on the instance. + instance._prefetched_objects_cache = {} return Response(serializer.data) diff --git a/tests/test_prefetch_related.py b/tests/test_prefetch_related.py index fc697adc1..a9fa238ea 100644 --- a/tests/test_prefetch_related.py +++ b/tests/test_prefetch_related.py @@ -14,7 +14,7 @@ class UserSerializer(serializers.ModelSerializer): class UserUpdate(generics.UpdateAPIView): - queryset = User.objects.all().prefetch_related('groups') + queryset = User.objects.exclude(username='exclude').prefetch_related('groups') serializer_class = UserSerializer @@ -39,3 +39,21 @@ class TestPrefetchRelatedUpdates(TestCase): 'email': 'tom@example.com' } assert response.data == expected + + def test_prefetch_related_excluding_instance_from_original_queryset(self): + """ + Regression test for https://github.com/tomchristie/django-rest-framework/issues/4661 + """ + view = UserUpdate.as_view() + pk = self.user.pk + groups_pk = self.groups[0].pk + request = factory.put('/', {'username': 'exclude', 'groups': [groups_pk]}, format='json') + response = view(request, pk=pk) + assert User.objects.get(pk=pk).groups.count() == 1 + expected = { + 'id': pk, + 'username': 'exclude', + 'groups': [1], + 'email': 'tom@example.com' + } + assert response.data == expected From 0c02bbbfa728267909ea73aeac57b2e99aba5857 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Mon, 14 Nov 2016 16:58:16 +0000 Subject: [PATCH 323/457] Correct a small typo in exceptions documentation --- docs/api-guide/exceptions.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/exceptions.md b/docs/api-guide/exceptions.md index df8cad42d..03f16222d 100644 --- a/docs/api-guide/exceptions.md +++ b/docs/api-guide/exceptions.md @@ -47,7 +47,7 @@ Any example validation error might look like this: You can implement custom exception handling by creating a handler function that converts exceptions raised in your API views into response objects. This allows you to control the style of error responses used by your API. -The function must take a pair of arguments, this first is the exception to be handled, and the second is a dictionary containing any extra context such as the view currently being handled. The exception handler function should either return a `Response` object, or return `None` if the exception cannot be handled. If the handler returns `None` then the exception will be re-raised and Django will return a standard HTTP 500 'server error' response. +The function must take a pair of arguments, the first is the exception to be handled, and the second is a dictionary containing any extra context such as the view currently being handled. The exception handler function should either return a `Response` object, or return `None` if the exception cannot be handled. If the handler returns `None` then the exception will be re-raised and Django will return a standard HTTP 500 'server error' response. For example, you might want to ensure that all error responses include the HTTP status code in the body of the response, like so: From 1b9013ebae6f4b28de6b88c65a97b5ab0e817200 Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Tue, 22 Nov 2016 19:46:12 +0600 Subject: [PATCH 324/457] update django-filter to version 1.0.0 --- requirements/requirements-optionals.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/requirements-optionals.txt b/requirements/requirements-optionals.txt index 86c4f7709..a59f153d1 100644 --- a/requirements/requirements-optionals.txt +++ b/requirements/requirements-optionals.txt @@ -1,5 +1,5 @@ # Optional packages which may be used with REST framework. markdown==2.6.4 django-guardian==1.4.6 -django-filter==0.15.3 +django-filter==1.0.0 coreapi==2.0.8 From 8030f5b74f49e3144e8fb45f367227bac1192aec Mon Sep 17 00:00:00 2001 From: Vinay Anantharaman Date: Tue, 22 Nov 2016 14:50:47 -0800 Subject: [PATCH 325/457] Edit to the import in Setting filter backends `django_filters` doesn't export `rest_framework` by default so it's required to import it. --- docs/api-guide/filtering.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/filtering.md b/docs/api-guide/filtering.md index 1b49d3a73..3f212ced3 100644 --- a/docs/api-guide/filtering.md +++ b/docs/api-guide/filtering.md @@ -98,7 +98,7 @@ The default filter backends may be set globally, using the `DEFAULT_FILTER_BACKE You can also set the filter backends on a per-view, or per-viewset basis, using the `GenericAPIView` class-based views. - import django_filters + import django_filters.rest_framework from django.contrib.auth.models import User from myapp.serializers import UserSerializer from rest_framework import generics From 4b59ec27fa725a83646792b560fae1b646baadcd Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Wed, 23 Nov 2016 19:17:00 +0600 Subject: [PATCH 326/457] convert tests asserts to pytest style (#4696) --- tests/test_views.py | 16 ++++++++-------- tests/test_viewsets.py | 10 +++++----- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tests/test_views.py b/tests/test_views.py index 05c499481..adafa1cd7 100644 --- a/tests/test_views.py +++ b/tests/test_views.py @@ -71,8 +71,8 @@ class ClassBasedViewIntegrationTests(TestCase): expected = { 'detail': JSON_ERROR } - self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST) - self.assertEqual(sanitise_json_error(response.data), expected) + assert response.status_code == status.HTTP_400_BAD_REQUEST + assert sanitise_json_error(response.data) == expected class FunctionBasedViewIntegrationTests(TestCase): @@ -85,8 +85,8 @@ class FunctionBasedViewIntegrationTests(TestCase): expected = { 'detail': JSON_ERROR } - self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST) - self.assertEqual(sanitise_json_error(response.data), expected) + assert response.status_code == status.HTTP_400_BAD_REQUEST + assert sanitise_json_error(response.data) == expected class TestCustomExceptionHandler(TestCase): @@ -107,8 +107,8 @@ class TestCustomExceptionHandler(TestCase): request = factory.get('/', content_type='application/json') response = view(request) expected = 'Error!' - self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST) - self.assertEqual(response.data, expected) + assert response.status_code == status.HTTP_400_BAD_REQUEST + assert response.data == expected def test_function_based_view_exception_handler(self): view = error_view @@ -116,5 +116,5 @@ class TestCustomExceptionHandler(TestCase): request = factory.get('/', content_type='application/json') response = view(request) expected = 'Error!' - self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST) - self.assertEqual(response.data, expected) + assert response.status_code == status.HTTP_400_BAD_REQUEST + assert response.data == expected diff --git a/tests/test_viewsets.py b/tests/test_viewsets.py index 0d9b6b310..a3c4e6be5 100644 --- a/tests/test_viewsets.py +++ b/tests/test_viewsets.py @@ -21,15 +21,15 @@ class InitializeViewSetsTestCase(TestCase): }) response = my_view(request) - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertEqual(response.data, {'ACTION': 'LIST'}) + assert response.status_code == status.HTTP_200_OK + assert response.data == {'ACTION': 'LIST'} def test_initialize_view_set_with_empty_actions(self): try: BasicViewSet.as_view() except TypeError as e: - self.assertEqual(str(e), "The `actions` argument must be provided " - "when calling `.as_view()` on a ViewSet. " - "For example `.as_view({'get': 'list'})`") + assert str(e) == ("The `actions` argument must be provided " + "when calling `.as_view()` on a ViewSet. " + "For example `.as_view({'get': 'list'})`") else: self.fail("actions must not be empty.") From 5ec223bca0f2df5be06b583f58012e115d2f52a2 Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Wed, 23 Nov 2016 20:05:34 +0600 Subject: [PATCH 327/457] converted validators and write_only_fields test to pytest style (#4697) --- tests/test_validators.py | 13 +++++-------- tests/test_write_only_fields.py | 6 +++--- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/tests/test_validators.py b/tests/test_validators.py index ab2c87c11..37e662b8e 100644 --- a/tests/test_validators.py +++ b/tests/test_validators.py @@ -94,23 +94,20 @@ class TestUniquenessValidation(TestCase): def test_doesnt_pollute_model(self): instance = AnotherUniquenessModel.objects.create(code='100') serializer = AnotherUniquenessSerializer(instance) - self.assertEqual( - AnotherUniquenessModel._meta.get_field('code').validators, []) + assert AnotherUniquenessModel._meta.get_field('code').validators == [] # Accessing data shouldn't effect validators on the model serializer.data - self.assertEqual( - AnotherUniquenessModel._meta.get_field('code').validators, []) + assert AnotherUniquenessModel._meta.get_field('code').validators == [] def test_related_model_is_unique(self): data = {'username': 'Existing', 'email': 'new-email@example.com'} rs = RelatedModelSerializer(data=data) - self.assertFalse(rs.is_valid()) - self.assertEqual(rs.errors, - {'username': ['This field must be unique.']}) + assert not rs.is_valid() + assert rs.errors == {'username': ['This field must be unique.']} data = {'username': 'new-username', 'email': 'new-email@example.com'} rs = RelatedModelSerializer(data=data) - self.assertTrue(rs.is_valid()) + assert rs.is_valid() def test_value_error_treated_as_not_unique(self): serializer = UniquenessIntegerSerializer(data={'integer': 'abc'}) diff --git a/tests/test_write_only_fields.py b/tests/test_write_only_fields.py index 3a289afab..272a05ff3 100644 --- a/tests/test_write_only_fields.py +++ b/tests/test_write_only_fields.py @@ -20,8 +20,8 @@ class WriteOnlyFieldTests(TestCase): 'password': '123' } serializer = self.Serializer(data=data) - self.assertTrue(serializer.is_valid()) - self.assertEqual(serializer.validated_data, data) + assert serializer.is_valid() + assert serializer.validated_data == data def write_only_fields_are_not_present_on_output(self): instance = { @@ -29,4 +29,4 @@ class WriteOnlyFieldTests(TestCase): 'password': '123' } serializer = self.Serializer(instance) - self.assertEqual(serializer.data, {'email': 'foo@example.com'}) + assert serializer.data == {'email': 'foo@example.com'} From a13b8d5560845612318fb030eb610bd34d986955 Mon Sep 17 00:00:00 2001 From: Nik Nyby Date: Wed, 23 Nov 2016 10:13:03 -0500 Subject: [PATCH 328/457] docs: grammar fix --- docs/api-guide/validators.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/validators.md b/docs/api-guide/validators.md index 1af9f02a5..e5b949496 100644 --- a/docs/api-guide/validators.md +++ b/docs/api-guide/validators.md @@ -159,7 +159,7 @@ If you want the date field to be entirely hidden from the user, then use `Hidden --- -**Note**: The `UniqueForValidation` classes always imposes an implicit constraint that the fields they are applied to are always treated as required. Fields with `default` values are an exception to this as they always supply a value even when omitted from user input. +**Note**: The `UniqueForValidation` classes impose an implicit constraint that the fields they are applied to are always treated as required. Fields with `default` values are an exception to this as they always supply a value even when omitted from user input. --- From eaec60ae1d4e34cfef115df6c626cf96f6750e56 Mon Sep 17 00:00:00 2001 From: Nik Nyby Date: Wed, 23 Nov 2016 11:10:39 -0500 Subject: [PATCH 329/457] docs: grammar fix - it's -> its (#4698) --- docs/api-guide/validators.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/validators.md b/docs/api-guide/validators.md index e5b949496..d6350ae5e 100644 --- a/docs/api-guide/validators.md +++ b/docs/api-guide/validators.md @@ -153,7 +153,7 @@ The field will not be writable to the user, but the default value will still be #### Using with a hidden date field. -If you want the date field to be entirely hidden from the user, then use `HiddenField`. This field type does not accept user input, but instead always returns it's default value to the `validated_data` in the serializer. +If you want the date field to be entirely hidden from the user, then use `HiddenField`. This field type does not accept user input, but instead always returns its default value to the `validated_data` in the serializer. published = serializers.HiddenField(default=timezone.now) From abc62afddb9e49b199ee5f4f491093014515da0e Mon Sep 17 00:00:00 2001 From: Nik Nyby Date: Thu, 24 Nov 2016 04:39:18 -0500 Subject: [PATCH 330/457] docs typo fix (#4701) Remove unnecessary "a" --- docs/api-guide/validators.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/validators.md b/docs/api-guide/validators.md index d6350ae5e..e041e9072 100644 --- a/docs/api-guide/validators.md +++ b/docs/api-guide/validators.md @@ -20,7 +20,7 @@ With `ModelForm` the validation is performed partially on the form, and partiall * It is easy to switch between using shortcut `ModelSerializer` classes and using explicit `Serializer` classes. Any validation behavior being used for `ModelSerializer` is simple to replicate. * Printing the `repr` of a serializer instance will show you exactly what validation rules it applies. There's no extra hidden validation behavior being called on the model instance. -When you're using `ModelSerializer` all of this is handled automatically for you. If you want to drop down to using a `Serializer` classes instead, then you need to define the validation rules explicitly. +When you're using `ModelSerializer` all of this is handled automatically for you. If you want to drop down to using `Serializer` classes instead, then you need to define the validation rules explicitly. #### Example From cd3fd36d0e5fa7e2d4907a7f74cd45641a8ddd03 Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Sun, 27 Nov 2016 23:55:09 +0600 Subject: [PATCH 331/457] converted generic relations assert to pytest style --- tests/test_relations_generic.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_relations_generic.py b/tests/test_relations_generic.py index babc2269c..a3798b0a3 100644 --- a/tests/test_relations_generic.py +++ b/tests/test_relations_generic.py @@ -75,7 +75,7 @@ class TestGenericRelations(TestCase): 'tags': ['django', 'python'], 'url': 'https://www.djangoproject.com/' } - self.assertEqual(serializer.data, expected) + assert serializer.data == expected def test_generic_fk(self): """ @@ -105,4 +105,4 @@ class TestGenericRelations(TestCase): 'tagged_item': 'Note: Remember the milk' } ] - self.assertEqual(serializer.data, expected) + assert serializer.data == expected From 42d6098c74e3c8536458f4d423bedb652da16db7 Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Mon, 28 Nov 2016 15:43:48 +0600 Subject: [PATCH 332/457] converted primary key relations test asserts to pytest (#4709) --- tests/test_relations_pk.py | 118 ++++++++++++++++++------------------- 1 file changed, 59 insertions(+), 59 deletions(-) diff --git a/tests/test_relations_pk.py b/tests/test_relations_pk.py index 7a3d45927..ea02f2577 100644 --- a/tests/test_relations_pk.py +++ b/tests/test_relations_pk.py @@ -84,7 +84,7 @@ class PKManyToManyTests(TestCase): {'id': 3, 'name': 'source-3', 'targets': [1, 2, 3]} ] with self.assertNumQueries(4): - self.assertEqual(serializer.data, expected) + assert serializer.data == expected def test_many_to_many_retrieve_prefetch_related(self): queryset = ManyToManySource.objects.all().prefetch_related('targets') @@ -101,15 +101,15 @@ class PKManyToManyTests(TestCase): {'id': 3, 'name': 'target-3', 'sources': [3]} ] with self.assertNumQueries(4): - self.assertEqual(serializer.data, expected) + assert serializer.data == expected def test_many_to_many_update(self): data = {'id': 1, 'name': 'source-1', 'targets': [1, 2, 3]} instance = ManyToManySource.objects.get(pk=1) serializer = ManyToManySourceSerializer(instance, data=data) - self.assertTrue(serializer.is_valid()) + assert serializer.is_valid() serializer.save() - self.assertEqual(serializer.data, data) + assert serializer.data == data # Ensure source 1 is updated, and everything else is as expected queryset = ManyToManySource.objects.all() @@ -119,15 +119,15 @@ class PKManyToManyTests(TestCase): {'id': 2, 'name': 'source-2', 'targets': [1, 2]}, {'id': 3, 'name': 'source-3', 'targets': [1, 2, 3]} ] - self.assertEqual(serializer.data, expected) + assert serializer.data == expected def test_reverse_many_to_many_update(self): data = {'id': 1, 'name': 'target-1', 'sources': [1]} instance = ManyToManyTarget.objects.get(pk=1) serializer = ManyToManyTargetSerializer(instance, data=data) - self.assertTrue(serializer.is_valid()) + assert serializer.is_valid() serializer.save() - self.assertEqual(serializer.data, data) + assert serializer.data == data # Ensure target 1 is updated, and everything else is as expected queryset = ManyToManyTarget.objects.all() @@ -137,15 +137,15 @@ class PKManyToManyTests(TestCase): {'id': 2, 'name': 'target-2', 'sources': [2, 3]}, {'id': 3, 'name': 'target-3', 'sources': [3]} ] - self.assertEqual(serializer.data, expected) + assert serializer.data == expected def test_many_to_many_create(self): data = {'id': 4, 'name': 'source-4', 'targets': [1, 3]} serializer = ManyToManySourceSerializer(data=data) - self.assertTrue(serializer.is_valid()) + assert serializer.is_valid() obj = serializer.save() - self.assertEqual(serializer.data, data) - self.assertEqual(obj.name, 'source-4') + assert serializer.data == data + assert obj.name == 'source-4' # Ensure source 4 is added, and everything else is as expected queryset = ManyToManySource.objects.all() @@ -156,7 +156,7 @@ class PKManyToManyTests(TestCase): {'id': 3, 'name': 'source-3', 'targets': [1, 2, 3]}, {'id': 4, 'name': 'source-4', 'targets': [1, 3]}, ] - self.assertEqual(serializer.data, expected) + assert serializer.data == expected def test_many_to_many_unsaved(self): source = ManyToManySource(name='source-unsaved') @@ -166,15 +166,15 @@ class PKManyToManyTests(TestCase): expected = {'id': None, 'name': 'source-unsaved', 'targets': []} # no query if source hasn't been created yet with self.assertNumQueries(0): - self.assertEqual(serializer.data, expected) + assert serializer.data == expected def test_reverse_many_to_many_create(self): data = {'id': 4, 'name': 'target-4', 'sources': [1, 3]} serializer = ManyToManyTargetSerializer(data=data) - self.assertTrue(serializer.is_valid()) + assert serializer.is_valid() obj = serializer.save() - self.assertEqual(serializer.data, data) - self.assertEqual(obj.name, 'target-4') + assert serializer.data == data + assert obj.name == 'target-4' # Ensure target 4 is added, and everything else is as expected queryset = ManyToManyTarget.objects.all() @@ -185,7 +185,7 @@ class PKManyToManyTests(TestCase): {'id': 3, 'name': 'target-3', 'sources': [3]}, {'id': 4, 'name': 'target-4', 'sources': [1, 3]} ] - self.assertEqual(serializer.data, expected) + assert serializer.data == expected class PKForeignKeyTests(TestCase): @@ -207,7 +207,7 @@ class PKForeignKeyTests(TestCase): {'id': 3, 'name': 'source-3', 'target': 1} ] with self.assertNumQueries(1): - self.assertEqual(serializer.data, expected) + assert serializer.data == expected def test_reverse_foreign_key_retrieve(self): queryset = ForeignKeyTarget.objects.all() @@ -217,7 +217,7 @@ class PKForeignKeyTests(TestCase): {'id': 2, 'name': 'target-2', 'sources': []}, ] with self.assertNumQueries(3): - self.assertEqual(serializer.data, expected) + assert serializer.data == expected def test_reverse_foreign_key_retrieve_prefetch_related(self): queryset = ForeignKeyTarget.objects.all().prefetch_related('sources') @@ -229,9 +229,9 @@ class PKForeignKeyTests(TestCase): data = {'id': 1, 'name': 'source-1', 'target': 2} instance = ForeignKeySource.objects.get(pk=1) serializer = ForeignKeySourceSerializer(instance, data=data) - self.assertTrue(serializer.is_valid()) + assert serializer.is_valid() serializer.save() - self.assertEqual(serializer.data, data) + assert serializer.data == data # Ensure source 1 is updated, and everything else is as expected queryset = ForeignKeySource.objects.all() @@ -241,20 +241,20 @@ class PKForeignKeyTests(TestCase): {'id': 2, 'name': 'source-2', 'target': 1}, {'id': 3, 'name': 'source-3', 'target': 1} ] - self.assertEqual(serializer.data, expected) + assert serializer.data == expected def test_foreign_key_update_incorrect_type(self): data = {'id': 1, 'name': 'source-1', 'target': 'foo'} instance = ForeignKeySource.objects.get(pk=1) serializer = ForeignKeySourceSerializer(instance, data=data) - self.assertFalse(serializer.is_valid()) - self.assertEqual(serializer.errors, {'target': ['Incorrect type. Expected pk value, received %s.' % six.text_type.__name__]}) + assert not serializer.is_valid() + assert serializer.errors == {'target': ['Incorrect type. Expected pk value, received %s.' % six.text_type.__name__]} def test_reverse_foreign_key_update(self): data = {'id': 2, 'name': 'target-2', 'sources': [1, 3]} instance = ForeignKeyTarget.objects.get(pk=2) serializer = ForeignKeyTargetSerializer(instance, data=data) - self.assertTrue(serializer.is_valid()) + assert serializer.is_valid() # We shouldn't have saved anything to the db yet since save # hasn't been called. queryset = ForeignKeyTarget.objects.all() @@ -263,10 +263,10 @@ class PKForeignKeyTests(TestCase): {'id': 1, 'name': 'target-1', 'sources': [1, 2, 3]}, {'id': 2, 'name': 'target-2', 'sources': []}, ] - self.assertEqual(new_serializer.data, expected) + assert new_serializer.data == expected serializer.save() - self.assertEqual(serializer.data, data) + assert serializer.data == data # Ensure target 2 is update, and everything else is as expected queryset = ForeignKeyTarget.objects.all() @@ -275,15 +275,15 @@ class PKForeignKeyTests(TestCase): {'id': 1, 'name': 'target-1', 'sources': [2]}, {'id': 2, 'name': 'target-2', 'sources': [1, 3]}, ] - self.assertEqual(serializer.data, expected) + assert serializer.data == expected def test_foreign_key_create(self): data = {'id': 4, 'name': 'source-4', 'target': 2} serializer = ForeignKeySourceSerializer(data=data) - self.assertTrue(serializer.is_valid()) + assert serializer.is_valid() obj = serializer.save() - self.assertEqual(serializer.data, data) - self.assertEqual(obj.name, 'source-4') + assert serializer.data == data + assert obj.name == 'source-4' # Ensure source 4 is added, and everything else is as expected queryset = ForeignKeySource.objects.all() @@ -294,15 +294,15 @@ class PKForeignKeyTests(TestCase): {'id': 3, 'name': 'source-3', 'target': 1}, {'id': 4, 'name': 'source-4', 'target': 2}, ] - self.assertEqual(serializer.data, expected) + assert serializer.data == expected def test_reverse_foreign_key_create(self): data = {'id': 3, 'name': 'target-3', 'sources': [1, 3]} serializer = ForeignKeyTargetSerializer(data=data) - self.assertTrue(serializer.is_valid()) + assert serializer.is_valid() obj = serializer.save() - self.assertEqual(serializer.data, data) - self.assertEqual(obj.name, 'target-3') + assert serializer.data == data + assert obj.name == 'target-3' # Ensure target 3 is added, and everything else is as expected queryset = ForeignKeyTarget.objects.all() @@ -312,14 +312,14 @@ class PKForeignKeyTests(TestCase): {'id': 2, 'name': 'target-2', 'sources': []}, {'id': 3, 'name': 'target-3', 'sources': [1, 3]}, ] - self.assertEqual(serializer.data, expected) + assert serializer.data == expected def test_foreign_key_update_with_invalid_null(self): data = {'id': 1, 'name': 'source-1', 'target': None} instance = ForeignKeySource.objects.get(pk=1) serializer = ForeignKeySourceSerializer(instance, data=data) - self.assertFalse(serializer.is_valid()) - self.assertEqual(serializer.errors, {'target': ['This field may not be null.']}) + assert not serializer.is_valid() + assert serializer.errors == {'target': ['This field may not be null.']} def test_foreign_key_with_unsaved(self): source = ForeignKeySource(name='source-unsaved') @@ -329,7 +329,7 @@ class PKForeignKeyTests(TestCase): # no query if source hasn't been created yet with self.assertNumQueries(0): - self.assertEqual(serializer.data, expected) + assert serializer.data == expected def test_foreign_key_with_empty(self): """ @@ -338,7 +338,7 @@ class PKForeignKeyTests(TestCase): https://github.com/tomchristie/django-rest-framework/issues/1072 """ serializer = NullableForeignKeySourceSerializer() - self.assertEqual(serializer.data['target'], None) + assert serializer.data['target'] is None def test_foreign_key_not_required(self): """ @@ -350,7 +350,7 @@ class PKForeignKeyTests(TestCase): extra_kwargs = {'target': {'required': False}} serializer = ModelSerializer(data={'name': 'test'}) serializer.is_valid(raise_exception=True) - self.assertNotIn('target', serializer.validated_data) + assert 'target' not in serializer.validated_data class PKNullableForeignKeyTests(TestCase): @@ -371,15 +371,15 @@ class PKNullableForeignKeyTests(TestCase): {'id': 2, 'name': 'source-2', 'target': 1}, {'id': 3, 'name': 'source-3', 'target': None}, ] - self.assertEqual(serializer.data, expected) + assert serializer.data == expected def test_foreign_key_create_with_valid_null(self): data = {'id': 4, 'name': 'source-4', 'target': None} serializer = NullableForeignKeySourceSerializer(data=data) - self.assertTrue(serializer.is_valid()) + assert serializer.is_valid() obj = serializer.save() - self.assertEqual(serializer.data, data) - self.assertEqual(obj.name, 'source-4') + assert serializer.data == data + assert obj.name == 'source-4' # Ensure source 4 is created, and everything else is as expected queryset = NullableForeignKeySource.objects.all() @@ -390,7 +390,7 @@ class PKNullableForeignKeyTests(TestCase): {'id': 3, 'name': 'source-3', 'target': None}, {'id': 4, 'name': 'source-4', 'target': None} ] - self.assertEqual(serializer.data, expected) + assert serializer.data == expected def test_foreign_key_create_with_valid_emptystring(self): """ @@ -400,10 +400,10 @@ class PKNullableForeignKeyTests(TestCase): data = {'id': 4, 'name': 'source-4', 'target': ''} expected_data = {'id': 4, 'name': 'source-4', 'target': None} serializer = NullableForeignKeySourceSerializer(data=data) - self.assertTrue(serializer.is_valid()) + assert serializer.is_valid() obj = serializer.save() - self.assertEqual(serializer.data, expected_data) - self.assertEqual(obj.name, 'source-4') + assert serializer.data == expected_data + assert obj.name == 'source-4' # Ensure source 4 is created, and everything else is as expected queryset = NullableForeignKeySource.objects.all() @@ -414,15 +414,15 @@ class PKNullableForeignKeyTests(TestCase): {'id': 3, 'name': 'source-3', 'target': None}, {'id': 4, 'name': 'source-4', 'target': None} ] - self.assertEqual(serializer.data, expected) + assert serializer.data == expected def test_foreign_key_update_with_valid_null(self): data = {'id': 1, 'name': 'source-1', 'target': None} instance = NullableForeignKeySource.objects.get(pk=1) serializer = NullableForeignKeySourceSerializer(instance, data=data) - self.assertTrue(serializer.is_valid()) + assert serializer.is_valid() serializer.save() - self.assertEqual(serializer.data, data) + assert serializer.data == data # Ensure source 1 is updated, and everything else is as expected queryset = NullableForeignKeySource.objects.all() @@ -432,7 +432,7 @@ class PKNullableForeignKeyTests(TestCase): {'id': 2, 'name': 'source-2', 'target': 1}, {'id': 3, 'name': 'source-3', 'target': None} ] - self.assertEqual(serializer.data, expected) + assert serializer.data == expected def test_foreign_key_update_with_valid_emptystring(self): """ @@ -443,9 +443,9 @@ class PKNullableForeignKeyTests(TestCase): expected_data = {'id': 1, 'name': 'source-1', 'target': None} instance = NullableForeignKeySource.objects.get(pk=1) serializer = NullableForeignKeySourceSerializer(instance, data=data) - self.assertTrue(serializer.is_valid()) + assert serializer.is_valid() serializer.save() - self.assertEqual(serializer.data, expected_data) + assert serializer.data == expected_data # Ensure source 1 is updated, and everything else is as expected queryset = NullableForeignKeySource.objects.all() @@ -455,18 +455,18 @@ class PKNullableForeignKeyTests(TestCase): {'id': 2, 'name': 'source-2', 'target': 1}, {'id': 3, 'name': 'source-3', 'target': None} ] - self.assertEqual(serializer.data, expected) + assert serializer.data == expected def test_null_uuid_foreign_key_serializes_as_none(self): source = NullableUUIDForeignKeySource(name='Source') serializer = NullableUUIDForeignKeySourceSerializer(source) data = serializer.data - self.assertEqual(data["target"], None) + assert data["target"] is None def test_nullable_uuid_foreign_key_is_valid_when_none(self): data = {"name": "Source", "target": None} serializer = NullableUUIDForeignKeySourceSerializer(data=data) - self.assertTrue(serializer.is_valid(), serializer.errors) + assert serializer.is_valid(), serializer.errors class PKNullableOneToOneTests(TestCase): @@ -485,4 +485,4 @@ class PKNullableOneToOneTests(TestCase): {'id': 1, 'name': 'target-1', 'nullable_source': None}, {'id': 2, 'name': 'target-2', 'nullable_source': 1}, ] - self.assertEqual(serializer.data, expected) + assert serializer.data == expected From 9f4c9691f47c534338cdaa4d8a22efc201c8fb62 Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Mon, 28 Nov 2016 20:31:27 +0600 Subject: [PATCH 333/457] converted filters tests asserts to pytest style (#4711) --- tests/test_filters.py | 300 +++++++++++++++++------------------------- 1 file changed, 124 insertions(+), 176 deletions(-) diff --git a/tests/test_filters.py b/tests/test_filters.py index 12fb85895..0cc326239 100644 --- a/tests/test_filters.py +++ b/tests/test_filters.py @@ -155,8 +155,8 @@ class IntegrationTestFiltering(CommonFilteringTestCase): request = factory.get('/') response = view(request).render() - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertEqual(response.data, self.data) + assert response.status_code == status.HTTP_200_OK + assert response.data == self.data self.assertTrue(issubclass(w[-1].category, PendingDeprecationWarning)) self.assertIn("'rest_framework.filters.DjangoFilterBackend' is pending deprecation.", str(w[-1].message)) @@ -175,9 +175,9 @@ class IntegrationTestFiltering(CommonFilteringTestCase): request = factory.get('/') response = view(request).render() - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertEqual(response.data, self.data) - self.assertEqual(len(w), 0) + assert response.status_code == status.HTTP_200_OK + assert response.data == self.data + assert len(w) == 0 @unittest.skipUnless(django_filters, 'django-filter not installed') def test_get_filtered_fields_root_view(self): @@ -189,24 +189,24 @@ class IntegrationTestFiltering(CommonFilteringTestCase): # Basic test with no filter. request = factory.get('/') response = view(request).render() - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertEqual(response.data, self.data) + assert response.status_code == status.HTTP_200_OK + assert response.data == self.data # Tests that the decimal filter works. search_decimal = Decimal('2.25') request = factory.get('/', {'decimal': '%s' % search_decimal}) response = view(request).render() - self.assertEqual(response.status_code, status.HTTP_200_OK) + assert response.status_code == status.HTTP_200_OK expected_data = [f for f in self.data if Decimal(f['decimal']) == search_decimal] - self.assertEqual(response.data, expected_data) + assert response.data == expected_data # Tests that the date filter works. search_date = datetime.date(2012, 9, 22) request = factory.get('/', {'date': '%s' % search_date}) # search_date str: '2012-09-22' response = view(request).render() - self.assertEqual(response.status_code, status.HTTP_200_OK) + assert response.status_code == status.HTTP_200_OK expected_data = [f for f in self.data if parse_date(f['date']) == search_date] - self.assertEqual(response.data, expected_data) + assert response.data == expected_data @unittest.skipUnless(django_filters, 'django-filter not installed') def test_filter_with_queryset(self): @@ -219,9 +219,9 @@ class IntegrationTestFiltering(CommonFilteringTestCase): search_decimal = Decimal('2.25') request = factory.get('/', {'decimal': '%s' % search_decimal}) response = view(request).render() - self.assertEqual(response.status_code, status.HTTP_200_OK) + assert response.status_code == status.HTTP_200_OK expected_data = [f for f in self.data if Decimal(f['decimal']) == search_decimal] - self.assertEqual(response.data, expected_data) + assert response.data == expected_data @unittest.skipUnless(django_filters, 'django-filter not installed') def test_filter_with_get_queryset_only(self): @@ -245,32 +245,32 @@ class IntegrationTestFiltering(CommonFilteringTestCase): # Basic test with no filter. request = factory.get('/') response = view(request).render() - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertEqual(response.data, self.data) + assert response.status_code == status.HTTP_200_OK + assert response.data == self.data # Tests that the decimal filter set with 'lt' in the filter class works. search_decimal = Decimal('4.25') request = factory.get('/', {'decimal': '%s' % search_decimal}) response = view(request).render() - self.assertEqual(response.status_code, status.HTTP_200_OK) + assert response.status_code == status.HTTP_200_OK expected_data = [f for f in self.data if Decimal(f['decimal']) < search_decimal] - self.assertEqual(response.data, expected_data) + assert response.data == expected_data # Tests that the date filter set with 'gt' in the filter class works. search_date = datetime.date(2012, 10, 2) request = factory.get('/', {'date': '%s' % search_date}) # search_date str: '2012-10-02' response = view(request).render() - self.assertEqual(response.status_code, status.HTTP_200_OK) + assert response.status_code == status.HTTP_200_OK expected_data = [f for f in self.data if parse_date(f['date']) > search_date] - self.assertEqual(response.data, expected_data) + assert response.data == expected_data # Tests that the text filter set with 'icontains' in the filter class works. search_text = 'ff' request = factory.get('/', {'text': '%s' % search_text}) response = view(request).render() - self.assertEqual(response.status_code, status.HTTP_200_OK) + assert response.status_code == status.HTTP_200_OK expected_data = [f for f in self.data if search_text in f['text'].lower()] - self.assertEqual(response.data, expected_data) + assert response.data == expected_data # Tests that multiple filters works. search_decimal = Decimal('5.25') @@ -280,10 +280,10 @@ class IntegrationTestFiltering(CommonFilteringTestCase): 'date': '%s' % (search_date,) }) response = view(request).render() - self.assertEqual(response.status_code, status.HTTP_200_OK) + assert response.status_code == status.HTTP_200_OK expected_data = [f for f in self.data if parse_date(f['date']) > search_date and Decimal(f['decimal']) < search_decimal] - self.assertEqual(response.data, expected_data) + assert response.data == expected_data @unittest.skipUnless(django_filters, 'django-filter not installed') def test_incorrectly_configured_filter(self): @@ -304,8 +304,8 @@ class IntegrationTestFiltering(CommonFilteringTestCase): request = factory.get('/?text=aaa') response = view(request).render() - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertEqual(len(response.data), 1) + assert response.status_code == status.HTTP_200_OK + assert len(response.data) == 1 @unittest.skipUnless(django_filters, 'django-filter not installed') def test_base_model_filter_with_proxy(self): @@ -316,8 +316,8 @@ class IntegrationTestFiltering(CommonFilteringTestCase): request = factory.get('/?text=aaa') response = view(request).render() - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertEqual(len(response.data), 1) + assert response.status_code == status.HTTP_200_OK + assert len(response.data) == 1 @unittest.skipUnless(django_filters, 'django-filter not installed') def test_unknown_filter(self): @@ -329,7 +329,7 @@ class IntegrationTestFiltering(CommonFilteringTestCase): search_integer = 10 request = factory.get('/', {'integer': '%s' % search_integer}) response = view(request).render() - self.assertEqual(response.status_code, status.HTTP_200_OK) + assert response.status_code == status.HTTP_200_OK @override_settings(ROOT_URLCONF='tests.test_filters') @@ -351,8 +351,8 @@ class IntegrationTestDetailFiltering(CommonFilteringTestCase): # Basic test with no filter. response = self.client.get(self._get_url(item)) - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertEqual(response.data, data) + assert response.status_code == status.HTTP_200_OK + assert response.data == data # Tests that the decimal filter set that should fail. search_decimal = Decimal('4.25') @@ -360,7 +360,7 @@ class IntegrationTestDetailFiltering(CommonFilteringTestCase): response = self.client.get( '{url}'.format(url=self._get_url(high_item)), {'decimal': '{param}'.format(param=search_decimal)}) - self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND) + assert response.status_code == status.HTTP_404_NOT_FOUND # Tests that the decimal filter set that should succeed. search_decimal = Decimal('4.25') @@ -369,8 +369,8 @@ class IntegrationTestDetailFiltering(CommonFilteringTestCase): response = self.client.get( '{url}'.format(url=self._get_url(low_item)), {'decimal': '{param}'.format(param=search_decimal)}) - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertEqual(response.data, low_item_data) + assert response.status_code == status.HTTP_200_OK + assert response.data == low_item_data # Tests that multiple filters works. search_decimal = Decimal('5.25') @@ -382,8 +382,8 @@ class IntegrationTestDetailFiltering(CommonFilteringTestCase): 'decimal': '{decimal}'.format(decimal=search_decimal), 'date': '{date}'.format(date=search_date) }) - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertEqual(response.data, valid_item_data) + assert response.status_code == status.HTTP_200_OK + assert response.data == valid_item_data class SearchFilterModel(models.Model): @@ -424,13 +424,10 @@ class SearchFilterTests(TestCase): view = SearchListView.as_view() request = factory.get('/', {'search': 'b'}) response = view(request) - self.assertEqual( - response.data, - [ - {'id': 1, 'title': 'z', 'text': 'abc'}, - {'id': 2, 'title': 'zz', 'text': 'bcd'} - ] - ) + assert response.data == [ + {'id': 1, 'title': 'z', 'text': 'abc'}, + {'id': 2, 'title': 'zz', 'text': 'bcd'} + ] def test_exact_search(self): class SearchListView(generics.ListAPIView): @@ -442,12 +439,9 @@ class SearchFilterTests(TestCase): view = SearchListView.as_view() request = factory.get('/', {'search': 'zzz'}) response = view(request) - self.assertEqual( - response.data, - [ - {'id': 3, 'title': 'zzz', 'text': 'cde'} - ] - ) + assert response.data == [ + {'id': 3, 'title': 'zzz', 'text': 'cde'} + ] def test_startswith_search(self): class SearchListView(generics.ListAPIView): @@ -459,12 +453,9 @@ class SearchFilterTests(TestCase): view = SearchListView.as_view() request = factory.get('/', {'search': 'b'}) response = view(request) - self.assertEqual( - response.data, - [ - {'id': 2, 'title': 'zz', 'text': 'bcd'} - ] - ) + assert response.data == [ + {'id': 2, 'title': 'zz', 'text': 'bcd'} + ] def test_regexp_search(self): class SearchListView(generics.ListAPIView): @@ -476,12 +467,9 @@ class SearchFilterTests(TestCase): view = SearchListView.as_view() request = factory.get('/', {'search': 'z{2} ^b'}) response = view(request) - self.assertEqual( - response.data, - [ - {'id': 2, 'title': 'zz', 'text': 'bcd'} - ] - ) + assert response.data == [ + {'id': 2, 'title': 'zz', 'text': 'bcd'} + ] def test_search_with_nonstandard_search_param(self): with override_settings(REST_FRAMEWORK={'SEARCH_PARAM': 'query'}): @@ -496,13 +484,10 @@ class SearchFilterTests(TestCase): view = SearchListView.as_view() request = factory.get('/', {'query': 'b'}) response = view(request) - self.assertEqual( - response.data, - [ - {'id': 1, 'title': 'z', 'text': 'abc'}, - {'id': 2, 'title': 'zz', 'text': 'bcd'} - ] - ) + assert response.data == [ + {'id': 1, 'title': 'z', 'text': 'abc'}, + {'id': 2, 'title': 'zz', 'text': 'bcd'} + ] reload_module(filters) @@ -528,15 +513,13 @@ class SearchFilterFkTests(TestCase): filter_ = filters.SearchFilter() prefixes = [''] + list(filter_.lookup_prefixes) for prefix in prefixes: - self.assertFalse( - filter_.must_call_distinct( - SearchFilterModelFk._meta, ["%stitle" % prefix] - ) + assert not filter_.must_call_distinct( + SearchFilterModelFk._meta, + ["%stitle" % prefix] ) - self.assertFalse( - filter_.must_call_distinct( - SearchFilterModelFk._meta, ["%stitle" % prefix, "%sattribute__label" % prefix] - ) + assert not filter_.must_call_distinct( + SearchFilterModelFk._meta, + ["%stitle" % prefix, "%sattribute__label" % prefix] ) def test_must_call_distinct_restores_meta_for_each_field(self): @@ -545,10 +528,9 @@ class SearchFilterFkTests(TestCase): filter_ = filters.SearchFilter() prefixes = [''] + list(filter_.lookup_prefixes) for prefix in prefixes: - self.assertFalse( - filter_.must_call_distinct( - SearchFilterModelFk._meta, ["%sattribute__label" % prefix, "%stitle" % prefix] - ) + assert not filter_.must_call_distinct( + SearchFilterModelFk._meta, + ["%sattribute__label" % prefix, "%stitle" % prefix] ) @@ -596,21 +578,20 @@ class SearchFilterM2MTests(TestCase): view = SearchListView.as_view() request = factory.get('/', {'search': 'zz'}) response = view(request) - self.assertEqual(len(response.data), 1) + assert len(response.data) == 1 def test_must_call_distinct(self): filter_ = filters.SearchFilter() prefixes = [''] + list(filter_.lookup_prefixes) for prefix in prefixes: - self.assertFalse( - filter_.must_call_distinct( - SearchFilterModelM2M._meta, ["%stitle" % prefix] - ) + assert not filter_.must_call_distinct( + SearchFilterModelM2M._meta, + ["%stitle" % prefix] ) - self.assertTrue( - filter_.must_call_distinct( - SearchFilterModelM2M._meta, ["%stitle" % prefix, "%sattributes__label" % prefix] - ) + + assert filter_.must_call_distinct( + SearchFilterModelM2M._meta, + ["%stitle" % prefix, "%sattributes__label" % prefix] ) @@ -672,14 +653,11 @@ class DjangoFilterOrderingTests(TestCase): request = factory.get('/') response = view(request) - self.assertEqual( - response.data, - [ - {'id': 3, 'date': '2014-10-08', 'text': 'cde'}, - {'id': 2, 'date': '2013-10-08', 'text': 'bcd'}, - {'id': 1, 'date': '2012-10-08', 'text': 'abc'} - ] - ) + assert response.data == [ + {'id': 3, 'date': '2014-10-08', 'text': 'cde'}, + {'id': 2, 'date': '2013-10-08', 'text': 'bcd'}, + {'id': 1, 'date': '2012-10-08', 'text': 'abc'} + ] class OrderingFilterTests(TestCase): @@ -713,14 +691,11 @@ class OrderingFilterTests(TestCase): view = OrderingListView.as_view() request = factory.get('/', {'ordering': 'text'}) response = view(request) - self.assertEqual( - response.data, - [ - {'id': 1, 'title': 'zyx', 'text': 'abc'}, - {'id': 2, 'title': 'yxw', 'text': 'bcd'}, - {'id': 3, 'title': 'xwv', 'text': 'cde'}, - ] - ) + assert response.data == [ + {'id': 1, 'title': 'zyx', 'text': 'abc'}, + {'id': 2, 'title': 'yxw', 'text': 'bcd'}, + {'id': 3, 'title': 'xwv', 'text': 'cde'}, + ] def test_reverse_ordering(self): class OrderingListView(generics.ListAPIView): @@ -733,14 +708,11 @@ class OrderingFilterTests(TestCase): view = OrderingListView.as_view() request = factory.get('/', {'ordering': '-text'}) response = view(request) - self.assertEqual( - response.data, - [ - {'id': 3, 'title': 'xwv', 'text': 'cde'}, - {'id': 2, 'title': 'yxw', 'text': 'bcd'}, - {'id': 1, 'title': 'zyx', 'text': 'abc'}, - ] - ) + assert response.data == [ + {'id': 3, 'title': 'xwv', 'text': 'cde'}, + {'id': 2, 'title': 'yxw', 'text': 'bcd'}, + {'id': 1, 'title': 'zyx', 'text': 'abc'}, + ] def test_incorrectfield_ordering(self): class OrderingListView(generics.ListAPIView): @@ -753,14 +725,11 @@ class OrderingFilterTests(TestCase): view = OrderingListView.as_view() request = factory.get('/', {'ordering': 'foobar'}) response = view(request) - self.assertEqual( - response.data, - [ - {'id': 3, 'title': 'xwv', 'text': 'cde'}, - {'id': 2, 'title': 'yxw', 'text': 'bcd'}, - {'id': 1, 'title': 'zyx', 'text': 'abc'}, - ] - ) + assert response.data == [ + {'id': 3, 'title': 'xwv', 'text': 'cde'}, + {'id': 2, 'title': 'yxw', 'text': 'bcd'}, + {'id': 1, 'title': 'zyx', 'text': 'abc'}, + ] def test_default_ordering(self): class OrderingListView(generics.ListAPIView): @@ -773,14 +742,11 @@ class OrderingFilterTests(TestCase): view = OrderingListView.as_view() request = factory.get('') response = view(request) - self.assertEqual( - response.data, - [ - {'id': 3, 'title': 'xwv', 'text': 'cde'}, - {'id': 2, 'title': 'yxw', 'text': 'bcd'}, - {'id': 1, 'title': 'zyx', 'text': 'abc'}, - ] - ) + assert response.data == [ + {'id': 3, 'title': 'xwv', 'text': 'cde'}, + {'id': 2, 'title': 'yxw', 'text': 'bcd'}, + {'id': 1, 'title': 'zyx', 'text': 'abc'}, + ] def test_default_ordering_using_string(self): class OrderingListView(generics.ListAPIView): @@ -793,14 +759,11 @@ class OrderingFilterTests(TestCase): view = OrderingListView.as_view() request = factory.get('') response = view(request) - self.assertEqual( - response.data, - [ - {'id': 3, 'title': 'xwv', 'text': 'cde'}, - {'id': 2, 'title': 'yxw', 'text': 'bcd'}, - {'id': 1, 'title': 'zyx', 'text': 'abc'}, - ] - ) + assert response.data == [ + {'id': 3, 'title': 'xwv', 'text': 'cde'}, + {'id': 2, 'title': 'yxw', 'text': 'bcd'}, + {'id': 1, 'title': 'zyx', 'text': 'abc'}, + ] def test_ordering_by_aggregate_field(self): # create some related models to aggregate order by @@ -824,14 +787,11 @@ class OrderingFilterTests(TestCase): view = OrderingListView.as_view() request = factory.get('/', {'ordering': 'relateds__count'}) response = view(request) - self.assertEqual( - response.data, - [ - {'id': 1, 'title': 'zyx', 'text': 'abc'}, - {'id': 3, 'title': 'xwv', 'text': 'cde'}, - {'id': 2, 'title': 'yxw', 'text': 'bcd'}, - ] - ) + assert response.data == [ + {'id': 1, 'title': 'zyx', 'text': 'abc'}, + {'id': 3, 'title': 'xwv', 'text': 'cde'}, + {'id': 2, 'title': 'yxw', 'text': 'bcd'}, + ] def test_ordering_with_nonstandard_ordering_param(self): with override_settings(REST_FRAMEWORK={'ORDERING_PARAM': 'order'}): @@ -847,14 +807,11 @@ class OrderingFilterTests(TestCase): view = OrderingListView.as_view() request = factory.get('/', {'order': 'text'}) response = view(request) - self.assertEqual( - response.data, - [ - {'id': 1, 'title': 'zyx', 'text': 'abc'}, - {'id': 2, 'title': 'yxw', 'text': 'bcd'}, - {'id': 3, 'title': 'xwv', 'text': 'cde'}, - ] - ) + assert response.data == [ + {'id': 1, 'title': 'zyx', 'text': 'abc'}, + {'id': 2, 'title': 'yxw', 'text': 'bcd'}, + {'id': 3, 'title': 'xwv', 'text': 'cde'}, + ] reload_module(filters) @@ -884,14 +841,11 @@ class OrderingFilterTests(TestCase): view = OrderingListView.as_view() request = factory.get('/', {'ordering': 'text'}) response = view(request) - self.assertEqual( - response.data, - [ - {'id': 1, 'title': 'zyx', 'text': 'abc'}, - {'id': 2, 'title': 'yxw', 'text': 'bcd'}, - {'id': 3, 'title': 'xwv', 'text': 'cde'}, - ] - ) + assert response.data == [ + {'id': 1, 'title': 'zyx', 'text': 'abc'}, + {'id': 2, 'title': 'yxw', 'text': 'bcd'}, + {'id': 3, 'title': 'xwv', 'text': 'cde'}, + ] def test_ordering_with_improper_configuration(self): class OrderingListView(generics.ListAPIView): @@ -967,14 +921,11 @@ class SensitiveOrderingFilterTests(TestCase): username_field = 'username' # Note: Inverse username ordering correctly applied. - self.assertEqual( - response.data, - [ - {'id': 3, username_field: 'userC'}, - {'id': 2, username_field: 'userB'}, - {'id': 1, username_field: 'userA'}, - ] - ) + assert response.data == [ + {'id': 3, username_field: 'userC'}, + {'id': 2, username_field: 'userB'}, + {'id': 1, username_field: 'userA'}, + ] def test_cannot_order_by_non_serializer_fields(self): for serializer_cls in [ @@ -997,11 +948,8 @@ class SensitiveOrderingFilterTests(TestCase): username_field = 'username' # Note: The passwords are not in order. Default ordering is used. - self.assertEqual( - response.data, - [ - {'id': 1, username_field: 'userA'}, # PassB - {'id': 2, username_field: 'userB'}, # PassC - {'id': 3, username_field: 'userC'}, # PassA - ] - ) + assert response.data == [ + {'id': 1, username_field: 'userA'}, # PassB + {'id': 2, username_field: 'userB'}, # PassC + {'id': 3, username_field: 'userC'}, # PassA + ] From 649876674933c7c05225e8f33a278ce4210df598 Mon Sep 17 00:00:00 2001 From: Ryan P Kilby Date: Tue, 29 Nov 2016 04:49:18 -0500 Subject: [PATCH 334/457] Fix django deprecation warnings (#4712) --- tests/test_model_serializer.py | 4 ++-- tests/test_prefetch_related.py | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/test_model_serializer.py b/tests/test_model_serializer.py index 06848302f..b839f56ca 100644 --- a/tests/test_model_serializer.py +++ b/tests/test_model_serializer.py @@ -94,7 +94,7 @@ class Issue3674ParentModel(models.Model): class Issue3674ChildModel(models.Model): - parent = models.ForeignKey(Issue3674ParentModel, related_name='children') + parent = models.ForeignKey(Issue3674ParentModel, related_name='children', on_delete=models.CASCADE) value = models.CharField(primary_key=True, max_length=64) @@ -1013,7 +1013,7 @@ class Issue3674Test(TestCase): title = models.CharField(max_length=64) class TestChildModel(models.Model): - parent = models.ForeignKey(TestParentModel, related_name='children') + parent = models.ForeignKey(TestParentModel, related_name='children', on_delete=models.CASCADE) value = models.CharField(primary_key=True, max_length=64) class TestChildModelSerializer(serializers.ModelSerializer): diff --git a/tests/test_prefetch_related.py b/tests/test_prefetch_related.py index a9fa238ea..750173b38 100644 --- a/tests/test_prefetch_related.py +++ b/tests/test_prefetch_related.py @@ -2,6 +2,7 @@ from django.contrib.auth.models import Group, User from django.test import TestCase from rest_framework import generics, serializers +from rest_framework.compat import set_many from rest_framework.test import APIRequestFactory factory = APIRequestFactory() @@ -22,7 +23,7 @@ class TestPrefetchRelatedUpdates(TestCase): def setUp(self): self.user = User.objects.create(username='tom', email='tom@example.com') self.groups = [Group.objects.create(name='a'), Group.objects.create(name='b')] - self.user.groups = self.groups + set_many(self.user, 'groups', self.groups) self.user.save() def test_prefetch_related_updates(self): From 1e0988686cda1f9c150e239b945c1d9a0ea9b19c Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy Date: Tue, 29 Nov 2016 13:27:00 +0100 Subject: [PATCH 335/457] Update the Python doc links to use https and point to Python 3 (#4713) --- docs/api-guide/fields.md | 2 +- docs/api-guide/settings.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/api-guide/fields.md b/docs/api-guide/fields.md index 17168b721..3dcc9d0a5 100644 --- a/docs/api-guide/fields.md +++ b/docs/api-guide/fields.md @@ -669,7 +669,7 @@ The [django-rest-framework-hstore][django-rest-framework-hstore] package provide [html-and-forms]: ../topics/html-and-forms.md [FILE_UPLOAD_HANDLERS]: https://docs.djangoproject.com/en/dev/ref/settings/#std:setting-FILE_UPLOAD_HANDLERS [ecma262]: http://ecma-international.org/ecma-262/5.1/#sec-15.9.1.15 -[strftime]: http://docs.python.org/2/library/datetime.html#strftime-and-strptime-behavior +[strftime]: https://docs.python.org/3/library/datetime.html#strftime-and-strptime-behavior [django-widgets]: https://docs.djangoproject.com/en/dev/ref/forms/widgets/ [iso8601]: http://www.w3.org/TR/NOTE-datetime [drf-compound-fields]: https://drf-compound-fields.readthedocs.io diff --git a/docs/api-guide/settings.md b/docs/api-guide/settings.md index 58ceeeeb4..a1ea12d6e 100644 --- a/docs/api-guide/settings.md +++ b/docs/api-guide/settings.md @@ -456,7 +456,7 @@ An integer of 0 or more, that may be used to specify the number of application p Default: `None` -[cite]: http://www.python.org/dev/peps/pep-0020/ +[cite]: https://www.python.org/dev/peps/pep-0020/ [rfc4627]: http://www.ietf.org/rfc/rfc4627.txt [heroku-minified-json]: https://github.com/interagent/http-api-design#keep-json-minified-in-all-responses -[strftime]: http://docs.python.org/2/library/time.html#time.strftime +[strftime]: https://docs.python.org/3/library/time.html#time.strftime From aed8387e05a7a665439044d90b7fac5d1fd61225 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Germ=C3=A1n=20Larra=C3=ADn?= Date: Tue, 29 Nov 2016 12:35:43 -0300 Subject: [PATCH 336/457] docs: Fix description of `DecimalField`'s `max_digits` (#4714) As of PR #4377, `max_digits=None` is allowed for `DecimalField`. --- docs/api-guide/fields.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/fields.md b/docs/api-guide/fields.md index 3dcc9d0a5..6b6ae612d 100644 --- a/docs/api-guide/fields.md +++ b/docs/api-guide/fields.md @@ -261,7 +261,7 @@ Corresponds to `django.db.models.fields.DecimalField`. **Signature**: `DecimalField(max_digits, decimal_places, coerce_to_string=None, max_value=None, min_value=None)` -- `max_digits` The maximum number of digits allowed in the number. Note that this number must be greater than or equal to decimal_places. +- `max_digits` The maximum number of digits allowed in the number. It must be either `None` or an integer greater than or equal to `decimal_places`. - `decimal_places` The number of decimal places to store with the number. - `coerce_to_string` Set to `True` if string values should be returned for the representation, or `False` if `Decimal` objects should be returned. Defaults to the same value as the `COERCE_DECIMAL_TO_STRING` settings key, which will be `True` unless overridden. If `Decimal` objects are returned by the serializer, then the final output format will be determined by the renderer. Note that setting `localize` will force the value to `True`. - `max_value` Validate that the number provided is no greater than this value. From 27641e07b5b56ea6fcd4676419e8fd99c58e9c66 Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Wed, 30 Nov 2016 01:13:21 +0600 Subject: [PATCH 337/457] converted test asserts of generics-test to pytest --- tests/test_generics.py | 102 ++++++++++++++++++++--------------------- 1 file changed, 51 insertions(+), 51 deletions(-) diff --git a/tests/test_generics.py b/tests/test_generics.py index 247237584..2c3679c46 100644 --- a/tests/test_generics.py +++ b/tests/test_generics.py @@ -98,8 +98,8 @@ class TestRootView(TestCase): request = factory.get('/') with self.assertNumQueries(1): response = self.view(request).render() - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertEqual(response.data, self.data) + assert response.status_code == status.HTTP_200_OK + assert response.data == self.data def test_post_root_view(self): """ @@ -109,10 +109,10 @@ class TestRootView(TestCase): request = factory.post('/', data, format='json') with self.assertNumQueries(1): response = self.view(request).render() - self.assertEqual(response.status_code, status.HTTP_201_CREATED) - self.assertEqual(response.data, {'id': 4, 'text': 'foobar'}) + assert response.status_code == status.HTTP_201_CREATED + assert response.data == {'id': 4, 'text': 'foobar'} created = self.objects.get(id=4) - self.assertEqual(created.text, 'foobar') + assert created.text == 'foobar' def test_put_root_view(self): """ @@ -122,8 +122,8 @@ class TestRootView(TestCase): request = factory.put('/', data, format='json') with self.assertNumQueries(0): response = self.view(request).render() - self.assertEqual(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED) - self.assertEqual(response.data, {"detail": 'Method "PUT" not allowed.'}) + assert response.status_code == status.HTTP_405_METHOD_NOT_ALLOWED + assert response.data == {"detail": 'Method "PUT" not allowed.'} def test_delete_root_view(self): """ @@ -132,8 +132,8 @@ class TestRootView(TestCase): request = factory.delete('/') with self.assertNumQueries(0): response = self.view(request).render() - self.assertEqual(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED) - self.assertEqual(response.data, {"detail": 'Method "DELETE" not allowed.'}) + assert response.status_code == status.HTTP_405_METHOD_NOT_ALLOWED + assert response.data == {"detail": 'Method "DELETE" not allowed.'} def test_post_cannot_set_id(self): """ @@ -143,10 +143,10 @@ class TestRootView(TestCase): request = factory.post('/', data, format='json') with self.assertNumQueries(1): response = self.view(request).render() - self.assertEqual(response.status_code, status.HTTP_201_CREATED) - self.assertEqual(response.data, {'id': 4, 'text': 'foobar'}) + assert response.status_code == status.HTTP_201_CREATED + assert response.data == {'id': 4, 'text': 'foobar'} created = self.objects.get(id=4) - self.assertEqual(created.text, 'foobar') + assert created.text == 'foobar' def test_post_error_root_view(self): """ @@ -156,7 +156,7 @@ class TestRootView(TestCase): request = factory.post('/', data, HTTP_ACCEPT='text/html') response = self.view(request).render() expected_error = 'Ensure this field has no more than 100 characters.' - self.assertIn(expected_error, response.rendered_content.decode('utf-8')) + assert expected_error in response.rendered_content.decode('utf-8') EXPECTED_QUERIES_FOR_PUT = 2 @@ -185,8 +185,8 @@ class TestInstanceView(TestCase): request = factory.get('/1') with self.assertNumQueries(1): response = self.view(request, pk=1).render() - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertEqual(response.data, self.data[0]) + assert response.status_code == status.HTTP_200_OK + assert response.data == self.data[0] def test_post_instance_view(self): """ @@ -196,8 +196,8 @@ class TestInstanceView(TestCase): request = factory.post('/', data, format='json') with self.assertNumQueries(0): response = self.view(request).render() - self.assertEqual(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED) - self.assertEqual(response.data, {"detail": 'Method "POST" not allowed.'}) + assert response.status_code == status.HTTP_405_METHOD_NOT_ALLOWED + assert response.data == {"detail": 'Method "POST" not allowed.'} def test_put_instance_view(self): """ @@ -207,10 +207,10 @@ class TestInstanceView(TestCase): request = factory.put('/1', data, format='json') with self.assertNumQueries(EXPECTED_QUERIES_FOR_PUT): response = self.view(request, pk='1').render() - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertEqual(dict(response.data), {'id': 1, 'text': 'foobar'}) + assert response.status_code == status.HTTP_200_OK + assert dict(response.data) == {'id': 1, 'text': 'foobar'} updated = self.objects.get(id=1) - self.assertEqual(updated.text, 'foobar') + assert updated.text == 'foobar' def test_patch_instance_view(self): """ @@ -221,10 +221,10 @@ class TestInstanceView(TestCase): with self.assertNumQueries(EXPECTED_QUERIES_FOR_PUT): response = self.view(request, pk=1).render() - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertEqual(response.data, {'id': 1, 'text': 'foobar'}) + assert response.status_code == status.HTTP_200_OK + assert response.data == {'id': 1, 'text': 'foobar'} updated = self.objects.get(id=1) - self.assertEqual(updated.text, 'foobar') + assert updated.text == 'foobar' def test_delete_instance_view(self): """ @@ -233,10 +233,10 @@ class TestInstanceView(TestCase): request = factory.delete('/1') with self.assertNumQueries(2): response = self.view(request, pk=1).render() - self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT) - self.assertEqual(response.content, six.b('')) + assert response.status_code == status.HTTP_204_NO_CONTENT + assert response.content == six.b('') ids = [obj.id for obj in self.objects.all()] - self.assertEqual(ids, [2, 3]) + assert ids == [2, 3] def test_get_instance_view_incorrect_arg(self): """ @@ -246,7 +246,7 @@ class TestInstanceView(TestCase): request = factory.get('/a') with self.assertNumQueries(0): response = self.view(request, pk='a').render() - self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND) + assert response.status_code == status.HTTP_404_NOT_FOUND def test_put_cannot_set_id(self): """ @@ -256,10 +256,10 @@ class TestInstanceView(TestCase): request = factory.put('/1', data, format='json') with self.assertNumQueries(EXPECTED_QUERIES_FOR_PUT): response = self.view(request, pk=1).render() - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertEqual(response.data, {'id': 1, 'text': 'foobar'}) + assert response.status_code == status.HTTP_200_OK + assert response.data == {'id': 1, 'text': 'foobar'} updated = self.objects.get(id=1) - self.assertEqual(updated.text, 'foobar') + assert updated.text == 'foobar' def test_put_to_deleted_instance(self): """ @@ -271,7 +271,7 @@ class TestInstanceView(TestCase): request = factory.put('/1', data, format='json') with self.assertNumQueries(1): response = self.view(request, pk=1).render() - self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND) + assert response.status_code == status.HTTP_404_NOT_FOUND def test_put_to_filtered_out_instance(self): """ @@ -282,7 +282,7 @@ class TestInstanceView(TestCase): filtered_out_pk = BasicModel.objects.filter(text='filtered out')[0].pk request = factory.put('/{0}'.format(filtered_out_pk), data, format='json') response = self.view(request, pk=filtered_out_pk).render() - self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND) + assert response.status_code == status.HTTP_404_NOT_FOUND def test_patch_cannot_create_an_object(self): """ @@ -292,8 +292,8 @@ class TestInstanceView(TestCase): request = factory.patch('/999', data, format='json') with self.assertNumQueries(1): response = self.view(request, pk=999).render() - self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND) - self.assertFalse(self.objects.filter(id=999).exists()) + assert response.status_code == status.HTTP_404_NOT_FOUND + assert not self.objects.filter(id=999).exists() def test_put_error_instance_view(self): """ @@ -303,7 +303,7 @@ class TestInstanceView(TestCase): request = factory.put('/', data, HTTP_ACCEPT='text/html') response = self.view(request, pk=1).render() expected_error = 'Ensure this field has no more than 100 characters.' - self.assertIn(expected_error, response.rendered_content.decode('utf-8')) + assert expected_error in response.rendered_content.decode('utf-8') class TestFKInstanceView(TestCase): @@ -363,8 +363,8 @@ class TestOverriddenGetObject(TestCase): request = factory.get('/1') with self.assertNumQueries(1): response = self.view(request, pk=1).render() - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertEqual(response.data, self.data[0]) + assert response.status_code == status.HTTP_200_OK + assert response.data == self.data[0] # Regression test for #285 @@ -394,9 +394,9 @@ class TestCreateModelWithAutoNowAddField(TestCase): data = {'email': 'foobar@example.com', 'content': 'foobar'} request = factory.post('/', data, format='json') response = self.view(request).render() - self.assertEqual(response.status_code, status.HTTP_201_CREATED) + assert response.status_code == status.HTTP_201_CREATED created = self.objects.get(id=1) - self.assertEqual(created.content, 'foobar') + assert created.content == 'foobar' # Test for particularly ugly regression with m2m in browsable API @@ -432,7 +432,7 @@ class TestM2MBrowsableAPI(TestCase): request = factory.get('/', HTTP_ACCEPT='text/html') view = ExampleView().as_view() response = view(request).render() - self.assertEqual(response.status_code, status.HTTP_200_OK) + assert response.status_code == status.HTTP_200_OK class InclusiveFilterBackend(object): @@ -489,9 +489,9 @@ class TestFilterBackendAppliedToViews(TestCase): root_view = RootView.as_view(filter_backends=(InclusiveFilterBackend,)) request = factory.get('/') response = root_view(request).render() - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertEqual(len(response.data), 1) - self.assertEqual(response.data, [{'id': 1, 'text': 'foo'}]) + assert response.status_code == status.HTTP_200_OK + assert len(response.data) == 1 + assert response.data == [{'id': 1, 'text': 'foo'}] def test_get_root_view_filters_out_all_models_with_exclusive_filter_backend(self): """ @@ -500,8 +500,8 @@ class TestFilterBackendAppliedToViews(TestCase): root_view = RootView.as_view(filter_backends=(ExclusiveFilterBackend,)) request = factory.get('/') response = root_view(request).render() - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertEqual(response.data, []) + assert response.status_code == status.HTTP_200_OK + assert response.data == [] def test_get_instance_view_filters_out_name_with_filter_backend(self): """ @@ -510,8 +510,8 @@ class TestFilterBackendAppliedToViews(TestCase): instance_view = InstanceView.as_view(filter_backends=(ExclusiveFilterBackend,)) request = factory.get('/1') response = instance_view(request, pk=1).render() - self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND) - self.assertEqual(response.data, {'detail': 'Not found.'}) + assert response.status_code == status.HTTP_404_NOT_FOUND + assert response.data == {'detail': 'Not found.'} def test_get_instance_view_will_return_single_object_when_filter_does_not_exclude_it(self): """ @@ -520,8 +520,8 @@ class TestFilterBackendAppliedToViews(TestCase): instance_view = InstanceView.as_view(filter_backends=(InclusiveFilterBackend,)) request = factory.get('/1') response = instance_view(request, pk=1).render() - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertEqual(response.data, {'id': 1, 'text': 'foo'}) + assert response.status_code == status.HTTP_200_OK + assert response.data == {'id': 1, 'text': 'foo'} def test_dynamic_serializer_form_in_browsable_api(self): """ @@ -530,8 +530,8 @@ class TestFilterBackendAppliedToViews(TestCase): view = DynamicSerializerView.as_view() request = factory.get('/') response = view(request).render() - self.assertContains(response, 'field_b') - self.assertNotContains(response, 'field_a') + assert 'field_b' in response + assert 'field_a' not in response class TestGuardedQueryset(TestCase): From 4a0829d6ec58b8b2fd12c36a34cdcc319def2695 Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Wed, 30 Nov 2016 02:08:37 +0600 Subject: [PATCH 338/457] attempt to fix test --- tests/test_generics.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_generics.py b/tests/test_generics.py index 2c3679c46..67191d329 100644 --- a/tests/test_generics.py +++ b/tests/test_generics.py @@ -530,7 +530,7 @@ class TestFilterBackendAppliedToViews(TestCase): view = DynamicSerializerView.as_view() request = factory.get('/') response = view(request).render() - assert 'field_b' in response + assert response is 'field_b' assert 'field_a' not in response From a5c8a8c2265c6462208c2defc0b943bc51ace6df Mon Sep 17 00:00:00 2001 From: Jeff Fein-Worton Date: Tue, 29 Nov 2016 18:00:10 -0800 Subject: [PATCH 339/457] typo --- docs/api-guide/permissions.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/permissions.md b/docs/api-guide/permissions.md index 7cdb59531..f2d2fcaae 100644 --- a/docs/api-guide/permissions.md +++ b/docs/api-guide/permissions.md @@ -164,7 +164,7 @@ As with `DjangoModelPermissions`, this permission must only be applied to views Note that `DjangoObjectPermissions` **does not** require the `django-guardian` package, and should support other object-level backends equally well. -As with `DjangoModelPermissions` you can use custom model permissions by overriding `DjangoModelPermissions` and setting the `.perms_map` property. Refer to the source code for details. +As with `DjangoModelPermissions` you can use custom model permissions by overriding `DjangoObjectPermissions` and setting the `.perms_map` property. Refer to the source code for details. --- From a5bb9825f3b238d89fdb5d8754d057116fff56a9 Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Wed, 30 Nov 2016 09:56:22 +0600 Subject: [PATCH 340/457] attempt to fix test again --- tests/test_generics.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_generics.py b/tests/test_generics.py index 67191d329..2c3679c46 100644 --- a/tests/test_generics.py +++ b/tests/test_generics.py @@ -530,7 +530,7 @@ class TestFilterBackendAppliedToViews(TestCase): view = DynamicSerializerView.as_view() request = factory.get('/') response = view(request).render() - assert response is 'field_b' + assert 'field_b' in response assert 'field_a' not in response From f5a900a404a85163ba36ec34034d0bacd626b010 Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Wed, 30 Nov 2016 10:01:37 +0600 Subject: [PATCH 341/457] some reverts to fix test --- tests/test_generics.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_generics.py b/tests/test_generics.py index 2c3679c46..aa3951154 100644 --- a/tests/test_generics.py +++ b/tests/test_generics.py @@ -530,8 +530,8 @@ class TestFilterBackendAppliedToViews(TestCase): view = DynamicSerializerView.as_view() request = factory.get('/') response = view(request).render() - assert 'field_b' in response - assert 'field_a' not in response + self.assertContains(response, 'field_b') + self.assertNotContains(response, 'field_a') class TestGuardedQueryset(TestCase): From 10b5f36fec92871e1d96c85a008324683a32f6b5 Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Wed, 30 Nov 2016 12:35:34 +0600 Subject: [PATCH 342/457] added fixes --- tests/test_generics.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/test_generics.py b/tests/test_generics.py index aa3951154..c24cda006 100644 --- a/tests/test_generics.py +++ b/tests/test_generics.py @@ -530,8 +530,9 @@ class TestFilterBackendAppliedToViews(TestCase): view = DynamicSerializerView.as_view() request = factory.get('/') response = view(request).render() - self.assertContains(response, 'field_b') - self.assertNotContains(response, 'field_a') + content = response.content.decode('utf8') + assert 'field_b' in content + assert 'field_a' not in content class TestGuardedQueryset(TestCase): From e03d88ced7f2b22f96f50c2a885264147b242b4a Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Wed, 30 Nov 2016 15:48:33 +0600 Subject: [PATCH 343/457] more pytest style assert (#4719) --- tests/test_validation.py | 38 +++++++++++++++++++--------------- tests/test_validation_error.py | 16 +++++++------- 2 files changed, 29 insertions(+), 25 deletions(-) diff --git a/tests/test_validation.py b/tests/test_validation.py index bc950dd22..8ff4aaf38 100644 --- a/tests/test_validation.py +++ b/tests/test_validation.py @@ -60,11 +60,11 @@ class TestNestedValidationError(TestCase): } }) - self.assertEqual(serializers.as_serializer_error(e), { + assert serializers.as_serializer_error(e) == { 'nested': { 'field': ['error'], } - }) + } class TestPreSaveValidationExclusionsSerializer(TestCase): @@ -75,20 +75,20 @@ class TestPreSaveValidationExclusionsSerializer(TestCase): # We've set `required=False` on the serializer, but the model # does not have `blank=True`, so this serializer should not validate. serializer = ShouldValidateModelSerializer(data={'renamed': ''}) - self.assertEqual(serializer.is_valid(), False) - self.assertIn('renamed', serializer.errors) - self.assertNotIn('should_validate_field', serializer.errors) + assert serializer.is_valid() is False + assert 'renamed' in serializer.errors + assert 'should_validate_field' not in serializer.errors class TestCustomValidationMethods(TestCase): def test_custom_validation_method_is_executed(self): serializer = ShouldValidateModelSerializer(data={'renamed': 'fo'}) - self.assertFalse(serializer.is_valid()) - self.assertIn('renamed', serializer.errors) + assert not serializer.is_valid() + assert 'renamed' in serializer.errors def test_custom_validation_method_passing(self): serializer = ShouldValidateModelSerializer(data={'renamed': 'foo'}) - self.assertTrue(serializer.is_valid()) + assert serializer.is_valid() class ValidationSerializer(serializers.Serializer): @@ -108,12 +108,12 @@ class TestAvoidValidation(TestCase): """ def test_serializer_errors_has_only_invalid_data_error(self): serializer = ValidationSerializer(data='invalid data') - self.assertFalse(serializer.is_valid()) - self.assertDictEqual(serializer.errors, { + assert not serializer.is_valid() + assert serializer.errors == { 'non_field_errors': [ 'Invalid data. Expected a dictionary, but got %s.' % type('').__name__ ] - }) + } # regression tests for issue: 1493 @@ -137,27 +137,31 @@ class TestMaxValueValidatorValidation(TestCase): def test_max_value_validation_serializer_success(self): serializer = ValidationMaxValueValidatorModelSerializer(data={'number_value': 99}) - self.assertTrue(serializer.is_valid()) + assert serializer.is_valid() def test_max_value_validation_serializer_fails(self): serializer = ValidationMaxValueValidatorModelSerializer(data={'number_value': 101}) - self.assertFalse(serializer.is_valid()) - self.assertDictEqual({'number_value': ['Ensure this value is less than or equal to 100.']}, serializer.errors) + assert not serializer.is_valid() + assert serializer.errors == { + 'number_value': [ + 'Ensure this value is less than or equal to 100.' + ] + } def test_max_value_validation_success(self): obj = ValidationMaxValueValidatorModel.objects.create(number_value=100) request = factory.patch('/{0}'.format(obj.pk), {'number_value': 98}, format='json') view = UpdateMaxValueValidationModel().as_view() response = view(request, pk=obj.pk).render() - self.assertEqual(response.status_code, status.HTTP_200_OK) + assert response.status_code == status.HTTP_200_OK def test_max_value_validation_fail(self): obj = ValidationMaxValueValidatorModel.objects.create(number_value=100) request = factory.patch('/{0}'.format(obj.pk), {'number_value': 101}, format='json') view = UpdateMaxValueValidationModel().as_view() response = view(request, pk=obj.pk).render() - self.assertEqual(response.content, b'{"number_value":["Ensure this value is less than or equal to 100."]}') - self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST) + assert response.content == b'{"number_value":["Ensure this value is less than or equal to 100."]}' + assert response.status_code == status.HTTP_400_BAD_REQUEST # regression tests for issue: 1533 diff --git a/tests/test_validation_error.py b/tests/test_validation_error.py index 8e371a349..562fe37e6 100644 --- a/tests/test_validation_error.py +++ b/tests/test_validation_error.py @@ -54,16 +54,16 @@ class TestValidationErrorWithFullDetails(TestCase): request = factory.get('/', content_type='application/json') response = view(request) - self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST) - self.assertEqual(response.data, self.expected_response_data) + assert response.status_code == status.HTTP_400_BAD_REQUEST + assert response.data == self.expected_response_data def test_function_based_view_exception_handler(self): view = error_view request = factory.get('/', content_type='application/json') response = view(request) - self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST) - self.assertEqual(response.data, self.expected_response_data) + assert response.status_code == status.HTTP_400_BAD_REQUEST + assert response.data == self.expected_response_data class TestValidationErrorWithCodes(TestCase): @@ -89,13 +89,13 @@ class TestValidationErrorWithCodes(TestCase): request = factory.get('/', content_type='application/json') response = view(request) - self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST) - self.assertEqual(response.data, self.expected_response_data) + assert response.status_code == status.HTTP_400_BAD_REQUEST + assert response.data == self.expected_response_data def test_function_based_view_exception_handler(self): view = error_view request = factory.get('/', content_type='application/json') response = view(request) - self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST) - self.assertEqual(response.data, self.expected_response_data) + assert response.status_code == status.HTTP_400_BAD_REQUEST + assert response.data == self.expected_response_data From 504f4b44c6dc96e1c1dd2cece3e9d3ac1052011d Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Wed, 30 Nov 2016 16:17:30 +0600 Subject: [PATCH 344/457] converted asserts of atomic requests test to pytest --- tests/test_atomic_requests.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/tests/test_atomic_requests.py b/tests/test_atomic_requests.py index 09d7f2fb1..9085bfc89 100644 --- a/tests/test_atomic_requests.py +++ b/tests/test_atomic_requests.py @@ -67,8 +67,8 @@ class DBTransactionTests(TestCase): with self.assertNumQueries(1): response = self.view(request) - self.assertFalse(transaction.get_rollback()) - self.assertEqual(response.status_code, status.HTTP_200_OK) + assert not transaction.get_rollback() + assert response.status_code == status.HTTP_200_OK assert BasicModel.objects.count() == 1 @@ -98,7 +98,7 @@ class DBTransactionErrorTests(TestCase): # 3 - release savepoint with transaction.atomic(): self.assertRaises(Exception, self.view, request) - self.assertFalse(transaction.get_rollback()) + assert not transaction.get_rollback() assert BasicModel.objects.count() == 1 @@ -128,9 +128,8 @@ class DBTransactionAPIExceptionTests(TestCase): # 4 - release savepoint (django>=1.8 only) with transaction.atomic(): response = self.view(request) - self.assertTrue(transaction.get_rollback()) - self.assertEqual(response.status_code, - status.HTTP_500_INTERNAL_SERVER_ERROR) + assert transaction.get_rollback() + assert response.status_code == status.HTTP_500_INTERNAL_SERVER_ERROR assert BasicModel.objects.count() == 0 @@ -151,5 +150,4 @@ class NonAtomicDBTransactionAPIExceptionTests(TransactionTestCase): # without checking connection.in_atomic_block view raises 500 # due attempt to rollback without transaction - self.assertEqual(response.status_code, - status.HTTP_404_NOT_FOUND) + assert response.status_code == status.HTTP_404_NOT_FOUND From a9b6c974852c7b5c6fb95c586fdab9fbe29e73f7 Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Wed, 30 Nov 2016 16:24:48 +0600 Subject: [PATCH 345/457] converted asserts of decorators test to pytest --- tests/test_decorators.py | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/tests/test_decorators.py b/tests/test_decorators.py index 46e4a6ad7..b187e5fd6 100644 --- a/tests/test_decorators.py +++ b/tests/test_decorators.py @@ -56,11 +56,11 @@ class DecoratorTestCase(TestCase): request = self.factory.get('/') response = view(request) - self.assertEqual(response.status_code, status.HTTP_200_OK) + assert response.status_code == status.HTTP_200_OK request = self.factory.post('/') response = view(request) - self.assertEqual(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED) + assert response.status_code == status.HTTP_405_METHOD_NOT_ALLOWED def test_calling_put_method(self): @@ -70,11 +70,11 @@ class DecoratorTestCase(TestCase): request = self.factory.put('/') response = view(request) - self.assertEqual(response.status_code, status.HTTP_200_OK) + assert response.status_code == status.HTTP_200_OK request = self.factory.post('/') response = view(request) - self.assertEqual(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED) + assert response.status_code == status.HTTP_405_METHOD_NOT_ALLOWED def test_calling_patch_method(self): @@ -84,11 +84,11 @@ class DecoratorTestCase(TestCase): request = self.factory.patch('/') response = view(request) - self.assertEqual(response.status_code, status.HTTP_200_OK) + assert response.status_code == status.HTTP_200_OK request = self.factory.post('/') response = view(request) - self.assertEqual(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED) + assert response.status_code == status.HTTP_405_METHOD_NOT_ALLOWED def test_renderer_classes(self): @@ -99,16 +99,15 @@ class DecoratorTestCase(TestCase): request = self.factory.get('/') response = view(request) - self.assertTrue(isinstance(response.accepted_renderer, JSONRenderer)) + assert isinstance(response.accepted_renderer, JSONRenderer) def test_parser_classes(self): @api_view(['GET']) @parser_classes([JSONParser]) def view(request): - self.assertEqual(len(request.parsers), 1) - self.assertTrue(isinstance(request.parsers[0], - JSONParser)) + assert len(request.parsers) == 1 + assert isinstance(request.parsers[0], JSONParser) return Response({}) request = self.factory.get('/') @@ -119,9 +118,8 @@ class DecoratorTestCase(TestCase): @api_view(['GET']) @authentication_classes([BasicAuthentication]) def view(request): - self.assertEqual(len(request.authenticators), 1) - self.assertTrue(isinstance(request.authenticators[0], - BasicAuthentication)) + assert len(request.authenticators) == 1 + assert isinstance(request.authenticators[0], BasicAuthentication) return Response({}) request = self.factory.get('/') @@ -136,7 +134,7 @@ class DecoratorTestCase(TestCase): request = self.factory.get('/') response = view(request) - self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN) + assert response.status_code == status.HTTP_403_FORBIDDEN def test_throttle_classes(self): class OncePerDayUserThrottle(UserRateThrottle): @@ -149,7 +147,7 @@ class DecoratorTestCase(TestCase): request = self.factory.get('/') response = view(request) - self.assertEqual(response.status_code, status.HTTP_200_OK) + assert response.status_code == status.HTTP_200_OK response = view(request) - self.assertEqual(response.status_code, status.HTTP_429_TOO_MANY_REQUESTS) + assert response.status_code == status.HTTP_429_TOO_MANY_REQUESTS From 9a3f8d9a9c63fc14a4e13738407f2b262de6649a Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Wed, 30 Nov 2016 16:42:43 +0600 Subject: [PATCH 346/457] converted asserts of descriptions test to pytest --- tests/test_description.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/test_description.py b/tests/test_description.py index fcb88287b..08d8bddec 100644 --- a/tests/test_description.py +++ b/tests/test_description.py @@ -60,7 +60,7 @@ class TestViewNamesAndDescriptions(TestCase): """ class MockView(APIView): pass - self.assertEqual(MockView().get_view_name(), 'Mock') + assert MockView().get_view_name() == 'Mock' def test_view_description_uses_docstring(self): """Ensure view descriptions are based on the docstring.""" @@ -80,7 +80,7 @@ class TestViewNamesAndDescriptions(TestCase): # hash style header #""" - self.assertEqual(MockView().get_view_description(), DESCRIPTION) + assert MockView().get_view_description() == DESCRIPTION def test_view_description_can_be_empty(self): """ @@ -89,7 +89,7 @@ class TestViewNamesAndDescriptions(TestCase): """ class MockView(APIView): pass - self.assertEqual(MockView().get_view_description(), '') + assert MockView().get_view_description() == '' def test_view_description_can_be_promise(self): """ @@ -111,7 +111,7 @@ class TestViewNamesAndDescriptions(TestCase): class MockView(APIView): __doc__ = MockLazyStr("a gettext string") - self.assertEqual(MockView().get_view_description(), 'a gettext string') + assert MockView().get_view_description() == 'a gettext string' def test_markdown(self): """ @@ -120,7 +120,7 @@ class TestViewNamesAndDescriptions(TestCase): if apply_markdown: gte_21_match = apply_markdown(DESCRIPTION) == MARKED_DOWN_gte_21 lt_21_match = apply_markdown(DESCRIPTION) == MARKED_DOWN_lt_21 - self.assertTrue(gte_21_match or lt_21_match) + assert gte_21_match or lt_21_match def test_dedent_tabs(): From 7e8b01dbd2e780b1204d8c362dcb40d31d1b27d5 Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Wed, 30 Nov 2016 16:45:48 +0600 Subject: [PATCH 347/457] converted asserts of encoders test to pytest --- tests/test_encoders.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/test_encoders.py b/tests/test_encoders.py index d6f681932..687141476 100644 --- a/tests/test_encoders.py +++ b/tests/test_encoders.py @@ -20,21 +20,21 @@ class JSONEncoderTests(TestCase): Tests encoding a decimal """ d = Decimal(3.14) - self.assertEqual(d, float(d)) + assert d == float(d) def test_encode_datetime(self): """ Tests encoding a datetime object """ current_time = datetime.now() - self.assertEqual(self.encoder.default(current_time), current_time.isoformat()) + assert self.encoder.default(current_time) == current_time.isoformat() def test_encode_time(self): """ Tests encoding a timezone """ current_time = datetime.now().time() - self.assertEqual(self.encoder.default(current_time), current_time.isoformat()[:12]) + assert self.encoder.default(current_time) == current_time.isoformat()[:12] def test_encode_time_tz(self): """ @@ -64,18 +64,18 @@ class JSONEncoderTests(TestCase): Tests encoding a date object """ current_date = date.today() - self.assertEqual(self.encoder.default(current_date), current_date.isoformat()) + assert self.encoder.default(current_date) == current_date.isoformat() def test_encode_timedelta(self): """ Tests encoding a timedelta object """ delta = timedelta(hours=1) - self.assertEqual(self.encoder.default(delta), str(delta.total_seconds())) + assert self.encoder.default(delta) == str(delta.total_seconds()) def test_encode_uuid(self): """ Tests encoding a UUID object """ unique_id = uuid4() - self.assertEqual(self.encoder.default(unique_id), str(unique_id)) + assert self.encoder.default(unique_id) == str(unique_id) From 1a741bb2a2759d9b20afc6160b5c7d58ec5ff382 Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Wed, 30 Nov 2016 17:12:01 +0600 Subject: [PATCH 348/457] converted asserts of exceptions test to pytest (#4723) --- tests/test_exceptions.py | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/tests/test_exceptions.py b/tests/test_exceptions.py index f1d172211..8b5628ef2 100644 --- a/tests/test_exceptions.py +++ b/tests/test_exceptions.py @@ -16,28 +16,22 @@ class ExceptionTestCase(TestCase): example = "string" lazy_example = _(example) - self.assertEqual( - _get_error_details(lazy_example), - example - ) + assert _get_error_details(lazy_example) == example + assert isinstance( _get_error_details(lazy_example), ErrorDetail ) - self.assertEqual( - _get_error_details({'nested': lazy_example})['nested'], - example - ) + assert _get_error_details({'nested': lazy_example})['nested'] == example + assert isinstance( _get_error_details({'nested': lazy_example})['nested'], ErrorDetail ) - self.assertEqual( - _get_error_details([[lazy_example]])[0][0], - example - ) + assert _get_error_details([[lazy_example]])[0][0] == example + assert isinstance( _get_error_details([[lazy_example]])[0][0], ErrorDetail From 4f6c326a9955e70e64eb83499015bba10175468a Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Wed, 30 Nov 2016 18:52:32 +0600 Subject: [PATCH 349/457] converted remaining unittes asserts of fields test to pytest (#4724) --- tests/test_fields.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/test_fields.py b/tests/test_fields.py index 92030e3ca..069ba879d 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -1014,16 +1014,16 @@ class TestLocalizedDecimalField(TestCase): @override_settings(USE_L10N=True, LANGUAGE_CODE='pl') def test_to_internal_value(self): field = serializers.DecimalField(max_digits=2, decimal_places=1, localize=True) - self.assertEqual(field.to_internal_value('1,1'), Decimal('1.1')) + assert field.to_internal_value('1,1') == Decimal('1.1') @override_settings(USE_L10N=True, LANGUAGE_CODE='pl') def test_to_representation(self): field = serializers.DecimalField(max_digits=2, decimal_places=1, localize=True) - self.assertEqual(field.to_representation(Decimal('1.1')), '1,1') + assert field.to_representation(Decimal('1.1')) == '1,1' def test_localize_forces_coerce_to_string(self): field = serializers.DecimalField(max_digits=2, decimal_places=1, coerce_to_string=False, localize=True) - self.assertTrue(isinstance(field.to_representation(Decimal('1.1')), six.string_types)) + assert isinstance(field.to_representation(Decimal('1.1')), six.string_types) class TestQuantizedValueForDecimal(TestCase): @@ -1031,19 +1031,19 @@ class TestQuantizedValueForDecimal(TestCase): field = serializers.DecimalField(max_digits=4, decimal_places=2) value = field.to_internal_value(12).as_tuple() expected_digit_tuple = (0, (1, 2, 0, 0), -2) - self.assertEqual(value, expected_digit_tuple) + assert value == expected_digit_tuple def test_string_quantized_value_for_decimal(self): field = serializers.DecimalField(max_digits=4, decimal_places=2) value = field.to_internal_value('12').as_tuple() expected_digit_tuple = (0, (1, 2, 0, 0), -2) - self.assertEqual(value, expected_digit_tuple) + assert value == expected_digit_tuple def test_part_precision_string_quantized_value_for_decimal(self): field = serializers.DecimalField(max_digits=4, decimal_places=2) value = field.to_internal_value('12.0').as_tuple() expected_digit_tuple = (0, (1, 2, 0, 0), -2) - self.assertEqual(value, expected_digit_tuple) + assert value == expected_digit_tuple class TestNoDecimalPlaces(FieldValues): From 22578525eff075e329e8840c42c358d59105a0d3 Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy Date: Wed, 30 Nov 2016 13:58:34 +0100 Subject: [PATCH 350/457] Documentation update (#4717) --- docs/api-guide/authentication.md | 2 +- docs/api-guide/fields.md | 6 +++--- docs/api-guide/filtering.md | 4 ++-- docs/api-guide/generic-views.md | 2 +- docs/api-guide/pagination.md | 2 +- docs/api-guide/parsers.md | 2 +- docs/api-guide/permissions.md | 4 ++-- docs/api-guide/relations.md | 6 +++--- docs/api-guide/renderers.md | 4 ++-- docs/api-guide/responses.md | 2 +- docs/api-guide/reverse.md | 4 ++-- docs/api-guide/schemas.md | 4 ++-- docs/api-guide/serializers.md | 2 +- docs/api-guide/testing.md | 4 ++-- docs/api-guide/throttling.md | 4 ++-- docs/api-guide/validators.md | 2 +- docs/topics/2.2-announcement.md | 8 ++++---- docs/topics/2.4-announcement.md | 2 +- docs/topics/3.0-announcement.md | 4 ++-- docs/topics/ajax-csrf-cors.md | 2 +- docs/topics/release-notes.md | 2 +- 21 files changed, 36 insertions(+), 36 deletions(-) diff --git a/docs/api-guide/authentication.md b/docs/api-guide/authentication.md index bf3a31eb7..4a01188f3 100644 --- a/docs/api-guide/authentication.md +++ b/docs/api-guide/authentication.md @@ -363,7 +363,7 @@ HTTP Signature (currently a [IETF draft][http-signature-ietf-draft]) provides a [oauth]: http://oauth.net/2/ [permission]: permissions.md [throttling]: throttling.md -[csrf-ajax]: https://docs.djangoproject.com/en/dev/ref/csrf/#ajax +[csrf-ajax]: https://docs.djangoproject.com/en/stable/ref/csrf/#ajax [mod_wsgi_official]: http://code.google.com/p/modwsgi/wiki/ConfigurationDirectives#WSGIPassAuthorization [django-oauth-toolkit-getting-started]: https://django-oauth-toolkit.readthedocs.io/en/latest/rest-framework/getting_started.html [django-rest-framework-oauth]: http://jpadilla.github.io/django-rest-framework-oauth/ diff --git a/docs/api-guide/fields.md b/docs/api-guide/fields.md index 6b6ae612d..b527b016b 100644 --- a/docs/api-guide/fields.md +++ b/docs/api-guide/fields.md @@ -665,12 +665,12 @@ The [django-rest-framework-gis][django-rest-framework-gis] package provides geog The [django-rest-framework-hstore][django-rest-framework-hstore] package provides an `HStoreField` to support [django-hstore][django-hstore] `DictionaryField` model field. -[cite]: https://docs.djangoproject.com/en/dev/ref/forms/api/#django.forms.Form.cleaned_data +[cite]: https://docs.djangoproject.com/en/stable/ref/forms/api/#django.forms.Form.cleaned_data [html-and-forms]: ../topics/html-and-forms.md -[FILE_UPLOAD_HANDLERS]: https://docs.djangoproject.com/en/dev/ref/settings/#std:setting-FILE_UPLOAD_HANDLERS +[FILE_UPLOAD_HANDLERS]: https://docs.djangoproject.com/en/stable/ref/settings/#std:setting-FILE_UPLOAD_HANDLERS [ecma262]: http://ecma-international.org/ecma-262/5.1/#sec-15.9.1.15 [strftime]: https://docs.python.org/3/library/datetime.html#strftime-and-strptime-behavior -[django-widgets]: https://docs.djangoproject.com/en/dev/ref/forms/widgets/ +[django-widgets]: https://docs.djangoproject.com/en/stable/ref/forms/widgets/ [iso8601]: http://www.w3.org/TR/NOTE-datetime [drf-compound-fields]: https://drf-compound-fields.readthedocs.io [drf-extra-fields]: https://github.com/Hipo/drf-extra-fields diff --git a/docs/api-guide/filtering.md b/docs/api-guide/filtering.md index 3f212ced3..8a23a2ea3 100644 --- a/docs/api-guide/filtering.md +++ b/docs/api-guide/filtering.md @@ -455,14 +455,14 @@ The [djangorestframework-word-filter][django-rest-framework-word-search-filter] [drf-url-filter][drf-url-filter] is a simple Django app to apply filters on drf `ModelViewSet`'s `Queryset` in a clean, simple and configurable way. It also supports validations on incoming query params and their values. A beautiful python package `Voluptuous` is being used for validations on the incoming query parameters. The best part about voluptuous is you can define your own validations as per your query params requirements. -[cite]: https://docs.djangoproject.com/en/dev/topics/db/queries/#retrieving-specific-objects-with-filters +[cite]: https://docs.djangoproject.com/en/stable/topics/db/queries/#retrieving-specific-objects-with-filters [django-filter]: https://github.com/alex/django-filter [django-filter-docs]: https://django-filter.readthedocs.io/en/latest/index.html [guardian]: https://django-guardian.readthedocs.io/ [view-permissions]: https://django-guardian.readthedocs.io/en/latest/userguide/assign.html [view-permissions-blogpost]: http://blog.nyaruka.com/adding-a-view-permission-to-django-models [nullbooleanselect]: https://github.com/django/django/blob/master/django/forms/widgets.py -[search-django-admin]: https://docs.djangoproject.com/en/dev/ref/contrib/admin/#django.contrib.admin.ModelAdmin.search_fields +[search-django-admin]: https://docs.djangoproject.com/en/stable/ref/contrib/admin/#django.contrib.admin.ModelAdmin.search_fields [django-rest-framework-filters]: https://github.com/philipn/django-rest-framework-filters [django-rest-framework-word-search-filter]: https://github.com/trollknurr/django-rest-framework-word-search-filter [django-url-filter]: https://github.com/miki725/django-url-filter diff --git a/docs/api-guide/generic-views.md b/docs/api-guide/generic-views.md index c368d0b46..606a3787a 100644 --- a/docs/api-guide/generic-views.md +++ b/docs/api-guide/generic-views.md @@ -382,7 +382,7 @@ The [django-rest-framework-bulk package][django-rest-framework-bulk] implements [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 +[cite]: https://docs.djangoproject.com/en/stable/ref/class-based-views/#base-vs-generic-views [GenericAPIView]: #genericapiview [ListModelMixin]: #listmodelmixin [CreateModelMixin]: #createmodelmixin diff --git a/docs/api-guide/pagination.md b/docs/api-guide/pagination.md index f82614eca..bc7a5602d 100644 --- a/docs/api-guide/pagination.md +++ b/docs/api-guide/pagination.md @@ -325,7 +325,7 @@ The [`DRF-extensions` package][drf-extensions] includes a [`PaginateByMaxMixin` The [`drf-proxy-pagination` package][drf-proxy-pagination] includes a `ProxyPagination` class which allows to choose pagination class with a query parameter. -[cite]: https://docs.djangoproject.com/en/dev/topics/pagination/ +[cite]: https://docs.djangoproject.com/en/stable/topics/pagination/ [github-link-pagination]: https://developer.github.com/guides/traversing-with-pagination/ [link-header]: ../img/link-header-pagination.png [drf-extensions]: http://chibisov.github.io/drf-extensions/docs/ diff --git a/docs/api-guide/parsers.md b/docs/api-guide/parsers.md index ef2859fe1..7bf932d06 100644 --- a/docs/api-guide/parsers.md +++ b/docs/api-guide/parsers.md @@ -224,7 +224,7 @@ Modify your REST framework settings. [jquery-ajax]: http://api.jquery.com/jQuery.ajax/ [cite]: https://groups.google.com/d/topic/django-developers/dxI4qVzrBY4/discussion -[upload-handlers]: https://docs.djangoproject.com/en/dev/topics/http/file-uploads/#upload-handlers +[upload-handlers]: https://docs.djangoproject.com/en/stable/topics/http/file-uploads/#upload-handlers [rest-framework-yaml]: http://jpadilla.github.io/django-rest-framework-yaml/ [rest-framework-xml]: http://jpadilla.github.io/django-rest-framework-xml/ [yaml]: http://www.yaml.org/ diff --git a/docs/api-guide/permissions.md b/docs/api-guide/permissions.md index f2d2fcaae..be2981327 100644 --- a/docs/api-guide/permissions.md +++ b/docs/api-guide/permissions.md @@ -269,8 +269,8 @@ The [Django Rest Framework Roles][django-rest-framework-roles] package makes it [authentication]: authentication.md [throttling]: throttling.md [filtering]: filtering.md -[contribauth]: https://docs.djangoproject.com/en/dev/topics/auth/customizing/#custom-permissions -[objectpermissions]: https://docs.djangoproject.com/en/dev/topics/auth/customizing/#handling-object-permissions +[contribauth]: https://docs.djangoproject.com/en/stable/topics/auth/customizing/#custom-permissions +[objectpermissions]: https://docs.djangoproject.com/en/stable/topics/auth/customizing/#handling-object-permissions [guardian]: https://github.com/lukaszb/django-guardian [get_objects_for_user]: http://pythonhosted.org/django-guardian/api/guardian.shortcuts.html#get-objects-for-user [2.2-announcement]: ../topics/2.2-announcement.md diff --git a/docs/api-guide/relations.md b/docs/api-guide/relations.md index aabe49412..662fd4809 100644 --- a/docs/api-guide/relations.md +++ b/docs/api-guide/relations.md @@ -505,7 +505,7 @@ For example, given the following model for a tag, which has a generic relationsh """ Tags arbitrary model instances using a generic relation. - See: https://docs.djangoproject.com/en/dev/ref/contrib/contenttypes/ + See: https://docs.djangoproject.com/en/stable/ref/contrib/contenttypes/ """ tag_name = models.SlugField() content_type = models.ForeignKey(ContentType, on_delete=models.CASCADE) @@ -593,9 +593,9 @@ The [drf-nested-routers package][drf-nested-routers] provides routers and relati The [rest-framework-generic-relations][drf-nested-relations] library provides read/write serialization for generic foreign keys. [cite]: http://lwn.net/Articles/193245/ -[reverse-relationships]: https://docs.djangoproject.com/en/dev/topics/db/queries/#following-relationships-backward +[reverse-relationships]: https://docs.djangoproject.com/en/stable/topics/db/queries/#following-relationships-backward [routers]: http://www.django-rest-framework.org/api-guide/routers#defaultrouter -[generic-relations]: https://docs.djangoproject.com/en/dev/ref/contrib/contenttypes/#id1 +[generic-relations]: https://docs.djangoproject.com/en/stable/ref/contrib/contenttypes/#id1 [2.2-announcement]: ../topics/2.2-announcement.md [drf-nested-routers]: https://github.com/alanjds/drf-nested-routers [drf-nested-relations]: https://github.com/Ian-Foote/rest-framework-generic-relations diff --git a/docs/api-guide/renderers.md b/docs/api-guide/renderers.md index a95778350..648eafdde 100644 --- a/docs/api-guide/renderers.md +++ b/docs/api-guide/renderers.md @@ -476,7 +476,7 @@ Comma-separated values are a plain-text tabular data format, that can be easily [Rest Framework Latex] provides a renderer that outputs PDFs using Laulatex. It is maintained by [Pebble (S/F Software)][mypebble]. -[cite]: https://docs.djangoproject.com/en/dev/ref/template-response/#the-rendering-process +[cite]: https://docs.djangoproject.com/en/stable/stable/template-response/#the-rendering-process [conneg]: content-negotiation.md [html-and-forms]: ../topics/html-and-forms.md [browser-accept-headers]: http://www.gethifi.com/blog/browser-rest-http-accept-headers @@ -485,7 +485,7 @@ Comma-separated values are a plain-text tabular data format, that can be easily [quote]: http://roy.gbiv.com/untangled/2008/rest-apis-must-be-hypertext-driven [application/vnd.github+json]: http://developer.github.com/v3/media/ [application/vnd.collection+json]: http://www.amundsen.com/media-types/collection/ -[django-error-views]: https://docs.djangoproject.com/en/dev/topics/http/views/#customizing-error-views +[django-error-views]: https://docs.djangoproject.com/en/stable/topics/http/views/#customizing-error-views [rest-framework-jsonp]: http://jpadilla.github.io/django-rest-framework-jsonp/ [cors]: http://www.w3.org/TR/cors/ [cors-docs]: http://www.django-rest-framework.org/topics/ajax-csrf-cors/ diff --git a/docs/api-guide/responses.md b/docs/api-guide/responses.md index 97f312710..8ee14eefa 100644 --- a/docs/api-guide/responses.md +++ b/docs/api-guide/responses.md @@ -91,5 +91,5 @@ As with any other `TemplateResponse`, this method is called to render the serial You won't typically need to call `.render()` yourself, as it's handled by Django's standard response cycle. -[cite]: https://docs.djangoproject.com/en/dev/ref/template-response/ +[cite]: https://docs.djangoproject.com/en/stable/stable/template-response/ [statuscodes]: status-codes.md diff --git a/docs/api-guide/reverse.md b/docs/api-guide/reverse.md index 35d88e2db..ee0b2054f 100644 --- a/docs/api-guide/reverse.md +++ b/docs/api-guide/reverse.md @@ -51,5 +51,5 @@ As with the `reverse` function, you should **include the request as a keyword ar api_root = reverse_lazy('api-root', request=request) [cite]: http://www.ics.uci.edu/~fielding/pubs/dissertation/rest_arch_style.htm#sec_5_1_5 -[reverse]: https://docs.djangoproject.com/en/dev/topics/http/urls/#reverse -[reverse-lazy]: https://docs.djangoproject.com/en/dev/topics/http/urls/#reverse-lazy +[reverse]: https://docs.djangoproject.com/en/stable/topics/http/urls/#reverse +[reverse-lazy]: https://docs.djangoproject.com/en/stable/topics/http/urls/#reverse-lazy diff --git a/docs/api-guide/schemas.md b/docs/api-guide/schemas.md index 7da619034..c89c100fe 100644 --- a/docs/api-guide/schemas.md +++ b/docs/api-guide/schemas.md @@ -541,5 +541,5 @@ A short description of the meaning and intended usage of the input field. [open-api]: https://openapis.org/ [json-hyperschema]: http://json-schema.org/latest/json-schema-hypermedia.html [api-blueprint]: https://apiblueprint.org/ -[static-files]: https://docs.djangoproject.com/en/dev/howto/static-files/ -[named-arguments]: https://docs.djangoproject.com/en/dev/topics/http/urls/#named-groups +[static-files]: https://docs.djangoproject.com/en/stable/howto/static-files/ +[named-arguments]: https://docs.djangoproject.com/en/stable/topics/http/urls/#named-groups diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md index 290e32f4f..d36812f3f 100644 --- a/docs/api-guide/serializers.md +++ b/docs/api-guide/serializers.md @@ -1118,7 +1118,7 @@ The [html-json-forms][html-json-forms] package provides an algorithm and seriali [cite]: https://groups.google.com/d/topic/django-users/sVFaOfQi4wY/discussion [relations]: relations.md -[model-managers]: https://docs.djangoproject.com/en/dev/topics/db/managers/ +[model-managers]: https://docs.djangoproject.com/en/stable/topics/db/managers/ [encapsulation-blogpost]: http://www.dabapps.com/blog/django-models-and-encapsulation/ [django-rest-marshmallow]: http://tomchristie.github.io/django-rest-marshmallow/ [marshmallow]: https://marshmallow.readthedocs.io/en/latest/ diff --git a/docs/api-guide/testing.md b/docs/api-guide/testing.md index de79a1e2f..410f6d78a 100644 --- a/docs/api-guide/testing.md +++ b/docs/api-guide/testing.md @@ -373,6 +373,6 @@ For example, to add support for using `format='html'` in test requests, you migh } [cite]: http://jacobian.org/writing/django-apps-with-buildout/#s-create-a-test-wrapper -[client]: https://docs.djangoproject.com/en/dev/topics/testing/tools/#the-test-client -[requestfactory]: https://docs.djangoproject.com/en/dev/topics/testing/advanced/#django.test.client.RequestFactory +[client]: https://docs.djangoproject.com/en/stable/topics/testing/tools/#the-test-client +[requestfactory]: https://docs.djangoproject.com/en/stable/topics/testing/advanced/#django.test.client.RequestFactory [configuration]: #configuration diff --git a/docs/api-guide/throttling.md b/docs/api-guide/throttling.md index da4d5f725..2a6337e81 100644 --- a/docs/api-guide/throttling.md +++ b/docs/api-guide/throttling.md @@ -193,5 +193,5 @@ The following is an example of a rate throttle, that will randomly throttle 1 in [cite]: https://dev.twitter.com/docs/error-codes-responses [permissions]: permissions.md [identifing-clients]: http://oxpedia.org/wiki/index.php?title=AppSuite:Grizzly#Multiple_Proxies_in_front_of_the_cluster -[cache-setting]: https://docs.djangoproject.com/en/dev/ref/settings/#caches -[cache-docs]: https://docs.djangoproject.com/en/dev/topics/cache/#setting-up-the-cache +[cache-setting]: https://docs.djangoproject.com/en/stable/stable/settings/#caches +[cache-docs]: https://docs.djangoproject.com/en/stable/topics/cache/#setting-up-the-cache diff --git a/docs/api-guide/validators.md b/docs/api-guide/validators.md index e041e9072..0e58c6fff 100644 --- a/docs/api-guide/validators.md +++ b/docs/api-guide/validators.md @@ -300,4 +300,4 @@ In some advanced cases you might want a validator to be passed the serializer fi # In `__call__` we can then use that information to modify the validation behavior. self.is_update = serializer_field.parent.instance is not None -[cite]: https://docs.djangoproject.com/en/dev/ref/validators/ +[cite]: https://docs.djangoproject.com/en/stable/ref/validators/ diff --git a/docs/topics/2.2-announcement.md b/docs/topics/2.2-announcement.md index e6220f427..ca4ed2efa 100644 --- a/docs/topics/2.2-announcement.md +++ b/docs/topics/2.2-announcement.md @@ -147,10 +147,10 @@ When using a serializer with a `HyperlinkedRelatedField` or `HyperlinkedIdentity From version 2.2 onwards, serializers with hyperlinked relationships *always* require a `'request'` key to be supplied in the context dictionary. The implicit behavior will continue to function, but its use will raise a `PendingDeprecationWarning`. [xordoquy]: https://github.com/xordoquy -[django-python-3]: https://docs.djangoproject.com/en/dev/faq/install/#can-i-use-django-with-python-3 -[porting-python-3]: https://docs.djangoproject.com/en/dev/topics/python3/ -[python-compat]: https://docs.djangoproject.com/en/dev/releases/1.5/#python-compatibility -[django-deprecation-policy]: https://docs.djangoproject.com/en/dev/internals/release-process/#internal-release-deprecation-policy +[django-python-3]: https://docs.djangoproject.com/en/stable/faq/install/#can-i-use-django-with-python-3 +[porting-python-3]: https://docs.djangoproject.com/en/stable/topics/python3/ +[python-compat]: https://docs.djangoproject.com/en/stable/releases/1.5/#python-compatibility +[django-deprecation-policy]: https://docs.djangoproject.com/en/stable/internals/release-process/#internal-release-deprecation-policy [credits]: http://www.django-rest-framework.org/topics/credits [mailing-list]: https://groups.google.com/forum/?fromgroups#!forum/django-rest-framework [django-rest-framework-docs]: https://github.com/marcgibbons/django-rest-framework-docs diff --git a/docs/topics/2.4-announcement.md b/docs/topics/2.4-announcement.md index 3009daa49..96f68c865 100644 --- a/docs/topics/2.4-announcement.md +++ b/docs/topics/2.4-announcement.md @@ -162,7 +162,7 @@ The next planned release will be 3.0, featuring an improved and simplified seria Once again, many thanks to all the generous [backers and sponsors][kickstarter-sponsors] who've helped make this possible! -[lts-releases]: https://docs.djangoproject.com/en/dev/internals/release-process/#long-term-support-lts-releases +[lts-releases]: https://docs.djangoproject.com/en/stable/internals/release-process/#long-term-support-lts-releases [2-4-release-notes]: release-notes#240 [view-name-and-description-settings]: ../api-guide/settings#view-names-and-descriptions [client-ip-identification]: ../api-guide/throttling#how-clients-are-identified diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md index e6cbf7238..25ab4fd5b 100644 --- a/docs/topics/3.0-announcement.md +++ b/docs/topics/3.0-announcement.md @@ -870,7 +870,7 @@ The `COMPACT_JSON` setting has been added, and can be used to revert this behavi #### File fields as URLs -The `FileField` and `ImageField` classes are now represented as URLs by default. You should ensure you set Django's [standard `MEDIA_URL` setting](https://docs.djangoproject.com/en/dev/ref/settings/#std:setting-MEDIA_URL) appropriately, and ensure your application [serves the uploaded files](https://docs.djangoproject.com/en/dev/howto/static-files/#serving-uploaded-files-in-development). +The `FileField` and `ImageField` classes are now represented as URLs by default. You should ensure you set Django's [standard `MEDIA_URL` setting](https://docs.djangoproject.com/en/stable/ref/settings/#std:setting-MEDIA_URL) appropriately, and ensure your application [serves the uploaded files](https://docs.djangoproject.com/en/stable/howto/static-files/#serving-uploaded-files-in-development). You can revert this behavior, and display filenames in the representation by using the `UPLOADED_FILES_USE_URL` settings key: @@ -962,4 +962,4 @@ You can follow development on the GitHub site, where we use [milestones to indic [kickstarter]: http://kickstarter.com/projects/tomchristie/django-rest-framework-3 [sponsors]: http://www.django-rest-framework.org/topics/kickstarter-announcement/#sponsors [mixins.py]: https://github.com/tomchristie/django-rest-framework/blob/master/rest_framework/mixins.py -[django-localization]: https://docs.djangoproject.com/en/dev/topics/i18n/translation/#localization-how-to-create-language-files +[django-localization]: https://docs.djangoproject.com/en/stable/topics/i18n/translation/#localization-how-to-create-language-files diff --git a/docs/topics/ajax-csrf-cors.md b/docs/topics/ajax-csrf-cors.md index ad88810da..4960e0881 100644 --- a/docs/topics/ajax-csrf-cors.md +++ b/docs/topics/ajax-csrf-cors.md @@ -35,7 +35,7 @@ The best way to deal with CORS in REST framework is to add the required response [cite]: http://www.codinghorror.com/blog/2008/10/preventing-csrf-and-xsrf-attacks.html [csrf]: https://www.owasp.org/index.php/Cross-Site_Request_Forgery_(CSRF) -[csrf-ajax]: https://docs.djangoproject.com/en/dev/ref/csrf/#ajax +[csrf-ajax]: https://docs.djangoproject.com/en/stable/ref/csrf/#ajax [cors]: http://www.w3.org/TR/cors/ [ottoyiu]: https://github.com/ottoyiu/ [django-cors-headers]: https://github.com/ottoyiu/django-cors-headers/ diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index e5683360b..5628bcaec 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -598,7 +598,7 @@ For older release notes, [please see the version 2.x documentation][old-release- [cite]: http://www.catb.org/~esr/writings/cathedral-bazaar/cathedral-bazaar/ar01s04.html [deprecation-policy]: #deprecation-policy -[django-deprecation-policy]: https://docs.djangoproject.com/en/dev/internals/release-process/#internal-release-deprecation-policy +[django-deprecation-policy]: https://docs.djangoproject.com/en/stable/internals/release-process/#internal-release-deprecation-policy [defusedxml-announce]: http://blog.python.org/2013/02/announcing-defusedxml-fixes-for-xml.html [743]: https://github.com/tomchristie/django-rest-framework/pull/743 [staticfiles14]: https://docs.djangoproject.com/en/1.4/howto/static-files/#with-a-template-tag From 16f5d42cbc3e966ab2d4d8dc00163942f2769e43 Mon Sep 17 00:00:00 2001 From: Carlton Gibson Date: Thu, 1 Dec 2016 10:11:25 +0100 Subject: [PATCH 351/457] Add additional link to HTML & Forms topic page (#4726) Just makes the topic page easier to find. Closes #1673 --- docs/api-guide/renderers.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/api-guide/renderers.md b/docs/api-guide/renderers.md index 648eafdde..236504850 100644 --- a/docs/api-guide/renderers.md +++ b/docs/api-guide/renderers.md @@ -123,6 +123,8 @@ You can use `TemplateHTMLRenderer` either to return regular HTML pages using RES If you're building websites that use `TemplateHTMLRenderer` along with other renderer classes, you should consider listing `TemplateHTMLRenderer` as the first class in the `renderer_classes` list, so that it will be prioritised first even for browsers that send poorly formed `ACCEPT:` headers. +See the [_HTML & Forms_ Topic Page][html-and-forms] for further examples of `TemplateHTMLRenderer` usage. + **.media_type**: `text/html` **.format**: `'.html'` From 932d04a4beb79afa7a52bfec7f66bb6ccfe53814 Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Thu, 1 Dec 2016 22:17:36 +0600 Subject: [PATCH 352/457] Browsable API tests asserts to pytest (#4725) --- tests/browsable_api/test_browsable_api.py | 18 ++++++++++++------ .../browsable_api/test_browsable_nested_api.py | 8 ++++---- tests/browsable_api/test_form_rendering.py | 4 ++-- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/tests/browsable_api/test_browsable_api.py b/tests/browsable_api/test_browsable_api.py index 3d49c353b..684d7ae14 100644 --- a/tests/browsable_api/test_browsable_api.py +++ b/tests/browsable_api/test_browsable_api.py @@ -26,16 +26,19 @@ class DropdownWithAuthTests(TestCase): def test_name_shown_when_logged_in(self): self.client.login(username=self.username, password=self.password) response = self.client.get('/') - self.assertContains(response, 'john') + content = response.content.decode('utf8') + assert 'john' in content def test_logout_shown_when_logged_in(self): self.client.login(username=self.username, password=self.password) response = self.client.get('/') - self.assertContains(response, '>Log out<') + content = response.content.decode('utf8') + assert '>Log out<' in content def test_login_shown_when_logged_out(self): response = self.client.get('/') - self.assertContains(response, '>Log in<') + content = response.content.decode('utf8') + assert '>Log in<' in content @override_settings(ROOT_URLCONF='tests.browsable_api.no_auth_urls') @@ -58,13 +61,16 @@ class NoDropdownWithoutAuthTests(TestCase): def test_name_shown_when_logged_in(self): self.client.login(username=self.username, password=self.password) response = self.client.get('/') - self.assertContains(response, 'john') + content = response.content.decode('utf8') + assert 'john' in content def test_dropdown_not_shown_when_logged_in(self): self.client.login(username=self.username, password=self.password) response = self.client.get('/') - self.assertNotContains(response, '
  • ') + content = response.content.decode('utf8') + assert '
  • ' not in content def test_dropdown_not_shown_when_logged_out(self): response = self.client.get('/') - self.assertNotContains(response, '
  • ') + content = response.content.decode('utf8') + assert '
  • ' not in content diff --git a/tests/browsable_api/test_browsable_nested_api.py b/tests/browsable_api/test_browsable_nested_api.py index 9e5538efc..8f38b3c4e 100644 --- a/tests/browsable_api/test_browsable_nested_api.py +++ b/tests/browsable_api/test_browsable_nested_api.py @@ -35,8 +35,8 @@ class DropdownWithAuthTests(TestCase): @override_settings(ROOT_URLCONF='tests.browsable_api.test_browsable_nested_api') def test_login(self): response = self.client.get('/api/') - self.assertEqual(200, response.status_code) + assert 200 == response.status_code content = response.content.decode('utf-8') - self.assertIn('form action="/api/"', content) - self.assertIn('input name="nested.one"', content) - self.assertIn('input name="nested.two"', content) + assert 'form action="/api/"' in content + assert 'input name="nested.one"' in content + assert 'input name="nested.two"' in content diff --git a/tests/browsable_api/test_form_rendering.py b/tests/browsable_api/test_form_rendering.py index 8b79ab6ff..30e113db7 100644 --- a/tests/browsable_api/test_form_rendering.py +++ b/tests/browsable_api/test_form_rendering.py @@ -50,5 +50,5 @@ class TestManyPostView(TestCase): request = factory.post('/', data, format='json') with self.assertNumQueries(1): response = self.view(request).render() - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertEqual(len(response.data), 3) + assert response.status_code == status.HTTP_200_OK + assert len(response.data) == 3 From 238783f2edc8fa337117b8c24e8c303b124903c3 Mon Sep 17 00:00:00 2001 From: Raphael Pierzina Date: Fri, 2 Dec 2016 17:01:37 +0000 Subject: [PATCH 353/457] Change DEFAULT_PERMISSION_CLASSES to a list in quickstart.md (#4733) --- docs/tutorial/quickstart.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/tutorial/quickstart.md b/docs/tutorial/quickstart.md index 96fed2767..e8a4c8ef6 100644 --- a/docs/tutorial/quickstart.md +++ b/docs/tutorial/quickstart.md @@ -118,7 +118,9 @@ We'd also like to set a few global settings. We'd like to turn on pagination, a ) REST_FRAMEWORK = { - 'DEFAULT_PERMISSION_CLASSES': ('rest_framework.permissions.IsAdminUser',), + 'DEFAULT_PERMISSION_CLASSES': [ + 'rest_framework.permissions.IsAdminUser', + ], 'PAGE_SIZE': 10 } From 761d53e923ea1e58f226c513bcc8d8d5b39db324 Mon Sep 17 00:00:00 2001 From: Daniel Rech Date: Mon, 5 Dec 2016 11:36:03 +0100 Subject: [PATCH 354/457] Updated Link ti Django Docs The Url to the settings/#caches Link changed in Django documentation. --- docs/api-guide/throttling.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/throttling.md b/docs/api-guide/throttling.md index 2a6337e81..58578a23e 100644 --- a/docs/api-guide/throttling.md +++ b/docs/api-guide/throttling.md @@ -193,5 +193,5 @@ The following is an example of a rate throttle, that will randomly throttle 1 in [cite]: https://dev.twitter.com/docs/error-codes-responses [permissions]: permissions.md [identifing-clients]: http://oxpedia.org/wiki/index.php?title=AppSuite:Grizzly#Multiple_Proxies_in_front_of_the_cluster -[cache-setting]: https://docs.djangoproject.com/en/stable/stable/settings/#caches +[cache-setting]: https://docs.djangoproject.com/en/stable/ref/settings/#caches [cache-docs]: https://docs.djangoproject.com/en/stable/topics/cache/#setting-up-the-cache From 85807e195859d740be8f49b21aaa8b63d18ec0d0 Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Tue, 6 Dec 2016 00:33:13 +0600 Subject: [PATCH 355/457] converted authentication_test asserts to pytest --- tests/test_authentication.py | 69 ++++++++++++++++++------------------ 1 file changed, 34 insertions(+), 35 deletions(-) diff --git a/tests/test_authentication.py b/tests/test_authentication.py index 6f17ea14f..21d2583bf 100644 --- a/tests/test_authentication.py +++ b/tests/test_authentication.py @@ -106,7 +106,7 @@ class BasicAuthTests(TestCase): {'example': 'example'}, HTTP_AUTHORIZATION=auth ) - self.assertEqual(response.status_code, status.HTTP_200_OK) + assert response.status_code == status.HTTP_200_OK def test_post_json_passing_basic_auth(self): """Ensure POSTing form over basic auth with correct credentials passes and does not require CSRF""" @@ -121,7 +121,7 @@ class BasicAuthTests(TestCase): format='json', HTTP_AUTHORIZATION=auth ) - self.assertEqual(response.status_code, status.HTTP_200_OK) + assert response.status_code == status.HTTP_200_OK def test_regression_handle_bad_base64_basic_auth_header(self): """Ensure POSTing JSON over basic auth with incorrectly padded Base64 string is handled correctly""" @@ -134,12 +134,12 @@ class BasicAuthTests(TestCase): format='json', HTTP_AUTHORIZATION=auth ) - self.assertEqual(response.status_code, status.HTTP_401_UNAUTHORIZED) + assert response.status_code == status.HTTP_401_UNAUTHORIZED def test_post_form_failing_basic_auth(self): """Ensure POSTing form over basic auth without correct credentials fails""" response = self.csrf_client.post('/basic/', {'example': 'example'}) - self.assertEqual(response.status_code, status.HTTP_401_UNAUTHORIZED) + assert response.status_code == status.HTTP_401_UNAUTHORIZED def test_post_json_failing_basic_auth(self): """Ensure POSTing json over basic auth without correct credentials fails""" @@ -148,8 +148,8 @@ class BasicAuthTests(TestCase): {'example': 'example'}, format='json' ) - self.assertEqual(response.status_code, status.HTTP_401_UNAUTHORIZED) - self.assertEqual(response['WWW-Authenticate'], 'Basic realm="api"') + assert response.status_code == status.HTTP_401_UNAUTHORIZED + assert response['WWW-Authenticate'] == 'Basic realm="api"' @override_settings(ROOT_URLCONF='tests.test_authentication') @@ -175,9 +175,7 @@ class SessionAuthTests(TestCase): cf. [#1810](https://github.com/tomchristie/django-rest-framework/pull/1810) """ response = self.csrf_client.get('/auth/login/') - self.assertContains( - response, '' - ) + assert '' in response def test_post_form_session_auth_failing_csrf(self): """ @@ -185,7 +183,7 @@ class SessionAuthTests(TestCase): """ self.csrf_client.login(username=self.username, password=self.password) response = self.csrf_client.post('/session/', {'example': 'example'}) - self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN) + assert response.status_code == status.HTTP_403_FORBIDDEN def test_post_form_session_auth_passing(self): """ @@ -198,7 +196,7 @@ class SessionAuthTests(TestCase): response = self.non_csrf_client.post( '/session/', {'example': 'example'} ) - self.assertEqual(response.status_code, status.HTTP_200_OK) + assert response.status_code == status.HTTP_200_OK def test_put_form_session_auth_passing(self): """ @@ -211,14 +209,14 @@ class SessionAuthTests(TestCase): response = self.non_csrf_client.put( '/session/', {'example': 'example'} ) - self.assertEqual(response.status_code, status.HTTP_200_OK) + assert response.status_code == status.HTTP_200_OK def test_post_form_session_auth_failing(self): """ Ensure POSTing form over session authentication without logged in user fails. """ response = self.csrf_client.post('/session/', {'example': 'example'}) - self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN) + assert response.status_code == status.HTTP_403_FORBIDDEN class BaseTokenAuthTests(object): @@ -248,7 +246,7 @@ class BaseTokenAuthTests(object): response = self.csrf_client.post( self.path, {'example': 'example'}, HTTP_AUTHORIZATION=auth ) - self.assertEqual(response.status_code, status.HTTP_200_OK) + assert response.status_code == status.HTTP_200_OK def test_fail_post_form_passing_nonexistent_token_auth(self): # use a nonexistent token key @@ -256,7 +254,7 @@ class BaseTokenAuthTests(object): response = self.csrf_client.post( self.path, {'example': 'example'}, HTTP_AUTHORIZATION=auth ) - self.assertEqual(response.status_code, status.HTTP_401_UNAUTHORIZED) + assert response.status_code == status.HTTP_401_UNAUTHORIZED def test_fail_post_form_passing_invalid_token_auth(self): # add an 'invalid' unicode character @@ -264,7 +262,7 @@ class BaseTokenAuthTests(object): response = self.csrf_client.post( self.path, {'example': 'example'}, HTTP_AUTHORIZATION=auth ) - self.assertEqual(response.status_code, status.HTTP_401_UNAUTHORIZED) + assert response.status_code == status.HTTP_401_UNAUTHORIZED def test_post_json_passing_token_auth(self): """ @@ -276,7 +274,7 @@ class BaseTokenAuthTests(object): self.path, {'example': 'example'}, format='json', HTTP_AUTHORIZATION=auth ) - self.assertEqual(response.status_code, status.HTTP_200_OK) + assert response.status_code == status.HTTP_200_OK def test_post_json_makes_one_db_query(self): """ @@ -298,7 +296,7 @@ class BaseTokenAuthTests(object): Ensure POSTing form over token auth without correct credentials fails """ response = self.csrf_client.post(self.path, {'example': 'example'}) - self.assertEqual(response.status_code, status.HTTP_401_UNAUTHORIZED) + assert response.status_code == status.HTTP_401_UNAUTHORIZED def test_post_json_failing_token_auth(self): """ @@ -307,7 +305,7 @@ class BaseTokenAuthTests(object): response = self.csrf_client.post( self.path, {'example': 'example'}, format='json' ) - self.assertEqual(response.status_code, status.HTTP_401_UNAUTHORIZED) + assert response.status_code == status.HTTP_401_UNAUTHORIZED @override_settings(ROOT_URLCONF='tests.test_authentication') @@ -319,13 +317,13 @@ class TokenAuthTests(BaseTokenAuthTests, TestCase): """Ensure creating a token with no key will auto-assign a key""" self.token.delete() token = self.model.objects.create(user=self.user) - self.assertTrue(bool(token.key)) + assert bool(token.key) def test_generate_key_returns_string(self): """Ensure generate_key returns a string""" token = self.model() key = token.generate_key() - self.assertTrue(isinstance(key, six.string_types)) + assert isinstance(key, six.string_types) def test_token_login_json(self): """Ensure token login view using JSON POST works.""" @@ -335,8 +333,8 @@ class TokenAuthTests(BaseTokenAuthTests, TestCase): {'username': self.username, 'password': self.password}, format='json' ) - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertEqual(response.data['token'], self.key) + assert response.status_code == status.HTTP_200_OK + assert response.data['token'] == self.key def test_token_login_json_bad_creds(self): """ @@ -349,22 +347,24 @@ class TokenAuthTests(BaseTokenAuthTests, TestCase): {'username': self.username, 'password': "badpass"}, format='json' ) - self.assertEqual(response.status_code, 400) + assert response.status_code == 400 def test_token_login_json_missing_fields(self): """Ensure token login view using JSON POST fails if missing fields.""" client = APIClient(enforce_csrf_checks=True) response = client.post('/auth-token/', {'username': self.username}, format='json') - self.assertEqual(response.status_code, 400) + assert response.status_code == 400 def test_token_login_form(self): """Ensure token login view using form POST works.""" client = APIClient(enforce_csrf_checks=True) - response = client.post('/auth-token/', - {'username': self.username, 'password': self.password}) - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertEqual(response.data['token'], self.key) + response = client.post( + '/auth-token/', + {'username': self.username, 'password': self.password} + ) + assert response.status_code == status.HTTP_200_OK + assert response.data['token'] == self.key @override_settings(ROOT_URLCONF='tests.test_authentication') @@ -397,8 +397,8 @@ class IncorrectCredentialsTests(TestCase): permission_classes=() ) response = view(request) - self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN) - self.assertEqual(response.data, {'detail': 'Bad credentials'}) + assert response.status_code == status.HTTP_403_FORBIDDEN + assert response.data == {'detail': 'Bad credentials'} class FailingAuthAccessedInRenderer(TestCase): @@ -435,7 +435,7 @@ class FailingAuthAccessedInRenderer(TestCase): request = factory.get('/') response = self.view(request) content = response.render().content - self.assertEqual(content, b'not authenticated') + assert content == b'not authenticated' class NoAuthenticationClassesTests(TestCase): @@ -458,6 +458,5 @@ class NoAuthenticationClassesTests(TestCase): permission_classes=(DummyPermission,), ) response = view(request) - self.assertEqual(response.status_code, - status.HTTP_403_FORBIDDEN) - self.assertEqual(response.data, {'detail': 'Dummy permission message'}) + assert response.status_code == status.HTTP_403_FORBIDDEN + assert response.data == {'detail': 'Dummy permission message'} From 841a91e9504447b6d6dc7f5ec42ab428ccffdb3e Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Tue, 6 Dec 2016 00:47:58 +0600 Subject: [PATCH 356/457] fix authentication_test pytest failure --- tests/test_authentication.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/test_authentication.py b/tests/test_authentication.py index 21d2583bf..151fabad5 100644 --- a/tests/test_authentication.py +++ b/tests/test_authentication.py @@ -175,7 +175,8 @@ class SessionAuthTests(TestCase): cf. [#1810](https://github.com/tomchristie/django-rest-framework/pull/1810) """ response = self.csrf_client.get('/auth/login/') - assert '' in response + content = response.content.decode('utf8') + assert '' in content def test_post_form_session_auth_failing_csrf(self): """ From 38bde343f86cd77a08cb0b6620203a90edf59f09 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 9 Dec 2016 16:06:59 +0000 Subject: [PATCH 357/457] Update sponsor link --- README.md | 2 +- docs/index.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 155f8dead..7bf90ba6a 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ The initial aim is to provide a single full-time position on REST framework.

    - +

    diff --git a/docs/index.md b/docs/index.md index 9b0913f00..b035c4a7c 100644 --- a/docs/index.md +++ b/docs/index.md @@ -73,7 +73,7 @@ The initial aim is to provide a single full-time position on REST framework.
    From 89d22942a6f2c91ad02e56f9eb9dbe316fe8f985 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 12 Dec 2016 10:08:54 +0000 Subject: [PATCH 358/457] Add missing docs on RequestsClient. Closes #4747. --- docs/api-guide/testing.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/api-guide/testing.md b/docs/api-guide/testing.md index 410f6d78a..13c746017 100644 --- a/docs/api-guide/testing.md +++ b/docs/api-guide/testing.md @@ -205,7 +205,9 @@ Note that the requests client requires you to pass fully qualified URLs. ## `RequestsClient` and working with the database -The `RequestsClient` class is useful if +The `RequestsClient` class is useful if you want to write tests that solely interact with the service interface. This is a little stricter than using the standard Django test client, as it means that all interactions should be via the API. + +If you're using `RequestsClient` you'll want to ensure that test setup, and results assertions are performed as regular API calls, rather than interacting with the database models directly. For example, rather than checking that `Customer.objects.count() == 3` you would list the customers endpoint, and ensure that it contains three records. ## Headers & Authentication From 0175ea48090afaa727669ebcb01ce08b703d0acb Mon Sep 17 00:00:00 2001 From: Allard Hoeve Date: Wed, 14 Dec 2016 20:15:39 +0100 Subject: [PATCH 359/457] Add drf-oidc-auth to 3rd party mods --- docs/topics/third-party-resources.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/topics/third-party-resources.md b/docs/topics/third-party-resources.md index 1713da1a1..96dfed602 100644 --- a/docs/topics/third-party-resources.md +++ b/docs/topics/third-party-resources.md @@ -189,6 +189,7 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque * [djangorestframework-httpsignature][djangorestframework-httpsignature] - Provides an easy to use HTTP Signature Authentication mechanism. * [djoser][djoser] - Provides a set of views to handle basic actions such as registration, login, logout, password reset and account activation. * [django-rest-auth][django-rest-auth] - Provides a set of REST API endpoints for registration, authentication (including social media authentication), password reset, retrieve and update user details, etc. +* [drf-oidc-auth][drf-oidc-auth] - Implements OpenID Connect token authentication for DRF. ### Permissions @@ -365,3 +366,4 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque [medium-django-rest-framework]: https://medium.com/django-rest-framework [django-rest-framework-course]: https://teamtreehouse.com/library/django-rest-framework [drf_tweaks]: https://github.com/ArabellaTech/drf_tweaks +[drf-oidc-auth]: https://github.com/ByteInternet/drf-oidc-auth From ebe174c0d7cc15bf3024c4a73bf96493992941f6 Mon Sep 17 00:00:00 2001 From: Eduard Iskandarov Date: Thu, 15 Dec 2016 15:36:40 +0300 Subject: [PATCH 360/457] add per-view custom exception handler support (#4753) --- docs/api-guide/views.md | 2 ++ rest_framework/views.py | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/docs/api-guide/views.md b/docs/api-guide/views.md index 55f6664e0..c0c4f67e4 100644 --- a/docs/api-guide/views.md +++ b/docs/api-guide/views.md @@ -73,6 +73,8 @@ The following methods are used by REST framework to instantiate the various plug ### .get_content_negotiator(self) +### .get_exception_handler(self) + ## API policy implementation methods The following methods are called before dispatching to the handler method. diff --git a/rest_framework/views.py b/rest_framework/views.py index a8710c7a0..92911e8df 100644 --- a/rest_framework/views.py +++ b/rest_framework/views.py @@ -286,6 +286,12 @@ class APIView(View): self._negotiator = self.content_negotiation_class() return self._negotiator + def get_exception_handler(self): + """ + Returns the exception handler that this view uses. + """ + return api_settings.EXCEPTION_HANDLER + # API policy implementation methods def perform_content_negotiation(self, request, force=False): @@ -428,7 +434,7 @@ class APIView(View): else: exc.status_code = status.HTTP_403_FORBIDDEN - exception_handler = self.settings.EXCEPTION_HANDLER + exception_handler = self.get_exception_handler() context = self.get_exception_handler_context() response = exception_handler(exc, context) From c2367fb0179b18b00bb42c18f33874408e0952c4 Mon Sep 17 00:00:00 2001 From: Masashi SHIBATA Date: Sat, 17 Dec 2016 22:00:29 +0900 Subject: [PATCH 361/457] Fix documentation's sample code in API Guide (#4756) --- docs/api-guide/schemas.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/api-guide/schemas.md b/docs/api-guide/schemas.md index c89c100fe..95eb05a40 100644 --- a/docs/api-guide/schemas.md +++ b/docs/api-guide/schemas.md @@ -281,8 +281,8 @@ A generic view with sections in the class docstring, using single-line style. class UserList(generics.ListCreateAPIView): """ - get: Create a new user. - post: List all the users. + get: List all the users. + post: Create a new user. """ queryset = User.objects.all() serializer_class = UserSerializer From f38734ef981663a2eeb088625a6623ccf2f1ec42 Mon Sep 17 00:00:00 2001 From: Christian Hess Date: Tue, 20 Dec 2016 14:26:18 -0200 Subject: [PATCH 362/457] Add new line correctly in docstring sections (#4759) The order of the line break was wrong --- rest_framework/schemas.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/schemas.py b/rest_framework/schemas.py index 773df6261..44da83063 100644 --- a/rest_framework/schemas.py +++ b/rest_framework/schemas.py @@ -414,7 +414,7 @@ class SchemaGenerator(object): current_section, seperator, lead = line.partition(':') sections[current_section] = lead.strip() else: - sections[current_section] += line + '\n' + sections[current_section] += '\n' + line header = getattr(view, 'action', method.lower()) if header in sections: From 93fe531dea161c614ccabdcd9effc158e7c2b611 Mon Sep 17 00:00:00 2001 From: Matthew Medal Date: Tue, 20 Dec 2016 14:19:00 -0800 Subject: [PATCH 363/457] Breadcrumb view name suffix fix (#4750) * add failing testcase for breadcrumb suffixes missing when using ModelViewSets * fix get_breadcrumbs to honor overridden get_view_name and keep viewset suffixes * ensure suffixes are appended in breadcrumb util --- rest_framework/utils/breadcrumbs.py | 4 +++- tests/test_utils.py | 22 ++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/rest_framework/utils/breadcrumbs.py b/rest_framework/utils/breadcrumbs.py index 74f4f7840..e6e7e3cc3 100644 --- a/rest_framework/utils/breadcrumbs.py +++ b/rest_framework/utils/breadcrumbs.py @@ -28,7 +28,9 @@ def get_breadcrumbs(url, request=None): # Don't list the same view twice in a row. # Probably an optional trailing slash. if not seen or seen[-1] != view: - name = cls().get_view_name() + c = cls() + c.suffix = getattr(view, 'suffix', None) + name = c.get_view_name() insert_url = preserve_builtin_query_params(prefix + url, request) breadcrumbs_list.insert(0, (name, insert_url)) seen.append(view) diff --git a/tests/test_utils.py b/tests/test_utils.py index 23b0013b2..aec0b1ef6 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -7,8 +7,11 @@ from django.utils import six import rest_framework.utils.model_meta from rest_framework.compat import _resolve_model +from rest_framework.routers import SimpleRouter +from rest_framework.serializers import ModelSerializer from rest_framework.utils.breadcrumbs import get_breadcrumbs from rest_framework.views import APIView +from rest_framework.viewsets import ModelViewSet from tests.models import BasicModel @@ -37,6 +40,13 @@ class CustomNameResourceInstance(APIView): return "Foo" +class ResourceViewSet(ModelViewSet): + serializer_class = ModelSerializer + queryset = BasicModel.objects.all() + + +router = SimpleRouter() +router.register(r'resources', ResourceViewSet) urlpatterns = [ url(r'^$', Root.as_view()), url(r'^resource/$', ResourceRoot.as_view()), @@ -45,6 +55,7 @@ urlpatterns = [ url(r'^resource/(?P[0-9]+)/$', NestedResourceRoot.as_view()), url(r'^resource/(?P[0-9]+)/(?P[A-Za-z]+)$', NestedResourceInstance.as_view()), ] +urlpatterns += router.urls @override_settings(ROOT_URLCONF='tests.test_utils') @@ -123,6 +134,17 @@ class BreadcrumbTests(TestCase): [('Root', '/')] ) + def test_modelviewset_resource_instance_breadcrumbs(self): + url = '/resources/1/' + self.assertEqual( + get_breadcrumbs(url), + [ + ('Root', '/'), + ('Resource List', '/resources/'), + ('Resource Instance', '/resources/1/') + ] + ) + class ResolveModelTests(TestCase): """ From 24e082b14222fb20aea93eb2f51bb99be88c4455 Mon Sep 17 00:00:00 2001 From: Nik Nyby Date: Thu, 22 Dec 2016 12:44:43 -0500 Subject: [PATCH 364/457] docs: typo fix: it's -> its --- rest_framework/fields.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 13b5145ba..f68b5eaf3 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -1652,7 +1652,7 @@ class ReadOnlyField(Field): A read-only field that simply returns the field value. If the field is a method with no parameters, the method will be called - and it's return value used as the representation. + and its return value used as the representation. For example, the following would call `get_expiry_date()` on the object: From f1cbf51b43005724a26e15e8c2235dd9622b0b33 Mon Sep 17 00:00:00 2001 From: Emmanuelle Delescolle Date: Sun, 25 Dec 2016 10:06:47 +0100 Subject: [PATCH 365/457] Add drf-schema-adapter to 3rd party metadata mods --- docs/api-guide/metadata.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/docs/api-guide/metadata.md b/docs/api-guide/metadata.md index e12aeb7fd..e98a9a311 100644 --- a/docs/api-guide/metadata.md +++ b/docs/api-guide/metadata.md @@ -104,6 +104,18 @@ Then configure your settings to use this custom class: 'DEFAULT_METADATA_CLASS': 'myproject.apps.core.MinimalMetadata' } +# Third party packages + +The following third party packages provide additional metadata implementations. + +## DRF-schema-adapter + +[drf-schema-adapter][drf-schema-adapter] is a set of tools that makes it easier to provide schema information to frontend frameworks and libraries. It provides a metadata mixin as well as 2 metadata classes and several adapters suitable to generate [json-schema][json-schema] as well as schema information readable by various libraries. + +You can also write your own adapter to work with your specific frontend. +If you whish to do so, it also provides an exporter that can export those schema information to json files. + [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/ +[drf-schema-adapter]: https://github.com/drf-forms/drf-schema-adapter From d98a0772d0423b8f5f49b8198af72020fad2d570 Mon Sep 17 00:00:00 2001 From: Emmanuelle Delescolle Date: Sat, 31 Dec 2016 08:16:45 +0100 Subject: [PATCH 366/457] Add DRF-Base64 to third-party serializers Add DRF-Base64, which provides serializers to handle base64-encoded files, to third-party serializers packages --- docs/api-guide/serializers.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md index d36812f3f..1368f89a6 100644 --- a/docs/api-guide/serializers.md +++ b/docs/api-guide/serializers.md @@ -1116,6 +1116,10 @@ The [drf-dynamic-fields][drf-dynamic-fields] package provides a mixin to dynamic The [html-json-forms][html-json-forms] package provides an algorithm and serializer for processing `` submissions per the (inactive) [HTML JSON Form specification][json-form-spec]. The serializer facilitates processing of arbitrarily nested JSON structures within HTML. For example, `` will be interpreted as `{"items": [{"id": "5"}]}`. +## DRF-Base64 + +[DRF-Base64][drf-base64] provides a set of field and model serializers that handles the upload of base64-encoded files. + [cite]: https://groups.google.com/d/topic/django-users/sVFaOfQi4wY/discussion [relations]: relations.md [model-managers]: https://docs.djangoproject.com/en/stable/topics/db/managers/ @@ -1131,3 +1135,4 @@ The [html-json-forms][html-json-forms] package provides an algorithm and seriali [html-json-forms]: https://github.com/wq/html-json-forms [json-form-spec]: https://www.w3.org/TR/html-json-forms/ [drf-dynamic-fields]: https://github.com/dbrgn/drf-dynamic-fields +[drf-base64]: https://bitbucket.org/levit_scs/drf_base64 From 492444eb2e46bfbdb23546e67a73f7363cc88c94 Mon Sep 17 00:00:00 2001 From: robert Date: Mon, 2 Jan 2017 17:03:03 -0600 Subject: [PATCH 367/457] added drf-flexfields addon info --- docs/api-guide/serializers.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md index 1368f89a6..96063bd81 100644 --- a/docs/api-guide/serializers.md +++ b/docs/api-guide/serializers.md @@ -1112,6 +1112,10 @@ The [dynamic-rest][dynamic-rest] package extends the ModelSerializer and ModelVi The [drf-dynamic-fields][drf-dynamic-fields] package provides a mixin to dynamically limit the fields per serializer to a subset specified by an URL parameter. +## DRF FlexFields + +The [drf-flex-fields][drf-flex-fields] package extends the ModelSerializer and ModelViewSet to provide commonly used functionality for dynamically setting fields and expanding primitive fields to nested models, both from URL parameters and your serializer class definitions. + ## HTML JSON Forms The [html-json-forms][html-json-forms] package provides an algorithm and serializer for processing `` submissions per the (inactive) [HTML JSON Form specification][json-form-spec]. The serializer facilitates processing of arbitrarily nested JSON structures within HTML. For example, `` will be interpreted as `{"items": [{"id": "5"}]}`. @@ -1133,6 +1137,7 @@ The [html-json-forms][html-json-forms] package provides an algorithm and seriali [django-hstore]: https://github.com/djangonauts/django-hstore [dynamic-rest]: https://github.com/AltSchool/dynamic-rest [html-json-forms]: https://github.com/wq/html-json-forms +[drf-flex-fields]: https://github.com/rsinger86/drf-flex-fields [json-form-spec]: https://www.w3.org/TR/html-json-forms/ [drf-dynamic-fields]: https://github.com/dbrgn/drf-dynamic-fields [drf-base64]: https://bitbucket.org/levit_scs/drf_base64 From 69366a11d721fd5f43dda6226cf33d83eabb4db4 Mon Sep 17 00:00:00 2001 From: Makedonsky Date: Tue, 3 Jan 2017 13:17:07 +0200 Subject: [PATCH 368/457] modify documenting-your-api docs topic --- docs/topics/documenting-your-api.md | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/docs/topics/documenting-your-api.md b/docs/topics/documenting-your-api.md index e7d2cde0c..38f365d7d 100644 --- a/docs/topics/documenting-your-api.md +++ b/docs/topics/documenting-your-api.md @@ -38,6 +38,34 @@ Both this package and DRF docs are fully documented, well supported, and come hi --- +### DRF AutoDocs + +Oleksander Mashianovs' [DRF Auto Docs][drfautodocs-repo] automated api renderer. + +Collects almost all the code you written into documentation effortlessly. + +Supports: + + * functional view docs + * tree-like structure + * Docstrings: + * markdown + * preserve space & newlines + * formatting with nice syntax + * Fields: + * choices rendering + * help_text (to specify SerializerMethodField output, etc) + * smart read_only/required rendering + * Endpoint properties: + * filter_backends + * authentication_classes + * permission_classes + * extra url params(GET params) + +![whole structure](http://joxi.ru/52aBGNI4k3oyA0.jpg) + +--- + #### Apiary There are various other online tools and services for providing API documentation. One notable service is [Apiary][apiary]. With Apiary, you describe your API using a simple markdown-like syntax. The generated documentation includes API interaction, a mock server for testing & prototyping, and various other tools. @@ -109,6 +137,7 @@ To implement a hypermedia API you'll need to decide on an appropriate media type [drfdocs-repo]: https://github.com/ekonstantinidis/django-rest-framework-docs [drfdocs-website]: http://www.drfdocs.com/ [drfdocs-demo]: http://demo.drfdocs.com/ +[drfautodocs-repo]: https://github.com/iMakedonsky/drf-autodocs [django-rest-swagger]: https://github.com/marcgibbons/django-rest-swagger [swagger]: https://developers.helloreverb.com/swagger/ [rest-framework-docs]: https://github.com/marcgibbons/django-rest-framework-docs From 11fd3bf1085e51f1b753953a495a6ba8aa1b5421 Mon Sep 17 00:00:00 2001 From: Ryan P Kilby Date: Tue, 3 Jan 2017 16:14:19 -0500 Subject: [PATCH 369/457] Add disabling of declared fields on serializer subclasses (#4764) * Add test for disabling declared fields on child * Check that declared base field is not in attrs * Update meta inheritance docs to include serializer * Test that meta fields cannot be declared as None * Add docs example for declarative field disabling --- docs/api-guide/serializers.md | 44 +++++++++++++++++++++++++++-------- rest_framework/serializers.py | 6 ++++- tests/test_serializer.py | 41 ++++++++++++++++++++++++++++++++ 3 files changed, 80 insertions(+), 11 deletions(-) diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md index 96063bd81..dd4ea8a90 100644 --- a/docs/api-guide/serializers.md +++ b/docs/api-guide/serializers.md @@ -578,16 +578,6 @@ Alternative representations include serializing using hyperlinks, serializing co For full details see the [serializer relations][relations] documentation. -## Inheritance of the 'Meta' class - -The inner `Meta` class on serializers is not inherited from parent classes by default. This is the same behavior as with Django's `Model` and `ModelForm` classes. If you want the `Meta` class to inherit from a parent class you must do so explicitly. For example: - - class AccountSerializer(MyBaseSerializer): - class Meta(MyBaseSerializer.Meta): - model = Account - -Typically we would recommend *not* using inheritance on inner Meta classes, but instead declaring all options explicitly. - ## Customizing field mappings 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. @@ -1025,6 +1015,40 @@ If any of the validation fails, then the method should raise a `serializers.Vali The `data` argument passed to this method will normally be the value of `request.data`, so the datatype it provides will depend on the parser classes you have configured for your API. +## Serializer Inheritance + +Similar to Django forms, you can extend and reuse serializers through inheritance. This allows you to declare a common set of fields or methods on a parent class that can then be used in a number of serializers. For example, + + class MyBaseSerializer(Serializer): + my_field = serializers.CharField() + + def validate_my_field(self): + ... + + class MySerializer(MyBaseSerializer): + ... + +Like Django's `Model` and `ModelForm` classes, the inner `Meta` class on serializers does not implicitly inherit from it's parents' inner `Meta` classes. If you want the `Meta` class to inherit from a parent class you must do so explicitly. For example: + + class AccountSerializer(MyBaseSerializer): + class Meta(MyBaseSerializer.Meta): + model = Account + +Typically we would recommend *not* using inheritance on inner Meta classes, but instead declaring all options explicitly. + +Additionally, the following caveats apply to serializer inheritance: + +* Normal Python name resolution rules apply. If you have multiple base classes that declare a `Meta` inner class, only the first one will be used. This means the child’s `Meta`, if it exists, otherwise the `Meta` of the first parent, etc. +* It’s possible to declaratively remove a `Field` inherited from a parent class by setting the name to be `None` on the subclass. + + class MyBaseSerializer(ModelSerializer): + my_field = serializers.CharField() + + class MySerializer(MyBaseSerializer): + my_field = None + + However, you can only use this technique to opt out from a field defined declaratively by a parent class; it won’t prevent the `ModelSerializer` from generating a default field. To opt-out from default fields, see [Specifying which fields to include](#specifying-which-fields-to-include). + ## Dynamically modifying fields Once a serializer has been initialized, the dictionary of fields that are set on the serializer may be accessed using the `.fields` attribute. Accessing and modifying this attribute allows you to dynamically modify the serializer. diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 02c24b70e..3556447bb 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -305,7 +305,11 @@ class SerializerMetaclass(type): # in order to maintain the correct order of fields. for base in reversed(bases): if hasattr(base, '_declared_fields'): - fields = list(base._declared_fields.items()) + fields + fields = [ + (field_name, obj) for field_name, obj + in base._declared_fields.items() + if field_name not in attrs + ] + fields return OrderedDict(fields) diff --git a/tests/test_serializer.py b/tests/test_serializer.py index 8c8b5b163..47258fdd1 100644 --- a/tests/test_serializer.py +++ b/tests/test_serializer.py @@ -7,6 +7,8 @@ import re import pytest +from django.db import models + from rest_framework import fields, relations, serializers from rest_framework.compat import unicode_repr from rest_framework.fields import Field @@ -413,3 +415,42 @@ class Test4606Regression: serializer = self.Serializer(data=[{"name": "liz"}], many=True) with pytest.raises(serializers.ValidationError): serializer.is_valid(raise_exception=True) + + +class TestDeclaredFieldInheritance: + def test_declared_field_disabling(self): + class Parent(serializers.Serializer): + f1 = serializers.CharField() + f2 = serializers.CharField() + + class Child(Parent): + f1 = None + + class Grandchild(Child): + pass + + assert len(Parent._declared_fields) == 2 + assert len(Child._declared_fields) == 1 + assert len(Grandchild._declared_fields) == 1 + + def test_meta_field_disabling(self): + # Declaratively setting a field on a child class will *not* prevent + # the ModelSerializer from generating a default field. + class MyModel(models.Model): + f1 = models.CharField(max_length=10) + f2 = models.CharField(max_length=10) + + class Parent(serializers.ModelSerializer): + class Meta: + model = MyModel + fields = ['f1', 'f2'] + + class Child(Parent): + f1 = None + + class Grandchild(Child): + pass + + assert len(Parent().get_fields()) == 2 + assert len(Child().get_fields()) == 2 + assert len(Grandchild().get_fields()) == 2 From eddc34f4c81e1a0d188356c0d3d81f482a37f367 Mon Sep 17 00:00:00 2001 From: Ian Clark Date: Wed, 4 Jan 2017 08:40:42 +0000 Subject: [PATCH 370/457] Add Serializer Extensions documentation (#4777) --- docs/api-guide/serializers.md | 8 ++++++++ docs/topics/third-party-resources.md | 5 ++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md index dd4ea8a90..b5aa78875 100644 --- a/docs/api-guide/serializers.md +++ b/docs/api-guide/serializers.md @@ -1140,6 +1140,13 @@ The [drf-dynamic-fields][drf-dynamic-fields] package provides a mixin to dynamic The [drf-flex-fields][drf-flex-fields] package extends the ModelSerializer and ModelViewSet to provide commonly used functionality for dynamically setting fields and expanding primitive fields to nested models, both from URL parameters and your serializer class definitions. +## Serializer Extensions + +The [django-rest-framework-serializer-extensions][drf-serializer-extensions] +package provides a collection of tools to DRY up your serializers, by allowing +fields to be defined on a per-view/request basis. Fields can be whitelisted, +blacklisted and child serializers can be optionally expanded. + ## HTML JSON Forms The [html-json-forms][html-json-forms] package provides an algorithm and serializer for processing `` submissions per the (inactive) [HTML JSON Form specification][json-form-spec]. The serializer facilitates processing of arbitrarily nested JSON structures within HTML. For example, `` will be interpreted as `{"items": [{"id": "5"}]}`. @@ -1165,3 +1172,4 @@ The [html-json-forms][html-json-forms] package provides an algorithm and seriali [json-form-spec]: https://www.w3.org/TR/html-json-forms/ [drf-dynamic-fields]: https://github.com/dbrgn/drf-dynamic-fields [drf-base64]: https://bitbucket.org/levit_scs/drf_base64 +[drf-serializer-extensions]: https://github.com/evenicoulddoit/django-rest-framework-serializer-extensions diff --git a/docs/topics/third-party-resources.md b/docs/topics/third-party-resources.md index 96dfed602..462bd922a 100644 --- a/docs/topics/third-party-resources.md +++ b/docs/topics/third-party-resources.md @@ -204,7 +204,9 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque * [djangorestframework-gis][djangorestframework-gis] - Geographic add-ons * [djangorestframework-hstore][djangorestframework-hstore] - Serializer class to support django-hstore DictionaryField model field and its schema-mode feature. * [djangorestframework-jsonapi][djangorestframework-jsonapi] - Provides a parser, renderer, serializers, and other tools to help build an API that is compliant with the jsonapi.org spec. -* [html-json-forms][html-json-forms]: Provides an algorithm and serializer to process HTML JSON Form submissions per the (inactive) spec. +* [html-json-forms][html-json-forms] - Provides an algorithm and serializer to process HTML JSON Form submissions per the (inactive) spec. +* [django-rest-framework-serializer-extensions][drf-serializer-extensions] - + Enables black/whitelisting fields, and conditionally expanding child serializers on a per-view/request basis. ### Serializer fields @@ -367,3 +369,4 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque [django-rest-framework-course]: https://teamtreehouse.com/library/django-rest-framework [drf_tweaks]: https://github.com/ArabellaTech/drf_tweaks [drf-oidc-auth]: https://github.com/ByteInternet/drf-oidc-auth +[drf-serializer-extensions]: https://github.com/evenicoulddoit/django-rest-framework-serializer-extensions From 7874bcabe99a321a9f20377d8540c3433f5f79b5 Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Wed, 4 Jan 2017 15:13:32 +0600 Subject: [PATCH 371/457] convert some more test asserts to pytest (#4778) * converted urlpatterns test asserts to pytest * converted test utils asserts to pytest * removed extra newlines --- tests/test_urlpatterns.py | 4 +- tests/test_utils.py | 97 +++++++++++++++------------------------ 2 files changed, 38 insertions(+), 63 deletions(-) diff --git a/tests/test_urlpatterns.py b/tests/test_urlpatterns.py index 33d367e1d..7d5aecfe5 100644 --- a/tests/test_urlpatterns.py +++ b/tests/test_urlpatterns.py @@ -35,8 +35,8 @@ class FormatSuffixTests(TestCase): callback, callback_args, callback_kwargs = resolver.resolve(request.path_info) except Exception: self.fail("Failed to resolve URL: %s" % request.path_info) - self.assertEqual(callback_args, test_path.args) - self.assertEqual(callback_kwargs, test_path.kwargs) + assert callback_args == test_path.args + assert callback_kwargs == test_path.kwargs def test_trailing_slash(self): factory = APIRequestFactory() diff --git a/tests/test_utils.py b/tests/test_utils.py index aec0b1ef6..11c9e9bb0 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -65,85 +65,60 @@ class BreadcrumbTests(TestCase): """ def test_root_breadcrumbs(self): url = '/' - self.assertEqual( - get_breadcrumbs(url), - [('Root', '/')] - ) + assert get_breadcrumbs(url) == [('Root', '/')] def test_resource_root_breadcrumbs(self): url = '/resource/' - self.assertEqual( - get_breadcrumbs(url), - [ - ('Root', '/'), - ('Resource Root', '/resource/') - ] - ) + assert get_breadcrumbs(url) == [ + ('Root', '/'), ('Resource Root', '/resource/') + ] def test_resource_instance_breadcrumbs(self): url = '/resource/123' - self.assertEqual( - get_breadcrumbs(url), - [ - ('Root', '/'), - ('Resource Root', '/resource/'), - ('Resource Instance', '/resource/123') - ] - ) + assert get_breadcrumbs(url) == [ + ('Root', '/'), + ('Resource Root', '/resource/'), + ('Resource Instance', '/resource/123') + ] def test_resource_instance_customname_breadcrumbs(self): url = '/resource/customname' - self.assertEqual( - get_breadcrumbs(url), - [ - ('Root', '/'), - ('Resource Root', '/resource/'), - ('Foo', '/resource/customname') - ] - ) + assert get_breadcrumbs(url) == [ + ('Root', '/'), + ('Resource Root', '/resource/'), + ('Foo', '/resource/customname') + ] def test_nested_resource_breadcrumbs(self): url = '/resource/123/' - self.assertEqual( - get_breadcrumbs(url), - [ - ('Root', '/'), - ('Resource Root', '/resource/'), - ('Resource Instance', '/resource/123'), - ('Nested Resource Root', '/resource/123/') - ] - ) + assert get_breadcrumbs(url) == [ + ('Root', '/'), + ('Resource Root', '/resource/'), + ('Resource Instance', '/resource/123'), + ('Nested Resource Root', '/resource/123/') + ] def test_nested_resource_instance_breadcrumbs(self): url = '/resource/123/abc' - self.assertEqual( - get_breadcrumbs(url), - [ - ('Root', '/'), - ('Resource Root', '/resource/'), - ('Resource Instance', '/resource/123'), - ('Nested Resource Root', '/resource/123/'), - ('Nested Resource Instance', '/resource/123/abc') - ] - ) + assert get_breadcrumbs(url) == [ + ('Root', '/'), + ('Resource Root', '/resource/'), + ('Resource Instance', '/resource/123'), + ('Nested Resource Root', '/resource/123/'), + ('Nested Resource Instance', '/resource/123/abc') + ] def test_broken_url_breadcrumbs_handled_gracefully(self): url = '/foobar' - self.assertEqual( - get_breadcrumbs(url), - [('Root', '/')] - ) + assert get_breadcrumbs(url) == [('Root', '/')] def test_modelviewset_resource_instance_breadcrumbs(self): url = '/resources/1/' - self.assertEqual( - get_breadcrumbs(url), - [ - ('Root', '/'), - ('Resource List', '/resources/'), - ('Resource Instance', '/resources/1/') - ] - ) + assert get_breadcrumbs(url) == [ + ('Root', '/'), + ('Resource List', '/resources/'), + ('Resource Instance', '/resources/1/') + ] class ResolveModelTests(TestCase): @@ -154,15 +129,15 @@ class ResolveModelTests(TestCase): """ def test_resolve_django_model(self): resolved_model = _resolve_model(BasicModel) - self.assertEqual(resolved_model, BasicModel) + assert resolved_model == BasicModel def test_resolve_string_representation(self): resolved_model = _resolve_model('tests.BasicModel') - self.assertEqual(resolved_model, BasicModel) + assert resolved_model == BasicModel def test_resolve_unicode_representation(self): resolved_model = _resolve_model(six.text_type('tests.BasicModel')) - self.assertEqual(resolved_model, BasicModel) + assert resolved_model == BasicModel def test_resolve_non_django_model(self): with self.assertRaises(ValueError): From a7d33f45193fdef669060d8ba1045a5fa10daeae Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Wed, 4 Jan 2017 15:59:21 +0600 Subject: [PATCH 372/457] conerted throttling tests asserts to pytest --- tests/test_throttling.py | 51 ++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/tests/test_throttling.py b/tests/test_throttling.py index 6d8d05a32..8d256ac92 100644 --- a/tests/test_throttling.py +++ b/tests/test_throttling.py @@ -70,7 +70,7 @@ class ThrottlingTests(TestCase): request = self.factory.get('/') for dummy in range(4): response = MockView.as_view()(request) - self.assertEqual(429, response.status_code) + assert response.status_code == 429 def set_throttle_timer(self, view, value): """ @@ -87,13 +87,13 @@ class ThrottlingTests(TestCase): request = self.factory.get('/') for dummy in range(4): response = MockView.as_view()(request) - self.assertEqual(429, response.status_code) + assert response.status_code == 429 # Advance the timer by one second self.set_throttle_timer(MockView, 1) response = MockView.as_view()(request) - self.assertEqual(200, response.status_code) + assert response.status_code == 200 def ensure_is_throttled(self, view, expect): request = self.factory.get('/') @@ -102,7 +102,7 @@ class ThrottlingTests(TestCase): view.as_view()(request) request.user = User.objects.create(username='b') response = view.as_view()(request) - self.assertEqual(expect, response.status_code) + assert response.status_code == expect def test_request_throttling_is_per_user(self): """ @@ -121,9 +121,9 @@ class ThrottlingTests(TestCase): self.set_throttle_timer(view, timer) response = view.as_view()(request) if expect is not None: - self.assertEqual(response['Retry-After'], expect) + assert response['Retry-After'] == expect else: - self.assertFalse('Retry-After' in response) + assert not'Retry-After' in response def test_seconds_fields(self): """ @@ -230,56 +230,55 @@ class ScopedRateThrottleTests(TestCase): # Should be able to hit x view 3 times per minute. response = self.x_view(request) - self.assertEqual(200, response.status_code) + assert response.status_code == 200 self.increment_timer() response = self.x_view(request) - self.assertEqual(200, response.status_code) + assert response.status_code == 200 self.increment_timer() response = self.x_view(request) - self.assertEqual(200, response.status_code) - + assert response.status_code == 200 self.increment_timer() response = self.x_view(request) - self.assertEqual(429, response.status_code) + assert response.status_code == 429 # Should be able to hit y view 1 time per minute. self.increment_timer() response = self.y_view(request) - self.assertEqual(200, response.status_code) + assert response.status_code == 200 self.increment_timer() response = self.y_view(request) - self.assertEqual(429, response.status_code) + assert response.status_code == 429 # Ensure throttles properly reset by advancing the rest of the minute self.increment_timer(55) # Should still be able to hit x view 3 times per minute. response = self.x_view(request) - self.assertEqual(200, response.status_code) + assert response.status_code == 200 self.increment_timer() response = self.x_view(request) - self.assertEqual(200, response.status_code) + assert response.status_code == 200 self.increment_timer() response = self.x_view(request) - self.assertEqual(200, response.status_code) + assert response.status_code == 200 self.increment_timer() response = self.x_view(request) - self.assertEqual(429, response.status_code) + assert response.status_code == 429 # Should still be able to hit y view 1 time per minute. self.increment_timer() response = self.y_view(request) - self.assertEqual(200, response.status_code) + assert response.status_code == 200 self.increment_timer() response = self.y_view(request) - self.assertEqual(429, response.status_code) + assert response.status_code == 429 def test_unscoped_view_not_throttled(self): request = self.factory.get('/') @@ -287,7 +286,7 @@ class ScopedRateThrottleTests(TestCase): for idx in range(10): self.increment_timer() response = self.unscoped_view(request) - self.assertEqual(200, response.status_code) + assert response.status_code == 200 class XffTestingBase(TestCase): @@ -321,12 +320,12 @@ class XffTestingBase(TestCase): class IdWithXffBasicTests(XffTestingBase): def test_accepts_request_under_limit(self): self.config_proxy(0) - self.assertEqual(200, self.view(self.request).status_code) + assert self.view(self.request).status_code == 200 def test_denies_request_over_limit(self): self.config_proxy(0) self.view(self.request) - self.assertEqual(429, self.view(self.request).status_code) + assert self.view(self.request).status_code == 429 class XffSpoofingTests(XffTestingBase): @@ -334,13 +333,13 @@ class XffSpoofingTests(XffTestingBase): self.config_proxy(1) self.view(self.request) self.request.META['HTTP_X_FORWARDED_FOR'] = '4.4.4.4, 5.5.5.5, 2.2.2.2' - self.assertEqual(429, self.view(self.request).status_code) + assert self.view(self.request).status_code == 429 def test_xff_spoofing_doesnt_change_machine_id_with_two_app_proxies(self): self.config_proxy(2) self.view(self.request) self.request.META['HTTP_X_FORWARDED_FOR'] = '4.4.4.4, 1.1.1.1, 2.2.2.2' - self.assertEqual(429, self.view(self.request).status_code) + assert self.view(self.request).status_code == 429 class XffUniqueMachinesTest(XffTestingBase): @@ -348,10 +347,10 @@ class XffUniqueMachinesTest(XffTestingBase): self.config_proxy(1) self.view(self.request) self.request.META['HTTP_X_FORWARDED_FOR'] = '0.0.0.0, 1.1.1.1, 7.7.7.7' - self.assertEqual(200, self.view(self.request).status_code) + assert self.view(self.request).status_code == 200 def test_unique_clients_are_counted_independently_with_two_proxies(self): self.config_proxy(2) self.view(self.request) self.request.META['HTTP_X_FORWARDED_FOR'] = '0.0.0.0, 7.7.7.7, 2.2.2.2' - self.assertEqual(200, self.view(self.request).status_code) + assert self.view(self.request).status_code == 200 From 8fa5846e513247ba90ce95a31587e3592e8aab30 Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Wed, 4 Jan 2017 17:46:55 +0600 Subject: [PATCH 373/457] conerted multi-table-inheritence test asserts to pytest --- tests/test_multitable_inheritance.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tests/test_multitable_inheritance.py b/tests/test_multitable_inheritance.py index 611333aa8..a63e07fac 100644 --- a/tests/test_multitable_inheritance.py +++ b/tests/test_multitable_inheritance.py @@ -44,8 +44,7 @@ class InheritedModelSerializationTests(TestCase): """ child = ChildModel(name1='parent name', name2='child name') serializer = DerivedModelSerializer(child) - self.assertEqual(set(serializer.data.keys()), - set(['name1', 'name2', 'id'])) + assert set(serializer.data.keys()) == set(['name1', 'name2', 'id']) def test_onetoone_primary_key_model_fields_as_expected(self): """ @@ -55,8 +54,7 @@ class InheritedModelSerializationTests(TestCase): parent = ParentModel.objects.create(name1='parent name') associate = AssociatedModel.objects.create(name='hello', ref=parent) serializer = AssociatedModelSerializer(associate) - self.assertEqual(set(serializer.data.keys()), - set(['name', 'ref'])) + assert set(serializer.data.keys()) == set(['name', 'ref']) def test_data_is_valid_without_parent_ptr(self): """ @@ -68,4 +66,5 @@ class InheritedModelSerializationTests(TestCase): 'name2': 'child name', } serializer = DerivedModelSerializer(data=data) - self.assertEqual(serializer.is_valid(), True) + assert serializer.is_valid() is True + From 43677b8baf279367bbf27a1544c7423cc2db9dee Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Wed, 4 Jan 2017 17:54:14 +0600 Subject: [PATCH 374/457] flake8 fix --- tests/test_multitable_inheritance.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/test_multitable_inheritance.py b/tests/test_multitable_inheritance.py index a63e07fac..2aacbc348 100644 --- a/tests/test_multitable_inheritance.py +++ b/tests/test_multitable_inheritance.py @@ -67,4 +67,3 @@ class InheritedModelSerializationTests(TestCase): } serializer = DerivedModelSerializer(data=data) assert serializer.is_valid() is True - From 88a910ebc85e191ace1f520d85645515ec5cb66c Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Wed, 4 Jan 2017 18:58:01 +0600 Subject: [PATCH 375/457] converted negotiation tests asserts to pytest --- tests/test_negotiation.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/test_negotiation.py b/tests/test_negotiation.py index 96ef83eab..6b8fd5060 100644 --- a/tests/test_negotiation.py +++ b/tests/test_negotiation.py @@ -38,20 +38,20 @@ class TestAcceptedMediaType(TestCase): def test_client_without_accept_use_renderer(self): request = Request(factory.get('/')) accepted_renderer, accepted_media_type = self.select_renderer(request) - self.assertEqual(accepted_media_type, 'application/json') + assert accepted_media_type == 'application/json' def test_client_underspecifies_accept_use_renderer(self): request = Request(factory.get('/', HTTP_ACCEPT='*/*')) accepted_renderer, accepted_media_type = self.select_renderer(request) - self.assertEqual(accepted_media_type, 'application/json') + assert accepted_media_type == 'application/json' def test_client_overspecifies_accept_use_client(self): request = Request(factory.get('/', HTTP_ACCEPT='application/json; indent=8')) accepted_renderer, accepted_media_type = self.select_renderer(request) - self.assertEqual(accepted_media_type, 'application/json; indent=8') + assert accepted_media_type == 'application/json; indent=8' def test_client_specifies_parameter(self): request = Request(factory.get('/', HTTP_ACCEPT='application/openapi+json;version=2.0')) accepted_renderer, accepted_media_type = self.select_renderer(request) - self.assertEqual(accepted_media_type, 'application/openapi+json;version=2.0') - self.assertEqual(accepted_renderer.format, 'swagger') + assert accepted_media_type == 'application/openapi+json;version=2.0' + assert accepted_renderer.format == 'swagger' From cd6acfcfcf0c7a4e2777d1c79ce59162070f44ba Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Thu, 5 Jan 2017 16:30:04 +0600 Subject: [PATCH 376/457] updated django minor versions --- tox.ini | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tox.ini b/tox.ini index e89274661..81531dc71 100644 --- a/tox.ini +++ b/tox.ini @@ -15,9 +15,9 @@ setenv = PYTHONDONTWRITEBYTECODE=1 PYTHONWARNINGS=once deps = - django18: Django==1.8.16 - django19: Django==1.9.11 - django110: Django==1.10.3 + django18: Django==1.8.17 + django19: Django==1.9.12 + django110: Django==1.10.5 djangomaster: https://github.com/django/django/archive/master.tar.gz -rrequirements/requirements-testing.txt -rrequirements/requirements-optionals.txt From 7ef6e967251bc36f234099e3498a901ab70ef178 Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Thu, 5 Jan 2017 11:14:57 +0000 Subject: [PATCH 377/457] Fixes documentation. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Django==1.8.17 chokes on this unless it’s just `snippets`. --- docs/tutorial/1-serialization.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/tutorial/1-serialization.md b/docs/tutorial/1-serialization.md index 04fb6914a..d7d6bafba 100644 --- a/docs/tutorial/1-serialization.md +++ b/docs/tutorial/1-serialization.md @@ -45,7 +45,7 @@ We'll need to add our new `snippets` app and the `rest_framework` app to `INSTAL INSTALLED_APPS = ( ... 'rest_framework', - 'snippets.apps.SnippetsConfig', + 'snippets', ) Okay, we're ready to roll. From eed8f5bb4269a29017380a57eec18dcc14c2756c Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Thu, 5 Jan 2017 12:06:08 +0000 Subject: [PATCH 378/457] Fixes comment from @xordoquy. --- docs/tutorial/1-serialization.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/tutorial/1-serialization.md b/docs/tutorial/1-serialization.md index d7d6bafba..710dfb8e7 100644 --- a/docs/tutorial/1-serialization.md +++ b/docs/tutorial/1-serialization.md @@ -45,9 +45,11 @@ We'll need to add our new `snippets` app and the `rest_framework` app to `INSTAL INSTALLED_APPS = ( ... 'rest_framework', - 'snippets', + 'snippets.apps.SnippetsConfig', ) +Please note that if you're using Django <1.9, you need to replace `snippets.apps.SnippetsConfig` with `snippets`. + Okay, we're ready to roll. ## Creating a model to work with From 718764f591aba99e2cabcc56a8d8c88a8feac949 Mon Sep 17 00:00:00 2001 From: wim glenn Date: Fri, 6 Jan 2017 00:40:50 -0600 Subject: [PATCH 379/457] add links to djangorestframework-queryfields to docs (#4786) --- docs/api-guide/serializers.md | 6 ++++++ docs/topics/third-party-resources.md | 2 ++ 2 files changed, 8 insertions(+) diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md index b5aa78875..15e92ee72 100644 --- a/docs/api-guide/serializers.md +++ b/docs/api-guide/serializers.md @@ -1155,6 +1155,11 @@ The [html-json-forms][html-json-forms] package provides an algorithm and seriali [DRF-Base64][drf-base64] provides a set of field and model serializers that handles the upload of base64-encoded files. +## QueryFields + +[djangorestframework-queryfields][djangorestframework-queryfields] allows API clients to specify which fields will be sent in the response via inclusion or exclusion query paramaters. + + [cite]: https://groups.google.com/d/topic/django-users/sVFaOfQi4wY/discussion [relations]: relations.md [model-managers]: https://docs.djangoproject.com/en/stable/topics/db/managers/ @@ -1173,3 +1178,4 @@ The [html-json-forms][html-json-forms] package provides an algorithm and seriali [drf-dynamic-fields]: https://github.com/dbrgn/drf-dynamic-fields [drf-base64]: https://bitbucket.org/levit_scs/drf_base64 [drf-serializer-extensions]: https://github.com/evenicoulddoit/django-rest-framework-serializer-extensions +[djangorestframework-queryfields]: http://djangorestframework-queryfields.readthedocs.io/ diff --git a/docs/topics/third-party-resources.md b/docs/topics/third-party-resources.md index 462bd922a..1ccedbc01 100644 --- a/docs/topics/third-party-resources.md +++ b/docs/topics/third-party-resources.md @@ -207,6 +207,7 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque * [html-json-forms][html-json-forms] - Provides an algorithm and serializer to process HTML JSON Form submissions per the (inactive) spec. * [django-rest-framework-serializer-extensions][drf-serializer-extensions] - Enables black/whitelisting fields, and conditionally expanding child serializers on a per-view/request basis. +* [djangorestframework-queryfields][djangorestframework-queryfields] - Serializer mixin allowing clients to control which fields will be sent in the API response. ### Serializer fields @@ -370,3 +371,4 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque [drf_tweaks]: https://github.com/ArabellaTech/drf_tweaks [drf-oidc-auth]: https://github.com/ByteInternet/drf-oidc-auth [drf-serializer-extensions]: https://github.com/evenicoulddoit/django-rest-framework-serializer-extensions +[djangorestframework-queryfields]: https://github.com/wimglenn/djangorestframework-queryfields From cf3862d56dddaf826c0a30913c4aebd6fdaba442 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 6 Jan 2017 07:24:28 +0000 Subject: [PATCH 380/457] Update 3.0-announcement.md Closes #4785 --- docs/topics/3.0-announcement.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md index 25ab4fd5b..f09788f56 100644 --- a/docs/topics/3.0-announcement.md +++ b/docs/topics/3.0-announcement.md @@ -894,11 +894,11 @@ If the request is omitted from the context, the returned URLs will be of the for The custom `X-Throttle-Wait-Second` header has now been dropped in favor of the standard `Retry-After` header. You can revert this behavior if needed by writing a custom exception handler for your application. -#### Date and time objects as ISO-8859-1 strings in serializer data. +#### Date and time objects as ISO-8601 strings in serializer data. Date and Time objects are now coerced to strings by default in the serializer output. Previously they were returned as `Date`, `Time` and `DateTime` objects, and later coerced to strings by the renderer. -You can modify this behavior globally by settings the existing `DATE_FORMAT`, `DATETIME_FORMAT` and `TIME_FORMAT` settings keys. Setting these values to `None` instead of their default value of `'iso-8859-1'` will result in native objects being returned in serializer data. +You can modify this behavior globally by settings the existing `DATE_FORMAT`, `DATETIME_FORMAT` and `TIME_FORMAT` settings keys. Setting these values to `None` instead of their default value of `'iso-8601'` will result in native objects being returned in serializer data. REST_FRAMEWORK = { # Return native `Date` and `Time` objects in `serializer.data` From a5fcf10c0ee269f77d04f41bc087a8c4d2ba6b59 Mon Sep 17 00:00:00 2001 From: Artem Muterko Date: Sat, 7 Jan 2017 00:32:13 +0200 Subject: [PATCH 381/457] Raise RuntimeError when trying to encode coreapi objects (#4790) --- rest_framework/utils/encoders.py | 10 +++++----- tests/test_encoders.py | 11 +++++++++++ 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/rest_framework/utils/encoders.py b/rest_framework/utils/encoders.py index 8203a7bc8..8896e4f2c 100644 --- a/rest_framework/utils/encoders.py +++ b/rest_framework/utils/encoders.py @@ -55,6 +55,11 @@ class JSONEncoder(json.JSONEncoder): elif hasattr(obj, 'tolist'): # Numpy arrays and array scalars. return obj.tolist() + elif (coreapi is not None) and isinstance(obj, (coreapi.Document, coreapi.Error)): + raise RuntimeError( + 'Cannot return a coreapi object from a JSON view. ' + 'You should be using a schema renderer instead for this view.' + ) elif hasattr(obj, '__getitem__'): try: return dict(obj) @@ -62,9 +67,4 @@ class JSONEncoder(json.JSONEncoder): pass elif hasattr(obj, '__iter__'): return tuple(item for item in obj) - elif (coreapi is not None) and isinstance(obj, (coreapi.Document, coreapi.Error)): - raise RuntimeError( - 'Cannot return a coreapi object from a JSON view. ' - 'You should be using a schema renderer instead for this view.' - ) return super(JSONEncoder, self).default(obj) diff --git a/tests/test_encoders.py b/tests/test_encoders.py index 687141476..403b1e9b2 100644 --- a/tests/test_encoders.py +++ b/tests/test_encoders.py @@ -4,6 +4,7 @@ from uuid import uuid4 from django.test import TestCase +from rest_framework.compat import coreapi from rest_framework.utils.encoders import JSONEncoder @@ -79,3 +80,13 @@ class JSONEncoderTests(TestCase): """ unique_id = uuid4() assert self.encoder.default(unique_id) == str(unique_id) + + def test_encode_coreapi_raises_error(self): + """ + Tests encoding a coreapi objects raises proper error + """ + with self.assertRaises(RuntimeError): + self.encoder.default(coreapi.Document()) + + with self.assertRaises(RuntimeError): + self.encoder.default(coreapi.Error()) From 64e801e479c1f111d8e4af43c55f9f22e76ebd06 Mon Sep 17 00:00:00 2001 From: Roman Vasilyev Date: Fri, 6 Jan 2017 14:46:36 -0800 Subject: [PATCH 382/457] get view for django 'virtual hosts' (#4776) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Brill, thanks! 👍 --- docs/api-guide/schemas.md | 12 ++++++++++++ rest_framework/schemas.py | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/docs/api-guide/schemas.md b/docs/api-guide/schemas.md index 95eb05a40..f43ff56bd 100644 --- a/docs/api-guide/schemas.md +++ b/docs/api-guide/schemas.md @@ -145,6 +145,18 @@ May be used to pass a canonical URL for the schema. url='https://www.example.org/api/' ) +#### `urlconf` + +A string representing the import path to the URL conf that you want +to generate an API schema for. This defaults to the value of Django's +ROOT_URLCONF setting. + + schema_view = get_schema_view( + title='Server Monitoring API', + url='https://www.example.org/api/', + urlconf='myproject.urls' + ) + #### `renderer_classes` May be used to pass the set of renderer classes that can be used to render the API root endpoint. diff --git a/rest_framework/schemas.py b/rest_framework/schemas.py index 44da83063..112f4d8c4 100644 --- a/rest_framework/schemas.py +++ b/rest_framework/schemas.py @@ -571,11 +571,11 @@ class SchemaGenerator(object): return named_path_components + [action] -def get_schema_view(title=None, url=None, renderer_classes=None): +def get_schema_view(title=None, url=None, urlconf=None, renderer_classes=None): """ Return a schema view. """ - generator = SchemaGenerator(title=title, url=url) + generator = SchemaGenerator(title=title, url=url, urlconf=urlconf) if renderer_classes is None: if renderers.BrowsableAPIRenderer in api_settings.DEFAULT_RENDERER_CLASSES: rclasses = [renderers.CoreJSONRenderer, renderers.BrowsableAPIRenderer] From e2c35920d180be47c835ee24a99440cb89dec58c Mon Sep 17 00:00:00 2001 From: wim glenn Date: Fri, 6 Jan 2017 16:46:56 -0600 Subject: [PATCH 383/457] fix a spelling error in api-guide (#4788) --- docs/api-guide/serializers.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md index 15e92ee72..6602d5e2c 100644 --- a/docs/api-guide/serializers.md +++ b/docs/api-guide/serializers.md @@ -1157,7 +1157,7 @@ The [html-json-forms][html-json-forms] package provides an algorithm and seriali ## QueryFields -[djangorestframework-queryfields][djangorestframework-queryfields] allows API clients to specify which fields will be sent in the response via inclusion or exclusion query paramaters. +[djangorestframework-queryfields][djangorestframework-queryfields] allows API clients to specify which fields will be sent in the response via inclusion/exclusion query parameters. [cite]: https://groups.google.com/d/topic/django-users/sVFaOfQi4wY/discussion From d7c00e8b7a8a17bc069be63fbf68d32f86d20f05 Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Sat, 7 Jan 2017 21:51:59 +0600 Subject: [PATCH 384/457] updated version of test dependencies in test requirements text --- requirements/requirements-testing.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements/requirements-testing.txt b/requirements/requirements-testing.txt index 177d677d8..b9e168442 100644 --- a/requirements/requirements-testing.txt +++ b/requirements/requirements-testing.txt @@ -1,4 +1,4 @@ # PyTest for running the tests. -pytest==2.9.1 -pytest-django==2.9.1 -pytest-cov==1.8.1 +pytest==3.0.5 +pytest-django==3.1.2 +pytest-cov==2.4.0 From b352c8a24cde5af5f99c758e5024e6288ac064b3 Mon Sep 17 00:00:00 2001 From: Artem Muterko Date: Sun, 8 Jan 2017 15:34:52 +0200 Subject: [PATCH 385/457] Fix some typos in documentation --- docs/api-guide/metadata.md | 2 +- docs/api-guide/permissions.md | 2 +- docs/api-guide/settings.md | 2 +- docs/topics/3.1-announcement.md | 2 +- docs/topics/3.4-announcement.md | 2 +- docs/topics/api-clients.md | 2 +- docs/topics/kickstarter-announcement.md | 2 +- docs/topics/release-notes.md | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/api-guide/metadata.md b/docs/api-guide/metadata.md index e98a9a311..de28ffd8a 100644 --- a/docs/api-guide/metadata.md +++ b/docs/api-guide/metadata.md @@ -113,7 +113,7 @@ The following third party packages provide additional metadata implementations. [drf-schema-adapter][drf-schema-adapter] is a set of tools that makes it easier to provide schema information to frontend frameworks and libraries. It provides a metadata mixin as well as 2 metadata classes and several adapters suitable to generate [json-schema][json-schema] as well as schema information readable by various libraries. You can also write your own adapter to work with your specific frontend. -If you whish to do so, it also provides an exporter that can export those schema information to json files. +If you wish to do so, it also provides an exporter that can export those schema information to json files. [cite]: http://tools.ietf.org/html/rfc7231#section-4.3.7 [no-options]: https://www.mnot.net/blog/2012/10/29/NO_OPTIONS diff --git a/docs/api-guide/permissions.md b/docs/api-guide/permissions.md index be2981327..344e33c86 100644 --- a/docs/api-guide/permissions.md +++ b/docs/api-guide/permissions.md @@ -259,7 +259,7 @@ The [REST Condition][rest-condition] package is another extension for building c ## DRY Rest Permissions -The [DRY Rest Permissions][dry-rest-permissions] package provides the ability to define different permissions for individual default and custom actions. This package is made for apps with permissions that are derived from relationships defined in the app's data model. It also supports permission checks being returned to a client app through the API's serializer. Additionally it supports adding permissions to the default and custom list actions to restrict the data they retrive per user. +The [DRY Rest Permissions][dry-rest-permissions] package provides the ability to define different permissions for individual default and custom actions. This package is made for apps with permissions that are derived from relationships defined in the app's data model. It also supports permission checks being returned to a client app through the API's serializer. Additionally it supports adding permissions to the default and custom list actions to restrict the data they retrieve per user. ## Django Rest Framework Roles diff --git a/docs/api-guide/settings.md b/docs/api-guide/settings.md index a1ea12d6e..aaedd463e 100644 --- a/docs/api-guide/settings.md +++ b/docs/api-guide/settings.md @@ -241,7 +241,7 @@ Default: If set, this maps the `'pk'` identifier in the URL conf onto the actual field name when generating a schema path parameter. Typically this will be `'id'`. This gives a more suitable representation as "primary key" is an implementation -detail, wheras "identifier" is a more general concept. +detail, whereas "identifier" is a more general concept. Default: `True` diff --git a/docs/topics/3.1-announcement.md b/docs/topics/3.1-announcement.md index 9eb93fcd7..6cca40665 100644 --- a/docs/topics/3.1-announcement.md +++ b/docs/topics/3.1-announcement.md @@ -153,7 +153,7 @@ For more information, see the documentation on [customizing field mappings][cust We've now moved a number of packages out of the core of REST framework, and into separately installable packages. If you're currently using these you don't need to worry, you simply need to `pip install` the new packages, and change any import paths. -We're making this change in order to help distribute the maintainance workload, and keep better focus of the core essentials of the framework. +We're making this change in order to help distribute the maintenance workload, and keep better focus of the core essentials of the framework. The change also means we can be more flexible with which external packages we recommend. For example, the excellently maintained [Django OAuth toolkit](https://github.com/evonove/django-oauth-toolkit) has now been promoted as our recommended option for integrating OAuth support. diff --git a/docs/topics/3.4-announcement.md b/docs/topics/3.4-announcement.md index 69343c75e..438192c9c 100644 --- a/docs/topics/3.4-announcement.md +++ b/docs/topics/3.4-announcement.md @@ -89,7 +89,7 @@ Name | Support | PyPI pa ---------------------------------|-------------------------------------|-------------------------------- [Core JSON][core-json] | Schema generation & client support. | Built-in support in `coreapi`. [Swagger / OpenAPI][swagger] | Schema generation & client support. | The `openapi-codec` package. -[JSON Hyper-Schema][hyperschema] | Currrently client support only. | The `hyperschema-codec` package. +[JSON Hyper-Schema][hyperschema] | Currently client support only. | The `hyperschema-codec` package. [API Blueprint][api-blueprint] | Not yet available. | Not yet available. --- diff --git a/docs/topics/api-clients.md b/docs/topics/api-clients.md index c12551aa6..fa7b60d3e 100644 --- a/docs/topics/api-clients.md +++ b/docs/topics/api-clients.md @@ -217,7 +217,7 @@ credentials, headers and bookmarks: # Python client library -The `coreapi` Python package allows you to programatically interact with any +The `coreapi` Python package allows you to programmatically interact with any API that exposes a supported schema format. ## Getting started diff --git a/docs/topics/kickstarter-announcement.md b/docs/topics/kickstarter-announcement.md index 78c5cce6f..6b7b428d1 100644 --- a/docs/topics/kickstarter-announcement.md +++ b/docs/topics/kickstarter-announcement.md @@ -102,7 +102,7 @@ Our gold sponsors include companies large and small. Many thanks for their signi ### Silver sponsors -The serious financial contribution that our silver sponsors have made is very much appreciated. I'd like to say a particular thank you to individuals who have choosen to privately support the project at this level. +The serious financial contribution that our silver sponsors have made is very much appreciated. I'd like to say a particular thank you to individuals who have chosen to privately support the project at this level.
    -*Many thanks to all our [wonderful sponsors][sponsors], and in particular to our premium backers, [Rover](http://jobs.rover.com/), [Sentry](https://getsentry.com/welcome/), [Stream](https://getstream.io/?utm_source=drf&utm_medium=banner&utm_campaign=drf), and [Machinalis](http://www.machinalis.com/#services).* +*Many thanks to all our [wonderful sponsors][sponsors], and in particular to our premium backers, [Rover](http://jobs.rover.com/), [Sentry](https://getsentry.com/welcome/), [Stream](https://getstream.io/?utm_source=drf&utm_medium=banner&utm_campaign=drf), and [Machinalis](https://hello.machinalis.co.uk/).* --- From b1eade4e32627c25dad2535c6bde2076f1385372 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 27 Jan 2017 12:57:26 +0000 Subject: [PATCH 446/457] Update machinalis links --- README.md | 2 +- docs/index.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2afb70502..c26252ce5 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ The initial aim is to provide a single full-time position on REST framework.

    -*Many thanks to all our [wonderful sponsors][sponsors], and in particular to our premium backers, [Rover](http://jobs.rover.com/), [Sentry](https://getsentry.com/welcome/), [Stream](https://getstream.io/?utm_source=drf&utm_medium=banner&utm_campaign=drf), and [Machinalis](http://www.machinalis.com/#services).* +*Many thanks to all our [wonderful sponsors][sponsors], and in particular to our premium backers, [Rover](http://jobs.rover.com/), [Sentry](https://getsentry.com/welcome/), [Stream](https://getstream.io/?utm_source=drf&utm_medium=banner&utm_campaign=drf), and [Machinalis](https://hello.machinalis.co.uk/).* --- diff --git a/docs/index.md b/docs/index.md index 006ae8221..29a11791e 100644 --- a/docs/index.md +++ b/docs/index.md @@ -74,7 +74,7 @@ The initial aim is to provide a single full-time position on REST framework.
  • Rover.com
  • Sentry
  • Stream
    • -
  • Machinalis
    • +
  • Machinalis
    • From 220be31791693f056591e2b9593b80d17c31830c Mon Sep 17 00:00:00 2001 From: Artem Muterko Date: Fri, 27 Jan 2017 17:44:00 +0200 Subject: [PATCH 447/457] Git add remaining tests for BaseSerializer (#4857) --- tests/test_serializer.py | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/tests/test_serializer.py b/tests/test_serializer.py index 47258fdd1..04fa39c0d 100644 --- a/tests/test_serializer.py +++ b/tests/test_serializer.py @@ -159,6 +159,32 @@ class TestBaseSerializer: self.Serializer = ExampleSerializer + def test_abstract_methods_raise_proper_errors(self): + serializer = serializers.BaseSerializer() + with pytest.raises(NotImplementedError): + serializer.to_internal_value(None) + with pytest.raises(NotImplementedError): + serializer.to_representation(None) + with pytest.raises(NotImplementedError): + serializer.update(None, None) + with pytest.raises(NotImplementedError): + serializer.create(None) + + def test_access_to_data_attribute_before_validation_raises_error(self): + serializer = serializers.BaseSerializer(data={'foo': 'bar'}) + with pytest.raises(AssertionError): + serializer.data + + def test_access_to_errors_attribute_before_validation_raises_error(self): + serializer = serializers.BaseSerializer(data={'foo': 'bar'}) + with pytest.raises(AssertionError): + serializer.errors + + def test_access_to_validated_data_attribute_before_validation_raises_error(self): + serializer = serializers.BaseSerializer(data={'foo': 'bar'}) + with pytest.raises(AssertionError): + serializer.validated_data + def test_serialize_instance(self): instance = {'id': 1, 'name': 'tom', 'domain': 'example.com'} serializer = self.Serializer(instance) From a8dbc2202811c85b84b3112dc2f317154906da57 Mon Sep 17 00:00:00 2001 From: Anna Ossowski Date: Sat, 28 Jan 2017 23:41:21 +0100 Subject: [PATCH 448/457] Updated Support section and added funding email (#4860) --- docs/index.md | 2 +- docs/topics/funding.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/index.md b/docs/index.md index 29a11791e..f3897696f 100644 --- a/docs/index.md +++ b/docs/index.md @@ -260,7 +260,7 @@ Framework. For support please see the [REST framework discussion group][group], try the `#restframework` channel on `irc.freenode.net`, search [the IRC archives][botbot], or raise a question on [Stack Overflow][stack-overflow], making sure to include the ['django-rest-framework'][django-rest-framework-tag] tag. -[Paid support is available][paid-support] from [DabApps][dabapps], and can include work on REST framework core, or support with building your REST framework API. Please [contact DabApps][contact-dabapps] if you'd like to discuss commercial support options. +For priority support please sign up for a [professional or premium sponsorship plan](https://fund.django-rest-framework.org/topics/funding/). For updates on REST framework development, you may also want to follow [the author][twitter] on Twitter. diff --git a/docs/topics/funding.md b/docs/topics/funding.md index 814de0a3c..91099cb3f 100644 --- a/docs/topics/funding.md +++ b/docs/topics/funding.md @@ -308,7 +308,7 @@ Our professional and premium plans also include **priority support**. At any tim Once you've signed up I'll contact you via email and arrange your ad placements on the site. -For further enquires please contact tom@tomchristie.com. +For further enquires please contact funding@django-rest-framework.org. --- From 1c437a793c3f3cedb1aa53f0cccec23a96cc3f34 Mon Sep 17 00:00:00 2001 From: Mariusz Felisiak Date: Sun, 29 Jan 2017 20:38:39 +0100 Subject: [PATCH 449/457] Removed unnecessary importlib wrapper. --- rest_framework/compat.py | 5 ----- rest_framework/settings.py | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/rest_framework/compat.py b/rest_framework/compat.py index b0e076203..872441abc 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -17,11 +17,6 @@ from django.template import Context, RequestContext, Template from django.utils import six from django.views.generic import View -try: - import importlib # Available in Python 3.1+ -except ImportError: - from django.utils import importlib # Will be removed in Django 1.9 - try: from django.urls import ( diff --git a/rest_framework/settings.py b/rest_framework/settings.py index 6d9ed2355..b699d7caf 100644 --- a/rest_framework/settings.py +++ b/rest_framework/settings.py @@ -18,13 +18,13 @@ REST framework settings, checking for user settings first, then falling back to the defaults. """ from __future__ import unicode_literals +from importlib import import_module from django.conf import settings from django.test.signals import setting_changed from django.utils import six from rest_framework import ISO_8601 -from rest_framework.compat import importlib DEFAULTS = { # Base API policies @@ -174,7 +174,7 @@ def import_from_string(val, setting_name): # Nod to tastypie's use of importlib. parts = val.split('.') module_path, class_name = '.'.join(parts[:-1]), parts[-1] - module = importlib.import_module(module_path) + module = import_module(module_path) return getattr(module, class_name) except (ImportError, AttributeError) as e: msg = "Could not import '%s' for API setting '%s'. %s: %s." % (val, setting_name, e.__class__.__name__, e) From 31e9f7dfbba7ad967d7f912e2014d9ad291fca3e Mon Sep 17 00:00:00 2001 From: Artem Muterko Date: Mon, 30 Jan 2017 13:08:03 +0200 Subject: [PATCH 450/457] Add remaining tests for generics (#4865) --- tests/test_generics.py | 91 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) diff --git a/tests/test_generics.py b/tests/test_generics.py index c24cda006..59278572e 100644 --- a/tests/test_generics.py +++ b/tests/test_generics.py @@ -547,3 +547,94 @@ class TestGuardedQueryset(TestCase): request = factory.get('/') with pytest.raises(RuntimeError): view(request).render() + + +class ApiViewsTests(TestCase): + + def test_create_api_view_post(self): + class MockCreateApiView(generics.CreateAPIView): + def create(self, request, *args, **kwargs): + self.called = True + self.call_args = (request, args, kwargs) + view = MockCreateApiView() + data = ('test request', ('test arg',), {'test_kwarg': 'test'}) + view.post('test request', 'test arg', test_kwarg='test') + assert view.called is True + assert view.call_args == data + + def test_destroy_api_view_delete(self): + class MockDestroyApiView(generics.DestroyAPIView): + def destroy(self, request, *args, **kwargs): + self.called = True + self.call_args = (request, args, kwargs) + view = MockDestroyApiView() + data = ('test request', ('test arg',), {'test_kwarg': 'test'}) + view.delete('test request', 'test arg', test_kwarg='test') + assert view.called is True + assert view.call_args == data + + def test_update_api_view_partial_update(self): + class MockUpdateApiView(generics.UpdateAPIView): + def partial_update(self, request, *args, **kwargs): + self.called = True + self.call_args = (request, args, kwargs) + view = MockUpdateApiView() + data = ('test request', ('test arg',), {'test_kwarg': 'test'}) + view.patch('test request', 'test arg', test_kwarg='test') + assert view.called is True + assert view.call_args == data + + def test_retrieve_update_api_view_get(self): + class MockRetrieveUpdateApiView(generics.RetrieveUpdateAPIView): + def retrieve(self, request, *args, **kwargs): + self.called = True + self.call_args = (request, args, kwargs) + view = MockRetrieveUpdateApiView() + data = ('test request', ('test arg',), {'test_kwarg': 'test'}) + view.get('test request', 'test arg', test_kwarg='test') + assert view.called is True + assert view.call_args == data + + def test_retrieve_update_api_view_put(self): + class MockRetrieveUpdateApiView(generics.RetrieveUpdateAPIView): + def update(self, request, *args, **kwargs): + self.called = True + self.call_args = (request, args, kwargs) + view = MockRetrieveUpdateApiView() + data = ('test request', ('test arg',), {'test_kwarg': 'test'}) + view.put('test request', 'test arg', test_kwarg='test') + assert view.called is True + assert view.call_args == data + + def test_retrieve_update_api_view_patch(self): + class MockRetrieveUpdateApiView(generics.RetrieveUpdateAPIView): + def partial_update(self, request, *args, **kwargs): + self.called = True + self.call_args = (request, args, kwargs) + view = MockRetrieveUpdateApiView() + data = ('test request', ('test arg',), {'test_kwarg': 'test'}) + view.patch('test request', 'test arg', test_kwarg='test') + assert view.called is True + assert view.call_args == data + + def test_retrieve_destroy_api_view_get(self): + class MockRetrieveDestroyUApiView(generics.RetrieveDestroyAPIView): + def retrieve(self, request, *args, **kwargs): + self.called = True + self.call_args = (request, args, kwargs) + view = MockRetrieveDestroyUApiView() + data = ('test request', ('test arg',), {'test_kwarg': 'test'}) + view.get('test request', 'test arg', test_kwarg='test') + assert view.called is True + assert view.call_args == data + + def test_retrieve_destroy_api_view_delete(self): + class MockRetrieveDestroyUApiView(generics.RetrieveDestroyAPIView): + def destroy(self, request, *args, **kwargs): + self.called = True + self.call_args = (request, args, kwargs) + view = MockRetrieveDestroyUApiView() + data = ('test request', ('test arg',), {'test_kwarg': 'test'}) + view.delete('test request', 'test arg', test_kwarg='test') + assert view.called is True + assert view.call_args == data From 3001b56e069a8aee118c2cd0977d04aa16733af4 Mon Sep 17 00:00:00 2001 From: Mariusz Felisiak Date: Mon, 30 Jan 2017 17:11:19 +0100 Subject: [PATCH 451/457] Fixed Django 2.0 compatibility due to `django.conf.urls.include` parameters change. (#4866) --- rest_framework/compat.py | 7 +++++++ rest_framework/urlpatterns.py | 4 ++-- tests/test_routers.py | 5 +++-- tests/test_versioning.py | 11 ++++++----- 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/rest_framework/compat.py b/rest_framework/compat.py index 872441abc..16bc41f3a 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -307,3 +307,10 @@ def set_many(instance, field, value): else: field = getattr(instance, field) field.set(value) + +def include(module, namespace=None, app_name=None): + from django.conf.urls import include + if django.VERSION < (1,9): + return include(module, namespace, app_name) + else: + return include((module, app_name), namespace) diff --git a/rest_framework/urlpatterns.py b/rest_framework/urlpatterns.py index 4ea55300e..2ce4ba52d 100644 --- a/rest_framework/urlpatterns.py +++ b/rest_framework/urlpatterns.py @@ -1,8 +1,8 @@ from __future__ import unicode_literals -from django.conf.urls import include, url +from django.conf.urls import url -from rest_framework.compat import RegexURLResolver +from rest_framework.compat import RegexURLResolver, include from rest_framework.settings import api_settings diff --git a/tests/test_routers.py b/tests/test_routers.py index 99e4391c0..dc3df2e7b 100644 --- a/tests/test_routers.py +++ b/tests/test_routers.py @@ -4,12 +4,13 @@ import json from collections import namedtuple import pytest -from django.conf.urls import include, url +from django.conf.urls import url from django.core.exceptions import ImproperlyConfigured from django.db import models from django.test import TestCase, override_settings from rest_framework import permissions, serializers, viewsets +from rest_framework.compat import include from rest_framework.decorators import detail_route, list_route from rest_framework.response import Response from rest_framework.routers import DefaultRouter, SimpleRouter @@ -81,7 +82,7 @@ empty_prefix_urls = [ urlpatterns = [ url(r'^non-namespaced/', include(namespaced_router.urls)), - url(r'^namespaced/', include(namespaced_router.urls, namespace='example')), + url(r'^namespaced/', include(namespaced_router.urls, namespace='example', app_name='example')), url(r'^example/', include(notes_router.urls)), url(r'^example2/', include(kwarged_notes_router.urls)), diff --git a/tests/test_versioning.py b/tests/test_versioning.py index 195f3fec1..098b09b65 100644 --- a/tests/test_versioning.py +++ b/tests/test_versioning.py @@ -1,8 +1,9 @@ import pytest -from django.conf.urls import include, url +from django.conf.urls import url from django.test import override_settings from rest_framework import serializers, status, versioning +from rest_framework.compat import include from rest_framework.decorators import APIView from rest_framework.relations import PKOnlyObject from rest_framework.response import Response @@ -170,7 +171,7 @@ class TestURLReversing(URLPatternsTestCase): ] urlpatterns = [ - url(r'^v1/', include(included, namespace='v1')), + url(r'^v1/', include(included, namespace='v1', app_name='v1')), url(r'^another/$', dummy_view, name='another'), url(r'^(?P[v1|v2]+)/another/$', dummy_view, name='another'), ] @@ -335,8 +336,8 @@ class TestHyperlinkedRelatedField(URLPatternsTestCase): ] urlpatterns = [ - url(r'^v1/', include(included, namespace='v1')), - url(r'^v2/', include(included, namespace='v2')) + url(r'^v1/', include(included, namespace='v1', app_name='v1')), + url(r'^v2/', include(included, namespace='v2', app_name='v2')) ] def setUp(self): @@ -367,7 +368,7 @@ class TestNamespaceVersioningHyperlinkedRelatedFieldScheme(URLPatternsTestCase): ] included = [ url(r'^namespaced/(?P\d+)/$', dummy_pk_view, name='namespaced'), - url(r'^nested/', include(nested, namespace='nested-namespace')) + url(r'^nested/', include(nested, namespace='nested-namespace', app_name='nested-namespace')) ] urlpatterns = [ From d610d150f1f2bceb7769c15c0214567870013a41 Mon Sep 17 00:00:00 2001 From: Artem Muterko Date: Tue, 31 Jan 2017 16:51:09 +0200 Subject: [PATCH 452/457] Add test for pagination when limit not set --- tests/test_pagination.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/test_pagination.py b/tests/test_pagination.py index 9f2e1c57c..dd7f70330 100644 --- a/tests/test_pagination.py +++ b/tests/test_pagination.py @@ -370,6 +370,13 @@ class TestLimitOffset: assert self.pagination.display_page_controls assert isinstance(self.pagination.to_html(), type('')) + def test_pagination_not_applied_if_limit_or_default_limit_not_set(self): + class MockPagination(pagination.LimitOffsetPagination): + default_limit = None + request = Request(factory.get('/')) + queryset = MockPagination().paginate_queryset(self.queryset, request) + assert queryset is None + def test_single_offset(self): """ When the offset is not a multiple of the limit we get some edge cases: From b99272c4251b718a1ea3715205abf1fd3be89039 Mon Sep 17 00:00:00 2001 From: Mariusz Felisiak Date: Tue, 31 Jan 2017 20:57:52 +0100 Subject: [PATCH 453/457] Fixed `dedent` for tab indent. --- rest_framework/utils/formatting.py | 25 ++++++++++--------------- tests/test_description.py | 6 +++++- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/rest_framework/utils/formatting.py b/rest_framework/utils/formatting.py index ca5b33c5e..78cb37e56 100644 --- a/rest_framework/utils/formatting.py +++ b/rest_framework/utils/formatting.py @@ -32,23 +32,18 @@ def dedent(content): unindented text on the initial line. """ content = force_text(content) - whitespace_counts = [ - len(line) - len(line.lstrip(' ')) - for line in content.splitlines()[1:] if line.lstrip() - ] - tab_counts = [ - len(line) - len(line.lstrip('\t')) - for line in content.splitlines()[1:] if line.lstrip() - ] + lines = [line for line in content.splitlines()[1:] if line.lstrip()] # unindent the content if needed - if whitespace_counts: - whitespace_pattern = '^' + (' ' * min(whitespace_counts)) - content = re.sub(re.compile(whitespace_pattern, re.MULTILINE), '', content) - elif tab_counts: - whitespace_pattern = '^' + ('\t' * min(whitespace_counts)) - content = re.sub(re.compile(whitespace_pattern, re.MULTILINE), '', content) - + if lines: + whitespace_counts = min([len(line) - len(line.lstrip(' ')) for line in lines]) + tab_counts = min([len(line) - len(line.lstrip('\t')) for line in lines]) + if whitespace_counts: + whitespace_pattern = '^' + (' ' * whitespace_counts) + content = re.sub(re.compile(whitespace_pattern, re.MULTILINE), '', content) + elif tab_counts: + whitespace_pattern = '^' + ('\t' * tab_counts) + content = re.sub(re.compile(whitespace_pattern, re.MULTILINE), '', content) return content.strip() diff --git a/tests/test_description.py b/tests/test_description.py index 08d8bddec..001a3ea21 100644 --- a/tests/test_description.py +++ b/tests/test_description.py @@ -124,4 +124,8 @@ class TestViewNamesAndDescriptions(TestCase): def test_dedent_tabs(): - assert dedent("\tfirst string\n\n\tsecond string") == 'first string\n\n\tsecond string' + result = 'first string\n\nsecond string' + assert dedent(" first string\n\n second string") == result + assert dedent("first string\n\n second string") == result + assert dedent("\tfirst string\n\n\tsecond string") == result + assert dedent("first string\n\n\tsecond string") == result From 2ec3db81777234c7038c0d6a4edde5162fc1edc6 Mon Sep 17 00:00:00 2001 From: Mohammad Ashraful Islam Date: Wed, 1 Feb 2017 18:20:06 +0600 Subject: [PATCH 454/457] fixed url checker ':' to 'http' (#4678) --- rest_framework/test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/test.py b/rest_framework/test.py index 241f94c91..87255bca0 100644 --- a/rest_framework/test.py +++ b/rest_framework/test.py @@ -114,7 +114,7 @@ if requests is not None: self.mount('https://', adapter) def request(self, method, url, *args, **kwargs): - if ':' not in url: + if not url.startswith('http'): raise ValueError('Missing "http:" or "https:". Use a fully qualified URL, eg "http://testserver%s"' % url) return super(RequestsClient, self).request(method, url, *args, **kwargs) From 3c93c3f7b44b878f9970f9f89a5237b6aabf0794 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 3 Feb 2017 16:54:13 +0000 Subject: [PATCH 455/457] Added Rollbar to premium sponsors --- docs/index.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/index.md b/docs/index.md index 29a11791e..b9806c544 100644 --- a/docs/index.md +++ b/docs/index.md @@ -75,10 +75,11 @@ The initial aim is to provide a single full-time position on REST framework.
  • Sentry
  • Stream
  • Machinalis
    • +
  • Rollbar
    • -*Many thanks to all our [wonderful sponsors][sponsors], and in particular to our premium backers, [Rover](http://jobs.rover.com/), [Sentry](https://getsentry.com/welcome/), [Stream](https://getstream.io/?utm_source=drf&utm_medium=banner&utm_campaign=drf), and [Machinalis](https://hello.machinalis.co.uk/).* +*Many thanks to all our [wonderful sponsors][sponsors], and in particular to our premium backers, [Rover](http://jobs.rover.com/), [Sentry](https://getsentry.com/welcome/), [Stream](https://getstream.io/?utm_source=drf&utm_medium=banner&utm_campaign=drf), [Machinalis](https://hello.machinalis.co.uk/), and [Rollbar](https://rollbar.com).* --- From 79f431c44a215aeab2aa2cacb8587995dad9e709 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 3 Feb 2017 17:10:52 +0000 Subject: [PATCH 456/457] Update sponsors on README to include rollbar (#4876) --- README.md | 3 ++- docs/img/premium/machinalis-readme.png | Bin 14046 -> 12872 bytes docs/img/premium/rollbar-readme.png | Bin 0 -> 12367 bytes docs/img/premium/rover-readme.png | Bin 55611 -> 53118 bytes docs/img/premium/sentry-readme.png | Bin 26353 -> 24584 bytes docs/img/premium/stream-readme.png | Bin 20667 -> 19341 bytes 6 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 docs/img/premium/rollbar-readme.png diff --git a/README.md b/README.md index c26252ce5..609f99184 100644 --- a/README.md +++ b/README.md @@ -25,9 +25,10 @@ The initial aim is to provide a single full-time position on REST framework. +

    -*Many thanks to all our [wonderful sponsors][sponsors], and in particular to our premium backers, [Rover](http://jobs.rover.com/), [Sentry](https://getsentry.com/welcome/), [Stream](https://getstream.io/?utm_source=drf&utm_medium=banner&utm_campaign=drf), and [Machinalis](https://hello.machinalis.co.uk/).* +*Many thanks to all our [wonderful sponsors][sponsors], and in particular to our premium backers, [Rover](http://jobs.rover.com/), [Sentry](https://getsentry.com/welcome/), [Stream](https://getstream.io/?utm_source=drf&utm_medium=banner&utm_campaign=drf), [Machinalis](https://hello.machinalis.co.uk/), and [Rollbar](https://rollbar.com).* --- diff --git a/docs/img/premium/machinalis-readme.png b/docs/img/premium/machinalis-readme.png index 4bdb020c2ecee7861668bb45e42f8eec304781f7..cd98c23c7b4dd2fd1bd8e79f401707bb7ba8d416 100644 GIT binary patch literal 12872 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 Pul!}D6{N}}-Us|Ikovn{ literal 0 HcmV?d00001 diff --git a/docs/img/premium/rover-readme.png b/docs/img/premium/rover-readme.png index c9865f2a93c1d67adc2f175cd422e764f7fe3a66..b8055d62e5804df24f131ae27ca142655faa4441 100644 GIT binary patch delta 52468 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 C>*S1s<>*FY2{omKg$)QGFZ4CETEr#h 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 diff --git a/docs/img/premium/sentry-readme.png b/docs/img/premium/sentry-readme.png index 1e869f3b1dd36442faed67d15705890aff7d4dd1..5536ce52fa15e0b9e20b3f8a7f3f6b6df3fa9759 100644 GIT binary patch delta 23710 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 literal 26353 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 diff --git a/docs/img/premium/stream-readme.png b/docs/img/premium/stream-readme.png index 955c11429c53bd18cbfbf888dca7663e134264eb..fc3733c704818f68eb52c453df9ba06eb288d21c 100644 GIT binary patch literal 19341 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 literal 20667 zcmeEuWmKHYvM4gRyTf21!3THOU;IwTEQx#a&!GBG%Fvw{{`(&&;N>MY4P7uxp=xc{3Vm61(%hBm7|rD zhdUe(^dHH=b^G6l{}+=!W-fmd`%8&`%O>`Ra}iA|cV`FBKPu36vh$GO5&KJ^e{cRD zjr@%z>+I;_X65b( z4zKs02>i409|(U`FY?OH$I3xh&JM27zog*f6%yn6k3Ij6DeLUu?55>nW?}V*v%gUO z(e&@of6>wVA38jI!vCc6kDh;ET3U#>dzyo-EIj@(U+`J`%lc)^Y`Ff>EXMU8p~c{~ zAfo1MX=m*#XXarg!NUy_5aAXQ;o%4J@cen;77*k5H<*8L@TW)C&C1Nf+3k(9vxCH6 zVmSVJ1@dyjXZ+v$|Ai{X^~aC?;a7h#M*&OB^j+-z9qH3J@Qu3WiV zG%%h+wdWXqUnZwa%p6Os9D}I}#J~qiF)4DAS-FDZHGJJfbz;_)V+bN8uSjc|LpW~N}iWVTtNTH)6 z(gOiQ+j;cV;k!QZ1nl0u?6=!j?t{(z!~@+e64yzNUZt;9n7Gn$kH5<`7}s)yYF zC;UgX|6kSr?;02SC)c$ZPkQckg6MGYS57c#(yXpprXK5*wc2Os9O9a<=PUI0FW~0P zlP%=wzs`ssH$C5SMh{!>N~_2rsCzZwu#{XYUMFltg-SE~X8 zvGCUQw)R_~pSGf=dwx0}g9BbwSxxh<0tYJ6d$=c0)W99rk5r@X?KXP2y?tJO#9=Di zX1&kLZ_<|57V{EqVoq!};WP|i-RAiM=qC#QKohI;za2#nKW(?W`>hYr&#uU!sLROc zTAc41B!B_<8g7YX6=ePzoEIG+sR>nuf#uQPpdf7(pLNSXW3*kHv7Yt4N|vhwEA&)8 zJNWuy(g8MR$+4tQ;$jDp$Bb?$b7fG!GkypCo`$Ng&wz|zT=X_=ISm6tb_I9oPgm?skvZJk0MWBb>$gv4=O{DJLQ}J)<+aUa3 zvctawzUPxZ8_C(vUL-)8iILiS!YU_XNzg~XVR)6)aR4JIg(4`~=?2a{i6-Npm{8Z? zam6gG3k{53gGHXhwF*M_cnCHJRUA;$zv@KqAqWW^AARlb;yXea1-$!_$%C}Gh^(^d zwZ=ifqNOaDIW-<3HNyZjFJJsT*U=n?FdF4O;&ctp68W+l@U0IIZ=wI=i@pj`_rf(y zM1ss?MEX|@NZ1|5kqCzx9TmaHH(f=uu{{h;If((|77=nFr-+G3Z<#!I_{y4XQN$bG z;Rzsj?z>OQl|g`}AR*4*OA}%w;bjfZ52`F2v`e}($64svA2WUUXue!2TOufvX9>q- zmMx)s!v-gl^VSlJeu4nLZ77OeDx+`FOUc+p&j>Zqh+=i@JT7oT7Vzc- zMT_muDVx1a`>W$+ot$aLJm$kLa!&dhE7D2o{4S-pcI1_EBj7tigm>G;_#6TKD{XX$ zlCF+p?`3pgSt`Pz0A!Kg)*`8O)xqAoRJ7Ob;gN6P3q_Hhvta&vHAqu3$jPL&8TWI8 z{?V29Pxb1b>h~HVt@Y~oNFU-u`08Kg7$sCJp-&*YO>TXAIBPy|ApbS;E?mz2T(exf zz6}Lt^J18EP>kzDeIaSKZr<#$JDEJp5~&NJ%}*zLg$Dy8b&@3pzCw4R1D-T+9uwLK zkhDWX4iIli@P|e~g0T^IIFB+~- zWYt`2dd}{BUnoN)GelSci*V!KgR>}sKH+LHo2C!@MRPSVUm#(#EabsIX|3V-axwL0 z6Q&s0J1lj8( zS43PV%AtEihD2BJhF`YU;3rTLf9Ludvk;~

    pjlIcQ4o>(`XbcjU>*qQ2?ZI)oLo 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 From cbad236f6d817d992873cd4df6527d46ab243ed1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=89=AC?= Date: Mon, 6 Feb 2017 17:36:03 +0800 Subject: [PATCH 457/457] Add max_length and min_length arguments for ListField (#4877) --- docs/api-guide/fields.md | 4 +++- rest_framework/fields.py | 12 +++++++++++- tests/test_fields.py | 10 ++++++++++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/docs/api-guide/fields.md b/docs/api-guide/fields.md index b527b016b..22ce7dd77 100644 --- a/docs/api-guide/fields.md +++ b/docs/api-guide/fields.md @@ -434,9 +434,11 @@ Requires either the `Pillow` package or `PIL` package. The `Pillow` package is A field class that validates a list of objects. -**Signature**: `ListField(child)` +**Signature**: `ListField(child, min_length=None, max_length=None)` - `child` - A field instance that should be used for validating the objects in the list. If this argument is not provided then objects in the list will not be validated. +- `min_length` - Validates that the list contains no fewer than this number of elements. +- `max_length` - Validates that the list contains no more than this number of elements. For example, to validate a list of integers you might use something like the following: diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 6d21d670a..f46edef1e 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -1505,12 +1505,16 @@ class ListField(Field): initial = [] default_error_messages = { 'not_a_list': _('Expected a list of items but got type "{input_type}".'), - 'empty': _('This list may not be empty.') + 'empty': _('This list may not be empty.'), + 'min_length': _('Ensure this field has at least {min_length} elements.'), + 'max_length': _('Ensure this field has no more than {max_length} elements.') } def __init__(self, *args, **kwargs): self.child = kwargs.pop('child', copy.deepcopy(self.child)) self.allow_empty = kwargs.pop('allow_empty', True) + self.max_length = kwargs.pop('max_length', None) + self.min_length = kwargs.pop('min_length', None) assert not inspect.isclass(self.child), '`child` has not been instantiated.' assert self.child.source is None, ( @@ -1520,6 +1524,12 @@ class ListField(Field): super(ListField, self).__init__(*args, **kwargs) self.child.bind(field_name='', parent=self) + if self.max_length is not None: + message = self.error_messages['max_length'].format(max_length=self.max_length) + self.validators.append(MaxLengthValidator(self.max_length, message=message)) + if self.min_length is not None: + message = self.error_messages['min_length'].format(min_length=self.min_length) + self.validators.append(MinLengthValidator(self.min_length, message=message)) def get_value(self, dictionary): if self.field_name not in dictionary: diff --git a/tests/test_fields.py b/tests/test_fields.py index 5de6546fc..16221d4cc 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -1668,6 +1668,16 @@ class TestEmptyListField(FieldValues): field = serializers.ListField(child=serializers.IntegerField(), allow_empty=False) +class TestListFieldLengthLimit(FieldValues): + valid_inputs = () + invalid_inputs = [ + ((0, 1), ['Ensure this field has at least 3 elements.']), + ((0, 1, 2, 3, 4, 5), ['Ensure this field has no more than 4 elements.']), + ] + outputs = () + field = serializers.ListField(child=serializers.IntegerField(), min_length=3, max_length=4) + + class TestUnvalidatedListField(FieldValues): """ Values for `ListField` with no `child` argument.