From ed7f3c55f7647b19ce2358ebce861a0cee8944d5 Mon Sep 17 00:00:00 2001 From: Max Wittig Date: Mon, 29 Jul 2019 14:20:11 +0200 Subject: [PATCH 001/303] docs(tutorial): add missing permission import in viewsets --- docs/tutorial/6-viewsets-and-routers.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/tutorial/6-viewsets-and-routers.md b/docs/tutorial/6-viewsets-and-routers.md index 11e24448f..3719bbf18 100644 --- a/docs/tutorial/6-viewsets-and-routers.md +++ b/docs/tutorial/6-viewsets-and-routers.md @@ -27,6 +27,7 @@ Next we're going to replace the `SnippetList`, `SnippetDetail` and `SnippetHighl from rest_framework.decorators import action from rest_framework.response import Response + from rest_framework import permissions class SnippetViewSet(viewsets.ModelViewSet): """ From 505a69cf432a1b9684462848059f731ea381ea6c Mon Sep 17 00:00:00 2001 From: Nikhil Kumar Date: Mon, 1 Jun 2020 13:49:43 -0400 Subject: [PATCH 002/303] Fixed heading markdown --- 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 4f566ff59..6323ceacd 100644 --- a/docs/api-guide/serializers.md +++ b/docs/api-guide/serializers.md @@ -161,7 +161,7 @@ Each key in the dictionary will be the field name, and the values will be lists When deserializing a list of items, errors will be returned as a list of dictionaries representing each of the deserialized items. -#### Raising an exception on invalid data +#### Raising an exception on invalid data The `.is_valid()` method takes an optional `raise_exception` flag that will cause it to raise a `serializers.ValidationError` exception if there are validation errors. From 9dc7021770ecb5689302cb97b282dd85fb7ed108 Mon Sep 17 00:00:00 2001 From: Nikhil Kumar Date: Mon, 1 Jun 2020 14:03:10 -0400 Subject: [PATCH 003/303] Fixed h4 rendering --- 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 b2bdd50c8..e309c9d91 100644 --- a/docs/api-guide/fields.md +++ b/docs/api-guide/fields.md @@ -371,7 +371,7 @@ Corresponds to `django.db.models.fields.TimeField` * `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']`. -#### `TimeField` format strings +#### `TimeField` format strings Format strings may either be [Python strftime formats][strftime] which explicitly specify the format, or the special string `'iso-8601'`, which indicates that [ISO 8601][iso8601] style times should be used. (eg `'12:34:56.000000'`) From 30ca04df835e2d41f32a0ecad3a23bcd06533658 Mon Sep 17 00:00:00 2001 From: Mark Story Date: Wed, 29 Jul 2020 09:58:53 -0400 Subject: [PATCH 004/303] Fix broken links in documenting API section The changed links were not working on the documentation site. I'm not 100% sure that these changes are correct but they generate working links in the GitHub previews. --- docs/topics/documenting-your-api.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/topics/documenting-your-api.md b/docs/topics/documenting-your-api.md index 5c5872650..e86a6cc77 100644 --- a/docs/topics/documenting-your-api.md +++ b/docs/topics/documenting-your-api.md @@ -209,8 +209,8 @@ To implement a hypermedia API you'll need to decide on an appropriate media type [cite]: https://roy.gbiv.com/untangled/2008/rest-apis-must-be-hypertext-driven [hypermedia-docs]: rest-hypermedia-hateoas.md -[metadata-docs]: ../api-guide/metadata/ -[schemas-examples]: ../api-guide/schemas/#examples +[metadata-docs]: ../api-guide/metadata.md +[schemas-examples]: ../api-guide/schemas.md#examples [image-drf-yasg]: ../img/drf-yasg.png [image-self-describing-api]: ../img/self-describing.png From 48c327c681da481b7c36c674307bd58adfa4286c Mon Sep 17 00:00:00 2001 From: Justin Duke Date: Mon, 24 Aug 2020 03:44:34 -0700 Subject: [PATCH 005/303] Fix schema typo (#7491) --- rest_framework/schemas/openapi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/schemas/openapi.py b/rest_framework/schemas/openapi.py index 9774a94c7..8a8e267e0 100644 --- a/rest_framework/schemas/openapi.py +++ b/rest_framework/schemas/openapi.py @@ -50,7 +50,7 @@ class SchemaGenerator(BaseSchemaGenerator): 'You have a duplicated operationId in your OpenAPI schema: {operation_id}\n' '\tRoute: {route1}, Method: {method1}\n' '\tRoute: {route2}, Method: {method2}\n' - '\tAn operationId has to be unique accros your schema. Your schema may not work in other tools.' + '\tAn operationId has to be unique across your schema. Your schema may not work in other tools.' .format( route1=ids[operation_id]['route'], method1=ids[operation_id]['method'], From e215db206a6a80432c4f2a5cb711fc858e9069b3 Mon Sep 17 00:00:00 2001 From: Vlad <38493865+VladSaichenko@users.noreply.github.com> Date: Tue, 25 Aug 2020 18:50:02 +0700 Subject: [PATCH 006/303] Updated url()'s with path() and re_path() (#7492) --- rest_framework/documentation.py | 6 +++--- rest_framework/routers.py | 7 +++---- rest_framework/urlpatterns.py | 7 +++---- rest_framework/urls.py | 6 +++--- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/rest_framework/documentation.py b/rest_framework/documentation.py index ce61fa6bf..53e5ab551 100644 --- a/rest_framework/documentation.py +++ b/rest_framework/documentation.py @@ -1,4 +1,4 @@ -from django.conf.urls import include, url +from django.urls import include, path from rest_framework.renderers import ( CoreJSONRenderer, DocumentationRenderer, SchemaJSRenderer @@ -82,7 +82,7 @@ def include_docs_urls( permission_classes=permission_classes, ) urls = [ - url(r'^$', docs_view, name='docs-index'), - url(r'^schema.js$', schema_js_view, name='schema-js') + path('', docs_view, name='docs-index'), + path('schema.js', schema_js_view, name='schema-js') ] return include((urls, 'api-docs'), namespace='api-docs') diff --git a/rest_framework/routers.py b/rest_framework/routers.py index 657ad67bc..e2afa573f 100644 --- a/rest_framework/routers.py +++ b/rest_framework/routers.py @@ -16,9 +16,8 @@ For example, you might have a `urls.py` that looks something like this: import itertools from collections import OrderedDict, namedtuple -from django.conf.urls import url from django.core.exceptions import ImproperlyConfigured -from django.urls import NoReverseMatch +from django.urls import NoReverseMatch, re_path from rest_framework import views from rest_framework.response import Response @@ -265,7 +264,7 @@ class SimpleRouter(BaseRouter): view = viewset.as_view(mapping, **initkwargs) name = route.name.format(basename=basename) - ret.append(url(regex, view, name=name)) + ret.append(re_path(regex, view, name=name)) return ret @@ -340,7 +339,7 @@ class DefaultRouter(SimpleRouter): if self.include_root_view: view = self.get_api_root_view(api_urls=urls) - root_url = url(r'^$', view, name=self.root_view_name) + root_url = re_path(r'^$', view, name=self.root_view_name) urls.append(root_url) if self.include_format_suffixes: diff --git a/rest_framework/urlpatterns.py b/rest_framework/urlpatterns.py index efcfd8401..bed5708eb 100644 --- a/rest_framework/urlpatterns.py +++ b/rest_framework/urlpatterns.py @@ -1,5 +1,4 @@ -from django.conf.urls import include, url -from django.urls import URLResolver, path, register_converter +from django.urls import URLResolver, include, path, re_path, register_converter from django.urls.resolvers import RoutePattern from rest_framework.settings import api_settings @@ -52,7 +51,7 @@ def apply_suffix_patterns(urlpatterns, suffix_pattern, suffix_required, suffix_r route = str(urlpattern.pattern) new_pattern = path(route, include((patterns, app_name), namespace), kwargs) else: - new_pattern = url(regex, include((patterns, app_name), namespace), kwargs) + new_pattern = re_path(regex, include((patterns, app_name), namespace), kwargs) ret.append(new_pattern) else: @@ -72,7 +71,7 @@ def apply_suffix_patterns(urlpatterns, suffix_pattern, suffix_required, suffix_r route = str(urlpattern.pattern).rstrip('$').rstrip('/') + suffix_route new_pattern = path(route, view, kwargs, name) else: - new_pattern = url(regex, view, kwargs, name) + new_pattern = re_path(regex, view, kwargs, name) ret.append(new_pattern) diff --git a/rest_framework/urls.py b/rest_framework/urls.py index 482a0a364..d9b858ebc 100644 --- a/rest_framework/urls.py +++ b/rest_framework/urls.py @@ -11,11 +11,11 @@ your API requires authentication: You should make sure your authentication settings include `SessionAuthentication`. """ -from django.conf.urls import url from django.contrib.auth import views +from django.urls import path app_name = 'rest_framework' urlpatterns = [ - url(r'^login/$', views.LoginView.as_view(template_name='rest_framework/login.html'), name='login'), - url(r'^logout/$', views.LogoutView.as_view(), name='logout'), + path('login/', views.LoginView.as_view(template_name='rest_framework/login.html'), name='login'), + path('logout/', views.LogoutView.as_view(), name='logout'), ] From 7f3a3557a050147dd2420aa41d1bf7ddd7f9818e Mon Sep 17 00:00:00 2001 From: johnthagen Date: Tue, 25 Aug 2020 18:15:17 -0400 Subject: [PATCH 007/303] Add drf_ujson2 reference (#7494) --- docs/api-guide/renderers.md | 5 +++-- docs/community/third-party-packages.md | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/docs/api-guide/renderers.md b/docs/api-guide/renderers.md index a508a9ff9..ca3a29b82 100644 --- a/docs/api-guide/renderers.md +++ b/docs/api-guide/renderers.md @@ -503,7 +503,7 @@ Comma-separated values are a plain-text tabular data format, that can be easily ## UltraJSON -[UltraJSON][ultrajson] is an optimized C JSON encoder which can give significantly faster JSON rendering. [Jacob Haslehurst][hzy] maintains the [drf-ujson-renderer][drf-ujson-renderer] package which implements JSON rendering using the UJSON package. +[UltraJSON][ultrajson] is an optimized C JSON encoder which can give significantly faster JSON rendering. [Adam Mertz][Amertz08] maintains [drf_ujson2][drf_ujson2], a fork of the now unmaintained [drf-ujson-renderer][drf-ujson-renderer], which implements JSON rendering using the UJSON package. ## CamelCase JSON @@ -547,8 +547,9 @@ Comma-separated values are a plain-text tabular data format, that can be easily [djangorestframework-msgpack]: https://github.com/juanriaza/django-rest-framework-msgpack [djangorestframework-csv]: https://github.com/mjumbewu/django-rest-framework-csv [ultrajson]: https://github.com/esnme/ultrajson -[hzy]: https://github.com/hzy +[Amertz08]: https://github.com/Amertz08 [drf-ujson-renderer]: https://github.com/gizmag/drf-ujson-renderer +[drf_ujson2]: https://github.com/Amertz08/drf_ujson2 [djangorestframework-camel-case]: https://github.com/vbabiy/djangorestframework-camel-case [Django REST Pandas]: https://github.com/wq/django-rest-pandas [Pandas]: https://pandas.pydata.org/ diff --git a/docs/community/third-party-packages.md b/docs/community/third-party-packages.md index b47dc098f..79cb56e01 100644 --- a/docs/community/third-party-packages.md +++ b/docs/community/third-party-packages.md @@ -240,7 +240,7 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque * [djangorestframework-csv][djangorestframework-csv] - Provides CSV renderer support. * [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. -* [drf_ujson][drf_ujson] - Implements JSON rendering using the UJSON package. +* [drf_ujson2][drf_ujson2] - Implements JSON rendering using the UJSON package. * [rest-pandas][rest-pandas] - Pandas DataFrame-powered renderers including Excel, CSV, and SVG formats. * [djangorestframework-rapidjson][djangorestframework-rapidjson] - Provides rapidjson support with parser and renderer. @@ -313,7 +313,7 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque [djangorestframework-msgpack]: https://github.com/juanriaza/django-rest-framework-msgpack [djangorestframework-camel-case]: https://github.com/vbabiy/djangorestframework-camel-case [djangorestframework-csv]: https://github.com/mjumbewu/django-rest-framework-csv -[drf_ujson]: https://github.com/gizmag/drf-ujson-renderer +[drf_ujson2]: https://github.com/Amertz08/drf_ujson2 [rest-pandas]: https://github.com/wq/django-rest-pandas [djangorestframework-rapidjson]: https://github.com/allisson/django-rest-framework-rapidjson [djangorestframework-chain]: https://github.com/philipn/django-rest-framework-chain From b3e02592d019fc4c66b5f4b11a462691e5cc64f1 Mon Sep 17 00:00:00 2001 From: Bob Thomas Date: Thu, 3 Sep 2020 06:47:11 -0400 Subject: [PATCH 008/303] Add support for Django 3.1 JSONField (#7467) Django 3.1 adds a new generic JSONField to replace the PostgreSQL-specific one. This adds support for the new field type, which should behave the same as the existing PostgreSQL field. Django's new JSONField also includes support for a custom "decoder", so add support for that in the serializer field. --- rest_framework/fields.py | 3 ++- rest_framework/serializers.py | 9 +++++++-- rest_framework/utils/field_mapping.py | 3 ++- tests/test_model_serializer.py | 26 ++++++++++++++++++++++++++ 4 files changed, 37 insertions(+), 4 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index da2dd54be..f218713f1 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -1758,6 +1758,7 @@ class JSONField(Field): def __init__(self, *args, **kwargs): self.binary = kwargs.pop('binary', False) self.encoder = kwargs.pop('encoder', None) + self.decoder = kwargs.pop('decoder', None) super().__init__(*args, **kwargs) def get_value(self, dictionary): @@ -1777,7 +1778,7 @@ class JSONField(Field): if self.binary or getattr(data, 'is_json_string', False): if isinstance(data, bytes): data = data.decode() - return json.loads(data) + return json.loads(data, cls=self.decoder) else: json.dumps(data, cls=self.encoder) except (TypeError, ValueError): diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 916f8bec4..439220b34 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -884,6 +884,8 @@ class ModelSerializer(Serializer): models.GenericIPAddressField: IPAddressField, models.FilePathField: FilePathField, } + if hasattr(models, 'JSONField'): + serializer_field_mapping[models.JSONField] = JSONField if postgres_fields: serializer_field_mapping[postgres_fields.HStoreField] = HStoreField serializer_field_mapping[postgres_fields.ArrayField] = ListField @@ -1242,10 +1244,13 @@ class ModelSerializer(Serializer): # `allow_blank` is only valid for textual fields. field_kwargs.pop('allow_blank', None) - if postgres_fields and isinstance(model_field, postgres_fields.JSONField): + is_django_jsonfield = hasattr(models, 'JSONField') and isinstance(model_field, models.JSONField) + if (postgres_fields and isinstance(model_field, postgres_fields.JSONField)) or is_django_jsonfield: # Populate the `encoder` argument of `JSONField` instances generated - # for the PostgreSQL specific `JSONField`. + # for the model `JSONField`. field_kwargs['encoder'] = getattr(model_field, 'encoder', None) + if is_django_jsonfield: + field_kwargs['decoder'] = getattr(model_field, 'decoder', None) if postgres_fields and isinstance(model_field, postgres_fields.ArrayField): # Populate the `child` argument on `ListField` instances generated diff --git a/rest_framework/utils/field_mapping.py b/rest_framework/utils/field_mapping.py index ed270be5e..c008495cc 100644 --- a/rest_framework/utils/field_mapping.py +++ b/rest_framework/utils/field_mapping.py @@ -92,7 +92,8 @@ def get_field_kwargs(field_name, model_field): kwargs['allow_unicode'] = model_field.allow_unicode if isinstance(model_field, models.TextField) and not model_field.choices or \ - (postgres_fields and isinstance(model_field, postgres_fields.JSONField)): + (postgres_fields and isinstance(model_field, postgres_fields.JSONField)) or \ + (hasattr(models, 'JSONField') and isinstance(model_field, models.JSONField)): kwargs['style'] = {'base_template': 'textarea.html'} if isinstance(model_field, models.AutoField) or not model_field.editable: diff --git a/tests/test_model_serializer.py b/tests/test_model_serializer.py index 51b8f2e22..1733930a6 100644 --- a/tests/test_model_serializer.py +++ b/tests/test_model_serializer.py @@ -7,6 +7,7 @@ an appropriate set of serializer fields for each case. """ import datetime import decimal +import json # noqa import sys import tempfile from collections import OrderedDict @@ -478,6 +479,7 @@ class TestPosgresFieldsMapping(TestCase): """) self.assertEqual(repr(TestSerializer()), expected) + @pytest.mark.skipif(hasattr(models, 'JSONField'), reason='has models.JSONField') def test_json_field(self): class JSONFieldModel(models.Model): json_field = postgres_fields.JSONField() @@ -496,6 +498,30 @@ class TestPosgresFieldsMapping(TestCase): self.assertEqual(repr(TestSerializer()), expected) +class CustomJSONDecoder(json.JSONDecoder): + pass + + +@pytest.mark.skipif(not hasattr(models, 'JSONField'), reason='no models.JSONField') +class TestDjangoJSONFieldMapping(TestCase): + def test_json_field(self): + class JSONFieldModel(models.Model): + json_field = models.JSONField() + json_field_with_encoder = models.JSONField(encoder=DjangoJSONEncoder, decoder=CustomJSONDecoder) + + class TestSerializer(serializers.ModelSerializer): + class Meta: + model = JSONFieldModel + fields = ['json_field', 'json_field_with_encoder'] + + expected = dedent(""" + TestSerializer(): + json_field = JSONField(decoder=None, encoder=None, style={'base_template': 'textarea.html'}) + json_field_with_encoder = JSONField(decoder=, encoder=, style={'base_template': 'textarea.html'}) + """) + self.assertEqual(repr(TestSerializer()), expected) + + # Tests for relational field mappings. # ------------------------------------ From f323049ecc24b48b8453867d0d8952e8e0c1c003 Mon Sep 17 00:00:00 2001 From: Ryan P Kilby Date: Thu, 3 Sep 2020 03:49:15 -0700 Subject: [PATCH 009/303] Fix pk-only optimization for properties (#7142) * Add callable/prop tests for pk-only optimization * Fix related field pk-only optimization for props --- rest_framework/relations.py | 9 +++++-- tests/models.py | 9 +++++++ tests/test_relations_pk.py | 47 +++++++++++++++++++++++++++++++++++++ 3 files changed, 63 insertions(+), 2 deletions(-) diff --git a/rest_framework/relations.py b/rest_framework/relations.py index 3a2a8fb4b..3cd46379d 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -175,8 +175,13 @@ class RelatedField(Field): value = attribute_instance.serializable_value(self.source_attrs[-1]) if is_simple_callable(value): # Handle edge case where the relationship `source` argument - # points to a `get_relationship()` method on the model - value = value().pk + # points to a `get_relationship()` method on the model. + value = value() + + # Handle edge case where relationship `source` argument points + # to an instance instead of a pk (e.g., a `@property`). + value = getattr(value, 'pk', value) + return PKOnlyObject(pk=value) except AttributeError: pass diff --git a/tests/models.py b/tests/models.py index 2c340a3e6..afe649760 100644 --- a/tests/models.py +++ b/tests/models.py @@ -37,6 +37,15 @@ class ManyToManySource(RESTFrameworkModel): class ForeignKeyTarget(RESTFrameworkModel): name = models.CharField(max_length=100) + def get_first_source(self): + """Used for testing related field against a callable.""" + return self.sources.all().order_by('pk')[0] + + @property + def first_source(self): + """Used for testing related field against a property.""" + return self.sources.all().order_by('pk')[0] + class UUIDForeignKeyTarget(RESTFrameworkModel): uuid = models.UUIDField(primary_key=True, default=uuid.uuid4) diff --git a/tests/test_relations_pk.py b/tests/test_relations_pk.py index 0da9da890..7a4878a2b 100644 --- a/tests/test_relations_pk.py +++ b/tests/test_relations_pk.py @@ -30,6 +30,25 @@ class ForeignKeyTargetSerializer(serializers.ModelSerializer): fields = ('id', 'name', 'sources') +class ForeignKeyTargetCallableSourceSerializer(serializers.ModelSerializer): + first_source = serializers.PrimaryKeyRelatedField( + source='get_first_source', + read_only=True, + ) + + class Meta: + model = ForeignKeyTarget + fields = ('id', 'name', 'first_source') + + +class ForeignKeyTargetPropertySourceSerializer(serializers.ModelSerializer): + first_source = serializers.PrimaryKeyRelatedField(read_only=True) + + class Meta: + model = ForeignKeyTarget + fields = ('id', 'name', 'first_source') + + class ForeignKeySourceSerializer(serializers.ModelSerializer): class Meta: model = ForeignKeySource @@ -389,6 +408,34 @@ class PKForeignKeyTests(TestCase): assert len(queryset) == 1 +class PKRelationTests(TestCase): + + def setUp(self): + self.target = ForeignKeyTarget.objects.create(name='target-1') + ForeignKeySource.objects.create(name='source-1', target=self.target) + ForeignKeySource.objects.create(name='source-2', target=self.target) + + def test_relation_field_callable_source(self): + serializer = ForeignKeyTargetCallableSourceSerializer(self.target) + expected = { + 'id': 1, + 'name': 'target-1', + 'first_source': 1, + } + with self.assertNumQueries(1): + self.assertEqual(serializer.data, expected) + + def test_relation_field_property_source(self): + serializer = ForeignKeyTargetPropertySourceSerializer(self.target) + expected = { + 'id': 1, + 'name': 'target-1', + 'first_source': 1, + } + with self.assertNumQueries(1): + self.assertEqual(serializer.data, expected) + + class PKNullableForeignKeyTests(TestCase): def setUp(self): target = ForeignKeyTarget(name='target-1') From 35c0abf24ea4a6c38e6fc2ee22b4aabe73776783 Mon Sep 17 00:00:00 2001 From: Charles Date: Thu, 3 Sep 2020 19:51:03 +0900 Subject: [PATCH 010/303] Change Token.generate_key to a Classmethod (#7502) * adds classmethod decorator to generate_key and test to confirm change is acceptable * self -> cls --- rest_framework/authtoken/models.py | 3 ++- tests/authentication/test_authentication.py | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/rest_framework/authtoken/models.py b/rest_framework/authtoken/models.py index f8a871bf1..fd8a50e0e 100644 --- a/rest_framework/authtoken/models.py +++ b/rest_framework/authtoken/models.py @@ -32,7 +32,8 @@ class Token(models.Model): self.key = self.generate_key() return super().save(*args, **kwargs) - def generate_key(self): + @classmethod + def generate_key(cls): return binascii.hexlify(os.urandom(20)).decode() def __str__(self): diff --git a/tests/authentication/test_authentication.py b/tests/authentication/test_authentication.py index 4760ea319..e872fa744 100644 --- a/tests/authentication/test_authentication.py +++ b/tests/authentication/test_authentication.py @@ -397,6 +397,10 @@ class TokenAuthTests(BaseTokenAuthTests, TestCase): key = token.generate_key() assert isinstance(key, str) + def test_generate_key_accessible_as_classmethod(self): + key = self.model.generate_key() + assert isinstance(key, str) + def test_token_login_json(self): """Ensure token login view using JSON POST works.""" client = APIClient(enforce_csrf_checks=True) From b8ab30683a03f8c6af2dda27ba893920ea83bc92 Mon Sep 17 00:00:00 2001 From: David Smith Date: Thu, 13 Aug 2020 21:33:25 +0100 Subject: [PATCH 011/303] default_app_config application variable is deprecated in Django 3.2 --- rest_framework/__init__.py | 6 +++++- rest_framework/authtoken/__init__.py | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py index 8f2bc4466..483276e14 100644 --- a/rest_framework/__init__.py +++ b/rest_framework/__init__.py @@ -7,6 +7,8 @@ ______ _____ _____ _____ __ \_| \_\____/\____/ \_/ |_| |_| \__,_|_| |_| |_|\___| \_/\_/ \___/|_| |_|\_| """ +import django + __title__ = 'Django REST framework' __version__ = '3.11.0' __author__ = 'Tom Christie' @@ -22,7 +24,9 @@ HTTP_HEADER_ENCODING = 'iso-8859-1' # Default datetime input and output formats ISO_8601 = 'iso-8601' -default_app_config = 'rest_framework.apps.RestFrameworkConfig' + +if django.VERSION < (3, 2): + default_app_config = 'rest_framework.apps.RestFrameworkConfig' class RemovedInDRF313Warning(DeprecationWarning): diff --git a/rest_framework/authtoken/__init__.py b/rest_framework/authtoken/__init__.py index 82f5b9171..285fe15c6 100644 --- a/rest_framework/authtoken/__init__.py +++ b/rest_framework/authtoken/__init__.py @@ -1 +1,4 @@ -default_app_config = 'rest_framework.authtoken.apps.AuthTokenConfig' +import django + +if django.VERSION < (3, 2): + default_app_config = 'rest_framework.authtoken.apps.AuthTokenConfig' From d5461e93fea2367fb0a5c7ef28d49c6be150273c Mon Sep 17 00:00:00 2001 From: David Smith <39445562+smithdc1@users.noreply.github.com> Date: Sat, 5 Sep 2020 09:02:27 +0100 Subject: [PATCH 012/303] Bump flake8 to 3.8.3 (#7521) --- requirements/requirements-codestyle.txt | 4 ++-- rest_framework/renderers.py | 4 ++-- rest_framework/utils/field_mapping.py | 1 - tests/test_fields.py | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/requirements/requirements-codestyle.txt b/requirements/requirements-codestyle.txt index 434fc41af..4f54d6e77 100644 --- a/requirements/requirements-codestyle.txt +++ b/requirements/requirements-codestyle.txt @@ -1,7 +1,7 @@ # PEP8 code linting, which we run on all commits. -flake8==3.7.9 +flake8==3.8.3 flake8-tidy-imports==4.1.0 -pycodestyle==2.5.0 +pycodestyle==2.6.0 # Sort and lint imports isort==5.4.2 diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index a96fa6e65..c790879b9 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -856,8 +856,8 @@ class DocumentationRenderer(BaseRenderer): return { 'document': data, 'langs': self.languages, - 'lang_htmls': ["rest_framework/docs/langs/%s.html" % l for l in self.languages], - 'lang_intro_htmls': ["rest_framework/docs/langs/%s-intro.html" % l for l in self.languages], + 'lang_htmls': ["rest_framework/docs/langs/%s.html" % language for language in self.languages], + 'lang_intro_htmls': ["rest_framework/docs/langs/%s-intro.html" % language for language in self.languages], 'code_style': pygments_css(self.code_style), 'request': request } diff --git a/rest_framework/utils/field_mapping.py b/rest_framework/utils/field_mapping.py index c008495cc..4f8a4f192 100644 --- a/rest_framework/utils/field_mapping.py +++ b/rest_framework/utils/field_mapping.py @@ -58,7 +58,6 @@ def get_detail_view_name(model): that refer to instances of the model. """ return '%(model_name)s-detail' % { - 'app_label': model._meta.app_label, 'model_name': model._meta.object_name.lower() } diff --git a/tests/test_fields.py b/tests/test_fields.py index b1ad1dc66..506e75905 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -669,7 +669,7 @@ class TestBooleanField(FieldValues): for input_value in inputs: with pytest.raises(serializers.ValidationError) as exc_info: field.run_validation(input_value) - expected = ['Must be a valid boolean.'.format(input_value)] + expected = ['Must be a valid boolean.'] assert exc_info.value.detail == expected From 9990b5928139072c8e010c8b5c86616f0d40ef9d Mon Sep 17 00:00:00 2001 From: David Smith <39445562+smithdc1@users.noreply.github.com> Date: Mon, 7 Sep 2020 19:00:17 +0100 Subject: [PATCH 013/303] Dropped test compatibility shims for Django <2.2. (#7523) --- tests/conftest.py | 29 +++++++++++++---------------- tests/schemas/test_coreapi.py | 1 - tests/test_model_serializer.py | 22 +--------------------- tests/test_permissions.py | 7 ------- tests/test_urlpatterns.py | 9 --------- 5 files changed, 14 insertions(+), 54 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index d28edeb8a..ac29e4a42 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -67,22 +67,19 @@ def pytest_configure(config): ) # guardian is optional - # Note that for the test cases we're installing a version of django-guardian - # that's only compatible with Django 2.0+. - if django.VERSION >= (2, 0, 0): - try: - import guardian # NOQA - except ImportError: - pass - else: - settings.ANONYMOUS_USER_ID = -1 - settings.AUTHENTICATION_BACKENDS = ( - 'django.contrib.auth.backends.ModelBackend', - 'guardian.backends.ObjectPermissionBackend', - ) - settings.INSTALLED_APPS += ( - 'guardian', - ) + try: + import guardian # NOQA + except ImportError: + pass + else: + settings.ANONYMOUS_USER_ID = -1 + settings.AUTHENTICATION_BACKENDS = ( + 'django.contrib.auth.backends.ModelBackend', + 'guardian.backends.ObjectPermissionBackend', + ) + settings.INSTALLED_APPS += ( + 'guardian', + ) if config.getoption('--no-pkgroot'): sys.path.pop(0) diff --git a/tests/schemas/test_coreapi.py b/tests/schemas/test_coreapi.py index 403b3b634..5f646258b 100644 --- a/tests/schemas/test_coreapi.py +++ b/tests/schemas/test_coreapi.py @@ -456,7 +456,6 @@ class TestSchemaGenerator(TestCase): @unittest.skipUnless(coreapi, 'coreapi is not installed') -@unittest.skipUnless(path, 'needs Django 2') @override_settings(REST_FRAMEWORK={'DEFAULT_SCHEMA_CLASS': 'rest_framework.schemas.AutoSchema'}) class TestSchemaGeneratorDjango2(TestCase): def setUp(self): diff --git a/tests/test_model_serializer.py b/tests/test_model_serializer.py index 1733930a6..7da1b41ae 100644 --- a/tests/test_model_serializer.py +++ b/tests/test_model_serializer.py @@ -12,7 +12,6 @@ import sys import tempfile from collections import OrderedDict -import django import pytest from django.core.exceptions import ImproperlyConfigured from django.core.serializers.json import DjangoJSONEncoder @@ -63,7 +62,7 @@ class RegularFieldsModel(models.Model): email_field = models.EmailField(max_length=100) float_field = models.FloatField() integer_field = models.IntegerField() - null_boolean_field = models.NullBooleanField() + null_boolean_field = models.BooleanField(null=True, default=False) positive_integer_field = models.PositiveIntegerField() positive_small_integer_field = models.PositiveSmallIntegerField() slug_field = models.SlugField(max_length=100) @@ -218,25 +217,6 @@ class TestRegularFieldMappings(TestCase): """) self.assertEqual(repr(TestSerializer()), expected) - # merge this into test_regular_fields / RegularFieldsModel when - # Django 2.1 is the minimum supported version - @pytest.mark.skipif(django.VERSION < (2, 1), reason='Django version < 2.1') - def test_nullable_boolean_field(self): - class NullableBooleanModel(models.Model): - field = models.BooleanField(null=True, default=False) - - class NullableBooleanSerializer(serializers.ModelSerializer): - class Meta: - model = NullableBooleanModel - fields = ['field'] - - expected = dedent(""" - NullableBooleanSerializer(): - field = BooleanField(allow_null=True, required=False) - """) - - self.assertEqual(repr(NullableBooleanSerializer()), expected) - def test_nullable_boolean_field_choices(self): class NullableBooleanChoicesModel(models.Model): CHECKLIST_OPTIONS = ( diff --git a/tests/test_permissions.py b/tests/test_permissions.py index 232c72dd2..4e6cae4b8 100644 --- a/tests/test_permissions.py +++ b/tests/test_permissions.py @@ -2,7 +2,6 @@ import base64 import unittest from unittest import mock -import django from django.conf import settings from django.contrib.auth.models import AnonymousUser, Group, Permission, User from django.db import models @@ -248,12 +247,6 @@ class BasicPermModel(models.Model): class Meta: app_label = 'tests' - if django.VERSION < (2, 1): - permissions = ( - ('view_basicpermmodel', 'Can view basic perm model'), - # add, change, delete built in to django - ) - class BasicPermSerializer(serializers.ModelSerializer): class Meta: diff --git a/tests/test_urlpatterns.py b/tests/test_urlpatterns.py index ec19494b0..90820b532 100644 --- a/tests/test_urlpatterns.py +++ b/tests/test_urlpatterns.py @@ -1,4 +1,3 @@ -import unittest from collections import namedtuple from django.conf.urls import include, url @@ -66,7 +65,6 @@ class FormatSuffixTests(TestCase): ] self._test_trailing_slash(urlpatterns) - @unittest.skipUnless(path, 'needs Django 2') def test_trailing_slash_django2(self): urlpatterns = [ path('test/', dummy_view), @@ -87,14 +85,12 @@ class FormatSuffixTests(TestCase): ] self._test_format_suffix(urlpatterns) - @unittest.skipUnless(path, 'needs Django 2') def test_format_suffix_django2(self): urlpatterns = [ path('test', dummy_view), ] self._test_format_suffix(urlpatterns) - @unittest.skipUnless(path, 'needs Django 2') def test_format_suffix_django2_args(self): urlpatterns = [ path('convtest/', dummy_view), @@ -124,7 +120,6 @@ class FormatSuffixTests(TestCase): ] self._test_default_args(urlpatterns) - @unittest.skipUnless(path, 'needs Django 2') def test_default_args_django2(self): urlpatterns = [ path('test', dummy_view, {'foo': 'bar'}), @@ -148,7 +143,6 @@ class FormatSuffixTests(TestCase): ] self._test_included_urls(urlpatterns) - @unittest.skipUnless(path, 'needs Django 2') def test_included_urls_django2(self): nested_patterns = [ path('path', dummy_view) @@ -158,7 +152,6 @@ class FormatSuffixTests(TestCase): ] self._test_included_urls(urlpatterns) - @unittest.skipUnless(path, 'needs Django 2') def test_included_urls_django2_mixed(self): nested_patterns = [ path('path', dummy_view) @@ -168,7 +161,6 @@ class FormatSuffixTests(TestCase): ] self._test_included_urls(urlpatterns) - @unittest.skipUnless(path, 'needs Django 2') def test_included_urls_django2_mixed_args(self): nested_patterns = [ path('path/', dummy_view), @@ -216,7 +208,6 @@ class FormatSuffixTests(TestCase): ] self._test_allowed_formats(urlpatterns) - @unittest.skipUnless(path, 'needs Django 2') def test_allowed_formats_django2(self): urlpatterns = [ path('test', dummy_view), From 410575dace9d64a53ec771ea5e21b40525ed0e95 Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Tue, 8 Sep 2020 15:32:27 +0100 Subject: [PATCH 014/303] Replace all url() calls with path() or re_path() (#7512) * url() is deprecated in Django 3.1 * update given feedbacks on url() is deprecated in Django 3.1 * Fix test_urlpatterns.py to continue testing mixed re_path() and path() * Fix one missed reference Co-authored-by: sanjusci --- docs/api-guide/authentication.md | 4 +- docs/api-guide/filtering.md | 2 +- docs/api-guide/format-suffixes.md | 6 +- docs/api-guide/generic-views.md | 2 +- docs/api-guide/parsers.md | 2 +- docs/api-guide/routers.md | 14 ++--- docs/api-guide/schemas.md | 2 +- docs/community/3.5-announcement.md | 6 +- docs/community/3.6-announcement.md | 2 +- docs/community/3.9-announcement.md | 3 +- docs/coreapi/from-documenting-your-api.md | 4 +- docs/coreapi/schemas.md | 9 +-- docs/index.md | 2 +- docs/topics/api-clients.md | 2 +- .../4-authentication-and-permissions.md | 2 +- .../templates/rest_framework/docs/error.html | 2 +- rest_framework/urls.py | 2 +- rest_framework/versioning.py | 12 ++-- tests/authentication/test_authentication.py | 30 ++++----- tests/browsable_api/auth_urls.py | 6 +- tests/browsable_api/no_auth_urls.py | 4 +- .../test_browsable_nested_api.py | 4 +- tests/schemas/test_coreapi.py | 61 +++++++++--------- tests/schemas/test_managementcommand.py | 4 +- tests/schemas/test_openapi.py | 40 ++++++------ tests/test_api_client.py | 16 ++--- tests/test_atomic_requests.py | 4 +- tests/test_fields.py | 2 +- tests/test_htmlrenderer.py | 8 +-- tests/test_lazy_hyperlinks.py | 4 +- tests/test_metadata.py | 3 +- tests/test_middleware.py | 6 +- tests/test_relations.py | 4 +- tests/test_relations_hyperlink.py | 18 +++--- tests/test_renderers.py | 20 +++--- tests/test_request.py | 8 +-- tests/test_requests_client.py | 10 +-- tests/test_response.py | 20 +++--- tests/test_reverse.py | 5 +- tests/test_routers.py | 23 ++++--- tests/test_testing.py | 12 ++-- tests/test_urlpatterns.py | 63 +++++++------------ tests/test_utils.py | 14 ++--- tests/test_versioning.py | 30 ++++----- tests/test_viewsets.py | 4 +- tests/urls.py | 4 +- 46 files changed, 243 insertions(+), 262 deletions(-) diff --git a/docs/api-guide/authentication.md b/docs/api-guide/authentication.md index ebb0ab4d6..5878040a4 100644 --- a/docs/api-guide/authentication.md +++ b/docs/api-guide/authentication.md @@ -199,7 +199,7 @@ When using `TokenAuthentication`, you may want to provide a mechanism for client from rest_framework.authtoken import views urlpatterns += [ - url(r'^api-token-auth/', views.obtain_auth_token) + path('api-token-auth/', views.obtain_auth_token) ] Note that the URL part of the pattern can be whatever you want to use. @@ -238,7 +238,7 @@ For example, you may return additional user information beyond the `token` value And in your `urls.py`: urlpatterns += [ - url(r'^api-token-auth/', CustomAuthToken.as_view()) + path('api-token-auth/', CustomAuthToken.as_view()) ] diff --git a/docs/api-guide/filtering.md b/docs/api-guide/filtering.md index 8e3bd9ef5..41c1341dd 100644 --- a/docs/api-guide/filtering.md +++ b/docs/api-guide/filtering.md @@ -45,7 +45,7 @@ Another style of filtering might involve restricting the queryset based on some For example if your URL config contained an entry like this: - url('^purchases/(?P.+)/$', PurchaseList.as_view()), + re_path('^purchases/(?P.+)/$', PurchaseList.as_view()), You could then write a view that returned a purchase queryset filtered by the username portion of the URL: diff --git a/docs/api-guide/format-suffixes.md b/docs/api-guide/format-suffixes.md index 04467b3d3..dfdf24953 100644 --- a/docs/api-guide/format-suffixes.md +++ b/docs/api-guide/format-suffixes.md @@ -32,9 +32,9 @@ Example: from blog import views urlpatterns = [ - url(r'^/$', views.apt_root), - url(r'^comments/$', views.comment_list), - url(r'^comments/(?P[0-9]+)/$', views.comment_detail) + path('', views.apt_root), + path('comments/', views.comment_list), + path('comments//', views.comment_detail) ] urlpatterns = format_suffix_patterns(urlpatterns, allowed=['json', 'html']) diff --git a/docs/api-guide/generic-views.md b/docs/api-guide/generic-views.md index 4ff549f07..afc2cab56 100644 --- a/docs/api-guide/generic-views.md +++ b/docs/api-guide/generic-views.md @@ -45,7 +45,7 @@ For more complex cases you might also want to override various methods on the vi For very simple cases you might want to pass through any class attributes using the `.as_view()` method. For example, your URLconf might include something like the following entry: - url(r'^/users/', ListCreateAPIView.as_view(queryset=User.objects.all(), serializer_class=UserSerializer), name='user-list') + path('users/', ListCreateAPIView.as_view(queryset=User.objects.all(), serializer_class=UserSerializer), name='user-list') --- diff --git a/docs/api-guide/parsers.md b/docs/api-guide/parsers.md index a3bc74a2b..e8f03de8b 100644 --- a/docs/api-guide/parsers.md +++ b/docs/api-guide/parsers.md @@ -125,7 +125,7 @@ If it is called without a `filename` URL keyword argument, then the client must # urls.py urlpatterns = [ # ... - url(r'^upload/(?P[^/]+)$', FileUploadView.as_view()) + re_path(r'^upload/(?P[^/]+)$', FileUploadView.as_view()) ] --- diff --git a/docs/api-guide/routers.md b/docs/api-guide/routers.md index 5f6802222..8d8594eee 100644 --- a/docs/api-guide/routers.md +++ b/docs/api-guide/routers.md @@ -63,7 +63,7 @@ For example, you can append `router.urls` to a list of existing views... router.register(r'accounts', AccountViewSet) urlpatterns = [ - url(r'^forgot-password/$', ForgotPasswordFormView.as_view()), + path('forgot-password/', ForgotPasswordFormView.as_view()), ] urlpatterns += router.urls @@ -71,22 +71,22 @@ For example, you can append `router.urls` to a list of existing views... Alternatively you can use Django's `include` function, like so... urlpatterns = [ - url(r'^forgot-password/$', ForgotPasswordFormView.as_view()), - url(r'^', include(router.urls)), + path('forgot-password', ForgotPasswordFormView.as_view()), + path('', include(router.urls)), ] You may use `include` with an application namespace: urlpatterns = [ - url(r'^forgot-password/$', ForgotPasswordFormView.as_view()), - url(r'^api/', include((router.urls, 'app_name'))), + path('forgot-password/', ForgotPasswordFormView.as_view()), + path('api/', include((router.urls, 'app_name'))), ] Or both an application and instance namespace: urlpatterns = [ - url(r'^forgot-password/$', ForgotPasswordFormView.as_view()), - url(r'^api/', include((router.urls, 'app_name'), namespace='instance_name')), + path('forgot-password/', ForgotPasswordFormView.as_view()), + path('api/', include((router.urls, 'app_name'), namespace='instance_name')), ] See Django's [URL namespaces docs][url-namespace-docs] and the [`include` API reference][include-api-reference] for more details. diff --git a/docs/api-guide/schemas.md b/docs/api-guide/schemas.md index 402315ef9..e39cd21a8 100644 --- a/docs/api-guide/schemas.md +++ b/docs/api-guide/schemas.md @@ -114,7 +114,7 @@ The `get_schema_view()` helper takes the following keyword arguments: only want the `myproject.api` urls to be exposed in the schema: schema_url_patterns = [ - url(r'^api/', include('myproject.api.urls')), + path('api/', include('myproject.api.urls')), ] schema_view = get_schema_view( diff --git a/docs/community/3.5-announcement.md b/docs/community/3.5-announcement.md index cce2dd050..91bfce428 100644 --- a/docs/community/3.5-announcement.md +++ b/docs/community/3.5-announcement.md @@ -69,7 +69,7 @@ schema_view = get_schema_view( ) urlpatterns = [ - url(r'^swagger/$', schema_view), + path('swagger/', schema_view), ... ] ``` @@ -198,8 +198,8 @@ Make sure to include the view before your router urls. For example: schema_view = get_schema_view(title='Example API') urlpatterns = [ - url('^$', schema_view), - url(r'^', include(router.urls)), + path('', schema_view), + path('', include(router.urls)), ] ### Schema path representations diff --git a/docs/community/3.6-announcement.md b/docs/community/3.6-announcement.md index c41ad8ecb..35704eb58 100644 --- a/docs/community/3.6-announcement.md +++ b/docs/community/3.6-announcement.md @@ -73,7 +73,7 @@ To install the API documentation, you'll need to include it in your projects URL urlpatterns = [ ... - url(r'^docs/', include_docs_urls(title=API_TITLE, description=API_DESCRIPTION)) + path('docs/', include_docs_urls(title=API_TITLE, description=API_DESCRIPTION)) ] Once installed you should see something a little like this: diff --git a/docs/community/3.9-announcement.md b/docs/community/3.9-announcement.md index 1cf4464d6..fee6e6909 100644 --- a/docs/community/3.9-announcement.md +++ b/docs/community/3.9-announcement.md @@ -62,6 +62,7 @@ Here's an example of adding an OpenAPI schema to the URL conf: ```python from rest_framework.schemas import get_schema_view from rest_framework.renderers import JSONOpenAPIRenderer +from django.urls import path schema_view = get_schema_view( title='Server Monitoring API', @@ -70,7 +71,7 @@ schema_view = get_schema_view( ) urlpatterns = [ - url('^schema.json$', schema_view), + path('schema.json', schema_view), ... ] ``` diff --git a/docs/coreapi/from-documenting-your-api.md b/docs/coreapi/from-documenting-your-api.md index 9ac3be686..604dfa668 100644 --- a/docs/coreapi/from-documenting-your-api.md +++ b/docs/coreapi/from-documenting-your-api.md @@ -19,7 +19,7 @@ To install the API documentation, you'll need to include it in your project's UR urlpatterns = [ ... - url(r'^docs/', include_docs_urls(title='My API title')) + path('docs/', include_docs_urls(title='My API title')) ] This will include two different views: @@ -41,7 +41,7 @@ You may ensure views are given a `request` instance by calling `include_docs_url urlpatterns = [ ... # Generate schema with valid `request` instance: - url(r'^docs/', include_docs_urls(title='My API title', public=False)) + path('docs/', include_docs_urls(title='My API title', public=False)) ] diff --git a/docs/coreapi/schemas.md b/docs/coreapi/schemas.md index 69606f853..e7a418b80 100644 --- a/docs/coreapi/schemas.md +++ b/docs/coreapi/schemas.md @@ -43,11 +43,12 @@ To add a dynamically generated schema view to your API, use `get_schema_view`. ```python from rest_framework.schemas import get_schema_view +from django.urls import path schema_view = get_schema_view(title="Example API") urlpatterns = [ - url('^schema$', schema_view), + path('schema', schema_view), ... ] ``` @@ -292,7 +293,7 @@ The simplest way to include a schema in your project is to use the schema_view = get_schema_view(title="Server Monitoring API") urlpatterns = [ - url('^$', schema_view), + path('', schema_view), ... ] @@ -358,7 +359,7 @@ List of url patterns to limit the schema introspection to. If you only want the to be exposed in the schema: schema_url_patterns = [ - url(r'^api/', include('myproject.api.urls')), + path('api/', include('myproject.api.urls')), ] schema_view = get_schema_view( @@ -411,7 +412,7 @@ return the schema. **urls.py:** urlpatterns = [ - url('/', schema_view), + path('', schema_view), ... ] diff --git a/docs/index.md b/docs/index.md index c7b78e9c3..54654c7c5 100644 --- a/docs/index.md +++ b/docs/index.md @@ -120,7 +120,7 @@ If you're intending to use the browsable API you'll probably also want to add RE urlpatterns = [ ... - url(r'^api-auth/', include('rest_framework.urls')) + path('api-auth/', include('rest_framework.urls')) ] Note that the URL path can be whatever you want. diff --git a/docs/topics/api-clients.md b/docs/topics/api-clients.md index b020c380a..9b61eaf42 100644 --- a/docs/topics/api-clients.md +++ b/docs/topics/api-clients.md @@ -384,7 +384,7 @@ First, install the API documentation views. These will include the schema resour urlpatterns = [ ... - url(r'^docs/', include_docs_urls(title='My API service'), name='api-docs'), + path('docs/', include_docs_urls(title='My API service'), name='api-docs'), ] Once the API documentation URLs are installed, you'll be able to include both the required JavaScript resources. Note that the ordering of these two lines is important, as the schema loading requires CoreAPI to already be installed. diff --git a/docs/tutorial/4-authentication-and-permissions.md b/docs/tutorial/4-authentication-and-permissions.md index 6808780fa..79ce355c9 100644 --- a/docs/tutorial/4-authentication-and-permissions.md +++ b/docs/tutorial/4-authentication-and-permissions.md @@ -137,7 +137,7 @@ We can add a login view for use with the browsable API, by editing the URLconf i Add the following import at the top of the file: - from django.conf.urls import include + from django.urls import path, include And, at the end of the file, add a pattern to include the login and logout views for the browsable API. diff --git a/rest_framework/templates/rest_framework/docs/error.html b/rest_framework/templates/rest_framework/docs/error.html index 6afc4a88b..694f88a15 100644 --- a/rest_framework/templates/rest_framework/docs/error.html +++ b/rest_framework/templates/rest_framework/docs/error.html @@ -48,7 +48,7 @@ being applied unexpectedly?

when including the docs urls:

-   url(r'^docs/', include_docs_urls(title='Your API',
+   path('docs/', include_docs_urls(title='Your API',
                                     authentication_classes=[],
                                     permission_classes=[])),
diff --git a/rest_framework/urls.py b/rest_framework/urls.py index d9b858ebc..0aa301332 100644 --- a/rest_framework/urls.py +++ b/rest_framework/urls.py @@ -6,7 +6,7 @@ your API requires authentication: urlpatterns = [ ... - url(r'^auth/', include('rest_framework.urls')) + path('auth/', include('rest_framework.urls')) ] You should make sure your authentication settings include `SessionAuthentication`. diff --git a/rest_framework/versioning.py b/rest_framework/versioning.py index 8c35a1a58..78cfc9dc8 100644 --- a/rest_framework/versioning.py +++ b/rest_framework/versioning.py @@ -60,8 +60,8 @@ class URLPathVersioning(BaseVersioning): An example URL conf for two views that accept two different versions. urlpatterns = [ - url(r'^(?P[v1|v2]+)/users/$', users_list, name='users-list'), - url(r'^(?P[v1|v2]+)/users/(?P[0-9]+)/$', users_detail, name='users-detail') + re_path(r'^(?P[v1|v2]+)/users/$', users_list, name='users-list'), + re_path(r'^(?P[v1|v2]+)/users/(?P[0-9]+)/$', users_detail, name='users-detail') ] GET /1.0/something/ HTTP/1.1 @@ -99,14 +99,14 @@ class NamespaceVersioning(BaseVersioning): # users/urls.py urlpatterns = [ - url(r'^/users/$', users_list, name='users-list'), - url(r'^/users/(?P[0-9]+)/$', users_detail, name='users-detail') + path('/users/', users_list, name='users-list'), + path('/users//', users_detail, name='users-detail') ] # urls.py urlpatterns = [ - url(r'^v1/', include('users.urls', namespace='v1')), - url(r'^v2/', include('users.urls', namespace='v2')) + path('v1/', include('users.urls', namespace='v1')), + path('v2/', include('users.urls', namespace='v2')) ] GET /1.0/something/ HTTP/1.1 diff --git a/tests/authentication/test_authentication.py b/tests/authentication/test_authentication.py index e872fa744..a73e0d79c 100644 --- a/tests/authentication/test_authentication.py +++ b/tests/authentication/test_authentication.py @@ -2,10 +2,10 @@ import base64 import pytest from django.conf import settings -from django.conf.urls import include, url from django.contrib.auth.models import User from django.http import HttpResponse from django.test import TestCase, override_settings +from django.urls import include, path from rest_framework import ( HTTP_HEADER_ENCODING, exceptions, permissions, renderers, status @@ -47,34 +47,34 @@ class MockView(APIView): urlpatterns = [ - url( - r'^session/$', + path( + 'session/', MockView.as_view(authentication_classes=[SessionAuthentication]) ), - url( - r'^basic/$', + path( + 'basic/', MockView.as_view(authentication_classes=[BasicAuthentication]) ), - url( - r'^remote-user/$', + path( + 'remote-user/', MockView.as_view(authentication_classes=[RemoteUserAuthentication]) ), - url( - r'^token/$', + path( + 'token/', MockView.as_view(authentication_classes=[TokenAuthentication]) ), - url( - r'^customtoken/$', + path( + 'customtoken/', MockView.as_view(authentication_classes=[CustomTokenAuthentication]) ), - url( - r'^customkeywordtoken/$', + path( + 'customkeywordtoken/', MockView.as_view( authentication_classes=[CustomKeywordTokenAuthentication] ) ), - url(r'^auth-token/$', obtain_auth_token), - url(r'^auth/', include('rest_framework.urls', namespace='rest_framework')), + path('auth-token/', obtain_auth_token), + path('auth/', include('rest_framework.urls', namespace='rest_framework')), ] diff --git a/tests/browsable_api/auth_urls.py b/tests/browsable_api/auth_urls.py index 7530c5e40..151278cbd 100644 --- a/tests/browsable_api/auth_urls.py +++ b/tests/browsable_api/auth_urls.py @@ -1,8 +1,8 @@ -from django.conf.urls import include, url +from django.urls import include, path from .views import MockView urlpatterns = [ - url(r'^$', MockView.as_view()), - url(r'^auth/', include('rest_framework.urls', namespace='rest_framework')), + path('', MockView.as_view()), + path('auth/', include('rest_framework.urls', namespace='rest_framework')), ] diff --git a/tests/browsable_api/no_auth_urls.py b/tests/browsable_api/no_auth_urls.py index 348bfe1c0..65701c065 100644 --- a/tests/browsable_api/no_auth_urls.py +++ b/tests/browsable_api/no_auth_urls.py @@ -1,7 +1,7 @@ -from django.conf.urls import url +from django.urls import path from .views import MockView urlpatterns = [ - url(r'^$', MockView.as_view()), + path('', MockView.as_view()), ] diff --git a/tests/browsable_api/test_browsable_nested_api.py b/tests/browsable_api/test_browsable_nested_api.py index f945d2a43..a6c2ee6bd 100644 --- a/tests/browsable_api/test_browsable_nested_api.py +++ b/tests/browsable_api/test_browsable_nested_api.py @@ -1,6 +1,6 @@ -from django.conf.urls import url from django.test import TestCase from django.test.utils import override_settings +from django.urls import path from rest_framework import serializers from rest_framework.generics import ListCreateAPIView @@ -23,7 +23,7 @@ class NestedSerializersView(ListCreateAPIView): urlpatterns = [ - url(r'^api/$', NestedSerializersView.as_view(), name='api'), + path('api/', NestedSerializersView.as_view(), name='api'), ] diff --git a/tests/schemas/test_coreapi.py b/tests/schemas/test_coreapi.py index 5f646258b..7b1f15fef 100644 --- a/tests/schemas/test_coreapi.py +++ b/tests/schemas/test_coreapi.py @@ -1,11 +1,10 @@ import unittest import pytest -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 django.urls import path +from django.urls import include, path from rest_framework import ( filters, generics, pagination, permissions, serializers @@ -145,8 +144,8 @@ with override_settings(REST_FRAMEWORK={'DEFAULT_SCHEMA_CLASS': 'rest_framework.s router = DefaultRouter() router.register('example', ExampleViewSet, basename='example') urlpatterns = [ - url(r'^$', schema_view), - url(r'^', include(router.urls)) + path('', schema_view), + path('', include(router.urls)) ] @@ -407,9 +406,9 @@ class ExampleDetailView(APIView): class TestSchemaGenerator(TestCase): def setUp(self): self.patterns = [ - url(r'^example/?$', views.ExampleListView.as_view()), - url(r'^example/(?P\d+)/?$', views.ExampleDetailView.as_view()), - url(r'^example/(?P\d+)/sub/?$', views.ExampleDetailView.as_view()), + path('example/', views.ExampleListView.as_view()), + path('example//', views.ExampleDetailView.as_view()), + path('example//sub/', views.ExampleDetailView.as_view()), ] def test_schema_for_regular_views(self): @@ -513,9 +512,9 @@ class TestSchemaGeneratorDjango2(TestCase): class TestSchemaGeneratorNotAtRoot(TestCase): def setUp(self): self.patterns = [ - url(r'^api/v1/example/?$', views.ExampleListView.as_view()), - url(r'^api/v1/example/(?P\d+)/?$', views.ExampleDetailView.as_view()), - url(r'^api/v1/example/(?P\d+)/sub/?$', views.ExampleDetailView.as_view()), + path('api/v1/example/', views.ExampleListView.as_view()), + path('api/v1/example//', views.ExampleDetailView.as_view()), + path('api/v1/example//sub/', views.ExampleDetailView.as_view()), ] def test_schema_for_regular_views(self): @@ -569,7 +568,7 @@ class TestSchemaGeneratorWithMethodLimitedViewSets(TestCase): router = DefaultRouter() router.register('example1', MethodLimitedViewSet, basename='example1') self.patterns = [ - url(r'^', include(router.urls)) + path('', include(router.urls)) ] def test_schema_for_regular_views(self): @@ -635,8 +634,8 @@ class TestSchemaGeneratorWithRestrictedViewSets(TestCase): router.register('example1', Http404ExampleViewSet, basename='example1') router.register('example2', PermissionDeniedExampleViewSet, basename='example2') self.patterns = [ - url('^example/?$', views.ExampleListView.as_view()), - url(r'^', include(router.urls)) + path('example/', views.ExampleListView.as_view()), + path('', include(router.urls)) ] def test_schema_for_regular_views(self): @@ -679,7 +678,7 @@ class ForeignKeySourceView(generics.CreateAPIView): class TestSchemaGeneratorWithForeignKey(TestCase): def setUp(self): self.patterns = [ - url(r'^example/?$', ForeignKeySourceView.as_view()), + path('example/', ForeignKeySourceView.as_view()), ] def test_schema_for_regular_views(self): @@ -725,7 +724,7 @@ class ManyToManySourceView(generics.CreateAPIView): class TestSchemaGeneratorWithManyToMany(TestCase): def setUp(self): self.patterns = [ - url(r'^example/?$', ManyToManySourceView.as_view()), + path('example/', ManyToManySourceView.as_view()), ] def test_schema_for_regular_views(self): @@ -1041,9 +1040,9 @@ with override_settings(REST_FRAMEWORK={'DEFAULT_SCHEMA_CLASS': 'rest_framework.s class SchemaGenerationExclusionTests(TestCase): def setUp(self): self.patterns = [ - url('^excluded-cbv/$', ExcludedAPIView.as_view()), - url('^excluded-fbv/$', excluded_fbv), - url('^included-fbv/$', included_fbv), + path('excluded-cbv/', ExcludedAPIView.as_view()), + path('excluded-fbv/', excluded_fbv), + path('included-fbv/', included_fbv), ] def test_schema_generator_excludes_correctly(self): @@ -1136,8 +1135,8 @@ class TestURLNamingCollisions(TestCase): pass patterns = [ - url(r'^test', simple_fbv), - url(r'^test/list/', simple_fbv), + path('test', simple_fbv), + path('test/list/', simple_fbv), ] generator = SchemaGenerator(title='Naming Colisions', patterns=patterns) @@ -1173,14 +1172,14 @@ class TestURLNamingCollisions(TestCase): def test_manually_routing_generic_view(self): patterns = [ - url(r'^test', NamingCollisionView.as_view()), - url(r'^test/retrieve/', NamingCollisionView.as_view()), - url(r'^test/update/', NamingCollisionView.as_view()), + path('test', NamingCollisionView.as_view()), + path('test/retrieve/', NamingCollisionView.as_view()), + path('test/update/', NamingCollisionView.as_view()), # Fails with method names: - url(r'^test/get/', NamingCollisionView.as_view()), - url(r'^test/put/', NamingCollisionView.as_view()), - url(r'^test/delete/', NamingCollisionView.as_view()), + path('test/get/', NamingCollisionView.as_view()), + path('test/put/', NamingCollisionView.as_view()), + path('test/delete/', NamingCollisionView.as_view()), ] generator = SchemaGenerator(title='Naming Colisions', patterns=patterns) @@ -1196,7 +1195,7 @@ class TestURLNamingCollisions(TestCase): def test_from_router(self): patterns = [ - url(r'from-router', include(naming_collisions_router.urls)), + path('from-router', include(naming_collisions_router.urls)), ] generator = SchemaGenerator(title='Naming Colisions', patterns=patterns) @@ -1228,8 +1227,8 @@ class TestURLNamingCollisions(TestCase): def test_url_under_same_key_not_replaced(self): patterns = [ - url(r'example/(?P\d+)/$', BasicNamingCollisionView.as_view()), - url(r'example/(?P\w+)/$', BasicNamingCollisionView.as_view()), + path('example//', BasicNamingCollisionView.as_view()), + path('example//', BasicNamingCollisionView.as_view()), ] generator = SchemaGenerator(title='Naming Colisions', patterns=patterns) @@ -1245,8 +1244,8 @@ class TestURLNamingCollisions(TestCase): pass patterns = [ - url(r'^test/list/', simple_fbv), - url(r'^test/(?P\d+)/list/', simple_fbv), + path('test/list/', simple_fbv), + path('test//list/', simple_fbv), ] generator = SchemaGenerator(title='Naming Colisions', patterns=patterns) diff --git a/tests/schemas/test_managementcommand.py b/tests/schemas/test_managementcommand.py index 115f871e5..645eaf91d 100644 --- a/tests/schemas/test_managementcommand.py +++ b/tests/schemas/test_managementcommand.py @@ -3,10 +3,10 @@ import os import tempfile import pytest -from django.conf.urls import url from django.core.management import call_command from django.test import TestCase from django.test.utils import override_settings +from django.urls import path from rest_framework.compat import uritemplate, yaml from rest_framework.management.commands import generateschema @@ -20,7 +20,7 @@ class FooView(APIView): urlpatterns = [ - url(r'^$', FooView.as_view()) + path('', FooView.as_view()) ] diff --git a/tests/schemas/test_openapi.py b/tests/schemas/test_openapi.py index d483f3d45..8ea910dc1 100644 --- a/tests/schemas/test_openapi.py +++ b/tests/schemas/test_openapi.py @@ -2,8 +2,8 @@ import uuid import warnings import pytest -from django.conf.urls import url from django.test import RequestFactory, TestCase, override_settings +from django.urls import path from django.utils.translation import gettext_lazy as _ from rest_framework import filters, generics, pagination, routers, serializers @@ -719,8 +719,8 @@ class TestOperationIntrospection(TestCase): def test_duplicate_operation_id(self): patterns = [ - url(r'^duplicate1/?$', views.ExampleOperationIdDuplicate1.as_view()), - url(r'^duplicate2/?$', views.ExampleOperationIdDuplicate2.as_view()), + path('duplicate1/', views.ExampleOperationIdDuplicate1.as_view()), + path('duplicate2/', views.ExampleOperationIdDuplicate2.as_view()), ] generator = SchemaGenerator(patterns=patterns) @@ -874,7 +874,7 @@ class TestOperationIntrospection(TestCase): schema = AutoSchema(tags=['example1', 'example2']) url_patterns = [ - url(r'^test/?$', ExampleStringTagsViewSet.as_view()), + path('test/', ExampleStringTagsViewSet.as_view()), ] generator = SchemaGenerator(patterns=url_patterns) schema = generator.get_schema(request=create_request('/')) @@ -911,8 +911,8 @@ class TestOperationIntrospection(TestCase): pass url_patterns = [ - url(r'^any-dash_underscore/?$', RestaurantAPIView.as_view()), - url(r'^restaurants/branches/?$', BranchAPIView.as_view()) + path('any-dash_underscore/', RestaurantAPIView.as_view()), + path('restaurants/branches/', BranchAPIView.as_view()) ] generator = SchemaGenerator(patterns=url_patterns) schema = generator.get_schema(request=create_request('/')) @@ -930,7 +930,7 @@ class TestGenerator(TestCase): def test_paths_construction(self): """Construction of the `paths` key.""" patterns = [ - url(r'^example/?$', views.ExampleListView.as_view()), + path('example/', views.ExampleListView.as_view()), ] generator = SchemaGenerator(patterns=patterns) generator._initialise_endpoints() @@ -946,8 +946,8 @@ class TestGenerator(TestCase): def test_prefixed_paths_construction(self): """Construction of the `paths` key maintains a common prefix.""" patterns = [ - url(r'^v1/example/?$', views.ExampleListView.as_view()), - url(r'^v1/example/{pk}/?$', views.ExampleDetailView.as_view()), + path('v1/example/', views.ExampleListView.as_view()), + path('v1/example/{pk}/', views.ExampleDetailView.as_view()), ] generator = SchemaGenerator(patterns=patterns) generator._initialise_endpoints() @@ -959,8 +959,8 @@ class TestGenerator(TestCase): def test_mount_url_prefixed_to_paths(self): patterns = [ - url(r'^example/?$', views.ExampleListView.as_view()), - url(r'^example/{pk}/?$', views.ExampleDetailView.as_view()), + path('example/', views.ExampleListView.as_view()), + path('example/{pk}/', views.ExampleDetailView.as_view()), ] generator = SchemaGenerator(patterns=patterns, url='/api') generator._initialise_endpoints() @@ -973,7 +973,7 @@ class TestGenerator(TestCase): def test_schema_construction(self): """Construction of the top level dictionary.""" patterns = [ - url(r'^example/?$', views.ExampleListView.as_view()), + path('example/', views.ExampleListView.as_view()), ] generator = SchemaGenerator(patterns=patterns) @@ -995,7 +995,7 @@ class TestGenerator(TestCase): def test_schema_information(self): """Construction of the top level dictionary.""" patterns = [ - url(r'^example/?$', views.ExampleListView.as_view()), + path('example/', views.ExampleListView.as_view()), ] generator = SchemaGenerator(patterns=patterns, title='My title', version='1.2.3', description='My description') @@ -1009,7 +1009,7 @@ class TestGenerator(TestCase): def test_schema_information_empty(self): """Construction of the top level dictionary.""" patterns = [ - url(r'^example/?$', views.ExampleListView.as_view()), + path('example/', views.ExampleListView.as_view()), ] generator = SchemaGenerator(patterns=patterns) @@ -1022,7 +1022,7 @@ class TestGenerator(TestCase): def test_serializer_model(self): """Construction of the top level dictionary.""" patterns = [ - url(r'^example/?$', views.ExampleGenericAPIViewModel.as_view()), + path('example/', views.ExampleGenericAPIViewModel.as_view()), ] generator = SchemaGenerator(patterns=patterns) @@ -1038,7 +1038,7 @@ class TestGenerator(TestCase): def test_authtoken_serializer(self): patterns = [ - url(r'^api-token-auth/', obtain_auth_token) + path('api-token-auth/', obtain_auth_token) ] generator = SchemaGenerator(patterns=patterns) @@ -1065,7 +1065,7 @@ class TestGenerator(TestCase): def test_component_name(self): patterns = [ - url(r'^example/?$', views.ExampleAutoSchemaComponentName.as_view()), + path('example/', views.ExampleAutoSchemaComponentName.as_view()), ] generator = SchemaGenerator(patterns=patterns) @@ -1080,8 +1080,8 @@ class TestGenerator(TestCase): def test_duplicate_component_name(self): patterns = [ - url(r'^duplicate1/?$', views.ExampleAutoSchemaDuplicate1.as_view()), - url(r'^duplicate2/?$', views.ExampleAutoSchemaDuplicate2.as_view()), + path('duplicate1/', views.ExampleAutoSchemaDuplicate1.as_view()), + path('duplicate2/', views.ExampleAutoSchemaDuplicate2.as_view()), ] generator = SchemaGenerator(patterns=patterns) @@ -1104,7 +1104,7 @@ class TestGenerator(TestCase): schema = AutoSchema(operation_id_base='example') url_patterns = [ - url(r'^example/?$', ExampleView.as_view()), + path('example/', ExampleView.as_view()), ] generator = SchemaGenerator(patterns=url_patterns) schema = generator.get_schema(request=create_request('/')) diff --git a/tests/test_api_client.py b/tests/test_api_client.py index 74a3579e2..976f10ed1 100644 --- a/tests/test_api_client.py +++ b/tests/test_api_client.py @@ -2,9 +2,9 @@ import os import tempfile import unittest -from django.conf.urls import url from django.http import HttpResponse from django.test import override_settings +from django.urls import path, re_path from rest_framework.compat import coreapi, coreschema from rest_framework.parsers import FileUploadParser @@ -178,13 +178,13 @@ class HeadersView(APIView): 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()), + path('', SchemaView.as_view()), + path('example/', ListView.as_view()), + re_path(r'^example/(?P[0-9]+)/$', DetailView.as_view()), + path('upload/', UploadView.as_view()), + path('download/', DownloadView.as_view()), + path('text/', TextView.as_view()), + path('headers/', HeadersView.as_view()), ] diff --git a/tests/test_atomic_requests.py b/tests/test_atomic_requests.py index de04d2c06..15b41e02f 100644 --- a/tests/test_atomic_requests.py +++ b/tests/test_atomic_requests.py @@ -1,9 +1,9 @@ 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, override_settings +from django.urls import path from rest_framework import status from rest_framework.exceptions import APIException @@ -44,7 +44,7 @@ class NonAtomicAPIExceptionView(APIView): urlpatterns = ( - url(r'^$', NonAtomicAPIExceptionView.as_view()), + path('', NonAtomicAPIExceptionView.as_view()), ) diff --git a/tests/test_fields.py b/tests/test_fields.py index 506e75905..fdd570d8a 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -697,7 +697,7 @@ class TestNullBooleanField(TestBooleanField): None: None, 'other': True } - field = serializers.NullBooleanField() + field = serializers.BooleanField(allow_null=True) class TestNullableBooleanField(TestNullBooleanField): diff --git a/tests/test_htmlrenderer.py b/tests/test_htmlrenderer.py index e31a9ced5..fa0f4efc6 100644 --- a/tests/test_htmlrenderer.py +++ b/tests/test_htmlrenderer.py @@ -1,10 +1,10 @@ import django.template.loader import pytest -from django.conf.urls import url from django.core.exceptions import ImproperlyConfigured, PermissionDenied from django.http import Http404 from django.template import TemplateDoesNotExist, engines from django.test import TestCase, override_settings +from django.urls import path from rest_framework import status from rest_framework.decorators import api_view, renderer_classes @@ -35,9 +35,9 @@ def not_found(request): urlpatterns = [ - url(r'^$', example), - url(r'^permission_denied$', permission_denied), - url(r'^not_found$', not_found), + path('', example), + path('permission_denied', permission_denied), + path('not_found', not_found), ] diff --git a/tests/test_lazy_hyperlinks.py b/tests/test_lazy_hyperlinks.py index cf3ee735f..716d02d2a 100644 --- a/tests/test_lazy_hyperlinks.py +++ b/tests/test_lazy_hyperlinks.py @@ -1,6 +1,6 @@ -from django.conf.urls import url from django.db import models from django.test import TestCase, override_settings +from django.urls import path from rest_framework import serializers from rest_framework.renderers import JSONRenderer @@ -29,7 +29,7 @@ def dummy_view(request): urlpatterns = [ - url(r'^example/(?P[0-9]+)/$', dummy_view, name='example-detail'), + path('example//', dummy_view, name='example-detail'), ] diff --git a/tests/test_metadata.py b/tests/test_metadata.py index e1a1fd352..4abc0fc07 100644 --- a/tests/test_metadata.py +++ b/tests/test_metadata.py @@ -311,7 +311,8 @@ class TestMetadata: class TestSimpleMetadataFieldInfo(TestCase): def test_null_boolean_field_info_type(self): options = metadata.SimpleMetadata() - field_info = options.get_field_info(serializers.NullBooleanField()) + field_info = options.get_field_info(serializers.BooleanField( + allow_null=True)) assert field_info['type'] == 'boolean' def test_related_field_choices(self): diff --git a/tests/test_middleware.py b/tests/test_middleware.py index 28a5e558a..6b2c91db7 100644 --- a/tests/test_middleware.py +++ b/tests/test_middleware.py @@ -1,7 +1,7 @@ -from django.conf.urls import url from django.contrib.auth.models import User from django.http import HttpRequest from django.test import override_settings +from django.urls import path from rest_framework.authentication import TokenAuthentication from rest_framework.authtoken.models import Token @@ -17,8 +17,8 @@ class PostView(APIView): urlpatterns = [ - url(r'^auth$', APIView.as_view(authentication_classes=(TokenAuthentication,))), - url(r'^post$', PostView.as_view()), + path('auth', APIView.as_view(authentication_classes=(TokenAuthentication,))), + path('post', PostView.as_view()), ] diff --git a/tests/test_relations.py b/tests/test_relations.py index 9f05e3b31..92aeecf6c 100644 --- a/tests/test_relations.py +++ b/tests/test_relations.py @@ -2,9 +2,9 @@ import uuid import pytest from _pytest.monkeypatch import MonkeyPatch -from django.conf.urls import url from django.core.exceptions import ImproperlyConfigured, ObjectDoesNotExist from django.test import override_settings +from django.urls import re_path from django.utils.datastructures import MultiValueDict from rest_framework import relations, serializers @@ -146,7 +146,7 @@ class TestProxiedPrimaryKeyRelatedField(APISimpleTestCase): urlpatterns = [ - url(r'^example/(?P.+)/$', lambda: None, name='example'), + re_path(r'^example/(?P.+)/$', lambda: None, name='example'), ] diff --git a/tests/test_relations_hyperlink.py b/tests/test_relations_hyperlink.py index 5ad0e31ff..77e4cd95f 100644 --- a/tests/test_relations_hyperlink.py +++ b/tests/test_relations_hyperlink.py @@ -1,5 +1,5 @@ -from django.conf.urls import url from django.test import TestCase, override_settings +from django.urls import path from rest_framework import serializers from rest_framework.test import APIRequestFactory @@ -17,14 +17,14 @@ def dummy_view(request, pk): urlpatterns = [ - url(r'^dummyurl/(?P[0-9]+)/$', dummy_view, name='dummy-url'), - url(r'^manytomanysource/(?P[0-9]+)/$', dummy_view, name='manytomanysource-detail'), - url(r'^manytomanytarget/(?P[0-9]+)/$', dummy_view, name='manytomanytarget-detail'), - url(r'^foreignkeysource/(?P[0-9]+)/$', dummy_view, name='foreignkeysource-detail'), - url(r'^foreignkeytarget/(?P[0-9]+)/$', dummy_view, name='foreignkeytarget-detail'), - url(r'^nullableforeignkeysource/(?P[0-9]+)/$', dummy_view, name='nullableforeignkeysource-detail'), - url(r'^onetoonetarget/(?P[0-9]+)/$', dummy_view, name='onetoonetarget-detail'), - url(r'^nullableonetoonesource/(?P[0-9]+)/$', dummy_view, name='nullableonetoonesource-detail'), + path('dummyurl//', dummy_view, name='dummy-url'), + path('manytomanysource//', dummy_view, name='manytomanysource-detail'), + path('manytomanytarget//', dummy_view, name='manytomanytarget-detail'), + path('foreignkeysource//', dummy_view, name='foreignkeysource-detail'), + path('foreignkeytarget//', dummy_view, name='foreignkeytarget-detail'), + path('nullableforeignkeysource//', dummy_view, name='nullableforeignkeysource-detail'), + path('onetoonetarget//', dummy_view, name='onetoonetarget-detail'), + path('nullableonetoonesource//', dummy_view, name='nullableonetoonesource-detail'), ] diff --git a/tests/test_renderers.py b/tests/test_renderers.py index 71c5fb3f6..8271608e1 100644 --- a/tests/test_renderers.py +++ b/tests/test_renderers.py @@ -3,12 +3,12 @@ from collections import OrderedDict from collections.abc import MutableMapping import pytest -from django.conf.urls import include, url from django.core.cache import cache from django.db import models from django.http.request import HttpRequest from django.template import loader from django.test import TestCase, override_settings +from django.urls import include, path, re_path from django.utils.safestring import SafeText from django.utils.translation import gettext_lazy as _ @@ -111,14 +111,14 @@ class HTMLView1(APIView): urlpatterns = [ - url(r'^.*\.(?P.+)$', MockView.as_view(renderer_classes=[RendererA, RendererB])), - url(r'^$', MockView.as_view(renderer_classes=[RendererA, RendererB])), - url(r'^cache$', MockGETView.as_view()), - url(r'^parseerror$', MockPOSTView.as_view(renderer_classes=[JSONRenderer, BrowsableAPIRenderer])), - url(r'^html$', HTMLView.as_view()), - url(r'^html1$', HTMLView1.as_view()), - url(r'^empty$', EmptyGETView.as_view()), - url(r'^api', include('rest_framework.urls', namespace='rest_framework')) + re_path(r'^.*\.(?P.+)$', MockView.as_view(renderer_classes=[RendererA, RendererB])), + path('', MockView.as_view(renderer_classes=[RendererA, RendererB])), + path('cache', MockGETView.as_view()), + path('parseerror', MockPOSTView.as_view(renderer_classes=[JSONRenderer, BrowsableAPIRenderer])), + path('html', HTMLView.as_view()), + path('html1', HTMLView1.as_view()), + path('empty', EmptyGETView.as_view()), + path('api', include('rest_framework.urls', namespace='rest_framework')) ] @@ -637,7 +637,7 @@ class BrowsableAPIRendererTests(URLPatternsTestCase): router = SimpleRouter() router.register('examples', ExampleViewSet, basename='example') router.register('auth-examples', AuthExampleViewSet, basename='auth-example') - urlpatterns = [url(r'^api/', include(router.urls))] + urlpatterns = [path('api/', include(router.urls))] def setUp(self): self.renderer = BrowsableAPIRenderer() diff --git a/tests/test_request.py b/tests/test_request.py index be84fe5f9..4425c020f 100644 --- a/tests/test_request.py +++ b/tests/test_request.py @@ -5,7 +5,6 @@ import os.path import tempfile import pytest -from django.conf.urls import url from django.contrib.auth import authenticate, login, logout from django.contrib.auth.middleware import AuthenticationMiddleware from django.contrib.auth.models import User @@ -13,6 +12,7 @@ from django.contrib.sessions.middleware import SessionMiddleware from django.core.files.uploadedfile import SimpleUploadedFile from django.http.request import RawPostDataException from django.test import TestCase, override_settings +from django.urls import path from rest_framework import status from rest_framework.authentication import SessionAuthentication @@ -153,9 +153,9 @@ class FileUploadView(APIView): urlpatterns = [ - url(r'^$', MockView.as_view()), - url(r'^echo/$', EchoView.as_view()), - url(r'^upload/$', FileUploadView.as_view()) + path('', MockView.as_view()), + path('echo/', EchoView.as_view()), + path('upload/', FileUploadView.as_view()) ] diff --git a/tests/test_requests_client.py b/tests/test_requests_client.py index 59b388c5a..c8e7be6ee 100644 --- a/tests/test_requests_client.py +++ b/tests/test_requests_client.py @@ -1,10 +1,10 @@ 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.urls import path from django.utils.decorators import method_decorator from django.views.decorators.csrf import csrf_protect, ensure_csrf_cookie @@ -90,10 +90,10 @@ class AuthView(APIView): 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'), + path('', Root.as_view(), name='root'), + path('headers/', HeadersView.as_view(), name='headers'), + path('session/', SessionView.as_view(), name='session'), + path('auth/', AuthView.as_view(), name='auth'), ] diff --git a/tests/test_response.py b/tests/test_response.py index d3a56d01b..0d5528dc9 100644 --- a/tests/test_response.py +++ b/tests/test_response.py @@ -1,5 +1,5 @@ -from django.conf.urls import include, url from django.test import TestCase, override_settings +from django.urls import include, path, re_path from rest_framework import generics, routers, serializers, status, viewsets from rest_framework.parsers import JSONParser @@ -117,15 +117,15 @@ new_model_viewset_router.register(r'', HTMLNewModelViewSet) urlpatterns = [ - url(r'^setbyview$', MockViewSettingContentType.as_view(renderer_classes=[RendererA, RendererB, RendererC])), - url(r'^.*\.(?P.+)$', MockView.as_view(renderer_classes=[RendererA, RendererB, RendererC])), - url(r'^$', MockView.as_view(renderer_classes=[RendererA, RendererB, RendererC])), - url(r'^html$', HTMLView.as_view()), - url(r'^json$', JSONView.as_view()), - url(r'^html1$', HTMLView1.as_view()), - url(r'^html_new_model$', HTMLNewModelView.as_view()), - url(r'^html_new_model_viewset', include(new_model_viewset_router.urls)), - url(r'^restframework', include('rest_framework.urls', namespace='rest_framework')) + path('setbyview', MockViewSettingContentType.as_view(renderer_classes=[RendererA, RendererB, RendererC])), + re_path(r'^.*\.(?P.+)$', MockView.as_view(renderer_classes=[RendererA, RendererB, RendererC])), + path('', MockView.as_view(renderer_classes=[RendererA, RendererB, RendererC])), + path('html', HTMLView.as_view()), + path('json', JSONView.as_view()), + path('html1', HTMLView1.as_view()), + path('html_new_model', HTMLNewModelView.as_view()), + path('html_new_model_viewset', include(new_model_viewset_router.urls)), + path('restframework', include('rest_framework.urls', namespace='rest_framework')) ] diff --git a/tests/test_reverse.py b/tests/test_reverse.py index 9ab1667c5..b26b448c9 100644 --- a/tests/test_reverse.py +++ b/tests/test_reverse.py @@ -1,6 +1,5 @@ -from django.conf.urls import url from django.test import TestCase, override_settings -from django.urls import NoReverseMatch +from django.urls import NoReverseMatch, path from rest_framework.reverse import reverse from rest_framework.test import APIRequestFactory @@ -13,7 +12,7 @@ def null_view(request): urlpatterns = [ - url(r'^view$', null_view, name='view'), + path('view', null_view, name='view'), ] diff --git a/tests/test_routers.py b/tests/test_routers.py index 007cb4768..f767a843d 100644 --- a/tests/test_routers.py +++ b/tests/test_routers.py @@ -1,11 +1,10 @@ from collections import namedtuple import pytest -from django.conf.urls import include, url from django.core.exceptions import ImproperlyConfigured from django.db import models from django.test import TestCase, override_settings -from django.urls import resolve, reverse +from django.urls import include, path, resolve, reverse from rest_framework import permissions, serializers, viewsets from rest_framework.decorators import action @@ -118,7 +117,7 @@ class TestSimpleRouter(URLPatternsTestCase, TestCase): router.register('basics', BasicViewSet, basename='basic') urlpatterns = [ - url(r'^api/', include(router.urls)), + path('api/', include(router.urls)), ] def setUp(self): @@ -163,8 +162,8 @@ class TestSimpleRouter(URLPatternsTestCase, TestCase): class TestRootView(URLPatternsTestCase, TestCase): urlpatterns = [ - url(r'^non-namespaced/', include(namespaced_router.urls)), - url(r'^namespaced/', include((namespaced_router.urls, 'namespaced'), namespace='namespaced')), + path('non-namespaced/', include(namespaced_router.urls)), + path('namespaced/', include((namespaced_router.urls, 'namespaced'), namespace='namespaced')), ] def test_retrieve_namespaced_root(self): @@ -181,8 +180,8 @@ class TestCustomLookupFields(URLPatternsTestCase, TestCase): Ensure that custom lookup fields are correctly routed. """ urlpatterns = [ - url(r'^example/', include(notes_router.urls)), - url(r'^example2/', include(kwarged_notes_router.urls)), + path('example/', include(notes_router.urls)), + path('example2/', include(kwarged_notes_router.urls)), ] def setUp(self): @@ -238,8 +237,8 @@ class TestLookupUrlKwargs(URLPatternsTestCase, TestCase): Setup a deep lookup_field, but map it to a simple URL kwarg. """ urlpatterns = [ - url(r'^example/', include(notes_router.urls)), - url(r'^example2/', include(kwarged_notes_router.urls)), + path('example/', include(notes_router.urls)), + path('example2/', include(kwarged_notes_router.urls)), ] def setUp(self): @@ -426,7 +425,7 @@ class TestDynamicListAndDetailRouter(TestCase): class TestEmptyPrefix(URLPatternsTestCase, TestCase): urlpatterns = [ - url(r'^empty-prefix/', include(empty_prefix_router.urls)), + path('empty-prefix/', include(empty_prefix_router.urls)), ] def test_empty_prefix_list(self): @@ -443,7 +442,7 @@ class TestEmptyPrefix(URLPatternsTestCase, TestCase): class TestRegexUrlPath(URLPatternsTestCase, TestCase): urlpatterns = [ - url(r'^regex/', include(regex_url_path_router.urls)), + path('regex/', include(regex_url_path_router.urls)), ] def test_regex_url_path_list(self): @@ -462,7 +461,7 @@ class TestRegexUrlPath(URLPatternsTestCase, TestCase): class TestViewInitkwargs(URLPatternsTestCase, TestCase): urlpatterns = [ - url(r'^example/', include(notes_router.urls)), + path('example/', include(notes_router.urls)), ] def test_suffix(self): diff --git a/tests/test_testing.py b/tests/test_testing.py index 8094bfd8d..cc60e4f00 100644 --- a/tests/test_testing.py +++ b/tests/test_testing.py @@ -1,9 +1,9 @@ from io import BytesIO -from django.conf.urls import url from django.contrib.auth.models import User from django.shortcuts import redirect from django.test import TestCase, override_settings +from django.urls import path from rest_framework import fields, serializers from rest_framework.decorators import api_view @@ -47,10 +47,10 @@ def post_view(request): urlpatterns = [ - url(r'^view/$', view), - url(r'^session-view/$', session_view), - url(r'^redirect-view/$', redirect_view), - url(r'^post-view/$', post_view) + path('view/', view), + path('session-view/', session_view), + path('redirect-view/', redirect_view), + path('post-view/', post_view) ] @@ -284,7 +284,7 @@ class TestAPIRequestFactory(TestCase): class TestUrlPatternTestCase(URLPatternsTestCase): urlpatterns = [ - url(r'^$', view), + path('', view), ] @classmethod diff --git a/tests/test_urlpatterns.py b/tests/test_urlpatterns.py index 90820b532..adcd0a742 100644 --- a/tests/test_urlpatterns.py +++ b/tests/test_urlpatterns.py @@ -1,8 +1,7 @@ from collections import namedtuple -from django.conf.urls import include, url from django.test import TestCase -from django.urls import Resolver404, URLResolver, path, re_path +from django.urls import Resolver404, URLResolver, include, path, re_path from django.urls.resolvers import RegexPattern from rest_framework.test import APIRequestFactory @@ -61,7 +60,7 @@ class FormatSuffixTests(TestCase): def test_trailing_slash(self): urlpatterns = [ - url(r'^test/$', dummy_view), + path('test/', dummy_view), ] self._test_trailing_slash(urlpatterns) @@ -81,7 +80,7 @@ class FormatSuffixTests(TestCase): def test_format_suffix(self): urlpatterns = [ - url(r'^test$', dummy_view), + path('test', dummy_view), ] self._test_format_suffix(urlpatterns) @@ -116,7 +115,7 @@ class FormatSuffixTests(TestCase): def test_default_args(self): urlpatterns = [ - url(r'^test$', dummy_view, {'foo': 'bar'}), + path('test', dummy_view, {'foo': 'bar'}), ] self._test_default_args(urlpatterns) @@ -135,15 +134,6 @@ class FormatSuffixTests(TestCase): self._resolve_urlpatterns(urlpatterns, test_paths) def test_included_urls(self): - nested_patterns = [ - url(r'^path$', dummy_view) - ] - urlpatterns = [ - url(r'^test/', include(nested_patterns), {'foo': 'bar'}), - ] - self._test_included_urls(urlpatterns) - - def test_included_urls_django2(self): nested_patterns = [ path('path', dummy_view) ] @@ -152,44 +142,35 @@ class FormatSuffixTests(TestCase): ] self._test_included_urls(urlpatterns) - def test_included_urls_django2_mixed(self): - nested_patterns = [ - path('path', dummy_view) - ] - urlpatterns = [ - url('^test/', include(nested_patterns), {'foo': 'bar'}), - ] - self._test_included_urls(urlpatterns) - - def test_included_urls_django2_mixed_args(self): + def test_included_urls_mixed(self): nested_patterns = [ path('path/', dummy_view), - url('^url/(?P[0-9]+)$', dummy_view) + re_path(r'^re_path/(?P[0-9]+)$', dummy_view) ] urlpatterns = [ - url('^purl/(?P[0-9]+)/', include(nested_patterns), {'foo': 'bar'}), + re_path(r'^pre_path/(?P[0-9]+)/', include(nested_patterns), {'foo': 'bar'}), path('ppath//', include(nested_patterns), {'foo': 'bar'}), ] test_paths = [ - # parent url() nesting child path() - URLTestPath('/purl/87/path/42', (), {'parent': '87', 'child': 42, 'foo': 'bar', }), - URLTestPath('/purl/87/path/42.api', (), {'parent': '87', 'child': 42, 'foo': 'bar', 'format': 'api'}), - URLTestPath('/purl/87/path/42.asdf', (), {'parent': '87', 'child': 42, 'foo': 'bar', 'format': 'asdf'}), + # parent re_path() nesting child path() + URLTestPath('/pre_path/87/path/42', (), {'parent': '87', 'child': 42, 'foo': 'bar', }), + URLTestPath('/pre_path/87/path/42.api', (), {'parent': '87', 'child': 42, 'foo': 'bar', 'format': 'api'}), + URLTestPath('/pre_path/87/path/42.asdf', (), {'parent': '87', 'child': 42, 'foo': 'bar', 'format': 'asdf'}), - # parent path() nesting child url() - URLTestPath('/ppath/87/url/42', (), {'parent': 87, 'child': '42', 'foo': 'bar', }), - URLTestPath('/ppath/87/url/42.api', (), {'parent': 87, 'child': '42', 'foo': 'bar', 'format': 'api'}), - URLTestPath('/ppath/87/url/42.asdf', (), {'parent': 87, 'child': '42', 'foo': 'bar', 'format': 'asdf'}), + # parent path() nesting child re_path() + URLTestPath('/ppath/87/re_path/42', (), {'parent': 87, 'child': '42', 'foo': 'bar', }), + URLTestPath('/ppath/87/re_path/42.api', (), {'parent': 87, 'child': '42', 'foo': 'bar', 'format': 'api'}), + URLTestPath('/ppath/87/re_path/42.asdf', (), {'parent': 87, 'child': '42', 'foo': 'bar', 'format': 'asdf'}), # parent path() nesting child path() URLTestPath('/ppath/87/path/42', (), {'parent': 87, 'child': 42, 'foo': 'bar', }), URLTestPath('/ppath/87/path/42.api', (), {'parent': 87, 'child': 42, 'foo': 'bar', 'format': 'api'}), URLTestPath('/ppath/87/path/42.asdf', (), {'parent': 87, 'child': 42, 'foo': 'bar', 'format': 'asdf'}), - # parent url() nesting child url() - URLTestPath('/purl/87/url/42', (), {'parent': '87', 'child': '42', 'foo': 'bar', }), - URLTestPath('/purl/87/url/42.api', (), {'parent': '87', 'child': '42', 'foo': 'bar', 'format': 'api'}), - URLTestPath('/purl/87/url/42.asdf', (), {'parent': '87', 'child': '42', 'foo': 'bar', 'format': 'asdf'}), + # parent re_path() nesting child re_path() + URLTestPath('/pre_path/87/re_path/42', (), {'parent': '87', 'child': '42', 'foo': 'bar', }), + URLTestPath('/pre_path/87/re_path/42.api', (), {'parent': '87', 'child': '42', 'foo': 'bar', 'format': 'api'}), + URLTestPath('/pre_path/87/re_path/42.asdf', (), {'parent': '87', 'child': '42', 'foo': 'bar', 'format': 'asdf'}), ] self._resolve_urlpatterns(urlpatterns, test_paths) @@ -202,13 +183,13 @@ class FormatSuffixTests(TestCase): ] self._resolve_urlpatterns(urlpatterns, test_paths, allowed=allowed_formats) - def test_allowed_formats(self): + def test_allowed_formats_re_path(self): urlpatterns = [ - url('^test$', dummy_view), + re_path(r'^test$', dummy_view), ] self._test_allowed_formats(urlpatterns) - def test_allowed_formats_django2(self): + def test_allowed_formats_path(self): urlpatterns = [ path('test', dummy_view), ] diff --git a/tests/test_utils.py b/tests/test_utils.py index 500c6a3fa..c72f680fe 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -1,7 +1,7 @@ from unittest import mock -from django.conf.urls import url from django.test import TestCase, override_settings +from django.urls import path from rest_framework.decorators import action from rest_framework.routers import SimpleRouter @@ -64,12 +64,12 @@ class ResourceViewSet(ModelViewSet): router = SimpleRouter() router.register(r'resources', ResourceViewSet) 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()), + path('', Root.as_view()), + path('resource/', ResourceRoot.as_view()), + path('resource/customname', CustomNameResourceInstance.as_view()), + path('resource/', ResourceInstance.as_view()), + path('resource//', NestedResourceRoot.as_view()), + path('resource//', NestedResourceInstance.as_view()), ] urlpatterns += router.urls diff --git a/tests/test_versioning.py b/tests/test_versioning.py index d4e269df3..d40d54229 100644 --- a/tests/test_versioning.py +++ b/tests/test_versioning.py @@ -1,6 +1,6 @@ import pytest -from django.conf.urls import include, url from django.test import override_settings +from django.urls import include, path, re_path from rest_framework import serializers, status, versioning from rest_framework.decorators import APIView @@ -144,14 +144,14 @@ class TestRequestVersion: class TestURLReversing(URLPatternsTestCase, APITestCase): included = [ - url(r'^namespaced/$', dummy_view, name='another'), - url(r'^example/(?P\d+)/$', dummy_pk_view, name='example-detail') + path('namespaced/', dummy_view, name='another'), + path('example//', dummy_pk_view, name='example-detail') ] urlpatterns = [ - url(r'^v1/', include((included, 'v1'), namespace='v1')), - url(r'^another/$', dummy_view, name='another'), - url(r'^(?P[v1|v2]+)/another/$', dummy_view, name='another'), + path('v1/', include((included, 'v1'), namespace='v1')), + path('another/', dummy_view, name='another'), + re_path(r'^(?P[v1|v2]+)/another/$', dummy_view, name='another'), ] def test_reverse_unversioned(self): @@ -310,12 +310,12 @@ class TestAllowedAndDefaultVersion: class TestHyperlinkedRelatedField(URLPatternsTestCase, APITestCase): included = [ - url(r'^namespaced/(?P\d+)/$', dummy_pk_view, name='namespaced'), + path('namespaced//', dummy_pk_view, name='namespaced'), ] urlpatterns = [ - url(r'^v1/', include((included, 'v1'), namespace='v1')), - url(r'^v2/', include((included, 'v2'), namespace='v2')) + path('v1/', include((included, 'v1'), namespace='v1')), + path('v2/', include((included, 'v2'), namespace='v2')) ] def setUp(self): @@ -342,17 +342,17 @@ class TestHyperlinkedRelatedField(URLPatternsTestCase, APITestCase): class TestNamespaceVersioningHyperlinkedRelatedFieldScheme(URLPatternsTestCase, APITestCase): nested = [ - url(r'^namespaced/(?P\d+)/$', dummy_pk_view, name='nested'), + path('namespaced//', dummy_pk_view, name='nested'), ] included = [ - url(r'^namespaced/(?P\d+)/$', dummy_pk_view, name='namespaced'), - url(r'^nested/', include((nested, 'nested-namespace'), namespace='nested-namespace')) + path('namespaced//', dummy_pk_view, name='namespaced'), + path('nested/', include((nested, 'nested-namespace'), namespace='nested-namespace')) ] urlpatterns = [ - url(r'^v1/', include((included, 'restframeworkv1'), namespace='v1')), - url(r'^v2/', include((included, 'restframeworkv2'), namespace='v2')), - url(r'^non-api/(?P\d+)/$', dummy_pk_view, name='non-api-view') + path('v1/', include((included, 'restframeworkv1'), namespace='v1')), + path('v2/', include((included, 'restframeworkv2'), namespace='v2')), + path('non-api//', dummy_pk_view, name='non-api-view') ] def _create_field(self, view_name, version): diff --git a/tests/test_viewsets.py b/tests/test_viewsets.py index 2a2997a0b..8842b0b1c 100644 --- a/tests/test_viewsets.py +++ b/tests/test_viewsets.py @@ -2,9 +2,9 @@ from collections import OrderedDict from functools import wraps import pytest -from django.conf.urls import include, url from django.db import models from django.test import TestCase, override_settings +from django.urls import include, path from rest_framework import status from rest_framework.decorators import action @@ -124,7 +124,7 @@ router.register(r'mapping', ActionViewSetWithMapping, basename='mapping') urlpatterns = [ - url(r'^api/', include(router.urls)), + path('api/', include(router.urls)), ] diff --git a/tests/urls.py b/tests/urls.py index 76ada5e3d..d9147683f 100644 --- a/tests/urls.py +++ b/tests/urls.py @@ -3,14 +3,14 @@ URLConf for test suite. We need only the docs urls for DocumentationRenderer tests. """ -from django.conf.urls import url +from django.urls import path from rest_framework.compat import coreapi from rest_framework.documentation import include_docs_urls if coreapi: urlpatterns = [ - url(r'^docs/', include_docs_urls(title='Test Suite API')), + path('docs/', include_docs_urls(title='Test Suite API')), ] else: urlpatterns = [] From ddcd8b539be4a5ffb7e6c89830bec9a24914ba55 Mon Sep 17 00:00:00 2001 From: Michael K Date: Tue, 8 Sep 2020 14:40:21 +0000 Subject: [PATCH 015/303] Run tests against Python 3.9 (#7517) 3.9.0 final is expected on Monday, 2020-10-05 See https://www.python.org/dev/peps/pep-0596/#schedule Also mention Django 3.1 compat where missing. --- .travis.yml | 3 +++ README.md | 4 ++-- docs/index.md | 4 ++-- setup.py | 1 + tox.ini | 6 +++--- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 39efaf4fc..c204c5460 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,6 +21,9 @@ matrix: - { python: "3.8", env: DJANGO=3.1 } - { python: "3.8", env: DJANGO=master } + - { python: "3.9-dev", env: DJANGO=3.1 } + - { python: "3.9-dev", env: DJANGO=master } + - { python: "3.8", env: TOXENV=base } - { python: "3.8", env: TOXENV=lint } - { python: "3.8", env: TOXENV=docs } diff --git a/README.md b/README.md index 4dfff3119..8af1466f8 100644 --- a/README.md +++ b/README.md @@ -52,8 +52,8 @@ There is a live example API for testing purposes, [available here][sandbox]. # Requirements -* Python (3.5, 3.6, 3.7, 3.8) -* Django (2.2, 3.0) +* Python (3.5, 3.6, 3.7, 3.8, 3.9) +* Django (2.2, 3.0, 3.1) We **highly recommend** and only officially support the latest patch release of each Python and Django series. diff --git a/docs/index.md b/docs/index.md index 54654c7c5..0273da9f1 100644 --- a/docs/index.md +++ b/docs/index.md @@ -83,8 +83,8 @@ continued development by **[signing up for a paid plan][funding]**. REST framework requires the following: -* Python (3.5, 3.6, 3.7, 3.8) -* Django (2.2, 3.0) +* Python (3.5, 3.6, 3.7, 3.8, 3.9) +* Django (2.2, 3.0, 3.1) We **highly recommend** and only officially support the latest patch release of each Python and Django series. diff --git a/setup.py b/setup.py index 38e680e10..e2a1c0222 100755 --- a/setup.py +++ b/setup.py @@ -101,6 +101,7 @@ setup( 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', + 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3 :: Only', 'Topic :: Internet :: WWW/HTTP', ], diff --git a/tox.ini b/tox.ini index 190865f23..d5e769764 100644 --- a/tox.ini +++ b/tox.ini @@ -2,8 +2,8 @@ envlist = {py35,py36,py37}-django22, {py36,py37,py38}-django30, - {py36,py37,py38}-django31, - {py36,py37,py38}-djangomaster, + {py36,py37,py38,py39}-django31, + {py36,py37,py38,py39}-djangomaster, base,dist,lint,docs, [travis:env] @@ -22,7 +22,7 @@ setenv = deps = django22: Django>=2.2,<3.0 django30: Django>=3.0,<3.1 - django31: Django>=3.1a1,<3.2 + django31: Django>=3.1,<3.2 djangomaster: https://github.com/django/django/archive/master.tar.gz -rrequirements/requirements-testing.txt -rrequirements/requirements-optionals.txt From 6b632c15b1bccf53287f81df143428b59d710241 Mon Sep 17 00:00:00 2001 From: Francisco Couzo Date: Tue, 8 Sep 2020 11:42:01 -0300 Subject: [PATCH 016/303] Remove unnecessary type conversions (#7526) --- rest_framework/pagination.py | 2 +- rest_framework/renderers.py | 2 +- rest_framework/serializers.py | 12 ++++-------- rest_framework/utils/urls.py | 4 ++-- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py index a73f2e526..60a57c8e4 100644 --- a/rest_framework/pagination.py +++ b/rest_framework/pagination.py @@ -80,7 +80,7 @@ def _get_displayed_page_numbers(current, final): # Now sort the page numbers and drop anything outside the limits. included = [ - idx for idx in sorted(list(included)) + idx for idx in sorted(included) if 0 < idx <= final ] diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index c790879b9..0fb74ca00 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -329,7 +329,7 @@ class HTMLFormRenderer(BaseRenderer): if isinstance(field._field, serializers.HiddenField): return '' - style = dict(self.default_style[field]) + style = self.default_style[field].copy() style.update(field.style) if 'template_pack' not in style: style['template_pack'] = parent_style.get('template_pack', self.template_pack) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 439220b34..3def1946c 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -194,10 +194,7 @@ class BaseSerializer(Field): "inspect 'serializer.validated_data' instead. " ) - validated_data = dict( - list(self.validated_data.items()) + - list(kwargs.items()) - ) + validated_data = {**self.validated_data, **kwargs} if self.instance is not None: self.instance = self.update(self.instance, validated_data) @@ -699,8 +696,7 @@ class ListSerializer(BaseSerializer): ) validated_data = [ - dict(list(attrs.items()) + list(kwargs.items())) - for attrs in self.validated_data + {**attrs, **kwargs} for attrs in self.validated_data ] if self.instance is not None: @@ -1410,7 +1406,7 @@ class ModelSerializer(Serializer): # so long as all the field names are included on the serializer. for parent_class in [model] + list(model._meta.parents): for unique_together_list in parent_class._meta.unique_together: - if set(field_names).issuperset(set(unique_together_list)): + if set(field_names).issuperset(unique_together_list): unique_constraint_names |= set(unique_together_list) # Now we have all the field names that have uniqueness constraints @@ -1541,7 +1537,7 @@ class ModelSerializer(Serializer): for parent_class in model_class_inheritance_tree: for unique_together in parent_class._meta.unique_together: # Skip if serializer does not map to all unique together sources - if not set(source_map).issuperset(set(unique_together)): + if not set(source_map).issuperset(unique_together): continue for source in unique_together: diff --git a/rest_framework/utils/urls.py b/rest_framework/utils/urls.py index 3534e5f49..afb06994c 100644 --- a/rest_framework/utils/urls.py +++ b/rest_framework/utils/urls.py @@ -11,7 +11,7 @@ def replace_query_param(url, key, val): (scheme, netloc, path, query, fragment) = parse.urlsplit(force_str(url)) query_dict = parse.parse_qs(query, keep_blank_values=True) query_dict[force_str(key)] = [force_str(val)] - query = parse.urlencode(sorted(list(query_dict.items())), doseq=True) + query = parse.urlencode(sorted(query_dict.items()), doseq=True) return parse.urlunsplit((scheme, netloc, path, query, fragment)) @@ -23,5 +23,5 @@ def remove_query_param(url, key): (scheme, netloc, path, query, fragment) = parse.urlsplit(force_str(url)) query_dict = parse.parse_qs(query, keep_blank_values=True) query_dict.pop(key, None) - query = parse.urlencode(sorted(list(query_dict.items())), doseq=True) + query = parse.urlencode(sorted(query_dict.items()), doseq=True) return parse.urlunsplit((scheme, netloc, path, query, fragment)) From 327cbef29977bb999f292d3c8b7b3efc2491691d Mon Sep 17 00:00:00 2001 From: Rafael Henter Date: Tue, 8 Sep 2020 11:44:03 -0300 Subject: [PATCH 017/303] Add Django API Client to the third party packages (#7440) --- docs/community/third-party-packages.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/community/third-party-packages.md b/docs/community/third-party-packages.md index 79cb56e01..336380aee 100644 --- a/docs/community/third-party-packages.md +++ b/docs/community/third-party-packages.md @@ -274,6 +274,7 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque * [drf-viewset-profiler][drf-viewset-profiler] - Lib to profile all methods from a viewset line by line. * [djangorestframework-features][djangorestframework-features] - Advanced schema generation and more based on named features. * [django-elasticsearch-dsl-drf][django-elasticsearch-dsl-drf] - Integrate Elasticsearch DSL with Django REST framework. Package provides views, serializers, filter backends, pagination and other handy add-ons. +* [django-api-client][django-api-client] - DRF client that groups the Endpoint response, for use in CBVs and FBV as if you were working with Django's Native Models.. [cite]: http://www.software-ecosystems.com/Software_Ecosystems/Ecosystems.html [cookiecutter]: https://github.com/jpadilla/cookiecutter-django-rest-framework @@ -358,3 +359,4 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque [drf-viewset-profiler]: https://github.com/fvlima/drf-viewset-profiler [djangorestframework-features]: https://github.com/cloudcode-hungary/django-rest-framework-features/ [django-elasticsearch-dsl-drf]: https://github.com/barseghyanartur/django-elasticsearch-dsl-drf +[django-api-client]: https://github.com/rhenter/django-api-client From 04f39c42ee28bd462fcc9088909b18f2b321501d Mon Sep 17 00:00:00 2001 From: Mohammad Amin Haghpanah Date: Wed, 9 Sep 2020 12:24:05 +0430 Subject: [PATCH 018/303] Add drf-psq package to docs (#7451) * Add drf-psq to third party packages * Add drf-psq to permissions.md this package is an extension that gives support for having action-based **permission_classes**, **serializer_class**, and **queryset** dependent on permission-based rules. Co-authored-by: Salar Nasiri --- docs/api-guide/permissions.md | 6 ++++++ docs/community/third-party-packages.md | 2 ++ 2 files changed, 8 insertions(+) diff --git a/docs/api-guide/permissions.md b/docs/api-guide/permissions.md index f317c12e6..ade146257 100644 --- a/docs/api-guide/permissions.md +++ b/docs/api-guide/permissions.md @@ -312,6 +312,11 @@ The [Django REST Framework API Key][djangorestframework-api-key] package provide The [Django Rest Framework Role Filters][django-rest-framework-role-filters] package provides simple filtering over multiple types of roles. +## Django Rest Framework PSQ + +The [Django Rest Framework PSQ][drf-psq] package is an extension that gives support for having action-based **permission_classes**, **serializer_class**, and **queryset** dependent on permission-based rules. + + [cite]: https://developer.apple.com/library/mac/#documentation/security/Conceptual/AuthenticationAndAuthorizationGuide/Authorization/Authorization.html [authentication]: authentication.md [throttling]: throttling.md @@ -328,3 +333,4 @@ The [Django Rest Framework Role Filters][django-rest-framework-role-filters] pac [django-rest-framework-role-filters]: https://github.com/allisson/django-rest-framework-role-filters [django-rest-framework-guardian]: https://github.com/rpkilby/django-rest-framework-guardian [drf-access-policy]: https://github.com/rsinger86/drf-access-policy +[drf-psq]: https://github.com/drf-psq/drf-psq diff --git a/docs/community/third-party-packages.md b/docs/community/third-party-packages.md index 336380aee..d4359890d 100644 --- a/docs/community/third-party-packages.md +++ b/docs/community/third-party-packages.md @@ -198,6 +198,7 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque * [rest_condition][rest-condition] - Another extension for building complex permissions in a simple and convenient way. * [dry-rest-permissions][dry-rest-permissions] - Provides a simple way to define permissions for individual api actions. * [drf-access-policy][drf-access-policy] - Declarative and flexible permissions inspired by AWS' IAM policies. +* [drf-psq][drf-psq] - An extension that gives support for having action-based **permission_classes**, **serializer_class**, and **queryset** dependent on permission-based rules. ### Serializers @@ -360,3 +361,4 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque [djangorestframework-features]: https://github.com/cloudcode-hungary/django-rest-framework-features/ [django-elasticsearch-dsl-drf]: https://github.com/barseghyanartur/django-elasticsearch-dsl-drf [django-api-client]: https://github.com/rhenter/django-api-client +[drf-psq]: https://github.com/drf-psq/drf-psq From e17779c47bccd218cfcdf1f3eaa61c354032ff71 Mon Sep 17 00:00:00 2001 From: johnthagen Date: Mon, 14 Sep 2020 13:46:51 -0400 Subject: [PATCH 019/303] Make it more clear to add django_filters to INSTALLED_APPS in docs. (#7535) --- docs/api-guide/filtering.md | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/docs/api-guide/filtering.md b/docs/api-guide/filtering.md index 41c1341dd..d305ede6b 100644 --- a/docs/api-guide/filtering.md +++ b/docs/api-guide/filtering.md @@ -145,10 +145,18 @@ Note that you can use both an overridden `.get_queryset()` and generic filtering The [`django-filter`][django-filter-docs] library includes a `DjangoFilterBackend` class which supports highly customizable field filtering for REST framework. -To use `DjangoFilterBackend`, first install `django-filter`. Then add `django_filters` to Django's `INSTALLED_APPS` +To use `DjangoFilterBackend`, first install `django-filter`. pip install django-filter +Then add `'django_filters'` to Django's `INSTALLED_APPS`: + + INSTALLED_APPS = [ + ... + 'django_filters', + ... + ] + You should now either add the filter backend to your settings: REST_FRAMEWORK = { @@ -365,4 +373,4 @@ The [djangorestframework-word-filter][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 [HStoreField]: https://docs.djangoproject.com/en/3.0/ref/contrib/postgres/fields/#hstorefield -[JSONField]: https://docs.djangoproject.com/en/3.0/ref/contrib/postgres/fields/#jsonfield \ No newline at end of file +[JSONField]: https://docs.djangoproject.com/en/3.0/ref/contrib/postgres/fields/#jsonfield From 98761e4ebb6c963aade674a568d010660302358e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D0=BE=D1=80=D0=B8=D1=81=20=D0=92=D0=B5=D1=80=D1=85?= =?UTF-8?q?=D0=BE=D0=B2=D1=81=D0=BA=D0=B8=D0=B9?= Date: Wed, 16 Sep 2020 09:43:27 -0400 Subject: [PATCH 020/303] Correct indentation --- docs/api-guide/views.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/views.md b/docs/api-guide/views.md index 45226d57b..2224c1f3a 100644 --- a/docs/api-guide/views.md +++ b/docs/api-guide/views.md @@ -169,7 +169,7 @@ To override the default settings, REST framework provides a set of additional de from rest_framework.throttling import UserRateThrottle class OncePerDayUserThrottle(UserRateThrottle): - rate = '1/day' + rate = '1/day' @api_view(['GET']) @throttle_classes([OncePerDayUserThrottle]) From c6e24521dab27a7af8e8637a32b868ffa03dec2f Mon Sep 17 00:00:00 2001 From: "T. Franzel" Date: Mon, 21 Sep 2020 12:39:35 +0200 Subject: [PATCH 021/303] Add third-party schema library drf-spectacular to docs (#7540) Co-authored-by: T. Franzel <13507857+tfranzel@users.noreply.github.com> --- docs/coreapi/schemas.md | 7 +++++++ docs/topics/documenting-your-api.md | 11 +++++++++++ 2 files changed, 18 insertions(+) diff --git a/docs/coreapi/schemas.md b/docs/coreapi/schemas.md index e7a418b80..653105a7a 100644 --- a/docs/coreapi/schemas.md +++ b/docs/coreapi/schemas.md @@ -828,10 +828,17 @@ A short description of the meaning and intended usage of the input field. [drf-yasg][drf-yasg] generates [OpenAPI][open-api] documents suitable for code generation - nested schemas, named models, response bodies, enum/pattern/min/max validators, form parameters, etc. + +## drf-spectacular - Sane and flexible OpenAPI 3.0 schema generation for Django REST framework + +[drf-spectacular][drf-spectacular] is a [OpenAPI 3][open-api] schema generation tool with explicit focus on extensibility, +customizability and client generation. It's usage patterns are very similar to [drf-yasg][drf-yasg]. + [cite]: https://blog.heroku.com/archives/2014/1/8/json_schema_for_heroku_platform_api [coreapi]: https://www.coreapi.org/ [corejson]: https://www.coreapi.org/specification/encoding/#core-json-encoding [drf-yasg]: https://github.com/axnsan12/drf-yasg/ +[drf-spectacular]: https://github.com/tfranzel/drf-spectacular/ [open-api]: https://openapis.org/ [json-hyperschema]: https://json-schema.org/latest/json-schema-hypermedia.html [api-blueprint]: https://apiblueprint.org/ diff --git a/docs/topics/documenting-your-api.md b/docs/topics/documenting-your-api.md index 5c5872650..7f39a9c33 100644 --- a/docs/topics/documenting-your-api.md +++ b/docs/topics/documenting-your-api.md @@ -142,6 +142,16 @@ This also translates into a very useful interactive documentation viewer in the ![Screenshot - drf-yasg][image-drf-yasg] +#### drf-spectacular - Sane and flexible OpenAPI 3.0 schema generation for Django REST framework + +[drf-spectacular][drf-spectacular] is a [OpenAPI 3][open-api] schema generation tool with explicit focus on extensibility, +customizability and client generation. Usage patterns are very similar to [drf-yasg][drf-yasg]. + +It aims to extract as much schema information as possible, while providing decorators and extensions for easy +customization. There is explicit support for [swagger-codegen][swagger], [SwaggerUI][swagger-ui] and [Redoc][redoc], +i18n, versioning, authentication, polymorphism (dynamic requests and responses), query/path/header parameters, +documentation and more. Several popular plugins for DRF are supported out-of-the-box as well. + --- ## Self describing APIs @@ -216,6 +226,7 @@ To implement a hypermedia API you'll need to decide on an appropriate media type [image-self-describing-api]: ../img/self-describing.png [drf-yasg]: https://github.com/axnsan12/drf-yasg/ +[drf-spectacular]: https://github.com/tfranzel/drf-spectacular/ [markdown]: https://daringfireball.net/projects/markdown/syntax [open-api]: https://openapis.org/ [redoc]: https://github.com/Rebilly/ReDoc From ae649336b110afe21b9429f2554052f31a9dfaf9 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 23 Sep 2020 15:39:06 +0100 Subject: [PATCH 022/303] Drop urlize_quoted_links (#7548) --- rest_framework/renderers.py | 2 +- .../templates/rest_framework/base.html | 6 +- rest_framework/templatetags/rest_framework.py | 83 +------------------ tests/test_templatetags.py | 26 +++--- 4 files changed, 21 insertions(+), 96 deletions(-) diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index 0fb74ca00..3c4be8aeb 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -418,7 +418,7 @@ class BrowsableAPIRenderer(BaseRenderer): if render_style == 'binary': return '[%d bytes of binary content]' % len(content) - return content + return content.decode('utf-8') if isinstance(content, bytes) else content def show_form_for_method(self, view, method, request, obj): """ diff --git a/rest_framework/templates/rest_framework/base.html b/rest_framework/templates/rest_framework/base.html index 9207f049b..a88e1591c 100644 --- a/rest_framework/templates/rest_framework/base.html +++ b/rest_framework/templates/rest_framework/base.html @@ -77,7 +77,7 @@
{% block request_forms %} - + {% if 'GET' in allowed_methods %}
@@ -176,9 +176,9 @@ 
HTTP {{ response.status_code }} {{ response.status_text }}{% for key, val in response_headers|items %}
-{{ key }}: {{ val|break_long_headers|urlize_quoted_links }}{% endfor %}
+{{ key }}: {{ val|break_long_headers|urlize }}{% endfor %}
 
-{{ content|urlize_quoted_links }}
+{{ content|urlize }}
diff --git a/rest_framework/templatetags/rest_framework.py b/rest_framework/templatetags/rest_framework.py index 79dd953ff..7bfa8f599 100644 --- a/rest_framework/templatetags/rest_framework.py +++ b/rest_framework/templatetags/rest_framework.py @@ -4,9 +4,9 @@ from collections import OrderedDict from django import template from django.template import loader from django.urls import NoReverseMatch, reverse -from django.utils.encoding import force_str, iri_to_uri +from django.utils.encoding import iri_to_uri from django.utils.html import escape, format_html, smart_urlquote -from django.utils.safestring import SafeData, mark_safe +from django.utils.safestring import mark_safe from rest_framework.compat import apply_markdown, pygments_highlight from rest_framework.renderers import HTMLFormRenderer @@ -311,85 +311,6 @@ def smart_urlquote_wrapper(matched_url): return None -@register.filter(needs_autoescape=True) -def urlize_quoted_links(text, trim_url_limit=None, nofollow=True, autoescape=True): - """ - Converts any URLs in text into clickable links. - - Works on http://, https://, www. links, and also on links ending in one of - the original seven gTLDs (.com, .edu, .gov, .int, .mil, .net, and .org). - Links can have trailing punctuation (periods, commas, close-parens) and - 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 ellipsis. - - If nofollow is True, the URLs in link text will get a rel="nofollow" - attribute. - - If autoescape is True, the link text and URLs will get autoescaped. - """ - def trim_url(x, limit=trim_url_limit): - return limit is not None and (len(x) > limit and ('%s...' % x[:max(0, limit - 3)])) or x - - safe_input = isinstance(text, SafeData) - - # Unfortunately, Django built-in cannot be used here, because escaping - # is to be performed on words, which have been forcibly coerced to text - def conditional_escape(text): - return escape(text) if autoescape and not safe_input else text - - words = word_split_re.split(force_str(text)) - for i, word in enumerate(words): - if '.' in word or '@' in word or ':' in word: - # Deal with punctuation. - lead, middle, trail = '', word, '' - for punctuation in TRAILING_PUNCTUATION: - if middle.endswith(punctuation): - middle = middle[:-len(punctuation)] - trail = punctuation + trail - for opening, closing in WRAPPING_PUNCTUATION: - if middle.startswith(opening): - middle = middle[len(opening):] - lead = lead + opening - # Keep parentheses at the end only if they're balanced. - if ( - middle.endswith(closing) and - middle.count(closing) == middle.count(opening) + 1 - ): - middle = middle[:-len(closing)] - trail = closing + trail - - # Make URL we want to point to. - url = None - nofollow_attr = ' rel="nofollow"' if nofollow else '' - if simple_url_re.match(middle): - url = smart_urlquote_wrapper(middle) - elif simple_url_2_re.match(middle): - url = smart_urlquote_wrapper('http://%s' % middle) - elif ':' not in middle and simple_email_re.match(middle): - local, domain = middle.rsplit('@', 1) - try: - domain = domain.encode('idna').decode('ascii') - except UnicodeError: - continue - url = 'mailto:%s@%s' % (local, domain) - nofollow_attr = '' - - # Make link. - if url: - trimmed = trim_url(middle) - lead, trail = conditional_escape(lead), conditional_escape(trail) - url, trimmed = conditional_escape(url), conditional_escape(trimmed) - middle = '%s' % (url, nofollow_attr, trimmed) - words[i] = '%s%s%s' % (lead, middle, trail) - else: - words[i] = conditional_escape(word) - else: - words[i] = conditional_escape(word) - return mark_safe(''.join(words)) - - @register.filter def break_long_headers(header): """ diff --git a/tests/test_templatetags.py b/tests/test_templatetags.py index 28d6b4011..cdf10ab1e 100644 --- a/tests/test_templatetags.py +++ b/tests/test_templatetags.py @@ -2,13 +2,14 @@ import unittest from django.template import Context, Template from django.test import TestCase +from django.utils.html import urlize from rest_framework.compat import coreapi, coreschema from rest_framework.relations import Hyperlink from rest_framework.templatetags import rest_framework from rest_framework.templatetags.rest_framework import ( add_nested_class, add_query_param, as_string, break_long_headers, - format_value, get_pagination_html, schema_links, urlize_quoted_links + format_value, get_pagination_html, schema_links ) from rest_framework.test import APIRequestFactory @@ -246,7 +247,7 @@ class Issue1386Tests(TestCase): def test_issue_1386(self): """ - Test function urlize_quoted_links with different args + Test function urlize with different args """ correct_urls = [ "asdf.com", @@ -255,7 +256,7 @@ class Issue1386Tests(TestCase): "as.d8f.ghj8.gov", ] for i in correct_urls: - res = urlize_quoted_links(i) + res = urlize(i) self.assertNotEqual(res, i) self.assertIn(i, res) @@ -264,11 +265,11 @@ class Issue1386Tests(TestCase): "asdf.netnet", ] for i in incorrect_urls: - res = urlize_quoted_links(i) + res = urlize(i) self.assertEqual(i, res) # example from issue #1386, this shouldn't raise an exception - urlize_quoted_links("asdf:[/p]zxcv.com") + urlize("asdf:[/p]zxcv.com") def test_smart_urlquote_wrapper_handles_value_error(self): def mock_smart_urlquote(url): @@ -289,7 +290,10 @@ class URLizerTests(TestCase): For all items in dict test assert that the value is urlized key """ for original, urlized in data.items(): - assert urlize_quoted_links(original, nofollow=False) == urlized + print('====') + print(repr(urlize(original, nofollow=False))) + print(repr(urlized)) + assert urlize(original, nofollow=False) == urlized def test_json_with_url(self): """ @@ -297,26 +301,26 @@ class URLizerTests(TestCase): """ data = {} data['"url": "http://api/users/1/", '] = \ - '"url": "http://api/users/1/", ' + '"url": "http://api/users/1/", ' data['"foo_set": [\n "http://api/foos/1/"\n], '] = \ - '"foo_set": [\n "http://api/foos/1/"\n], ' + '"foo_set": [\n "http://api/foos/1/"\n], ' self._urlize_dict_check(data) def test_template_render_with_autoescape(self): """ Test that HTML is correctly escaped in Browsable API views. """ - template = Template("{% load rest_framework %}{{ content|urlize_quoted_links }}") + template = Template("{% load rest_framework %}{{ content|urlize }}") rendered = template.render(Context({'content': ' http://example.com'})) assert rendered == '<script>alert()</script>' \ ' http://example.com' def test_template_render_with_noautoescape(self): """ - Test if the autoescape value is getting passed to urlize_quoted_links filter. + Test if the autoescape value is getting passed to urlize filter. """ template = Template("{% load rest_framework %}" - "{% autoescape off %}{{ content|urlize_quoted_links }}" + "{% autoescape off %}{{ content|urlize }}" "{% endautoescape %}") rendered = template.render(Context({'content': ' "http://example.com" '})) assert rendered == ' "http://example.com" ' From 9ee67bbff77638316b6f1455d5dff38637a02306 Mon Sep 17 00:00:00 2001 From: Esieboma Jeremiah <57163971+esiebomaj@users.noreply.github.com> Date: Mon, 28 Sep 2020 08:52:17 +0100 Subject: [PATCH 023/303] corrects typographical error in line 118 (#7553) --- 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 3def1946c..49eec8259 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -115,7 +115,7 @@ class BaseSerializer(Field): super().__init__(**kwargs) def __new__(cls, *args, **kwargs): - # We override this method in order to automagically create + # We override this method in order to automatically create # `ListSerializer` classes instead when `many=True` is set. if kwargs.pop('many', False): return cls.many_init(*args, **kwargs) From 6f7aad8ffa96226672eacb82ab003dcf01070ed3 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 28 Sep 2020 10:47:50 +0100 Subject: [PATCH 024/303] Placeholder for 3.12 release (#7379) * Placeholder for 3.12 release * Updating release notes * Updating release notes * Updating release notes * Update release notes * Fix typo * Basic structure for release announcement * 3.12 release notes * Version 3.12.0 --- docs/community/3.12-announcement.md | 169 ++++++++++++++++++++++++++++ docs/community/release-notes.md | 49 +++++++- mkdocs.yml | 1 + rest_framework/__init__.py | 2 +- 4 files changed, 219 insertions(+), 2 deletions(-) create mode 100644 docs/community/3.12-announcement.md diff --git a/docs/community/3.12-announcement.md b/docs/community/3.12-announcement.md new file mode 100644 index 000000000..9d2220933 --- /dev/null +++ b/docs/community/3.12-announcement.md @@ -0,0 +1,169 @@ + + +# Django REST framework 3.12 + +REST framework 3.12 brings a handful of refinements to the OpenAPI schema +generation, plus support for Django's new database-agnostic `JSONField`, +and some improvements to the `SearchFilter` class. + +## Grouping operations with tags. + +Open API schemas will now automatically include tags, based on the first element +in the URL path. + +For example... + +Method | Path | Tags +--------------------------------|-----------------|------------- +`GET`, `PUT`, `PATCH`, `DELETE` | `/users/{id}/` | `['users']` +`GET`, `POST` | `/users/` | `['users']` +`GET`, `PUT`, `PATCH`, `DELETE` | `/orders/{id}/` | `['orders']` +`GET`, `POST` | `/orders/` | `['orders']` + +The tags used for a particular view may also be overridden... + +```python +class MyOrders(APIView): + schema = AutoSchema(tags=['users', 'orders']) + ... +``` + +See [the schema documentation](https://www.django-rest-framework.org/api-guide/schemas/#grouping-operations-with-tags) for more information. + +## Customizing the operation ID. + +REST framework automatically determines operation IDs to use in OpenAPI +schemas. The latest version provides more control for overriding the behaviour +used to generate the operation IDs. + +See [the schema documentation](https://www.django-rest-framework.org/api-guide/schemas/#operationid) for more information. + +## Support for OpenAPI components. + +In order to output more graceful OpenAPI schemes, REST framework 3.12 now +defines components in the schema, and then references them inside request +and response objects. This is in contrast with the previous approach, which +fully expanded the request and response bodies for each operation. + +The names used for a component default to using the serializer class name, [but +may be overridden if needed](https://www.django-rest-framework.org/api-guide/schemas/#components +)... + +```python +class MyOrders(APIView): + schema = AutoSchema(component_name="OrderDetails") +``` + +## More Public API + +Many methods on the `AutoSchema` class have now been promoted to public API, +allowing you to more fully customize the schema generation. The following methods +are now available for overriding... + +* `get_path_parameters` +* `get_pagination_parameters` +* `get_filter_parameters` +* `get_request_body` +* `get_responses` +* `get_serializer` +* `get_paginator` +* `map_serializer` +* `map_field` +* `map_choice_field` +* `map_field_validators` +* `allows_filters`. + +See [the schema docs](https://www.django-rest-framework.org/api-guide/schemas/#per-view-customization) +for details on using custom `AutoSchema` subclasses. + +## Support for JSONField. + +Django 3.1 deprecated the existing `django.contrib.postgres.fields.JSONField` +in favour of a new database-agnositic `JSONField`. + +REST framework 3.12 now supports this new model field, and `ModelSerializer` +classes will correctly map the model field. + +## SearchFilter improvements + +There are a couple of significant improvements to the `SearchFilter` class. + +### Nested searches against JSONField and HStoreField + +The class now supports nested search within `JSONField` and `HStoreField`, using +the double underscore notation for traversing which element of the field the +search should apply to. + +```python +class SitesSearchView(generics.ListAPIView): + """ + An API view to return a list of archaeological sites, optionally filtered + by a search against the site name or location. (Location searches are + matched against the region and country names.) + """ + queryset = Sites.objects.all() + serializer_class = SitesSerializer + filter_backends = [filters.SearchFilter] + search_fields = ['site_name', 'location__region', 'location__country'] +``` + +### Searches against annotate fields + +Django allows querysets to create additional virtual fields, using the `.annotate` +method. We now support searching against annotate fields. + +```python +class PublisherSearchView(generics.ListAPIView): + """ + Search for publishers, optionally filtering the search against the average + rating of all their books. + """ + queryset = Publisher.objects.annotate(avg_rating=Avg('book__rating')) + serializer_class = PublisherSerializer + filter_backends = [filters.SearchFilter] + search_fields = ['avg_rating'] +``` + +--- + +## Funding + +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]**. + +*Every single sign-up helps us make REST framework long-term financially sustainable.* + + +
+ +*Many thanks to all our [wonderful sponsors][sponsors], and in particular to our premium backers, [Sentry](https://getsentry.com/welcome/), [Stream](https://getstream.io/?utm_source=drf&utm_medium=banner&utm_campaign=drf), [ESG](https://software.esg-usa.com/), [Rollbar](https://rollbar.com/?utm_source=django&utm_medium=sponsorship&utm_campaign=freetrial), [Cadre](https://cadre.com), [Kloudless](https://hubs.ly/H0f30Lf0), [Lights On Software](https://lightsonsoftware.com), and [Retool](https://retool.com/?utm_source=djangorest&utm_medium=sponsorship).* + +[sponsors]: https://fund.django-rest-framework.org/topics/funding/#our-sponsors +[funding]: funding.md diff --git a/docs/community/release-notes.md b/docs/community/release-notes.md index d6f56317d..636e91d6c 100644 --- a/docs/community/release-notes.md +++ b/docs/community/release-notes.md @@ -36,11 +36,58 @@ You can determine your currently installed version using `pip show`: ## 3.11.x series +### 3.12.0 + +* Add `--file` option to `generateschema` command. [#7130] +* Support `tags` for OpenAPI schema generation. See [the schema docs](https://www.django-rest-framework.org/api-guide/schemas/#grouping-operations-with-tags). [#7184] +* Support customising the operation ID for schema generation. See [the schema docs](https://www.django-rest-framework.org/api-guide/schemas/#operationid). [#7190] +* Support OpenAPI components for schema generation. See [the schema docs](https://www.django-rest-framework.org/api-guide/schemas/#components). [#7124] +* The following methods on `AutoSchema` become public API: `get_path_parameters`, `get_pagination_parameters`, `get_filter_parameters`, `get_request_body`, `get_responses`, `get_serializer`, `get_paginator`, `map_serializer`, `map_field`, `map_choice_field`, `map_field_validators`, `allows_filters`. See [the schema docs](https://www.django-rest-framework.org/api-guide/schemas/#autoschema) +* Add support for Django 3.1's database-agnositic `JSONField`. [#7467] +* `SearchFilter` now supports nested search on `JSONField` and `HStoreField` model fields. [#7121] +* `SearchFilter` now supports searching on `annotate()` fields. [#6240] +* The authtoken model no longer exposes the `pk` in the admin URL. [#7341] +* Add `__repr__` for Request instances. [#7239] +* UTF-8 decoding with Latin-1 fallback for basic auth credentials. [#7193] +* CharField treats surrogate characters as a validation failure. [#7026] +* Don't include callables as default values in schemas. [#7105] +* Improve `ListField` schema output to include all available child information. [#7137] +* Allow `default=False` to be included for `BooleanField` schema outputs. [#7165] +* Include `"type"` information in `ChoiceField` schema outputs. [#7161] +* Include `"type": "object"` on schema objects. [#7169] +* Don't include component in schema output for DELETE requests. [#7229] +* Fix schema types for `DecimalField`. [#7254] +* Fix schema generation for `ObtainAuthToken` view. [#7211] +* Support passing `context=...` to view `.get_serializer()` methods. [#7298] +* Pass custom code to `PermissionDenied` if permission class has one set. [#7306] +* Include "example" in schema pagination output. [#7275] +* Default status code of 201 on schema output for POST requests. [#7206] +* Use camelCase for operation IDs in schema output. [#7208] +* Warn if duplicate operation IDs exist in schema output. [#7207] +* Improve handling of decimal type when mapping `ChoiceField` to a schema output. [#7264] +* Disable YAML aliases for OpenAPI schema outputs. [#7131] +* Fix action URL names for APIs included under a namespaced URL. [#7287] +* Update jQuery version from 3.4 to 3.5. [#7313] +* Fix `UniqueTogether` handling when serializer fields use `source=...`. [#7143] +* HTTP `HEAD` requests now set `self.action` correctly on a ViewSet instance. [#7223] +* Return a valid OpenAPI schema for the case where no API schema paths exist. [#7125] +* Include tests in package distribution. [#7145] +* Allow type checkers to support annotations like `ModelSerializer[Author]`. [#7385] +* Don't include invalid `charset=None` portion in the request `Content-Type` header when using APIClient. [#7400] +* Fix `\Z`/`\z` tokens in OpenAPI regexs. [#7389] +* Fix `PrimaryKeyRelatedField` and `HyperlinkedRelatedField` when source field is actually a property. [#7142] +* `Token.generate_key` is now a class method. [#7502] +* `@action` warns if method is wrapped in a decorator that does not preserve information using `@functools.wraps`. [#7098] + +--- + +## 3.11.x series + ### 3.11.0 **Date**: 12th December 2019 -* Drop `.set_context` API [in favour of a `requires_context` marker](../3.11-announcement#validator-default-context). +* Drop `.set_context` API [in favour of a `requires_context` marker](3.11-announcement.md#validator-default-context). * Changed default widget for TextField with choices to select box. [#6892][gh6892] * Supported nested writes on non-relational fields, such as JSONField. [#6916][gh6916] * Include request/response media types in OpenAPI schemas, based on configured parsers/renderers. [#6865][gh6865] diff --git a/mkdocs.yml b/mkdocs.yml index 484971a71..573898bca 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -66,6 +66,7 @@ nav: - 'Contributing to REST framework': 'community/contributing.md' - 'Project management': 'community/project-management.md' - 'Release Notes': 'community/release-notes.md' + - '3.12 Announcement': 'community/3.12-announcement.md' - '3.11 Announcement': 'community/3.11-announcement.md' - '3.10 Announcement': 'community/3.10-announcement.md' - '3.9 Announcement': 'community/3.9-announcement.md' diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py index 8f2bc4466..afb2d3429 100644 --- a/rest_framework/__init__.py +++ b/rest_framework/__init__.py @@ -8,7 +8,7 @@ ______ _____ _____ _____ __ """ __title__ = 'Django REST framework' -__version__ = '3.11.0' +__version__ = '3.12.0' __author__ = 'Tom Christie' __license__ = 'BSD 3-Clause' __copyright__ = 'Copyright 2011-2019 Encode OSS Ltd' From 68b23075a2d72935f1e6c428c664d49412a8af68 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 28 Sep 2020 10:54:52 +0100 Subject: [PATCH 025/303] Add date to 3.12 release. --- docs/community/release-notes.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/community/release-notes.md b/docs/community/release-notes.md index 636e91d6c..b9bccc3ac 100644 --- a/docs/community/release-notes.md +++ b/docs/community/release-notes.md @@ -38,6 +38,8 @@ You can determine your currently installed version using `pip show`: ### 3.12.0 +Date: 28th September 2020 + * Add `--file` option to `generateschema` command. [#7130] * Support `tags` for OpenAPI schema generation. See [the schema docs](https://www.django-rest-framework.org/api-guide/schemas/#grouping-operations-with-tags). [#7184] * Support customising the operation ID for schema generation. See [the schema docs](https://www.django-rest-framework.org/api-guide/schemas/#operationid). [#7190] From 995188f8c5bfdd0da29a7f9ca01898dfce5f0b37 Mon Sep 17 00:00:00 2001 From: Hugo Rodger-Brown Date: Mon, 28 Sep 2020 16:16:18 +0100 Subject: [PATCH 026/303] Add missing TokenProxy migration (#7557) Fixes #7554 --- .../authtoken/migrations/0003_tokenproxy.py | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 rest_framework/authtoken/migrations/0003_tokenproxy.py diff --git a/rest_framework/authtoken/migrations/0003_tokenproxy.py b/rest_framework/authtoken/migrations/0003_tokenproxy.py new file mode 100644 index 000000000..79405a7c0 --- /dev/null +++ b/rest_framework/authtoken/migrations/0003_tokenproxy.py @@ -0,0 +1,25 @@ +# Generated by Django 3.1.1 on 2020-09-28 09:34 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('authtoken', '0002_auto_20160226_1747'), + ] + + operations = [ + migrations.CreateModel( + name='TokenProxy', + fields=[ + ], + options={ + 'verbose_name': 'token', + 'proxy': True, + 'indexes': [], + 'constraints': [], + }, + bases=('authtoken.token',), + ), + ] From 05b3865838bcc0e4298a2c6a75cca69aad4f51d7 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 28 Sep 2020 16:18:23 +0100 Subject: [PATCH 027/303] Version 3.12.1 --- docs/community/release-notes.md | 6 ++++++ rest_framework/__init__.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/docs/community/release-notes.md b/docs/community/release-notes.md index b9bccc3ac..a300162aa 100644 --- a/docs/community/release-notes.md +++ b/docs/community/release-notes.md @@ -36,6 +36,12 @@ You can determine your currently installed version using `pip show`: ## 3.11.x series +### 3.12.1 + +Date: 28th September 2020 + +* Add `TokenProxy` migration. [#7557] + ### 3.12.0 Date: 28th September 2020 diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py index afb2d3429..cd35f7a04 100644 --- a/rest_framework/__init__.py +++ b/rest_framework/__init__.py @@ -8,7 +8,7 @@ ______ _____ _____ _____ __ """ __title__ = 'Django REST framework' -__version__ = '3.12.0' +__version__ = '3.12.1' __author__ = 'Tom Christie' __license__ = 'BSD 3-Clause' __copyright__ = 'Copyright 2011-2019 Encode OSS Ltd' From 9edd5dfe5d65b99289b7a6d0d74deab89749a512 Mon Sep 17 00:00:00 2001 From: Ali Mirlou Date: Mon, 28 Sep 2020 23:15:30 +0330 Subject: [PATCH 028/303] Fix typo in release notes --- docs/community/release-notes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/community/release-notes.md b/docs/community/release-notes.md index a300162aa..26dca3e4f 100644 --- a/docs/community/release-notes.md +++ b/docs/community/release-notes.md @@ -34,7 +34,7 @@ You can determine your currently installed version using `pip show`: --- -## 3.11.x series +## 3.12.x series ### 3.12.1 From a03c85225ff79db42319fda4dfa6e65d316b6c03 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 30 Sep 2020 09:10:36 +0100 Subject: [PATCH 029/303] Update test_templatetags.py --- tests/test_templatetags.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/test_templatetags.py b/tests/test_templatetags.py index cdf10ab1e..4b84f6647 100644 --- a/tests/test_templatetags.py +++ b/tests/test_templatetags.py @@ -290,9 +290,6 @@ class URLizerTests(TestCase): For all items in dict test assert that the value is urlized key """ for original, urlized in data.items(): - print('====') - print(repr(urlize(original, nofollow=False))) - print(repr(urlized)) assert urlize(original, nofollow=False) == urlized def test_json_with_url(self): From be87eb43b348f1f079de81329218b79814b97173 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 30 Sep 2020 09:44:31 +0100 Subject: [PATCH 030/303] Update release notes with 3.11.1, 3.11.2 --- docs/community/release-notes.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/docs/community/release-notes.md b/docs/community/release-notes.md index 26dca3e4f..a48888719 100644 --- a/docs/community/release-notes.md +++ b/docs/community/release-notes.md @@ -91,6 +91,18 @@ Date: 28th September 2020 ## 3.11.x series +### 3.11.2 + +**Date**: 30th September 2020 + +* **Security**: Drop `urlize_quoted_links` template tag in favour of Django's built-in `urlize`. Removes a XSS vulnerability for some kinds of content in the browsable API. + +### 3.11.1 + +**Date**: 5th August 2020 + +* Fix compat with Django 3.1 + ### 3.11.0 **Date**: 12th December 2019 From 91916a4db14cd6a06aca13fb9a46fc667f6c0682 Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Wed, 30 Sep 2020 13:47:06 +0100 Subject: [PATCH 031/303] Fix NullBooleanField warning (#7565) The argument to Field is 'allow_null'. --- 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 f218713f1..fdfba13f2 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -749,7 +749,7 @@ class NullBooleanField(BooleanField): warnings.warn( "The `NullBooleanField` is deprecated and will be removed starting " "with 3.14. Instead use the `BooleanField` field and set " - "`null=True` which does the same thing.", + "`allow_null=True` which does the same thing.", RemovedInDRF314Warning, stacklevel=2 ) From 86ec3da2daa7c585ac00c9900a6b482d7e819eac Mon Sep 17 00:00:00 2001 From: Emmanuel Meric de Bellefon Date: Mon, 5 Oct 2020 20:56:42 +0200 Subject: [PATCH 032/303] Update 6-viewsets-and-routers.md --- 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 11e24448f..18989a3ee 100644 --- a/docs/tutorial/6-viewsets-and-routers.md +++ b/docs/tutorial/6-viewsets-and-routers.md @@ -2,7 +2,7 @@ REST framework includes an abstraction for dealing with `ViewSets`, that allows the developer to concentrate on modeling the state and interactions of the API, and leave the URL construction to be handled automatically, based on common conventions. -`ViewSet` classes are almost the same thing as `View` classes, except that they provide operations such as `read`, or `update`, and not method handlers such as `get` or `put`. +`ViewSet` classes are almost the same thing as `View` classes, except that they provide operations such as `retrieve`, or `update`, and not method handlers such as `get` or `put`. A `ViewSet` class is only bound to a set of method handlers at the last moment, when it is instantiated into a set of views, typically by using a `Router` class which handles the complexities of defining the URL conf for you. From a849627f88c95cf3561a51055a0d8af901430e6a Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy Date: Mon, 5 Oct 2020 21:48:07 +0200 Subject: [PATCH 033/303] Fixes #7538 - use `retrieve` action name instead of `detail` --- 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 11e24448f..3ce3ae710 100644 --- a/docs/tutorial/6-viewsets-and-routers.md +++ b/docs/tutorial/6-viewsets-and-routers.md @@ -16,7 +16,7 @@ First of all let's refactor our `UserList` and `UserDetail` views into a single class UserViewSet(viewsets.ReadOnlyModelViewSet): """ - This viewset automatically provides `list` and `detail` actions. + This viewset automatically provides `list` and `retrieve` actions. """ queryset = User.objects.all() serializer_class = UserSerializer From 6a45a6a36fedf5b2a9bfbb23cf12b8a1cc8acb3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E0=A4=B8=E0=A5=8D=E0=A4=AA=E0=A4=B0=E0=A5=8D=E0=A4=B6?= Date: Tue, 6 Oct 2020 17:59:11 +0545 Subject: [PATCH 034/303] Fix broken machinalis links (#7580) #7572 #7423 #7573 all are related to this --- docs/community/tutorials-and-resources.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/community/tutorials-and-resources.md b/docs/community/tutorials-and-resources.md index 6fdac6004..cfd3ba852 100644 --- a/docs/community/tutorials-and-resources.md +++ b/docs/community/tutorials-and-resources.md @@ -101,12 +101,12 @@ Want your Django REST Framework talk/tutorial/article to be added to our website [django-rest-framework-course]: https://teamtreehouse.com/library/django-rest-framework [pycon-uk-2016]: https://www.youtube.com/watch?v=FjmiGh7OqVg [django-under-hood-2014]: https://www.youtube.com/watch?v=3cSsbe-tA0E -[integrating-pandas-drf-and-bokeh]: https://machinalis.com/blog/pandas-django-rest-framework-bokeh/ -[controlling-uncertainty-on-web-apps-and-apis]: https://machinalis.com/blog/controlling-uncertainty-on-web-applications-and-apis/ -[full-text-search-in-drf]: https://machinalis.com/blog/full-text-search-on-django-rest-framework/ -[oauth2-authentication-with-drf]: https://machinalis.com/blog/oauth2-authentication/ -[nested-resources-with-drf]: https://machinalis.com/blog/nested-resources-with-django/ -[image-fields-with-drf]: https://machinalis.com/blog/image-fields-with-django-rest-framework/ +[integrating-pandas-drf-and-bokeh]: https://web.archive.org/web/20180104205117/http://machinalis.com/blog/pandas-django-rest-framework-bokeh/ +[controlling-uncertainty-on-web-apps-and-apis]: https://web.archive.org/web/20180104205043/https://machinalis.com/blog/controlling-uncertainty-on-web-applications-and-apis/ +[full-text-search-in-drf]: https://web.archive.org/web/20180104205059/http://machinalis.com/blog/full-text-search-on-django-rest-framework/ +[oauth2-authentication-with-drf]: https://web.archive.org/web/20180104205054/http://machinalis.com/blog/oauth2-authentication/ +[nested-resources-with-drf]: https://web.archive.org/web/20180104205109/http://machinalis.com/blog/nested-resources-with-django/ +[image-fields-with-drf]: https://web.archive.org/web/20180104205048/http://machinalis.com/blog/image-fields-with-django-rest-framework/ [chatbot-using-drf-part1]: https://chatbotslife.com/chatbot-using-django-rest-framework-api-ai-slack-part-1-3-69c7e38b7b1e#.g2aceuncf [new-django-admin-with-drf-and-emberjs]: https://blog.levit.be/new-django-admin-with-emberjs-what-are-the-news/ [drf-schema]: https://drf-schema-adapter.readthedocs.io/en/latest/ From 5e23b559f83f2ce2a4683111590909dc475d41a6 Mon Sep 17 00:00:00 2001 From: Mopsan Date: Fri, 9 Oct 2020 11:38:11 +0300 Subject: [PATCH 035/303] Fix example override of SchemaGenerator.get_schema() --- 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 e39cd21a8..b4832b369 100644 --- a/docs/api-guide/schemas.md +++ b/docs/api-guide/schemas.md @@ -181,8 +181,8 @@ dictionary For example you might wish to add terms of service to the [top-level ``` class TOSSchemaGenerator(SchemaGenerator): - def get_schema(self): - schema = super().get_schema() + def get_schema(self, *args, **kwargs): + schema = super().get_schema(*args, **kwargs) schema["info"]["termsOfService"] = "https://example.com/tos.html" return schema ``` From 7921e9af434f2ccfde6962cf8a1b76331cc77722 Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Fri, 9 Oct 2020 10:48:03 +0100 Subject: [PATCH 036/303] Fix RemovedInDjango40Warning for middleware get_resopnse() (#7513) Fixes #7417. Fixes all these issues seen with `tox -e py38-django31`: ``` /Users/chainz/Documents/Projects/django-rest-framework/tests/test_request.py:208: RemovedInDjango40Warning: Passing None for the middleware get_response argument is deprecated. SessionMiddleware().process_request(self.wrapped_request) tests/test_requests_client.py: 1 test with warning tests/test_testing.py: 4 tests with warnings tests/test_throttling.py: 1 test with warning tests/authentication/test_authentication.py: 4 tests with warnings tests/browsable_api/test_browsable_api.py: 4 tests with warnings /Users/chainz/Documents/Projects/django-rest-framework/rest_framework/authentication.py:139: RemovedInDjango40Warning: Passing None for the middleware get_response argument is deprecated. check = CSRFCheck() ``` --- rest_framework/authentication.py | 5 ++++- tests/test_request.py | 8 ++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/rest_framework/authentication.py b/rest_framework/authentication.py index a2ba53480..9111007c0 100644 --- a/rest_framework/authentication.py +++ b/rest_framework/authentication.py @@ -136,7 +136,10 @@ class SessionAuthentication(BaseAuthentication): """ Enforce CSRF validation for session based authentication. """ - check = CSRFCheck() + def dummy_get_response(request): # pragma: no cover + return None + + check = CSRFCheck(dummy_get_response) # populates request.META['CSRF_COOKIE'], which is used in process_view() check.process_request(request) reason = check.process_view(request, None, (), {}) diff --git a/tests/test_request.py b/tests/test_request.py index 4425c020f..8f55d00ed 100644 --- a/tests/test_request.py +++ b/tests/test_request.py @@ -205,8 +205,12 @@ class TestUserSetter(TestCase): # available to login and logout functions self.wrapped_request = factory.get('/') self.request = Request(self.wrapped_request) - SessionMiddleware().process_request(self.wrapped_request) - AuthenticationMiddleware().process_request(self.wrapped_request) + + def dummy_get_response(request): # pragma: no cover + return None + + SessionMiddleware(dummy_get_response).process_request(self.wrapped_request) + AuthenticationMiddleware(dummy_get_response).process_request(self.wrapped_request) User.objects.create_user('ringo', 'starr@thebeatles.com', 'yellow') self.user = authenticate(username='ringo', password='yellow') From 931b34e7deb3b54e9b8205aad3a2448ff319e2b8 Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Fri, 9 Oct 2020 11:09:34 +0100 Subject: [PATCH 037/303] Remove tox-venv from Travis setup (#7585) This was added in #6139. However it seems [tox-venv is no longer maintained](https://github.com/tox-dev/tox-venv), the related [virtualenv issue has been closed](https://github.com/pypa/virtualenv/issues/355), and I suspect with the virtualenv rewrite fixed the problem with site.py and the warnings referred to for the DRF tests. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c204c5460..2c2724bf6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,7 +40,7 @@ matrix: - env: DJANGO=master install: - - pip install tox tox-venv tox-travis + - pip install tox tox-travis script: - tox From 79daf315c4504d55bfd6025567be8ec9f35d361c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kry=C5=A1tof=20Piln=C3=A1=C4=8Dek?= Date: Fri, 9 Oct 2020 13:16:15 +0200 Subject: [PATCH 038/303] Fix: authtoken.TokenProxy cannot be proxy when not installed (#7571) closes https://github.com/encode/django-rest-framework/issues/7442 --- rest_framework/authtoken/models.py | 3 ++- tests/test_authtoken.py | 11 ++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/rest_framework/authtoken/models.py b/rest_framework/authtoken/models.py index fd8a50e0e..540049295 100644 --- a/rest_framework/authtoken/models.py +++ b/rest_framework/authtoken/models.py @@ -49,5 +49,6 @@ class TokenProxy(Token): return self.user.pk class Meta: - proxy = True + proxy = 'rest_framework.authtoken' in settings.INSTALLED_APPS + abstract = 'rest_framework.authtoken' not in settings.INSTALLED_APPS verbose_name = "token" diff --git a/tests/test_authtoken.py b/tests/test_authtoken.py index 036e317ef..30e416d65 100644 --- a/tests/test_authtoken.py +++ b/tests/test_authtoken.py @@ -1,10 +1,11 @@ +import importlib from io import StringIO import pytest from django.contrib.admin import site from django.contrib.auth.models import User from django.core.management import CommandError, call_command -from django.test import TestCase +from django.test import TestCase, modify_settings from rest_framework.authtoken.admin import TokenAdmin from rest_framework.authtoken.management.commands.drf_create_token import \ @@ -21,6 +22,14 @@ class AuthTokenTests(TestCase): self.user = User.objects.create_user(username='test_user') self.token = Token.objects.create(key='test token', user=self.user) + def test_authtoken_can_be_imported_when_not_included_in_installed_apps(self): + import rest_framework.authtoken.models + with modify_settings(INSTALLED_APPS={'remove': 'rest_framework.authtoken'}): + importlib.reload(rest_framework.authtoken.models) + # Set the proxy and abstract properties back to the version, + # where authtoken is among INSTALLED_APPS. + importlib.reload(rest_framework.authtoken.models) + def test_model_admin_displayed_fields(self): mock_request = object() token_admin = TokenAdmin(self.token, self.site) From 79c37d0dc3740aa1c439f8a447e5e8b64fd567be Mon Sep 17 00:00:00 2001 From: David Smith <39445562+smithdc1@users.noreply.github.com> Date: Fri, 9 Oct 2020 12:21:22 +0100 Subject: [PATCH 039/303] Return NotImplemented sooner for ErrorDetail equality test (#7531) The test suite raises warnings when tested against Python 3.9 `DeprecationWarning: NotImplemented should not be used in a boolean context` Where `r` returns `NotImplemented` then this change returns `NotImplemented` first to avoid the comparison test. --- rest_framework/exceptions.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rest_framework/exceptions.py b/rest_framework/exceptions.py index 345a40524..943dcc88c 100644 --- a/rest_framework/exceptions.py +++ b/rest_framework/exceptions.py @@ -73,6 +73,8 @@ class ErrorDetail(str): def __eq__(self, other): r = super().__eq__(other) + if r is NotImplemented: + return NotImplemented try: return r and self.code == other.code except AttributeError: From 563b04376828a9c3d4d0c3232c1dad342627168b Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Sat, 10 Oct 2020 17:34:00 +0100 Subject: [PATCH 040/303] Error on deprecation and pending deprecation warnings (#7586) Erroring on deprecation or pending deprecation warnings means they are caught early. This will avoid the cycle of releasing with 'support for Django X', then chasing all the deprecation warnings one-by-one. Instead, when a new Django version is added to the test matrix, it will fail until all the relevant warnings are fixed. This avoids passing these warnings on to users, some of whom don't upgrade until they are all fixed. --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index d5e769764..df6387d5e 100644 --- a/tox.ini +++ b/tox.ini @@ -14,7 +14,7 @@ DJANGO = master: djangomaster [testenv] -commands = ./runtests.py --fast --coverage {posargs} +commands = python -W error::DeprecationWarning -W error::PendingDeprecationWarning runtests.py --fast --coverage {posargs} envdir = {toxworkdir}/venvs/{envname} setenv = PYTHONDONTWRITEBYTECODE=1 From 1ef192811cee3e6953aeb3d8f724d45c3057b6e7 Mon Sep 17 00:00:00 2001 From: Thomas Riccardi Date: Sat, 10 Oct 2020 18:34:39 +0200 Subject: [PATCH 041/303] Add missing quoting for `data` keyword argument in serializer doc (#7587) --- 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 efa325620..5e2705834 100644 --- a/docs/api-guide/serializers.md +++ b/docs/api-guide/serializers.md @@ -251,7 +251,7 @@ For more information see the [validators documentation](validators.md). When passing an initial object or queryset to a serializer instance, the object will be made available as `.instance`. If no initial object is passed then the `.instance` attribute will be `None`. -When passing data to a serializer instance, the unmodified data will be made available as `.initial_data`. If the data keyword argument is not passed then the `.initial_data` attribute will not exist. +When passing data to a serializer instance, the unmodified data will be made available as `.initial_data`. If the `data` keyword argument is not passed then the `.initial_data` attribute will not exist. ## Partial updates From ffde1691025761c97927f9f4bbd5a9f3ec9ea96e Mon Sep 17 00:00:00 2001 From: zach valenta Date: Sat, 10 Oct 2020 12:36:15 -0400 Subject: [PATCH 042/303] Add docs link to to_internal_value() (#7476) --- docs/api-guide/relations.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/api-guide/relations.md b/docs/api-guide/relations.md index 88b462e1a..d3d8b30b8 100644 --- a/docs/api-guide/relations.md +++ b/docs/api-guide/relations.md @@ -337,7 +337,7 @@ 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. +If you want to implement a read-write relational field, you must also implement the [`.to_internal_value(self, data)` method][to_internal_value]. To provide a dynamic queryset based on the `context`, you can also override `.get_queryset(self)` instead of specifying `.queryset` on the class or when initializing the field. @@ -605,3 +605,4 @@ The [rest-framework-generic-relations][drf-nested-relations] library provides re [drf-nested-relations]: https://github.com/Ian-Foote/rest-framework-generic-relations [django-intermediary-manytomany]: https://docs.djangoproject.com/en/2.2/topics/db/models/#intermediary-manytomany [dealing-with-nested-objects]: https://www.django-rest-framework.org/api-guide/serializers/#dealing-with-nested-objects +[to_internal_value]: https://www.django-rest-framework.org/api-guide/serializers/#to_internal_valueself-data From eff97efa283529c6503b9ebde6506691cecb17a2 Mon Sep 17 00:00:00 2001 From: Thomas Leese Date: Sat, 10 Oct 2020 18:02:21 +0100 Subject: [PATCH 043/303] Don't catch exceptions in get_queryset (#7480) In the `to_internal_value` method of the primary key and slug related fields, `TypeError`s and `ValueError`s are caught from `self.get_queryset().get(...)` and presented to the user. This works fine for most cases, but can cause problems if the exception is coming from `self.get_queryset()` rather than from the `.get(...)`. It means errors in the `get_queryset` method can be hidden and presented back to the user as though, for example, the input provided to the `to_internal_value` was the wrong type, whereas in reality there's a bug in the `get_queryset` method and therefore it should bubble up and be exposed as a server error. I've decided to fix this because twice now I've had to debug why I'm seeing `invalid_type` errors from my serializer (errors like `wrong pk type - int` when the `pk` type on my model is `int`) when the real problem was a bug in my custom `get_queryset` method. --- rest_framework/relations.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/rest_framework/relations.py b/rest_framework/relations.py index 3cd46379d..eaf27e1d9 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -257,8 +257,9 @@ class PrimaryKeyRelatedField(RelatedField): def to_internal_value(self, data): if self.pk_field is not None: data = self.pk_field.to_internal_value(data) + queryset = self.get_queryset() try: - return self.get_queryset().get(pk=data) + return queryset.get(pk=data) except ObjectDoesNotExist: self.fail('does_not_exist', pk_value=data) except (TypeError, ValueError): @@ -454,8 +455,9 @@ class SlugRelatedField(RelatedField): super().__init__(**kwargs) def to_internal_value(self, data): + queryset = self.get_queryset() try: - return self.get_queryset().get(**{self.slug_field: data}) + return queryset.get(**{self.slug_field: data}) except ObjectDoesNotExist: self.fail('does_not_exist', slug_name=self.slug_field, value=smart_str(data)) except (TypeError, ValueError): From 0bdd537cc454477886fefc9873353b2364d94158 Mon Sep 17 00:00:00 2001 From: Aarni Koskela Date: Mon, 12 Oct 2020 17:40:26 +0300 Subject: [PATCH 044/303] Ignore derivations of BrowsableAPIRenderer in OpenAPI schema (#7497) * Ignore derivations of BrowsableAPIRenderer in OpenAPI schema * Improve test_renderer_mapping test Co-authored-by: Carlton Gibson --- rest_framework/schemas/openapi.py | 2 +- tests/schemas/test_openapi.py | 17 +++++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/rest_framework/schemas/openapi.py b/rest_framework/schemas/openapi.py index 8a8e267e0..4ecb7a65f 100644 --- a/rest_framework/schemas/openapi.py +++ b/rest_framework/schemas/openapi.py @@ -595,7 +595,7 @@ class AutoSchema(ViewInspector): media_types = [] for renderer in self.view.renderer_classes: # BrowsableAPIRenderer not relevant to OpenAPI spec - if renderer == renderers.BrowsableAPIRenderer: + if issubclass(renderer, renderers.BrowsableAPIRenderer): continue media_types.append(renderer.media_type) return media_types diff --git a/tests/schemas/test_openapi.py b/tests/schemas/test_openapi.py index 8ea910dc1..542c377b1 100644 --- a/tests/schemas/test_openapi.py +++ b/tests/schemas/test_openapi.py @@ -10,7 +10,9 @@ from rest_framework import filters, generics, pagination, routers, serializers from rest_framework.authtoken.views import obtain_auth_token from rest_framework.compat import uritemplate from rest_framework.parsers import JSONParser, MultiPartParser -from rest_framework.renderers import JSONRenderer, OpenAPIRenderer +from rest_framework.renderers import ( + BaseRenderer, BrowsableAPIRenderer, JSONRenderer, OpenAPIRenderer +) from rest_framework.request import Request from rest_framework.schemas.openapi import AutoSchema, SchemaGenerator @@ -507,9 +509,16 @@ class TestOperationIntrospection(TestCase): path = '/{id}/' method = 'GET' + class CustomBrowsableAPIRenderer(BrowsableAPIRenderer): + media_type = 'image/jpeg' # that's a wild API renderer + + class TextRenderer(BaseRenderer): + media_type = 'text/plain' + format = 'text' + class View(generics.CreateAPIView): serializer_class = views.ExampleSerializer - renderer_classes = [JSONRenderer] + renderer_classes = [JSONRenderer, TextRenderer, BrowsableAPIRenderer, CustomBrowsableAPIRenderer] view = create_view( View, @@ -524,8 +533,8 @@ class TestOperationIntrospection(TestCase): # schema support is there success_response = responses['200'] - assert len(success_response['content'].keys()) == 1 - assert 'application/json' in success_response['content'] + # Check that the API renderers aren't included, but custom renderers are + assert set(success_response['content']) == {'application/json', 'text/plain'} def test_openapi_yaml_rendering_without_aliases(self): renderer = OpenAPIRenderer() From 95f0b0867a7542f7304401bfb6ae74c6e804934b Mon Sep 17 00:00:00 2001 From: Pawel Date: Tue, 13 Oct 2020 08:32:38 +0200 Subject: [PATCH 045/303] Documentation: improve the action decorator documentation (#7316) (#7380) * Documentation: improve the action decorator documentation (#7316) --- docs/api-guide/viewsets.md | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/docs/api-guide/viewsets.md b/docs/api-guide/viewsets.md index d7aa7ad3b..22cc3d8aa 100644 --- a/docs/api-guide/viewsets.md +++ b/docs/api-guide/viewsets.md @@ -171,11 +171,6 @@ A more complete example of extra actions: serializer = self.get_serializer(recent_users, many=True) return Response(serializer.data) -The decorator can additionally take extra arguments that will be set for the routed view only. For example: - - @action(detail=True, methods=['post'], permission_classes=[IsAdminOrIsSelf]) - def set_password(self, request, pk=None): - ... The `action` decorator will route `GET` requests by default, but may also accept other HTTP methods by setting the `methods` argument. For example: @@ -183,7 +178,14 @@ The `action` decorator will route `GET` requests by default, but may also accept def unset_password(self, request, pk=None): ... -The two new actions will then be available at the urls `^users/{pk}/set_password/$` and `^users/{pk}/unset_password/$` + +The decorator allows you to override any viewset-level configuration such as `permission_classes`, `serializer_class`, `filter_backends`...: + + @action(detail=True, methods=['post'], permission_classes=[IsAdminOrIsSelf]) + def set_password(self, request, pk=None): + ... + +The two new actions will then be available at the urls `^users/{pk}/set_password/$` and `^users/{pk}/unset_password/$`. Use the `url_path` and `url_name` parameters to change the URL segement and the reverse URL name of the action. To view all extra actions, call the `.get_extra_actions()` method. From 3799633cdeb679eec681451bd318867dbd292114 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 13 Oct 2020 14:17:53 +0100 Subject: [PATCH 046/303] Version 3.12.2 --- docs/community/release-notes.md | 8 ++++++++ rest_framework/__init__.py | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/docs/community/release-notes.md b/docs/community/release-notes.md index a48888719..c981b9ac9 100644 --- a/docs/community/release-notes.md +++ b/docs/community/release-notes.md @@ -36,6 +36,14 @@ You can determine your currently installed version using `pip show`: ## 3.12.x series +### 3.12.2 + +Date: 13th October 2020 + +* Fix issue if `rest_framework.authtoken.models` is imported, but `rest_framework.authtoken` is not in INSTALLED_APPS. [#7571] +* Ignore subclasses of BrowsableAPIRenderer in OpenAPI schema. [#7497] +* Narrower exception catching in serilizer fields, to ensure that any errors in broken `get_queryset()` methods are not masked. [#7480] + ### 3.12.1 Date: 28th September 2020 diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py index 05d5adc46..7ff188a5a 100644 --- a/rest_framework/__init__.py +++ b/rest_framework/__init__.py @@ -10,7 +10,7 @@ ______ _____ _____ _____ __ import django __title__ = 'Django REST framework' -__version__ = '3.12.1' +__version__ = '3.12.2' __author__ = 'Tom Christie' __license__ = 'BSD 3-Clause' __copyright__ = 'Copyright 2011-2019 Encode OSS Ltd' From 04e0c2b9ab6616a28148ce32e2d19858ccfe6c69 Mon Sep 17 00:00:00 2001 From: David Smith <39445562+smithdc1@users.noreply.github.com> Date: Tue, 13 Oct 2020 17:27:08 +0100 Subject: [PATCH 047/303] Bumped Markdown version to 3.3 (#7590) --- requirements/requirements-optionals.txt | 3 +- tests/test_description.py | 372 ++++++++++++------------ 2 files changed, 182 insertions(+), 193 deletions(-) diff --git a/requirements/requirements-optionals.txt b/requirements/requirements-optionals.txt index 2b7a18a13..739555667 100644 --- a/requirements/requirements-optionals.txt +++ b/requirements/requirements-optionals.txt @@ -1,6 +1,7 @@ # Optional packages which may be used with REST framework. psycopg2-binary>=2.8.5, <2.9 -markdown==3.1.1 +markdown==3.3;python_version>="3.6" +markdown==3.2.2;python_version=="3.5" pygments==2.4.2 django-guardian==2.2.0 django-filter>=2.2.0, <2.3 diff --git a/tests/test_description.py b/tests/test_description.py index ae00fe4a9..9e7e4dc32 100644 --- a/tests/test_description.py +++ b/tests/test_description.py @@ -1,192 +1,180 @@ -from django.test import TestCase - -from rest_framework.compat import apply_markdown -from rest_framework.utils.formatting import dedent -from rest_framework.views import APIView - -# We check that docstrings get nicely un-indented. -DESCRIPTION = """an example docstring -==================== - -* list -* list - -another header --------------- - - code block - -indented - -# hash style header # - -``` json -[{ - "alpha": 1, - "beta: "this is a string" -}] -```""" - - -# If markdown is installed we also test it's working -# (and that our wrapped forces '=' to h2 and '-' to h3) -MARKED_DOWN_HILITE = """ -
[{
    "alpha": 1,
\
-    "beta: "this\
- is a \
-string"
}]
- -


""" - -MARKED_DOWN_NOT_HILITE = """ -

json -[{ - "alpha": 1, - "beta: "this is a string" -}]

""" - -# We support markdown < 2.1 and markdown >= 2.1 -MARKED_DOWN_lt_21 = """

an example docstring

-
    -
  • list
    • -
  • list
    • -
-

another header

-
code block
-
-

indented

-

hash style header

%s""" - -MARKED_DOWN_gte_21 = """

an example docstring

-
    -
  • list
    • -
  • list
    • -
-

another header

-
code block
-
-

indented

-

hash style header

%s""" - - -class TestViewNamesAndDescriptions(TestCase): - def test_view_name_uses_class_name(self): - """ - Ensure view names are based on the class name. - """ - class MockView(APIView): - pass - assert MockView().get_view_name() == 'Mock' - - def test_view_name_uses_name_attribute(self): - class MockView(APIView): - name = 'Foo' - assert MockView().get_view_name() == 'Foo' - - def test_view_name_uses_suffix_attribute(self): - class MockView(APIView): - suffix = 'List' - assert MockView().get_view_name() == 'Mock List' - - def test_view_name_preferences_name_over_suffix(self): - class MockView(APIView): - name = 'Foo' - suffix = 'List' - assert MockView().get_view_name() == 'Foo' - - def test_view_description_uses_docstring(self): - """Ensure view descriptions are based on the docstring.""" - class MockView(APIView): - """an example docstring - ==================== - - * list - * list - - another header - -------------- - - code block - - indented - - # hash style header # - - ``` json - [{ - "alpha": 1, - "beta: "this is a string" - }] - ```""" - - assert MockView().get_view_description() == DESCRIPTION - - def test_view_description_uses_description_attribute(self): - class MockView(APIView): - description = 'Foo' - assert MockView().get_view_description() == 'Foo' - - def test_view_description_allows_empty_description(self): - class MockView(APIView): - """Description.""" - description = '' - assert MockView().get_view_description() == '' - - def test_view_description_can_be_empty(self): - """ - Ensure that if a view has no docstring, - then it's description is the empty string. - """ - class MockView(APIView): - pass - assert MockView().get_view_description() == '' - - def test_view_description_can_be_promise(self): - """ - Ensure a view may have a docstring that is actually a lazily evaluated - class that can be converted to a string. - - See: https://github.com/encode/django-rest-framework/issues/1708 - """ - # use a mock object instead of gettext_lazy to ensure that we can't end - # up with a test case string in our l10n catalog - - class MockLazyStr: - def __init__(self, string): - self.s = string - - def __str__(self): - return self.s - - class MockView(APIView): - __doc__ = MockLazyStr("a gettext string") - - assert MockView().get_view_description() == 'a gettext string' - - def test_markdown(self): - """ - Ensure markdown to HTML works as expected. - """ - if apply_markdown: - md_applied = apply_markdown(DESCRIPTION) - gte_21_match = ( - md_applied == ( - MARKED_DOWN_gte_21 % MARKED_DOWN_HILITE) or - md_applied == ( - MARKED_DOWN_gte_21 % MARKED_DOWN_NOT_HILITE)) - lt_21_match = ( - md_applied == ( - MARKED_DOWN_lt_21 % MARKED_DOWN_HILITE) or - md_applied == ( - MARKED_DOWN_lt_21 % MARKED_DOWN_NOT_HILITE)) - assert gte_21_match or lt_21_match - - -def test_dedent_tabs(): - 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 +import sys + +import pytest +from django.test import TestCase + +from rest_framework.compat import apply_markdown +from rest_framework.utils.formatting import dedent +from rest_framework.views import APIView + +# We check that docstrings get nicely un-indented. +DESCRIPTION = """an example docstring +==================== + +* list +* list + +another header +-------------- + + code block + +indented + +# hash style header # + +``` json +[{ + "alpha": 1, + "beta: "this is a string" +}] +```""" + + +# If markdown is installed we also test it's working +# (and that our wrapped forces '=' to h2 and '-' to h3) +MARKDOWN_BASE = """

an example docstring

+
    +
  • list
    • +
  • list
    • +
+

another header

+
code block
+
+

indented

+

hash style header

%s""" + +MARKDOWN_gte_33 = """ +
[{
\
+    "alpha":\
+ 1,
\
+    "beta: "this\
+ is a \
+string"
}]\
+
+


""" + +MARKDOWN_lt_33 = """ +
[{
\
+    "alpha":\
+ 1,
\
+    "beta: "this\
+ is a\
+ string"
}]\
+
+ +


""" + + +class TestViewNamesAndDescriptions(TestCase): + def test_view_name_uses_class_name(self): + """ + Ensure view names are based on the class name. + """ + class MockView(APIView): + pass + assert MockView().get_view_name() == 'Mock' + + def test_view_name_uses_name_attribute(self): + class MockView(APIView): + name = 'Foo' + assert MockView().get_view_name() == 'Foo' + + def test_view_name_uses_suffix_attribute(self): + class MockView(APIView): + suffix = 'List' + assert MockView().get_view_name() == 'Mock List' + + def test_view_name_preferences_name_over_suffix(self): + class MockView(APIView): + name = 'Foo' + suffix = 'List' + assert MockView().get_view_name() == 'Foo' + + def test_view_description_uses_docstring(self): + """Ensure view descriptions are based on the docstring.""" + class MockView(APIView): + """an example docstring + ==================== + + * list + * list + + another header + -------------- + + code block + + indented + + # hash style header # + + ``` json + [{ + "alpha": 1, + "beta: "this is a string" + }] + ```""" + + assert MockView().get_view_description() == DESCRIPTION + + def test_view_description_uses_description_attribute(self): + class MockView(APIView): + description = 'Foo' + assert MockView().get_view_description() == 'Foo' + + def test_view_description_allows_empty_description(self): + class MockView(APIView): + """Description.""" + description = '' + assert MockView().get_view_description() == '' + + def test_view_description_can_be_empty(self): + """ + Ensure that if a view has no docstring, + then it's description is the empty string. + """ + class MockView(APIView): + pass + assert MockView().get_view_description() == '' + + def test_view_description_can_be_promise(self): + """ + Ensure a view may have a docstring that is actually a lazily evaluated + class that can be converted to a string. + + See: https://github.com/encode/django-rest-framework/issues/1708 + """ + # use a mock object instead of gettext_lazy to ensure that we can't end + # up with a test case string in our l10n catalog + + class MockLazyStr: + def __init__(self, string): + self.s = string + + def __str__(self): + return self.s + + class MockView(APIView): + __doc__ = MockLazyStr("a gettext string") + + assert MockView().get_view_description() == 'a gettext string' + + @pytest.mark.skipif(not apply_markdown, reason="Markdown is not installed") + def test_markdown(self): + """ + Ensure markdown to HTML works as expected. + """ + # Markdown 3.3 is only supported on Python 3.6 and higher + if sys.version_info >= (3, 6): + assert apply_markdown(DESCRIPTION) == MARKDOWN_BASE % MARKDOWN_gte_33 + else: + assert apply_markdown(DESCRIPTION) == MARKDOWN_BASE % MARKDOWN_lt_33 + + +def test_dedent_tabs(): + 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 a0115e66d4583905613346f65ff6cbb98092e3c4 Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy Date: Tue, 13 Oct 2020 21:30:05 +0200 Subject: [PATCH 048/303] restore the transifex configuration This reverts commit 6957aaae8594b42cbf368d361031ce5fb9eb7246. --- .tx/config | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 .tx/config diff --git a/.tx/config b/.tx/config new file mode 100644 index 000000000..e151a7e6f --- /dev/null +++ b/.tx/config @@ -0,0 +1,9 @@ +[main] +host = https://www.transifex.com +lang_map = sr@latin:sr_Latn, zh-Hans:zh_Hans, zh-Hant:zh_Hant + +[django-rest-framework.djangopo] +file_filter = rest_framework/locale//LC_MESSAGES/django.po +source_file = rest_framework/locale/en_US/LC_MESSAGES/django.po +source_lang = en_US +type = PO From 47cfbdac97c8bafd88a1eea796301e61f9bb9f36 Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy Date: Tue, 13 Oct 2020 21:40:33 +0200 Subject: [PATCH 049/303] Translations updated from transifex and compiled --- .../locale/ar/LC_MESSAGES/django.mo | Bin 6525 -> 12150 bytes .../locale/ar/LC_MESSAGES/django.po | 536 ++++++++++------ .../locale/az/LC_MESSAGES/django.mo | Bin 0 -> 10428 bytes .../locale/az/LC_MESSAGES/django.po | 573 +++++++++++++++++ .../locale/bg/LC_MESSAGES/django.mo | Bin 0 -> 13083 bytes .../locale/bg/LC_MESSAGES/django.po | 572 +++++++++++++++++ .../locale/ca/LC_MESSAGES/django.mo | Bin 9605 -> 9300 bytes .../locale/ca/LC_MESSAGES/django.po | 379 ++++++++---- .../locale/cs/LC_MESSAGES/django.mo | Bin 8990 -> 10519 bytes .../locale/cs/LC_MESSAGES/django.po | 427 ++++++++----- .../locale/da/LC_MESSAGES/django.mo | Bin 10360 -> 9955 bytes .../locale/da/LC_MESSAGES/django.po | 387 ++++++++---- .../locale/de/LC_MESSAGES/django.mo | Bin 10885 -> 10490 bytes .../locale/de/LC_MESSAGES/django.po | 389 ++++++++---- .../locale/el/LC_MESSAGES/django.mo | Bin 13466 -> 12933 bytes .../locale/el/LC_MESSAGES/django.po | 395 ++++++++---- .../locale/en/LC_MESSAGES/django.mo | Bin 10185 -> 12285 bytes .../locale/en/LC_MESSAGES/django.po | 387 ++++++++---- .../locale/en_US/LC_MESSAGES/django.po | 371 +++++++---- .../locale/es/LC_MESSAGES/django.mo | Bin 11023 -> 10627 bytes .../locale/es/LC_MESSAGES/django.po | 392 ++++++++---- .../locale/et/LC_MESSAGES/django.mo | Bin 8691 -> 10096 bytes .../locale/et/LC_MESSAGES/django.po | 428 ++++++++----- .../locale/fa/LC_MESSAGES/django.mo | Bin 466 -> 11976 bytes .../locale/fa/LC_MESSAGES/django.po | 549 ++++++++++------- .../locale/fa_IR/LC_MESSAGES/django.mo | Bin 479 -> 11989 bytes .../locale/fa_IR/LC_MESSAGES/django.po | 549 ++++++++++------- .../locale/fi/LC_MESSAGES/django.mo | Bin 10508 -> 10197 bytes .../locale/fi/LC_MESSAGES/django.po | 414 ++++++++----- .../locale/fr/LC_MESSAGES/django.mo | Bin 10973 -> 10662 bytes .../locale/fr/LC_MESSAGES/django.po | 447 +++++++++----- .../locale/hu/LC_MESSAGES/django.mo | Bin 9082 -> 10844 bytes .../locale/hu/LC_MESSAGES/django.po | 437 ++++++++----- .../locale/hy/LC_MESSAGES/django.mo | Bin 0 -> 12885 bytes .../locale/hy/LC_MESSAGES/django.po | 573 +++++++++++++++++ .../locale/id/LC_MESSAGES/django.mo | Bin 469 -> 5188 bytes .../locale/id/LC_MESSAGES/django.po | 461 +++++++++----- .../locale/it/LC_MESSAGES/django.mo | Bin 10318 -> 10480 bytes .../locale/it/LC_MESSAGES/django.po | 417 ++++++++----- .../locale/ja/LC_MESSAGES/django.mo | Bin 12254 -> 11759 bytes .../locale/ja/LC_MESSAGES/django.po | 387 ++++++++---- .../locale/ko_KR/LC_MESSAGES/django.mo | Bin 11774 -> 11698 bytes .../locale/ko_KR/LC_MESSAGES/django.po | 400 ++++++++---- .../locale/lt/LC_MESSAGES/django.mo | Bin 0 -> 5056 bytes .../locale/lt/LC_MESSAGES/django.po | 573 +++++++++++++++++ .../locale/lv/LC_MESSAGES/django.mo | Bin 10800 -> 10423 bytes .../locale/lv/LC_MESSAGES/django.po | 387 ++++++++---- .../locale/mk/LC_MESSAGES/django.mo | Bin 12619 -> 12121 bytes .../locale/mk/LC_MESSAGES/django.po | 387 ++++++++---- .../locale/nb/LC_MESSAGES/django.mo | Bin 10317 -> 9928 bytes .../locale/nb/LC_MESSAGES/django.po | 387 ++++++++---- .../locale/ne_NP/LC_MESSAGES/django.mo | Bin 0 -> 15636 bytes .../locale/ne_NP/LC_MESSAGES/django.po | 574 ++++++++++++++++++ .../locale/nl/LC_MESSAGES/django.mo | Bin 10567 -> 10163 bytes .../locale/nl/LC_MESSAGES/django.po | 390 ++++++++---- .../locale/pl/LC_MESSAGES/django.mo | Bin 11080 -> 10673 bytes .../locale/pl/LC_MESSAGES/django.po | 389 ++++++++---- .../locale/pt/LC_MESSAGES/django.mo | Bin 476 -> 10382 bytes .../locale/pt/LC_MESSAGES/django.po | 546 ++++++++++------- .../locale/pt_BR/LC_MESSAGES/django.mo | Bin 10804 -> 10397 bytes .../locale/pt_BR/LC_MESSAGES/django.po | 390 ++++++++---- .../locale/ro/LC_MESSAGES/django.mo | Bin 10854 -> 10701 bytes .../locale/ro/LC_MESSAGES/django.po | 398 ++++++++---- .../locale/ru/LC_MESSAGES/django.mo | Bin 13400 -> 13160 bytes .../locale/ru/LC_MESSAGES/django.po | 393 ++++++++---- .../locale/ru_RU/LC_MESSAGES/django.mo | Bin 0 -> 5208 bytes .../locale/ru_RU/LC_MESSAGES/django.po | 573 +++++++++++++++++ .../locale/sk/LC_MESSAGES/django.mo | Bin 9370 -> 9164 bytes .../locale/sk/LC_MESSAGES/django.po | 381 ++++++++---- .../locale/sl/LC_MESSAGES/django.mo | Bin 10349 -> 9985 bytes .../locale/sl/LC_MESSAGES/django.po | 387 ++++++++---- .../locale/sv/LC_MESSAGES/django.mo | Bin 10584 -> 10204 bytes .../locale/sv/LC_MESSAGES/django.po | 387 ++++++++---- .../locale/th/LC_MESSAGES/django.mo | Bin 0 -> 8880 bytes .../locale/th/LC_MESSAGES/django.po | 573 +++++++++++++++++ .../locale/tr/LC_MESSAGES/django.mo | Bin 10509 -> 10073 bytes .../locale/tr/LC_MESSAGES/django.po | 389 ++++++++---- .../locale/tr_TR/LC_MESSAGES/django.mo | Bin 10481 -> 10292 bytes .../locale/tr_TR/LC_MESSAGES/django.po | 396 ++++++++---- .../locale/uk/LC_MESSAGES/django.mo | Bin 13437 -> 13245 bytes .../locale/uk/LC_MESSAGES/django.po | 411 ++++++++----- .../locale/vi/LC_MESSAGES/django.mo | Bin 469 -> 2179 bytes .../locale/vi/LC_MESSAGES/django.po | 413 ++++++++----- .../locale/zh_CN/LC_MESSAGES/django.mo | Bin 10301 -> 9915 bytes .../locale/zh_CN/LC_MESSAGES/django.po | 387 ++++++++---- .../locale/zh_Hans/LC_MESSAGES/django.mo | Bin 10321 -> 9938 bytes .../locale/zh_Hans/LC_MESSAGES/django.po | 389 ++++++++---- .../locale/zh_Hant/LC_MESSAGES/django.mo | Bin 488 -> 4809 bytes .../locale/zh_Hant/LC_MESSAGES/django.po | 470 +++++++++----- 89 files changed, 14471 insertions(+), 5369 deletions(-) create mode 100644 rest_framework/locale/az/LC_MESSAGES/django.mo create mode 100644 rest_framework/locale/az/LC_MESSAGES/django.po create mode 100644 rest_framework/locale/bg/LC_MESSAGES/django.mo create mode 100644 rest_framework/locale/bg/LC_MESSAGES/django.po create mode 100644 rest_framework/locale/hy/LC_MESSAGES/django.mo create mode 100644 rest_framework/locale/hy/LC_MESSAGES/django.po create mode 100644 rest_framework/locale/lt/LC_MESSAGES/django.mo create mode 100644 rest_framework/locale/lt/LC_MESSAGES/django.po create mode 100644 rest_framework/locale/ne_NP/LC_MESSAGES/django.mo create mode 100644 rest_framework/locale/ne_NP/LC_MESSAGES/django.po create mode 100644 rest_framework/locale/ru_RU/LC_MESSAGES/django.mo create mode 100644 rest_framework/locale/ru_RU/LC_MESSAGES/django.po create mode 100644 rest_framework/locale/th/LC_MESSAGES/django.mo create mode 100644 rest_framework/locale/th/LC_MESSAGES/django.po diff --git a/rest_framework/locale/ar/LC_MESSAGES/django.mo b/rest_framework/locale/ar/LC_MESSAGES/django.mo index 19a41dfd6e6ccc0c4ebc3b5cce8325eecd65fb65..f793d7c73b74b37eee04252018de72e7505a305d 100644 GIT binary patch literal 12150 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 B_B#Lo delta 1987 zcmY+^TWnNC7{KvaC{QZ5mP;>`GA+GOx@>o=m9`WE5-jTS_w3&t!#`G(j4RqYj#`eAX-e(HU#4@SbJfgc8i(*A$|vez&q;>sPy*Y6R8zf;h_X1_IAlVpLN|x3hcz6ULo%1FrtE#F8M+Ei;OUdVQmCTl=iGe<9nY#(W|4OPQ2Cw3s68fwr^ zQpe&c9o7fK15QNu#p46fa4cX}mNu9JrKj_)vwc33D67xkDeLl?_?%bgZg!#r5xvhD zNJSG#6Pp_{BlEYI(FOkLTcbzJ>GI?4v8dX{ocrSGSR|mHNJOFuC-$7$9!@3?#S;;= zJ(?JFl1V2X(~)S*G4E8Yn7K3EH|V6y+J&dgxkZ!9lF@|P#YuSseOY_x;I?t1;Wx>-ye^~ zqW!6GB$+R%eBM{7-51@L-BEj9yQA()_EYKF^8vG`YLoe<>U!Q*`+YmyF>S9hp40Y{ z&2o`-$Nbt(*qr^)X6(D#p0#;2i#$NCy%M#@&cf@Se zYt3gXj+)P#2HJQD8Jr-BjLj+%8L<;nQ8PoHo2P7+pxrU^eapDHwsN^CZ*4Ty?X|rD zMJ`$Ufs#, 2017 # Bashar Al-Abdulhadi, 2016-2017 # Eyad Toma , 2015,2017 +# zak zak , 2020 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: 2017-10-18 09:51+0000\n" -"Last-Translator: Andrew Ayoub \n" +"POT-Creation-Date: 2020-10-13 21:45+0200\n" +"PO-Revision-Date: 2020-10-13 19:45+0000\n" +"Last-Translator: Xavier Ordoquy \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" @@ -21,40 +22,40 @@ 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:73 +#: authentication.py:70 msgid "Invalid basic header. No credentials provided." -msgstr "" +msgstr "رأس أساسي غير صالح, لم تقدم اي بيانات." -#: authentication.py:76 +#: authentication.py:73 msgid "Invalid basic header. Credentials string should not contain spaces." -msgstr "" +msgstr "رأس أساسي غير صالح, سلسلة البيانات لا يجب أن تحتوي على أي أحرف مسافات" -#: authentication.py:82 +#: authentication.py:83 msgid "Invalid basic header. Credentials not correctly base64 encoded." -msgstr "" +msgstr "رأس أساسي غير صالح, البيانات ليست مرمّزة بصحة على أساس64." -#: authentication.py:99 +#: authentication.py:101 msgid "Invalid username/password." msgstr "اسم المستخدم/كلمة السر غير صحيحين." -#: authentication.py:102 authentication.py:198 +#: authentication.py:104 authentication.py:206 msgid "User inactive or deleted." msgstr "المستخدم غير مفعل او تم حذفه." -#: authentication.py:176 +#: authentication.py:184 msgid "Invalid token header. No credentials provided." -msgstr "" +msgstr "رمز الراْس المميّز غير صالح, لم تقدم أي بيانات." -#: authentication.py:179 +#: authentication.py:187 msgid "Invalid token header. Token string should not contain spaces." -msgstr "" +msgstr "رمز الراْس المميّز غير صالح, سلسلة الرمز المميّز لا يجب أن تحتوي على أي أحرف مسافات." -#: authentication.py:185 +#: authentication.py:193 msgid "" "Invalid token header. Token string should not contain invalid characters." -msgstr "" +msgstr "رمز الراْس المميّز غير صالح, سلسلة الرمز المميّز لا يجب أن تحتوي على أي أحرف غير صالحة." -#: authentication.py:195 +#: authentication.py:203 msgid "Invalid token." msgstr "رمز غير صحيح." @@ -62,382 +63,515 @@ msgstr "رمز غير صحيح." msgid "Auth Token" msgstr "رمز التفويض" -#: authtoken/models.py:15 +#: authtoken/models.py:13 msgid "Key" msgstr "المفتاح" -#: authtoken/models.py:18 +#: authtoken/models.py:16 msgid "User" msgstr "المستخدم" -#: authtoken/models.py:20 +#: authtoken/models.py:18 msgid "Created" msgstr "أنشئ" -#: authtoken/models.py:29 +#: authtoken/models.py:27 authtoken/serializers.py:19 msgid "Token" msgstr "الرمز" -#: authtoken/models.py:30 +#: authtoken/models.py:28 msgid "Tokens" msgstr "الرموز" -#: authtoken/serializers.py:8 +#: authtoken/serializers.py:9 msgid "Username" msgstr "اسم المستخدم" -#: authtoken/serializers.py:9 +#: authtoken/serializers.py:13 msgid "Password" msgstr "كلمة المرور" -#: authtoken/serializers.py:20 -msgid "User account is disabled." -msgstr "حساب المستخدم غير مفعل." - -#: authtoken/serializers.py:23 +#: authtoken/serializers.py:35 msgid "Unable to log in with provided credentials." msgstr "تعذر تسجيل الدخول بالبيانات التي ادخلتها." -#: authtoken/serializers.py:26 +#: authtoken/serializers.py:38 msgid "Must include \"username\" and \"password\"." msgstr "يجب أن تتضمن \"اسم المستخدم\" و \"كلمة المرور\"." -#: exceptions.py:49 +#: exceptions.py:102 msgid "A server error occurred." msgstr "حدث خطأ في المخدم." -#: exceptions.py:84 -msgid "Malformed request." +#: exceptions.py:142 +msgid "Invalid input." msgstr "" -#: exceptions.py:89 +#: exceptions.py:161 +msgid "Malformed request." +msgstr "الطلب صيغ بشكل سيء." + +#: exceptions.py:167 msgid "Incorrect authentication credentials." msgstr "بيانات الدخول غير صحيحة." -#: exceptions.py:94 +#: exceptions.py:173 msgid "Authentication credentials were not provided." msgstr "لم يتم تزويد بيانات الدخول." -#: exceptions.py:99 +#: exceptions.py:179 msgid "You do not have permission to perform this action." msgstr "ليس لديك صلاحية للقيام بهذا الإجراء." -#: exceptions.py:104 views.py:81 +#: exceptions.py:185 msgid "Not found." msgstr "غير موجود." -#: exceptions.py:109 +#: exceptions.py:191 +#, python-brace-format msgid "Method \"{method}\" not allowed." -msgstr "طلب غير مسموح به" +msgstr "الطريقة \"{method}\" غير مسموح بها." -#: exceptions.py:120 +#: exceptions.py:202 msgid "Could not satisfy the request Accept header." -msgstr "" +msgstr "لم نتمكن من تلبية الرٱس Accept في الطلب." -#: exceptions.py:132 +#: exceptions.py:212 +#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." -msgstr "" +msgstr "الوسيط \"{media_type}\" الموجود في الطلب غير معتمد." -#: exceptions.py:145 +#: exceptions.py:223 msgid "Request was throttled." +msgstr "تم تقييد الطلب." + +#: exceptions.py:224 +#, python-brace-format +msgid "Expected available in {wait} second." msgstr "" -#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 -#: validators.py:181 +#: exceptions.py:225 +#, python-brace-format +msgid "Expected available in {wait} seconds." +msgstr "" + +#: fields.py:316 relations.py:245 relations.py:279 validators.py:90 +#: validators.py:183 msgid "This field is required." msgstr "هذا الحقل مطلوب." -#: fields.py:270 +#: fields.py:317 msgid "This field may not be null." msgstr "لا يمكن لهذا الحقل ان يكون فارغاً null." -#: fields.py:608 fields.py:639 -msgid "\"{input}\" is not a valid boolean." -msgstr "\"{input}\" ليس قيمة منطقية." +#: fields.py:701 +msgid "Must be a valid boolean." +msgstr "" -#: fields.py:674 +#: fields.py:766 +msgid "Not a valid string." +msgstr "" + +#: fields.py:767 msgid "This field may not be blank." msgstr "لا يمكن لهذا الحقل ان يكون فارغاً." -#: fields.py:675 fields.py:1675 +#: fields.py:768 fields.py:1881 +#, python-brace-format msgid "Ensure this field has no more than {max_length} characters." msgstr "تأكد ان الحقل لا يزيد عن {max_length} محرف." -#: fields.py:676 +#: fields.py:769 +#, python-brace-format msgid "Ensure this field has at least {min_length} characters." msgstr "تأكد ان الحقل {min_length} محرف على الاقل." -#: fields.py:713 +#: fields.py:816 msgid "Enter a valid email address." msgstr "عليك ان تدخل بريد إلكتروني صالح." -#: fields.py:724 +#: fields.py:827 msgid "This value does not match the required pattern." msgstr "هذه القيمة لا تطابق النمط المطلوب." -#: fields.py:735 +#: fields.py:838 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." +msgstr "أدخل \"slug\" صالح يحتوي على حروف، أرقام، شُرط سفلية أو واصلات." + +#: fields.py:839 +msgid "" +"Enter a valid \"slug\" consisting of Unicode letters, numbers, underscores, " +"or hyphens." msgstr "" -#: fields.py:747 +#: fields.py:854 msgid "Enter a valid URL." msgstr "الرجاء إدخال رابط إلكتروني صالح." -#: fields.py:760 -msgid "\"{value}\" is not a valid UUID." +#: fields.py:867 +msgid "Must be a valid UUID." msgstr "" -#: fields.py:796 +#: fields.py:903 msgid "Enter a valid IPv4 or IPv6 address." -msgstr "برجاء إدخال عنوان IPV4 أو IPV6 صحيح" +msgstr "أدخِل عنوان IPV4 أو IPV6 صحيح." -#: fields.py:821 +#: fields.py:931 msgid "A valid integer is required." msgstr "الرجاء إدخال رقم صحيح صالح." -#: fields.py:822 fields.py:857 fields.py:891 +#: fields.py:932 fields.py:969 fields.py:1005 fields.py:1366 +#, python-brace-format msgid "Ensure this value is less than or equal to {max_value}." msgstr "تأكد ان القيمة أقل أو تساوي {max_value}." -#: fields.py:823 fields.py:858 fields.py:892 +#: fields.py:933 fields.py:970 fields.py:1006 fields.py:1367 +#, python-brace-format msgid "Ensure this value is greater than or equal to {min_value}." msgstr "تأكد ان القيمة أكبر أو تساوي {min_value}." -#: fields.py:824 fields.py:859 fields.py:896 +#: fields.py:934 fields.py:971 fields.py:1010 msgid "String value too large." -msgstr "القيمه اكبر من المسموح" +msgstr "السلسلة اطول من القيمة المسموح بها." -#: fields.py:856 fields.py:890 +#: fields.py:968 fields.py:1004 msgid "A valid number is required." msgstr "الرجاء إدخال رقم صالح." -#: fields.py:893 +#: fields.py:1007 +#, python-brace-format msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "تأكد ان القيمة لا تحوي أكثر من {max_digits} رقم." -#: fields.py:894 +#: fields.py:1008 +#, python-brace-format msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." -msgstr "" +msgstr "تأكد انه لا يوجد اكثر من {max_decimal_places} منازل عشرية." -#: fields.py:895 +#: fields.py:1009 +#, python-brace-format msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." -msgstr "" +msgstr "تأكد انه لا يوجد اكثر من {max_whole_digits} أرقام قبل النقطة العشرية." -#: fields.py:1025 +#: fields.py:1148 +#, python-brace-format msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "صيغة التاريخ و الوقت غير صحيحة. عليك أن تستخدم واحدة من هذه الصيغ التالية: {format}." -#: fields.py:1026 +#: fields.py:1149 msgid "Expected a datetime but got a date." msgstr "متوقع تاريخ و وقت و وجد تاريخ فقط" -#: fields.py:1103 +#: fields.py:1150 +#, python-brace-format +msgid "Invalid datetime for the timezone \"{timezone}\"." +msgstr "" + +#: fields.py:1151 +msgid "Datetime value out of range." +msgstr "" + +#: fields.py:1236 +#, python-brace-format msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "صيغة التاريخ غير صحيحة. عليك أن تستخدم واحدة من هذه الصيغ التالية: {format}." -#: fields.py:1104 +#: fields.py:1237 msgid "Expected a date but got a datetime." msgstr "متوقع تاريخ فقط و وجد تاريخ ووقت" -#: fields.py:1170 +#: fields.py:1303 +#, python-brace-format msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "صيغة الوقت غير صحيحة. عليك أن تستخدم واحدة من هذه الصيغ التالية: {format}." -#: fields.py:1232 +#: fields.py:1365 +#, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." -msgstr "صيغة المده غير صحيحه, برجاء إستخدام أحد هذه الصيغ {format}" +msgstr "صيغة المدة غير صحيحه, يرجى إستخدام إحدى هذه الصيغ: {format}." -#: fields.py:1251 fields.py:1300 +#: fields.py:1399 fields.py:1456 +#, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" ليست واحدة من الخيارات الصالحة." -#: fields.py:1254 relations.py:71 relations.py:441 +#: fields.py:1402 +#, python-brace-format msgid "More than {count} items..." msgstr "أكثر من {count} عنصر..." -#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 +#: fields.py:1457 fields.py:1603 relations.py:485 serializers.py:570 +#, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." -msgstr "" +msgstr "المتوقع وجود قائمة عناصر لكن وجد النوع \"{input_type}\"." -#: fields.py:1302 +#: fields.py:1458 msgid "This selection may not be empty." -msgstr "" +msgstr "هذا التحديد لا يجب أن يكون فارغا." -#: fields.py:1339 +#: fields.py:1495 +#, python-brace-format msgid "\"{input}\" is not a valid path choice." -msgstr "" +msgstr "{input} كإختيار مسار غير صالح." -#: fields.py:1358 +#: fields.py:1514 msgid "No file was submitted." msgstr "لم يتم إرسال أي ملف." -#: fields.py:1359 +#: fields.py:1515 msgid "" "The submitted data was not a file. Check the encoding type on the form." -msgstr "" +msgstr "المعطيات المرسولة ليست ملف. إفحص نوع الترميز في النموذج." -#: fields.py:1360 +#: fields.py:1516 msgid "No filename could be determined." -msgstr "" +msgstr "ما من إسم ملف أمكن تحديده." -#: fields.py:1361 +#: fields.py:1517 msgid "The submitted file is empty." msgstr "الملف الذي تم إرساله فارغ." -#: fields.py:1362 +#: fields.py:1518 +#, python-brace-format msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "تأكد ان اسم الملف لا يحوي أكثر من {max_length} محرف (الإسم المرسل يحوي {length} محرف)." -#: fields.py:1410 +#: fields.py:1566 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." -msgstr "" +msgstr "الرجاء تحميل صورة صالحة. الملف الذي تم تحميله إما لم يكن صورة او انه كان صورة تالفة." -#: fields.py:1449 relations.py:438 serializers.py:525 +#: fields.py:1604 relations.py:486 serializers.py:571 msgid "This list may not be empty." +msgstr "القائمة يجب أن لا تكون فارغة." + +#: fields.py:1605 +#, python-brace-format +msgid "Ensure this field has at least {min_length} elements." msgstr "" -#: fields.py:1502 +#: fields.py:1606 +#, python-brace-format +msgid "Ensure this field has no more than {max_length} elements." +msgstr "" + +#: fields.py:1682 +#, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." +msgstr "المتوقع كان قاموس عناصر و لكن النوع المتحصل عليه هو \"{input_type}\"." + +#: fields.py:1683 +msgid "This dictionary may not be empty." msgstr "" -#: fields.py:1549 +#: fields.py:1755 msgid "Value must be valid JSON." -msgstr "" +msgstr "القيمة يجب أن تكون JSON صالح." -#: 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 "معرف العنصر \"{pk_value}\" غير صالح - العنصر غير موجود." - -#: 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 +#: filters.py:49 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 +#: filters.py:50 +msgid "A search term." +msgstr "" + +#: filters.py:180 templates/rest_framework/filters/ordering.html:3 +msgid "Ordering" +msgstr "الترتيب" + +#: filters.py:181 +msgid "Which field to use when ordering the results." +msgstr "" + +#: filters.py:287 +msgid "ascending" +msgstr "تصاعدي" + +#: filters.py:288 +msgid "descending" +msgstr "تنازلي" + +#: pagination.py:174 +msgid "A page number within the paginated result set." +msgstr "" + +#: pagination.py:179 pagination.py:372 pagination.py:590 +msgid "Number of results to return per page." +msgstr "" + +#: pagination.py:189 +msgid "Invalid page." +msgstr "صفحة غير صحيحة." + +#: pagination.py:374 +msgid "The initial index from which to return the results." +msgstr "" + +#: pagination.py:581 +msgid "The pagination cursor value." +msgstr "" + +#: pagination.py:583 +msgid "Invalid cursor" +msgstr "مؤشر غير صالح" + +#: relations.py:246 +#, python-brace-format +msgid "Invalid pk \"{pk_value}\" - object does not exist." +msgstr "معرف العنصر \"{pk_value}\" غير صالح - العنصر غير موجود." + +#: relations.py:247 +#, python-brace-format +msgid "Incorrect type. Expected pk value, received {data_type}." +msgstr "نوع خاطئ. المتوقع قيمة من pk، لكن المتحصل عليه {data_type}." + +#: relations.py:280 +msgid "Invalid hyperlink - No URL match." +msgstr "إرتباط تشعبي غير صالح - لا مطابقة لURL." + +#: relations.py:281 +msgid "Invalid hyperlink - Incorrect URL match." +msgstr "إرتباط تشعبي غير صالح - مطابقة خاطئة لURL." + +#: relations.py:282 +msgid "Invalid hyperlink - Object does not exist." +msgstr "إرتباط تشعبي غير صالح - عنصر غير موجود." + +#: relations.py:283 +#, python-brace-format +msgid "Incorrect type. Expected URL string, received {data_type}." +msgstr "نوع خاطئ. المتوقع سلسلة URL، لكن المتحصل عليه {data_type}." + +#: relations.py:448 +#, python-brace-format +msgid "Object with {slug_name}={value} does not exist." +msgstr "عنصر ب {slug_name}={value} غير موجود." + +#: relations.py:449 +msgid "Invalid value." +msgstr "قيمة غير صالحة." + +#: schemas/utils.py:32 +msgid "unique integer value" +msgstr "" + +#: schemas/utils.py:34 +msgid "UUID string" +msgstr "" + +#: schemas/utils.py:36 +msgid "unique value" +msgstr "" + +#: schemas/utils.py:38 +#, python-brace-format +msgid "A {value_type} identifying this {name}." +msgstr "" + +#: serializers.py:337 +#, python-brace-format +msgid "Invalid data. Expected a dictionary, but got {datatype}." +msgstr "معطيات غير صالحة. المتوقع هو قاموس، لكن المتحصل عليه {datatype}." + +#: templates/rest_framework/admin.html:116 +#: templates/rest_framework/base.html:136 +msgid "Extra Actions" +msgstr "" + +#: templates/rest_framework/admin.html:130 +#: templates/rest_framework/base.html:150 +msgid "Filters" +msgstr "مرشحات" + +#: templates/rest_framework/base.html:37 +msgid "navbar" +msgstr "" + +#: templates/rest_framework/base.html:75 +msgid "content" +msgstr "" + +#: templates/rest_framework/base.html:78 +msgid "request form" +msgstr "" + +#: templates/rest_framework/base.html:157 +msgid "main content" +msgstr "" + +#: templates/rest_framework/base.html:173 +msgid "request info" +msgstr "" + +#: templates/rest_framework/base.html:177 +msgid "response info" +msgstr "" + +#: templates/rest_framework/horizontal/radio.html:4 +#: templates/rest_framework/inline/radio.html:3 +#: templates/rest_framework/vertical/radio.html:3 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 +#: templates/rest_framework/horizontal/select_multiple.html:4 +#: templates/rest_framework/inline/select_multiple.html:3 +#: templates/rest_framework/vertical/select_multiple.html:3 msgid "No items to select." -msgstr "" +msgstr "ما من عناصر للتحديد." -#: validators.py:43 +#: validators.py:39 msgid "This field must be unique." msgstr "هذا الحقل يجب أن يكون فريد" -#: validators.py:97 +#: validators.py:89 +#, python-brace-format msgid "The fields {field_names} must make a unique set." +msgstr "الحقول {field_names} يجب أن تشكل مجموعة فريدة." + +#: validators.py:171 +#, python-brace-format +msgid "Surrogate characters are not allowed: U+{code_point:X}." msgstr "" -#: validators.py:245 +#: validators.py:243 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" date." -msgstr "" +msgstr "الحقل يجب ان يكون فريد للتاريخ {date_field}." -#: validators.py:260 +#: validators.py:258 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" month." -msgstr "" +msgstr "الحقل يجب ان يكون فريد للشهر {date_field}." -#: validators.py:273 +#: validators.py:271 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" year." -msgstr "" +msgstr "الحقل يجب ان يكون فريد للعام {date_field}." -#: versioning.py:42 +#: versioning.py:40 msgid "Invalid version in \"Accept\" header." -msgstr "" +msgstr "إصدار غير صالح في الرٱس \"Accept\"." -#: versioning.py:73 +#: versioning.py:71 msgid "Invalid version in URL path." -msgstr "" +msgstr "إصدار غير صالح في المسار URL." -#: versioning.py:115 +#: versioning.py:116 msgid "Invalid version in URL path. Does not match any version namespace." -msgstr "" +msgstr " إصدار غير صالح في المسار URL. لا يطابق أي إصدار من مساحة الإسم." -#: versioning.py:147 +#: versioning.py:148 msgid "Invalid version in hostname." -msgstr "" +msgstr "إصدار غير صالح في اسم المضيف." -#: versioning.py:169 +#: versioning.py:170 msgid "Invalid version in query parameter." -msgstr "" - -#: views.py:88 -msgid "Permission denied." -msgstr "ليس لديك صلاحية." +msgstr "إصدار غير صالح في معلمة الإستعلام." diff --git a/rest_framework/locale/az/LC_MESSAGES/django.mo b/rest_framework/locale/az/LC_MESSAGES/django.mo new file mode 100644 index 0000000000000000000000000000000000000000..08648351e8ed72361f7148ed5f2e38e412dea206 GIT binary patch literal 10428 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 OM2QKMStIZS>i+>T@S}zR literal 0 HcmV?d00001 diff --git a/rest_framework/locale/az/LC_MESSAGES/django.po b/rest_framework/locale/az/LC_MESSAGES/django.po new file mode 100644 index 000000000..43a224259 --- /dev/null +++ b/rest_framework/locale/az/LC_MESSAGES/django.po @@ -0,0 +1,573 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Emin Mastizada , 2020 +msgid "" +msgstr "" +"Project-Id-Version: Django REST framework\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-10-13 21:45+0200\n" +"PO-Revision-Date: 2020-10-13 19:45+0000\n" +"Last-Translator: Xavier Ordoquy \n" +"Language-Team: Azerbaijani (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/az/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: az\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: authentication.py:70 +msgid "Invalid basic header. No credentials provided." +msgstr "Xətalı sadə başlıq. İstifadəçi məlumatları təchiz edilməyib." + +#: authentication.py:73 +msgid "Invalid basic header. Credentials string should not contain spaces." +msgstr "Xətalı sadə başlıq. İstifadəçi məlumatlarında boşluq olmamalıdır." + +#: authentication.py:83 +msgid "Invalid basic header. Credentials not correctly base64 encoded." +msgstr "Xətalı sadə başlıq. İstifadəçi məlumatları base64 ilə düzgün şifrələnməyib." + +#: authentication.py:101 +msgid "Invalid username/password." +msgstr "Xətalı istifadəçi adı/parol." + +#: authentication.py:104 authentication.py:206 +msgid "User inactive or deleted." +msgstr "İstifadəçi aktiv deyil və ya silinib." + +#: authentication.py:184 +msgid "Invalid token header. No credentials provided." +msgstr "Xətalı token başlığı. İstifadəçi məlumatları təchiz edilməyib." + +#: authentication.py:187 +msgid "Invalid token header. Token string should not contain spaces." +msgstr "Xətalı token başlığı. Token mətnində boşluqlar olmamalıdır." + +#: authentication.py:193 +msgid "" +"Invalid token header. Token string should not contain invalid characters." +msgstr "Xətalı token başlığı. Token mətnində xətalı simvollar olmamalıdır." + +#: authentication.py:203 +msgid "Invalid token." +msgstr "Xətalı token." + +#: authtoken/apps.py:7 +msgid "Auth Token" +msgstr "Təsdiqləmə Tokeni" + +#: authtoken/models.py:13 +msgid "Key" +msgstr "Açar" + +#: authtoken/models.py:16 +msgid "User" +msgstr "İstifadəçi" + +#: authtoken/models.py:18 +msgid "Created" +msgstr "Yaradılıb" + +#: authtoken/models.py:27 authtoken/serializers.py:19 +msgid "Token" +msgstr "Token" + +#: authtoken/models.py:28 +msgid "Tokens" +msgstr "Tokenlər" + +#: authtoken/serializers.py:9 +msgid "Username" +msgstr "İstifadəçi adı" + +#: authtoken/serializers.py:13 +msgid "Password" +msgstr "Parol" + +#: authtoken/serializers.py:35 +msgid "Unable to log in with provided credentials." +msgstr "Təchiz edilən istifadəçi məlumatları ilə daxil olmaq mümkün olmadı." + +#: authtoken/serializers.py:38 +msgid "Must include \"username\" and \"password\"." +msgstr "Mütləq \"username\" və \"password\" olmalıdır." + +#: exceptions.py:102 +msgid "A server error occurred." +msgstr "Server xətası yaşandı." + +#: exceptions.py:142 +msgid "Invalid input." +msgstr "" + +#: exceptions.py:161 +msgid "Malformed request." +msgstr "Qüsurlu istək." + +#: exceptions.py:167 +msgid "Incorrect authentication credentials." +msgstr "Səhv təsdiqləmə məlumatları." + +#: exceptions.py:173 +msgid "Authentication credentials were not provided." +msgstr "Təsdiqləmə məlumatları təchiz edilməyib." + +#: exceptions.py:179 +msgid "You do not have permission to perform this action." +msgstr "Bu əməliyyat üçün icazəniz yoxdur." + +#: exceptions.py:185 +msgid "Not found." +msgstr "Tapılmadı." + +#: exceptions.py:191 +#, python-brace-format +msgid "Method \"{method}\" not allowed." +msgstr "\"{method}\" yöntəminə icazə verilmir." + +#: exceptions.py:202 +msgid "Could not satisfy the request Accept header." +msgstr "İstəyin Accept başlığını qane etmək mümkün olmadı." + +#: exceptions.py:212 +#, python-brace-format +msgid "Unsupported media type \"{media_type}\" in request." +msgstr "İstəkdə dəstəklənməyən \"{media_type}\" mediya növü." + +#: exceptions.py:223 +msgid "Request was throttled." +msgstr "İstək nəzərə alınmadı." + +#: exceptions.py:224 +#, python-brace-format +msgid "Expected available in {wait} second." +msgstr "" + +#: exceptions.py:225 +#, python-brace-format +msgid "Expected available in {wait} seconds." +msgstr "" + +#: fields.py:316 relations.py:245 relations.py:279 validators.py:90 +#: validators.py:183 +msgid "This field is required." +msgstr "Bu sahə tələb edilir." + +#: fields.py:317 +msgid "This field may not be null." +msgstr "Bu sahə null ola bilməz." + +#: fields.py:701 +msgid "Must be a valid boolean." +msgstr "" + +#: fields.py:766 +msgid "Not a valid string." +msgstr "" + +#: fields.py:767 +msgid "This field may not be blank." +msgstr "Bu sahə boş ola bilməz." + +#: fields.py:768 fields.py:1881 +#, python-brace-format +msgid "Ensure this field has no more than {max_length} characters." +msgstr "Bu sahənin ən çox {max_length} simvolu olduğuna əmin olun." + +#: fields.py:769 +#, python-brace-format +msgid "Ensure this field has at least {min_length} characters." +msgstr "Bu sahənin ən az {min_length} simvolu olduğuna əmin olun." + +#: fields.py:816 +msgid "Enter a valid email address." +msgstr "Keçərli e-poçt ünvanı daxil edin." + +#: fields.py:827 +msgid "This value does not match the required pattern." +msgstr "Bu dəyər tələb edilən formaya uyğun gəlmir." + +#: fields.py:838 +msgid "" +"Enter a valid \"slug\" consisting of letters, numbers, underscores or " +"hyphens." +msgstr "Hərf, rəqəm, alt xətt və defislərdən ibarət keçərli \"slug\" daxil edin." + +#: fields.py:839 +msgid "" +"Enter a valid \"slug\" consisting of Unicode letters, numbers, underscores, " +"or hyphens." +msgstr "" + +#: fields.py:854 +msgid "Enter a valid URL." +msgstr "Keçərli URL daxil edin." + +#: fields.py:867 +msgid "Must be a valid UUID." +msgstr "" + +#: fields.py:903 +msgid "Enter a valid IPv4 or IPv6 address." +msgstr "Keçərli IPv4 və ya IPv6 ünvanı daxil edin." + +#: fields.py:931 +msgid "A valid integer is required." +msgstr "Keçərli tam ədəd tələb edilir." + +#: fields.py:932 fields.py:969 fields.py:1005 fields.py:1366 +#, python-brace-format +msgid "Ensure this value is less than or equal to {max_value}." +msgstr "Bu dəyərin uzunluğunun ən çox {max_value} olduğuna əmin olun." + +#: fields.py:933 fields.py:970 fields.py:1006 fields.py:1367 +#, python-brace-format +msgid "Ensure this value is greater than or equal to {min_value}." +msgstr "Bu dəyərin uzunluğunun ən az {min_value} olduğuna əmin olun." + +#: fields.py:934 fields.py:971 fields.py:1010 +msgid "String value too large." +msgstr "Yazı dəyəri çox uzundur." + +#: fields.py:968 fields.py:1004 +msgid "A valid number is required." +msgstr "Keçərli rəqəm tələb edilir." + +#: fields.py:1007 +#, python-brace-format +msgid "Ensure that there are no more than {max_digits} digits in total." +msgstr "Ən çox {max_digits} rəqəm olduğuna əmin olun." + +#: fields.py:1008 +#, python-brace-format +msgid "" +"Ensure that there are no more than {max_decimal_places} decimal places." +msgstr "Ən çox {max_decimal_places} onluq kəsr hissəsi olduğuna əmin olun." + +#: fields.py:1009 +#, python-brace-format +msgid "" +"Ensure that there are no more than {max_whole_digits} digits before the " +"decimal point." +msgstr "Onluq kərsdən əvvəl ən çox {max_whole_digits} rəqəm olduğuna əmin olun." + +#: fields.py:1148 +#, python-brace-format +msgid "Datetime has wrong format. Use one of these formats instead: {format}." +msgstr "Datetime dəyəri səhvdir. Əvəzinə bu formatlardan birini işlədin: {format}." + +#: fields.py:1149 +msgid "Expected a datetime but got a date." +msgstr "Datetime gözlənirdi amma date gəldi." + +#: fields.py:1150 +#, python-brace-format +msgid "Invalid datetime for the timezone \"{timezone}\"." +msgstr "" + +#: fields.py:1151 +msgid "Datetime value out of range." +msgstr "" + +#: fields.py:1236 +#, python-brace-format +msgid "Date has wrong format. Use one of these formats instead: {format}." +msgstr "Date dəyəri səhvdir. Əvəzinə bu formatlardan birini işlədin: {format}." + +#: fields.py:1237 +msgid "Expected a date but got a datetime." +msgstr "Date gözlənirdi amma datetime gəldi." + +#: fields.py:1303 +#, python-brace-format +msgid "Time has wrong format. Use one of these formats instead: {format}." +msgstr "Vaxt formatı səhvdir. Əvəzinə bu formatlardan birini işlədin: {format}." + +#: fields.py:1365 +#, python-brace-format +msgid "Duration has wrong format. Use one of these formats instead: {format}." +msgstr "Müddət formatı səhvdir. Əvəzinə bu formatlardan birini işlədin: {format}." + +#: fields.py:1399 fields.py:1456 +#, python-brace-format +msgid "\"{input}\" is not a valid choice." +msgstr "\"{input}\" keçərli seçim deyil." + +#: fields.py:1402 +#, python-brace-format +msgid "More than {count} items..." +msgstr "{count} elementdən daha çoxdur..." + +#: fields.py:1457 fields.py:1603 relations.py:485 serializers.py:570 +#, python-brace-format +msgid "Expected a list of items but got type \"{input_type}\"." +msgstr "Elementlər siyahısı gözlənirdi, amma \"{input_type}\" növü gəldi." + +#: fields.py:1458 +msgid "This selection may not be empty." +msgstr "Bu seçim boş ola bilməz." + +#: fields.py:1495 +#, python-brace-format +msgid "\"{input}\" is not a valid path choice." +msgstr "\"{input}\" keçərli yol seçimi deyil." + +#: fields.py:1514 +msgid "No file was submitted." +msgstr "Heç bir fayl göndərilmədi." + +#: fields.py:1515 +msgid "" +"The submitted data was not a file. Check the encoding type on the form." +msgstr "Göndərilən məlumat fayl deyildi. Anketin şifrələmə (encoding) növünü yoxlayın." + +#: fields.py:1516 +msgid "No filename could be determined." +msgstr "Faylın adı təyin edilə bilmədi." + +#: fields.py:1517 +msgid "The submitted file is empty." +msgstr "Göndərilən fayl boşdur." + +#: fields.py:1518 +#, python-brace-format +msgid "" +"Ensure this filename has at most {max_length} characters (it has {length})." +msgstr "Fayl adının ən çox {max_length} simvoldan ibarət olduğuna əmin olun (hazırki: {length})." + +#: fields.py:1566 +msgid "" +"Upload a valid image. The file you uploaded was either not an image or a " +"corrupted image." +msgstr "Keçərli şəkil yükləyin. Yüklədiyiniz fayl ya şəkil deyil, ya da ola bilsin zədələnib." + +#: fields.py:1604 relations.py:486 serializers.py:571 +msgid "This list may not be empty." +msgstr "Bu siyahı boş ola bilməz." + +#: fields.py:1605 +#, python-brace-format +msgid "Ensure this field has at least {min_length} elements." +msgstr "" + +#: fields.py:1606 +#, python-brace-format +msgid "Ensure this field has no more than {max_length} elements." +msgstr "" + +#: fields.py:1682 +#, python-brace-format +msgid "Expected a dictionary of items but got type \"{input_type}\"." +msgstr "Elementlərin kitabçası (dictionary) gözlənirdi amma \"{input_type}\" növü gəldi." + +#: fields.py:1683 +msgid "This dictionary may not be empty." +msgstr "" + +#: fields.py:1755 +msgid "Value must be valid JSON." +msgstr "Dəyər keçərli JSON olmalıdır." + +#: filters.py:49 templates/rest_framework/filters/search.html:2 +msgid "Search" +msgstr "Axtarış" + +#: filters.py:50 +msgid "A search term." +msgstr "" + +#: filters.py:180 templates/rest_framework/filters/ordering.html:3 +msgid "Ordering" +msgstr "Sıralama" + +#: filters.py:181 +msgid "Which field to use when ordering the results." +msgstr "" + +#: filters.py:287 +msgid "ascending" +msgstr "artan" + +#: filters.py:288 +msgid "descending" +msgstr "azalan" + +#: pagination.py:174 +msgid "A page number within the paginated result set." +msgstr "" + +#: pagination.py:179 pagination.py:372 pagination.py:590 +msgid "Number of results to return per page." +msgstr "" + +#: pagination.py:189 +msgid "Invalid page." +msgstr "Xətalı səhifə." + +#: pagination.py:374 +msgid "The initial index from which to return the results." +msgstr "" + +#: pagination.py:581 +msgid "The pagination cursor value." +msgstr "" + +#: pagination.py:583 +msgid "Invalid cursor" +msgstr "Xətalı kursor" + +#: relations.py:246 +#, python-brace-format +msgid "Invalid pk \"{pk_value}\" - object does not exist." +msgstr "Xətalı pk \"{pk_value}\" - obyekt mövcud deyil." + +#: relations.py:247 +#, python-brace-format +msgid "Incorrect type. Expected pk value, received {data_type}." +msgstr "Xətalı növ. PK dəyəri gözlənirdi, {data_type} alındı." + +#: relations.py:280 +msgid "Invalid hyperlink - No URL match." +msgstr "Xətalı hiperkeçid - Heç bir URL uyğun gəlmir." + +#: relations.py:281 +msgid "Invalid hyperlink - Incorrect URL match." +msgstr "Xətalı hiperkeçid - Xətalı URL uyğunluğu." + +#: relations.py:282 +msgid "Invalid hyperlink - Object does not exist." +msgstr "Xətalı hiperkeçid - Obyekt mövcud deyil." + +#: relations.py:283 +#, python-brace-format +msgid "Incorrect type. Expected URL string, received {data_type}." +msgstr "Xətalı növ. URL yazısı gözlənirdi, {data_type} gəldi." + +#: relations.py:448 +#, python-brace-format +msgid "Object with {slug_name}={value} does not exist." +msgstr "{slug_name}={value} üçün uyğun obyekt mövcud deyil." + +#: relations.py:449 +msgid "Invalid value." +msgstr "Xətalı dəyər." + +#: schemas/utils.py:32 +msgid "unique integer value" +msgstr "" + +#: schemas/utils.py:34 +msgid "UUID string" +msgstr "" + +#: schemas/utils.py:36 +msgid "unique value" +msgstr "" + +#: schemas/utils.py:38 +#, python-brace-format +msgid "A {value_type} identifying this {name}." +msgstr "" + +#: serializers.py:337 +#, python-brace-format +msgid "Invalid data. Expected a dictionary, but got {datatype}." +msgstr "Xətalı məlumat. Kitabça (dictionary) gözlənirdi, {datatype} gəldi." + +#: templates/rest_framework/admin.html:116 +#: templates/rest_framework/base.html:136 +msgid "Extra Actions" +msgstr "" + +#: templates/rest_framework/admin.html:130 +#: templates/rest_framework/base.html:150 +msgid "Filters" +msgstr "Filterlər" + +#: templates/rest_framework/base.html:37 +msgid "navbar" +msgstr "" + +#: templates/rest_framework/base.html:75 +msgid "content" +msgstr "" + +#: templates/rest_framework/base.html:78 +msgid "request form" +msgstr "" + +#: templates/rest_framework/base.html:157 +msgid "main content" +msgstr "" + +#: templates/rest_framework/base.html:173 +msgid "request info" +msgstr "" + +#: templates/rest_framework/base.html:177 +msgid "response info" +msgstr "" + +#: templates/rest_framework/horizontal/radio.html:4 +#: templates/rest_framework/inline/radio.html:3 +#: templates/rest_framework/vertical/radio.html:3 +msgid "None" +msgstr "Heç nə" + +#: templates/rest_framework/horizontal/select_multiple.html:4 +#: templates/rest_framework/inline/select_multiple.html:3 +#: templates/rest_framework/vertical/select_multiple.html:3 +msgid "No items to select." +msgstr "Seçiləcək element yoxdur." + +#: validators.py:39 +msgid "This field must be unique." +msgstr "Bu sahə unikal olmalıdır." + +#: validators.py:89 +#, python-brace-format +msgid "The fields {field_names} must make a unique set." +msgstr "{field_names} sahələri birlikdə unikal dəst olmalıdırlar." + +#: validators.py:171 +#, python-brace-format +msgid "Surrogate characters are not allowed: U+{code_point:X}." +msgstr "" + +#: validators.py:243 +#, python-brace-format +msgid "This field must be unique for the \"{date_field}\" date." +msgstr "Bu sahə \"{date_field}\" günü üçün unikal olmalıdır." + +#: validators.py:258 +#, python-brace-format +msgid "This field must be unique for the \"{date_field}\" month." +msgstr "Bu sahə \"{date_field}\" ayı üçün unikal olmalıdır." + +#: validators.py:271 +#, python-brace-format +msgid "This field must be unique for the \"{date_field}\" year." +msgstr "Bu sahə \"{date_field}\" ili üçün unikal olmalıdır." + +#: versioning.py:40 +msgid "Invalid version in \"Accept\" header." +msgstr "\"Accept\" başlığında xətalı versiya." + +#: versioning.py:71 +msgid "Invalid version in URL path." +msgstr "URL yolunda xətalı versiya." + +#: versioning.py:116 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "URL yolunda xətalı versiya. Heç bir versiya namespace-inə uyğun gəlmir." + +#: versioning.py:148 +msgid "Invalid version in hostname." +msgstr "Hostname-də xətalı versiya." + +#: versioning.py:170 +msgid "Invalid version in query parameter." +msgstr "Sorğu parametrində xətalı versiya." diff --git a/rest_framework/locale/bg/LC_MESSAGES/django.mo b/rest_framework/locale/bg/LC_MESSAGES/django.mo new file mode 100644 index 0000000000000000000000000000000000000000..71a0d8a74863adbce4792dd85f71dd318fa09d8c GIT binary patch literal 13083 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 Z)7DY7BZU1%)5`JoOQlb%aFFP}{9nBZ#RUKW literal 0 HcmV?d00001 diff --git a/rest_framework/locale/bg/LC_MESSAGES/django.po b/rest_framework/locale/bg/LC_MESSAGES/django.po new file mode 100644 index 000000000..56e1c9ef8 --- /dev/null +++ b/rest_framework/locale/bg/LC_MESSAGES/django.po @@ -0,0 +1,572 @@ +# 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: 2020-10-13 21:45+0200\n" +"PO-Revision-Date: 2020-10-13 19:45+0000\n" +"Last-Translator: Xavier Ordoquy \n" +"Language-Team: Bulgarian (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/bg/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: bg\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: authentication.py:70 +msgid "Invalid basic header. No credentials provided." +msgstr "Невалиден header за базово удостоверение (basic authentication). Не се предоставени удостоверения." + +#: authentication.py:73 +msgid "Invalid basic header. Credentials string should not contain spaces." +msgstr "Невалиден header за базово удостоверение (basic authentication). Носителите на удостоверение не трябва да съдържат интервали." + +#: authentication.py:83 +msgid "Invalid basic header. Credentials not correctly base64 encoded." +msgstr "Невалиден header за базово удостоверение (basic authentication). Носителите на удостоверение не са кодирани в base64." + +#: authentication.py:101 +msgid "Invalid username/password." +msgstr "Невалидни потребителско име/парола." + +#: authentication.py:104 authentication.py:206 +msgid "User inactive or deleted." +msgstr "Потребителят е неактивен или изтрит." + +#: authentication.py:184 +msgid "Invalid token header. No credentials provided." +msgstr "Невалиден token header. Не са предоставени носители на удостоверение." + +#: authentication.py:187 +msgid "Invalid token header. Token string should not contain spaces." +msgstr "Невалиден token header. Жетона (token-a) не трябва да съдържа интервали." + +#: authentication.py:193 +msgid "" +"Invalid token header. Token string should not contain invalid characters." +msgstr "Невалиден token header. Жетона (token-a) не трябва да съдържа невалидни символи." + +#: authentication.py:203 +msgid "Invalid token." +msgstr "Невалиден жетон." + +#: authtoken/apps.py:7 +msgid "Auth Token" +msgstr "Жетон за удостоверение" + +#: authtoken/models.py:13 +msgid "Key" +msgstr "Ключ" + +#: authtoken/models.py:16 +msgid "User" +msgstr "Потребител" + +#: authtoken/models.py:18 +msgid "Created" +msgstr "Създаден" + +#: authtoken/models.py:27 authtoken/serializers.py:19 +msgid "Token" +msgstr "Жетон" + +#: authtoken/models.py:28 +msgid "Tokens" +msgstr "Жетони" + +#: authtoken/serializers.py:9 +msgid "Username" +msgstr "Потребителско име" + +#: authtoken/serializers.py:13 +msgid "Password" +msgstr "Парола" + +#: authtoken/serializers.py:35 +msgid "Unable to log in with provided credentials." +msgstr "Не е възможен вход с предоставените удостоверения." + +#: authtoken/serializers.py:38 +msgid "Must include \"username\" and \"password\"." +msgstr "Трябва да съдържа \"username\" (потребителско име) и \"password\" (парола)." + +#: exceptions.py:102 +msgid "A server error occurred." +msgstr "Сървърна грешка." + +#: exceptions.py:142 +msgid "Invalid input." +msgstr "" + +#: exceptions.py:161 +msgid "Malformed request." +msgstr "Неправилно оформена заявка." + +#: exceptions.py:167 +msgid "Incorrect authentication credentials." +msgstr "Невалидни носители на удостоверение." + +#: exceptions.py:173 +msgid "Authentication credentials were not provided." +msgstr "Носители на удостоверение не са предоставени." + +#: exceptions.py:179 +msgid "You do not have permission to perform this action." +msgstr "Нямате права да се направи това действие." + +#: exceptions.py:185 +msgid "Not found." +msgstr "Обектът не е намерен." + +#: exceptions.py:191 +#, python-brace-format +msgid "Method \"{method}\" not allowed." +msgstr "Метод \"{method}\" не е позволен." + +#: exceptions.py:202 +msgid "Could not satisfy the request Accept header." +msgstr "Не може да бъде удовлетворен Accept header." + +#: exceptions.py:212 +#, python-brace-format +msgid "Unsupported media type \"{media_type}\" in request." +msgstr "Неподдържан тип на документа \"{media_type}\" в заявката." + +#: exceptions.py:223 +msgid "Request was throttled." +msgstr "Заявката е ограничена." + +#: exceptions.py:224 +#, python-brace-format +msgid "Expected available in {wait} second." +msgstr "" + +#: exceptions.py:225 +#, python-brace-format +msgid "Expected available in {wait} seconds." +msgstr "" + +#: fields.py:316 relations.py:245 relations.py:279 validators.py:90 +#: validators.py:183 +msgid "This field is required." +msgstr "Това поле е задължително." + +#: fields.py:317 +msgid "This field may not be null." +msgstr "Това поле не може да има празна стойност." + +#: fields.py:701 +msgid "Must be a valid boolean." +msgstr "" + +#: fields.py:766 +msgid "Not a valid string." +msgstr "" + +#: fields.py:767 +msgid "This field may not be blank." +msgstr "Това поле не може да е празно." + +#: fields.py:768 fields.py:1881 +#, python-brace-format +msgid "Ensure this field has no more than {max_length} characters." +msgstr "Това поле не трябва да съдържа повече от {max_length} символа." + +#: fields.py:769 +#, python-brace-format +msgid "Ensure this field has at least {min_length} characters." +msgstr "Това поле трябва да съдържа поде {min_length} символа." + +#: fields.py:816 +msgid "Enter a valid email address." +msgstr "Въведете валиден имейл адрес." + +#: fields.py:827 +msgid "This value does not match the required pattern." +msgstr "Тази стойност не съответства на изисквания шаблон." + +#: fields.py:838 +msgid "" +"Enter a valid \"slug\" consisting of letters, numbers, underscores or " +"hyphens." +msgstr "Въведете валиден \"slug\" съдържащ латински букви, цифри, долни черти или тирета." + +#: fields.py:839 +msgid "" +"Enter a valid \"slug\" consisting of Unicode letters, numbers, underscores, " +"or hyphens." +msgstr "" + +#: fields.py:854 +msgid "Enter a valid URL." +msgstr "Въведете валиден URL." + +#: fields.py:867 +msgid "Must be a valid UUID." +msgstr "" + +#: fields.py:903 +msgid "Enter a valid IPv4 or IPv6 address." +msgstr "Въведете валиден IPv4 или IPv6 адрес." + +#: fields.py:931 +msgid "A valid integer is required." +msgstr "Необходимо е валидно цяло число." + +#: fields.py:932 fields.py:969 fields.py:1005 fields.py:1366 +#, python-brace-format +msgid "Ensure this value is less than or equal to {max_value}." +msgstr "Тази стойност трябва да е не повече от {max_value}." + +#: fields.py:933 fields.py:970 fields.py:1006 fields.py:1367 +#, python-brace-format +msgid "Ensure this value is greater than or equal to {min_value}." +msgstr "Тази стойност трябва да е поне {min_value}." + +#: fields.py:934 fields.py:971 fields.py:1010 +msgid "String value too large." +msgstr "Низът е прекалено голям." + +#: fields.py:968 fields.py:1004 +msgid "A valid number is required." +msgstr "Необходимо е валидно число." + +#: fields.py:1007 +#, python-brace-format +msgid "Ensure that there are no more than {max_digits} digits in total." +msgstr "Допустими са не повече от {max_digits} цифри." + +#: fields.py:1008 +#, python-brace-format +msgid "" +"Ensure that there are no more than {max_decimal_places} decimal places." +msgstr "Допустими са не повече от {max_decimal_places} цифри след десетичната запетая." + +#: fields.py:1009 +#, python-brace-format +msgid "" +"Ensure that there are no more than {max_whole_digits} digits before the " +"decimal point." +msgstr "Допустими са не повече от {max_whole_digits} цифри преди десетичната запетая." + +#: fields.py:1148 +#, python-brace-format +msgid "Datetime has wrong format. Use one of these formats instead: {format}." +msgstr "Датата и часът са в невалиден формат. Валидни са следните формати: {format}." + +#: fields.py:1149 +msgid "Expected a datetime but got a date." +msgstr "Очаква се дата и час, но е намерена само дата." + +#: fields.py:1150 +#, python-brace-format +msgid "Invalid datetime for the timezone \"{timezone}\"." +msgstr "" + +#: fields.py:1151 +msgid "Datetime value out of range." +msgstr "" + +#: fields.py:1236 +#, python-brace-format +msgid "Date has wrong format. Use one of these formats instead: {format}." +msgstr "Дата е в невалиден формат. Валидни са следните формати: {format}." + +#: fields.py:1237 +msgid "Expected a date but got a datetime." +msgstr "Очаква се дата, но са подадени дата и час." + +#: fields.py:1303 +#, python-brace-format +msgid "Time has wrong format. Use one of these formats instead: {format}." +msgstr "Времето е в невалиден формат. Валидни са следните формати: {format}." + +#: fields.py:1365 +#, python-brace-format +msgid "Duration has wrong format. Use one of these formats instead: {format}." +msgstr "Отрязъкът от време е в невалиден формат. Валидни са следните формати: {format}." + +#: fields.py:1399 fields.py:1456 +#, python-brace-format +msgid "\"{input}\" is not a valid choice." +msgstr "\"{input}\" не е валиден избор." + +#: fields.py:1402 +#, python-brace-format +msgid "More than {count} items..." +msgstr "Повече от {count} неща..." + +#: fields.py:1457 fields.py:1603 relations.py:485 serializers.py:570 +#, python-brace-format +msgid "Expected a list of items but got type \"{input_type}\"." +msgstr "Очаква се списък от неща, но е получен тип \"{input_type}\"." + +#: fields.py:1458 +msgid "This selection may not be empty." +msgstr "Този избор не може да е празен." + +#: fields.py:1495 +#, python-brace-format +msgid "\"{input}\" is not a valid path choice." +msgstr "\"{input}\" не е валиден избор за път." + +#: fields.py:1514 +msgid "No file was submitted." +msgstr "Не е подаден файл." + +#: fields.py:1515 +msgid "" +"The submitted data was not a file. Check the encoding type on the form." +msgstr "Подадените данни не са файл. Проверете кодировката на формата." + +#: fields.py:1516 +msgid "No filename could be determined." +msgstr "Не може да бъде определено името на файла." + +#: fields.py:1517 +msgid "The submitted file is empty." +msgstr "Подадения файл е празен." + +#: fields.py:1518 +#, python-brace-format +msgid "" +"Ensure this filename has at most {max_length} characters (it has {length})." +msgstr "Името на файла може да е до {max_length} символа (то е {length})." + +#: fields.py:1566 +msgid "" +"Upload a valid image. The file you uploaded was either not an image or a " +"corrupted image." +msgstr "Невалидно изображение. Подадения файл не е изображение или е повредено изображение." + +#: fields.py:1604 relations.py:486 serializers.py:571 +msgid "This list may not be empty." +msgstr "Този списък не може да е празен." + +#: fields.py:1605 +#, python-brace-format +msgid "Ensure this field has at least {min_length} elements." +msgstr "" + +#: fields.py:1606 +#, python-brace-format +msgid "Ensure this field has no more than {max_length} elements." +msgstr "" + +#: fields.py:1682 +#, python-brace-format +msgid "Expected a dictionary of items but got type \"{input_type}\"." +msgstr "Очаква се асоциативен масив, но е получен \"{input_type}\"." + +#: fields.py:1683 +msgid "This dictionary may not be empty." +msgstr "" + +#: fields.py:1755 +msgid "Value must be valid JSON." +msgstr "Стойността трябва да е валиден JSON." + +#: filters.py:49 templates/rest_framework/filters/search.html:2 +msgid "Search" +msgstr "Търсене" + +#: filters.py:50 +msgid "A search term." +msgstr "" + +#: filters.py:180 templates/rest_framework/filters/ordering.html:3 +msgid "Ordering" +msgstr "Подредба" + +#: filters.py:181 +msgid "Which field to use when ordering the results." +msgstr "" + +#: filters.py:287 +msgid "ascending" +msgstr "в нарастващ ред" + +#: filters.py:288 +msgid "descending" +msgstr "в намаляващ ред" + +#: pagination.py:174 +msgid "A page number within the paginated result set." +msgstr "" + +#: pagination.py:179 pagination.py:372 pagination.py:590 +msgid "Number of results to return per page." +msgstr "" + +#: pagination.py:189 +msgid "Invalid page." +msgstr "Невалидна страница." + +#: pagination.py:374 +msgid "The initial index from which to return the results." +msgstr "" + +#: pagination.py:581 +msgid "The pagination cursor value." +msgstr "" + +#: pagination.py:583 +msgid "Invalid cursor" +msgstr "Невалиден курсор" + +#: relations.py:246 +#, python-brace-format +msgid "Invalid pk \"{pk_value}\" - object does not exist." +msgstr "Невалиден идентификатор \"{pk_value}\" - обектът не съществува." + +#: relations.py:247 +#, python-brace-format +msgid "Incorrect type. Expected pk value, received {data_type}." +msgstr "Неправилен тип. Очакван е тип за основен ключ, получен е {data_type}." + +#: relations.py:280 +msgid "Invalid hyperlink - No URL match." +msgstr "Невалидна връзка (hyperlink) - няма намерен URL." + +#: relations.py:281 +msgid "Invalid hyperlink - Incorrect URL match." +msgstr "Невалидна връзка (hyperlink) - неправилно съвпадение на URL." + +#: relations.py:282 +msgid "Invalid hyperlink - Object does not exist." +msgstr "Невалидна връзка (hyperlink) - обектът не съществува." + +#: relations.py:283 +#, python-brace-format +msgid "Incorrect type. Expected URL string, received {data_type}." +msgstr "Невалиден тип. Очаква се URL низ, получен е {data_type}." + +#: relations.py:448 +#, python-brace-format +msgid "Object with {slug_name}={value} does not exist." +msgstr "Обект с {slug_name}={value} не съществува." + +#: relations.py:449 +msgid "Invalid value." +msgstr "Невалидна стойност." + +#: schemas/utils.py:32 +msgid "unique integer value" +msgstr "" + +#: schemas/utils.py:34 +msgid "UUID string" +msgstr "" + +#: schemas/utils.py:36 +msgid "unique value" +msgstr "" + +#: schemas/utils.py:38 +#, python-brace-format +msgid "A {value_type} identifying this {name}." +msgstr "" + +#: serializers.py:337 +#, python-brace-format +msgid "Invalid data. Expected a dictionary, but got {datatype}." +msgstr "Невалидни данни. Очаква се асоциативен масив, но е получен {datatype}." + +#: templates/rest_framework/admin.html:116 +#: templates/rest_framework/base.html:136 +msgid "Extra Actions" +msgstr "" + +#: templates/rest_framework/admin.html:130 +#: templates/rest_framework/base.html:150 +msgid "Filters" +msgstr "Филтри" + +#: templates/rest_framework/base.html:37 +msgid "navbar" +msgstr "" + +#: templates/rest_framework/base.html:75 +msgid "content" +msgstr "" + +#: templates/rest_framework/base.html:78 +msgid "request form" +msgstr "" + +#: templates/rest_framework/base.html:157 +msgid "main content" +msgstr "" + +#: templates/rest_framework/base.html:173 +msgid "request info" +msgstr "" + +#: templates/rest_framework/base.html:177 +msgid "response info" +msgstr "" + +#: templates/rest_framework/horizontal/radio.html:4 +#: templates/rest_framework/inline/radio.html:3 +#: templates/rest_framework/vertical/radio.html:3 +msgid "None" +msgstr "Нищо" + +#: templates/rest_framework/horizontal/select_multiple.html:4 +#: templates/rest_framework/inline/select_multiple.html:3 +#: templates/rest_framework/vertical/select_multiple.html:3 +msgid "No items to select." +msgstr "Няма неща за избиране." + +#: validators.py:39 +msgid "This field must be unique." +msgstr "Това поле трябва да е уникално." + +#: validators.py:89 +#, python-brace-format +msgid "The fields {field_names} must make a unique set." +msgstr "Полетата {field_names} трябва да образуват уникална комбинация." + +#: validators.py:171 +#, python-brace-format +msgid "Surrogate characters are not allowed: U+{code_point:X}." +msgstr "" + +#: validators.py:243 +#, python-brace-format +msgid "This field must be unique for the \"{date_field}\" date." +msgstr "Това поле трябва да е уникално за \"{date_field}\" дата." + +#: validators.py:258 +#, python-brace-format +msgid "This field must be unique for the \"{date_field}\" month." +msgstr "Това поле трябва да е уникално за \"{date_field}\" месец." + +#: validators.py:271 +#, python-brace-format +msgid "This field must be unique for the \"{date_field}\" year." +msgstr "Това поле трябва да е уникално за \"{date_field}\" година." + +#: versioning.py:40 +msgid "Invalid version in \"Accept\" header." +msgstr "Невалидна версия в \"Accept\" header." + +#: versioning.py:71 +msgid "Invalid version in URL path." +msgstr "Невалидна версия в URL пътя." + +#: versioning.py:116 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "Невалидна версия в URL пътя. Няма съвпадение с пространството от имена на версии." + +#: versioning.py:148 +msgid "Invalid version in hostname." +msgstr "Невалидна версия в името на сървъра (hostname)." + +#: versioning.py:170 +msgid "Invalid version in query parameter." +msgstr "Невалидна версия в GET параметър." diff --git a/rest_framework/locale/ca/LC_MESSAGES/django.mo b/rest_framework/locale/ca/LC_MESSAGES/django.mo index 0f72ec03947a137debd0497f8e67a4d84ca95ac7..7da9971a8ec201a5e8907883c09508c10db7c4d9 100644 GIT binary patch delta 1850 zcmYk+-A`0U7{~F4H&5*8 z`|uCnT`SGrrT+y+%@Vdq;|LD|*=D=&Lu|nd*p0tpGnV9d{~y2@{jYHgE@2*~2fYau zqMq0J9zp%yBsSm;R3Oi>nfF^>u2~ZgdaxDG;9gwBYRp+>wi?5zah+I!r?C{T;|{!! zHTXB`dlh`C3;S_5euMnkZ+yIoFVyG#mi>k|S%?aA+`2~@2026UkM$54AbiH&#xwN(%N zeipM+L=n`uespjg_2P4=T)2ys7+{vQSf9`O570QlgJQgmb@&voq>+RLW^d8|zR>%@ zN4S;#pQz`>grgOC2ld0pP!pWS{rD3ez#!qq@F?p4SACb(vHluZNJ?vuKEg0w#>4mo z6=^lItH+PA4`;9nU!qoMBjGCt!dQ*ReUliae+P96GFTqv&VFpc@dS+y8uNGvUt<)z z_|*uWMRvu0L5+KYdU44nFN?cTk&mKQZWf#HA!>X!%M-?4Bu#7@H{&J0pSVRs$Kf9G zZhMLRS&&hB(GFC<-**BP!FePoTR=_VDY96Wm6jMa`h<7%HmeqT|^@RfHt7doh7qn713LI=R%{YWPLTsIrHu)l_b@Qnf;y zLia}13DW!Bs2fnrq@v}~60301+>*(sR!N1Vx9wEr!D?!hsvJ3l{qQr`6+Nl37; delta 2103 zcmaLXTWl0n9LMof3cYaYg>5OV)D9~a#kRDR(%OrxU8uztini4Vi8$>}>`1#?y1Sqd z-9*zE600T~V+au{5)(r-sY@a+Xtd%BF&Hfm8pP;>vGGBLMB|I``ZPw4+90uxIKRZ0L)gEJf3%W(W7cCSTG)(t;t<}BM{zBlK;8d7 z-iBAO9)HFVgr7RyYN@+!uDdG!~4zCbgJ-0oxn4wnarVPaMkyQ zf4;aRJHuvF3VLuOI=BXB(89AAz)QFkzeX0zT*uA0h$$^qWoh=tI;`M0jE%S-m714O z16lBY|II%x!@o7ArLkds>n_}7<@D;T1yzf=4<@k61_iARR73)U5&#qwox6zs5#Dn-L z?!jV8x*s1${eI5(2h??yj7m9-;JtVThw&P=;ufaej8EYZp29l3i5jrQa;QeSQgj;V zjQPHfA&x&oZIgViR&njY4m^T8F@uBnCx&o$wK1LeGLlwv8Fk$?)Qf{mTSY#Ant2kn zlBqZ8w9#2W-LR@AJEK9Q-pma0XWsCSFQOjwIWk6b6S>tCTiF*ippN(Z9z{*y1TuN^ z32Fe}B8!sHhDQ_~C7^a0Vs71hr zb@O5LmRxnD#)6vr32kwuV5jo0rPZ?OgP=61>1+1yMxl5`SdJ95*Vy{E+THZJiGE@Q z!FKmjM<&bwp*jf@1%!5u()KXnt&@sFg{Ia^1iW7MlWBs-+~{O7@odm?<5o15ux#tF zJ?=)Vkyvcpv7-&?3wgcO!DF0EI{&?DczD;2%wKuW7nbgIrY78Y+>J%8h!b_4Nanec zp4@;vIvPtx6MA~YjoTyRP9%LXaJHzawZ5^fzOmVA+S=aImX4KGSVLp62|I3u$EMtP z!gZ|9L~J5NjQS@sZ\n" +"POT-Creation-Date: 2020-10-13 21:45+0200\n" +"PO-Revision-Date: 2020-10-13 19:45+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" "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:73 +#: authentication.py:70 msgid "Invalid basic header. No credentials provided." msgstr "Header Basic invàlid. No hi ha disponibles les credencials." -#: authentication.py:76 +#: authentication.py:73 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "Header Basic invàlid. Les credencials no poden contenir espais." -#: authentication.py:82 +#: authentication.py:83 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Header Basic invàlid. Les credencials no estan codificades correctament en base64." -#: authentication.py:99 +#: authentication.py:101 msgid "Invalid username/password." msgstr "Usuari/Contrasenya incorrectes." -#: authentication.py:102 authentication.py:198 +#: authentication.py:104 authentication.py:206 msgid "User inactive or deleted." msgstr "Usuari inactiu o esborrat." -#: authentication.py:176 +#: authentication.py:184 msgid "Invalid token header. No credentials provided." msgstr "Token header invàlid. No s'han indicat les credencials." -#: authentication.py:179 +#: authentication.py:187 msgid "Invalid token header. Token string should not contain spaces." msgstr "Token header invàlid. El token no ha de contenir espais." -#: authentication.py:185 +#: authentication.py:193 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:195 +#: authentication.py:203 msgid "Invalid token." msgstr "Token invàlid." @@ -58,382 +58,515 @@ msgstr "Token invàlid." msgid "Auth Token" msgstr "" -#: authtoken/models.py:15 +#: authtoken/models.py:13 msgid "Key" msgstr "" -#: authtoken/models.py:18 +#: authtoken/models.py:16 msgid "User" msgstr "" -#: authtoken/models.py:20 +#: authtoken/models.py:18 msgid "Created" msgstr "" -#: authtoken/models.py:29 +#: authtoken/models.py:27 authtoken/serializers.py:19 msgid "Token" msgstr "" -#: authtoken/models.py:30 +#: authtoken/models.py:28 msgid "Tokens" msgstr "" -#: authtoken/serializers.py:8 +#: authtoken/serializers.py:9 msgid "Username" msgstr "" -#: authtoken/serializers.py:9 +#: authtoken/serializers.py:13 msgid "Password" msgstr "" -#: authtoken/serializers.py:20 -msgid "User account is disabled." -msgstr "Compte d'usuari desactivat." - -#: authtoken/serializers.py:23 +#: authtoken/serializers.py:35 msgid "Unable to log in with provided credentials." msgstr "No es possible loguejar-se amb les credencials introduïdes." -#: authtoken/serializers.py:26 +#: authtoken/serializers.py:38 msgid "Must include \"username\" and \"password\"." msgstr "S'ha d'incloure \"username\" i \"password\"." -#: exceptions.py:49 +#: exceptions.py:102 msgid "A server error occurred." msgstr "S'ha produït un error en el servidor." -#: exceptions.py:84 +#: exceptions.py:142 +msgid "Invalid input." +msgstr "" + +#: exceptions.py:161 msgid "Malformed request." msgstr "Request amb format incorrecte." -#: exceptions.py:89 +#: exceptions.py:167 msgid "Incorrect authentication credentials." msgstr "Credencials d'autenticació incorrectes." -#: exceptions.py:94 +#: exceptions.py:173 msgid "Authentication credentials were not provided." msgstr "Credencials d'autenticació no disponibles." -#: exceptions.py:99 +#: exceptions.py:179 msgid "You do not have permission to perform this action." msgstr "No té permisos per realitzar aquesta acció." -#: exceptions.py:104 views.py:81 +#: exceptions.py:185 msgid "Not found." msgstr "No trobat." -#: exceptions.py:109 +#: exceptions.py:191 +#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "Mètode \"{method}\" no permès." -#: exceptions.py:120 +#: exceptions.py:202 msgid "Could not satisfy the request Accept header." msgstr "No s'ha pogut satisfer l'Accept header de la petició." -#: exceptions.py:132 +#: exceptions.py:212 +#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "Media type \"{media_type}\" no suportat." -#: exceptions.py:145 +#: exceptions.py:223 msgid "Request was throttled." msgstr "La petició ha estat limitada pel número màxim de peticions definit." -#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 -#: validators.py:181 +#: exceptions.py:224 +#, python-brace-format +msgid "Expected available in {wait} second." +msgstr "" + +#: exceptions.py:225 +#, python-brace-format +msgid "Expected available in {wait} seconds." +msgstr "" + +#: fields.py:316 relations.py:245 relations.py:279 validators.py:90 +#: validators.py:183 msgid "This field is required." msgstr "Aquest camp és obligatori." -#: fields.py:270 +#: fields.py:317 msgid "This field may not be null." msgstr "Aquest camp no pot ser nul." -#: fields.py:608 fields.py:639 -msgid "\"{input}\" is not a valid boolean." -msgstr "\"{input}\" no és un booleà." +#: fields.py:701 +msgid "Must be a valid boolean." +msgstr "" -#: fields.py:674 +#: fields.py:766 +msgid "Not a valid string." +msgstr "" + +#: fields.py:767 msgid "This field may not be blank." msgstr "Aquest camp no pot estar en blanc." -#: fields.py:675 fields.py:1675 +#: fields.py:768 fields.py:1881 +#, 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." -#: fields.py:676 +#: fields.py:769 +#, python-brace-format 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:713 +#: fields.py:816 msgid "Enter a valid email address." msgstr "Introdueixi una adreça de correu vàlida." -#: fields.py:724 +#: fields.py:827 msgid "This value does not match the required pattern." msgstr "Aquest valor no compleix el patró requerit." -#: fields.py:735 +#: fields.py:838 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:747 +#: fields.py:839 +msgid "" +"Enter a valid \"slug\" consisting of Unicode letters, numbers, underscores, " +"or hyphens." +msgstr "" + +#: fields.py:854 msgid "Enter a valid URL." msgstr "Introdueixi una URL vàlida." -#: fields.py:760 -msgid "\"{value}\" is not a valid UUID." -msgstr "\"{value}\" no és un UUID vàlid." +#: fields.py:867 +msgid "Must be a valid UUID." +msgstr "" -#: fields.py:796 +#: fields.py:903 msgid "Enter a valid IPv4 or IPv6 address." msgstr "Introdueixi una adreça IPv4 o IPv6 vàlida." -#: fields.py:821 +#: fields.py:931 msgid "A valid integer is required." msgstr "Es requereix un nombre enter vàlid." -#: fields.py:822 fields.py:857 fields.py:891 +#: fields.py:932 fields.py:969 fields.py:1005 fields.py:1366 +#, python-brace-format 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:823 fields.py:858 fields.py:892 +#: fields.py:933 fields.py:970 fields.py:1006 fields.py:1367 +#, python-brace-format 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:824 fields.py:859 fields.py:896 +#: fields.py:934 fields.py:971 fields.py:1010 msgid "String value too large." msgstr "Valor del text massa gran." -#: fields.py:856 fields.py:890 +#: fields.py:968 fields.py:1004 msgid "A valid number is required." msgstr "Es requereix un nombre vàlid." -#: fields.py:893 +#: fields.py:1007 +#, python-brace-format 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:894 +#: fields.py:1008 +#, python-brace-format 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:895 +#: fields.py:1009 +#, python-brace-format 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:1025 +#: fields.py:1148 +#, python-brace-format 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:1026 +#: fields.py:1149 msgid "Expected a datetime but got a date." msgstr "S'espera un Datetime però s'ha rebut un Date." -#: fields.py:1103 +#: fields.py:1150 +#, python-brace-format +msgid "Invalid datetime for the timezone \"{timezone}\"." +msgstr "" + +#: fields.py:1151 +msgid "Datetime value out of range." +msgstr "" + +#: fields.py:1236 +#, 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:1104 +#: fields.py:1237 msgid "Expected a date but got a datetime." msgstr "S'espera un Date però s'ha rebut un Datetime." -#: fields.py:1170 +#: fields.py:1303 +#, 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:1232 +#: fields.py:1365 +#, 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:1251 fields.py:1300 +#: fields.py:1399 fields.py:1456 +#, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" no és una opció vàlida." -#: fields.py:1254 relations.py:71 relations.py:441 +#: fields.py:1402 +#, python-brace-format msgid "More than {count} items..." msgstr "" -#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 +#: fields.py:1457 fields.py:1603 relations.py:485 serializers.py:570 +#, 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:1302 +#: fields.py:1458 msgid "This selection may not be empty." msgstr "Aquesta selecció no pot estar buida." -#: fields.py:1339 +#: fields.py:1495 +#, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "\"{input}\" no és un path vàlid." -#: fields.py:1358 +#: fields.py:1514 msgid "No file was submitted." msgstr "No s'ha enviat cap fitxer." -#: fields.py:1359 +#: fields.py:1515 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:1360 +#: fields.py:1516 msgid "No filename could be determined." msgstr "No s'ha pogut determinar el nom del fitxer." -#: fields.py:1361 +#: fields.py:1517 msgid "The submitted file is empty." msgstr "El fitxer enviat està buit." -#: fields.py:1362 +#: fields.py:1518 +#, 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:1410 +#: fields.py:1566 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:1449 relations.py:438 serializers.py:525 +#: fields.py:1604 relations.py:486 serializers.py:571 msgid "This list may not be empty." msgstr "Aquesta llista no pot estar buida." -#: fields.py:1502 +#: fields.py:1605 +#, python-brace-format +msgid "Ensure this field has at least {min_length} elements." +msgstr "" + +#: fields.py:1606 +#, python-brace-format +msgid "Ensure this field has no more than {max_length} elements." +msgstr "" + +#: fields.py:1682 +#, 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:1549 +#: fields.py:1683 +msgid "This dictionary may not be empty." +msgstr "" + +#: fields.py:1755 msgid "Value must be valid JSON." msgstr "" -#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 -msgid "Submit" +#: filters.py:49 templates/rest_framework/filters/search.html:2 +msgid "Search" msgstr "" -#: filters.py:336 +#: filters.py:50 +msgid "A search term." +msgstr "" + +#: filters.py:180 templates/rest_framework/filters/ordering.html:3 +msgid "Ordering" +msgstr "" + +#: filters.py:181 +msgid "Which field to use when ordering the results." +msgstr "" + +#: filters.py:287 msgid "ascending" msgstr "" -#: filters.py:337 +#: filters.py:288 msgid "descending" msgstr "" -#: pagination.py:193 +#: pagination.py:174 +msgid "A page number within the paginated result set." +msgstr "" + +#: pagination.py:179 pagination.py:372 pagination.py:590 +msgid "Number of results to return per page." +msgstr "" + +#: pagination.py:189 msgid "Invalid page." msgstr "" -#: pagination.py:427 +#: pagination.py:374 +msgid "The initial index from which to return the results." +msgstr "" + +#: pagination.py:581 +msgid "The pagination cursor value." +msgstr "" + +#: pagination.py:583 msgid "Invalid cursor" msgstr "Cursor invàlid." -#: relations.py:207 +#: relations.py:246 +#, 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 +#: relations.py:247 +#, 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:240 +#: relations.py:280 msgid "Invalid hyperlink - No URL match." msgstr "Hyperlink invàlid - Cap match d'URL." -#: relations.py:241 +#: relations.py:281 msgid "Invalid hyperlink - Incorrect URL match." msgstr "Hyperlink invàlid - Match d'URL incorrecta." -#: relations.py:242 +#: relations.py:282 msgid "Invalid hyperlink - Object does not exist." msgstr "Hyperlink invàlid - L'objecte no existeix." -#: relations.py:243 +#: relations.py:283 +#, 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:401 +#: relations.py:448 +#, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "L'objecte amb {slug_name}={value} no existeix." -#: relations.py:402 +#: relations.py:449 msgid "Invalid value." msgstr "Valor invàlid." -#: serializers.py:326 +#: schemas/utils.py:32 +msgid "unique integer value" +msgstr "" + +#: schemas/utils.py:34 +msgid "UUID string" +msgstr "" + +#: schemas/utils.py:36 +msgid "unique value" +msgstr "" + +#: schemas/utils.py:38 +#, python-brace-format +msgid "A {value_type} identifying this {name}." +msgstr "" + +#: serializers.py:337 +#, 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:116 -#: templates/rest_framework/base.html:128 +#: templates/rest_framework/base.html:136 +msgid "Extra Actions" +msgstr "" + +#: templates/rest_framework/admin.html:130 +#: templates/rest_framework/base.html:150 msgid "Filters" msgstr "" -#: templates/rest_framework/filters/django_filter.html:2 -#: templates/rest_framework/filters/django_filter_crispyforms.html:4 -msgid "Field filters" +#: templates/rest_framework/base.html:37 +msgid "navbar" msgstr "" -#: templates/rest_framework/filters/ordering.html:3 -msgid "Ordering" +#: templates/rest_framework/base.html:75 +msgid "content" msgstr "" -#: templates/rest_framework/filters/search.html:2 -msgid "Search" +#: templates/rest_framework/base.html:78 +msgid "request form" msgstr "" -#: templates/rest_framework/horizontal/radio.html:2 -#: templates/rest_framework/inline/radio.html:2 -#: templates/rest_framework/vertical/radio.html:2 +#: templates/rest_framework/base.html:157 +msgid "main content" +msgstr "" + +#: templates/rest_framework/base.html:173 +msgid "request info" +msgstr "" + +#: templates/rest_framework/base.html:177 +msgid "response info" +msgstr "" + +#: templates/rest_framework/horizontal/radio.html:4 +#: templates/rest_framework/inline/radio.html:3 +#: templates/rest_framework/vertical/radio.html:3 msgid "None" msgstr "Cap" -#: templates/rest_framework/horizontal/select_multiple.html:2 -#: templates/rest_framework/inline/select_multiple.html:2 -#: templates/rest_framework/vertical/select_multiple.html:2 +#: templates/rest_framework/horizontal/select_multiple.html:4 +#: templates/rest_framework/inline/select_multiple.html:3 +#: templates/rest_framework/vertical/select_multiple.html:3 msgid "No items to select." msgstr "Cap opció seleccionada." -#: validators.py:43 +#: validators.py:39 msgid "This field must be unique." msgstr "Aquest camp ha de ser únic." -#: validators.py:97 +#: validators.py:89 +#, python-brace-format msgid "The fields {field_names} must make a unique set." msgstr "Aquests camps {field_names} han de constituir un conjunt únic." -#: validators.py:245 +#: validators.py:171 +#, python-brace-format +msgid "Surrogate characters are not allowed: U+{code_point:X}." +msgstr "" + +#: validators.py:243 +#, python-brace-format 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:260 +#: validators.py:258 +#, python-brace-format 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:273 +#: validators.py:271 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" year." msgstr "Aquest camp ha de ser únic per a l'any \"{date_field}\"." -#: versioning.py:42 +#: versioning.py:40 msgid "Invalid version in \"Accept\" header." msgstr "Versió invàlida al header \"Accept\"." -#: versioning.py:73 +#: versioning.py:71 msgid "Invalid version in URL path." msgstr "Versió invàlida a la URL." -#: versioning.py:115 +#: versioning.py:116 msgid "Invalid version in URL path. Does not match any version namespace." msgstr "" -#: versioning.py:147 +#: versioning.py:148 msgid "Invalid version in hostname." msgstr "Versió invàlida al hostname." -#: versioning.py:169 +#: versioning.py:170 msgid "Invalid version in query parameter." msgstr "Versió invàlida al paràmetre de consulta." - -#: views.py:88 -msgid "Permission denied." -msgstr "Permís denegat." diff --git a/rest_framework/locale/cs/LC_MESSAGES/django.mo b/rest_framework/locale/cs/LC_MESSAGES/django.mo index 1561cd98c570a634e4abd2fcbda46ab764e56ca7..ebf7db5aa7b4cb3f8bc3c7e406e4246ea92501ce 100644 GIT binary patch delta 3414 zcmZ|PeQZ@{9l-IY1zHAev4!$hN}nRMFyYdcwvN)SWxP|~25kq<0jKvq(%as9&gGnQ zFZ3dIac+xqEYp)^EX0@kLWYV9Yfxh>QExl-4-ylj!-R-t@sF9nlxX7HoZsKM7eX{X zxzGJP=bYy}ufOMfY5S`O$9`Ki^A$xpPF^N?hEmUnCH#?A&sIv~8eE0DaWSS)>VFn% z@FLE^pWr&Yj%)FsSc#yxoJlZ~$MxkK*rf6E2ynR4?{p z2acmWzlnQrL77q?MhmO(S(E{uFWkRc@HZ&!y^n2bOsS3K`4KuOGdzXT!58rnyn)?V zS)tSxd>kYA3i4A^{7JoE;%Y3Lr&K+*;lua@(uDdnHsQ+{!5`x;`d5FV(1jfz$~Sl# zmva4l;rgp6GrNK^qhFyc<=w({TV?+FL7c(;49W^*aXFqtY46+Eh(E=J_#TdF3MJH@ zkBvAJHzBL8dT>4VBHO6W6#NWI1Lsh} zCHM!F34Kt_`pb>kOs54`An~aBQC8p>-Y!yV7-b6%6Z&iLlPK?9L|Nh=AwPACKgOi~ zh7DLwrFGbf(%v9$#U$>*H^(UKr|3V=`&kAFzAvEM|20a?bh4hE zn8gHs52fRkwfQaT#T8r+qD=5vl!<&FyKw9#g-sNeG7Z_w0j$HPa66vGy*PzWU=d3jcvJ5zRE2n`%UPz73g!I)M@!&xO}xECq!IZoG~1 z!oN{sVA)Eg__nA9l!3IM1kIB;3uE{=4x@DVLzIE#a3j8h`>>W#NxKP@WB3AU{027C zzj}*87v8~cT+3)=i4sT~>h*%xQO@sO?7*d5Y{Pz>g%_{{$1yx5*v|D0Jc#p{g-mP^ zTQPxS60PGD_^I#m$LgtDDA8KXddmytScEgk61B3A_tFjuoTf0zS5E5pk!1pM6eY=O z$kNLZKTbYImVuGR!o8JJ8<`K1`Z#%jd@nKhaKB{4GAK=!^f9u`UbaA%mBkC=p%*2| z)=836H9IWjkDkPqBnjTN^8J4>ZRX-g;l>7JrPX2bqhwhrN%Do0)q09NlPp^yM~hEH z7{H+Bk!8vI$%KA#-*FjoAP0) zAwOBTW|zWmiCjuN@hJ$??t(&uyoD?QDO=sfhbsIwLzpCx_zK@o2PkzHu8Q$7a%r%) zq&9f5WKNJSSu{6g`9nH7w(fIAjIA~Y-E)@&b)}n2x46dgO)NN8`nlO# z)2`*m9Xm)>c2E4V)GnUC>p-SeJFdodZN*})@q!(5ZkKM4Cw$|26C37M7tgRxn4qit zd{x}eSc!Oy?kv}e%JaZ3UmRR5zZ&eVcxa{G>KISkj<1uJA05(`J*qQQqC;(4N#mug zXmGM(VK7_~nbB)TgI6nB7dx)e{*YzsGf^jP`)76BH%TuN34T@)TbRGlzN0;pFi}6E z_Bpl**39c%zu%1+H*TL$2Q1G!<+w3*(40&g&)26cj}~3W_Y)=-QHPA>Mu#TO%zLY- zJrU=5(i#m1IcT&=ru@-}>KlrCg&t(A|6L*Is7#mTmo@zNg6~vL22WSj)c1SFm6@pl zE0H!jnWlM~&9Bn#L;LpyuT`}zu)L_TV=~s5xmOIXR}ECOG_7mqw?Q{=>}YKZn&&Ul zhpkN9xSH8HC)1<4^E5M)QcogoJDIo@49$Np*1Acj5^QCnYqhPrx^%N{XwbG^MS-iP zHM(0j=?=}qN4s=O{$XdAZvEeC&0#Hhv7Q&TyxGE=8#c`et}JM5h})^Oe|Ckojh(xk zpOzG&EVHFYwCAJ;9XB1^UC>v(Iqe(Uk7uo^b5g|*qcHfzvc@1;9hoyQ>Svtk*Np81 zx2mgyH>y9iwa?Au#-(a9H%$Vr0N38Ofg?8Bmfc&Y))vIT_36#{KuQwly*u{B_wo0}nJtpl8{6 z-G6XTxIR-CB6^>3Vksw+yBuSR)7Nt2F*|oDnPwuxNn;>Vli*+?aGm7SRdbUfy0YecsB-ma3h`OE^JU-Jz15tgGcu9IcyM+}p=aIyyWo zgPawUoVt+EgSkncG3Lgz%wm#56ILqpp#NXJ;6(j151yUT;NAMEV0uM+XFq$(!kUCP zlDou$6Av@&D~^jhD&J`OTTL z=bV{uzB#WAoY|H9x^T&iqV!SAs9~2l#T#MhM zAD1pyYBM%q502t4JckeC9qd*rsp{QIJxNClTktxzqbpabN3avy@Hoo#1>A#wVj=eB zWd^VhD>$FZdIse=m$3=&;e*(Cf9836v6c6$85&(&_zbsW{tBf6IDq*$jji|!`tTE! zh}^{*Eb=H-i(M%9MKOqHQSSc=z4$}+d^w#m&|)m({i;nGIGnu@N155{D4~8EtMNJ( z<6YF4yHY78rD|{sHlbX%aSc9?GO$x9Azwgwk7rfpdJQI}qlbp9-F|GwqbQ-im_5IP zGJ}l;nHP1StZ5h@!uPNazr?4|!{|%#>8#UO&-rPb%OTPzk$b6#_)91*7Adt3zd*V1 zXOx-eug)ZyAFDXug?^mC9e5h|;J5e$`kDStoJL9Fk5LBdCmgc0QI!7oQI^PCLi{^u zjF8G&TsLt8dI*nXw;vzHI1c0GY`>TA%6lwi71SB* z#dni50yKWbEm+NZ$cu-u9jCAxKR|i#FUaz%orFu0aS&M@bqqJ*Nt6N2p(N=ol&t>^ z`6*3UrN0wp$&#ZqB-F2RkPu%$HiEi^@`CTMA3Z!(9=xB!R!rh!_#w)J-8z#aRme|m z;~+_U0E2iOyYL#y#N3RcQuhB28f|ohP}c4|N+j-JGkOWf0QMtY>O3~$Rph6B=a7T) z3|S({4;i2od0r<~BHTcgLaL-Ewj3K}|1TDnDm_9u@1c@|>OMK4usZ4R$~Ka3fkcX> zPY-lAc2NIYa_L}0q>C)UGAhAR9x9)X^w#W^_e*%B$U3%A2}}CZx*280l7LI8Qe?(b zWc#?N>?GAq&3>)ZxzWVAln1C1L0Qhl!fO7jBqbXq<0TnnFH07aW9jVz=?{r~WTd#M z+tRJf+DcQ_Qd4C+_E8s$nzyTdr{5p&Z$Y-)3lr*iTfmoY1Dr=IZ?xy&0YPnhVc8MC_}V5SNh%(Vi` z^b~G2Ckjha?-X9iF|$RE@vXiT(AL;kB;mwm5aXekbs%hy2h>o^p41`78jFXH*g7() z$L+8kx5texZZe08hw|%M{I#wA+6GaSM<%+d zW7!U~WX+Fz8`^a=oS3x2L7x*0)@{;Vx>mPopVJwv*Hu;8=?FGTXC0mO?RozQl4FOb zY#ogx7CxGvjq5|!;fRhu7yUb0X1Ju@2y$~>3xR!^HZtLII^w=y>|WldZ;VLJhH*w<{n@m2f\n" +"POT-Creation-Date: 2020-10-13 21:45+0200\n" +"PO-Revision-Date: 2020-10-13 19:45+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" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: cs\n" -"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n" -#: authentication.py:73 +#: authentication.py:70 msgid "Invalid basic header. No credentials provided." msgstr "Chybná hlavička. Nebyly poskytnuty přihlašovací údaje." -#: authentication.py:76 +#: authentication.py:73 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:82 +#: authentication.py:83 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:99 +#: authentication.py:101 msgid "Invalid username/password." msgstr "Chybné uživatelské jméno nebo heslo." -#: authentication.py:102 authentication.py:198 +#: authentication.py:104 authentication.py:206 msgid "User inactive or deleted." msgstr "Uživatelský účet je neaktivní nebo byl smazán." -#: authentication.py:176 +#: authentication.py:184 msgid "Invalid token header. No credentials provided." msgstr "Chybná hlavička tokenu. Nebyly zadány přihlašovací údaje." -#: authentication.py:179 +#: authentication.py:187 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:185 +#: authentication.py:193 msgid "" "Invalid token header. Token string should not contain invalid characters." -msgstr "" +msgstr "Chybná hlavička s tokenem. Token nesmí obsahovat nevalidní znaky." -#: authentication.py:195 +#: authentication.py:203 msgid "Invalid token." msgstr "Chybný token." #: authtoken/apps.py:7 msgid "Auth Token" -msgstr "" +msgstr "Autentizační token" -#: authtoken/models.py:15 +#: authtoken/models.py:13 msgid "Key" -msgstr "" +msgstr "Klíč" + +#: authtoken/models.py:16 +msgid "User" +msgstr "Uživatel" #: authtoken/models.py:18 -msgid "User" -msgstr "" - -#: authtoken/models.py:20 msgid "Created" -msgstr "" +msgstr "Vytvořeno" -#: authtoken/models.py:29 +#: authtoken/models.py:27 authtoken/serializers.py:19 msgid "Token" -msgstr "" +msgstr "Token" -#: authtoken/models.py:30 +#: authtoken/models.py:28 msgid "Tokens" -msgstr "" - -#: authtoken/serializers.py:8 -msgid "Username" -msgstr "" +msgstr "Tokeny" #: authtoken/serializers.py:9 +msgid "Username" +msgstr "Uživatelské jméno" + +#: authtoken/serializers.py:13 msgid "Password" -msgstr "" +msgstr "Heslo" -#: authtoken/serializers.py:20 -msgid "User account is disabled." -msgstr "Uživatelský účet je uzamčen." - -#: authtoken/serializers.py:23 +#: authtoken/serializers.py:35 msgid "Unable to log in with provided credentials." msgstr "Zadanými údaji se nebylo možné přihlásit." -#: authtoken/serializers.py:26 +#: authtoken/serializers.py:38 msgid "Must include \"username\" and \"password\"." msgstr "Musí obsahovat \"uživatelské jméno\" a \"heslo\"." -#: exceptions.py:49 +#: exceptions.py:102 msgid "A server error occurred." msgstr "Chyba na straně serveru." -#: exceptions.py:84 +#: exceptions.py:142 +msgid "Invalid input." +msgstr "" + +#: exceptions.py:161 msgid "Malformed request." msgstr "Neplatný formát požadavku." -#: exceptions.py:89 +#: exceptions.py:167 msgid "Incorrect authentication credentials." msgstr "Chybné přihlašovací údaje." -#: exceptions.py:94 +#: exceptions.py:173 msgid "Authentication credentials were not provided." msgstr "Nebyly zadány přihlašovací údaje." -#: exceptions.py:99 +#: exceptions.py:179 msgid "You do not have permission to perform this action." msgstr "K této akci nemáte oprávnění." -#: exceptions.py:104 views.py:81 +#: exceptions.py:185 msgid "Not found." msgstr "Nenalezeno." -#: exceptions.py:109 +#: exceptions.py:191 +#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "Metoda \"{method}\" není povolena." -#: exceptions.py:120 +#: exceptions.py:202 msgid "Could not satisfy the request Accept header." msgstr "Nelze vyhovět požadavku v hlavičce Accept." -#: exceptions.py:132 +#: exceptions.py:212 +#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "Nepodporovaný media type \"{media_type}\" v požadavku." -#: exceptions.py:145 +#: exceptions.py:223 msgid "Request was throttled." msgstr "Požadavek byl limitován kvůli omezení počtu požadavků za časovou periodu." -#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 -#: validators.py:181 +#: exceptions.py:224 +#, python-brace-format +msgid "Expected available in {wait} second." +msgstr "" + +#: exceptions.py:225 +#, python-brace-format +msgid "Expected available in {wait} seconds." +msgstr "" + +#: fields.py:316 relations.py:245 relations.py:279 validators.py:90 +#: validators.py:183 msgid "This field is required." msgstr "Toto pole je vyžadováno." -#: fields.py:270 +#: fields.py:317 msgid "This field may not be null." msgstr "Toto pole nesmí být prázdné (null)." -#: fields.py:608 fields.py:639 -msgid "\"{input}\" is not a valid boolean." -msgstr "\"{input}\" nelze použít jako typ boolean." +#: fields.py:701 +msgid "Must be a valid boolean." +msgstr "" -#: fields.py:674 +#: fields.py:766 +msgid "Not a valid string." +msgstr "" + +#: fields.py:767 msgid "This field may not be blank." msgstr "Toto pole nesmí být prázdné." -#: fields.py:675 fields.py:1675 +#: fields.py:768 fields.py:1881 +#, 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ů." -#: fields.py:676 +#: fields.py:769 +#, python-brace-format msgid "Ensure this field has at least {min_length} characters." msgstr "Zkontrolujte, že toto pole obsahuje alespoň {min_length} znaků." -#: fields.py:713 +#: fields.py:816 msgid "Enter a valid email address." msgstr "Vložte platnou e-mailovou adresu." -#: fields.py:724 +#: fields.py:827 msgid "This value does not match the required pattern." msgstr "Hodnota v tomto poli neodpovídá požadovanému formátu." -#: fields.py:735 +#: fields.py:838 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:747 +#: fields.py:839 +msgid "" +"Enter a valid \"slug\" consisting of Unicode letters, numbers, underscores, " +"or hyphens." +msgstr "" + +#: fields.py:854 msgid "Enter a valid URL." msgstr "Vložte platný odkaz." -#: fields.py:760 -msgid "\"{value}\" is not a valid UUID." -msgstr "\"{value}\" není platné UUID." - -#: fields.py:796 -msgid "Enter a valid IPv4 or IPv6 address." +#: fields.py:867 +msgid "Must be a valid UUID." msgstr "" -#: fields.py:821 +#: fields.py:903 +msgid "Enter a valid IPv4 or IPv6 address." +msgstr "Vložte platnou IPv4 nebo IPv6 adresu." + +#: fields.py:931 msgid "A valid integer is required." msgstr "Je vyžadováno celé číslo." -#: fields.py:822 fields.py:857 fields.py:891 +#: fields.py:932 fields.py:969 fields.py:1005 fields.py:1366 +#, python-brace-format msgid "Ensure this value is less than or equal to {max_value}." msgstr "Zkontrolujte, že hodnota je menší nebo rovna {max_value}." -#: fields.py:823 fields.py:858 fields.py:892 +#: fields.py:933 fields.py:970 fields.py:1006 fields.py:1367 +#, python-brace-format 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:824 fields.py:859 fields.py:896 +#: fields.py:934 fields.py:971 fields.py:1010 msgid "String value too large." msgstr "Řetězec je příliš dlouhý." -#: fields.py:856 fields.py:890 +#: fields.py:968 fields.py:1004 msgid "A valid number is required." msgstr "Je vyžadováno číslo." -#: fields.py:893 +#: fields.py:1007 +#, python-brace-format 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:894 +#: fields.py:1008 +#, python-brace-format 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:895 +#: fields.py:1009 +#, python-brace-format 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:1025 +#: fields.py:1148 +#, python-brace-format 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:1026 +#: fields.py:1149 msgid "Expected a datetime but got a date." msgstr "Bylo zadáno pouze datum bez času." -#: fields.py:1103 +#: fields.py:1150 +#, python-brace-format +msgid "Invalid datetime for the timezone \"{timezone}\"." +msgstr "" + +#: fields.py:1151 +msgid "Datetime value out of range." +msgstr "" + +#: fields.py:1236 +#, 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:1104 +#: fields.py:1237 msgid "Expected a date but got a datetime." msgstr "Bylo zadáno datum a čas, místo samotného data." -#: fields.py:1170 +#: fields.py:1303 +#, 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:1232 +#: fields.py:1365 +#, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." -msgstr "" +msgstr "Trvání má nesprávný formát. Použijte jeden z následujících: {format}." -#: fields.py:1251 fields.py:1300 +#: fields.py:1399 fields.py:1456 +#, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" není platnou možností." -#: fields.py:1254 relations.py:71 relations.py:441 +#: fields.py:1402 +#, python-brace-format msgid "More than {count} items..." -msgstr "" +msgstr "Více než {count} položek..." -#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 +#: fields.py:1457 fields.py:1603 relations.py:485 serializers.py:570 +#, 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:1302 +#: fields.py:1458 msgid "This selection may not be empty." -msgstr "" +msgstr "Tento výběr by neměl být prázdný." -#: fields.py:1339 +#: fields.py:1495 +#, python-brace-format msgid "\"{input}\" is not a valid path choice." -msgstr "" +msgstr "\"{input}\" není validní cesta k souboru." -#: fields.py:1358 +#: fields.py:1514 msgid "No file was submitted." msgstr "Nebyl zaslán žádný soubor." -#: fields.py:1359 +#: fields.py:1515 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:1360 +#: fields.py:1516 msgid "No filename could be determined." msgstr "Nebylo možné zjistit jméno souboru." -#: fields.py:1361 +#: fields.py:1517 msgid "The submitted file is empty." msgstr "Zaslaný soubor je prázdný." -#: fields.py:1362 +#: fields.py:1518 +#, 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:1410 +#: fields.py:1566 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:1449 relations.py:438 serializers.py:525 +#: fields.py:1604 relations.py:486 serializers.py:571 msgid "This list may not be empty." +msgstr "Tento list by neměl být prázdný." + +#: fields.py:1605 +#, python-brace-format +msgid "Ensure this field has at least {min_length} elements." msgstr "" -#: fields.py:1502 +#: fields.py:1606 +#, python-brace-format +msgid "Ensure this field has no more than {max_length} elements." +msgstr "" + +#: fields.py:1682 +#, 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:1549 +#: fields.py:1683 +msgid "This dictionary may not be empty." +msgstr "" + +#: fields.py:1755 msgid "Value must be valid JSON." +msgstr "Hodnota musí být platná hodnota JSON." + +#: filters.py:49 templates/rest_framework/filters/search.html:2 +msgid "Search" +msgstr "Hledat" + +#: filters.py:50 +msgid "A search term." msgstr "" -#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 -msgid "Submit" +#: filters.py:180 templates/rest_framework/filters/ordering.html:3 +msgid "Ordering" +msgstr "Řazení" + +#: filters.py:181 +msgid "Which field to use when ordering the results." msgstr "" -#: filters.py:336 +#: filters.py:287 msgid "ascending" -msgstr "" +msgstr "vzestupně" -#: filters.py:337 +#: filters.py:288 msgid "descending" +msgstr "sestupně" + +#: pagination.py:174 +msgid "A page number within the paginated result set." msgstr "" -#: pagination.py:193 +#: pagination.py:179 pagination.py:372 pagination.py:590 +msgid "Number of results to return per page." +msgstr "" + +#: pagination.py:189 msgid "Invalid page." +msgstr "Nevalidní strana." + +#: pagination.py:374 +msgid "The initial index from which to return the results." msgstr "" -#: pagination.py:427 -msgid "Invalid cursor" -msgstr "Chybný kurzor." +#: pagination.py:581 +msgid "The pagination cursor value." +msgstr "" -#: relations.py:207 +#: pagination.py:583 +msgid "Invalid cursor" +msgstr "Chybný kurzor" + +#: relations.py:246 +#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Chybný primární klíč \"{pk_value}\" - objekt neexistuje." -#: relations.py:208 +#: relations.py:247 +#, 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:240 +#: relations.py:280 msgid "Invalid hyperlink - No URL match." msgstr "Chybný odkaz - nebyla nalezena žádní shoda." -#: relations.py:241 +#: relations.py:281 msgid "Invalid hyperlink - Incorrect URL match." msgstr "Chybný odkaz - byla nalezena neplatná shoda." -#: relations.py:242 +#: relations.py:282 msgid "Invalid hyperlink - Object does not exist." msgstr "Chybný odkaz - objekt neexistuje." -#: relations.py:243 +#: relations.py:283 +#, 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:401 +#: relations.py:448 +#, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "Objekt s {slug_name}={value} neexistuje." -#: relations.py:402 +#: relations.py:449 msgid "Invalid value." msgstr "Chybná hodnota." -#: serializers.py:326 +#: schemas/utils.py:32 +msgid "unique integer value" +msgstr "" + +#: schemas/utils.py:34 +msgid "UUID string" +msgstr "" + +#: schemas/utils.py:36 +msgid "unique value" +msgstr "" + +#: schemas/utils.py:38 +#, python-brace-format +msgid "A {value_type} identifying this {name}." +msgstr "" + +#: serializers.py:337 +#, 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:116 -#: templates/rest_framework/base.html:128 +#: templates/rest_framework/base.html:136 +msgid "Extra Actions" +msgstr "" + +#: templates/rest_framework/admin.html:130 +#: templates/rest_framework/base.html:150 msgid "Filters" +msgstr "Filtry" + +#: templates/rest_framework/base.html:37 +msgid "navbar" msgstr "" -#: templates/rest_framework/filters/django_filter.html:2 -#: templates/rest_framework/filters/django_filter_crispyforms.html:4 -msgid "Field filters" +#: templates/rest_framework/base.html:75 +msgid "content" msgstr "" -#: templates/rest_framework/filters/ordering.html:3 -msgid "Ordering" +#: templates/rest_framework/base.html:78 +msgid "request form" msgstr "" -#: templates/rest_framework/filters/search.html:2 -msgid "Search" +#: templates/rest_framework/base.html:157 +msgid "main content" msgstr "" -#: templates/rest_framework/horizontal/radio.html:2 -#: templates/rest_framework/inline/radio.html:2 -#: templates/rest_framework/vertical/radio.html:2 +#: templates/rest_framework/base.html:173 +msgid "request info" +msgstr "" + +#: templates/rest_framework/base.html:177 +msgid "response info" +msgstr "" + +#: templates/rest_framework/horizontal/radio.html:4 +#: templates/rest_framework/inline/radio.html:3 +#: templates/rest_framework/vertical/radio.html:3 msgid "None" -msgstr "" +msgstr "Neuvedeno" -#: templates/rest_framework/horizontal/select_multiple.html:2 -#: templates/rest_framework/inline/select_multiple.html:2 -#: templates/rest_framework/vertical/select_multiple.html:2 +#: templates/rest_framework/horizontal/select_multiple.html:4 +#: templates/rest_framework/inline/select_multiple.html:3 +#: templates/rest_framework/vertical/select_multiple.html:3 msgid "No items to select." -msgstr "" +msgstr "Žádné položky k výběru." -#: validators.py:43 +#: validators.py:39 msgid "This field must be unique." msgstr "Tato položka musí být unikátní." -#: validators.py:97 +#: validators.py:89 +#, python-brace-format msgid "The fields {field_names} must make a unique set." msgstr "Položka {field_names} musí tvořit unikátní množinu." -#: validators.py:245 +#: validators.py:171 +#, python-brace-format +msgid "Surrogate characters are not allowed: U+{code_point:X}." +msgstr "" + +#: validators.py:243 +#, python-brace-format 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:260 +#: validators.py:258 +#, python-brace-format 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:273 +#: validators.py:271 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" year." msgstr "Tato položka musí být pro rok \"{date_field}\" unikátní." -#: versioning.py:42 +#: versioning.py:40 msgid "Invalid version in \"Accept\" header." msgstr "Chybné číslo verze v hlavičce Accept." -#: versioning.py:73 +#: versioning.py:71 msgid "Invalid version in URL path." msgstr "Chybné číslo verze v odkazu." -#: versioning.py:115 +#: versioning.py:116 msgid "Invalid version in URL path. Does not match any version namespace." -msgstr "" +msgstr "Nevalidní verze v URL cestě. Neodpovídá žádnému z jmenných prostorů pro verze." -#: versioning.py:147 +#: versioning.py:148 msgid "Invalid version in hostname." msgstr "Chybné číslo verze v hostname." -#: versioning.py:169 +#: versioning.py:170 msgid "Invalid version in query parameter." msgstr "Chybné čislo verze v URL parametru." - -#: views.py:88 -msgid "Permission denied." -msgstr "" diff --git a/rest_framework/locale/da/LC_MESSAGES/django.mo b/rest_framework/locale/da/LC_MESSAGES/django.mo index 77fd7c2abbe3eda1b7b4e4862469a3970ef24175..d70bc13a51ec471f0bb2093aac13daead653e7e2 100644 GIT binary patch delta 2193 zcmYk-e@xVM9LMqZb({hkBEQZ{!7qgz5*(mFh^U7ll7OJ30#Yc-3R7;eN%BX#TpN=% z=GOJQRvR15wOy;-@{hLG)@sg{Te@tP(^+k8%?(?Bm|MB^e0}fB)@QtVd_LdfzTeO1 z^L~H6-0S_VJAN}S<8`AA6KjY9zgZlYFX0z0Gt}4y*8c zT#EN`I|j1M+Ofm)Ebi2!exwuSgOY5s{Wy$|;d$JQ3)qR3%gmZ_67~6~*oA-KBiOjy zEDr}!6FY&r{)*?vsQX>P2F!U-6J)7vbhNTA)B`5436r=Df5*qMJjX18$B-X;n_v37 zb6A1DU@2y=V6s?+eANzMEskOY-@qsE8{DF;UXh!=VK+X+c*q;SfLg&cYDFKRw(^2E z&R&`RJdA#>ccONn2TO1Sb-&XX#`mxYzeWeIV?3YEzjQJ%mv6J%R){s|AnCJS&jHj8 zMo{H3g+Y7?Yw;~4r*;uF;g#H6pGQ#Rc2un#!A9ia@pP`e3k#?juPaFZVH6$4L#PS8 zh}wZ92JlbRMDF6FcpvLwmBdcQA`?d=<4*x8ihE%@y3W z4G*El^QhvxfjTzD>{~M)#ZCAD?#7=`#a6-oGFR(E<^C9!;|wbIpI{WP;bsgmYwcWo zAD#7dhOh~zu@%2W&Dh7?I&e2?Yu`i)-7cbTbPe@@g0<;W)PkDO2y)VF7B%sAkWIF$ z*on81=a7Gg6TpQjWO6p+jX%UP#^+JjucN+r4_UOem8M@bhfph-MRwU7#Ae|={2dFyPMN}&PYI_M4jq;~|8cItOp(8d-1PHYjVw>Ab|5Do2 zdI{A?m{65JK&W<_i4KB)8E&zH^$`aM9eW)~x2YgBSWDC-W;2Tu-(^Npp{%`#1KbTwx~ZFL<#8=bmM&Gik5WH4CPe|U0ibi(PGI2wEYJx+ZUqZ`2`98QbvjfYNTo{p1BumTt*OzniWFKvTaYRjx1C|L>~@yyPHTji z4aOIEs%a1vqKSzRBTsCiNW_p3O*GNOXu<+Jl~w5)4&(kk$`3&O%JnWBO!64%ksI9&{kNj%|Ii=YfD^cSn zR1pneBOXE3z;rU=TGvfSUMmwD4?- zP6eGSSdTYwJxAe1a?R2C7DKxY&-Xuoa`o2{h+XsZHY(co|jwx3B{%Dzg(m zh+7$7K&Adqq?l7?rIr1`M%056sAKmQYGPNBqipV=R&XELK2yIm`yS{)J?Ip2!pwDK zac0UN=aKhij7w41n{hkt!E&Adcj>I*!l$T}+(EX_{Ej+iMSPG1vlgqd4=G?XhAh&Y zL{6%CA60CZQ4_w3s)esmwelAhU@o)KM2oPJ=bLgmdDx0rq8t$Z3uidn+GQa)xgrZRs(N5wFX`FIm&;%(Ff?qVla zvOi%QLVf=wDl^~s{)##c#iU7@S%|gRgj&!c-#E@-yhr=5YSha^fB2wricCMD^rP%L6wL-Bab3Awcsg@s!y0>`*G>iqw%-Mf3b z(>n_9=M_0I+d349c}^mk?kcX#FWKcJMk2{%B<@IC9u&kGS^ea5PyPPlVIomzB;~;96cJ77N*4W;MyEHFoV>!j4Q# zFQ_7dOCK)FNm!9+)Uh1T3cnPyBVo_VEUji?b$(I*wM$_~YfCukfr`QWIURO5o0u6R7= diff --git a/rest_framework/locale/da/LC_MESSAGES/django.po b/rest_framework/locale/da/LC_MESSAGES/django.po index 900695649..574066f2a 100644 --- a/rest_framework/locale/da/LC_MESSAGES/django.po +++ b/rest_framework/locale/da/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-07-12 16:13+0100\n" -"PO-Revision-Date: 2017-08-03 14:58+0000\n" -"Last-Translator: Mads Jensen \n" +"POT-Creation-Date: 2020-10-13 21:45+0200\n" +"PO-Revision-Date: 2020-10-13 19:45+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" "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:73 +#: authentication.py:70 msgid "Invalid basic header. No credentials provided." msgstr "Ugyldig basic header. Ingen legitimation angivet." -#: authentication.py:76 +#: authentication.py:73 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "Ugyldig basic header. Legitimationsstrenge må ikke indeholde mellemrum." -#: authentication.py:82 +#: authentication.py:83 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Ugyldig basic header. Legitimationen er ikke base64 encoded på korrekt vis." -#: authentication.py:99 +#: authentication.py:101 msgid "Invalid username/password." msgstr "Ugyldigt brugernavn/kodeord." -#: authentication.py:102 authentication.py:198 +#: authentication.py:104 authentication.py:206 msgid "User inactive or deleted." msgstr "Inaktiv eller slettet bruger." -#: authentication.py:176 +#: authentication.py:184 msgid "Invalid token header. No credentials provided." msgstr "Ugyldig token header." -#: authentication.py:179 +#: authentication.py:187 msgid "Invalid token header. Token string should not contain spaces." msgstr "Ugyldig token header. Token-strenge må ikke indeholde mellemrum." -#: authentication.py:185 +#: authentication.py:193 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:195 +#: authentication.py:203 msgid "Invalid token." msgstr "Ugyldigt token." @@ -60,382 +60,515 @@ msgstr "Ugyldigt token." msgid "Auth Token" msgstr "" -#: authtoken/models.py:15 +#: authtoken/models.py:13 msgid "Key" msgstr "Nøgle" -#: authtoken/models.py:18 +#: authtoken/models.py:16 msgid "User" msgstr "Bruger" -#: authtoken/models.py:20 +#: authtoken/models.py:18 msgid "Created" msgstr "Oprettet" -#: authtoken/models.py:29 +#: authtoken/models.py:27 authtoken/serializers.py:19 msgid "Token" msgstr "Token" -#: authtoken/models.py:30 +#: authtoken/models.py:28 msgid "Tokens" msgstr "Tokens" -#: authtoken/serializers.py:8 +#: authtoken/serializers.py:9 msgid "Username" msgstr "Brugernavn" -#: authtoken/serializers.py:9 +#: authtoken/serializers.py:13 msgid "Password" msgstr "Kodeord" -#: authtoken/serializers.py:20 -msgid "User account is disabled." -msgstr "Brugerkontoen er deaktiveret." - -#: authtoken/serializers.py:23 +#: authtoken/serializers.py:35 msgid "Unable to log in with provided credentials." msgstr "Kunne ikke logge ind med den angivne legitimation." -#: authtoken/serializers.py:26 +#: authtoken/serializers.py:38 msgid "Must include \"username\" and \"password\"." msgstr "Skal indeholde \"username\" og \"password\"." -#: exceptions.py:49 +#: exceptions.py:102 msgid "A server error occurred." msgstr "Der er sket en serverfejl." -#: exceptions.py:84 +#: exceptions.py:142 +msgid "Invalid input." +msgstr "" + +#: exceptions.py:161 msgid "Malformed request." msgstr "Misdannet forespørgsel." -#: exceptions.py:89 +#: exceptions.py:167 msgid "Incorrect authentication credentials." msgstr "Ugyldig legitimation til autentificering." -#: exceptions.py:94 +#: exceptions.py:173 msgid "Authentication credentials were not provided." msgstr "Legitimation til autentificering blev ikke angivet." -#: exceptions.py:99 +#: exceptions.py:179 msgid "You do not have permission to perform this action." msgstr "Du har ikke lov til at udføre denne handling." -#: exceptions.py:104 views.py:81 +#: exceptions.py:185 msgid "Not found." msgstr "Ikke fundet." -#: exceptions.py:109 +#: exceptions.py:191 +#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "Metoden \"{method}\" er ikke tilladt." -#: exceptions.py:120 +#: exceptions.py:202 msgid "Could not satisfy the request Accept header." msgstr "Kunne ikke efterkomme forespørgslens Accept header." -#: exceptions.py:132 +#: exceptions.py:212 +#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "Forespørgslens media type, \"{media_type}\", er ikke understøttet." -#: exceptions.py:145 +#: exceptions.py:223 msgid "Request was throttled." msgstr "Forespørgslen blev neddroslet." -#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 -#: validators.py:181 +#: exceptions.py:224 +#, python-brace-format +msgid "Expected available in {wait} second." +msgstr "" + +#: exceptions.py:225 +#, python-brace-format +msgid "Expected available in {wait} seconds." +msgstr "" + +#: fields.py:316 relations.py:245 relations.py:279 validators.py:90 +#: validators.py:183 msgid "This field is required." msgstr "Dette felt er påkrævet." -#: fields.py:270 +#: fields.py:317 msgid "This field may not be null." msgstr "Dette felt må ikke være null." -#: fields.py:608 fields.py:639 -msgid "\"{input}\" is not a valid boolean." -msgstr "\"{input}\" er ikke en tilladt boolsk værdi." +#: fields.py:701 +msgid "Must be a valid boolean." +msgstr "" -#: fields.py:674 +#: fields.py:766 +msgid "Not a valid string." +msgstr "" + +#: fields.py:767 msgid "This field may not be blank." msgstr "Dette felt må ikke være tomt." -#: fields.py:675 fields.py:1675 +#: fields.py:768 fields.py:1881 +#, 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." -#: fields.py:676 +#: fields.py:769 +#, python-brace-format msgid "Ensure this field has at least {min_length} characters." msgstr "Tjek at dette felt indeholder mindst {min_length} tegn." -#: fields.py:713 +#: fields.py:816 msgid "Enter a valid email address." msgstr "Angiv en gyldig e-mailadresse." -#: fields.py:724 +#: fields.py:827 msgid "This value does not match the required pattern." msgstr "Denne værdi passer ikke med det påkrævede mønster." -#: fields.py:735 +#: fields.py:838 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:747 +#: fields.py:839 +msgid "" +"Enter a valid \"slug\" consisting of Unicode letters, numbers, underscores, " +"or hyphens." +msgstr "" + +#: fields.py:854 msgid "Enter a valid URL." msgstr "Indtast en gyldig URL." -#: fields.py:760 -msgid "\"{value}\" is not a valid UUID." -msgstr "\"{value}\" er ikke et gyldigt UUID." +#: fields.py:867 +msgid "Must be a valid UUID." +msgstr "" -#: fields.py:796 +#: fields.py:903 msgid "Enter a valid IPv4 or IPv6 address." msgstr "Indtast en gyldig IPv4 eller IPv6 adresse." -#: fields.py:821 +#: fields.py:931 msgid "A valid integer is required." msgstr "Et gyldigt heltal er påkrævet." -#: fields.py:822 fields.py:857 fields.py:891 +#: fields.py:932 fields.py:969 fields.py:1005 fields.py:1366 +#, python-brace-format 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:823 fields.py:858 fields.py:892 +#: fields.py:933 fields.py:970 fields.py:1006 fields.py:1367 +#, python-brace-format 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:824 fields.py:859 fields.py:896 +#: fields.py:934 fields.py:971 fields.py:1010 msgid "String value too large." msgstr "Strengværdien er for stor." -#: fields.py:856 fields.py:890 +#: fields.py:968 fields.py:1004 msgid "A valid number is required." msgstr "Et gyldigt tal er påkrævet." -#: fields.py:893 +#: fields.py:1007 +#, python-brace-format 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:894 +#: fields.py:1008 +#, python-brace-format 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:895 +#: fields.py:1009 +#, python-brace-format 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:1025 +#: fields.py:1148 +#, python-brace-format 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:1026 +#: fields.py:1149 msgid "Expected a datetime but got a date." msgstr "Forventede en datotid, men fik en dato." -#: fields.py:1103 +#: fields.py:1150 +#, python-brace-format +msgid "Invalid datetime for the timezone \"{timezone}\"." +msgstr "" + +#: fields.py:1151 +msgid "Datetime value out of range." +msgstr "" + +#: fields.py:1236 +#, 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:1104 +#: fields.py:1237 msgid "Expected a date but got a datetime." msgstr "Forventede en dato men fik en datotid." -#: fields.py:1170 +#: fields.py:1303 +#, 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:1232 +#: fields.py:1365 +#, 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:1251 fields.py:1300 +#: fields.py:1399 fields.py:1456 +#, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" er ikke et gyldigt valg." -#: fields.py:1254 relations.py:71 relations.py:441 +#: fields.py:1402 +#, python-brace-format msgid "More than {count} items..." msgstr "Flere end {count} objekter..." -#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 +#: fields.py:1457 fields.py:1603 relations.py:485 serializers.py:570 +#, 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:1302 +#: fields.py:1458 msgid "This selection may not be empty." msgstr "Dette valg kan være tomt." -#: fields.py:1339 +#: fields.py:1495 +#, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "\"{input}\" er ikke et gyldigt valg af adresse." -#: fields.py:1358 +#: fields.py:1514 msgid "No file was submitted." msgstr "Ingen medsendt fil." -#: fields.py:1359 +#: fields.py:1515 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:1360 +#: fields.py:1516 msgid "No filename could be determined." msgstr "Filnavnet kunne ikke afgøres." -#: fields.py:1361 +#: fields.py:1517 msgid "The submitted file is empty." msgstr "Den medsendte fil er tom." -#: fields.py:1362 +#: fields.py:1518 +#, 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:1410 +#: fields.py:1566 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:1449 relations.py:438 serializers.py:525 +#: fields.py:1604 relations.py:486 serializers.py:571 msgid "This list may not be empty." msgstr "Denne liste er muligvis ikke tom." -#: fields.py:1502 +#: fields.py:1605 +#, python-brace-format +msgid "Ensure this field has at least {min_length} elements." +msgstr "" + +#: fields.py:1606 +#, python-brace-format +msgid "Ensure this field has no more than {max_length} elements." +msgstr "" + +#: fields.py:1682 +#, 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:1549 +#: fields.py:1683 +msgid "This dictionary may not be empty." +msgstr "" + +#: fields.py:1755 msgid "Value must be valid JSON." msgstr "Værdi skal være gyldig JSON." -#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 -msgid "Submit" -msgstr "Indsend." +#: filters.py:49 templates/rest_framework/filters/search.html:2 +msgid "Search" +msgstr "Søg" -#: filters.py:336 +#: filters.py:50 +msgid "A search term." +msgstr "" + +#: filters.py:180 templates/rest_framework/filters/ordering.html:3 +msgid "Ordering" +msgstr "Sortering" + +#: filters.py:181 +msgid "Which field to use when ordering the results." +msgstr "" + +#: filters.py:287 msgid "ascending" msgstr "stigende" -#: filters.py:337 +#: filters.py:288 msgid "descending" msgstr "faldende" -#: pagination.py:193 +#: pagination.py:174 +msgid "A page number within the paginated result set." +msgstr "" + +#: pagination.py:179 pagination.py:372 pagination.py:590 +msgid "Number of results to return per page." +msgstr "" + +#: pagination.py:189 msgid "Invalid page." msgstr "Ugyldig side" -#: pagination.py:427 +#: pagination.py:374 +msgid "The initial index from which to return the results." +msgstr "" + +#: pagination.py:581 +msgid "The pagination cursor value." +msgstr "" + +#: pagination.py:583 msgid "Invalid cursor" msgstr "Ugyldig cursor" -#: relations.py:207 +#: relations.py:246 +#, 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 +#: relations.py:247 +#, 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:240 +#: relations.py:280 msgid "Invalid hyperlink - No URL match." msgstr "Ugyldigt hyperlink - intet URL match." -#: relations.py:241 +#: relations.py:281 msgid "Invalid hyperlink - Incorrect URL match." msgstr "Ugyldigt hyperlink - forkert URL match." -#: relations.py:242 +#: relations.py:282 msgid "Invalid hyperlink - Object does not exist." msgstr "Ugyldigt hyperlink - objektet findes ikke." -#: relations.py:243 +#: relations.py:283 +#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Forkert type. Forventede en URL-streng, fik {data_type}." -#: relations.py:401 +#: relations.py:448 +#, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "Object med {slug_name}={value} findes ikke." -#: relations.py:402 +#: relations.py:449 msgid "Invalid value." msgstr "Ugyldig værdi." -#: serializers.py:326 +#: schemas/utils.py:32 +msgid "unique integer value" +msgstr "" + +#: schemas/utils.py:34 +msgid "UUID string" +msgstr "" + +#: schemas/utils.py:36 +msgid "unique value" +msgstr "" + +#: schemas/utils.py:38 +#, python-brace-format +msgid "A {value_type} identifying this {name}." +msgstr "" + +#: serializers.py:337 +#, 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:116 -#: templates/rest_framework/base.html:128 +#: templates/rest_framework/base.html:136 +msgid "Extra Actions" +msgstr "" + +#: templates/rest_framework/admin.html:130 +#: templates/rest_framework/base.html:150 msgid "Filters" msgstr "Filtre" -#: templates/rest_framework/filters/django_filter.html:2 -#: templates/rest_framework/filters/django_filter_crispyforms.html:4 -msgid "Field filters" -msgstr "Søgefiltre" +#: templates/rest_framework/base.html:37 +msgid "navbar" +msgstr "" -#: templates/rest_framework/filters/ordering.html:3 -msgid "Ordering" -msgstr "Sortering" +#: templates/rest_framework/base.html:75 +msgid "content" +msgstr "" -#: templates/rest_framework/filters/search.html:2 -msgid "Search" -msgstr "Søg" +#: templates/rest_framework/base.html:78 +msgid "request form" +msgstr "" -#: templates/rest_framework/horizontal/radio.html:2 -#: templates/rest_framework/inline/radio.html:2 -#: templates/rest_framework/vertical/radio.html:2 +#: templates/rest_framework/base.html:157 +msgid "main content" +msgstr "" + +#: templates/rest_framework/base.html:173 +msgid "request info" +msgstr "" + +#: templates/rest_framework/base.html:177 +msgid "response info" +msgstr "" + +#: templates/rest_framework/horizontal/radio.html:4 +#: templates/rest_framework/inline/radio.html:3 +#: templates/rest_framework/vertical/radio.html:3 msgid "None" msgstr "Ingen" -#: templates/rest_framework/horizontal/select_multiple.html:2 -#: templates/rest_framework/inline/select_multiple.html:2 -#: templates/rest_framework/vertical/select_multiple.html:2 +#: templates/rest_framework/horizontal/select_multiple.html:4 +#: templates/rest_framework/inline/select_multiple.html:3 +#: templates/rest_framework/vertical/select_multiple.html:3 msgid "No items to select." msgstr "Intet at vælge." -#: validators.py:43 +#: validators.py:39 msgid "This field must be unique." msgstr "Dette felt skal være unikt." -#: validators.py:97 +#: validators.py:89 +#, python-brace-format msgid "The fields {field_names} must make a unique set." msgstr "Felterne {field_names} skal udgøre et unikt sæt." -#: validators.py:245 +#: validators.py:171 +#, python-brace-format +msgid "Surrogate characters are not allowed: U+{code_point:X}." +msgstr "" + +#: validators.py:243 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" date." msgstr "Dette felt skal være unikt for \"{date_field}\"-datoen." -#: validators.py:260 +#: validators.py:258 +#, python-brace-format 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:273 +#: validators.py:271 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" year." msgstr "Dette felt skal være unikt for \"{date_field}\"-året." -#: versioning.py:42 +#: versioning.py:40 msgid "Invalid version in \"Accept\" header." msgstr "Ugyldig version i \"Accept\" headeren." -#: versioning.py:73 +#: versioning.py:71 msgid "Invalid version in URL path." msgstr "Ugyldig version i URL-stien." -#: versioning.py:115 +#: versioning.py:116 msgid "Invalid version in URL path. Does not match any version namespace." msgstr "Ugyldig version in URLen. Den stemmer ikke overens med nogen versionsnumre." -#: versioning.py:147 +#: versioning.py:148 msgid "Invalid version in hostname." msgstr "Ugyldig version i hostname." -#: versioning.py:169 +#: versioning.py:170 msgid "Invalid version in query parameter." msgstr "Ugyldig version i forespørgselsparameteren." - -#: views.py:88 -msgid "Permission denied." -msgstr "Adgang nægtet." diff --git a/rest_framework/locale/de/LC_MESSAGES/django.mo b/rest_framework/locale/de/LC_MESSAGES/django.mo index 0042572ef9e2c518221cf6536bbbb57b11626fb4..98688039789f0300dd6aed554c84050365f9991c 100644 GIT binary patch delta 2243 zcmYk-drXye9LMo5aq)npDFU5PIZ((&I33i3aDY7CLr8=GB`Y{fmy~(r5?SU>3(?g^ zYo0M{6StakU0j!)+FDzGgl+Xlx>j?e&6(L)ZLZl||D-E>f1c;D^&8*w`u(2soagyn zzP}&i-8VWCmlkGB8l|6DtVlN-lUaOFDtu-Eti&?hf_LM7)cvnu5uU~zoW>eFht+r! z=U_#)**Xm2CLDH6*ymI>b0LjiN3jKa@Ks!mKVu{M=bE)*H%9O+)b|&$4HxB_-HS0? zh~uaZzTsW})bmHw^Zv%LCCnP`bbA;_jqo|t3#PChXK)QJm}j;gJ1~fo$e(@1hwl3U zD=>GySqX-*3b!MVu$M7}uVWCu#1`Ife^6=0$X)IO58yqtk9zI5Q6u{pHKGfssl4vB z!wcN+J29Q>qo^5p0hi(g>Un3d9KXf_yoQMYl`QVg!*a~PMr774iuYqHvW#}n^DycG z6R0#fg@yP&hVU$EN&iH3xQU1B`(9Lg5S25p4XLw6jTlEkzKu#+|4&A3=RTh5Fqz(li6%WMt%#m=Cw=Qj^10t*8f|K;8H&@@Ic}?V?imV5vdgVLMSBKj^imQQ3V3wFEh=la?SK^_(hH zF12Ab?!i*+|4Hw{XUHIJ7Bv$YEa-fkiyA=@>cOq3B7+$mw$nK+7B_#$c- zjA1i=hY35qN0&cptAK0a;n-ds1aYoG)yOyG+OW5Wiu6xT1BUv zc8@yMNT?Gk4TPSreCa3p2)&1rFb*-NXhd4~M~NQiiu*yQos3?E>P&!8d4$lcbr8yQ zCe4}dR#eddR30XLPR*TFPHCrTH&ko=|6kV9==CnFL}u98hFVW0lZs9_Cd3{iGKdJF zj4vRR$STU4PNJJ2o$PT!+n8PMln42Y61jSR2~kC;kSosqS6yp)yJ!n42{#eN-o+YJ zM(_06mDujpweB1NPTArq^p9sfp+rxenYDc_Rh zMPD#gnVpuIs-L$wGx=m*UFuX`d3tiT;6lraP)#j=D+9F+kyYX4AxchLYZ^H9tyM%?TQaR`+T73K-{fG_YUlfj}F9wPsE=|{Zp8imTdN~P966L Yvr^v`|CE_LTNX+AmYq*eUaw643q5Y%YybcN delta 2567 zcmZYATWnNC9LMo#x0i*=Z3}Hd+a61ia%pXWvb9`#p-@UI6lg&T0^9D{?Xk-)+1&yG zVV^J(h*2A&Viiq{iSdDlVijXz0QJQniAG~$qGBLMB|M-{1f$>I*+YDA!oQ!H*>jos zpPAv_)|3629|L)34JAT6LiG5IIfc&_@Q3o2-2;f5@0- z96NpUd=p^shl>qK!ZLbbXl715;EM;tN=UlW5^JEXF&S zhq*NPDy9%0#{jYnOuJ_{a;fPHD;7UA=`o>qh_C3@D8s=oL>p_e5FlvCO(9HTP!e*=|9I(A_c zHPg#D7r*fQ88y>;UfaiXmeDRp*01SBWo7_h%Q41Az2G0VMl~+sVfs|PScPfST6iTx zMT_GS>cU^pO)=AAawdQ)aUp8k?8Pk@!TmUieOOAG`Z0!^@d`eLvq+=X(lhuZUc~*F zTW-vH%nVWKpz0pKMY;y=Tu$OQ(PI~@{+Gh2Y*=>6qHSo_+DZY+m+kA&@ zcpJ4F>a6TQqPR)>{{t#Peo#KNc$%;kyHP1VgW46JqQ2=JWMP{M^4N&=sQV+R8NP`; z*xW{47bNf8V!BZ65v;}ISjqd%`&2g2@ul0rAegRp!!p#222h{EMm^{#YEh2kQv3*c zm$~J&{Tvn~$26ic(T6i|H);YSsOP?pe%^21rNRa<7m)0mtC){BP$~Qsb;IAd7X6QL zR$wP;K<82SUG~~PdFC*S_4Lp8bg+Z=1+?%l%;*7gSb>^B5S7va)S`M3^YIoI;2)?} zeHYhY#Ui#E?m<6(j>^neXyNb3DQt=sXERcUTFgN#!uVqHubCaCBL_9BWL|QBew&E)^}1J;Z*Z zlhCYnVyWnC*JqhVY#+)y-|ICRaGh7TP>W?Z zkxN7frFI9Q#iimSN{JR?7ooy`8SY{YVVEc+RP>p(`X3aVN*TqcV@~|wX!>}S<)o~5B5j4NL!p=xwgwZ4m>r7Ojn()!mRB94 zbJYI-RsH>49TRcCFTco+g{_DaOWVoRM0{FhexTP*9&l1AClR;8cHFVUbz^4&!Gi6h zg9n`S#FapeZ+2*CC@~sO>(yZ=6&j4`qMLJmnBEYqt#7KWUv4$5Xl`s8yH-+K*)uv4 zN?GkrYG^nS8MKp8J87*xV7DGlB#+d^oC$wvan4*Tdi9f7+R<-2L&M2o+exPm+sSm@ zn7?dOp*M@MnPnw;?!bG?>I%QWVL_D2f, 2015 -# datKater , 2017 +# 5a85a00218ad0559ac6870a4179f4dbc, 2017 # Lukas Bischofberger , 2017 # Mads Jensen , 2015 # Niklas P , 2015-2016 @@ -15,9 +15,9 @@ 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: 2017-08-03 14:58+0000\n" -"Last-Translator: Lukas Bischofberger \n" +"POT-Creation-Date: 2020-10-13 21:45+0200\n" +"PO-Revision-Date: 2020-10-13 19:45+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" @@ -25,40 +25,40 @@ msgstr "" "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:73 +#: authentication.py:70 msgid "Invalid basic header. No credentials provided." msgstr "Ungültiger basic header. Keine Zugangsdaten angegeben." -#: authentication.py:76 +#: authentication.py:73 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "Ungültiger basic header. Zugangsdaten sollen keine Leerzeichen enthalten." -#: authentication.py:82 +#: authentication.py:83 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Ungültiger basic header. Zugangsdaten sind nicht korrekt mit base64 kodiert." -#: authentication.py:99 +#: authentication.py:101 msgid "Invalid username/password." msgstr "Ungültiger Benutzername/Passwort" -#: authentication.py:102 authentication.py:198 +#: authentication.py:104 authentication.py:206 msgid "User inactive or deleted." msgstr "Benutzer inaktiv oder gelöscht." -#: authentication.py:176 +#: authentication.py:184 msgid "Invalid token header. No credentials provided." msgstr "Ungültiger token header. Keine Zugangsdaten angegeben." -#: authentication.py:179 +#: authentication.py:187 msgid "Invalid token header. Token string should not contain spaces." msgstr "Ungültiger token header. Zugangsdaten sollen keine Leerzeichen enthalten." -#: authentication.py:185 +#: authentication.py:193 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:195 +#: authentication.py:203 msgid "Invalid token." msgstr "Ungültiges Token" @@ -66,382 +66,515 @@ msgstr "Ungültiges Token" msgid "Auth Token" msgstr "Auth Token" -#: authtoken/models.py:15 +#: authtoken/models.py:13 msgid "Key" msgstr "Schlüssel" -#: authtoken/models.py:18 +#: authtoken/models.py:16 msgid "User" msgstr "Benutzer" -#: authtoken/models.py:20 +#: authtoken/models.py:18 msgid "Created" msgstr "Erzeugt" -#: authtoken/models.py:29 +#: authtoken/models.py:27 authtoken/serializers.py:19 msgid "Token" msgstr "Token" -#: authtoken/models.py:30 +#: authtoken/models.py:28 msgid "Tokens" msgstr "Tokens" -#: authtoken/serializers.py:8 +#: authtoken/serializers.py:9 msgid "Username" msgstr "Benutzername" -#: authtoken/serializers.py:9 +#: authtoken/serializers.py:13 msgid "Password" msgstr "Passwort" -#: authtoken/serializers.py:20 -msgid "User account is disabled." -msgstr "Benutzerkonto ist gesperrt." - -#: authtoken/serializers.py:23 +#: authtoken/serializers.py:35 msgid "Unable to log in with provided credentials." msgstr "Die angegebenen Zugangsdaten stimmen nicht." -#: authtoken/serializers.py:26 +#: authtoken/serializers.py:38 msgid "Must include \"username\" and \"password\"." msgstr "\"username\" und \"password\" sind erforderlich." -#: exceptions.py:49 +#: exceptions.py:102 msgid "A server error occurred." msgstr "Ein Serverfehler ist aufgetreten." -#: exceptions.py:84 +#: exceptions.py:142 +msgid "Invalid input." +msgstr "" + +#: exceptions.py:161 msgid "Malformed request." msgstr "Fehlerhafte Anfrage." -#: exceptions.py:89 +#: exceptions.py:167 msgid "Incorrect authentication credentials." msgstr "Falsche Anmeldedaten." -#: exceptions.py:94 +#: exceptions.py:173 msgid "Authentication credentials were not provided." msgstr "Anmeldedaten fehlen." -#: exceptions.py:99 +#: exceptions.py:179 msgid "You do not have permission to perform this action." msgstr "Sie sind nicht berechtigt diese Aktion durchzuführen." -#: exceptions.py:104 views.py:81 +#: exceptions.py:185 msgid "Not found." msgstr "Nicht gefunden." -#: exceptions.py:109 +#: exceptions.py:191 +#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "Methode \"{method}\" nicht erlaubt." -#: exceptions.py:120 +#: exceptions.py:202 msgid "Could not satisfy the request Accept header." msgstr "Kann die Accept Kopfzeile der Anfrage nicht erfüllen." -#: exceptions.py:132 +#: exceptions.py:212 +#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "Nicht unterstützter Medientyp \"{media_type}\" in der Anfrage." -#: exceptions.py:145 +#: exceptions.py:223 msgid "Request was throttled." msgstr "Die Anfrage wurde gedrosselt." -#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 -#: validators.py:181 +#: exceptions.py:224 +#, python-brace-format +msgid "Expected available in {wait} second." +msgstr "" + +#: exceptions.py:225 +#, python-brace-format +msgid "Expected available in {wait} seconds." +msgstr "" + +#: fields.py:316 relations.py:245 relations.py:279 validators.py:90 +#: validators.py:183 msgid "This field is required." msgstr "Dieses Feld ist erforderlich." -#: fields.py:270 +#: fields.py:317 msgid "This field may not be null." msgstr "Dieses Feld darf nicht null sein." -#: fields.py:608 fields.py:639 -msgid "\"{input}\" is not a valid boolean." -msgstr "\"{input}\" ist kein gültiger Wahrheitswert." +#: fields.py:701 +msgid "Must be a valid boolean." +msgstr "" -#: fields.py:674 +#: fields.py:766 +msgid "Not a valid string." +msgstr "" + +#: fields.py:767 msgid "This field may not be blank." msgstr "Dieses Feld darf nicht leer sein." -#: fields.py:675 fields.py:1675 +#: fields.py:768 fields.py:1881 +#, 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." -#: fields.py:676 +#: fields.py:769 +#, python-brace-format msgid "Ensure this field has at least {min_length} characters." msgstr "Stelle sicher, dass dieses Feld mindestens {min_length} Zeichen lang ist." -#: fields.py:713 +#: fields.py:816 msgid "Enter a valid email address." msgstr "Gib eine gültige E-Mail Adresse an." -#: fields.py:724 +#: fields.py:827 msgid "This value does not match the required pattern." msgstr "Dieser Wert passt nicht zu dem erforderlichen Muster." -#: fields.py:735 +#: fields.py:838 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:747 +#: fields.py:839 +msgid "" +"Enter a valid \"slug\" consisting of Unicode letters, numbers, underscores, " +"or hyphens." +msgstr "" + +#: fields.py:854 msgid "Enter a valid URL." msgstr "Gib eine gültige URL ein." -#: fields.py:760 -msgid "\"{value}\" is not a valid UUID." -msgstr "\"{value}\" ist keine gültige UUID." +#: fields.py:867 +msgid "Must be a valid UUID." +msgstr "" -#: fields.py:796 +#: fields.py:903 msgid "Enter a valid IPv4 or IPv6 address." msgstr "Geben Sie eine gültige IPv4 oder IPv6 Adresse an" -#: fields.py:821 +#: fields.py:931 msgid "A valid integer is required." msgstr "Eine gültige Ganzzahl ist erforderlich." -#: fields.py:822 fields.py:857 fields.py:891 +#: fields.py:932 fields.py:969 fields.py:1005 fields.py:1366 +#, python-brace-format 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:823 fields.py:858 fields.py:892 +#: fields.py:933 fields.py:970 fields.py:1006 fields.py:1367 +#, python-brace-format 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:824 fields.py:859 fields.py:896 +#: fields.py:934 fields.py:971 fields.py:1010 msgid "String value too large." msgstr "Zeichenkette zu lang." -#: fields.py:856 fields.py:890 +#: fields.py:968 fields.py:1004 msgid "A valid number is required." msgstr "Eine gültige Zahl ist erforderlich." -#: fields.py:893 +#: fields.py:1007 +#, python-brace-format 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:894 +#: fields.py:1008 +#, python-brace-format 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:895 +#: fields.py:1009 +#, python-brace-format 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:1025 +#: fields.py:1148 +#, python-brace-format 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:1026 +#: fields.py:1149 msgid "Expected a datetime but got a date." msgstr "Erwarte eine Datums- und Zeitangabe, erhielt aber ein Datum." -#: fields.py:1103 +#: fields.py:1150 +#, python-brace-format +msgid "Invalid datetime for the timezone \"{timezone}\"." +msgstr "" + +#: fields.py:1151 +msgid "Datetime value out of range." +msgstr "" + +#: fields.py:1236 +#, 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:1104 +#: fields.py:1237 msgid "Expected a date but got a datetime." msgstr "Erwarte ein Datum, erhielt aber eine Datums- und Zeitangabe." -#: fields.py:1170 +#: fields.py:1303 +#, 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:1232 +#: fields.py:1365 +#, 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:1251 fields.py:1300 +#: fields.py:1399 fields.py:1456 +#, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" ist keine gültige Option." -#: fields.py:1254 relations.py:71 relations.py:441 +#: fields.py:1402 +#, python-brace-format msgid "More than {count} items..." msgstr "Mehr als {count} Ergebnisse" -#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 +#: fields.py:1457 fields.py:1603 relations.py:485 serializers.py:570 +#, 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:1302 +#: fields.py:1458 msgid "This selection may not be empty." msgstr "Diese Auswahl darf nicht leer sein" -#: fields.py:1339 +#: fields.py:1495 +#, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "\"{input}\" ist ein ungültiger Pfad." -#: fields.py:1358 +#: fields.py:1514 msgid "No file was submitted." msgstr "Es wurde keine Datei übermittelt." -#: fields.py:1359 +#: fields.py:1515 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:1360 +#: fields.py:1516 msgid "No filename could be determined." msgstr "Der Dateiname konnte nicht ermittelt werden." -#: fields.py:1361 +#: fields.py:1517 msgid "The submitted file is empty." msgstr "Die übermittelte Datei ist leer." -#: fields.py:1362 +#: fields.py:1518 +#, 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:1410 +#: fields.py:1566 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:1449 relations.py:438 serializers.py:525 +#: fields.py:1604 relations.py:486 serializers.py:571 msgid "This list may not be empty." msgstr "Diese Liste darf nicht leer sein." -#: fields.py:1502 +#: fields.py:1605 +#, python-brace-format +msgid "Ensure this field has at least {min_length} elements." +msgstr "" + +#: fields.py:1606 +#, python-brace-format +msgid "Ensure this field has no more than {max_length} elements." +msgstr "" + +#: fields.py:1682 +#, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "Erwartete ein Dictionary mit Elementen, erhielt aber den Typ \"{input_type}\"." -#: fields.py:1549 +#: fields.py:1683 +msgid "This dictionary may not be empty." +msgstr "" + +#: fields.py:1755 msgid "Value must be valid JSON." msgstr "Wert muss gültiges JSON sein." -#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 -msgid "Submit" -msgstr "Abschicken" +#: filters.py:49 templates/rest_framework/filters/search.html:2 +msgid "Search" +msgstr "Suche" -#: filters.py:336 +#: filters.py:50 +msgid "A search term." +msgstr "" + +#: filters.py:180 templates/rest_framework/filters/ordering.html:3 +msgid "Ordering" +msgstr "Sortierung" + +#: filters.py:181 +msgid "Which field to use when ordering the results." +msgstr "" + +#: filters.py:287 msgid "ascending" msgstr "Aufsteigend" -#: filters.py:337 +#: filters.py:288 msgid "descending" msgstr "Absteigend" -#: pagination.py:193 +#: pagination.py:174 +msgid "A page number within the paginated result set." +msgstr "" + +#: pagination.py:179 pagination.py:372 pagination.py:590 +msgid "Number of results to return per page." +msgstr "" + +#: pagination.py:189 msgid "Invalid page." msgstr "Ungültige Seite." -#: pagination.py:427 +#: pagination.py:374 +msgid "The initial index from which to return the results." +msgstr "" + +#: pagination.py:581 +msgid "The pagination cursor value." +msgstr "" + +#: pagination.py:583 msgid "Invalid cursor" msgstr "Ungültiger Zeiger" -#: relations.py:207 +#: relations.py:246 +#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Ungültiger pk \"{pk_value}\" - Object existiert nicht." -#: relations.py:208 +#: relations.py:247 +#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Falscher Typ. Erwarte pk Wert, erhielt aber {data_type}." -#: relations.py:240 +#: relations.py:280 msgid "Invalid hyperlink - No URL match." msgstr "Ungültiger Hyperlink - entspricht keiner URL." -#: relations.py:241 +#: relations.py:281 msgid "Invalid hyperlink - Incorrect URL match." msgstr "Ungültiger Hyperlink - URL stimmt nicht überein." -#: relations.py:242 +#: relations.py:282 msgid "Invalid hyperlink - Object does not exist." msgstr "Ungültiger Hyperlink - Objekt existiert nicht." -#: relations.py:243 +#: relations.py:283 +#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Falscher Typ. Erwarte URL Zeichenkette, erhielt aber {data_type}." -#: relations.py:401 +#: relations.py:448 +#, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "Objekt mit {slug_name}={value} existiert nicht." -#: relations.py:402 +#: relations.py:449 msgid "Invalid value." msgstr "Ungültiger Wert." -#: serializers.py:326 +#: schemas/utils.py:32 +msgid "unique integer value" +msgstr "" + +#: schemas/utils.py:34 +msgid "UUID string" +msgstr "" + +#: schemas/utils.py:36 +msgid "unique value" +msgstr "" + +#: schemas/utils.py:38 +#, python-brace-format +msgid "A {value_type} identifying this {name}." +msgstr "" + +#: serializers.py:337 +#, 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:116 -#: templates/rest_framework/base.html:128 +#: templates/rest_framework/base.html:136 +msgid "Extra Actions" +msgstr "" + +#: templates/rest_framework/admin.html:130 +#: templates/rest_framework/base.html:150 msgid "Filters" msgstr "Filter" -#: templates/rest_framework/filters/django_filter.html:2 -#: templates/rest_framework/filters/django_filter_crispyforms.html:4 -msgid "Field filters" -msgstr "Feldfilter" +#: templates/rest_framework/base.html:37 +msgid "navbar" +msgstr "" -#: templates/rest_framework/filters/ordering.html:3 -msgid "Ordering" -msgstr "Sortierung" +#: templates/rest_framework/base.html:75 +msgid "content" +msgstr "" -#: templates/rest_framework/filters/search.html:2 -msgid "Search" -msgstr "Suche" +#: templates/rest_framework/base.html:78 +msgid "request form" +msgstr "" -#: templates/rest_framework/horizontal/radio.html:2 -#: templates/rest_framework/inline/radio.html:2 -#: templates/rest_framework/vertical/radio.html:2 +#: templates/rest_framework/base.html:157 +msgid "main content" +msgstr "" + +#: templates/rest_framework/base.html:173 +msgid "request info" +msgstr "" + +#: templates/rest_framework/base.html:177 +msgid "response info" +msgstr "" + +#: templates/rest_framework/horizontal/radio.html:4 +#: templates/rest_framework/inline/radio.html:3 +#: templates/rest_framework/vertical/radio.html:3 msgid "None" msgstr "Nichts" -#: templates/rest_framework/horizontal/select_multiple.html:2 -#: templates/rest_framework/inline/select_multiple.html:2 -#: templates/rest_framework/vertical/select_multiple.html:2 +#: templates/rest_framework/horizontal/select_multiple.html:4 +#: templates/rest_framework/inline/select_multiple.html:3 +#: templates/rest_framework/vertical/select_multiple.html:3 msgid "No items to select." msgstr "Keine Elemente zum Auswählen." -#: validators.py:43 +#: validators.py:39 msgid "This field must be unique." msgstr "Dieses Feld muss eindeutig sein." -#: validators.py:97 +#: validators.py:89 +#, python-brace-format msgid "The fields {field_names} must make a unique set." msgstr "Die Felder {field_names} müssen eine eindeutige Menge bilden." -#: validators.py:245 +#: validators.py:171 +#, python-brace-format +msgid "Surrogate characters are not allowed: U+{code_point:X}." +msgstr "" + +#: validators.py:243 +#, python-brace-format 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:260 +#: validators.py:258 +#, python-brace-format 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:273 +#: validators.py:271 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" year." msgstr "Dieses Feld muss bezüglich des \"{date_field}\" Jahrs eindeutig sein." -#: versioning.py:42 +#: versioning.py:40 msgid "Invalid version in \"Accept\" header." msgstr "Ungültige Version in der \"Accept\" Kopfzeile." -#: versioning.py:73 +#: versioning.py:71 msgid "Invalid version in URL path." msgstr "Ungültige Version im URL Pfad." -#: versioning.py:115 +#: versioning.py:116 msgid "Invalid version in URL path. Does not match any version namespace." msgstr "Ungültige Version im URL-Pfad. Entspricht keinem Versions-Namensraum." -#: versioning.py:147 +#: versioning.py:148 msgid "Invalid version in hostname." msgstr "Ungültige Version im Hostname." -#: versioning.py:169 +#: versioning.py:170 msgid "Invalid version in query parameter." msgstr "Ungültige Version im Anfrageparameter." - -#: views.py:88 -msgid "Permission denied." -msgstr "Zugriff verweigert." diff --git a/rest_framework/locale/el/LC_MESSAGES/django.mo b/rest_framework/locale/el/LC_MESSAGES/django.mo index b44b9ea9c3855c92d569c77a7613d233ab511c95..f434e6fc9067325f42f365893ffa52e35dd577bc 100644 GIT binary patch delta 2203 zcmY+_ZA@EL7{KwTv|uS48*eQWbOnYCgi^*jR@kKC7{YKcl?hYKV4G4$fRcezXR5>c z!Gz50?uGd>U*^jPm$}#vVidE*W%0w*%uLPVvSi;d5@Mpu#Kh?Tx%axvlb-uK=d``| zoaa2JeJz^U6~CJ8IxLi4Y9ZC-6p7gQXr0G~h)?#C*e z#7g`e`Kruf6aI!9u{PZ_F3-|vVc;xAFrB+>#Wt+Ncd!93<0j0@5UIyL)c4=OcD#fo zShPqa8=Fxl*o`_qW_t|velr--r7qCW8CEa0R#=DnfL>gSQ`m?X@jlGT6bWD#@{*Uh z=;sVvi5IX4uVV%JmWc3GX~H0OVgO&nRt@!O8td^djy||2iKk9<^+5JQw@n6NjTMWGE5cwW;D@IsW zC!WG${0BE-F{$5*L#QF1##;Od_h1H3(FMGK2k~{=0D}kUpT!B>!s?#FAL2AL2O`8v zZ*T@*#?T!i3H$()Co9BEn9Fi{YfMkas_+vI_md3 z?jkBUjWG<9kpv?yAJJIHzlBZUcnvM$gI}$d^tfQjMsDk3pjgvJbEyJuVN~CIb&&9 zh}~F%kKjH$jh9d-p5O?y;~^w(W7B{iKVkWgAtaw1|2SmBcsy2eu+PCl63bC9`a?jp*|^;^xmIiT%Gq^vv*U z4z$|uWZ3HJbq{shHrr#5q2^65)k)RdAfV>4B?rx)ZjFXU;8ChoSigqcP2E7%{ra!y zUN=)Yf#&}M`FXSGHr!e?;~&0dK*QfgB{j_QAXl>8%oE)rcGUdOXfWeXNB38Yo`goT zWnI$kb|-31knH9uNx=eYJ@tNS7L}h4vuO5fUXaH(%W_&?s-H@l5T56vLnC8*jJ@t` zJ(IaASXINT)?X8@UmY?cKA*q4Z#=qd)Za0> zb2v8kjDOwUVXGAxj1CQtNBfdb`+^SRYW~jT__BZ}`DMvDN6NP|Ml6_P6qYYezFYdF h)9xn=%Rg|WJYSqVSMjsM_^NUw*;JLAW}K{@{}(#=?XLg; delta 2634 zcmZYAeN0tl9Ki7hQBV-ji-Jb#5g`@i%Bvun$cy*_z9eG4^y0m6n};s<8u!v%#4d=4 zG#A-5b2Y7*HM6D3^(B^eH~+}3wR2{hTWQ*Cu33MyX69tNG-&pL}|QIgV>nBg|uU=QZw-d)G&;>cm}8AHJpNfqCD>yr&Jcs z$0TgP0^Er6a5pC6X{=Eyq(;cpbK`++El(|{{0c6`uW=)$Co5HsZMX=JVgug9O3WJ{ z``v?$ln>)9{23jXniA{aOqBaeEJI4U$w-5HunaFDf9ek|($j?0*oae6UQ~(|=*KEN zj@Fdq+M5nh_i{BI_6j~g=5HFSR} zHrckLjC8;*zlOz>PvGG=rEcH?%3T}*S*l@NhreP8R?}EEcA{+7Lnupo8)Ye+A%-Cp zS7Q)+QAT#3%j-Ci;fcp^2+NtCKD>-=*f34bkW%MRo?k$#d+;Od$Kn}EJ&&KFjyalA zNAOi#hM@wsr1UU=vL*+y1#hAkYxuDfPhkh3K_mD-NO=)kPUta>5kBqKc;vb~CHqyjsWSyXMf8T(KgxPd)b&s+U?8D+-G=PI=r z*CX3N4PiAN!&3Yasj9L#dots7I9}#%CmET6eq4mdu?lZv6XvjEcvkI1Ii5#xIbK28 zGgIfqUN{}=DVNygmr#!B5Hcz12r@Qx31tR;!ZO~k9*~iW#RahuR^ywLPhbt!@K!lC z{U{wghw>%7i#srnE$_y+u?7D|*^F);T8QtWl&_&|)+ucLeq4*8F=VciNx< z3vF4cjH@h*Bx!sVA?qheI=7OL&d(rNDQgcb#dU-v4uq<+a}q^Ag(0ZB}vwS1D-2v$XHAx06B zvWR9GzkCQJ#S=1}O9)v8NfQX!&D#iB+eAVVr&CR|at|-E8J{7>6S6!U6t$YDBwU1? zf(?Wu*@#aNAvrRVWP`{t`){hEzz5FSy>kC)LiS0H6iC$s-ytiN+p;IE?}HR8i1kE+ z6i6$GG%FYTijtkhB6sP&9i74MY)ubnK7UYiX)n6GdaLI4`@J5Q&l$dxxMEs%7dJaS z|F6~Dys|Fh92-9-+2d{1p3}WSPe&l)O!;oKW1Xj?T@M6wzfWuR_;gRJGd#{wp3v0k zZr6j6D#x7oNv@U_f2S`fuWr=?F1J@Ixh8+Htf;)8u%e)_L@O$-EUU;bBqcSv0>Od} z9WGzM>k9fiDzy#U{q3%RR=d4J4+M3Owm9f-UrMytHzMAQ!nma9!;$zi_a`4SqMALL z@XMK6LR7Pc@K0~(&lomNb3GqU%MYf!Pis-`M2*jklab#1jD+>%qDF)| zJZROtz*D<4bATHs%|3HCZP9~M#zo__F``jLI&{%E%kL2*YBe}woHs5QA9FWq?sA61 HMR)%JHvf<} diff --git a/rest_framework/locale/el/LC_MESSAGES/django.po b/rest_framework/locale/el/LC_MESSAGES/django.po index 18eb371c9..65459fc7b 100644 --- a/rest_framework/locale/el/LC_MESSAGES/django.po +++ b/rest_framework/locale/el/LC_MESSAGES/django.po @@ -3,14 +3,16 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Christos Barkonikos , 2020 +# Panagiotis Pavlidis , 2019 # Serafeim Papastefanos , 2016 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: 2017-08-03 14:58+0000\n" -"Last-Translator: Thomas Christie \n" +"POT-Creation-Date: 2020-10-13 21:45+0200\n" +"PO-Revision-Date: 2020-10-13 19:45+0000\n" +"Last-Translator: Xavier Ordoquy \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" @@ -18,40 +20,40 @@ msgstr "" "Language: el\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:73 +#: authentication.py:70 msgid "Invalid basic header. No credentials provided." msgstr "Λανθασμένη επικεφαλίδα basic. Δεν υπάρχουν διαπιστευτήρια." -#: authentication.py:76 +#: authentication.py:73 msgid "Invalid basic header. Credentials string should not contain spaces." -msgstr "Λανθασμένη επικεφαλίδα basic. Τα διαπιστευτήρια δε μπορεί να περιέχουν κενά." +msgstr "Λανθασμένη επικεφαλίδα basic. Τα διαπιστευτήρια δεν πρέπει να περιέχουν κενά." -#: authentication.py:82 +#: authentication.py:83 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Λανθασμένη επικεφαλίδα basic. Τα διαπιστευτήρια δεν είναι κωδικοποιημένα κατά base64." -#: authentication.py:99 +#: authentication.py:101 msgid "Invalid username/password." msgstr "Λανθασμένο όνομα χρήστη/κωδικός." -#: authentication.py:102 authentication.py:198 +#: authentication.py:104 authentication.py:206 msgid "User inactive or deleted." msgstr "Ο χρήστης είναι ανενεργός ή διεγραμμένος." -#: authentication.py:176 +#: authentication.py:184 msgid "Invalid token header. No credentials provided." msgstr "Λανθασμένη επικεφαλίδα token. Δεν υπάρχουν διαπιστευτήρια." -#: authentication.py:179 +#: authentication.py:187 msgid "Invalid token header. Token string should not contain spaces." -msgstr "Λανθασμένη επικεφαλίδα token. Το token δε πρέπει να περιέχει κενά." +msgstr "Λανθασμένη επικεφαλίδα token. Το token δεν πρέπει να περιέχει κενά." -#: authentication.py:185 +#: authentication.py:193 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "Λανθασμένη επικεφαλίδα token. Το token περιέχει μη επιτρεπτούς χαρακτήρες." -#: authentication.py:195 +#: authentication.py:203 msgid "Invalid token." msgstr "Λανθασμένο token" @@ -59,382 +61,515 @@ msgstr "Λανθασμένο token" msgid "Auth Token" msgstr "Token πιστοποίησης" -#: authtoken/models.py:15 +#: authtoken/models.py:13 msgid "Key" msgstr "Κλειδί" -#: authtoken/models.py:18 +#: authtoken/models.py:16 msgid "User" msgstr "Χρήστης" -#: authtoken/models.py:20 +#: authtoken/models.py:18 msgid "Created" msgstr "Δημιουργήθηκε" -#: authtoken/models.py:29 +#: authtoken/models.py:27 authtoken/serializers.py:19 msgid "Token" msgstr "Token" -#: authtoken/models.py:30 +#: authtoken/models.py:28 msgid "Tokens" msgstr "Tokens" -#: authtoken/serializers.py:8 +#: authtoken/serializers.py:9 msgid "Username" msgstr "Όνομα χρήστη" -#: authtoken/serializers.py:9 +#: authtoken/serializers.py:13 msgid "Password" msgstr "Κωδικός" -#: authtoken/serializers.py:20 -msgid "User account is disabled." -msgstr "Ο λογαριασμός χρήστη είναι απενεργοποιημένος." - -#: authtoken/serializers.py:23 +#: authtoken/serializers.py:35 msgid "Unable to log in with provided credentials." msgstr "Δεν είναι δυνατή η σύνδεση με τα διαπιστευτήρια." -#: authtoken/serializers.py:26 +#: authtoken/serializers.py:38 msgid "Must include \"username\" and \"password\"." msgstr "Πρέπει να περιέχει \"όνομα χρήστη\" και \"κωδικό\"." -#: exceptions.py:49 +#: exceptions.py:102 msgid "A server error occurred." msgstr "Σφάλμα διακομιστή." -#: exceptions.py:84 +#: exceptions.py:142 +msgid "Invalid input." +msgstr "" + +#: exceptions.py:161 msgid "Malformed request." msgstr "Λανθασμένο αίτημα." -#: exceptions.py:89 +#: exceptions.py:167 msgid "Incorrect authentication credentials." msgstr "Λάθος διαπιστευτήρια." -#: exceptions.py:94 +#: exceptions.py:173 msgid "Authentication credentials were not provided." msgstr "Δεν δόθηκαν διαπιστευτήρια." -#: exceptions.py:99 +#: exceptions.py:179 msgid "You do not have permission to perform this action." msgstr "Δεν έχετε δικαίωματα για αυτή την ενέργεια." -#: exceptions.py:104 views.py:81 +#: exceptions.py:185 msgid "Not found." msgstr "Δε βρέθηκε." -#: exceptions.py:109 +#: exceptions.py:191 +#, python-brace-format msgid "Method \"{method}\" not allowed." -msgstr "Η μέθοδος \"{method\"} δεν επιτρέπεται." +msgstr "Η μέθοδος \"{method}\" δεν επιτρέπεται." -#: exceptions.py:120 +#: exceptions.py:202 msgid "Could not satisfy the request Accept header." msgstr "Δεν ήταν δυνατή η ικανοποίηση της επικεφαλίδας Accept της αίτησης." -#: exceptions.py:132 +#: exceptions.py:212 +#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "Δεν υποστηρίζεται το media type \"{media_type}\" της αίτησης." -#: exceptions.py:145 +#: exceptions.py:223 msgid "Request was throttled." msgstr "Το αίτημα έγινε throttle." -#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 -#: validators.py:181 +#: exceptions.py:224 +#, python-brace-format +msgid "Expected available in {wait} second." +msgstr "" + +#: exceptions.py:225 +#, python-brace-format +msgid "Expected available in {wait} seconds." +msgstr "" + +#: fields.py:316 relations.py:245 relations.py:279 validators.py:90 +#: validators.py:183 msgid "This field is required." msgstr "Το πεδίο είναι απαραίτητο." -#: fields.py:270 +#: fields.py:317 msgid "This field may not be null." msgstr "Το πεδίο δε μπορεί να είναι null." -#: fields.py:608 fields.py:639 -msgid "\"{input}\" is not a valid boolean." -msgstr "Το \"{input}\" δεν είναι έγκυρο boolean." +#: fields.py:701 +msgid "Must be a valid boolean." +msgstr "" -#: fields.py:674 +#: fields.py:766 +msgid "Not a valid string." +msgstr "" + +#: fields.py:767 msgid "This field may not be blank." msgstr "Το πεδίο δε μπορεί να είναι κενό." -#: fields.py:675 fields.py:1675 +#: fields.py:768 fields.py:1881 +#, python-brace-format msgid "Ensure this field has no more than {max_length} characters." msgstr "Επιβεβαιώσατε ότι το πεδίο δεν έχει περισσότερους από {max_length} χαρακτήρες." -#: fields.py:676 +#: fields.py:769 +#, python-brace-format msgid "Ensure this field has at least {min_length} characters." msgstr "Επιβεβαιώσατε ότι το πεδίο έχει τουλάχιστον {min_length} χαρακτήρες." -#: fields.py:713 +#: fields.py:816 msgid "Enter a valid email address." msgstr "Συμπληρώσατε μια έγκυρη διεύθυνση e-mail." -#: fields.py:724 +#: fields.py:827 msgid "This value does not match the required pattern." msgstr "Η τιμή δε ταιριάζει με το pattern." -#: fields.py:735 +#: fields.py:838 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "Εισάγετε ένα έγκυρο \"slug\" που αποτελείται από γράμματα, αριθμούς παύλες και κάτω παύλες." -#: fields.py:747 +#: fields.py:839 +msgid "" +"Enter a valid \"slug\" consisting of Unicode letters, numbers, underscores, " +"or hyphens." +msgstr "" + +#: fields.py:854 msgid "Enter a valid URL." msgstr "Εισάγετε έγκυρο URL." -#: fields.py:760 -msgid "\"{value}\" is not a valid UUID." -msgstr "Το \"{value}\" δεν είναι έγκυρο UUID." +#: fields.py:867 +msgid "Must be a valid UUID." +msgstr "" -#: fields.py:796 +#: fields.py:903 msgid "Enter a valid IPv4 or IPv6 address." msgstr "Εισάγετε μια έγκυρη διεύθυνση IPv4 ή IPv6." -#: fields.py:821 +#: fields.py:931 msgid "A valid integer is required." msgstr "Ένας έγκυρος ακέραιος είναι απαραίτητος." -#: fields.py:822 fields.py:857 fields.py:891 +#: fields.py:932 fields.py:969 fields.py:1005 fields.py:1366 +#, python-brace-format msgid "Ensure this value is less than or equal to {max_value}." msgstr "Επιβεβαιώσατε ότι η τιμή είναι μικρότερη ή ίση του {max_value}." -#: fields.py:823 fields.py:858 fields.py:892 +#: fields.py:933 fields.py:970 fields.py:1006 fields.py:1367 +#, python-brace-format msgid "Ensure this value is greater than or equal to {min_value}." msgstr "Επιβεβαιώσατε ότι η τιμή είναι μεγαλύτερη ή ίση του {min_value}." -#: fields.py:824 fields.py:859 fields.py:896 +#: fields.py:934 fields.py:971 fields.py:1010 msgid "String value too large." msgstr "Το κείμενο είναι πολύ μεγάλο." -#: fields.py:856 fields.py:890 +#: fields.py:968 fields.py:1004 msgid "A valid number is required." msgstr "Ένας έγκυρος αριθμός είναι απαραίτητος." -#: fields.py:893 +#: fields.py:1007 +#, python-brace-format msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "Επιβεβαιώσατε ότι δεν υπάρχουν παραπάνω από {max_digits} ψηφία." -#: fields.py:894 +#: fields.py:1008 +#, python-brace-format msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "Επιβεβαιώσατε ότι δεν υπάρχουν παραπάνω από {max_decimal_places} δεκαδικά ψηφία." -#: fields.py:895 +#: fields.py:1009 +#, python-brace-format msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "Επιβεβαιώσατε ότι δεν υπάρχουν παραπάνω από {max_whole_digits} ακέραια ψηφία." -#: fields.py:1025 +#: fields.py:1148 +#, python-brace-format msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "Η ημερομηνία έχεi λάθος μορφή. Χρησιμοποιήστε μια από τις ακόλουθες μορφές: {format}" -#: fields.py:1026 +#: fields.py:1149 msgid "Expected a datetime but got a date." msgstr "Αναμένεται ημερομηνία και ώρα αλλά δόθηκε μόνο ημερομηνία." -#: fields.py:1103 +#: fields.py:1150 +#, python-brace-format +msgid "Invalid datetime for the timezone \"{timezone}\"." +msgstr "" + +#: fields.py:1151 +msgid "Datetime value out of range." +msgstr "" + +#: fields.py:1236 +#, python-brace-format msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "Η ημερομηνία έχεi λάθος μορφή. Χρησιμοποιήστε μια από τις ακόλουθες μορφές: {format}" -#: fields.py:1104 +#: fields.py:1237 msgid "Expected a date but got a datetime." msgstr "Αναμένεται ημερομηνία αλλά δόθηκε ημερομηνία και ώρα." -#: fields.py:1170 +#: fields.py:1303 +#, python-brace-format msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "Η ώρα έχει λάθος μορφή. Χρησιμοποιήστε μια από τις ακόλουθες μορφές: {format}" -#: fields.py:1232 +#: fields.py:1365 +#, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "Η διάρκεια έχει λάθος μορφή. Χρησιμοποιήστε μια από τις ακόλουθες μορφές: {format}" -#: fields.py:1251 fields.py:1300 +#: fields.py:1399 fields.py:1456 +#, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "Το \"{input}\" δεν είναι έγκυρη επιλογή." -#: fields.py:1254 relations.py:71 relations.py:441 +#: fields.py:1402 +#, python-brace-format msgid "More than {count} items..." msgstr "Περισσότερα από {count} αντικείμενα..." -#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 +#: fields.py:1457 fields.py:1603 relations.py:485 serializers.py:570 +#, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Αναμένεται μια λίστα αντικειμένον αλλά δόθηκε ο τύπος \"{input_type}\"" -#: fields.py:1302 +#: fields.py:1458 msgid "This selection may not be empty." msgstr "Η επιλογή δε μπορεί να είναι κενή." -#: fields.py:1339 +#: fields.py:1495 +#, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "Το \"{input}\" δεν είναι έγκυρη επιλογή διαδρομής." -#: fields.py:1358 +#: fields.py:1514 msgid "No file was submitted." msgstr "Δεν υποβλήθηκε αρχείο." -#: fields.py:1359 +#: fields.py:1515 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "Τα δεδομένα που υποβλήθηκαν δεν ήταν αρχείο. Ελέγξατε την κωδικοποίηση της φόρμας." -#: fields.py:1360 +#: fields.py:1516 msgid "No filename could be determined." msgstr "Δε βρέθηκε όνομα αρχείου." -#: fields.py:1361 +#: fields.py:1517 msgid "The submitted file is empty." msgstr "Το αρχείο που υποβλήθηκε είναι κενό." -#: fields.py:1362 +#: fields.py:1518 +#, python-brace-format msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "Επιβεβαιώσατε ότι το όνομα αρχείου έχει ως {max_length} χαρακτήρες (έχει {length})." -#: fields.py:1410 +#: fields.py:1566 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 +#: fields.py:1604 relations.py:486 serializers.py:571 msgid "This list may not be empty." msgstr "Η λίστα δε μπορεί να είναι κενή." -#: fields.py:1502 +#: fields.py:1605 +#, python-brace-format +msgid "Ensure this field has at least {min_length} elements." +msgstr "" + +#: fields.py:1606 +#, python-brace-format +msgid "Ensure this field has no more than {max_length} elements." +msgstr "" + +#: fields.py:1682 +#, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "Αναμένεται ένα λεξικό αντικείμενων αλλά δόθηκε ο τύπος \"{input_type}\"." -#: fields.py:1549 +#: fields.py:1683 +msgid "This dictionary may not be empty." +msgstr "" + +#: fields.py:1755 msgid "Value must be valid JSON." msgstr "Η τιμή πρέπει να είναι μορφής JSON." -#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 -msgid "Submit" -msgstr "Υποβολή" +#: filters.py:49 templates/rest_framework/filters/search.html:2 +msgid "Search" +msgstr "Αναζήτηση" -#: filters.py:336 +#: filters.py:50 +msgid "A search term." +msgstr "" + +#: filters.py:180 templates/rest_framework/filters/ordering.html:3 +msgid "Ordering" +msgstr "Ταξινόμηση" + +#: filters.py:181 +msgid "Which field to use when ordering the results." +msgstr "" + +#: filters.py:287 msgid "ascending" msgstr "" -#: filters.py:337 +#: filters.py:288 msgid "descending" msgstr "" -#: pagination.py:193 +#: pagination.py:174 +msgid "A page number within the paginated result set." +msgstr "" + +#: pagination.py:179 pagination.py:372 pagination.py:590 +msgid "Number of results to return per page." +msgstr "" + +#: pagination.py:189 msgid "Invalid page." msgstr "Λάθος σελίδα." -#: pagination.py:427 +#: pagination.py:374 +msgid "The initial index from which to return the results." +msgstr "" + +#: pagination.py:581 +msgid "The pagination cursor value." +msgstr "" + +#: pagination.py:583 msgid "Invalid cursor" msgstr "Λάθος cursor." -#: relations.py:207 +#: relations.py:246 +#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Λάθος κλειδί \"{pk_value}\" - το αντικείμενο δεν υπάρχει." -#: relations.py:208 +#: relations.py:247 +#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Λάθος τύπος. Αναμένεται τιμή κλειδιού, δόθηκε {data_type}." -#: relations.py:240 +#: relations.py:280 msgid "Invalid hyperlink - No URL match." msgstr "Λάθος σύνδεση - δε ταιριάζει κάποιο URL." -#: relations.py:241 +#: relations.py:281 msgid "Invalid hyperlink - Incorrect URL match." msgstr "Λάθος σύνδεση - δε ταιριάζει κάποιο URL." -#: relations.py:242 +#: relations.py:282 msgid "Invalid hyperlink - Object does not exist." msgstr "Λάθος σύνδεση - το αντικείμενο δεν υπάρχει." -#: relations.py:243 +#: relations.py:283 +#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Λάθος τύπος. Αναμένεται URL, δόθηκε {data_type}." -#: relations.py:401 +#: relations.py:448 +#, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "Το αντικείμενο {slug_name}={value} δεν υπάρχει." -#: relations.py:402 +#: relations.py:449 msgid "Invalid value." msgstr "Λάθος τιμή." -#: serializers.py:326 +#: schemas/utils.py:32 +msgid "unique integer value" +msgstr "" + +#: schemas/utils.py:34 +msgid "UUID string" +msgstr "" + +#: schemas/utils.py:36 +msgid "unique value" +msgstr "" + +#: schemas/utils.py:38 +#, python-brace-format +msgid "A {value_type} identifying this {name}." +msgstr "" + +#: serializers.py:337 +#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "Λάθος δεδομένα. Αναμένεται λεξικό αλλά δόθηκε {datatype}." #: templates/rest_framework/admin.html:116 -#: templates/rest_framework/base.html:128 +#: templates/rest_framework/base.html:136 +msgid "Extra Actions" +msgstr "" + +#: templates/rest_framework/admin.html:130 +#: templates/rest_framework/base.html:150 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/base.html:37 +msgid "navbar" +msgstr "" -#: templates/rest_framework/filters/ordering.html:3 -msgid "Ordering" -msgstr "Ταξινόμηση" +#: templates/rest_framework/base.html:75 +msgid "content" +msgstr "" -#: templates/rest_framework/filters/search.html:2 -msgid "Search" -msgstr "Αναζήτηση" +#: templates/rest_framework/base.html:78 +msgid "request form" +msgstr "" -#: templates/rest_framework/horizontal/radio.html:2 -#: templates/rest_framework/inline/radio.html:2 -#: templates/rest_framework/vertical/radio.html:2 +#: templates/rest_framework/base.html:157 +msgid "main content" +msgstr "" + +#: templates/rest_framework/base.html:173 +msgid "request info" +msgstr "" + +#: templates/rest_framework/base.html:177 +msgid "response info" +msgstr "" + +#: templates/rest_framework/horizontal/radio.html:4 +#: templates/rest_framework/inline/radio.html:3 +#: templates/rest_framework/vertical/radio.html:3 msgid "None" 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 +#: templates/rest_framework/horizontal/select_multiple.html:4 +#: templates/rest_framework/inline/select_multiple.html:3 +#: templates/rest_framework/vertical/select_multiple.html:3 msgid "No items to select." msgstr "Δεν υπάρχουν αντικείμενα προς επιλογή." -#: validators.py:43 +#: validators.py:39 msgid "This field must be unique." msgstr "Το πεδίο πρέπει να είναι μοναδικό" -#: validators.py:97 +#: validators.py:89 +#, python-brace-format msgid "The fields {field_names} must make a unique set." msgstr "Τα πεδία {field_names} πρέπει να αποτελούν ένα μοναδικό σύνολο." -#: validators.py:245 +#: validators.py:171 +#, python-brace-format +msgid "Surrogate characters are not allowed: U+{code_point:X}." +msgstr "" + +#: validators.py:243 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" date." msgstr "Το πεδίο πρέπει να είναι μοναδικό για την ημερομηνία \"{date_field}\"." -#: validators.py:260 +#: validators.py:258 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" month." msgstr "Το πεδίο πρέπει να είναι μοναδικό για το μήνα \"{date_field}\"." -#: validators.py:273 +#: validators.py:271 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" year." msgstr "Το πεδίο πρέπει να είναι μοναδικό για το έτος \"{date_field}\"." -#: versioning.py:42 +#: versioning.py:40 msgid "Invalid version in \"Accept\" header." msgstr "Λάθος έκδοση στην επικεφαλίδα \"Accept\"." -#: versioning.py:73 +#: versioning.py:71 msgid "Invalid version in URL path." msgstr "Λάθος έκδοση στη διαδρομή URL." -#: versioning.py:115 +#: versioning.py:116 msgid "Invalid version in URL path. Does not match any version namespace." msgstr "" -#: versioning.py:147 +#: versioning.py:148 msgid "Invalid version in hostname." msgstr "Λάθος έκδοση στο hostname." -#: versioning.py:169 +#: versioning.py:170 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 68e5600ae29759ff2dd8be760cfe9bbfbc6ffa2b..0770a9d5e7d6269e71717c100aa98d02275cfa7e 100644 GIT binary patch literal 12285 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 YP5-Y$2gv?EmaLz;`G42^|9|TCe^7Qb5&!@I delta 2718 zcmdVa>2Fk37{~E5T`07rKtU)iQ!Z=S3JgL^OE=oGN!i;Xh^5ocOu5?5n9e{*SSFZA zAgEDqcp*^{R7gyWN)bU5B9a&lkSJ&{(clu_U{nk*j1nY%fA?O(-{47~`#I;%-Of4B z(|@;qu_k?^Fzc|P#fWi4OQtagarYn&wATk4GXamGg%@!O{(_~LJH(hGoQ}G`5le6@ z=Hf0a$Ne}9Ph$@LgpJ0e%}qK>IWdc?WfGU+N7#TFdB(J36IS98T!dF~B^KlxQ;nNZ zzaPdHyn>Ukc&IUjScm$+b*S@k*R(M&(a{6X-~zmj{F!M5-j`OOW?YAQQ3My_QLM*r zu?dTY88aKVAg9bB)OAO28eT)K8&x%*BnU2OPi^_#xI}V1)O;dMswV z+8^7fne0T(>=k55%{hO3*Z+Mi)6e95EovnebI{hcVp)!II3!%OViOz zPoQRc5%r)SupEEISy;q0RW?gdGg^hJmKS`lqgJw%hcsXe+wmk;;yql16}(JU(~s4d zK2Jv%{DUf+P|!=Ny{NrBj{Iak@XufM{R{QLVy3eI+fh~XEb2p#pk{m=^`g&F)sQ*f ztC||5YSLym9cBF|sIs|*y6_&VY$`2pDLYYR^EB#3@1Tp{k~Yb+5%J>UnP< zi(^jt<147D`5wpdeq$zjOBzJYv=eo~9?ZmJsFipNnS?oudf;^|!`nz&m|||SFofi@ zS&z!47-~zOL?z`8R4$#6djGq0^n$af2VFvC>CZ?WnVbGNFxi{&VANh$p+0yY>blqb z@fl>h%{8pRTc|Cb%6@3vfttW!OzXn;=va6e^@YDWz&iJpctxb`cPH#GH$|4 zn1xeV4)WE^@NGuTw8J0wpsHpcs%lP`vHn_`^PC9aMxvU~^5qftn@UADs1nq4&;9nW z-%%2>6K<>Fs4Q3hs69$NLSz%9m77OefyLVYb#&B7XtTuad8N07ekZYv(5#hgYDy~p zkGM&=6j>~{HFInwx(RLPazbs5hr9Gz4YlbW=5g)+T7RG=ZSwmTYAYTiGKd(Vt!gKf zgld_D_Pw6aHmD6J_@`*XM1;s8)Fu!k+@5!cg0?KZl|w$UieMMaYGM)5Ma(DK2se3f zJ)zQ4t0OkMy$6Q|x=P?l{;3WeL`?R_$|)tRno67&a%)#fqgF+1AoPz&P4zs??Rkl# zuJcuHaZXnv(HjlNoiB4soQBfb!HK(egnPF~_e`|xq!mx3tgyuiJ7Tr9t!Q@ME^Tw( z&-;6z#!3a8rwZmfHwwNU*gI)qAb+VH?TuJ5yEhf>9~e62WWYH$GT-@g>JtNYS!0G1 z8ND+*me?MTI4{mYO!mYI7seWOp\n" +"POT-Creation-Date: 2020-10-13 21:45+0200\n" +"PO-Revision-Date: 2020-10-13 19:45+0000\n" +"Last-Translator: Xavier Ordoquy \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:73 +#: authentication.py:70 msgid "Invalid basic header. No credentials provided." msgstr "Invalid basic header. No credentials provided." -#: authentication.py:76 +#: authentication.py:73 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "Invalid basic header. Credentials string should not contain spaces." -#: authentication.py:82 +#: authentication.py:83 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Invalid basic header. Credentials not correctly base64 encoded." -#: authentication.py:99 +#: authentication.py:101 msgid "Invalid username/password." msgstr "Invalid username/password." -#: authentication.py:102 authentication.py:198 +#: authentication.py:104 authentication.py:206 msgid "User inactive or deleted." msgstr "User inactive or deleted." -#: authentication.py:176 +#: authentication.py:184 msgid "Invalid token header. No credentials provided." msgstr "Invalid token header. No credentials provided." -#: authentication.py:179 +#: authentication.py:187 msgid "Invalid token header. Token string should not contain spaces." msgstr "Invalid token header. Token string should not contain spaces." -#: authentication.py:185 +#: authentication.py:193 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "Invalid token header. Token string should not contain invalid characters." -#: authentication.py:195 +#: authentication.py:203 msgid "Invalid token." msgstr "Invalid token." @@ -58,382 +58,515 @@ msgstr "Invalid token." msgid "Auth Token" msgstr "Auth Token" -#: authtoken/models.py:15 +#: authtoken/models.py:13 msgid "Key" msgstr "Key" -#: authtoken/models.py:18 +#: authtoken/models.py:16 msgid "User" msgstr "User" -#: authtoken/models.py:20 +#: authtoken/models.py:18 msgid "Created" msgstr "Created" -#: authtoken/models.py:29 +#: authtoken/models.py:27 authtoken/serializers.py:19 msgid "Token" msgstr "Token" -#: authtoken/models.py:30 +#: authtoken/models.py:28 msgid "Tokens" msgstr "Tokens" -#: authtoken/serializers.py:8 +#: authtoken/serializers.py:9 msgid "Username" msgstr "Username" -#: authtoken/serializers.py:9 +#: authtoken/serializers.py:13 msgid "Password" msgstr "Password" -#: authtoken/serializers.py:20 -msgid "User account is disabled." -msgstr "User account is disabled." - -#: authtoken/serializers.py:23 +#: authtoken/serializers.py:35 msgid "Unable to log in with provided credentials." msgstr "Unable to log in with provided credentials." -#: authtoken/serializers.py:26 +#: authtoken/serializers.py:38 msgid "Must include \"username\" and \"password\"." msgstr "Must include \"username\" and \"password\"." -#: exceptions.py:49 +#: exceptions.py:102 msgid "A server error occurred." msgstr "A server error occurred." -#: exceptions.py:84 +#: exceptions.py:142 +msgid "Invalid input." +msgstr "Invalid input." + +#: exceptions.py:161 msgid "Malformed request." msgstr "Malformed request." -#: exceptions.py:89 +#: exceptions.py:167 msgid "Incorrect authentication credentials." msgstr "Incorrect authentication credentials." -#: exceptions.py:94 +#: exceptions.py:173 msgid "Authentication credentials were not provided." msgstr "Authentication credentials were not provided." -#: exceptions.py:99 +#: exceptions.py:179 msgid "You do not have permission to perform this action." msgstr "You do not have permission to perform this action." -#: exceptions.py:104 views.py:81 +#: exceptions.py:185 msgid "Not found." msgstr "Not found." -#: exceptions.py:109 +#: exceptions.py:191 +#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "Method \"{method}\" not allowed." -#: exceptions.py:120 +#: exceptions.py:202 msgid "Could not satisfy the request Accept header." msgstr "Could not satisfy the request Accept header." -#: exceptions.py:132 +#: exceptions.py:212 +#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "Unsupported media type \"{media_type}\" in request." -#: exceptions.py:145 +#: exceptions.py:223 msgid "Request was throttled." msgstr "Request was throttled." -#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 -#: validators.py:181 +#: exceptions.py:224 +#, python-brace-format +msgid "Expected available in {wait} second." +msgstr "Expected available in {wait} second." + +#: exceptions.py:225 +#, python-brace-format +msgid "Expected available in {wait} seconds." +msgstr "Expected available in {wait} seconds." + +#: fields.py:316 relations.py:245 relations.py:279 validators.py:90 +#: validators.py:183 msgid "This field is required." msgstr "This field is required." -#: fields.py:270 +#: fields.py:317 msgid "This field may not be null." msgstr "This field may not be null." -#: fields.py:608 fields.py:639 -msgid "\"{input}\" is not a valid boolean." -msgstr "\"{input}\" is not a valid boolean." +#: fields.py:701 +msgid "Must be a valid boolean." +msgstr "Must be a valid boolean." -#: fields.py:674 +#: fields.py:766 +msgid "Not a valid string." +msgstr "Not a valid string." + +#: fields.py:767 msgid "This field may not be blank." msgstr "This field may not be blank." -#: fields.py:675 fields.py:1675 +#: fields.py:768 fields.py:1881 +#, 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." -#: fields.py:676 +#: fields.py:769 +#, python-brace-format msgid "Ensure this field has at least {min_length} characters." msgstr "Ensure this field has at least {min_length} characters." -#: fields.py:713 +#: fields.py:816 msgid "Enter a valid email address." msgstr "Enter a valid email address." -#: fields.py:724 +#: fields.py:827 msgid "This value does not match the required pattern." msgstr "This value does not match the required pattern." -#: fields.py:735 +#: fields.py:838 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:747 +#: fields.py:839 +msgid "" +"Enter a valid \"slug\" consisting of Unicode letters, numbers, underscores, " +"or hyphens." +msgstr "Enter a valid \"slug\" consisting of Unicode letters, numbers, underscores, or hyphens." + +#: fields.py:854 msgid "Enter a valid URL." msgstr "Enter a valid URL." -#: fields.py:760 -msgid "\"{value}\" is not a valid UUID." -msgstr "\"{value}\" is not a valid UUID." +#: fields.py:867 +msgid "Must be a valid UUID." +msgstr "Must be a valid UUID." -#: fields.py:796 +#: fields.py:903 msgid "Enter a valid IPv4 or IPv6 address." msgstr "Enter a valid IPv4 or IPv6 address." -#: fields.py:821 +#: fields.py:931 msgid "A valid integer is required." msgstr "A valid integer is required." -#: fields.py:822 fields.py:857 fields.py:891 +#: fields.py:932 fields.py:969 fields.py:1005 fields.py:1366 +#, python-brace-format 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:823 fields.py:858 fields.py:892 +#: fields.py:933 fields.py:970 fields.py:1006 fields.py:1367 +#, python-brace-format 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:824 fields.py:859 fields.py:896 +#: fields.py:934 fields.py:971 fields.py:1010 msgid "String value too large." msgstr "String value too large." -#: fields.py:856 fields.py:890 +#: fields.py:968 fields.py:1004 msgid "A valid number is required." msgstr "A valid number is required." -#: fields.py:893 +#: fields.py:1007 +#, python-brace-format 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:894 +#: fields.py:1008 +#, python-brace-format 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:895 +#: fields.py:1009 +#, python-brace-format 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:1025 +#: fields.py:1148 +#, python-brace-format 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:1026 +#: fields.py:1149 msgid "Expected a datetime but got a date." msgstr "Expected a datetime but got a date." -#: fields.py:1103 +#: fields.py:1150 +#, python-brace-format +msgid "Invalid datetime for the timezone \"{timezone}\"." +msgstr "Invalid datetime for the timezone \"{timezone}\"." + +#: fields.py:1151 +msgid "Datetime value out of range." +msgstr "Datetime value out of range." + +#: fields.py:1236 +#, 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:1104 +#: fields.py:1237 msgid "Expected a date but got a datetime." msgstr "Expected a date but got a datetime." -#: fields.py:1170 +#: fields.py:1303 +#, 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:1232 +#: fields.py:1365 +#, 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:1251 fields.py:1300 +#: fields.py:1399 fields.py:1456 +#, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" is not a valid choice." -#: fields.py:1254 relations.py:71 relations.py:441 +#: fields.py:1402 +#, python-brace-format msgid "More than {count} items..." msgstr "More than {count} items..." -#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 +#: fields.py:1457 fields.py:1603 relations.py:485 serializers.py:570 +#, 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:1302 +#: fields.py:1458 msgid "This selection may not be empty." msgstr "This selection may not be empty." -#: fields.py:1339 +#: fields.py:1495 +#, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "\"{input}\" is not a valid path choice." -#: fields.py:1358 +#: fields.py:1514 msgid "No file was submitted." msgstr "No file was submitted." -#: fields.py:1359 +#: fields.py:1515 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:1360 +#: fields.py:1516 msgid "No filename could be determined." msgstr "No filename could be determined." -#: fields.py:1361 +#: fields.py:1517 msgid "The submitted file is empty." msgstr "The submitted file is empty." -#: fields.py:1362 +#: fields.py:1518 +#, 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:1410 +#: fields.py:1566 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:1449 relations.py:438 serializers.py:525 +#: fields.py:1604 relations.py:486 serializers.py:571 msgid "This list may not be empty." msgstr "This list may not be empty." -#: fields.py:1502 +#: fields.py:1605 +#, python-brace-format +msgid "Ensure this field has at least {min_length} elements." +msgstr "Ensure this field has at least {min_length} elements." + +#: fields.py:1606 +#, python-brace-format +msgid "Ensure this field has no more than {max_length} elements." +msgstr "Ensure this field has no more than {max_length} elements." + +#: fields.py:1682 +#, 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:1549 +#: fields.py:1683 +msgid "This dictionary may not be empty." +msgstr "This dictionary may not be empty." + +#: fields.py:1755 msgid "Value must be valid JSON." msgstr "Value must be valid JSON." -#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 -msgid "Submit" -msgstr "Submit" +#: filters.py:49 templates/rest_framework/filters/search.html:2 +msgid "Search" +msgstr "Search" -#: filters.py:336 +#: filters.py:50 +msgid "A search term." +msgstr "A search term." + +#: filters.py:180 templates/rest_framework/filters/ordering.html:3 +msgid "Ordering" +msgstr "Ordering" + +#: filters.py:181 +msgid "Which field to use when ordering the results." +msgstr "Which field to use when ordering the results." + +#: filters.py:287 msgid "ascending" msgstr "ascending" -#: filters.py:337 +#: filters.py:288 msgid "descending" msgstr "descending" -#: pagination.py:193 +#: pagination.py:174 +msgid "A page number within the paginated result set." +msgstr "A page number within the paginated result set." + +#: pagination.py:179 pagination.py:372 pagination.py:590 +msgid "Number of results to return per page." +msgstr "Number of results to return per page." + +#: pagination.py:189 msgid "Invalid page." msgstr "Invalid page." -#: pagination.py:427 +#: pagination.py:374 +msgid "The initial index from which to return the results." +msgstr "The initial index from which to return the results." + +#: pagination.py:581 +msgid "The pagination cursor value." +msgstr "The pagination cursor value." + +#: pagination.py:583 msgid "Invalid cursor" msgstr "Invalid cursor" -#: relations.py:207 +#: relations.py:246 +#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Invalid pk \"{pk_value}\" - object does not exist." -#: relations.py:208 +#: relations.py:247 +#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Incorrect type. Expected pk value, received {data_type}." -#: relations.py:240 +#: relations.py:280 msgid "Invalid hyperlink - No URL match." msgstr "Invalid hyperlink - No URL match." -#: relations.py:241 +#: relations.py:281 msgid "Invalid hyperlink - Incorrect URL match." msgstr "Invalid hyperlink - Incorrect URL match." -#: relations.py:242 +#: relations.py:282 msgid "Invalid hyperlink - Object does not exist." msgstr "Invalid hyperlink - Object does not exist." -#: relations.py:243 +#: relations.py:283 +#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Incorrect type. Expected URL string, received {data_type}." -#: relations.py:401 +#: relations.py:448 +#, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "Object with {slug_name}={value} does not exist." -#: relations.py:402 +#: relations.py:449 msgid "Invalid value." msgstr "Invalid value." -#: serializers.py:326 +#: schemas/utils.py:32 +msgid "unique integer value" +msgstr "unique integer value" + +#: schemas/utils.py:34 +msgid "UUID string" +msgstr "UUID string" + +#: schemas/utils.py:36 +msgid "unique value" +msgstr "unique value" + +#: schemas/utils.py:38 +#, python-brace-format +msgid "A {value_type} identifying this {name}." +msgstr "A {value_type} identifying this {name}." + +#: serializers.py:337 +#, 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:116 -#: templates/rest_framework/base.html:128 +#: templates/rest_framework/base.html:136 +msgid "Extra Actions" +msgstr "Extra Actions" + +#: templates/rest_framework/admin.html:130 +#: templates/rest_framework/base.html:150 msgid "Filters" msgstr "Filters" -#: templates/rest_framework/filters/django_filter.html:2 -#: templates/rest_framework/filters/django_filter_crispyforms.html:4 -msgid "Field filters" -msgstr "Field filters" +#: templates/rest_framework/base.html:37 +msgid "navbar" +msgstr "navbar" -#: templates/rest_framework/filters/ordering.html:3 -msgid "Ordering" -msgstr "Ordering" +#: templates/rest_framework/base.html:75 +msgid "content" +msgstr "content" -#: templates/rest_framework/filters/search.html:2 -msgid "Search" -msgstr "Search" +#: templates/rest_framework/base.html:78 +msgid "request form" +msgstr "request form" -#: templates/rest_framework/horizontal/radio.html:2 -#: templates/rest_framework/inline/radio.html:2 -#: templates/rest_framework/vertical/radio.html:2 +#: templates/rest_framework/base.html:157 +msgid "main content" +msgstr "main content" + +#: templates/rest_framework/base.html:173 +msgid "request info" +msgstr "request info" + +#: templates/rest_framework/base.html:177 +msgid "response info" +msgstr "response info" + +#: templates/rest_framework/horizontal/radio.html:4 +#: templates/rest_framework/inline/radio.html:3 +#: templates/rest_framework/vertical/radio.html:3 msgid "None" 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 +#: templates/rest_framework/horizontal/select_multiple.html:4 +#: templates/rest_framework/inline/select_multiple.html:3 +#: templates/rest_framework/vertical/select_multiple.html:3 msgid "No items to select." msgstr "No items to select." -#: validators.py:43 +#: validators.py:39 msgid "This field must be unique." msgstr "This field must be unique." -#: validators.py:97 +#: validators.py:89 +#, python-brace-format msgid "The fields {field_names} must make a unique set." msgstr "The fields {field_names} must make a unique set." -#: validators.py:245 +#: validators.py:171 +#, python-brace-format +msgid "Surrogate characters are not allowed: U+{code_point:X}." +msgstr "Surrogate characters are not allowed: U+{code_point:X}." + +#: validators.py:243 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" date." msgstr "This field must be unique for the \"{date_field}\" date." -#: validators.py:260 +#: validators.py:258 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" month." msgstr "This field must be unique for the \"{date_field}\" month." -#: validators.py:273 +#: validators.py:271 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" year." msgstr "This field must be unique for the \"{date_field}\" year." -#: versioning.py:42 +#: versioning.py:40 msgid "Invalid version in \"Accept\" header." msgstr "Invalid version in \"Accept\" header." -#: versioning.py:73 +#: versioning.py:71 msgid "Invalid version in URL path." msgstr "Invalid version in URL path." -#: versioning.py:115 +#: versioning.py:116 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 +#: versioning.py:148 msgid "Invalid version in hostname." msgstr "Invalid version in hostname." -#: versioning.py:169 +#: versioning.py:170 msgid "Invalid version in query parameter." msgstr "Invalid version in query parameter." - -#: views.py:88 -msgid "Permission denied." -msgstr "Permission denied." diff --git a/rest_framework/locale/en_US/LC_MESSAGES/django.po b/rest_framework/locale/en_US/LC_MESSAGES/django.po index 3733a1e33..c9dd2d633 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-07-12 16:13+0100\n" +"POT-Creation-Date: 2020-10-13 21:45+0200\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:73 +#: authentication.py:70 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:76 +#: authentication.py:73 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:82 +#: authentication.py:83 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:99 +#: authentication.py:101 msgid "Invalid username/password." msgstr "" -#: authentication.py:102 authentication.py:198 +#: authentication.py:104 authentication.py:206 msgid "User inactive or deleted." msgstr "" -#: authentication.py:176 +#: authentication.py:184 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:179 +#: authentication.py:187 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:185 +#: authentication.py:193 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:195 +#: authentication.py:203 msgid "Invalid token." msgstr "" @@ -58,380 +58,513 @@ msgstr "" msgid "Auth Token" msgstr "" -#: authtoken/models.py:15 +#: authtoken/models.py:13 msgid "Key" msgstr "" -#: authtoken/models.py:18 +#: authtoken/models.py:16 msgid "User" msgstr "" -#: authtoken/models.py:20 +#: authtoken/models.py:18 msgid "Created" msgstr "" -#: authtoken/models.py:29 +#: authtoken/models.py:27 authtoken/serializers.py:19 msgid "Token" msgstr "" -#: authtoken/models.py:30 +#: authtoken/models.py:28 msgid "Tokens" msgstr "" -#: authtoken/serializers.py:8 +#: authtoken/serializers.py:9 msgid "Username" msgstr "" -#: authtoken/serializers.py:9 +#: authtoken/serializers.py:13 msgid "Password" msgstr "" -#: authtoken/serializers.py:20 -msgid "User account is disabled." -msgstr "" - -#: authtoken/serializers.py:23 +#: authtoken/serializers.py:35 msgid "Unable to log in with provided credentials." msgstr "" -#: authtoken/serializers.py:26 +#: authtoken/serializers.py:38 msgid "Must include \"username\" and \"password\"." msgstr "" -#: exceptions.py:49 +#: exceptions.py:102 msgid "A server error occurred." msgstr "" -#: exceptions.py:84 +#: exceptions.py:142 +msgid "Invalid input." +msgstr "" + +#: exceptions.py:161 msgid "Malformed request." msgstr "" -#: exceptions.py:89 +#: exceptions.py:167 msgid "Incorrect authentication credentials." msgstr "" -#: exceptions.py:94 +#: exceptions.py:173 msgid "Authentication credentials were not provided." msgstr "" -#: exceptions.py:99 +#: exceptions.py:179 msgid "You do not have permission to perform this action." msgstr "" -#: exceptions.py:104 views.py:81 +#: exceptions.py:185 msgid "Not found." msgstr "" -#: exceptions.py:109 +#: exceptions.py:191 +#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "" -#: exceptions.py:120 +#: exceptions.py:202 msgid "Could not satisfy the request Accept header." msgstr "" -#: exceptions.py:132 +#: exceptions.py:212 +#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "" -#: exceptions.py:145 +#: exceptions.py:223 msgid "Request was throttled." msgstr "" -#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 -#: validators.py:181 +#: exceptions.py:224 +#, python-brace-format +msgid "Expected available in {wait} second." +msgstr "" + +#: exceptions.py:225 +#, python-brace-format +msgid "Expected available in {wait} seconds." +msgstr "" + +#: fields.py:316 relations.py:245 relations.py:279 validators.py:90 +#: validators.py:183 msgid "This field is required." msgstr "" -#: fields.py:270 +#: fields.py:317 msgid "This field may not be null." msgstr "" -#: fields.py:608 fields.py:639 -msgid "\"{input}\" is not a valid boolean." +#: fields.py:701 +msgid "Must be a valid boolean." msgstr "" -#: fields.py:674 +#: fields.py:766 +msgid "Not a valid string." +msgstr "" + +#: fields.py:767 msgid "This field may not be blank." msgstr "" -#: fields.py:675 fields.py:1675 +#: fields.py:768 fields.py:1881 +#, python-brace-format msgid "Ensure this field has no more than {max_length} characters." msgstr "" -#: fields.py:676 +#: fields.py:769 +#, python-brace-format msgid "Ensure this field has at least {min_length} characters." msgstr "" -#: fields.py:713 +#: fields.py:816 msgid "Enter a valid email address." msgstr "" -#: fields.py:724 +#: fields.py:827 msgid "This value does not match the required pattern." msgstr "" -#: fields.py:735 +#: fields.py:838 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "" -#: fields.py:747 +#: fields.py:839 +msgid "" +"Enter a valid \"slug\" consisting of Unicode letters, numbers, underscores, " +"or hyphens." +msgstr "" + +#: fields.py:854 msgid "Enter a valid URL." msgstr "" -#: fields.py:760 -msgid "\"{value}\" is not a valid UUID." +#: fields.py:867 +msgid "Must be a valid UUID." msgstr "" -#: fields.py:796 +#: fields.py:903 msgid "Enter a valid IPv4 or IPv6 address." msgstr "" -#: fields.py:821 +#: fields.py:931 msgid "A valid integer is required." msgstr "" -#: fields.py:822 fields.py:857 fields.py:891 +#: fields.py:932 fields.py:969 fields.py:1005 fields.py:1366 +#, python-brace-format msgid "Ensure this value is less than or equal to {max_value}." msgstr "" -#: fields.py:823 fields.py:858 fields.py:892 +#: fields.py:933 fields.py:970 fields.py:1006 fields.py:1367 +#, python-brace-format msgid "Ensure this value is greater than or equal to {min_value}." msgstr "" -#: fields.py:824 fields.py:859 fields.py:896 +#: fields.py:934 fields.py:971 fields.py:1010 msgid "String value too large." msgstr "" -#: fields.py:856 fields.py:890 +#: fields.py:968 fields.py:1004 msgid "A valid number is required." msgstr "" -#: fields.py:893 +#: fields.py:1007 +#, python-brace-format msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "" -#: fields.py:894 +#: fields.py:1008 +#, python-brace-format msgid "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "" -#: fields.py:895 +#: fields.py:1009 +#, python-brace-format msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "" -#: fields.py:1025 +#: fields.py:1148 +#, python-brace-format msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1026 +#: fields.py:1149 msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1103 +#: fields.py:1150 +#, python-brace-format +msgid "Invalid datetime for the timezone \"{timezone}\"." +msgstr "" + +#: fields.py:1151 +msgid "Datetime value out of range." +msgstr "" + +#: fields.py:1236 +#, python-brace-format msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1104 +#: fields.py:1237 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1170 +#: fields.py:1303 +#, python-brace-format msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1232 +#: fields.py:1365 +#, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1251 fields.py:1300 +#: fields.py:1399 fields.py:1456 +#, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "" -#: fields.py:1254 relations.py:71 relations.py:441 +#: fields.py:1402 +#, python-brace-format msgid "More than {count} items..." msgstr "" -#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 +#: fields.py:1457 fields.py:1603 relations.py:485 serializers.py:570 +#, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1302 +#: fields.py:1458 msgid "This selection may not be empty." msgstr "" -#: fields.py:1339 +#: fields.py:1495 +#, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1358 +#: fields.py:1514 msgid "No file was submitted." msgstr "" -#: fields.py:1359 +#: fields.py:1515 msgid "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1360 +#: fields.py:1516 msgid "No filename could be determined." msgstr "" -#: fields.py:1361 +#: fields.py:1517 msgid "The submitted file is empty." msgstr "" -#: fields.py:1362 +#: fields.py:1518 +#, python-brace-format msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1410 +#: fields.py:1566 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 +#: fields.py:1604 relations.py:486 serializers.py:571 msgid "This list may not be empty." msgstr "" -#: fields.py:1502 +#: fields.py:1605 +#, python-brace-format +msgid "Ensure this field has at least {min_length} elements." +msgstr "" + +#: fields.py:1606 +#, python-brace-format +msgid "Ensure this field has no more than {max_length} elements." +msgstr "" + +#: fields.py:1682 +#, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1549 +#: fields.py:1683 +msgid "This dictionary may not be empty." +msgstr "" + +#: fields.py:1755 msgid "Value must be valid JSON." msgstr "" -#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 -msgid "Submit" +#: filters.py:49 templates/rest_framework/filters/search.html:2 +msgid "Search" msgstr "" -#: filters.py:336 +#: filters.py:50 +msgid "A search term." +msgstr "" + +#: filters.py:180 templates/rest_framework/filters/ordering.html:3 +msgid "Ordering" +msgstr "" + +#: filters.py:181 +msgid "Which field to use when ordering the results." +msgstr "" + +#: filters.py:287 msgid "ascending" msgstr "" -#: filters.py:337 +#: filters.py:288 msgid "descending" msgstr "" -#: pagination.py:193 +#: pagination.py:174 +msgid "A page number within the paginated result set." +msgstr "" + +#: pagination.py:179 pagination.py:372 pagination.py:590 +msgid "Number of results to return per page." +msgstr "" + +#: pagination.py:189 msgid "Invalid page." msgstr "" -#: pagination.py:427 +#: pagination.py:374 +msgid "The initial index from which to return the results." +msgstr "" + +#: pagination.py:581 +msgid "The pagination cursor value." +msgstr "" + +#: pagination.py:583 msgid "Invalid cursor" msgstr "" -#: relations.py:207 +#: relations.py:246 +#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" -#: relations.py:208 +#: relations.py:247 +#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" -#: relations.py:240 +#: relations.py:280 msgid "Invalid hyperlink - No URL match." msgstr "" -#: relations.py:241 +#: relations.py:281 msgid "Invalid hyperlink - Incorrect URL match." msgstr "" -#: relations.py:242 +#: relations.py:282 msgid "Invalid hyperlink - Object does not exist." msgstr "" -#: relations.py:243 +#: relations.py:283 +#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:401 +#: relations.py:448 +#, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:402 +#: relations.py:449 msgid "Invalid value." msgstr "" -#: serializers.py:326 +#: schemas/utils.py:32 +msgid "unique integer value" +msgstr "" + +#: schemas/utils.py:34 +msgid "UUID string" +msgstr "" + +#: schemas/utils.py:36 +msgid "unique value" +msgstr "" + +#: schemas/utils.py:38 +#, python-brace-format +msgid "A {value_type} identifying this {name}." +msgstr "" + +#: serializers.py:337 +#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "" #: templates/rest_framework/admin.html:116 -#: templates/rest_framework/base.html:128 +#: templates/rest_framework/base.html:136 +msgid "Extra Actions" +msgstr "" + +#: templates/rest_framework/admin.html:130 +#: templates/rest_framework/base.html:150 msgid "Filters" msgstr "" -#: templates/rest_framework/filters/django_filter.html:2 -#: templates/rest_framework/filters/django_filter_crispyforms.html:4 -msgid "Field filters" +#: templates/rest_framework/base.html:37 +msgid "navbar" msgstr "" -#: templates/rest_framework/filters/ordering.html:3 -msgid "Ordering" +#: templates/rest_framework/base.html:75 +msgid "content" msgstr "" -#: templates/rest_framework/filters/search.html:2 -msgid "Search" +#: templates/rest_framework/base.html:78 +msgid "request form" msgstr "" -#: templates/rest_framework/horizontal/radio.html:2 -#: templates/rest_framework/inline/radio.html:2 -#: templates/rest_framework/vertical/radio.html:2 +#: templates/rest_framework/base.html:157 +msgid "main content" +msgstr "" + +#: templates/rest_framework/base.html:173 +msgid "request info" +msgstr "" + +#: templates/rest_framework/base.html:177 +msgid "response info" +msgstr "" + +#: templates/rest_framework/horizontal/radio.html:4 +#: templates/rest_framework/inline/radio.html:3 +#: templates/rest_framework/vertical/radio.html:3 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 +#: templates/rest_framework/horizontal/select_multiple.html:4 +#: templates/rest_framework/inline/select_multiple.html:3 +#: templates/rest_framework/vertical/select_multiple.html:3 msgid "No items to select." msgstr "" -#: validators.py:43 +#: validators.py:39 msgid "This field must be unique." msgstr "" -#: validators.py:97 +#: validators.py:89 +#, python-brace-format msgid "The fields {field_names} must make a unique set." msgstr "" -#: validators.py:245 +#: validators.py:171 +#, python-brace-format +msgid "Surrogate characters are not allowed: U+{code_point:X}." +msgstr "" + +#: validators.py:243 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" date." msgstr "" -#: validators.py:260 +#: validators.py:258 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" month." msgstr "" -#: validators.py:273 +#: validators.py:271 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" year." msgstr "" -#: versioning.py:42 +#: versioning.py:40 msgid "Invalid version in \"Accept\" header." msgstr "" -#: versioning.py:73 +#: versioning.py:71 msgid "Invalid version in URL path." msgstr "" -#: versioning.py:115 +#: versioning.py:116 msgid "Invalid version in URL path. Does not match any version namespace." msgstr "" -#: versioning.py:147 +#: versioning.py:148 msgid "Invalid version in hostname." msgstr "" -#: versioning.py:169 +#: versioning.py:170 msgid "Invalid version in query parameter." msgstr "" - -#: views.py:88 -msgid "Permission denied." -msgstr "" diff --git a/rest_framework/locale/es/LC_MESSAGES/django.mo b/rest_framework/locale/es/LC_MESSAGES/django.mo index 6efb9bdd15c6d6714283b652ecec46e2b8d56669..16df627fcc901ed5fb7307de1b195c5672dad071 100644 GIT binary patch delta 2273 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, 2015 +# Ernesto Rico Schmidt , 2015 # José Padilla , 2015 +# Leo Prada , 2019 # Miguel Gonzalez , 2015 # Miguel Gonzalez , 2016 # Miguel Gonzalez , 2015-2016 @@ -13,9 +14,9 @@ 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: 2017-08-03 14:58+0000\n" -"Last-Translator: Miguel Gonzalez \n" +"POT-Creation-Date: 2020-10-13 21:45+0200\n" +"PO-Revision-Date: 2020-10-13 19:45+0000\n" +"Last-Translator: Xavier Ordoquy \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" @@ -23,40 +24,40 @@ msgstr "" "Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:73 +#: authentication.py:70 msgid "Invalid basic header. No credentials provided." msgstr "Cabecera básica inválida. Las credenciales no fueron suministradas." -#: authentication.py:76 +#: authentication.py:73 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:82 +#: authentication.py:83 msgid "Invalid basic header. Credentials not correctly base64 encoded." -msgstr "Cabecera básica inválida. Las credenciales incorrectamente codificadas en base64." +msgstr "Cabecera básica inválida. Las credenciales no fueron codificadas correctamente en base64." -#: authentication.py:99 +#: authentication.py:101 msgid "Invalid username/password." msgstr "Nombre de usuario/contraseña inválidos." -#: authentication.py:102 authentication.py:198 +#: authentication.py:104 authentication.py:206 msgid "User inactive or deleted." msgstr "Usuario inactivo o borrado." -#: authentication.py:176 +#: authentication.py:184 msgid "Invalid token header. No credentials provided." msgstr "Cabecera token inválida. Las credenciales no fueron suministradas." -#: authentication.py:179 +#: authentication.py:187 msgid "Invalid token header. Token string should not contain spaces." msgstr "Cabecera token inválida. La cadena token no debe contener espacios." -#: authentication.py:185 +#: authentication.py:193 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:195 +#: authentication.py:203 msgid "Invalid token." msgstr "Token inválido." @@ -64,382 +65,515 @@ msgstr "Token inválido." msgid "Auth Token" msgstr "Token de autenticación" -#: authtoken/models.py:15 +#: authtoken/models.py:13 msgid "Key" msgstr "Clave" -#: authtoken/models.py:18 +#: authtoken/models.py:16 msgid "User" msgstr "Usuario" -#: authtoken/models.py:20 +#: authtoken/models.py:18 msgid "Created" msgstr "Fecha de creación" -#: authtoken/models.py:29 +#: authtoken/models.py:27 authtoken/serializers.py:19 msgid "Token" msgstr "Token" -#: authtoken/models.py:30 +#: authtoken/models.py:28 msgid "Tokens" msgstr "Tokens" -#: authtoken/serializers.py:8 +#: authtoken/serializers.py:9 msgid "Username" msgstr "Nombre de usuario" -#: authtoken/serializers.py:9 +#: authtoken/serializers.py:13 msgid "Password" msgstr "Contraseña" -#: authtoken/serializers.py:20 -msgid "User account is disabled." -msgstr "Cuenta de usuario está deshabilitada." - -#: authtoken/serializers.py:23 +#: authtoken/serializers.py:35 msgid "Unable to log in with provided credentials." msgstr "No puede iniciar sesión con las credenciales proporcionadas." -#: authtoken/serializers.py:26 +#: authtoken/serializers.py:38 msgid "Must include \"username\" and \"password\"." msgstr "Debe incluir \"username\" y \"password\"." -#: exceptions.py:49 +#: exceptions.py:102 msgid "A server error occurred." msgstr "Se ha producido un error en el servidor." -#: exceptions.py:84 +#: exceptions.py:142 +msgid "Invalid input." +msgstr "" + +#: exceptions.py:161 msgid "Malformed request." msgstr "Solicitud con formato incorrecto." -#: exceptions.py:89 +#: exceptions.py:167 msgid "Incorrect authentication credentials." msgstr "Credenciales de autenticación incorrectas." -#: exceptions.py:94 +#: exceptions.py:173 msgid "Authentication credentials were not provided." msgstr "Las credenciales de autenticación no se proveyeron." -#: exceptions.py:99 +#: exceptions.py:179 msgid "You do not have permission to perform this action." msgstr "Usted no tiene permiso para realizar esta acción." -#: exceptions.py:104 views.py:81 +#: exceptions.py:185 msgid "Not found." msgstr "No encontrado." -#: exceptions.py:109 +#: exceptions.py:191 +#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "Método \"{method}\" no permitido." -#: exceptions.py:120 +#: exceptions.py:202 msgid "Could not satisfy the request Accept header." msgstr "No se ha podido satisfacer la solicitud de cabecera de Accept." -#: exceptions.py:132 +#: exceptions.py:212 +#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "Tipo de medio \"{media_type}\" incompatible en la solicitud." -#: exceptions.py:145 +#: exceptions.py:223 msgid "Request was throttled." msgstr "Solicitud fue regulada (throttled)." -#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 -#: validators.py:181 +#: exceptions.py:224 +#, python-brace-format +msgid "Expected available in {wait} second." +msgstr "" + +#: exceptions.py:225 +#, python-brace-format +msgid "Expected available in {wait} seconds." +msgstr "" + +#: fields.py:316 relations.py:245 relations.py:279 validators.py:90 +#: validators.py:183 msgid "This field is required." msgstr "Este campo es requerido." -#: fields.py:270 +#: fields.py:317 msgid "This field may not be null." msgstr "Este campo no puede ser nulo." -#: fields.py:608 fields.py:639 -msgid "\"{input}\" is not a valid boolean." -msgstr "\"{input}\" no es un booleano válido." +#: fields.py:701 +msgid "Must be a valid boolean." +msgstr "" -#: fields.py:674 +#: fields.py:766 +msgid "Not a valid string." +msgstr "" + +#: fields.py:767 msgid "This field may not be blank." msgstr "Este campo no puede estar en blanco." -#: fields.py:675 fields.py:1675 +#: fields.py:768 fields.py:1881 +#, 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." -#: fields.py:676 +#: fields.py:769 +#, python-brace-format 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:713 +#: fields.py:816 msgid "Enter a valid email address." msgstr "Introduzca una dirección de correo electrónico válida." -#: fields.py:724 +#: fields.py:827 msgid "This value does not match the required pattern." msgstr "Este valor no coincide con el patrón requerido." -#: fields.py:735 +#: fields.py:838 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:747 +#: fields.py:839 +msgid "" +"Enter a valid \"slug\" consisting of Unicode letters, numbers, underscores, " +"or hyphens." +msgstr "" + +#: fields.py:854 msgid "Enter a valid URL." msgstr "Introduzca una URL válida." -#: fields.py:760 -msgid "\"{value}\" is not a valid UUID." -msgstr "\"{value}\" no es un UUID válido." +#: fields.py:867 +msgid "Must be a valid UUID." +msgstr "" -#: fields.py:796 +#: fields.py:903 msgid "Enter a valid IPv4 or IPv6 address." msgstr "Introduzca una dirección IPv4 o IPv6 válida." -#: fields.py:821 +#: fields.py:931 msgid "A valid integer is required." msgstr "Introduzca un número entero válido." -#: fields.py:822 fields.py:857 fields.py:891 +#: fields.py:932 fields.py:969 fields.py:1005 fields.py:1366 +#, python-brace-format 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:823 fields.py:858 fields.py:892 +#: fields.py:933 fields.py:970 fields.py:1006 fields.py:1367 +#, python-brace-format 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:824 fields.py:859 fields.py:896 +#: fields.py:934 fields.py:971 fields.py:1010 msgid "String value too large." msgstr "Cadena demasiado larga." -#: fields.py:856 fields.py:890 +#: fields.py:968 fields.py:1004 msgid "A valid number is required." msgstr "Se requiere un número válido." -#: fields.py:893 +#: fields.py:1007 +#, python-brace-format 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:894 +#: fields.py:1008 +#, python-brace-format 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:895 +#: fields.py:1009 +#, python-brace-format 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:1025 +#: fields.py:1148 +#, python-brace-format 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:1026 +#: fields.py:1149 msgid "Expected a datetime but got a date." msgstr "Se esperaba un fecha/hora en vez de una fecha." -#: fields.py:1103 +#: fields.py:1150 +#, python-brace-format +msgid "Invalid datetime for the timezone \"{timezone}\"." +msgstr "" + +#: fields.py:1151 +msgid "Datetime value out of range." +msgstr "" + +#: fields.py:1236 +#, 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:1104 +#: fields.py:1237 msgid "Expected a date but got a datetime." msgstr "Se esperaba una fecha en vez de una fecha/hora." -#: fields.py:1170 +#: fields.py:1303 +#, 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:1232 +#: fields.py:1365 +#, 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:1251 fields.py:1300 +#: fields.py:1399 fields.py:1456 +#, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" no es una elección válida." -#: fields.py:1254 relations.py:71 relations.py:441 +#: fields.py:1402 +#, python-brace-format msgid "More than {count} items..." msgstr "Más de {count} elementos..." -#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 +#: fields.py:1457 fields.py:1603 relations.py:485 serializers.py:570 +#, 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:1302 +#: fields.py:1458 msgid "This selection may not be empty." msgstr "Esta selección no puede estar vacía." -#: fields.py:1339 +#: fields.py:1495 +#, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "\"{input}\" no es una elección de ruta válida." -#: fields.py:1358 +#: fields.py:1514 msgid "No file was submitted." msgstr "No se envió ningún archivo." -#: fields.py:1359 +#: fields.py:1515 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:1360 +#: fields.py:1516 msgid "No filename could be determined." msgstr "No se pudo determinar un nombre de archivo." -#: fields.py:1361 +#: fields.py:1517 msgid "The submitted file is empty." msgstr "El archivo enviado está vació." -#: fields.py:1362 +#: fields.py:1518 +#, 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:1410 +#: fields.py:1566 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:1449 relations.py:438 serializers.py:525 +#: fields.py:1604 relations.py:486 serializers.py:571 msgid "This list may not be empty." msgstr "Esta lista no puede estar vacía." -#: fields.py:1502 +#: fields.py:1605 +#, python-brace-format +msgid "Ensure this field has at least {min_length} elements." +msgstr "" + +#: fields.py:1606 +#, python-brace-format +msgid "Ensure this field has no more than {max_length} elements." +msgstr "" + +#: fields.py:1682 +#, 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:1549 +#: fields.py:1683 +msgid "This dictionary may not be empty." +msgstr "" + +#: fields.py:1755 msgid "Value must be valid JSON." msgstr "El valor debe ser JSON válido." -#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 -msgid "Submit" -msgstr "Enviar" +#: filters.py:49 templates/rest_framework/filters/search.html:2 +msgid "Search" +msgstr "Buscar" -#: filters.py:336 +#: filters.py:50 +msgid "A search term." +msgstr "" + +#: filters.py:180 templates/rest_framework/filters/ordering.html:3 +msgid "Ordering" +msgstr "Ordenamiento" + +#: filters.py:181 +msgid "Which field to use when ordering the results." +msgstr "" + +#: filters.py:287 msgid "ascending" msgstr "ascendiente" -#: filters.py:337 +#: filters.py:288 msgid "descending" msgstr "descendiente" -#: pagination.py:193 +#: pagination.py:174 +msgid "A page number within the paginated result set." +msgstr "" + +#: pagination.py:179 pagination.py:372 pagination.py:590 +msgid "Number of results to return per page." +msgstr "" + +#: pagination.py:189 msgid "Invalid page." msgstr "Página inválida." -#: pagination.py:427 +#: pagination.py:374 +msgid "The initial index from which to return the results." +msgstr "" + +#: pagination.py:581 +msgid "The pagination cursor value." +msgstr "" + +#: pagination.py:583 msgid "Invalid cursor" msgstr "Cursor inválido" -#: relations.py:207 +#: relations.py:246 +#, 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 +#: relations.py:247 +#, 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:240 +#: relations.py:280 msgid "Invalid hyperlink - No URL match." msgstr "Hiperenlace inválido - No hay URL coincidentes." -#: relations.py:241 +#: relations.py:281 msgid "Invalid hyperlink - Incorrect URL match." msgstr "Hiperenlace inválido - Coincidencia incorrecta de la URL." -#: relations.py:242 +#: relations.py:282 msgid "Invalid hyperlink - Object does not exist." msgstr "Hiperenlace inválido - Objeto no existe." -#: relations.py:243 +#: relations.py:283 +#, 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:401 +#: relations.py:448 +#, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "Objeto con {slug_name}={value} no existe." -#: relations.py:402 +#: relations.py:449 msgid "Invalid value." msgstr "Valor inválido." -#: serializers.py:326 +#: schemas/utils.py:32 +msgid "unique integer value" +msgstr "" + +#: schemas/utils.py:34 +msgid "UUID string" +msgstr "" + +#: schemas/utils.py:36 +msgid "unique value" +msgstr "" + +#: schemas/utils.py:38 +#, python-brace-format +msgid "A {value_type} identifying this {name}." +msgstr "" + +#: serializers.py:337 +#, 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:116 -#: templates/rest_framework/base.html:128 +#: templates/rest_framework/base.html:136 +msgid "Extra Actions" +msgstr "" + +#: templates/rest_framework/admin.html:130 +#: templates/rest_framework/base.html:150 msgid "Filters" msgstr "Filtros" -#: templates/rest_framework/filters/django_filter.html:2 -#: templates/rest_framework/filters/django_filter_crispyforms.html:4 -msgid "Field filters" -msgstr "Filtros de campo" +#: templates/rest_framework/base.html:37 +msgid "navbar" +msgstr "" -#: templates/rest_framework/filters/ordering.html:3 -msgid "Ordering" -msgstr "Ordenamiento" +#: templates/rest_framework/base.html:75 +msgid "content" +msgstr "" -#: templates/rest_framework/filters/search.html:2 -msgid "Search" -msgstr "Buscar" +#: templates/rest_framework/base.html:78 +msgid "request form" +msgstr "" -#: templates/rest_framework/horizontal/radio.html:2 -#: templates/rest_framework/inline/radio.html:2 -#: templates/rest_framework/vertical/radio.html:2 +#: templates/rest_framework/base.html:157 +msgid "main content" +msgstr "" + +#: templates/rest_framework/base.html:173 +msgid "request info" +msgstr "" + +#: templates/rest_framework/base.html:177 +msgid "response info" +msgstr "" + +#: templates/rest_framework/horizontal/radio.html:4 +#: templates/rest_framework/inline/radio.html:3 +#: templates/rest_framework/vertical/radio.html:3 msgid "None" msgstr "Ninguno" -#: templates/rest_framework/horizontal/select_multiple.html:2 -#: templates/rest_framework/inline/select_multiple.html:2 -#: templates/rest_framework/vertical/select_multiple.html:2 +#: templates/rest_framework/horizontal/select_multiple.html:4 +#: templates/rest_framework/inline/select_multiple.html:3 +#: templates/rest_framework/vertical/select_multiple.html:3 msgid "No items to select." msgstr "No hay elementos para seleccionar." -#: validators.py:43 +#: validators.py:39 msgid "This field must be unique." msgstr "Este campo debe ser único." -#: validators.py:97 +#: validators.py:89 +#, python-brace-format msgid "The fields {field_names} must make a unique set." msgstr "Los campos {field_names} deben formar un conjunto único." -#: validators.py:245 +#: validators.py:171 +#, python-brace-format +msgid "Surrogate characters are not allowed: U+{code_point:X}." +msgstr "" + +#: validators.py:243 +#, python-brace-format 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:260 +#: validators.py:258 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" month." msgstr "Este campo debe ser único para el mes \"{date_field}\"." -#: validators.py:273 +#: validators.py:271 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" year." msgstr "Este campo debe ser único para el año \"{date_field}\"." -#: versioning.py:42 +#: versioning.py:40 msgid "Invalid version in \"Accept\" header." msgstr "Versión inválida en la cabecera \"Accept\"." -#: versioning.py:73 +#: versioning.py:71 msgid "Invalid version in URL path." msgstr "Versión inválida en la ruta de la URL." -#: versioning.py:115 +#: versioning.py:116 msgid "Invalid version in URL path. Does not match any version namespace." msgstr "La versión especificada en la ruta de la URL no es válida. No coincide con ninguna del espacio de nombres de versiones." -#: versioning.py:147 +#: versioning.py:148 msgid "Invalid version in hostname." msgstr "Versión inválida en el nombre de host." -#: versioning.py:169 +#: versioning.py:170 msgid "Invalid version in query parameter." msgstr "Versión inválida en el parámetro de consulta." - -#: views.py:88 -msgid "Permission denied." -msgstr "Permiso denegado." diff --git a/rest_framework/locale/et/LC_MESSAGES/django.mo b/rest_framework/locale/et/LC_MESSAGES/django.mo index 8deba1eb0a8adddd04f1465445c7d5d3083accf8..e14ea9e270d7b06ac9ad497bf06c55378c98c170 100644 GIT binary patch delta 3094 zcmZ|QZEPGz8Nl(eo!mKbY{zd&9LLQ#q^;e?m!y6naqQY|(geT6cHk z6+&W^x!=t0dUocSXEyI0y)(A-yV?y`6yEbbJHCPY@ShmP)=f%1ga`0A`URKNk7=CXLJ5C8fI~QgU%(II+js;UE0h|+ zY3#voquhTJN3nj3QXfErwfI?-30^H;Un%-)l=1$BU1~|G!JE)Q?Aclv z@Cn>W|5CC49h8;5gtDSvp@j0U#eP>!;r=Ns<9ZGy0#D*yco}89AK<7(UE&UtHgnJoW?w>*FpGV1= zFV_+OZW=FeA-~rs{l@yjj3-bYOrpk1C=>cVN(64**Or!xChBcHH{L1v-n(zQu8P?uORisR+PPe7$wA0DC79ZuBgk! z>)*mQ`mdry>JRuJ-bRT~`x1ZEOCv;S zd6d0gL-JSs1AB4PZl&(QjgSU(Q z8kQla;BI72Y6$yquGoJbW#y|VIq^p%J=9;2cc}=2$$0nhBRMpLJLUW@(vSzfit^%@ zQTA#L`L?KEpq%61qU1z`SxAo5;C5_6dA*vR`; z!(KiTxF09*5}v|aD51NbuM&$;r%@*QBua>{;e&VsWdd?hvO0=#3bvx0f?k}&O!59} zD3SU(F7Xvq@6li~`Kz*rd$}7ygHcRi36@busT}L~%L!VtDk<`nlgLa_C3j>JQe?kL zk9<@f$Fo#PKFU)5xJavu$_Gh(lsZFQFT6XyicXa9YpRq-sSi^hp>i1VpKghwoC+zj zby8&I5)~=OsB&zj$U^tY{{MFwq;sZtp#up_{#Z$vWpAZO*0)kWM%_T|p~|;|PlP&2 zl_DoXws4v%k$sFRN#016@*(N~b&I@T_Er*13R|8(&(fAHSTBcYNY);wN)AYod`T4v@P+gEwD*3INh z%8m0nlQpw)-)1Uz*p>&sS}; z^Hs635oghUt*Uc}mvwZIFd2Pu)(bPiC$t+lX+IXTYgO@Wg^mt9?K>%FHi)S)FXPy@ z>fZh1*|?K+GjnRf`2Gbi8&{{C^P%Gh`hxKpG3y0E%8AF+q+_zPiRFvcH%q!xF89-B zF+a(3j&{-u!D38JC0xJw2AS*sK45!l!Yzfc=6`+r!hxyGIKrhTJ!rs{zM?FaeSp${JJ>Flxx>$dCDCg(a? z&FZ}K;iB$+f|W^YAmwJfoNJa7bu}gST783kroPF(UO%~U^*Xb+TN{QWqn;NJ0LMPn?5y45ZehOVRdM|`B29&Q<-PIp|2)Q%J{1*8KXvBch2YqlbR3p z0uQhOOgpB=1E1z{-(9;)2Sz<7a8jYnIPem#_EIS$3*&LaGIn8v2efy|RR8Qr% zKo#Jm-OxX=ms{GZMvNZ@X5M7nw5w+9;O_cLnR|W<^2zaXOMi9J_&JkPNy8a%a_T>U C&JaZa delta 2055 zcmZY9TWl0n7{Kwf%cU1->6Tu$QtW9Hvag8R17m)_qpp9=D(ZmNH1fvEXG$9)Q-*%dKImx%bIWs#m z=X~dz^V{w_{mCElSI#QhAW=$$-AdVbaV0;rJ*$-}$45|O4DZ9!=*1Mueb;b3{)F|o zDnqHw7{ES!2Djr|_z>R2UZs+1OQuqfaUzDTxPV*Hou$-H?8Xi}fpUEgcj2FykAvAu z19%cE=^t@?1LZlFuo?ftDr~xE>3IjRjrXfr4tluo74~E98l`-=7jyAAw&4tJ!g-X8 z+{QXA$Wh9VJt+50Vi&%Na{u>uFaGTGGdL*&Ey7aXuR7!ahn)*?l$pJTlIr)d1{bgh zZ==SnwMsE5Rfi4OjB?$^VmyX2u+u0hpF??1PTtb>I!wxmJ`QBLe z8I*gLUet-QreVAvKg34-4j;!HMqh%Xj>mBe{j+$^MW#{Hj~0-B8Nf`z(f}?XlT-63 zGyewVLBBhFPoYw^^!?b42T*2q1|{V`q71x@G)R9KWl3jImiSwI3QI`OPJFJI{O{)A zGAH)qI!aoqI?Ru(@k=NVIPZ81Tj)11DtX``l!3m3QfzZ519OossrFu!|GkWUyn-ZC z{ehjBl_c-g9BjvWoWRX^7TfVE%8cBk=>hD(b$ARbaK`DUP>SjbZopfPS#+d!YLFzV zhp`NU*nr6wIbbmAW9Pym@*${SQL6hck{ngdH01%^CVV0mKb=)5P1anRERCDs zOH#drvs5&3dQ0fTX)8z6TQTUb0W2} z*yAdiWNv!g9^=7!+#0hZL2GK-XR^K8yFAl>{v|!le(#WZ*V}DAuPQVvN@A&0$*b;E zxHRBOo!?-&Tt1UoHg9f}oimI2J@aXKi@8%CFas6iX0f8RcvmPiYUxQUd^n*ezj%8p t6d6r~g1%IHWtrQ&UUkUiRe$Cgk4EBA9gXN%f_Wx_KC@6=Yc|$&{SE3a8fO3i diff --git a/rest_framework/locale/et/LC_MESSAGES/django.po b/rest_framework/locale/et/LC_MESSAGES/django.po index cc2c2e3f0..d9c4b184f 100644 --- a/rest_framework/locale/et/LC_MESSAGES/django.po +++ b/rest_framework/locale/et/LC_MESSAGES/django.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Tõnis Kärdi , 2015 +# Erlend Eelmets , 2020 +# Tõnis Kärdi , 2015,2019 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: 2017-08-03 14:58+0000\n" -"Last-Translator: Thomas Christie \n" +"POT-Creation-Date: 2020-10-13 21:45+0200\n" +"PO-Revision-Date: 2020-10-13 19:45+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,423 +19,556 @@ msgstr "" "Language: et\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:73 +#: authentication.py:70 msgid "Invalid basic header. No credentials provided." msgstr "Sobimatu lihtpäis. Kasutajatunnus on esitamata." -#: authentication.py:76 +#: authentication.py:73 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "Sobimatu lihtpäis. Kasutajatunnus ei tohi sisaldada tühikuid." -#: authentication.py:82 +#: authentication.py:83 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Sobimatu lihtpäis. Kasutajatunnus pole korrektselt base64-kodeeritud." -#: authentication.py:99 +#: authentication.py:101 msgid "Invalid username/password." msgstr "Sobimatu kasutajatunnus/salasõna." -#: authentication.py:102 authentication.py:198 +#: authentication.py:104 authentication.py:206 msgid "User inactive or deleted." msgstr "Kasutaja on inaktiivne või kustutatud." -#: authentication.py:176 +#: authentication.py:184 msgid "Invalid token header. No credentials provided." msgstr "Sobimatu lubakaardi päis. Kasutajatunnus on esitamata." -#: authentication.py:179 +#: authentication.py:187 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:185 +#: authentication.py:193 msgid "" "Invalid token header. Token string should not contain invalid characters." -msgstr "" +msgstr "Sobimatu lubakaardi päis. Loa sõne ei tohi sisaldada sobimatuid märke." -#: authentication.py:195 +#: authentication.py:203 msgid "Invalid token." msgstr "Sobimatu lubakaart." #: authtoken/apps.py:7 msgid "Auth Token" -msgstr "" +msgstr "Autentimistähis" -#: authtoken/models.py:15 +#: authtoken/models.py:13 msgid "Key" -msgstr "" +msgstr "Võti" + +#: authtoken/models.py:16 +msgid "User" +msgstr "Kasutaja" #: authtoken/models.py:18 -msgid "User" -msgstr "" - -#: authtoken/models.py:20 msgid "Created" -msgstr "" +msgstr "Loodud" -#: authtoken/models.py:29 +#: authtoken/models.py:27 authtoken/serializers.py:19 msgid "Token" -msgstr "" +msgstr "Tähis" -#: authtoken/models.py:30 +#: authtoken/models.py:28 msgid "Tokens" -msgstr "" - -#: authtoken/serializers.py:8 -msgid "Username" -msgstr "" +msgstr "Tähised" #: authtoken/serializers.py:9 +msgid "Username" +msgstr "Kasutajanimi" + +#: authtoken/serializers.py:13 msgid "Password" -msgstr "" +msgstr "Salasõna" -#: authtoken/serializers.py:20 -msgid "User account is disabled." -msgstr "Kasutajakonto on suletud." - -#: authtoken/serializers.py:23 +#: authtoken/serializers.py:35 msgid "Unable to log in with provided credentials." msgstr "Sisselogimine antud tunnusega ebaõnnestus." -#: authtoken/serializers.py:26 +#: authtoken/serializers.py:38 msgid "Must include \"username\" and \"password\"." msgstr "Peab sisaldama \"kasutajatunnust\" ja \"slasõna\"." -#: exceptions.py:49 +#: exceptions.py:102 msgid "A server error occurred." msgstr "Viga serveril." -#: exceptions.py:84 +#: exceptions.py:142 +msgid "Invalid input." +msgstr "" + +#: exceptions.py:161 msgid "Malformed request." msgstr "Väändunud päring." -#: exceptions.py:89 +#: exceptions.py:167 msgid "Incorrect authentication credentials." msgstr "Ebakorrektne autentimistunnus." -#: exceptions.py:94 +#: exceptions.py:173 msgid "Authentication credentials were not provided." msgstr "Autentimistunnus on esitamata." -#: exceptions.py:99 +#: exceptions.py:179 msgid "You do not have permission to perform this action." msgstr "Teil puuduvad piisavad õigused selle tegevuse teostamiseks." -#: exceptions.py:104 views.py:81 +#: exceptions.py:185 msgid "Not found." msgstr "Ei leidnud." -#: exceptions.py:109 +#: exceptions.py:191 +#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "Meetod \"{method}\" pole lubatud." -#: exceptions.py:120 +#: exceptions.py:202 msgid "Could not satisfy the request Accept header." msgstr "Päringu Accept-päist ei suutnud täita." -#: exceptions.py:132 +#: exceptions.py:212 +#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "Meedia tüüpi {media_type} päringus ei toetata." -#: exceptions.py:145 +#: exceptions.py:223 msgid "Request was throttled." msgstr "Liiga palju päringuid." -#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 -#: validators.py:181 +#: exceptions.py:224 +#, python-brace-format +msgid "Expected available in {wait} second." +msgstr "" + +#: exceptions.py:225 +#, python-brace-format +msgid "Expected available in {wait} seconds." +msgstr "" + +#: fields.py:316 relations.py:245 relations.py:279 validators.py:90 +#: validators.py:183 msgid "This field is required." msgstr "Väli on kohustuslik." -#: fields.py:270 +#: fields.py:317 msgid "This field may not be null." msgstr "Väli ei tohi olla tühi." -#: fields.py:608 fields.py:639 -msgid "\"{input}\" is not a valid boolean." -msgstr "\"{input}\" pole kehtiv kahendarv." +#: fields.py:701 +msgid "Must be a valid boolean." +msgstr "" -#: fields.py:674 +#: fields.py:766 +msgid "Not a valid string." +msgstr "" + +#: fields.py:767 msgid "This field may not be blank." msgstr "See väli ei tohi olla tühi." -#: fields.py:675 fields.py:1675 +#: fields.py:768 fields.py:1881 +#, 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." -#: fields.py:676 +#: fields.py:769 +#, python-brace-format 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:713 +#: fields.py:816 msgid "Enter a valid email address." msgstr "Sisestage kehtiv e-posti aadress." -#: fields.py:724 +#: fields.py:827 msgid "This value does not match the required pattern." msgstr "Väärtus ei ühti etteantud mustriga." -#: fields.py:735 +#: fields.py:838 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:747 +#: fields.py:839 +msgid "" +"Enter a valid \"slug\" consisting of Unicode letters, numbers, underscores, " +"or hyphens." +msgstr "" + +#: fields.py:854 msgid "Enter a valid URL." msgstr "Sisestage korrektne URL." -#: fields.py:760 -msgid "\"{value}\" is not a valid UUID." -msgstr "\"{value}\" pole kehtiv UUID." - -#: fields.py:796 -msgid "Enter a valid IPv4 or IPv6 address." +#: fields.py:867 +msgid "Must be a valid UUID." msgstr "" -#: fields.py:821 +#: fields.py:903 +msgid "Enter a valid IPv4 or IPv6 address." +msgstr "Sisesta valiidne IPv4 või IPv6 aadress" + +#: fields.py:931 msgid "A valid integer is required." msgstr "Sisendiks peab olema täisarv." -#: fields.py:822 fields.py:857 fields.py:891 +#: fields.py:932 fields.py:969 fields.py:1005 fields.py:1366 +#, python-brace-format 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:823 fields.py:858 fields.py:892 +#: fields.py:933 fields.py:970 fields.py:1006 fields.py:1367 +#, python-brace-format 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:824 fields.py:859 fields.py:896 +#: fields.py:934 fields.py:971 fields.py:1010 msgid "String value too large." msgstr "Sõne on liiga pikk." -#: fields.py:856 fields.py:890 +#: fields.py:968 fields.py:1004 msgid "A valid number is required." msgstr "Sisendiks peab olema arv." -#: fields.py:893 +#: fields.py:1007 +#, python-brace-format 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:894 +#: fields.py:1008 +#, python-brace-format 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:895 +#: fields.py:1009 +#, python-brace-format 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:1025 +#: fields.py:1148 +#, python-brace-format 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:1026 +#: fields.py:1149 msgid "Expected a datetime but got a date." msgstr "Ootasin kuupäev-kellaaeg andmetüüpi, kuid sain hoopis kuupäeva." -#: fields.py:1103 +#: fields.py:1150 +#, python-brace-format +msgid "Invalid datetime for the timezone \"{timezone}\"." +msgstr "" + +#: fields.py:1151 +msgid "Datetime value out of range." +msgstr "" + +#: fields.py:1236 +#, 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:1104 +#: fields.py:1237 msgid "Expected a date but got a datetime." msgstr "Ootasin kuupäeva andmetüüpi, kuid sain hoopis kuupäev-kellaaja." -#: fields.py:1170 +#: fields.py:1303 +#, 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:1232 +#: fields.py:1365 +#, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." -msgstr "" +msgstr "Valesti formaaditud kestvus. Kasutage mõnda neist: {format}" -#: fields.py:1251 fields.py:1300 +#: fields.py:1399 fields.py:1456 +#, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" on sobimatu valik." -#: fields.py:1254 relations.py:71 relations.py:441 +#: fields.py:1402 +#, python-brace-format msgid "More than {count} items..." -msgstr "" +msgstr "Kirjeid on rohkem kui {count} ... " -#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 +#: fields.py:1457 fields.py:1603 relations.py:485 serializers.py:570 +#, 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:1302 +#: fields.py:1458 msgid "This selection may not be empty." -msgstr "" +msgstr "Valik ei tohi olla määramata." -#: fields.py:1339 +#: fields.py:1495 +#, python-brace-format msgid "\"{input}\" is not a valid path choice." -msgstr "" +msgstr "\"{input}\" on sobimatu valik." -#: fields.py:1358 +#: fields.py:1514 msgid "No file was submitted." msgstr "Ühtegi faili ei esitatud." -#: fields.py:1359 +#: fields.py:1515 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:1360 +#: fields.py:1516 msgid "No filename could be determined." msgstr "Ei suutnud tuvastada failinime." -#: fields.py:1361 +#: fields.py:1517 msgid "The submitted file is empty." msgstr "Esitatud fail oli tühi." -#: fields.py:1362 +#: fields.py:1518 +#, 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:1410 +#: fields.py:1566 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:1449 relations.py:438 serializers.py:525 +#: fields.py:1604 relations.py:486 serializers.py:571 msgid "This list may not be empty." +msgstr "Loetelu ei tohi olla määramata." + +#: fields.py:1605 +#, python-brace-format +msgid "Ensure this field has at least {min_length} elements." msgstr "" -#: fields.py:1502 +#: fields.py:1606 +#, python-brace-format +msgid "Ensure this field has no more than {max_length} elements." +msgstr "" + +#: fields.py:1682 +#, 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:1549 +#: fields.py:1683 +msgid "This dictionary may not be empty." +msgstr "" + +#: fields.py:1755 msgid "Value must be valid JSON." +msgstr "Väärtus peab olema valiidne JSON." + +#: filters.py:49 templates/rest_framework/filters/search.html:2 +msgid "Search" +msgstr "Otsing" + +#: filters.py:50 +msgid "A search term." msgstr "" -#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 -msgid "Submit" +#: filters.py:180 templates/rest_framework/filters/ordering.html:3 +msgid "Ordering" +msgstr "Järjestus" + +#: filters.py:181 +msgid "Which field to use when ordering the results." msgstr "" -#: filters.py:336 +#: filters.py:287 msgid "ascending" -msgstr "" +msgstr "kasvav" -#: filters.py:337 +#: filters.py:288 msgid "descending" +msgstr "kahanev" + +#: pagination.py:174 +msgid "A page number within the paginated result set." msgstr "" -#: pagination.py:193 +#: pagination.py:179 pagination.py:372 pagination.py:590 +msgid "Number of results to return per page." +msgstr "" + +#: pagination.py:189 msgid "Invalid page." +msgstr "Sobimatu lehekülg." + +#: pagination.py:374 +msgid "The initial index from which to return the results." msgstr "" -#: pagination.py:427 -msgid "Invalid cursor" -msgstr "Sobimatu kursor." +#: pagination.py:581 +msgid "The pagination cursor value." +msgstr "" -#: relations.py:207 +#: pagination.py:583 +msgid "Invalid cursor" +msgstr "Sobimatu kursor" + +#: relations.py:246 +#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Sobimatu primaarvõti \"{pk_value}\" - objekti pole olemas." -#: relations.py:208 +#: relations.py:247 +#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Sobimatu andmetüüp. Ootasin primaarvõtit, sain {data_type}." -#: relations.py:240 +#: relations.py:280 msgid "Invalid hyperlink - No URL match." msgstr "Sobimatu hüperlink - ei leidnud URLi vastet." -#: relations.py:241 +#: relations.py:281 msgid "Invalid hyperlink - Incorrect URL match." msgstr "Sobimatu hüperlink - vale URLi vaste." -#: relations.py:242 +#: relations.py:282 msgid "Invalid hyperlink - Object does not exist." msgstr "Sobimatu hüperlink - objekti ei eksisteeri." -#: relations.py:243 +#: relations.py:283 +#, 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:401 +#: relations.py:448 +#, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "Objekti {slug_name}={value} ei eksisteeri." -#: relations.py:402 +#: relations.py:449 msgid "Invalid value." msgstr "Sobimatu väärtus." -#: serializers.py:326 +#: schemas/utils.py:32 +msgid "unique integer value" +msgstr "" + +#: schemas/utils.py:34 +msgid "UUID string" +msgstr "" + +#: schemas/utils.py:36 +msgid "unique value" +msgstr "" + +#: schemas/utils.py:38 +#, python-brace-format +msgid "A {value_type} identifying this {name}." +msgstr "" + +#: serializers.py:337 +#, 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:116 -#: templates/rest_framework/base.html:128 +#: templates/rest_framework/base.html:136 +msgid "Extra Actions" +msgstr "" + +#: templates/rest_framework/admin.html:130 +#: templates/rest_framework/base.html:150 msgid "Filters" +msgstr "Filtrid" + +#: templates/rest_framework/base.html:37 +msgid "navbar" msgstr "" -#: templates/rest_framework/filters/django_filter.html:2 -#: templates/rest_framework/filters/django_filter_crispyforms.html:4 -msgid "Field filters" +#: templates/rest_framework/base.html:75 +msgid "content" msgstr "" -#: templates/rest_framework/filters/ordering.html:3 -msgid "Ordering" +#: templates/rest_framework/base.html:78 +msgid "request form" msgstr "" -#: templates/rest_framework/filters/search.html:2 -msgid "Search" +#: templates/rest_framework/base.html:157 +msgid "main content" msgstr "" -#: templates/rest_framework/horizontal/radio.html:2 -#: templates/rest_framework/inline/radio.html:2 -#: templates/rest_framework/vertical/radio.html:2 +#: templates/rest_framework/base.html:173 +msgid "request info" +msgstr "" + +#: templates/rest_framework/base.html:177 +msgid "response info" +msgstr "" + +#: templates/rest_framework/horizontal/radio.html:4 +#: templates/rest_framework/inline/radio.html:3 +#: templates/rest_framework/vertical/radio.html:3 msgid "None" -msgstr "" +msgstr "Puudub" -#: templates/rest_framework/horizontal/select_multiple.html:2 -#: templates/rest_framework/inline/select_multiple.html:2 -#: templates/rest_framework/vertical/select_multiple.html:2 +#: templates/rest_framework/horizontal/select_multiple.html:4 +#: templates/rest_framework/inline/select_multiple.html:3 +#: templates/rest_framework/vertical/select_multiple.html:3 msgid "No items to select." -msgstr "" +msgstr "Pole midagi valida." -#: validators.py:43 +#: validators.py:39 msgid "This field must be unique." msgstr "Selle välja väärtus peab olema unikaalne." -#: validators.py:97 +#: validators.py:89 +#, python-brace-format msgid "The fields {field_names} must make a unique set." msgstr "Veerud {field_names} peavad moodustama unikaalse hulga." -#: validators.py:245 +#: validators.py:171 +#, python-brace-format +msgid "Surrogate characters are not allowed: U+{code_point:X}." +msgstr "" + +#: validators.py:243 +#, python-brace-format 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:260 +#: validators.py:258 +#, python-brace-format 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:273 +#: validators.py:271 +#, python-brace-format 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." -#: versioning.py:42 +#: versioning.py:40 msgid "Invalid version in \"Accept\" header." msgstr "Sobimatu versioon \"Accept\" päises." -#: versioning.py:73 +#: versioning.py:71 msgid "Invalid version in URL path." msgstr "Sobimatu versioon URLi rajas." -#: versioning.py:115 +#: versioning.py:116 msgid "Invalid version in URL path. Does not match any version namespace." -msgstr "" +msgstr "Sobimatu versioon URLis - see ei vasta ühelegi teadaolevale." -#: versioning.py:147 +#: versioning.py:148 msgid "Invalid version in hostname." msgstr "Sobimatu versioon hostinimes." -#: versioning.py:169 +#: versioning.py:170 msgid "Invalid version in query parameter." msgstr "Sobimatu versioon päringu parameetris." - -#: views.py:88 -msgid "Permission denied." -msgstr "" diff --git a/rest_framework/locale/fa/LC_MESSAGES/django.mo b/rest_framework/locale/fa/LC_MESSAGES/django.mo index 0e73156d43628c002f3232811c478971ac5af52e..099318e69a178c32d30b3ddcefbec1a8579d8d55 100644 GIT binary patch literal 11976 zcmchcdyHJyUB_=onkL&ceT7E|l;bVXb?TY5lQ?zOaS}gUCw|r5O&cC{?#|rZ9q-KC z@ys2s7uOOt_O7X1sE{i92OuygyK(Gn*N+AlVF`m&ibVh6b;m}ChYCnY6d}Yv6@t(A zoO|!g?9SQ_30(Q^ch0@%{Lb(3{r%3l$A9zT`@Z6Fy~_O~y6^S8Ul88UAFhE1JkNlu z!JhzM1b+yuf$IN@;A7xxU>|q`%z=Ljt^vOXz84&L(DSx{Yr!30Bf)QgpQ3#agI@r5 zf-i$#1V0J>9k>yE^nIT95;y`5fxiXn{a=H-z(*ePypMrC_+jugDE+>gJinS?3zWS7 z0@s7jyx-{;g0gQ4l>A=@H-IttJour9J#Q=c888oi1>~RiNBmL0KLZEAhd$tWtHAZ( zsKZ|YCFeWf5I926#p5r7^6S^Z zXTX0=aNx(B9;4tPp8q)rb-m|}%ZEMSDD6|=82C@%EVySCxdHwq_<6PaoxK;q2JLTy z&w*PYtMdBs zL8$MofyDguwt$jb1J&IwDg?qX#+5SrMME({x6hCqK5pG?|f5PqkEVnqKJX6h}GeVV^7a6iPoid!+(1^q1#^!tAONv;jxAh$S6irP!@qAYkn?V29c^7bab zH-VG}d%c*TfG}EKP#!D~l^e>(^m-3JK9V-TecZ}hUEjyOh5Nl~^dBo#Yt86*zbQ3L zHH?gJj`-zL(G(`aQX$B%+@a=26Irj#rV-SS1a%YC>tWr5g+jAl4~ltjb0V%(je>FB zGfO=<+$?pytTrp7%ic8+KO9a5Rc|vtgKAVN_)#gWngV0h^vex171RT(cC8*BDHS#2 z*05PF+Gh>=H^!z7qwSGi|n48%Y%xHjnWkt|dEQCrOVjas}Piq;EZD!?>qf&Gqg78xUlj- zXh2yX^&6!^TK){>FDs=g{)zVGY4r=9e#!(GWUK1V>Yc_r#Z6-(tG{q7@~H%knre%b z?hqkFLgsJ~nZ8FKpel!VhKRnV3n8oXkzUuC7 zm(PSzy#iB80@7I^Q%&EVq@^LYquXXT*&V1_4%YleV=An(OsDhM>eSIBjkL%^n|`-e z_ovpkhqU`BHrj~v6p+0%+tT3JNE^R8ZP={XiKLd*zNd%@%DQ^=e0jJTP*-X!E|q}v z&wDQg)81~stSteFt9=ezj=Z-!h$g}!fu|ck*lXF1R=FHbX~VL+y&@OFW;HtQ>Qp|@ zt0pC=R4tU7MM_ob#eNJxT;-yBGYJ&R!Wp{BqxvUI)!K!$x$t&=*se# zbZ|A1HKq}i;jso)1O7zpbtwLMFX8u8iT&6yEgAg0s!aHCKUb2!!VQ9*JT`4onqHkAr)=i6cUbYw&Ii=!H zvZY~pD&b^wM{y0vjMoa{+ZnB|t$Xrj>qJnPwA%?=*tF`|RRF?ikD8xDT7x3V42EB>?%Fuoow`_;*=K^-rv&2qW>oeX1CViej~t@>5Wf`irva7T^* z#jpy+m^A6s^RA|wCQ7#%mb|iSWruB@-g3lJQm@d#5~q?4570 zZBg{>--b6*^+(AY=wA-URdg)P(>17bVan6D(X7?Nx^^h!cgc6$QCibTb`X-0CH_dQ z9QxYMxOI<>HpDiL*vvW|HciuZL84MOAjjCES;kTV)m^(P->%EenkIHKJU&e7_7C&1 zwPmBAjzv<~Cca)POTCxv*3xDS#Byr9cwq0Iy!Q%|7ehPOgwJr+#!9JSOCsK&rDPxq zuv`;_INxs+f@)EzT@13H`|6?AzueAZ?qyd}hs?G^esw%F`?nt$He;%el>EuQ{ehg9 z+uay16?0pf%7sASO46BYeab#{d@GC=R zpLAq*JunePwV}bmsi~=aB%!6T;HX9n7OnC*wy;qyQ$Dw@_wzv#+=?F@^9NV=?cTY2 zd)p1`@@xCHl6HKo=7!mP44Ei68V&MkRjO{ZUnSJ7O(VlQavR$Hq{~=P&u!Pv3ttbJ z4Wp$fGh@h%`F;D!d?c20JBUzY$W&{#+1T{NMn2p0X462`JZILe-q_di`F`u{&DTvl z*P4mX$8W}S@w{oBj<3;}j~7jA=GNKxa(uq?d*2SA&t+aM-o;3yz7@~iI&0#~j5-g* zi>)&nx){G{;sxehXw4$XO_YdlowRT0b&Vej4DVFy6umFCPInJ-J-hlzeR^j7;`6OD zH(zhf=z+6wE?)fmpT|b*zi{iU$Md&Zl75XFU2%fby`z8HSwa?3daiW}N5xmV%xKME z<25OBQIk3$3o=;^nJSO)z_ex^oaFJmM4bfASedEwH9Ee)`vvLBL|*FzPPE=U&*Md2 zGZx?yyCt{^c6@N~*GxVZT z75z_jpRZuIEgf%9Sg$aoXD97)grnwc{-q^B@uX%AJX#dv|!nI5)h6VAt%;>DW_Rw(|OQ|hZW;5@5V=V6U~AX3~`Bw2Xo z=1ijJ3L>*}oDPw;f+puU3ZktEuo}7&HJo%&1(v@WTg9GfTPlp1_M&{j6eUII)o7cK7BEh`Y zDd!Eer#`uwb`^8xY|_jARlQmCli_6HoN6bF{7B zD~;5eg|=7lDbg9Hs&S6q=auJ4(an|*s*0W3#>A@EeFCNNX=kZHAb4WaE3?wZp>>KW zoVS?JW+~C-nJsH=5d4}D7@b#6a;J^i$ zsXJ8Et^0Xso!=$D-EWEKTeIT4#!wiUZ>dR|LLm}%Ix6*!CdD+7|2$?VXKV31f?P7W zO@bEsORX7d3z{$nzjZUY1A&=6U6 zzr^&Us4SP=ad=V>(_yW2Q^7pRQgmA}^U6=ONDgRv45u<)C7>6V5!NFumRPgoSkh`g za~s(niR-r5n5yhpA`f5ODJ52>#Esv)Yw@WTgwL&d;*z-LRuJ~lE)*;1_qON3%w9?J zb<10QScxuKB_jfN%$POb#@T$Q4#bha1CPVQ>wRXtbIOr6(J4J?y;JY>TM**Dovumon`QY?j!O+gk^7qBq-0Mtl-t@#M86~nm}&+t zy}69Vi49JmqAbSU!Qktf)H*`Rqn%g$nzYD!{MM4n{v9^Azuug}C*!NA;mUVDfU+kIH0^iSd`)P0`sZmDD0>+4Ha%ce@WK z24vw?9n%UJ&wEP^UL=2@th!=*S76$i&E8A4USJ3l%+SnCz`NvgO$Qrz z&bSXAEFp~YrRo;$mAkY7v;OElf|h;a3L6)#3-Evpo>Irl4scj=AI|;cqW_GXA z8LLFgG?49xxc_#`PN(Sr542mFGx|=*cI0gm^bp&wMTte0E?pmV_5h^wc%?^|j&j$d zxQT(?B0Kt1`C7A%R0(HO`H63>kE|bYR>C{Hq`pc#2_f|hNvXL z-hrrP7I>*YRCr(=3~)PCJSRGe$xEG{j=^JZ##fRNS|V;UMx`tJikE1d-A)pC3VrzG zB6q~)WItlnX(y>8ArI{lJR)?2!ce?RLn$MCcaEUaH8Wd0lU(;Sp{D8FWYbKGUz$+X zi>X6Qm%+GVh6mS_O{$nP=-+vO@79#=N@Msg#adz{dsQS{oOEI$8rmWdUnB1?%YWH- z__@|~zNA%;(og7oR)-P7L+iU#d&UzMmkv%CzcJVSCfZ~Or?#1qjx(%V)&nF^$4?V~ zgV*dAPN0s?EuE-~@z+`>QV9%mm9E$7)5#c_&G-eQ|2gQgkQY*i0_RFFO}ipm!{9Fs l6)smLa4PfR4=S!oS-J#BG!m{-KJgW2v%I)O=^!b*{{i2Fy0!oS delta 136 zcmX>Rdx_cNo)F7a1|VPrVi_P-0b*t#)&XJ=umIv2KuJp=4N?OGlQYG__zcZ-4a{{7 zjT8(`tqe^jpA{2V2+7FLO)OS$&M3+(F3C()uqnyUbpYaIsK8_v@sE6l)(QnVrA3K3 Jwg%Q*3;^V|9OD20 diff --git a/rest_framework/locale/fa/LC_MESSAGES/django.po b/rest_framework/locale/fa/LC_MESSAGES/django.po index 0aa9ae4c6..6a5b99acf 100644 --- a/rest_framework/locale/fa/LC_MESSAGES/django.po +++ b/rest_framework/locale/fa/LC_MESSAGES/django.po @@ -3,437 +3,574 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Ali Mahdiyar , 2020 +# Aryan Baghi , 2020 +# Omid Zarin , 2019 +# Xavier Ordoquy , 2020 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" +"POT-Creation-Date: 2020-10-13 21:45+0200\n" +"PO-Revision-Date: 2020-10-13 19:58+0000\n" +"Last-Translator: Xavier Ordoquy \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" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#: authentication.py:70 +msgid "Invalid basic header. No credentials provided." +msgstr "هدر اولیه نامعتبر است. اطلاعات هویتی ارائه نشده است." #: authentication.py:73 -msgid "Invalid basic header. No credentials provided." -msgstr "" - -#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." -msgstr "" +msgstr "هدر اولیه نامعتبر است. رشته ی اطلاعات هویتی نباید شامل فاصله باشد." -#: authentication.py:82 +#: authentication.py:83 msgid "Invalid basic header. Credentials not correctly base64 encoded." -msgstr "" +msgstr "هدر اولیه نامعتبر است. اطلاعات هویتی با متد base64 به درستی رمزنگاری نشده است." -#: authentication.py:99 +#: authentication.py:101 msgid "Invalid username/password." -msgstr "" +msgstr "نام کاربری/رمز‌عبور نامعتبر است." -#: authentication.py:102 authentication.py:198 +#: authentication.py:104 authentication.py:206 msgid "User inactive or deleted." -msgstr "" +msgstr "کاربر غیر فعال یا حذف شده است." -#: authentication.py:176 +#: authentication.py:184 msgid "Invalid token header. No credentials provided." -msgstr "" +msgstr "توکن هدر نامعتبر است. اطلاعات هویتی ارائه نشده است. " -#: authentication.py:179 +#: authentication.py:187 msgid "Invalid token header. Token string should not contain spaces." -msgstr "" +msgstr "توکن هدر نامعتبر است. توکن نباید شامل فضای خالی باشد." -#: authentication.py:185 +#: authentication.py:193 msgid "" "Invalid token header. Token string should not contain invalid characters." -msgstr "" +msgstr "توکن هدر نامعتبر است. توکن شامل کاراکتر‌های نامعتبر است." -#: authentication.py:195 +#: authentication.py:203 msgid "Invalid token." -msgstr "" +msgstr "توکن هدر نامعتبر است. " #: authtoken/apps.py:7 msgid "Auth Token" -msgstr "" +msgstr "توکن اعتبار‌سنجی" -#: authtoken/models.py:15 +#: authtoken/models.py:13 msgid "Key" -msgstr "" +msgstr "کلید" + +#: authtoken/models.py:16 +msgid "User" +msgstr "کاربر" #: authtoken/models.py:18 -msgid "User" -msgstr "" - -#: authtoken/models.py:20 msgid "Created" -msgstr "" +msgstr "ایجاد‌شد" -#: authtoken/models.py:29 +#: authtoken/models.py:27 authtoken/serializers.py:19 msgid "Token" -msgstr "" +msgstr "توکن" -#: authtoken/models.py:30 +#: authtoken/models.py:28 msgid "Tokens" -msgstr "" - -#: authtoken/serializers.py:8 -msgid "Username" -msgstr "" +msgstr "توکن‌ها" #: authtoken/serializers.py:9 +msgid "Username" +msgstr "نام‌کاربری" + +#: authtoken/serializers.py:13 msgid "Password" -msgstr "" +msgstr "رمز‌عبور" -#: authtoken/serializers.py:20 -msgid "User account is disabled." -msgstr "" - -#: authtoken/serializers.py:23 +#: authtoken/serializers.py:35 msgid "Unable to log in with provided credentials." -msgstr "" +msgstr "با اطلاعات ارسال شده نمیتوان وارد شد." -#: authtoken/serializers.py:26 +#: authtoken/serializers.py:38 msgid "Must include \"username\" and \"password\"." -msgstr "" +msgstr "باید شامل نام‌کاربری و رمز‌عبود باشد." -#: exceptions.py:49 +#: exceptions.py:102 msgid "A server error occurred." +msgstr "خطای سمت سرور رخ داده است." + +#: exceptions.py:142 +msgid "Invalid input." msgstr "" -#: exceptions.py:84 +#: exceptions.py:161 msgid "Malformed request." -msgstr "" +msgstr "درخواست ناقص." -#: exceptions.py:89 +#: exceptions.py:167 msgid "Incorrect authentication credentials." -msgstr "" +msgstr "اطلاعات احراز هویت صحیح نیست." -#: exceptions.py:94 +#: exceptions.py:173 msgid "Authentication credentials were not provided." -msgstr "" +msgstr "اطلاعات برای اعتبارسنجی ارسال نشده است." -#: exceptions.py:99 +#: exceptions.py:179 msgid "You do not have permission to perform this action." -msgstr "" +msgstr "شما اجازه انجام این دستور را ندارید." -#: exceptions.py:104 views.py:81 +#: exceptions.py:185 msgid "Not found." -msgstr "" +msgstr "یافت نشد." -#: exceptions.py:109 +#: exceptions.py:191 +#, python-brace-format msgid "Method \"{method}\" not allowed." -msgstr "" +msgstr "متد {method} مجاز نیست." -#: exceptions.py:120 +#: exceptions.py:202 msgid "Could not satisfy the request Accept header." -msgstr "" +msgstr "نوع محتوای درخواستی در هدر قابل قبول نیست." -#: exceptions.py:132 +#: exceptions.py:212 +#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." -msgstr "" +msgstr "نوع رسانه {media_type} در درخواست پشتیبانی نمیشود." -#: exceptions.py:145 +#: exceptions.py:223 msgid "Request was throttled." +msgstr "تعداد درخواست‌های شما محدود شده است." + +#: exceptions.py:224 +#, python-brace-format +msgid "Expected available in {wait} second." msgstr "" -#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 -#: validators.py:181 +#: exceptions.py:225 +#, python-brace-format +msgid "Expected available in {wait} seconds." +msgstr "" + +#: fields.py:316 relations.py:245 relations.py:279 validators.py:90 +#: validators.py:183 msgid "This field is required." -msgstr "" +msgstr "این مقدار لازم است." -#: fields.py:270 +#: fields.py:317 msgid "This field may not be null." +msgstr "این مقدار نباید توهی باشد." + +#: fields.py:701 +msgid "Must be a valid boolean." msgstr "" -#: fields.py:608 fields.py:639 -msgid "\"{input}\" is not a valid boolean." +#: fields.py:766 +msgid "Not a valid string." msgstr "" -#: fields.py:674 +#: fields.py:767 msgid "This field may not be blank." -msgstr "" +msgstr "این مقدار نباید خالی باشد." -#: fields.py:675 fields.py:1675 +#: fields.py:768 fields.py:1881 +#, python-brace-format msgid "Ensure this field has no more than {max_length} characters." -msgstr "" +msgstr "مطمعن شوید طول این مقدار بیشتر از {max_length} نیست." -#: fields.py:676 +#: fields.py:769 +#, python-brace-format msgid "Ensure this field has at least {min_length} characters." -msgstr "" +msgstr "مطمعن شوید طول این مقدار حداقل {min_length} است." -#: fields.py:713 +#: fields.py:816 msgid "Enter a valid email address." -msgstr "" +msgstr "پست الکترونیکی صحبح وارد کنید." -#: fields.py:724 +#: fields.py:827 msgid "This value does not match the required pattern." -msgstr "" +msgstr "مقدار وارد شده با الگو مطابقت ندارد." -#: fields.py:735 +#: fields.py:838 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." +msgstr "یک \"slug\" معتبر شامل حروف، اعداد، آندرلاین یا خط فاصله وارد کنید" + +#: fields.py:839 +msgid "" +"Enter a valid \"slug\" consisting of Unicode letters, numbers, underscores, " +"or hyphens." msgstr "" -#: fields.py:747 +#: fields.py:854 msgid "Enter a valid URL." +msgstr "یک URL معتبر وارد کنید" + +#: fields.py:867 +msgid "Must be a valid UUID." msgstr "" -#: fields.py:760 -msgid "\"{value}\" is not a valid UUID." -msgstr "" - -#: fields.py:796 +#: fields.py:903 msgid "Enter a valid IPv4 or IPv6 address." -msgstr "" +msgstr "یک آدرس IPv4 یا IPv6 معتبر وارد کنید." -#: fields.py:821 +#: fields.py:931 msgid "A valid integer is required." -msgstr "" +msgstr "یک مقدار عددی معتبر لازم است." -#: fields.py:822 fields.py:857 fields.py:891 +#: fields.py:932 fields.py:969 fields.py:1005 fields.py:1366 +#, python-brace-format msgid "Ensure this value is less than or equal to {max_value}." -msgstr "" +msgstr "این مقدار باید کوچکتر یا مساوی با {max_value} باشد." -#: fields.py:823 fields.py:858 fields.py:892 +#: fields.py:933 fields.py:970 fields.py:1006 fields.py:1367 +#, python-brace-format msgid "Ensure this value is greater than or equal to {min_value}." -msgstr "" +msgstr "این مقدار باید بزرگتر یا مساوی با {min_value} باشد." -#: fields.py:824 fields.py:859 fields.py:896 +#: fields.py:934 fields.py:971 fields.py:1010 msgid "String value too large." -msgstr "" +msgstr "رشته بسیار طولانی است." -#: fields.py:856 fields.py:890 +#: fields.py:968 fields.py:1004 msgid "A valid number is required." -msgstr "" +msgstr "یک عدد معتبر نیاز است." -#: fields.py:893 +#: fields.py:1007 +#, python-brace-format msgid "Ensure that there are no more than {max_digits} digits in total." -msgstr "" +msgstr "بیشتر از {max_digits} رقم نباید وجود داشته باشد." -#: fields.py:894 +#: fields.py:1008 +#, python-brace-format msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." -msgstr "" +msgstr "بیشتر از {max_decimal_places} ممیز اعشار نباید وجود داشته باشد" -#: fields.py:895 +#: fields.py:1009 +#, python-brace-format msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." -msgstr "" +msgstr "بیشتر از {max_whole_digits} رقم نباید قبل از ممیز اعشار باشد." -#: fields.py:1025 +#: fields.py:1148 +#, python-brace-format msgid "Datetime has wrong format. Use one of these formats instead: {format}." -msgstr "" +msgstr "فرمت Datetime اشتباه است. از یکی از این فرمت ها استفاده کنید: {format}." -#: fields.py:1026 +#: fields.py:1149 msgid "Expected a datetime but got a date." +msgstr "باید datetime باشد اما date دریافت شد." + +#: fields.py:1150 +#, python-brace-format +msgid "Invalid datetime for the timezone \"{timezone}\"." msgstr "" -#: fields.py:1103 +#: fields.py:1151 +msgid "Datetime value out of range." +msgstr "" + +#: fields.py:1236 +#, python-brace-format msgid "Date has wrong format. Use one of these formats instead: {format}." -msgstr "" +msgstr "فرمت تاریخ اشتباه است. از یکی از این فرمت ها استفاده کنید: {format}." -#: fields.py:1104 +#: fields.py:1237 msgid "Expected a date but got a datetime." -msgstr "" +msgstr "باید date باشد اما datetime دریافت شد." -#: fields.py:1170 +#: fields.py:1303 +#, python-brace-format msgid "Time has wrong format. Use one of these formats instead: {format}." -msgstr "" +msgstr "فرمت Time اشتباه است. از یکی از این فرمت ها استفاده کنید: {format}." -#: fields.py:1232 +#: fields.py:1365 +#, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." -msgstr "" +msgstr "فرمت Duration اشتباه است. از یکی از این فرمت ها استفاده کنید: {format}." -#: fields.py:1251 fields.py:1300 +#: fields.py:1399 fields.py:1456 +#, python-brace-format msgid "\"{input}\" is not a valid choice." -msgstr "" +msgstr "\"{input}\" یک انتخاب معتبر نیست." -#: fields.py:1254 relations.py:71 relations.py:441 +#: fields.py:1402 +#, python-brace-format msgid "More than {count} items..." -msgstr "" +msgstr "بیشتر از {count} آیتم..." -#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 +#: fields.py:1457 fields.py:1603 relations.py:485 serializers.py:570 +#, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." -msgstr "" +msgstr "باید یک لیست از مقادیر ارسال شود اما یک «{input_type}» دریافت شد." -#: fields.py:1302 +#: fields.py:1458 msgid "This selection may not be empty." -msgstr "" +msgstr "این بخش نمی‌تواند خالی باشد." -#: fields.py:1339 +#: fields.py:1495 +#, python-brace-format msgid "\"{input}\" is not a valid path choice." -msgstr "" +msgstr "\"{input}\" یک مسیر انتخاب معتبر نیست." -#: fields.py:1358 +#: fields.py:1514 msgid "No file was submitted." -msgstr "" +msgstr "فایلی ارسال نشده است." -#: fields.py:1359 +#: fields.py:1515 msgid "" "The submitted data was not a file. Check the encoding type on the form." -msgstr "" +msgstr "دیتای ارسال شده فایل نیست. encoding type فرم را چک کنید." -#: fields.py:1360 +#: fields.py:1516 msgid "No filename could be determined." -msgstr "" +msgstr "اسم فایل مشخص نیست." -#: fields.py:1361 +#: fields.py:1517 msgid "The submitted file is empty." -msgstr "" +msgstr "فایل ارسال شده خالی است." -#: fields.py:1362 +#: fields.py:1518 +#, python-brace-format msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." -msgstr "" +msgstr "نام این فایل باید حداکثر {max_length} کاراکتر باشد ({length} کاراکتر دارد)." -#: fields.py:1410 +#: fields.py:1566 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." -msgstr "" +msgstr "یک عکس معتبر آپلود کنید. فایلی که ارسال کردید عکس یا عکس خراب شده نیست" -#: fields.py:1449 relations.py:438 serializers.py:525 +#: fields.py:1604 relations.py:486 serializers.py:571 msgid "This list may not be empty." +msgstr "این لیست نمی تواند خالی باشد" + +#: fields.py:1605 +#, python-brace-format +msgid "Ensure this field has at least {min_length} elements." msgstr "" -#: fields.py:1502 +#: fields.py:1606 +#, python-brace-format +msgid "Ensure this field has no more than {max_length} elements." +msgstr "" + +#: fields.py:1682 +#, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." +msgstr "باید دیکشنری از آیتم ها ارسال می شد، اما \"{input_type}\" ارسال شده است." + +#: fields.py:1683 +msgid "This dictionary may not be empty." msgstr "" -#: fields.py:1549 +#: fields.py:1755 msgid "Value must be valid JSON." +msgstr "مقدار باید JSON معتبر باشد." + +#: filters.py:49 templates/rest_framework/filters/search.html:2 +msgid "Search" +msgstr "جستجو" + +#: filters.py:50 +msgid "A search term." msgstr "" -#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 -msgid "Submit" +#: filters.py:180 templates/rest_framework/filters/ordering.html:3 +msgid "Ordering" +msgstr "ترتیب" + +#: filters.py:181 +msgid "Which field to use when ordering the results." msgstr "" -#: filters.py:336 +#: filters.py:287 msgid "ascending" -msgstr "" +msgstr "صعودی" -#: filters.py:337 +#: filters.py:288 msgid "descending" +msgstr "نزولی" + +#: pagination.py:174 +msgid "A page number within the paginated result set." msgstr "" -#: pagination.py:193 +#: pagination.py:179 pagination.py:372 pagination.py:590 +msgid "Number of results to return per page." +msgstr "" + +#: pagination.py:189 msgid "Invalid page." +msgstr "صفحه نامعتبر" + +#: pagination.py:374 +msgid "The initial index from which to return the results." msgstr "" -#: pagination.py:427 +#: pagination.py:581 +msgid "The pagination cursor value." +msgstr "" + +#: pagination.py:583 msgid "Invalid cursor" -msgstr "" +msgstr "مکان نمای نامعتبر" -#: relations.py:207 +#: relations.py:246 +#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." -msgstr "" +msgstr "pk نامعتبر \"{pk_value}\" - این Object وجود ندارد" -#: relations.py:208 +#: relations.py:247 +#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." -msgstr "" +msgstr "تایپ نامعتبر. باید pk ارسال می شد اما {data_type} ارسال شده است." -#: relations.py:240 +#: relations.py:280 msgid "Invalid hyperlink - No URL match." -msgstr "" +msgstr "هایپرلینک نامعتبر - URL مطابق وجود ندارد" -#: relations.py:241 +#: relations.py:281 msgid "Invalid hyperlink - Incorrect URL match." -msgstr "" +msgstr "هایپرلینک نامعتبر - خطا در تطابق URL" -#: relations.py:242 +#: relations.py:282 msgid "Invalid hyperlink - Object does not exist." -msgstr "" +msgstr "هایپرلینک نامعبتر - Object وجود ندارد." -#: relations.py:243 +#: relations.py:283 +#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." -msgstr "" +msgstr "داده نامعتبر. باید رشته ی URL باشد، اما {data_type} دریافت شد." -#: relations.py:401 +#: relations.py:448 +#, python-brace-format msgid "Object with {slug_name}={value} does not exist." -msgstr "" +msgstr "Object با {slug_name}={value} وجود ندارد." -#: relations.py:402 +#: relations.py:449 msgid "Invalid value." +msgstr "مقدار نامعتبر." + +#: schemas/utils.py:32 +msgid "unique integer value" msgstr "" -#: serializers.py:326 -msgid "Invalid data. Expected a dictionary, but got {datatype}." +#: schemas/utils.py:34 +msgid "UUID string" msgstr "" +#: schemas/utils.py:36 +msgid "unique value" +msgstr "" + +#: schemas/utils.py:38 +#, python-brace-format +msgid "A {value_type} identifying this {name}." +msgstr "" + +#: serializers.py:337 +#, python-brace-format +msgid "Invalid data. Expected a dictionary, but got {datatype}." +msgstr "داده نامعتبر. باید دیکشنری ارسال می شد، اما {datatype} ارسال شده است." + #: templates/rest_framework/admin.html:116 -#: templates/rest_framework/base.html:128 +#: templates/rest_framework/base.html:136 +msgid "Extra Actions" +msgstr "" + +#: templates/rest_framework/admin.html:130 +#: templates/rest_framework/base.html:150 msgid "Filters" +msgstr "فیلترها" + +#: templates/rest_framework/base.html:37 +msgid "navbar" msgstr "" -#: templates/rest_framework/filters/django_filter.html:2 -#: templates/rest_framework/filters/django_filter_crispyforms.html:4 -msgid "Field filters" +#: templates/rest_framework/base.html:75 +msgid "content" msgstr "" -#: templates/rest_framework/filters/ordering.html:3 -msgid "Ordering" +#: templates/rest_framework/base.html:78 +msgid "request form" msgstr "" -#: templates/rest_framework/filters/search.html:2 -msgid "Search" +#: templates/rest_framework/base.html:157 +msgid "main content" msgstr "" -#: templates/rest_framework/horizontal/radio.html:2 -#: templates/rest_framework/inline/radio.html:2 -#: templates/rest_framework/vertical/radio.html:2 +#: templates/rest_framework/base.html:173 +msgid "request info" +msgstr "" + +#: templates/rest_framework/base.html:177 +msgid "response info" +msgstr "" + +#: templates/rest_framework/horizontal/radio.html:4 +#: templates/rest_framework/inline/radio.html:3 +#: templates/rest_framework/vertical/radio.html:3 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 +#: templates/rest_framework/horizontal/select_multiple.html:4 +#: templates/rest_framework/inline/select_multiple.html:3 +#: templates/rest_framework/vertical/select_multiple.html:3 msgid "No items to select." -msgstr "" +msgstr "آیتمی برای انتخاب وجود ندارد" -#: validators.py:43 +#: validators.py:39 msgid "This field must be unique." -msgstr "" +msgstr "این فیلد باید یکتا باشد" -#: validators.py:97 +#: validators.py:89 +#, python-brace-format msgid "The fields {field_names} must make a unique set." +msgstr "فیلدهای {field_names} باید یک مجموعه یکتا باشند." + +#: validators.py:171 +#, python-brace-format +msgid "Surrogate characters are not allowed: U+{code_point:X}." msgstr "" -#: validators.py:245 +#: validators.py:243 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" date." -msgstr "" +msgstr "این فیلد باید برای تاریخ \"{date_field}\" یکتا باشد." -#: validators.py:260 +#: validators.py:258 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" month." -msgstr "" +msgstr "این فیلد باید برای ماه \"{date_field}\" یکتا باشد." -#: validators.py:273 +#: validators.py:271 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" year." -msgstr "" +msgstr "این فیلد باید برای سال \"{date_field}\" یکتا باشد." -#: versioning.py:42 +#: versioning.py:40 msgid "Invalid version in \"Accept\" header." -msgstr "" +msgstr "ورژن نامعتبر در هدر \"Accept\"." -#: versioning.py:73 +#: versioning.py:71 msgid "Invalid version in URL path." -msgstr "" +msgstr "ورژن نامعتبر در مسیر URL." -#: versioning.py:115 +#: versioning.py:116 msgid "Invalid version in URL path. Does not match any version namespace." -msgstr "" +msgstr "ورژن نامعتبر در مسیر URL. با هیچ نام گذاری ورژنی تطابق ندارد." -#: versioning.py:147 +#: versioning.py:148 msgid "Invalid version in hostname." -msgstr "" +msgstr "نسخه نامعتبر در نام هاست" -#: versioning.py:169 +#: versioning.py:170 msgid "Invalid version in query parameter." -msgstr "" - -#: views.py:88 -msgid "Permission denied." -msgstr "" +msgstr "ورژن نامعتبر در پارامتر کوئری." diff --git a/rest_framework/locale/fa_IR/LC_MESSAGES/django.mo b/rest_framework/locale/fa_IR/LC_MESSAGES/django.mo index 1f72e1090f6e667d41ee4f925ea7f9a0f51b6f6d..52d3f3bf84e43fd3972255b9ae363c56677e4d00 100644 GIT binary patch literal 11989 zcmchcZH!#kS;ucknx<~j(l%`fp>VuFyKX(Rb{ePgIu3UHl5AqfuDwnh0^Qu5xx0Jg znYrVcJ6>;BmWb=!b&y-Zhl+ln0<0>#aqMi?F9ZiE6=@L?2=M`0W^9BgP>F9;rASBx z!S8?0y?17IXKjZBu6*}D=iYOk^F06O<(zx`_aDCPYaZ8g+&`!LR?qvg@OJ)i_21!n z23!aJGWZ1eGhh`|{};jgz?Z-^;9Fo0{7Y~>_!IEGVE_9(?@@3AxErh|_y+hG?OPbU z4IBcW27eR$EcktJ3wZDQJ?}~I5I6|_0jT$X2krsyzSHx55%j?igEOG?`+D;Ha)K>T z^8O3l1a7{|=@)^rZxWRJZ-5VhP4HL14}HM%c7UG)^WfJ&{(0ZwkNW*J*bm5v^Rao zy*~in%JZY3?Eez@^WaxN$vX#r68tmpW8lAn2E3il9|1oJ-Ue;~q1@XB4uDUBxX_zU z@Fb}5UjY>&-vsXgUja9O-v;H+AA{2OVT9}bGoac>K*h^f!3V*!p!IXozV~jY?|xAI z4ub}q1EtRbDEph>d%*iX>hxF(ewubaxDgx%p8;n<+4T?Lz2FZ(+4J8?`won`pLQQe zD0+uL**^lla*O9Z56Z5O5%inE$3Xe-1@HmzHBh|%05srTO!7FG2ls%JAXIzb0gr&+ z10(QpoFe=q@Hwy_W7Ypf@QdL0lJ+J@J4pKk*wAzE0J!Jl4u21noF9RM;3!U49Df58 zuipkYgFi`d(=RwZBJg>he;*`ty*3d14^%d20sV(L)vlhOW+#t zKfq1ktpqQj?`;Of>poC&kAv#>tpxuZyoL6y+eu6#hYS$h?{h`*W>)%#(gLET5kDR7vXQ?K)-L-pX7Q79N<>WlA`vKzbFgdv##k8 zTHe0o_g0Y7V6P_<6yQc17nBDZhsq7*V|u-ZA0J5@;C^o9t*)Qqew6#YYV=Kqm1-kC z-etj=f(RR|H9-HljLQsv(MBo>L8l7u_9|uKmCx6X^kHA_~88>55 zt?b8nbEqDesKPxaAvD~Jx(O@w7!iYJ+C3r9Bq9#W?^sNu=FEI&+U%;-8&DHZ__0*y zr*D}u<;Xp*nCY^AY@`?z!m?i)sh0dgP(N;xwsGyechhph@i5kSi|}LODE3P?FJN*a zDg`5McqV2vfL>Vz^K#>{^zajJGi^Dtv%=`gk)}T+;!tlodAF`x4-&2sC^N=wG}h#`iXn|i6u$(K z&K%o~K+9ahh-_#nsMmXqL!tIKD9G}=uU=}5_nAUesfYDABRRi2qM8~4? zakLSeaa)qqRBj=lyN^w{?ta~U!h&jsUz?J7VH}j}nb>%$8knU1ji_NtJbW1M=#BqH|htuIXU z?ud3b=&^6~c{#ioks;zRI7ZyGg;o7=!Zx)9H}y?d4<|X)%5L2TJB;yx@~rY-GQp*K-I6;C!-q6bUKf%P906sNQ*pS)92Re zzSR2mkai#WMjMfy044V}@k<_x<_Y^TfSyzvqFOM_=>PnTxr5up{ zdGELgv?U;Mwa;P8k@xln@kCU_@pR({do8=sDwU#1ZCLiUSL8y}sKm!zoyzBV z)u050l|rdeq*SFW_F(|xQZA`l#Kl-x3d|&nOuaE$4k_bEP9EEJ3ehZ*qgqJOmE|$% z;A$dkOg$(O#~M@#_!G0&q4?*$B)%s@_G8mpG)5%v_||FbIhN{_+a&P!)mSkoVc!14 z*WLj~gw-yds6}yH(&PsNzgC#=4%&j3tYmQ%nUY^q$_%sU+m)Sl)1sZ1Ek;?Sl>NhO zX;_{@NJe)Q*MQ7;tsuUg(Q<9+$(tP$LE*67PT0bxRnM*h1f2F5a@=w`mRDBVpj?fo z^fKFU@T0wz?RZ}Hr>ukFdbH$M4tEXecv)$bO5N{d7^4!S(8g-jr(zb2SPqCCHU1aF z$`oVLq*KqEnr;d&U1wPG%C40iwso@Q0!vA~N(UQA?Kmo{8e7X#dX?e?ZH39+`3Bn- zMbG}Ndxt9iD0xHpm!feM9UJE98q~Qk<>^~*RI5=OF0@mNsJuET_g32lqXd_nu+$Vr1u<@EOk9SPtv9B*F$QB?Dd{ z$~8d*`F_0+REkRNVvzmZUyHQ<<%Wv6r(H=MG&`U7E8~$luiQZM;&R2wv3@Q;SDMZJlRG^WhM$5>bNYa44kAA^3r5S1TcSY^Bck-6c(FAtji z(vjVD{}7Vanf{45t_}_iOioVbW62K3f@2yuP_#DW*vZDZ%!b^?-p>cfb34nxm_IUf zU|`*vy+eC_x}3CL$_ZkTPzpoxQH@cN{$+1g(*kC=_?wyf#+ zmcMrT>dU4%-aFwNBFeLTjdbkn7pi zPwLY%>(@NnI(7Bs)~p^l8|Rx#|M(l&i2diTo%VSCdP~x;aHA_EINdw?r=2Ba38m*- zCn2hNsmqMkEH++|GUqj^6S63i)sU%Tga@WI=img77bNNgaLUR|$=B%SIo>ZyS0?gW zFF>MY^DK{-cny{FyprGM+jQ#T1tU&1oulH~X$Z&!wC0-gdV@whbG{Hoh+OPE)W`-X zGwsI~o&R6vOOHYRZ|7?+V6p5`Ov72vGm+LzYldz%psvsx>g9SU7hML|p5tD0QH?M; zf|vAM^mq%*IVC8?@;kI;Hu`KC;{)H-F2EC#;tn(u0(CIfAHpoBwGrODmL1Jweu?)76)ouizo; z%2Wo=l(u?jeVw?+^ruHMW_b@)sHNs2M>Rcc&n8@GUT7{|U9>{sYhJ0Z+5mZ0td1+h z={oU5?>a}@`n}pntyyS$2~LsDFjb8+^ggRRPl|4~d{9;F)Yd0fz3$^EjZZsE4IIG} zn_iif)(@?dOySsKLYt*{muI%DwMF2J%oaQFtykRnzuUdO^~b%8YrUW>Q;5p|4-L8& z%Xvi>51Dt)77ggcJxq>!vYmvBH${@o;WR$;)|xVg8d?Q zzWI{lZkbs#s>E7rX5|!Tx%`t{uobE^d?(tB1r}zkk!>Q!Q|xTlEx6iZ!=_u#a}G zSVh0LJr8E~N}4~kajOq2g-ce+@Ib2I^=a}Ped(Tr&yj1V2Z%i?f<6VV5Lo(@>P@oO zu}SOhLGCi_>ep>@iJ&y6T+k*urN^!}>YaWI61Z=tYf}8?Sbmh_Qo~T>UX!1c?1_e= zt(`>lOOk-8W{IU&S444QgA*t(E8=co@SB>{5~1YL&a3&7w8(q>){@HpooH@(xOc^t@3@!J3hzl#!kJZ^d-Xda;MVCZpFnd>{yYIo*fkQs7&_E7{1(Yiq2N4 zq!vlbo+ro9?LM3skhxcNOe!CP+d68S^Osw=j4Ii{W2?7g(l;}0JL%s|iX1qL?} z8Jd|1c$a*x>0krqjQilh65J>*Rkxs5bZG--`RG26mVJs9HZEEhhyyZ^V*o-_Pne5O zZR;u7iOaPyvwM|JUnN?mj%<6x{U2O*R80rsK)a=Rqwj=lN8S#C9%9?ID6zKeksbZ1e62YbR7uRH@)K??N0vv(O5zTdl#d*9EIR~WMr`Ld z)#~CD7&ztK5S1j@I}o+P0x#u5g@>pk0^AN2<`j;K, 2020 +# Aryan Baghi , 2020 +# Omid Zarin , 2019 +# Xavier Ordoquy , 2020 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" +"POT-Creation-Date: 2020-10-13 21:45+0200\n" +"PO-Revision-Date: 2020-10-13 19:59+0000\n" +"Last-Translator: Xavier Ordoquy \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" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#: authentication.py:70 +msgid "Invalid basic header. No credentials provided." +msgstr "هدر اولیه نامعتبر است. اطلاعات هویتی ارائه نشده است." #: authentication.py:73 -msgid "Invalid basic header. No credentials provided." -msgstr "" - -#: authentication.py:76 msgid "Invalid basic header. Credentials string should not contain spaces." -msgstr "" +msgstr "هدر اولیه نامعتبر است. رشته ی اطلاعات هویتی نباید شامل فاصله باشد." -#: authentication.py:82 +#: authentication.py:83 msgid "Invalid basic header. Credentials not correctly base64 encoded." -msgstr "" +msgstr "هدر اولیه نامعتبر است. اطلاعات هویتی با متد base64 به درستی رمزنگاری نشده است." -#: authentication.py:99 +#: authentication.py:101 msgid "Invalid username/password." -msgstr "" +msgstr "نام کاربری/رمز‌عبور نامعتبر است." -#: authentication.py:102 authentication.py:198 +#: authentication.py:104 authentication.py:206 msgid "User inactive or deleted." -msgstr "" +msgstr "کاربر غیر فعال یا حذف شده است." -#: authentication.py:176 +#: authentication.py:184 msgid "Invalid token header. No credentials provided." -msgstr "" +msgstr "توکن هدر نامعتبر است. اطلاعات هویتی ارائه نشده است. " -#: authentication.py:179 +#: authentication.py:187 msgid "Invalid token header. Token string should not contain spaces." -msgstr "" +msgstr "توکن هدر نامعتبر است. توکن نباید شامل فضای خالی باشد." -#: authentication.py:185 +#: authentication.py:193 msgid "" "Invalid token header. Token string should not contain invalid characters." -msgstr "" +msgstr "توکن هدر نامعتبر است. توکن شامل کاراکتر‌های نامعتبر است." -#: authentication.py:195 +#: authentication.py:203 msgid "Invalid token." -msgstr "" +msgstr "توکن هدر نامعتبر است. " #: authtoken/apps.py:7 msgid "Auth Token" -msgstr "" +msgstr "توکن اعتبار‌سنجی" -#: authtoken/models.py:15 +#: authtoken/models.py:13 msgid "Key" -msgstr "" +msgstr "کلید" + +#: authtoken/models.py:16 +msgid "User" +msgstr "کاربر" #: authtoken/models.py:18 -msgid "User" -msgstr "" - -#: authtoken/models.py:20 msgid "Created" -msgstr "" +msgstr "ایجاد‌شد" -#: authtoken/models.py:29 +#: authtoken/models.py:27 authtoken/serializers.py:19 msgid "Token" -msgstr "" +msgstr "توکن" -#: authtoken/models.py:30 +#: authtoken/models.py:28 msgid "Tokens" -msgstr "" - -#: authtoken/serializers.py:8 -msgid "Username" -msgstr "" +msgstr "توکن‌ها" #: authtoken/serializers.py:9 +msgid "Username" +msgstr "نام‌کاربری" + +#: authtoken/serializers.py:13 msgid "Password" -msgstr "" +msgstr "رمز‌عبور" -#: authtoken/serializers.py:20 -msgid "User account is disabled." -msgstr "" - -#: authtoken/serializers.py:23 +#: authtoken/serializers.py:35 msgid "Unable to log in with provided credentials." -msgstr "" +msgstr "با اطلاعات ارسال شده نمیتوان وارد شد." -#: authtoken/serializers.py:26 +#: authtoken/serializers.py:38 msgid "Must include \"username\" and \"password\"." -msgstr "" +msgstr "باید شامل نام‌کاربری و رمز‌عبود باشد." -#: exceptions.py:49 +#: exceptions.py:102 msgid "A server error occurred." +msgstr "خطای سمت سرور رخ داده است." + +#: exceptions.py:142 +msgid "Invalid input." msgstr "" -#: exceptions.py:84 +#: exceptions.py:161 msgid "Malformed request." -msgstr "" +msgstr "درخواست ناقص." -#: exceptions.py:89 +#: exceptions.py:167 msgid "Incorrect authentication credentials." -msgstr "" +msgstr "اطلاعات احراز هویت صحیح نیست." -#: exceptions.py:94 +#: exceptions.py:173 msgid "Authentication credentials were not provided." -msgstr "" +msgstr "اطلاعات برای اعتبارسنجی ارسال نشده است." -#: exceptions.py:99 +#: exceptions.py:179 msgid "You do not have permission to perform this action." -msgstr "" +msgstr "شما اجازه انجام این دستور را ندارید." -#: exceptions.py:104 views.py:81 +#: exceptions.py:185 msgid "Not found." -msgstr "" +msgstr "یافت نشد." -#: exceptions.py:109 +#: exceptions.py:191 +#, python-brace-format msgid "Method \"{method}\" not allowed." -msgstr "" +msgstr "متد {method} مجاز نیست." -#: exceptions.py:120 +#: exceptions.py:202 msgid "Could not satisfy the request Accept header." -msgstr "" +msgstr "نوع محتوای درخواستی در هدر قابل قبول نیست." -#: exceptions.py:132 +#: exceptions.py:212 +#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." -msgstr "" +msgstr "نوع رسانه {media_type} در درخواست پشتیبانی نمیشود." -#: exceptions.py:145 +#: exceptions.py:223 msgid "Request was throttled." +msgstr "تعداد درخواست‌های شما محدود شده است." + +#: exceptions.py:224 +#, python-brace-format +msgid "Expected available in {wait} second." msgstr "" -#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 -#: validators.py:181 +#: exceptions.py:225 +#, python-brace-format +msgid "Expected available in {wait} seconds." +msgstr "" + +#: fields.py:316 relations.py:245 relations.py:279 validators.py:90 +#: validators.py:183 msgid "This field is required." -msgstr "" +msgstr "این مقدار لازم است." -#: fields.py:270 +#: fields.py:317 msgid "This field may not be null." +msgstr "این مقدار نباید توهی باشد." + +#: fields.py:701 +msgid "Must be a valid boolean." msgstr "" -#: fields.py:608 fields.py:639 -msgid "\"{input}\" is not a valid boolean." +#: fields.py:766 +msgid "Not a valid string." msgstr "" -#: fields.py:674 +#: fields.py:767 msgid "This field may not be blank." -msgstr "" +msgstr "این مقدار نباید خالی باشد." -#: fields.py:675 fields.py:1675 +#: fields.py:768 fields.py:1881 +#, python-brace-format msgid "Ensure this field has no more than {max_length} characters." -msgstr "" +msgstr "مطمعن شوید طول این مقدار بیشتر از {max_length} نیست." -#: fields.py:676 +#: fields.py:769 +#, python-brace-format msgid "Ensure this field has at least {min_length} characters." -msgstr "" +msgstr "مطمعن شوید طول این مقدار حداقل {min_length} است." -#: fields.py:713 +#: fields.py:816 msgid "Enter a valid email address." -msgstr "" +msgstr "پست الکترونیکی صحبح وارد کنید." -#: fields.py:724 +#: fields.py:827 msgid "This value does not match the required pattern." -msgstr "" +msgstr "مقدار وارد شده با الگو مطابقت ندارد." -#: fields.py:735 +#: fields.py:838 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." +msgstr "یک \"slug\" معتبر شامل حروف، اعداد، آندرلاین یا خط فاصله وارد کنید" + +#: fields.py:839 +msgid "" +"Enter a valid \"slug\" consisting of Unicode letters, numbers, underscores, " +"or hyphens." msgstr "" -#: fields.py:747 +#: fields.py:854 msgid "Enter a valid URL." +msgstr "یک URL معتبر وارد کنید" + +#: fields.py:867 +msgid "Must be a valid UUID." msgstr "" -#: fields.py:760 -msgid "\"{value}\" is not a valid UUID." -msgstr "" - -#: fields.py:796 +#: fields.py:903 msgid "Enter a valid IPv4 or IPv6 address." -msgstr "" +msgstr "یک آدرس IPv4 یا IPv6 معتبر وارد کنید." -#: fields.py:821 +#: fields.py:931 msgid "A valid integer is required." -msgstr "" +msgstr "یک مقدار عددی معتبر لازم است." -#: fields.py:822 fields.py:857 fields.py:891 +#: fields.py:932 fields.py:969 fields.py:1005 fields.py:1366 +#, python-brace-format msgid "Ensure this value is less than or equal to {max_value}." -msgstr "" +msgstr "این مقدار باید کوچکتر یا مساوی با {max_value} باشد." -#: fields.py:823 fields.py:858 fields.py:892 +#: fields.py:933 fields.py:970 fields.py:1006 fields.py:1367 +#, python-brace-format msgid "Ensure this value is greater than or equal to {min_value}." -msgstr "" +msgstr "این مقدار باید بزرگتر یا مساوی با {min_value} باشد." -#: fields.py:824 fields.py:859 fields.py:896 +#: fields.py:934 fields.py:971 fields.py:1010 msgid "String value too large." -msgstr "" +msgstr "رشته بسیار طولانی است." -#: fields.py:856 fields.py:890 +#: fields.py:968 fields.py:1004 msgid "A valid number is required." -msgstr "" +msgstr "یک عدد معتبر نیاز است." -#: fields.py:893 +#: fields.py:1007 +#, python-brace-format msgid "Ensure that there are no more than {max_digits} digits in total." -msgstr "" +msgstr "بیشتر از {max_digits} رقم نباید وجود داشته باشد." -#: fields.py:894 +#: fields.py:1008 +#, python-brace-format msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." -msgstr "" +msgstr "بیشتر از {max_decimal_places} ممیز اعشار نباید وجود داشته باشد" -#: fields.py:895 +#: fields.py:1009 +#, python-brace-format msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." -msgstr "" +msgstr "بیشتر از {max_whole_digits} رقم نباید قبل از ممیز اعشار باشد." -#: fields.py:1025 +#: fields.py:1148 +#, python-brace-format msgid "Datetime has wrong format. Use one of these formats instead: {format}." -msgstr "" +msgstr "فرمت Datetime اشتباه است. از یکی از این فرمت ها استفاده کنید: {format}." -#: fields.py:1026 +#: fields.py:1149 msgid "Expected a datetime but got a date." +msgstr "باید datetime باشد اما date دریافت شد." + +#: fields.py:1150 +#, python-brace-format +msgid "Invalid datetime for the timezone \"{timezone}\"." msgstr "" -#: fields.py:1103 +#: fields.py:1151 +msgid "Datetime value out of range." +msgstr "" + +#: fields.py:1236 +#, python-brace-format msgid "Date has wrong format. Use one of these formats instead: {format}." -msgstr "" +msgstr "فرمت تاریخ اشتباه است. از یکی از این فرمت ها استفاده کنید: {format}." -#: fields.py:1104 +#: fields.py:1237 msgid "Expected a date but got a datetime." -msgstr "" +msgstr "باید date باشد اما datetime دریافت شد." -#: fields.py:1170 +#: fields.py:1303 +#, python-brace-format msgid "Time has wrong format. Use one of these formats instead: {format}." -msgstr "" +msgstr "فرمت Time اشتباه است. از یکی از این فرمت ها استفاده کنید: {format}." -#: fields.py:1232 +#: fields.py:1365 +#, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." -msgstr "" +msgstr "فرمت Duration اشتباه است. از یکی از این فرمت ها استفاده کنید: {format}." -#: fields.py:1251 fields.py:1300 +#: fields.py:1399 fields.py:1456 +#, python-brace-format msgid "\"{input}\" is not a valid choice." -msgstr "" +msgstr "\"{input}\" یک انتخاب معتبر نیست." -#: fields.py:1254 relations.py:71 relations.py:441 +#: fields.py:1402 +#, python-brace-format msgid "More than {count} items..." -msgstr "" +msgstr "بیشتر از {count} آیتم..." -#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 +#: fields.py:1457 fields.py:1603 relations.py:485 serializers.py:570 +#, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." -msgstr "" +msgstr "باید یک لیست از مقادیر ارسال شود اما یک «{input_type}» دریافت شد." -#: fields.py:1302 +#: fields.py:1458 msgid "This selection may not be empty." -msgstr "" +msgstr "این بخش نمی‌تواند خالی باشد." -#: fields.py:1339 +#: fields.py:1495 +#, python-brace-format msgid "\"{input}\" is not a valid path choice." -msgstr "" +msgstr "\"{input}\" یک مسیر انتخاب معتبر نیست." -#: fields.py:1358 +#: fields.py:1514 msgid "No file was submitted." -msgstr "" +msgstr "فایلی ارسال نشده است." -#: fields.py:1359 +#: fields.py:1515 msgid "" "The submitted data was not a file. Check the encoding type on the form." -msgstr "" +msgstr "دیتای ارسال شده فایل نیست. encoding type فرم را چک کنید." -#: fields.py:1360 +#: fields.py:1516 msgid "No filename could be determined." -msgstr "" +msgstr "اسم فایل مشخص نیست." -#: fields.py:1361 +#: fields.py:1517 msgid "The submitted file is empty." -msgstr "" +msgstr "فایل ارسال شده خالی است." -#: fields.py:1362 +#: fields.py:1518 +#, python-brace-format msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." -msgstr "" +msgstr "نام این فایل باید حداکثر {max_length} کاراکتر باشد ({length} کاراکتر دارد)." -#: fields.py:1410 +#: fields.py:1566 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." -msgstr "" +msgstr "یک عکس معتبر آپلود کنید. فایلی که ارسال کردید عکس یا عکس خراب شده نیست" -#: fields.py:1449 relations.py:438 serializers.py:525 +#: fields.py:1604 relations.py:486 serializers.py:571 msgid "This list may not be empty." +msgstr "این لیست نمی تواند خالی باشد" + +#: fields.py:1605 +#, python-brace-format +msgid "Ensure this field has at least {min_length} elements." msgstr "" -#: fields.py:1502 +#: fields.py:1606 +#, python-brace-format +msgid "Ensure this field has no more than {max_length} elements." +msgstr "" + +#: fields.py:1682 +#, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." +msgstr "باید دیکشنری از آیتم ها ارسال می شد، اما \"{input_type}\" ارسال شده است." + +#: fields.py:1683 +msgid "This dictionary may not be empty." msgstr "" -#: fields.py:1549 +#: fields.py:1755 msgid "Value must be valid JSON." +msgstr "مقدار باید JSON معتبر باشد." + +#: filters.py:49 templates/rest_framework/filters/search.html:2 +msgid "Search" +msgstr "جستجو" + +#: filters.py:50 +msgid "A search term." msgstr "" -#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 -msgid "Submit" +#: filters.py:180 templates/rest_framework/filters/ordering.html:3 +msgid "Ordering" +msgstr "ترتیب" + +#: filters.py:181 +msgid "Which field to use when ordering the results." msgstr "" -#: filters.py:336 +#: filters.py:287 msgid "ascending" -msgstr "" +msgstr "صعودی" -#: filters.py:337 +#: filters.py:288 msgid "descending" +msgstr "نزولی" + +#: pagination.py:174 +msgid "A page number within the paginated result set." msgstr "" -#: pagination.py:193 +#: pagination.py:179 pagination.py:372 pagination.py:590 +msgid "Number of results to return per page." +msgstr "" + +#: pagination.py:189 msgid "Invalid page." +msgstr "صفحه نامعتبر" + +#: pagination.py:374 +msgid "The initial index from which to return the results." msgstr "" -#: pagination.py:427 +#: pagination.py:581 +msgid "The pagination cursor value." +msgstr "" + +#: pagination.py:583 msgid "Invalid cursor" -msgstr "" +msgstr "مکان نمای نامعتبر" -#: relations.py:207 +#: relations.py:246 +#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." -msgstr "" +msgstr "pk نامعتبر \"{pk_value}\" - این Object وجود ندارد" -#: relations.py:208 +#: relations.py:247 +#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." -msgstr "" +msgstr "تایپ نامعتبر. باید pk ارسال می شد اما {data_type} ارسال شده است." -#: relations.py:240 +#: relations.py:280 msgid "Invalid hyperlink - No URL match." -msgstr "" +msgstr "هایپرلینک نامعتبر - URL مطابق وجود ندارد" -#: relations.py:241 +#: relations.py:281 msgid "Invalid hyperlink - Incorrect URL match." -msgstr "" +msgstr "هایپرلینک نامعتبر - خطا در تطابق URL" -#: relations.py:242 +#: relations.py:282 msgid "Invalid hyperlink - Object does not exist." -msgstr "" +msgstr "هایپرلینک نامعبتر - Object وجود ندارد." -#: relations.py:243 +#: relations.py:283 +#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." -msgstr "" +msgstr "داده نامعتبر. باید رشته ی URL باشد، اما {data_type} دریافت شد." -#: relations.py:401 +#: relations.py:448 +#, python-brace-format msgid "Object with {slug_name}={value} does not exist." -msgstr "" +msgstr "Object با {slug_name}={value} وجود ندارد." -#: relations.py:402 +#: relations.py:449 msgid "Invalid value." +msgstr "مقدار نامعتبر." + +#: schemas/utils.py:32 +msgid "unique integer value" msgstr "" -#: serializers.py:326 -msgid "Invalid data. Expected a dictionary, but got {datatype}." +#: schemas/utils.py:34 +msgid "UUID string" msgstr "" +#: schemas/utils.py:36 +msgid "unique value" +msgstr "" + +#: schemas/utils.py:38 +#, python-brace-format +msgid "A {value_type} identifying this {name}." +msgstr "" + +#: serializers.py:337 +#, python-brace-format +msgid "Invalid data. Expected a dictionary, but got {datatype}." +msgstr "داده نامعتبر. باید دیکشنری ارسال می شد، اما {datatype} ارسال شده است." + #: templates/rest_framework/admin.html:116 -#: templates/rest_framework/base.html:128 +#: templates/rest_framework/base.html:136 +msgid "Extra Actions" +msgstr "" + +#: templates/rest_framework/admin.html:130 +#: templates/rest_framework/base.html:150 msgid "Filters" +msgstr "فیلترها" + +#: templates/rest_framework/base.html:37 +msgid "navbar" msgstr "" -#: templates/rest_framework/filters/django_filter.html:2 -#: templates/rest_framework/filters/django_filter_crispyforms.html:4 -msgid "Field filters" +#: templates/rest_framework/base.html:75 +msgid "content" msgstr "" -#: templates/rest_framework/filters/ordering.html:3 -msgid "Ordering" +#: templates/rest_framework/base.html:78 +msgid "request form" msgstr "" -#: templates/rest_framework/filters/search.html:2 -msgid "Search" +#: templates/rest_framework/base.html:157 +msgid "main content" msgstr "" -#: templates/rest_framework/horizontal/radio.html:2 -#: templates/rest_framework/inline/radio.html:2 -#: templates/rest_framework/vertical/radio.html:2 +#: templates/rest_framework/base.html:173 +msgid "request info" +msgstr "" + +#: templates/rest_framework/base.html:177 +msgid "response info" +msgstr "" + +#: templates/rest_framework/horizontal/radio.html:4 +#: templates/rest_framework/inline/radio.html:3 +#: templates/rest_framework/vertical/radio.html:3 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 +#: templates/rest_framework/horizontal/select_multiple.html:4 +#: templates/rest_framework/inline/select_multiple.html:3 +#: templates/rest_framework/vertical/select_multiple.html:3 msgid "No items to select." -msgstr "" +msgstr "آیتمی برای انتخاب وجود ندارد" -#: validators.py:43 +#: validators.py:39 msgid "This field must be unique." -msgstr "" +msgstr "این فیلد باید یکتا باشد" -#: validators.py:97 +#: validators.py:89 +#, python-brace-format msgid "The fields {field_names} must make a unique set." +msgstr "فیلدهای {field_names} باید یک مجموعه یکتا باشند." + +#: validators.py:171 +#, python-brace-format +msgid "Surrogate characters are not allowed: U+{code_point:X}." msgstr "" -#: validators.py:245 +#: validators.py:243 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" date." -msgstr "" +msgstr "این فیلد باید برای تاریخ \"{date_field}\" یکتا باشد." -#: validators.py:260 +#: validators.py:258 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" month." -msgstr "" +msgstr "این فیلد باید برای ماه \"{date_field}\" یکتا باشد." -#: validators.py:273 +#: validators.py:271 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" year." -msgstr "" +msgstr "این فیلد باید برای سال \"{date_field}\" یکتا باشد." -#: versioning.py:42 +#: versioning.py:40 msgid "Invalid version in \"Accept\" header." -msgstr "" +msgstr "ورژن نامعتبر در هدر \"Accept\"." -#: versioning.py:73 +#: versioning.py:71 msgid "Invalid version in URL path." -msgstr "" +msgstr "ورژن نامعتبر در مسیر URL." -#: versioning.py:115 +#: versioning.py:116 msgid "Invalid version in URL path. Does not match any version namespace." -msgstr "" +msgstr "ورژن نامعتبر در مسیر URL. با هیچ نام گذاری ورژنی تطابق ندارد." -#: versioning.py:147 +#: versioning.py:148 msgid "Invalid version in hostname." -msgstr "" +msgstr "نسخه نامعتبر در نام هاست" -#: versioning.py:169 +#: versioning.py:170 msgid "Invalid version in query parameter." -msgstr "" - -#: views.py:88 -msgid "Permission denied." -msgstr "" +msgstr "ورژن نامعتبر در پارامتر کوئری." diff --git a/rest_framework/locale/fi/LC_MESSAGES/django.mo b/rest_framework/locale/fi/LC_MESSAGES/django.mo index 67dd26ef2cea382cfe820e3eb19867b8af42aeec..50a6d0f8a9fb01938b54ccd72ef0d55931faf36a 100644 GIT binary patch delta 2472 zcmZ|QZERCj9LMofwy_5h24jPJ1TJAVC*GfH$NuCYX>YDlteR!6g{UB8emtNi;@Z7~;eC*WM-g!jt{`Ip^H= z+;jiuoVz1kqn(MdX_?0irI#pGWEk_RoX7{omt%~DbFm87;7lAueg80);Azam&(M$8 za6aD0Z1m+CvjPLS8i&#*%tb0~ba?o6E4JfCd;=fD+t`T34;j;e8?XUSp|0P;wK#o} zF^^ynr{U|U2_AR*KXUyJHQrxXZxY5VeKS3Ovl7>14IV@O z%;$XQdpFRBlcpF`f%W((ZbF7I2QYwdVGVwY?cCq|N@W=~7_oHr@#7g`gl`&%( zGX*NK5$llOC(Iy~4Rm~n8u(9SW1Dtnp@Di(KRkdM@Ev51=3{KZQPk2Ddehe%QK{}l z{>)C-!>EazM?ZdpRXYEFQ_;YcT-7dZN8TwWh}r`KI0yH-?USfXokjMmNn$2mK~}?j zjasUoP!lX?aFS)Vp_b$o!} zQ<$A5v=uesov5YRg9~s3*WtIQ2dg5jKCH!rQrkm?Yo-siDc;6x{KEAbdT3`5Yl&&Z zcxj`elc1uvoK8>>yP1q$)aY%8tq^La%I1=`JF)94g9c7om;KHZac-I_6qVl_!W+Vv_D(LFmk?um#LhsapDt=2lbx zV6>L2iE_77yIA|-8Mi$bJKg#+h(3tj)n;I~27#qdOvd;`^+oy^(aSb+;Xk4BNq)?U8}zcQ zJSgjpSSv@aNs#Ru$gC~SoW gFONjRVS6aXd{0$haE5(5vLkkXC?1PBW4@Yy0XW$#F8}}l delta 2713 zcmZYATWl0n9LMpqz0d-dVu4Z$ZKti!Vriv9p|;Y}a5lPTf4K3q~J!Q zAcB~0_+SWLzQ5T4A3W)QKIhENocozx zUv_w9{QJC&V}`Vim_)Rv8*>o%4&y>Pm2FHZzKs?R;bgpp#W-TPF$Fjk^?oZ(#LYMY z2e2CV<23vjv+yRi8WT6akXgu$X*?~XxCqbVTud8j%xav6v++1K;#b&)qaHG*0oS2^ zKZfmi1VDWWZp`asRN)z{!#l{IsT`H+=`7TUn@|n)U_GA1X8aoG zVL`4jHMjw}We%a9JC2oj6*ZIh@KG!tO*^!2mXMi_Yfu%uj7#t=&cVRLsS2C1kn&Q$ z?4U;SENWyYkSR6i{PI2j_X!L?o%?f8Gtt6DOV@>QRTw2xfk!YO&!B}@a18#A8JI?a zRWVuk80I0{z_j|dA&;6aR6W~K+vqtQk1zS)KBPbf1dawaiUWwXF z5uAmGP-}eAFW*HCpmtp9xpuTD??83%AbK-`nUwFLI+RB5s&IHd^IuD*jvH%nJ8Gn# z;RL+o`vYpEcl~lY!+D%?5wd^Ha@5SM!vg_hY}A_n#?jE;$)_?c)stx97Njrc`8b(U zGH;?rdd~mhI+jtsjk9nR!_){CU?;ZW(|8iKSN_EL*h(eZj0bQvUd9G2V>(sOM%4YI zsDa0ClhITa6&Vx64%F`a0BPHNgW4N^U=vPa=cu9eI0H|i-oJ*qm{F3Nsj;Ym6`_`( z8C&oLd=fuLj&IxqtkkaWKsKz|i|W}CRKuU*Blt6F3UjDc4b@^JwxBw&4_D%QsPnJs z;{cfsR6Uze@9js`_XZZxzPUiAnHx7yYc+vZ^guIe%6pKX%ue4|kw5bxmukF*dM}Na z^j;+wmfv(B-za0F_Qo?f1^4>pcQBjw&HH53)3eAyFkfH>eupfdxry3*f1%cJ7_F(p zbC6j#`%p`D0@cwosLgi+TQH4QwFlcCxKa1Lb=1Vea=r;0>$zr}buo~6y0BQs; zqV~pXs3|{>%kfv#NE>NYGqVWQfn8iQRBU&buFSIPV(3lPDoH2o4Oh!~Cxxqr?U`3%p!v zT{n>5LM$Sx2=!b^-*%l{{f}5kXvUQ06J5ksLSMnfgwnDU-qL0JdB*Fdjaq+Ap^|p} zJTI5}NN9@J6KTXYLQABxt2I|jC$!PD7uFI=qX|BW-cjyB&8`xM!aH4Ffs0LK5b@1i z_)qDrcLgpb8i{UVCb5dprqTN8c+DY{nuv8??!U`iviU^0e`^yCBiOfIYURr3#!K}n zI=%mR+Js6^5S@f~eoz|-XSeMp?iO9h?6v!1(Znak^?vT3;zg-ka#=}LAhRp7%MK@&mQ?w< zzl*CAKU$>^N{a(s$*$5ZX}M}My2rBVg6r<7Nqkg3E4!WU*ff~@sr;3+yakTcA9386 wwae+-8H~BHVB*k}(*>>*avltIXmF1^bS4@d8mvi7ujtJP#d?E@cPncC1#S{*3;+NC diff --git a/rest_framework/locale/fi/LC_MESSAGES/django.po b/rest_framework/locale/fi/LC_MESSAGES/django.po index 0791a3005..97e5c1394 100644 --- a/rest_framework/locale/fi/LC_MESSAGES/django.po +++ b/rest_framework/locale/fi/LC_MESSAGES/django.po @@ -5,13 +5,14 @@ # Translators: # Aarni Koskela, 2015 # Aarni Koskela, 2015-2016 +# Kimmo Huoman , 2020 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: 2017-08-03 14:58+0000\n" -"Last-Translator: Aarni Koskela\n" +"POT-Creation-Date: 2020-10-13 21:45+0200\n" +"PO-Revision-Date: 2020-10-13 19:45+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,423 +20,556 @@ msgstr "" "Language: fi\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:73 +#: authentication.py:70 msgid "Invalid basic header. No credentials provided." -msgstr "Epäkelpo perusotsake. Ei annettuja tunnuksia." +msgstr "Epäkelpo \"basic\" -otsake. Ei annettuja tunnuksia." -#: authentication.py:76 +#: authentication.py:73 msgid "Invalid basic header. Credentials string should not contain spaces." -msgstr "Epäkelpo perusotsake. Tunnusmerkkijono ei saa sisältää välilyöntejä." +msgstr "Epäkelpo \"basic\" -otsake. Tunnusmerkkijono ei saa sisältää välilyöntejä." -#: authentication.py:82 +#: authentication.py:83 msgid "Invalid basic header. Credentials not correctly base64 encoded." -msgstr "Epäkelpo perusotsake. Tunnukset eivät ole base64-koodattu." +msgstr "Epäkelpo \"basic\" -otsake. Tunnukset eivät ole base64-koodattu." -#: authentication.py:99 +#: authentication.py:101 msgid "Invalid username/password." msgstr "Epäkelpo käyttäjänimi tai salasana." -#: authentication.py:102 authentication.py:198 +#: authentication.py:104 authentication.py:206 msgid "User inactive or deleted." msgstr "Käyttäjä ei-aktiivinen tai poistettu." -#: authentication.py:176 +#: authentication.py:184 msgid "Invalid token header. No credentials provided." -msgstr "Epäkelpo Token-otsake. Ei annettuja tunnuksia." +msgstr "Epäkelpo \"token\" -otsake. Ei annettuja tunnuksia." -#: authentication.py:179 +#: authentication.py:187 msgid "Invalid token header. Token string should not contain spaces." -msgstr "Epäkelpo Token-otsake. Tunnusmerkkijono ei saa sisältää välilyöntejä." +msgstr "Epäkelpo \"token\" -otsake. Tunnusmerkkijono ei saa sisältää välilyöntejä." -#: authentication.py:185 +#: authentication.py:193 msgid "" "Invalid token header. Token string should not contain invalid characters." -msgstr "Epäkelpo Token-otsake. Tunnusmerkkijono ei saa sisältää epäkelpoja merkkejä." +msgstr "Epäkelpo \"token\" -otsake. Tunnusmerkkijono ei saa sisältää epäkelpoja merkkejä." -#: authentication.py:195 +#: authentication.py:203 msgid "Invalid token." -msgstr "Epäkelpo Token." +msgstr "Epäkelpo token." #: authtoken/apps.py:7 msgid "Auth Token" msgstr "Autentikaatiotunniste" -#: authtoken/models.py:15 +#: authtoken/models.py:13 msgid "Key" msgstr "Avain" -#: authtoken/models.py:18 +#: authtoken/models.py:16 msgid "User" msgstr "Käyttäjä" -#: authtoken/models.py:20 +#: authtoken/models.py:18 msgid "Created" msgstr "Luotu" -#: authtoken/models.py:29 +#: authtoken/models.py:27 authtoken/serializers.py:19 msgid "Token" msgstr "Tunniste" -#: authtoken/models.py:30 +#: authtoken/models.py:28 msgid "Tokens" msgstr "Tunnisteet" -#: authtoken/serializers.py:8 +#: authtoken/serializers.py:9 msgid "Username" msgstr "Käyttäjänimi" -#: authtoken/serializers.py:9 +#: authtoken/serializers.py:13 msgid "Password" msgstr "Salasana" -#: authtoken/serializers.py:20 -msgid "User account is disabled." -msgstr "Käyttäjätili ei ole käytössä." - -#: authtoken/serializers.py:23 +#: authtoken/serializers.py:35 msgid "Unable to log in with provided credentials." -msgstr "Ei voitu kirjautua annetuilla tunnuksilla." +msgstr "Kirjautuminen epäonnistui annetuilla tunnuksilla." -#: authtoken/serializers.py:26 +#: authtoken/serializers.py:38 msgid "Must include \"username\" and \"password\"." msgstr "Pitää sisältää \"username\" ja \"password\"." -#: exceptions.py:49 +#: exceptions.py:102 msgid "A server error occurred." msgstr "Sattui palvelinvirhe." -#: exceptions.py:84 +#: exceptions.py:142 +msgid "Invalid input." +msgstr "" + +#: exceptions.py:161 msgid "Malformed request." msgstr "Pyyntö on virheellisen muotoinen." -#: exceptions.py:89 +#: exceptions.py:167 msgid "Incorrect authentication credentials." msgstr "Väärät autentikaatiotunnukset." -#: exceptions.py:94 +#: exceptions.py:173 msgid "Authentication credentials were not provided." msgstr "Autentikaatiotunnuksia ei annettu." -#: exceptions.py:99 +#: exceptions.py:179 msgid "You do not have permission to perform this action." -msgstr "Sinulla ei ole lupaa suorittaa tätä toimintoa." +msgstr "Sinulla ei ole oikeutta suorittaa tätä toimintoa." -#: exceptions.py:104 views.py:81 +#: exceptions.py:185 msgid "Not found." msgstr "Ei löydy." -#: exceptions.py:109 +#: exceptions.py:191 +#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "Metodi \"{method}\" ei ole sallittu." -#: exceptions.py:120 +#: exceptions.py:202 msgid "Could not satisfy the request Accept header." msgstr "Ei voitu vastata pyynnön Accept-otsakkeen mukaisesti." -#: exceptions.py:132 +#: exceptions.py:212 +#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "Pyynnön mediatyyppiä \"{media_type}\" ei tueta." -#: exceptions.py:145 +#: exceptions.py:223 msgid "Request was throttled." msgstr "Pyyntö hidastettu." -#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 -#: validators.py:181 +#: exceptions.py:224 +#, python-brace-format +msgid "Expected available in {wait} second." +msgstr "" + +#: exceptions.py:225 +#, python-brace-format +msgid "Expected available in {wait} seconds." +msgstr "" + +#: fields.py:316 relations.py:245 relations.py:279 validators.py:90 +#: validators.py:183 msgid "This field is required." msgstr "Tämä kenttä vaaditaan." -#: fields.py:270 +#: fields.py:317 msgid "This field may not be null." msgstr "Tämän kentän arvo ei voi olla \"null\"." -#: fields.py:608 fields.py:639 -msgid "\"{input}\" is not a valid boolean." -msgstr "\"{input}\" ei ole kelvollinen totuusarvo." +#: fields.py:701 +msgid "Must be a valid boolean." +msgstr "" -#: fields.py:674 +#: fields.py:766 +msgid "Not a valid string." +msgstr "" + +#: fields.py:767 msgid "This field may not be blank." msgstr "Tämä kenttä ei voi olla tyhjä." -#: fields.py:675 fields.py:1675 +#: fields.py:768 fields.py:1881 +#, python-brace-format msgid "Ensure this field has no more than {max_length} characters." msgstr "Arvo saa olla enintään {max_length} merkkiä pitkä." -#: fields.py:676 +#: fields.py:769 +#, python-brace-format msgid "Ensure this field has at least {min_length} characters." msgstr "Arvo tulee olla vähintään {min_length} merkkiä pitkä." -#: fields.py:713 +#: fields.py:816 msgid "Enter a valid email address." msgstr "Syötä kelvollinen sähköpostiosoite." -#: fields.py:724 +#: fields.py:827 msgid "This value does not match the required pattern." msgstr "Arvo ei täsmää vaadittuun kuvioon." -#: fields.py:735 +#: fields.py:838 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:747 +#: fields.py:839 +msgid "" +"Enter a valid \"slug\" consisting of Unicode letters, numbers, underscores, " +"or hyphens." +msgstr "" + +#: fields.py:854 msgid "Enter a valid URL." msgstr "Syötä oikea URL-osoite." -#: fields.py:760 -msgid "\"{value}\" is not a valid UUID." -msgstr "{value} ei ole kelvollinen UUID." +#: fields.py:867 +msgid "Must be a valid UUID." +msgstr "" -#: fields.py:796 +#: fields.py:903 msgid "Enter a valid IPv4 or IPv6 address." msgstr "Syötä kelvollinen IPv4- tai IPv6-osoite." -#: fields.py:821 +#: fields.py:931 msgid "A valid integer is required." msgstr "Syötä kelvollinen kokonaisluku." -#: fields.py:822 fields.py:857 fields.py:891 +#: fields.py:932 fields.py:969 fields.py:1005 fields.py:1366 +#, python-brace-format msgid "Ensure this value is less than or equal to {max_value}." -msgstr "Tämän arvon on oltava enintään {max_value}." +msgstr "Tämän arvon on oltava pienempi tai yhtä suuri kuin {max_value}." -#: fields.py:823 fields.py:858 fields.py:892 +#: fields.py:933 fields.py:970 fields.py:1006 fields.py:1367 +#, python-brace-format msgid "Ensure this value is greater than or equal to {min_value}." -msgstr "Tämän luvun on oltava vähintään {min_value}." +msgstr "Tämän luvun on oltava suurempi tai yhtä suuri kuin {min_value}." -#: fields.py:824 fields.py:859 fields.py:896 +#: fields.py:934 fields.py:971 fields.py:1010 msgid "String value too large." msgstr "Liian suuri merkkijonoarvo." -#: fields.py:856 fields.py:890 +#: fields.py:968 fields.py:1004 msgid "A valid number is required." msgstr "Kelvollinen luku vaaditaan." -#: fields.py:893 +#: fields.py:1007 +#, python-brace-format 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:894 +#: fields.py:1008 +#, python-brace-format 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." +msgstr "Tässä luvussa voi olla enintään {max_decimal_places} desimaalia." -#: fields.py:895 +#: fields.py:1009 +#, python-brace-format 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." +msgstr "Tässä luvussa voi olla enintään {max_whole_digits} numeroa ennen desimaalipilkkua." -#: fields.py:1025 +#: fields.py:1148 +#, python-brace-format 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:1026 +#: fields.py:1149 msgid "Expected a datetime but got a date." msgstr "Odotettiin päivämäärää ja aikaa, saatiin vain päivämäärä." -#: fields.py:1103 +#: fields.py:1150 +#, python-brace-format +msgid "Invalid datetime for the timezone \"{timezone}\"." +msgstr "" + +#: fields.py:1151 +msgid "Datetime value out of range." +msgstr "" + +#: fields.py:1236 +#, 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:1104 +#: fields.py:1237 msgid "Expected a date but got a datetime." msgstr "Odotettiin päivämäärää, saatiin päivämäärä ja aika." -#: fields.py:1170 +#: fields.py:1303 +#, 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:1232 +#: fields.py:1365 +#, 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:1251 fields.py:1300 +#: fields.py:1399 fields.py:1456 +#, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" ei ole kelvollinen valinta." -#: fields.py:1254 relations.py:71 relations.py:441 +#: fields.py:1402 +#, python-brace-format msgid "More than {count} items..." msgstr "Enemmän kuin {count} kappaletta..." -#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 +#: fields.py:1457 fields.py:1603 relations.py:485 serializers.py:570 +#, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Odotettiin listaa, saatiin tyyppi {input_type}." -#: fields.py:1302 +#: fields.py:1458 msgid "This selection may not be empty." msgstr "Valinta ei saa olla tyhjä." -#: fields.py:1339 +#: fields.py:1495 +#, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "\"{input}\" ei ole kelvollinen polku." -#: fields.py:1358 +#: fields.py:1514 msgid "No file was submitted." msgstr "Yhtään tiedostoa ei ole lähetetty." -#: fields.py:1359 +#: fields.py:1515 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:1360 +#: fields.py:1516 msgid "No filename could be determined." msgstr "Tiedostonimeä ei voitu päätellä." -#: fields.py:1361 +#: fields.py:1517 msgid "The submitted file is empty." msgstr "Lähetetty tiedosto on tyhjä." -#: fields.py:1362 +#: fields.py:1518 +#, 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:1410 +#: fields.py:1566 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:1449 relations.py:438 serializers.py:525 +#: fields.py:1604 relations.py:486 serializers.py:571 msgid "This list may not be empty." msgstr "Lista ei saa olla tyhjä." -#: fields.py:1502 +#: fields.py:1605 +#, python-brace-format +msgid "Ensure this field has at least {min_length} elements." +msgstr "" + +#: fields.py:1606 +#, python-brace-format +msgid "Ensure this field has no more than {max_length} elements." +msgstr "" + +#: fields.py:1682 +#, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "Odotettiin sanakirjaa, saatiin tyyppi {input_type}." -#: fields.py:1549 +#: fields.py:1683 +msgid "This dictionary may not be empty." +msgstr "" + +#: fields.py:1755 msgid "Value must be valid JSON." msgstr "Arvon pitää olla kelvollista JSONia." -#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 -msgid "Submit" -msgstr "Lähetä" +#: filters.py:49 templates/rest_framework/filters/search.html:2 +msgid "Search" +msgstr "Haku" -#: filters.py:336 +#: filters.py:50 +msgid "A search term." +msgstr "" + +#: filters.py:180 templates/rest_framework/filters/ordering.html:3 +msgid "Ordering" +msgstr "Järjestys" + +#: filters.py:181 +msgid "Which field to use when ordering the results." +msgstr "" + +#: filters.py:287 msgid "ascending" msgstr "nouseva" -#: filters.py:337 +#: filters.py:288 msgid "descending" msgstr "laskeva" -#: pagination.py:193 +#: pagination.py:174 +msgid "A page number within the paginated result set." +msgstr "" + +#: pagination.py:179 pagination.py:372 pagination.py:590 +msgid "Number of results to return per page." +msgstr "" + +#: pagination.py:189 msgid "Invalid page." msgstr "Epäkelpo sivu." -#: pagination.py:427 +#: pagination.py:374 +msgid "The initial index from which to return the results." +msgstr "" + +#: pagination.py:581 +msgid "The pagination cursor value." +msgstr "" + +#: pagination.py:583 msgid "Invalid cursor" msgstr "Epäkelpo kursori" -#: relations.py:207 +#: relations.py:246 +#, 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 +#: relations.py:247 +#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Väärä tyyppi. Odotettiin pääavainarvoa, saatiin {data_type}." -#: relations.py:240 +#: relations.py:280 msgid "Invalid hyperlink - No URL match." msgstr "Epäkelpo linkki - URL ei täsmää." -#: relations.py:241 +#: relations.py:281 msgid "Invalid hyperlink - Incorrect URL match." msgstr "Epäkelpo linkki - epäkelpo URL-osuma." -#: relations.py:242 +#: relations.py:282 msgid "Invalid hyperlink - Object does not exist." msgstr "Epäkelpo linkki - objektia ei ole." -#: relations.py:243 +#: relations.py:283 +#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Epäkelpo tyyppi. Odotettiin URL-merkkijonoa, saatiin {data_type}." -#: relations.py:401 +#: relations.py:448 +#, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "Objektia ({slug_name}={value}) ei ole." -#: relations.py:402 +#: relations.py:449 msgid "Invalid value." msgstr "Epäkelpo arvo." -#: serializers.py:326 +#: schemas/utils.py:32 +msgid "unique integer value" +msgstr "" + +#: schemas/utils.py:34 +msgid "UUID string" +msgstr "" + +#: schemas/utils.py:36 +msgid "unique value" +msgstr "" + +#: schemas/utils.py:38 +#, python-brace-format +msgid "A {value_type} identifying this {name}." +msgstr "" + +#: serializers.py:337 +#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "Odotettiin sanakirjaa, saatiin tyyppi {datatype}." #: templates/rest_framework/admin.html:116 -#: templates/rest_framework/base.html:128 +#: templates/rest_framework/base.html:136 +msgid "Extra Actions" +msgstr "" + +#: templates/rest_framework/admin.html:130 +#: templates/rest_framework/base.html:150 msgid "Filters" msgstr "Suotimet" -#: templates/rest_framework/filters/django_filter.html:2 -#: templates/rest_framework/filters/django_filter_crispyforms.html:4 -msgid "Field filters" -msgstr "Kenttäsuotimet" +#: templates/rest_framework/base.html:37 +msgid "navbar" +msgstr "" -#: templates/rest_framework/filters/ordering.html:3 -msgid "Ordering" -msgstr "Järjestys" +#: templates/rest_framework/base.html:75 +msgid "content" +msgstr "" -#: templates/rest_framework/filters/search.html:2 -msgid "Search" -msgstr "Haku" +#: templates/rest_framework/base.html:78 +msgid "request form" +msgstr "" -#: templates/rest_framework/horizontal/radio.html:2 -#: templates/rest_framework/inline/radio.html:2 -#: templates/rest_framework/vertical/radio.html:2 +#: templates/rest_framework/base.html:157 +msgid "main content" +msgstr "" + +#: templates/rest_framework/base.html:173 +msgid "request info" +msgstr "" + +#: templates/rest_framework/base.html:177 +msgid "response info" +msgstr "" + +#: templates/rest_framework/horizontal/radio.html:4 +#: templates/rest_framework/inline/radio.html:3 +#: templates/rest_framework/vertical/radio.html:3 msgid "None" msgstr "Ei mitään" -#: templates/rest_framework/horizontal/select_multiple.html:2 -#: templates/rest_framework/inline/select_multiple.html:2 -#: templates/rest_framework/vertical/select_multiple.html:2 +#: templates/rest_framework/horizontal/select_multiple.html:4 +#: templates/rest_framework/inline/select_multiple.html:3 +#: templates/rest_framework/vertical/select_multiple.html:3 msgid "No items to select." msgstr "Ei valittavia kohteita." -#: validators.py:43 +#: validators.py:39 msgid "This field must be unique." msgstr "Arvon tulee olla uniikki." -#: validators.py:97 +#: validators.py:89 +#, python-brace-format msgid "The fields {field_names} must make a unique set." msgstr "Kenttien {field_names} tulee muodostaa uniikki joukko." -#: validators.py:245 +#: validators.py:171 +#, python-brace-format +msgid "Surrogate characters are not allowed: U+{code_point:X}." +msgstr "" + +#: validators.py:243 +#, python-brace-format 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:260 +#: validators.py:258 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" month." msgstr "Kentän tulee olla uniikki kuukauden {date_field} suhteen." -#: validators.py:273 +#: validators.py:271 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" year." msgstr "Kentän tulee olla uniikki vuoden {date_field} suhteen." -#: versioning.py:42 +#: versioning.py:40 msgid "Invalid version in \"Accept\" header." msgstr "Epäkelpo versio Accept-otsakkeessa." -#: versioning.py:73 +#: versioning.py:71 msgid "Invalid version in URL path." msgstr "Epäkelpo versio URL-polussa." -#: versioning.py:115 +#: versioning.py:116 msgid "Invalid version in URL path. Does not match any version namespace." msgstr "URL-polun versio ei täsmää mihinkään versionimiavaruuteen." -#: versioning.py:147 +#: versioning.py:148 msgid "Invalid version in hostname." msgstr "Epäkelpo versio palvelinosoitteessa." -#: versioning.py:169 +#: versioning.py:170 msgid "Invalid version in query parameter." msgstr "Epäkelpo versio kyselyparametrissa." - -#: views.py:88 -msgid "Permission denied." -msgstr "Pääsy evätty." diff --git a/rest_framework/locale/fr/LC_MESSAGES/django.mo b/rest_framework/locale/fr/LC_MESSAGES/django.mo index b462e08d7185771785d15b3f7b20ba5579011b26..a1c0b3c2d4a0e9d28c07dac5652968dee90fcff6 100644 GIT binary patch delta 2624 zcmZ|Qe@vBC9LMp)PcadH03!11;VN)ZKtMqS&0mS)k3hj~&+|Mi=jx1eU+0|XdCqgr z`JVIeZR^>V$amutPZ-i>a;|cMF$ZNbKO}#OF&36$5iZAx*o(UVIn2Sc_yESR94})T z-oX**A8E`Yti%TFbB&lG3QK8-oA*TDbV>}OF^3^jEunyqIPu*Q}GgN(_KYvw&WtWJry;uY*cK^kiJbV z*5d}$0AEI;WqwAYY(^Bjd!-O_c)xj&!aUsIc@iI_epNSMCeu^LRmd1jD{4S{ktH7Miic>P?A>=FVq`CZ-DgO7Sg;d(S25mkf;A~EXLo21E zFB~i9oQ6cyX3{eAi7>0kN@K{)I0+w@u*iPN@lfJ)_&qs;H2fALjQOclXVg}K&D1tt1R+x(niv;8BY2* z&G#ztxQIN$9!SZvucuT*OGm~fMQ5kwCfQrlYolke^%N3T*G{2v(T;ZnfL8 zi=(Hrr^dy{2JJ5G*~cTslz32euExCvb>Qzst8M!bt#F_li6a34zh72JzY zQC2>*J1bJTh&?nsLD`*~*ddHXjiAgRjIvVKZ6BfR`plfjCf$SVS9K2K@G>sNYgmbs zxCS#drFP+N)aCqtO-0VDGdHq%d?-142W69di;}CSC`;;eMozT`_){g*FnQFlouREdEhd};2+5TRDU9WqyEM$%;BRT zIjuz|rv_05dK?+6x{k8h?jheI^#Em4KEYVb&ZnLCt3_1U$f^uwgv}_q?nZfGAIg#* z#u_|{GT`r#G%Jl!OR82PX;ob)?E#dfKWTd#<%9H({d*N(rI5U!g9?*U2T(?M7G;x7 zpo}zaabzYrDDC+ux%J~dJdcT($i`tmss$)3unc8l9Vq=9C<8iyGx63E)?b$94h;_6 zMpP5B+|uDxkrN?*ATO1Y5W%`iZlzQZq~0nkxynEpzg1*ktS4kLk}6(j4Rnpe#}z)FTsfnCxYuh0$8IJUM$dEi_4$U)puE~+1l+xY^3de`Uy{lyi%YADOP6b9 z<<%8cV-qPgj;J~cn%#q?h4 z+L~NX>T-ue3xAN-&h=s1=5Td-6ScR~H*&p`eva!~zzxV=MTBiZ>;baz23 z<$6~ua%iV=v!V<$oSU06%Q-rl)~{2phxcG0i%{*x%b-ai~*HC^GaY2wCy}HM6Pc1{B@JM}{_#t$@Uy}%{sq2Cq&ENn diff --git a/rest_framework/locale/fr/LC_MESSAGES/django.po b/rest_framework/locale/fr/LC_MESSAGES/django.po index 25b39e453..c2e08c80b 100644 --- a/rest_framework/locale/fr/LC_MESSAGES/django.po +++ b/rest_framework/locale/fr/LC_MESSAGES/django.po @@ -3,16 +3,18 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Erwann Mest , 2019 # Etienne Desgagné , 2015 # Martin Maillard , 2015 # Martin Maillard , 2015 +# Stéphane Raimbault , 2019 # Xavier Ordoquy , 2015-2016 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: 2017-08-03 14:58+0000\n" +"POT-Creation-Date: 2020-10-13 21:45+0200\n" +"PO-Revision-Date: 2020-10-13 19:45+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,40 +23,40 @@ msgstr "" "Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: authentication.py:73 +#: authentication.py:70 msgid "Invalid basic header. No credentials provided." msgstr "En-tête « basic » non valide. Informations d'identification non fournies." -#: authentication.py:76 +#: authentication.py:73 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:82 +#: authentication.py:83 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:99 +#: authentication.py:101 msgid "Invalid username/password." msgstr "Nom d'utilisateur et/ou mot de passe non valide(s)." -#: authentication.py:102 authentication.py:198 +#: authentication.py:104 authentication.py:206 msgid "User inactive or deleted." msgstr "Utilisateur inactif ou supprimé." -#: authentication.py:176 +#: authentication.py:184 msgid "Invalid token header. No credentials provided." msgstr "En-tête « token » non valide. Informations d'identification non fournies." -#: authentication.py:179 +#: authentication.py:187 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:185 +#: authentication.py:193 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:195 +#: authentication.py:203 msgid "Invalid token." msgstr "Token non valide." @@ -62,382 +64,515 @@ msgstr "Token non valide." msgid "Auth Token" msgstr "Jeton d'authentification" -#: authtoken/models.py:15 +#: authtoken/models.py:13 msgid "Key" msgstr "Clef" -#: authtoken/models.py:18 +#: authtoken/models.py:16 msgid "User" msgstr "Utilisateur" -#: authtoken/models.py:20 +#: authtoken/models.py:18 msgid "Created" msgstr "Création" -#: authtoken/models.py:29 +#: authtoken/models.py:27 authtoken/serializers.py:19 msgid "Token" msgstr "Jeton" -#: authtoken/models.py:30 +#: authtoken/models.py:28 msgid "Tokens" msgstr "Jetons" -#: authtoken/serializers.py:8 +#: authtoken/serializers.py:9 msgid "Username" msgstr "Nom de l'utilisateur" -#: authtoken/serializers.py:9 +#: authtoken/serializers.py:13 msgid "Password" msgstr "Mot de passe" -#: authtoken/serializers.py:20 -msgid "User account is disabled." -msgstr "Ce compte est désactivé." - -#: authtoken/serializers.py:23 +#: authtoken/serializers.py:35 msgid "Unable to log in with provided credentials." msgstr "Impossible de se connecter avec les informations d'identification fournies." -#: authtoken/serializers.py:26 +#: authtoken/serializers.py:38 msgid "Must include \"username\" and \"password\"." -msgstr "\"username\" et \"password\" doivent être inclus." +msgstr "« username » et « password » doivent être inclus." -#: exceptions.py:49 +#: exceptions.py:102 msgid "A server error occurred." msgstr "Une erreur du serveur est survenue." -#: exceptions.py:84 +#: exceptions.py:142 +msgid "Invalid input." +msgstr "" + +#: exceptions.py:161 msgid "Malformed request." msgstr "Requête malformée" -#: exceptions.py:89 +#: exceptions.py:167 msgid "Incorrect authentication credentials." msgstr "Informations d'authentification incorrectes." -#: exceptions.py:94 +#: exceptions.py:173 msgid "Authentication credentials were not provided." msgstr "Informations d'authentification non fournies." -#: exceptions.py:99 +#: exceptions.py:179 msgid "You do not have permission to perform this action." msgstr "Vous n'avez pas la permission d'effectuer cette action." -#: exceptions.py:104 views.py:81 +#: exceptions.py:185 msgid "Not found." msgstr "Pas trouvé." -#: exceptions.py:109 +#: exceptions.py:191 +#, python-brace-format msgid "Method \"{method}\" not allowed." -msgstr "Méthode \"{method}\" non autorisée." +msgstr "Méthode « {method} » non autorisée." -#: exceptions.py:120 +#: exceptions.py:202 msgid "Could not satisfy the request Accept header." msgstr "L'en-tête « Accept » n'a pas pu être satisfaite." -#: exceptions.py:132 +#: exceptions.py:212 +#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." -msgstr "Type de média \"{media_type}\" non supporté." +msgstr "Type de média « {media_type} » non supporté." -#: exceptions.py:145 +#: exceptions.py:223 msgid "Request was throttled." msgstr "Requête ralentie." -#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 -#: validators.py:181 +#: exceptions.py:224 +#, python-brace-format +msgid "Expected available in {wait} second." +msgstr "" + +#: exceptions.py:225 +#, python-brace-format +msgid "Expected available in {wait} seconds." +msgstr "" + +#: fields.py:316 relations.py:245 relations.py:279 validators.py:90 +#: validators.py:183 msgid "This field is required." msgstr "Ce champ est obligatoire." -#: fields.py:270 +#: fields.py:317 msgid "This field may not be null." msgstr "Ce champ ne peut être nul." -#: fields.py:608 fields.py:639 -msgid "\"{input}\" is not a valid boolean." -msgstr "\"{input}\" n'est pas un booléen valide." +#: fields.py:701 +msgid "Must be a valid boolean." +msgstr "" -#: fields.py:674 +#: fields.py:766 +msgid "Not a valid string." +msgstr "" + +#: fields.py:767 msgid "This field may not be blank." msgstr "Ce champ ne peut être vide." -#: fields.py:675 fields.py:1675 +#: fields.py:768 fields.py:1881 +#, 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." +msgstr "Assurez-vous que ce champ comporte au plus {max_length} caractères." -#: fields.py:676 +#: fields.py:769 +#, python-brace-format msgid "Ensure this field has at least {min_length} characters." -msgstr "Assurez-vous que ce champ comporte au moins {min_length} caractères." +msgstr "Assurez-vous que ce champ comporte au moins {min_length} caractères." -#: fields.py:713 +#: fields.py:816 msgid "Enter a valid email address." -msgstr "Saisissez une adresse email valable." +msgstr "Saisissez une adresse e-mail valide." -#: fields.py:724 +#: fields.py:827 msgid "This value does not match the required pattern." msgstr "Cette valeur ne satisfait pas le motif imposé." -#: fields.py:735 +#: fields.py:838 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:747 +#: fields.py:839 +msgid "" +"Enter a valid \"slug\" consisting of Unicode letters, numbers, underscores, " +"or hyphens." +msgstr "" + +#: fields.py:854 msgid "Enter a valid URL." msgstr "Saisissez une URL valide." -#: fields.py:760 -msgid "\"{value}\" is not a valid UUID." -msgstr "\"{value}\" n'est pas un UUID valide." +#: fields.py:867 +msgid "Must be a valid UUID." +msgstr "" -#: fields.py:796 +#: fields.py:903 msgid "Enter a valid IPv4 or IPv6 address." msgstr "Saisissez une adresse IPv4 ou IPv6 valide." -#: fields.py:821 +#: fields.py:931 msgid "A valid integer is required." msgstr "Un nombre entier valide est requis." -#: fields.py:822 fields.py:857 fields.py:891 +#: fields.py:932 fields.py:969 fields.py:1005 fields.py:1366 +#, python-brace-format 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}." +msgstr "Assurez-vous que cette valeur est inférieure ou égale à {max_value}." -#: fields.py:823 fields.py:858 fields.py:892 +#: fields.py:933 fields.py:970 fields.py:1006 fields.py:1367 +#, python-brace-format 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}." +msgstr "Assurez-vous que cette valeur est supérieure ou égale à {min_value}." -#: fields.py:824 fields.py:859 fields.py:896 +#: fields.py:934 fields.py:971 fields.py:1010 msgid "String value too large." msgstr "Chaîne de caractères trop longue." -#: fields.py:856 fields.py:890 +#: fields.py:968 fields.py:1004 msgid "A valid number is required." msgstr "Un nombre valide est requis." -#: fields.py:893 +#: fields.py:1007 +#, python-brace-format 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." +msgstr "Assurez-vous qu'il n'y a pas plus de {max_digits} chiffres au total." -#: fields.py:894 +#: fields.py:1008 +#, python-brace-format 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." +msgstr "Assurez-vous qu'il n'y a pas plus de {max_decimal_places} chiffres après la virgule." -#: fields.py:895 +#: fields.py:1009 +#, python-brace-format 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:1025 +#: fields.py:1148 +#, python-brace-format 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}." +msgstr "La date + heure n'a pas le bon format. Utilisez un des formats suivants : {format}." -#: fields.py:1026 +#: fields.py:1149 msgid "Expected a datetime but got a date." msgstr "Attendait une date + heure mais a reçu une date." -#: 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:1150 +#, python-brace-format +msgid "Invalid datetime for the timezone \"{timezone}\"." +msgstr "" -#: fields.py:1104 +#: fields.py:1151 +msgid "Datetime value out of range." +msgstr "" + +#: fields.py:1236 +#, 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:1237 msgid "Expected a date but got a datetime." msgstr "Attendait une date mais a reçu une date + heure." -#: fields.py:1170 +#: fields.py:1303 +#, 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}." +msgstr "L'heure n'a pas le bon format. Utilisez un des formats suivants : {format}." -#: fields.py:1232 +#: fields.py:1365 +#, 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}." +msgstr "La durée n'a pas le bon format. Utilisez l'un des formats suivants : {format}." -#: fields.py:1251 fields.py:1300 +#: fields.py:1399 fields.py:1456 +#, python-brace-format msgid "\"{input}\" is not a valid choice." -msgstr "\"{input}\" n'est pas un choix valide." +msgstr "« {input} » n'est pas un choix valide." -#: fields.py:1254 relations.py:71 relations.py:441 +#: fields.py:1402 +#, python-brace-format msgid "More than {count} items..." msgstr "Plus de {count} éléments..." -#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 +#: fields.py:1457 fields.py:1603 relations.py:485 serializers.py:570 +#, 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}\"." +msgstr "Attendait une liste d'éléments mais a reçu « {input_type} »." -#: fields.py:1302 +#: fields.py:1458 msgid "This selection may not be empty." msgstr "Cette sélection ne peut être vide." -#: fields.py:1339 +#: fields.py:1495 +#, python-brace-format msgid "\"{input}\" is not a valid path choice." -msgstr "\"{input}\" n'est pas un choix de chemin valide." +msgstr "« {input} » n'est pas un choix de chemin valide." -#: fields.py:1358 +#: fields.py:1514 msgid "No file was submitted." msgstr "Aucun fichier n'a été soumis." -#: fields.py:1359 +#: fields.py:1515 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:1360 +#: fields.py:1516 msgid "No filename could be determined." msgstr "Le nom de fichier n'a pu être déterminé." -#: fields.py:1361 +#: fields.py:1517 msgid "The submitted file is empty." msgstr "Le fichier soumis est vide." -#: fields.py:1362 +#: fields.py:1518 +#, 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})." +msgstr "Assurez-vous que le nom de fichier comporte au plus {max_length} caractères (il en comporte {length})." -#: fields.py:1410 +#: fields.py:1566 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:1449 relations.py:438 serializers.py:525 +#: fields.py:1604 relations.py:486 serializers.py:571 msgid "This list may not be empty." msgstr "Cette liste ne peut pas être vide." -#: 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:1605 +#, python-brace-format +msgid "Ensure this field has at least {min_length} elements." +msgstr "" -#: fields.py:1549 +#: fields.py:1606 +#, python-brace-format +msgid "Ensure this field has no more than {max_length} elements." +msgstr "" + +#: fields.py:1682 +#, 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:1683 +msgid "This dictionary may not be empty." +msgstr "" + +#: fields.py:1755 msgid "Value must be valid JSON." msgstr "La valeur doit être un JSON valide." -#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 -msgid "Submit" -msgstr "Envoyer" +#: filters.py:49 templates/rest_framework/filters/search.html:2 +msgid "Search" +msgstr "Recherche" -#: filters.py:336 +#: filters.py:50 +msgid "A search term." +msgstr "" + +#: filters.py:180 templates/rest_framework/filters/ordering.html:3 +msgid "Ordering" +msgstr "Ordre" + +#: filters.py:181 +msgid "Which field to use when ordering the results." +msgstr "" + +#: filters.py:287 msgid "ascending" msgstr "croissant" -#: filters.py:337 +#: filters.py:288 msgid "descending" msgstr "décroissant" -#: pagination.py:193 -msgid "Invalid page." -msgstr "Page invalide." +#: pagination.py:174 +msgid "A page number within the paginated result set." +msgstr "" -#: pagination.py:427 +#: pagination.py:179 pagination.py:372 pagination.py:590 +msgid "Number of results to return per page." +msgstr "" + +#: pagination.py:189 +msgid "Invalid page." +msgstr "Page non valide." + +#: pagination.py:374 +msgid "The initial index from which to return the results." +msgstr "" + +#: pagination.py:581 +msgid "The pagination cursor value." +msgstr "" + +#: pagination.py:583 msgid "Invalid cursor" msgstr "Curseur non valide" -#: relations.py:207 +#: relations.py:246 +#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." -msgstr "Clé primaire \"{pk_value}\" non valide - l'objet n'existe pas." +msgstr "Clé primaire « {pk_value} » non valide - l'objet n'existe pas." -#: relations.py:208 +#: relations.py:247 +#, 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:240 +#: relations.py:280 msgid "Invalid hyperlink - No URL match." -msgstr "Lien non valide : pas d'URL correspondante." +msgstr "Lien non valide : pas d'URL correspondante." -#: relations.py:241 +#: relations.py:281 msgid "Invalid hyperlink - Incorrect URL match." -msgstr "Lien non valide : URL correspondante incorrecte." +msgstr "Lien non valide : URL correspondante incorrecte." -#: relations.py:242 +#: relations.py:282 msgid "Invalid hyperlink - Object does not exist." -msgstr "Lien non valide : l'objet n'existe pas." +msgstr "Lien non valide : l'objet n'existe pas." -#: relations.py:243 +#: relations.py:283 +#, 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:401 +#: relations.py:448 +#, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "L'object avec {slug_name}={value} n'existe pas." -#: relations.py:402 +#: relations.py:449 msgid "Invalid value." msgstr "Valeur non valide." -#: serializers.py:326 +#: schemas/utils.py:32 +msgid "unique integer value" +msgstr "" + +#: schemas/utils.py:34 +msgid "UUID string" +msgstr "" + +#: schemas/utils.py:36 +msgid "unique value" +msgstr "" + +#: schemas/utils.py:38 +#, python-brace-format +msgid "A {value_type} identifying this {name}." +msgstr "" + +#: serializers.py:337 +#, 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:116 -#: templates/rest_framework/base.html:128 +#: templates/rest_framework/base.html:136 +msgid "Extra Actions" +msgstr "" + +#: templates/rest_framework/admin.html:130 +#: templates/rest_framework/base.html:150 msgid "Filters" msgstr "Filtres" -#: templates/rest_framework/filters/django_filter.html:2 -#: templates/rest_framework/filters/django_filter_crispyforms.html:4 -msgid "Field filters" -msgstr "Filtres de champ" +#: templates/rest_framework/base.html:37 +msgid "navbar" +msgstr "" -#: templates/rest_framework/filters/ordering.html:3 -msgid "Ordering" -msgstr "Ordre" +#: templates/rest_framework/base.html:75 +msgid "content" +msgstr "" -#: templates/rest_framework/filters/search.html:2 -msgid "Search" -msgstr "Recherche" +#: templates/rest_framework/base.html:78 +msgid "request form" +msgstr "" -#: templates/rest_framework/horizontal/radio.html:2 -#: templates/rest_framework/inline/radio.html:2 -#: templates/rest_framework/vertical/radio.html:2 +#: templates/rest_framework/base.html:157 +msgid "main content" +msgstr "" + +#: templates/rest_framework/base.html:173 +msgid "request info" +msgstr "" + +#: templates/rest_framework/base.html:177 +msgid "response info" +msgstr "" + +#: templates/rest_framework/horizontal/radio.html:4 +#: templates/rest_framework/inline/radio.html:3 +#: templates/rest_framework/vertical/radio.html:3 msgid "None" msgstr "Aucune" -#: templates/rest_framework/horizontal/select_multiple.html:2 -#: templates/rest_framework/inline/select_multiple.html:2 -#: templates/rest_framework/vertical/select_multiple.html:2 +#: templates/rest_framework/horizontal/select_multiple.html:4 +#: templates/rest_framework/inline/select_multiple.html:3 +#: templates/rest_framework/vertical/select_multiple.html:3 msgid "No items to select." msgstr "Aucun élément à sélectionner." -#: validators.py:43 +#: validators.py:39 msgid "This field must be unique." msgstr "Ce champ doit être unique." -#: validators.py:97 +#: validators.py:89 +#, python-brace-format msgid "The fields {field_names} must make a unique set." msgstr "Les champs {field_names} doivent former un ensemble unique." -#: validators.py:245 +#: validators.py:171 +#, python-brace-format +msgid "Surrogate characters are not allowed: U+{code_point:X}." +msgstr "" + +#: validators.py:243 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" date." -msgstr "Ce champ doit être unique pour la date \"{date_field}\"." +msgstr "Ce champ doit être unique pour la date « {date_field} »." -#: validators.py:260 +#: validators.py:258 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" month." -msgstr "Ce champ doit être unique pour le mois \"{date_field}\"." +msgstr "Ce champ doit être unique pour le mois « {date_field} »." -#: validators.py:273 +#: validators.py:271 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" year." -msgstr "Ce champ doit être unique pour l'année \"{date_field}\"." +msgstr "Ce champ doit être unique pour l'année « {date_field} »." -#: versioning.py:42 +#: versioning.py:40 msgid "Invalid version in \"Accept\" header." msgstr "Version non valide dans l'en-tête « Accept »." -#: versioning.py:73 +#: versioning.py:71 msgid "Invalid version in URL path." msgstr "Version non valide dans l'URL." -#: versioning.py:115 +#: versioning.py:116 msgid "Invalid version in URL path. Does not match any version namespace." msgstr "Version invalide dans l'URL. Ne correspond à aucune version de l'espace de nommage." -#: versioning.py:147 +#: versioning.py:148 msgid "Invalid version in hostname." msgstr "Version non valide dans le nom d'hôte." -#: versioning.py:169 +#: versioning.py:170 msgid "Invalid version in query parameter." msgstr "Version non valide dans le paramètre de requête." - -#: views.py:88 -msgid "Permission denied." -msgstr "Permission refusée." diff --git a/rest_framework/locale/hu/LC_MESSAGES/django.mo b/rest_framework/locale/hu/LC_MESSAGES/django.mo index 8fadddcea143d0981a071d72c1801565403d1c8e..61f285299f185130df373672340c8f4146af0556 100644 GIT binary patch delta 3436 zcmb8vdu&tJ9l-Gu5|R)SMnWirgm4IySHUDe(h_KahQ}aTfRKdJ7rod=@vZIaaPPGt zL6xPhYu9z{pl3*E6Y5fJ(=x`iDjVvm4r%qmv_DuiRg+5^JN{(vyMwv+8Y<2!%45_PspU$2UaaJcvZh)ojcf5vJb;UF6y^PA zu^GROHTVW@!0WgkZ(0F*4L%BYQk~1$X zApTu6zRQimUZY$$H5O-l2<62DYJ3J|Lf=7&zzv*@%?pbYS&nycy#_mQ5Rc*0C=2^7 zHsOaT3;Op$;x9Le)koWf!{#+-AAbL zU)Y697=%1khw*dxNXbh%8UykoK8by7)G)q@a=nV>AHhi+#9Qd&0CALLoW|WaXQ@&T zV?RoSF5xnK2W8K1qWpdZvldUIOe}Z3)TrQX3CT7js%kgN9v;J;ID!560UpB+T};~N zP~QIq?!os^a$qG#U@Z=zWP1+fz3<~z%;UY>R<~#z=f<|SVkEwf^5RFh2Fpo(qOaED z2JAuU@FdFbzJYRV)k>wdz$%oScnCRI%E4855($F3fZccn*U9<+3k}9nE%d@%)DDym z9OQ(l5!{BSQF7ylScO-S-B8z1BKHBx0DnYQrsgo}QQU{5fqDsLL9e3x?tNUz`05r7 z8K8}g5+B8T@N39Ny~USwa1&*KMtYIwo3IZPI2&KZD!huD@fylXKfy<_ll_oCqOW2n zzKl8k1Jn%~eAFNKl5B2VS6t~nlx#kXWmry?0UM|@WgiVrQ=v%bbEtzcF3hO%vve3V=v#L|)($z&vpbr1D0mBUiV0SR|6Rf-%p zDRO$M3$5ZwnOACW$Mv%Rx0hX9NOnt+5VAAs0qT8JNlGb_-9%J9Lam@mh$U*0q;j^U zNa77php6OdA^iKXi7Mr@)Sc8?8DEl)2p0;uSU6^KQCYZC{F42abG?_ktaz(%8YGb( zDqYJK9xSyb0r_hvlmjINIXOL4$s3SC4Ppz_bl}l}3 zWwqU0*;Fy=gmK$jdAw2&rW3}q->Q7Ls>e4@Xksr`Jy*Ru<2#|7_NMx(F3(!9|4?>| zPWu|Wv=fW@Ca}Ms^K?zjjmk@oKW6=!)izqwRkhbmhQ<%3F4PQ{RYo&@koN6|bAMd! zj2LTcFEqGb)=9cC9gRD_6O~u(-)gT%h6ehyOevywr%j-}bf{BK7>#Sk8`D|dVi@f? zDHDu3QDZOF^_2ITG5e>wEsN8>(P7;2^qFWnQ_fgnh9`_RsnKvOq6Xt`P#Qrd`oAyOv-2~xg*dCicVH{(f3jT-1;*E|M;P3! zk@&`#BO4GYJdxF^VJDd}I+bBmMk|Kyz>$Of_T&1_Mkk0GFD6TfnVF_t(J;JcQ~QPv zKAUyN*6uBxcePV$`kWx#Fz7p8kaWVd->n~TvM%EjhV;qInBIPx5J+oh()H3=*O|K7 zP+b7lf z&E1s=<7^YDsO;J1<@WW)#q08uq4rFwIFJcL%_JT-LH=@RJU62HcPsM z-8HV=*z~#3@k8guh5M$?FFak|SV-NhGcs08-e~@E%Gmm*7F*Z!cIWO-^H;OHlu78g zNsh@#rR5wC$41Q)ZOnjsDKp~480&XUTdR+ZPru?%pG(-5C9m0cmK?Mjn;*0-dDyR^=>E?v7QKY4pV6P$tsr@+|5OBdT;wp8=Z6&q=7 zvHw`Qk-Df|_Y(m(nKZ$8!o=K!HY3ciuo=c5ck@%)%TH!Qy5$@MCS^NXm)JX7duI1$ zlF`79v~F$AUpaANy-vAa_~{vuwW@ z|2p?IZ*iKOh#D?smE*aNPMBm;)>s@ov@b3HV%=>=$0Y2kwm0kcnq-_r^!R0d%FbVL zclUqYk&r0zfteARgsg2Q?hGskXoK7%ik@rio)w)7z5JD|No1$bsc4YDk{}Oh{s(b( Bu$lk> delta 2116 zcmajfTWnNC7{Kw_(n3L6*jjp}c3Ku$E?rs{Xn_KyEtJF>6D%bvVwUZJ9(KEjbWaPc zF^fKU0ZGKMDj{kb5|c)WnvD7=ZOf;e-x zzkuuU29{&AOsP8TM(IC}GO;AeL|^hf?T>$f6}(^lPUAidaMvQ#ScO|r;}giF)nQzY zNB#fLVKx14P$qT_Wr^$O6kZrd`Twxre;sA3KE%~{3A3{FrE?1dT__P8z~%Td${v1- zOR*%VR2#P8BN)e8{Mh$%Yz*TG@isx zJdY3JU%q|wlzN8#1d=qWhUJmIgAe1MIDlIScN9-z50;auy|@i`;%nH5*HKowvX=Fi z8#@U@JdUgJD)MgCz;eivuD~wLpuF%L?!q~&r>sy4H{%B=5#Pkc7-r)mxDD6f(t$@l62fKo zR2bLc8f0#240)u=9;dOM#(O9;`VCnfwOJP?vq0AX!QddS5=-KS>@b zvHX2=V$LzMf9{0Y8jP4sFlsIaW2U=ejX73PlY6(~vw%5WnKI#d=Oa26k2_;2SKc>d zr(?U5)=)%kPg|qfPQ~J`J#J}dR1aB6%e97#u3BaGRc$YCYj0`oXlae=wv}sFb(k-! zs`bFIGZIVdp5akD?b?>^be)kdYTO^l6<3!A1~+B&-568Wh_?0~()p>;@%&Wkkd@X+ zXRn=z*)rtjrxFqMe>X6(k%)0>vZk)N$<)=>ghs5)=g0Tur(7-1Pg=vw+;w%rPG_9t z-uz@TWk<};+Bb6jbqA-J>kU7c;>LE<+xSt5cc=Ng@gcv}uOIbWHO+12SN*lQ)YNxp zWP{&2(|pEnHHGGz=NBwD)uCP!3w4;Yp%={X!v6YAIzc@7skBZwqsjcF>tx1b%*=Ho txoZo9MP^0#S#u%$6&LQYlEbldCdD-KIqlj>mn+9*<0lulo6058e*kRCQ0o8y diff --git a/rest_framework/locale/hu/LC_MESSAGES/django.po b/rest_framework/locale/hu/LC_MESSAGES/django.po index 9002f8e61..a1d75b9f0 100644 --- a/rest_framework/locale/hu/LC_MESSAGES/django.po +++ b/rest_framework/locale/hu/LC_MESSAGES/django.po @@ -3,14 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Zoltan Szalai , 2015 +# Zoltan Szalai , 2015,2018-2019 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: 2017-08-03 14:58+0000\n" -"Last-Translator: Thomas Christie \n" +"POT-Creation-Date: 2020-10-13 21:45+0200\n" +"PO-Revision-Date: 2020-10-13 19:45+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,423 +18,556 @@ msgstr "" "Language: hu\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:73 +#: authentication.py:70 msgid "Invalid basic header. No credentials provided." -msgstr "Érvénytelen basic fejlécmező. Nem voltak megadva azonosítók." +msgstr "Érvénytelen basic fejléc. Nem voltak megadva azonosítók." -#: authentication.py:76 +#: authentication.py:73 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." +msgstr "Érvénytelen basic fejléc. Az azonosító karakterlánc nem tartalmazhat szóközöket." -#: authentication.py:82 +#: authentication.py:83 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ő." +msgstr "Érvénytelen basic fejléc. Az azonosítók base64 kódolása nem megfelelő." -#: authentication.py:99 +#: authentication.py:101 msgid "Invalid username/password." msgstr "Érvénytelen felhasználónév/jelszó." -#: authentication.py:102 authentication.py:198 +#: authentication.py:104 authentication.py:206 msgid "User inactive or deleted." msgstr "A felhasználó nincs aktiválva vagy törölve lett." -#: authentication.py:176 +#: authentication.py:184 msgid "Invalid token header. No credentials provided." -msgstr "Érvénytelen token fejlécmező. Nem voltak megadva azonosítók." +msgstr "Érvénytelen token fejléc. Nem voltak megadva azonosítók." -#: authentication.py:179 +#: authentication.py:187 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." +msgstr "Érvénytelen token fejléc. A token karakterlánc nem tartalmazhat szóközöket." -#: authentication.py:185 +#: authentication.py:193 msgid "" "Invalid token header. Token string should not contain invalid characters." -msgstr "" +msgstr "Érvénytelen token fejléc. A token karakterlánc nem tartalmazhat érvénytelen karaktereket." -#: authentication.py:195 +#: authentication.py:203 msgid "Invalid token." msgstr "Érvénytelen token." #: authtoken/apps.py:7 msgid "Auth Token" -msgstr "" +msgstr "Auth token" -#: authtoken/models.py:15 +#: authtoken/models.py:13 msgid "Key" -msgstr "" +msgstr "Kulcs" + +#: authtoken/models.py:16 +msgid "User" +msgstr "Felhasználó" #: authtoken/models.py:18 -msgid "User" -msgstr "" - -#: authtoken/models.py:20 msgid "Created" -msgstr "" +msgstr "Létrehozva" -#: authtoken/models.py:29 +#: authtoken/models.py:27 authtoken/serializers.py:19 msgid "Token" -msgstr "" +msgstr "Token" -#: authtoken/models.py:30 +#: authtoken/models.py:28 msgid "Tokens" -msgstr "" - -#: authtoken/serializers.py:8 -msgid "Username" -msgstr "" +msgstr "Tokenek" #: authtoken/serializers.py:9 +msgid "Username" +msgstr "Felhasználónév" + +#: authtoken/serializers.py:13 msgid "Password" -msgstr "" +msgstr "Jelszó" -#: authtoken/serializers.py:20 -msgid "User account is disabled." -msgstr "A felhasználó tiltva van." - -#: authtoken/serializers.py:23 +#: authtoken/serializers.py:35 msgid "Unable to log in with provided credentials." msgstr "A megadott azonosítókkal nem lehet bejelentkezni." -#: authtoken/serializers.py:26 +#: authtoken/serializers.py:38 msgid "Must include \"username\" and \"password\"." msgstr "Tartalmaznia kell a \"felhasználónevet\" és a \"jelszót\"." -#: exceptions.py:49 +#: exceptions.py:102 msgid "A server error occurred." msgstr "Szerver oldali hiba történt." -#: exceptions.py:84 +#: exceptions.py:142 +msgid "Invalid input." +msgstr "" + +#: exceptions.py:161 msgid "Malformed request." msgstr "Hibás kérés." -#: exceptions.py:89 +#: exceptions.py:167 msgid "Incorrect authentication credentials." msgstr "Hibás azonosítók." -#: exceptions.py:94 +#: exceptions.py:173 msgid "Authentication credentials were not provided." msgstr "Nem voltak megadva azonosítók." -#: exceptions.py:99 +#: exceptions.py:179 msgid "You do not have permission to perform this action." msgstr "Nincs jogosultsága a művelet végrehajtásához." -#: exceptions.py:104 views.py:81 +#: exceptions.py:185 msgid "Not found." msgstr "Nem található." -#: exceptions.py:109 +#: exceptions.py:191 +#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "A \"{method}\" metódus nem megengedett." -#: exceptions.py:120 +#: exceptions.py:202 msgid "Could not satisfy the request Accept header." -msgstr "A kérés Accept fejlécmezőjét nem lehetett kiszolgálni." +msgstr "A kérés Accept fejlécét nem lehetett teljesíteni." -#: exceptions.py:132 +#: exceptions.py:212 +#, 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." -#: exceptions.py:145 +#: exceptions.py:223 msgid "Request was throttled." msgstr "A kérés korlátozva lett." -#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 -#: validators.py:181 +#: exceptions.py:224 +#, python-brace-format +msgid "Expected available in {wait} second." +msgstr "" + +#: exceptions.py:225 +#, python-brace-format +msgid "Expected available in {wait} seconds." +msgstr "" + +#: fields.py:316 relations.py:245 relations.py:279 validators.py:90 +#: validators.py:183 msgid "This field is required." msgstr "Ennek a mezőnek a megadása kötelező." -#: fields.py:270 +#: fields.py:317 msgid "This field may not be null." msgstr "Ez a mező nem lehet null értékű." -#: 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:701 +msgid "Must be a valid boolean." +msgstr "" -#: fields.py:674 +#: fields.py:766 +msgid "Not a valid string." +msgstr "" + +#: fields.py:767 msgid "This field may not be blank." msgstr "Ez a mező nem lehet üres." -#: fields.py:675 fields.py:1675 +#: fields.py:768 fields.py:1881 +#, 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." -#: fields.py:676 +#: fields.py:769 +#, python-brace-format 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:713 +#: fields.py:816 msgid "Enter a valid email address." msgstr "Adjon meg egy érvényes e-mail címet!" -#: fields.py:724 +#: fields.py:827 msgid "This value does not match the required pattern." msgstr "Ez az érték nem illeszkedik a szükséges mintázatra." -#: fields.py:735 +#: fields.py:838 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:747 +#: fields.py:839 +msgid "" +"Enter a valid \"slug\" consisting of Unicode letters, numbers, underscores, " +"or hyphens." +msgstr "" + +#: fields.py:854 msgid "Enter a valid URL." msgstr "Adjon meg egy érvényes URL-t!" -#: fields.py:760 -msgid "\"{value}\" is not a valid UUID." +#: fields.py:867 +msgid "Must be a valid UUID." msgstr "" -#: fields.py:796 +#: fields.py:903 msgid "Enter a valid IPv4 or IPv6 address." -msgstr "" +msgstr "Adjon meg egy érvényes IPv4 vagy IPv6 címet!" -#: fields.py:821 +#: fields.py:931 msgid "A valid integer is required." msgstr "Egy érvényes egész szám megadása szükséges." -#: fields.py:822 fields.py:857 fields.py:891 +#: fields.py:932 fields.py:969 fields.py:1005 fields.py:1366 +#, python-brace-format 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:823 fields.py:858 fields.py:892 +#: fields.py:933 fields.py:970 fields.py:1006 fields.py:1367 +#, python-brace-format 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:824 fields.py:859 fields.py:896 +#: fields.py:934 fields.py:971 fields.py:1010 msgid "String value too large." msgstr "A karakterlánc túl hosszú." -#: fields.py:856 fields.py:890 +#: fields.py:968 fields.py:1004 msgid "A valid number is required." msgstr "Egy érvényes szám megadása szükséges." -#: fields.py:893 +#: fields.py:1007 +#, python-brace-format 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:894 +#: fields.py:1008 +#, python-brace-format 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:895 +#: fields.py:1009 +#, python-brace-format 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:1025 +#: fields.py:1148 +#, python-brace-format 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:1026 +#: fields.py:1149 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:1103 +#: fields.py:1150 +#, python-brace-format +msgid "Invalid datetime for the timezone \"{timezone}\"." +msgstr "" + +#: fields.py:1151 +msgid "Datetime value out of range." +msgstr "" + +#: fields.py:1236 +#, 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:1104 +#: fields.py:1237 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:1170 +#: fields.py:1303 +#, 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:1232 +#: fields.py:1365 +#, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." -msgstr "" +msgstr "Az időtartam formátuma hibás. Használja ezek valamelyikét helyette: {format}." -#: fields.py:1251 fields.py:1300 +#: fields.py:1399 fields.py:1456 +#, python-brace-format msgid "\"{input}\" is not a valid choice." -msgstr "Az \"{input}\" nem egy érvényes elem." +msgstr "Érvénytelen választási lehetőség: \"{input}\"" -#: fields.py:1254 relations.py:71 relations.py:441 +#: fields.py:1402 +#, python-brace-format msgid "More than {count} items..." -msgstr "" +msgstr "Több, mint {count} elem ..." -#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 +#: fields.py:1457 fields.py:1603 relations.py:485 serializers.py:570 +#, 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:1302 +#: fields.py:1458 msgid "This selection may not be empty." -msgstr "" +msgstr "Választania kell egy elemet." -#: fields.py:1339 +#: fields.py:1495 +#, python-brace-format msgid "\"{input}\" is not a valid path choice." -msgstr "" +msgstr "Érvénytelen választási lehetőség: \"{input}\"" -#: fields.py:1358 +#: fields.py:1514 msgid "No file was submitted." msgstr "Semmilyen fájl sem került feltöltésre." -#: fields.py:1359 +#: fields.py:1515 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:1360 +#: fields.py:1516 msgid "No filename could be determined." msgstr "A fájlnév nem megállapítható." -#: fields.py:1361 +#: fields.py:1517 msgid "The submitted file is empty." msgstr "A küldött fájl üres." -#: fields.py:1362 +#: fields.py:1518 +#, 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:1410 +#: fields.py:1566 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:1449 relations.py:438 serializers.py:525 +#: fields.py:1604 relations.py:486 serializers.py:571 msgid "This list may not be empty." +msgstr "Nem lehet üres a lista." + +#: fields.py:1605 +#, python-brace-format +msgid "Ensure this field has at least {min_length} elements." msgstr "" -#: fields.py:1502 +#: fields.py:1606 +#, python-brace-format +msgid "Ensure this field has no more than {max_length} elements." +msgstr "" + +#: fields.py:1682 +#, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." +msgstr "Dictionary elemek helyett \"{input_type}\" lett megadva." + +#: fields.py:1683 +msgid "This dictionary may not be empty." msgstr "" -#: fields.py:1549 +#: fields.py:1755 msgid "Value must be valid JSON." +msgstr "Az értéknek érvényes JSON-nek lennie." + +#: filters.py:49 templates/rest_framework/filters/search.html:2 +msgid "Search" +msgstr "Keresés" + +#: filters.py:50 +msgid "A search term." msgstr "" -#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 -msgid "Submit" +#: filters.py:180 templates/rest_framework/filters/ordering.html:3 +msgid "Ordering" +msgstr "Rendezés" + +#: filters.py:181 +msgid "Which field to use when ordering the results." msgstr "" -#: filters.py:336 +#: filters.py:287 msgid "ascending" -msgstr "" +msgstr "növekvő" -#: filters.py:337 +#: filters.py:288 msgid "descending" +msgstr "csökkenő" + +#: pagination.py:174 +msgid "A page number within the paginated result set." msgstr "" -#: pagination.py:193 +#: pagination.py:179 pagination.py:372 pagination.py:590 +msgid "Number of results to return per page." +msgstr "" + +#: pagination.py:189 msgid "Invalid page." +msgstr "Érvénytelen oldal." + +#: pagination.py:374 +msgid "The initial index from which to return the results." msgstr "" -#: pagination.py:427 +#: pagination.py:581 +msgid "The pagination cursor value." +msgstr "" + +#: pagination.py:583 msgid "Invalid cursor" -msgstr "" +msgstr "Érvénytelen kurzor" -#: relations.py:207 +#: relations.py:246 +#, 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 +#: relations.py:247 +#, 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:240 +#: relations.py:280 msgid "Invalid hyperlink - No URL match." msgstr "Érvénytelen link - Nem illeszkedő URL." -#: relations.py:241 +#: relations.py:281 msgid "Invalid hyperlink - Incorrect URL match." msgstr "Érvénytelen link. - Eltérő URL illeszkedés." -#: relations.py:242 +#: relations.py:282 msgid "Invalid hyperlink - Object does not exist." msgstr "Érvénytelen link - Az objektum nem létezik." -#: relations.py:243 +#: relations.py:283 +#, 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:401 +#: relations.py:448 +#, 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:402 +#: relations.py:449 msgid "Invalid value." msgstr "Érvénytelen érték." -#: serializers.py:326 +#: schemas/utils.py:32 +msgid "unique integer value" +msgstr "" + +#: schemas/utils.py:34 +msgid "UUID string" +msgstr "" + +#: schemas/utils.py:36 +msgid "unique value" +msgstr "" + +#: schemas/utils.py:38 +#, python-brace-format +msgid "A {value_type} identifying this {name}." +msgstr "" + +#: serializers.py:337 +#, 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:116 -#: templates/rest_framework/base.html:128 +#: templates/rest_framework/base.html:136 +msgid "Extra Actions" +msgstr "" + +#: templates/rest_framework/admin.html:130 +#: templates/rest_framework/base.html:150 msgid "Filters" +msgstr "Szűrők" + +#: templates/rest_framework/base.html:37 +msgid "navbar" msgstr "" -#: templates/rest_framework/filters/django_filter.html:2 -#: templates/rest_framework/filters/django_filter_crispyforms.html:4 -msgid "Field filters" +#: templates/rest_framework/base.html:75 +msgid "content" msgstr "" -#: templates/rest_framework/filters/ordering.html:3 -msgid "Ordering" +#: templates/rest_framework/base.html:78 +msgid "request form" msgstr "" -#: templates/rest_framework/filters/search.html:2 -msgid "Search" +#: templates/rest_framework/base.html:157 +msgid "main content" msgstr "" -#: templates/rest_framework/horizontal/radio.html:2 -#: templates/rest_framework/inline/radio.html:2 -#: templates/rest_framework/vertical/radio.html:2 +#: templates/rest_framework/base.html:173 +msgid "request info" +msgstr "" + +#: templates/rest_framework/base.html:177 +msgid "response info" +msgstr "" + +#: templates/rest_framework/horizontal/radio.html:4 +#: templates/rest_framework/inline/radio.html:3 +#: templates/rest_framework/vertical/radio.html:3 msgid "None" -msgstr "" +msgstr "Semmi" -#: templates/rest_framework/horizontal/select_multiple.html:2 -#: templates/rest_framework/inline/select_multiple.html:2 -#: templates/rest_framework/vertical/select_multiple.html:2 +#: templates/rest_framework/horizontal/select_multiple.html:4 +#: templates/rest_framework/inline/select_multiple.html:3 +#: templates/rest_framework/vertical/select_multiple.html:3 msgid "No items to select." -msgstr "" +msgstr "Nincsenek kiválasztható elemek." -#: validators.py:43 +#: validators.py:39 msgid "This field must be unique." msgstr "Ennek a mezőnek egyedinek kell lennie." -#: validators.py:97 +#: validators.py:89 +#, python-brace-format msgid "The fields {field_names} must make a unique set." msgstr "A {field_names} mezőnevek nem tartalmazhatnak duplikátumot." -#: validators.py:245 +#: validators.py:171 +#, python-brace-format +msgid "Surrogate characters are not allowed: U+{code_point:X}." +msgstr "" + +#: validators.py:243 +#, python-brace-format 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:260 +#: validators.py:258 +#, python-brace-format 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:273 +#: validators.py:271 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" year." msgstr "A mezőnek egyedinek kell lennie a \"{date_field}\" évre." -#: versioning.py:42 +#: versioning.py:40 msgid "Invalid version in \"Accept\" header." -msgstr "Érvénytelen verzió az \"Accept\" fejlécmezőben." +msgstr "Érvénytelen verzió az \"Accept\" fejlécben." -#: versioning.py:73 +#: versioning.py:71 msgid "Invalid version in URL path." msgstr "Érvénytelen verzió az URL elérési útban." -#: versioning.py:115 +#: versioning.py:116 msgid "Invalid version in URL path. Does not match any version namespace." -msgstr "" +msgstr "Érvénytelen verzió az URL elérési útban. Nem illeszkedik egyetlen verzió névtérre sem." -#: versioning.py:147 +#: versioning.py:148 msgid "Invalid version in hostname." msgstr "Érvénytelen verzió a hosztnévben." -#: versioning.py:169 +#: versioning.py:170 msgid "Invalid version in query parameter." msgstr "Érvénytelen verzió a lekérdezési paraméterben." - -#: views.py:88 -msgid "Permission denied." -msgstr "" diff --git a/rest_framework/locale/hy/LC_MESSAGES/django.mo b/rest_framework/locale/hy/LC_MESSAGES/django.mo new file mode 100644 index 0000000000000000000000000000000000000000..c5f3ebcfaa1efa88d9c0bbd02b03d659b1ae662c GIT binary patch literal 12885 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 Z>1&, 2019 +msgid "" +msgstr "" +"Project-Id-Version: Django REST framework\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-10-13 21:45+0200\n" +"PO-Revision-Date: 2020-10-13 19:45+0000\n" +"Last-Translator: Xavier Ordoquy \n" +"Language-Team: Armenian (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/hy/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: hy\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: authentication.py:70 +msgid "Invalid basic header. No credentials provided." +msgstr "Անվավեր վերնագիր: Նույնականացման տվյալները տրամադրված չեն:" + +#: authentication.py:73 +msgid "Invalid basic header. Credentials string should not contain spaces." +msgstr "Անվավեր վերնագիր: Նույնականացման տողը չպետք է պարունակի բացատներ:" + +#: authentication.py:83 +msgid "Invalid basic header. Credentials not correctly base64 encoded." +msgstr "Անվավեր վերնագիր: Նույնականացման տվյալները սխալ են ձեւակերպված base64-ում:" + +#: authentication.py:101 +msgid "Invalid username/password." +msgstr "Անվավեր օգտանուն / գաղտնաբառ:" + +#: authentication.py:104 authentication.py:206 +msgid "User inactive or deleted." +msgstr "Օգտատերը ջնջված է կամ ոչ ակտիվ:" + +#: authentication.py:184 +msgid "Invalid token header. No credentials provided." +msgstr "Անվավեր տոկենի վերնագիր: Նույնականացման տվյալները տրամադրված չեն:" + +#: authentication.py:187 +msgid "Invalid token header. Token string should not contain spaces." +msgstr "Անվավեր տոկենի վերնագիր: Տոկենի տողը չպետք է պարունակի բացատներ:" + +#: authentication.py:193 +msgid "" +"Invalid token header. Token string should not contain invalid characters." +msgstr "Անվավեր տոկենի վերնագիր: Տոկենի տողը չպետք է պարունակի անթույլատրելի նիշեր:" + +#: authentication.py:203 +msgid "Invalid token." +msgstr "Անվավեր տոկեն։" + +#: authtoken/apps.py:7 +msgid "Auth Token" +msgstr "Վավերացման Տոկեն։" + +#: authtoken/models.py:13 +msgid "Key" +msgstr "Բանալի" + +#: authtoken/models.py:16 +msgid "User" +msgstr "Օգտատեր" + +#: authtoken/models.py:18 +msgid "Created" +msgstr "Ստեղծված է" + +#: authtoken/models.py:27 authtoken/serializers.py:19 +msgid "Token" +msgstr "Տոկեն" + +#: authtoken/models.py:28 +msgid "Tokens" +msgstr "Տոկեններ" + +#: authtoken/serializers.py:9 +msgid "Username" +msgstr "Օգտանուն" + +#: authtoken/serializers.py:13 +msgid "Password" +msgstr "Գաղտնաբառ" + +#: authtoken/serializers.py:35 +msgid "Unable to log in with provided credentials." +msgstr "Անհնար է մուտք գործել տրամադրված նույնականացման տվյալներով:" + +#: authtoken/serializers.py:38 +msgid "Must include \"username\" and \"password\"." +msgstr "Պետք է ներառի «օգտանուն» եւ «գաղտնաբառ»:" + +#: exceptions.py:102 +msgid "A server error occurred." +msgstr "Տեղի ունեցել սերվերի սխալ:" + +#: exceptions.py:142 +msgid "Invalid input." +msgstr "" + +#: exceptions.py:161 +msgid "Malformed request." +msgstr "Սխալ հարցում:" + +#: exceptions.py:167 +msgid "Incorrect authentication credentials." +msgstr "Սխալ նույնականացման տվյալներ։" + +#: exceptions.py:173 +msgid "Authentication credentials were not provided." +msgstr "Նույնականացման տվյալները տրամադրված չեն:" + +#: exceptions.py:179 +msgid "You do not have permission to perform this action." +msgstr "Այս գործողությունը կատարելու թույլտվություն չունեք:" + +#: exceptions.py:185 +msgid "Not found." +msgstr "Չի գտնվել։" + +#: exceptions.py:191 +#, python-brace-format +msgid "Method \"{method}\" not allowed." +msgstr "\"{method}\" մեթոդը թույլատրված չէ:" + +#: exceptions.py:202 +msgid "Could not satisfy the request Accept header." +msgstr "Չհաջողվեց բավարարել հարցման Ընդունել վերնագիրը:" + +#: exceptions.py:212 +#, python-brace-format +msgid "Unsupported media type \"{media_type}\" in request." +msgstr "Անհամապատասխան մեդիա տիպ \"{media_type}\":" + +#: exceptions.py:223 +msgid "Request was throttled." +msgstr "Հարցումն ընդհատվել է:" + +#: exceptions.py:224 +#, python-brace-format +msgid "Expected available in {wait} second." +msgstr "" + +#: exceptions.py:225 +#, python-brace-format +msgid "Expected available in {wait} seconds." +msgstr "" + +#: fields.py:316 relations.py:245 relations.py:279 validators.py:90 +#: validators.py:183 +msgid "This field is required." +msgstr "Այս դաշտը պարտադիր է:" + +#: fields.py:317 +msgid "This field may not be null." +msgstr "Այս դաշտը չի կարող զրոյական լինել:" + +#: fields.py:701 +msgid "Must be a valid boolean." +msgstr "" + +#: fields.py:766 +msgid "Not a valid string." +msgstr "" + +#: fields.py:767 +msgid "This field may not be blank." +msgstr "Այս դաշտը չի կարող դատարկ լինել:" + +#: fields.py:768 fields.py:1881 +#, python-brace-format +msgid "Ensure this field has no more than {max_length} characters." +msgstr "Համոզվեք, որ այս դաշտը լինի ոչ ավել, քան {max_length} նիշ:" + +#: fields.py:769 +#, python-brace-format +msgid "Ensure this field has at least {min_length} characters." +msgstr "Համոզվեք, որ այս դաշտը ունի առնվազն {min_length} նիշ:" + +#: fields.py:816 +msgid "Enter a valid email address." +msgstr "Մուտքագրեք վավեր էլ.փոստի հասցե:" + +#: fields.py:827 +msgid "This value does not match the required pattern." +msgstr "Այս արժեքը չի համապատասխանում պահանջվող օրինակին:" + +#: fields.py:838 +msgid "" +"Enter a valid \"slug\" consisting of letters, numbers, underscores or " +"hyphens." +msgstr "Մուտքագրեք վավեր \"slug\", որը բաղկացած է տառերից, թվերից, ընդգծումից կամ դեֆիսից:" + +#: fields.py:839 +msgid "" +"Enter a valid \"slug\" consisting of Unicode letters, numbers, underscores, " +"or hyphens." +msgstr "" + +#: fields.py:854 +msgid "Enter a valid URL." +msgstr "Մուտքագրեք վավեր հղում:" + +#: fields.py:867 +msgid "Must be a valid UUID." +msgstr "" + +#: fields.py:903 +msgid "Enter a valid IPv4 or IPv6 address." +msgstr "Մուտքագրեք վավեր IPv4 կամ IPv6 հասցե:" + +#: fields.py:931 +msgid "A valid integer is required." +msgstr "Պահանջվում է լիարժեք ամբողջական թիվ:" + +#: fields.py:932 fields.py:969 fields.py:1005 fields.py:1366 +#, python-brace-format +msgid "Ensure this value is less than or equal to {max_value}." +msgstr "Համոզվեք, որ արժեքը փոքր է կամ հավասար {max_value} -ին։" + +#: fields.py:933 fields.py:970 fields.py:1006 fields.py:1367 +#, python-brace-format +msgid "Ensure this value is greater than or equal to {min_value}." +msgstr "Համոզվեք, որ արժեքը մեծ է կամ հավասար {min_value} -ին։" + +#: fields.py:934 fields.py:971 fields.py:1010 +msgid "String value too large." +msgstr "Տողը ունի չափազանց մեծ արժեք:" + +#: fields.py:968 fields.py:1004 +msgid "A valid number is required." +msgstr "Պահանջվում է վավեր համար:" + +#: fields.py:1007 +#, python-brace-format +msgid "Ensure that there are no more than {max_digits} digits in total." +msgstr "Համոզվեք, որ {max_digits} -ից ավել թվանշան չկա:" + +#: fields.py:1008 +#, python-brace-format +msgid "" +"Ensure that there are no more than {max_decimal_places} decimal places." +msgstr "Համոզվեք, որ {max_decimal_places} -ից ավել տասնորդական նշան չկա:" + +#: fields.py:1009 +#, python-brace-format +msgid "" +"Ensure that there are no more than {max_whole_digits} digits before the " +"decimal point." +msgstr "Համոզվեք, որ տասնորդական կետից առաջ չկա {max_whole_digits} -ից ավել թվանշան:" + +#: fields.py:1148 +#, python-brace-format +msgid "Datetime has wrong format. Use one of these formats instead: {format}." +msgstr "Datetime -ը սխալ ձեւաչափ ունի: Փոխարենը օգտագործեք այս ձեւաչափերից մեկը. {format} ։" + +#: fields.py:1149 +msgid "Expected a datetime but got a date." +msgstr "Ակնկալվում է օրվա ժամը, սակայն ամսաթիվ է ստացել:" + +#: fields.py:1150 +#, python-brace-format +msgid "Invalid datetime for the timezone \"{timezone}\"." +msgstr "" + +#: fields.py:1151 +msgid "Datetime value out of range." +msgstr "" + +#: fields.py:1236 +#, python-brace-format +msgid "Date has wrong format. Use one of these formats instead: {format}." +msgstr "Ամսաթիվն ունի սխալ ձեւաչափ: Փոխարենը օգտագործեք այս ձեւաչափերից մեկը. {format} ։" + +#: fields.py:1237 +msgid "Expected a date but got a datetime." +msgstr "Ակնկալվում է ամսաթիվ, սակայն ստացել է օրվա ժամը:" + +#: fields.py:1303 +#, python-brace-format +msgid "Time has wrong format. Use one of these formats instead: {format}." +msgstr "Ժամանակը սխալ ձեւաչափ ունի: Փոխարենը օգտագործեք այս ձեւաչափերից մեկը. {format} ։" + +#: fields.py:1365 +#, python-brace-format +msgid "Duration has wrong format. Use one of these formats instead: {format}." +msgstr "Տեւողությունը սխալ ձեւաչափ ունի: Փոխարենը օգտագործեք այս ձեւաչափերից մեկը. {format} ։" + +#: fields.py:1399 fields.py:1456 +#, python-brace-format +msgid "\"{input}\" is not a valid choice." +msgstr "\"{input}\" -ը վավեր ընտրություն չէ:" + +#: fields.py:1402 +#, python-brace-format +msgid "More than {count} items..." +msgstr "Ավելի քան {count} առարկա..." + +#: fields.py:1457 fields.py:1603 relations.py:485 serializers.py:570 +#, python-brace-format +msgid "Expected a list of items but got type \"{input_type}\"." +msgstr "Ակնկալվում է տարրերի ցանկ, բայց ստացել է \"{input_type}\" -ի տիպ:" + +#: fields.py:1458 +msgid "This selection may not be empty." +msgstr "Այս ընտրությունը չի կարող դատարկ լինել:" + +#: fields.py:1495 +#, python-brace-format +msgid "\"{input}\" is not a valid path choice." +msgstr "\"{input}\" -ը վավեր ճանապարհի ընտրություն չէ:" + +#: fields.py:1514 +msgid "No file was submitted." +msgstr "Ոչ մի ֆայլ չի ուղարկվել:" + +#: fields.py:1515 +msgid "" +"The submitted data was not a file. Check the encoding type on the form." +msgstr "Ուղարկված տվյալը ֆայլ չէ: Ստուգեք կոդավորման տիպը:" + +#: fields.py:1516 +msgid "No filename could be determined." +msgstr "Ֆայլի անունը հնարավոր չէ որոշվել:" + +#: fields.py:1517 +msgid "The submitted file is empty." +msgstr "Ուղարկված ֆայլը դատարկ է:" + +#: fields.py:1518 +#, python-brace-format +msgid "" +"Ensure this filename has at most {max_length} characters (it has {length})." +msgstr "Համոզվեք, որ այս ֆայլի անունը ունի առավելագույնը {max_length} նիշ, (այն ունի {length})։" + +#: fields.py:1566 +msgid "" +"Upload a valid image. The file you uploaded was either not an image or a " +"corrupted image." +msgstr "Վերբեռնեք վավեր նկար: Ձեր բեռնած ֆայլը կամ նկար չէ կամ վնասված նկար է:" + +#: fields.py:1604 relations.py:486 serializers.py:571 +msgid "This list may not be empty." +msgstr "Այս ցանկը չի կարող դատարկ լինել:" + +#: fields.py:1605 +#, python-brace-format +msgid "Ensure this field has at least {min_length} elements." +msgstr "" + +#: fields.py:1606 +#, python-brace-format +msgid "Ensure this field has no more than {max_length} elements." +msgstr "" + +#: fields.py:1682 +#, python-brace-format +msgid "Expected a dictionary of items but got type \"{input_type}\"." +msgstr "Ակնկալվում է տարրերի բառարան, բայց ստացել է \"{input_type}\" տիպ։" + +#: fields.py:1683 +msgid "This dictionary may not be empty." +msgstr "" + +#: fields.py:1755 +msgid "Value must be valid JSON." +msgstr "Արժեքը պետք է լինի JSON:" + +#: filters.py:49 templates/rest_framework/filters/search.html:2 +msgid "Search" +msgstr "Որոնում" + +#: filters.py:50 +msgid "A search term." +msgstr "" + +#: filters.py:180 templates/rest_framework/filters/ordering.html:3 +msgid "Ordering" +msgstr "Պատվիրել" + +#: filters.py:181 +msgid "Which field to use when ordering the results." +msgstr "" + +#: filters.py:287 +msgid "ascending" +msgstr "աճման կարգով" + +#: filters.py:288 +msgid "descending" +msgstr "նվազման կարգով" + +#: pagination.py:174 +msgid "A page number within the paginated result set." +msgstr "" + +#: pagination.py:179 pagination.py:372 pagination.py:590 +msgid "Number of results to return per page." +msgstr "" + +#: pagination.py:189 +msgid "Invalid page." +msgstr "Անվավեր էջ:" + +#: pagination.py:374 +msgid "The initial index from which to return the results." +msgstr "" + +#: pagination.py:581 +msgid "The pagination cursor value." +msgstr "" + +#: pagination.py:583 +msgid "Invalid cursor" +msgstr "Սխալ կուրսոր" + +#: relations.py:246 +#, python-brace-format +msgid "Invalid pk \"{pk_value}\" - object does not exist." +msgstr "Անվավեր pk \"{pk_value}\" օբյեկտը գոյություն չունի:" + +#: relations.py:247 +#, python-brace-format +msgid "Incorrect type. Expected pk value, received {data_type}." +msgstr "Անհայտ տիպ: Ակնկալվում է pk արժեք, ստացված է {data_type}։" + +#: relations.py:280 +msgid "Invalid hyperlink - No URL match." +msgstr "Անվավեր հղում - Ոչ մի հղման համընկնում:" + +#: relations.py:281 +msgid "Invalid hyperlink - Incorrect URL match." +msgstr "Անվավեր հղում - սխալ հղման համընկնում:" + +#: relations.py:282 +msgid "Invalid hyperlink - Object does not exist." +msgstr "Անվավեր հղում - տվյալ օբյեկտը գոյություն չունի:" + +#: relations.py:283 +#, python-brace-format +msgid "Incorrect type. Expected URL string, received {data_type}." +msgstr "Անվավեր տիպ: Սպասվում է հղման տողը, ստացել է {data_type}։" + +#: relations.py:448 +#, python-brace-format +msgid "Object with {slug_name}={value} does not exist." +msgstr "{slug_name}={value} տվյալ պարունակությամբ օբյեկտ գոյություն չունի:" + +#: relations.py:449 +msgid "Invalid value." +msgstr "Անվավեր արժեք:" + +#: schemas/utils.py:32 +msgid "unique integer value" +msgstr "" + +#: schemas/utils.py:34 +msgid "UUID string" +msgstr "" + +#: schemas/utils.py:36 +msgid "unique value" +msgstr "" + +#: schemas/utils.py:38 +#, python-brace-format +msgid "A {value_type} identifying this {name}." +msgstr "" + +#: serializers.py:337 +#, python-brace-format +msgid "Invalid data. Expected a dictionary, but got {datatype}." +msgstr "Անվավեր տվյալներ: Սպասվում է բառարան, բայց ստացվել է {datatype}։" + +#: templates/rest_framework/admin.html:116 +#: templates/rest_framework/base.html:136 +msgid "Extra Actions" +msgstr "" + +#: templates/rest_framework/admin.html:130 +#: templates/rest_framework/base.html:150 +msgid "Filters" +msgstr "Ֆիլտրեր" + +#: templates/rest_framework/base.html:37 +msgid "navbar" +msgstr "" + +#: templates/rest_framework/base.html:75 +msgid "content" +msgstr "" + +#: templates/rest_framework/base.html:78 +msgid "request form" +msgstr "" + +#: templates/rest_framework/base.html:157 +msgid "main content" +msgstr "" + +#: templates/rest_framework/base.html:173 +msgid "request info" +msgstr "" + +#: templates/rest_framework/base.html:177 +msgid "response info" +msgstr "" + +#: templates/rest_framework/horizontal/radio.html:4 +#: templates/rest_framework/inline/radio.html:3 +#: templates/rest_framework/vertical/radio.html:3 +msgid "None" +msgstr "Ոչ մեկը" + +#: templates/rest_framework/horizontal/select_multiple.html:4 +#: templates/rest_framework/inline/select_multiple.html:3 +#: templates/rest_framework/vertical/select_multiple.html:3 +msgid "No items to select." +msgstr "Ոչ մի տարր ընտրված չէ։" + +#: validators.py:39 +msgid "This field must be unique." +msgstr "Այս դաշտը պետք է լինի եզակի:" + +#: validators.py:89 +#, python-brace-format +msgid "The fields {field_names} must make a unique set." +msgstr "{field_names} դաշտերը պետք է կազմեն եզակի հավաքածու:" + +#: validators.py:171 +#, python-brace-format +msgid "Surrogate characters are not allowed: U+{code_point:X}." +msgstr "" + +#: validators.py:243 +#, python-brace-format +msgid "This field must be unique for the \"{date_field}\" date." +msgstr "Այս դաշտը պետք է եզակի լինի \"{date_field}\" ամսաթվի համար:" + +#: validators.py:258 +#, python-brace-format +msgid "This field must be unique for the \"{date_field}\" month." +msgstr "Այս դաշտը պետք է եզակի լինի \"{date_field}\" ամսվա համար:" + +#: validators.py:271 +#, python-brace-format +msgid "This field must be unique for the \"{date_field}\" year." +msgstr "Այս դաշտը պետք է եզակի լինի \"{date_field}\" տարվա համար:" + +#: versioning.py:40 +msgid "Invalid version in \"Accept\" header." +msgstr "\"Accept\" վերնագրի անվավեր տարբերակ:" + +#: versioning.py:71 +msgid "Invalid version in URL path." +msgstr "Անվավեր տարբերակ հղման ճանապարհի մեջ:" + +#: versioning.py:116 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "Անվավեր տարբերակ հղման ճանապարհի մեջ: Չի համապատասխանում որեւէ անվանման տարբերակի:" + +#: versioning.py:148 +msgid "Invalid version in hostname." +msgstr "Անվավեր տարբերակ անվանման մեջ:" + +#: versioning.py:170 +msgid "Invalid version in query parameter." +msgstr "Անվավեր տարբերակ `հարցման պարամետրում:" diff --git a/rest_framework/locale/id/LC_MESSAGES/django.mo b/rest_framework/locale/id/LC_MESSAGES/django.mo index 471d5a830e78ff06fb04917d914030cf36639ad5..c67e2a1da9e52599dd32d35227af0187b2ec1b12 100644 GIT binary patch literal 5188 zcmbuCO^h5z6~~(-1ZN=u41}+Q6q5jUyfeFNN5&ar$LqvS{JpZ*7I0bBOxMhm`_tXk z`@zcMVid)lr?T7f``uD>@puo4lPk;v>sn;C==NP{Rw!s_VJoruU zEci?CJor|FC*B(buQL8Rcn17Ecndu6Xb^l6Tmw&nKLjsK_n1PGn>)@xr-+^BM{|P<`KK58`zXEv`90BG13!w0D3H&%X zYR2CHKh5~3paS0j#m~QjxDq@K8JHYA3myTV2baKGAQS}O20saY50vlytQr3bJj(cw z;E&<{zu;lUKl(t;_isVr_ix~b!MVqS;IrUU;EUjCQ0&+Qg`eMm%iw`0Y923wqW=fr zY48tVTjoDl^LrfZGrj|!0RIe%-X}gpOu^ScdH)me^D+-EfNz76C-WF3JlzJ5gWm$5 z1K$9J?>E7x!AA+!$H3=6TnxJ4XTWnHCIulVddlYgcR=Cs=b-TZ7w`=DA5i!{_K_N2 z1ZCYz;7ecx3ctSq4}rf1p(OY_D7^g(6gwaPXb?cR_ety(8{~S3Tgd|#OT7;wFBc*{ z_e8(=GO%LODaw1vrP*#? z{=Y0MbQ5hpn`Hj0FuGS#9kOH^=504~hj-dR_E$!-epndtu#l*wiY>w>&@n{T?)YUS z+9V`MOhjW-mix(J&{R%zk9TFOjH_Ww^|Q3JrL!bGNgf*~G|j8DN_zgGO4%P}pD2`K z(P%4Y3wj=Bm0eg_e?g|f<4T7itM{zAdHu53J}YJtZR45so4FxOAvT7#FMC`UTVj@V zCMi{~a%xCjaa*}jO|@B*!QECTxR7FFfw5_0S=qmYDR*_Ms1J)Wz|b8 z6eE6>j|?*C?F1{0&fq!$m*ON#-KfZ%i)HC5=|7RIl@WTA` zQ_rYgtkY-5Yb~8}X)nr5xI@eYP5w?bWQS=2ot?ubXu%l5IJgy6WiS z(Z%)>f5&+2E*?9w$TfGFV%J_RbXvyRWkpwgS+84m`L!aLPP*zs8gj~&ma21T#CqlfGJ)#+|ykdcJ*P zx=w5vn4*1-jUH02y6QyFx``)UWy86Zn8Pz}pC=w=SEachmZz3Za-7M`sl}6X!L(0t zHq;U2hjOE1o$xzwx=^`|Ed`jJV2ay1v}(vKrNK7+3wzgMs_G$5*|e#pxEB=#$`nZ z(z!P-H)%Dpoj{!Dg~J5wRwcHNI_lLb)hMoq{JN@XWyEM3Rc^ME*`)$6sYnqb51=fB z{}Kk@g*huamDHoK4kI}kFgX@yhAPSu3V@GdkM3c_`PH){;#k;yyBjIBv%2mpS~oPi zMSM)}`^_DV3?~R)&twWwm40hygA&o7L>!EJR?ixkP_po@@od~>Ohw18QO(FfQ;=!* zwX@OCQTqu>evP{oHT}jeXX>=CNhhTxLHKr)u)YNw_a6HSM&yLVb+6=1*K(=hMl}r! zJ9A4mtYkfug_cXOctTVYKHuh-t2+u^2W@hZ?{gyTQ>pth+YWHQQsV37-Xr6*1M(=KY_EeL4lLgmk zX`-=}c|qFIO+{vFXY12c5oxhRJH<_6NHrM_sTp-}BB@s;6plCWu0_J|xZ`PRVQ6hh zHCmBcI>|;;j5p}0iYxyw(|G@eQv)tdzBXG1eZ^zrv%PJP6{7uYo#jzh@=qJX-37TZ zV&?tqhT2DLcG?S%>1#=EL^J38k$jpdI%7Re*?jkm$)5=VckM4%kHa{CMF>#BCG7zXw$0H;Tok)M?SatM}#vOg1uw^1E8}V;s5{u delta 122 zcmX@2ah2KPo)F7a1|VPrVi_P-0b*t#)&XJ=umIxOKuJp=4N?OGlmBpq@fn)w8kp-E v8Yvi>S{a&5PT&?-2+7FLO)OS$&M3+(F3C()uqnyUbpYaIsKDmw+)RuBT7Vdw diff --git a/rest_framework/locale/id/LC_MESSAGES/django.po b/rest_framework/locale/id/LC_MESSAGES/django.po index c84add0a4..b3d3c2e89 100644 --- a/rest_framework/locale/id/LC_MESSAGES/django.po +++ b/rest_framework/locale/id/LC_MESSAGES/django.po @@ -3,13 +3,17 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Aldiantoro Nugroho , 2017 +# aslam hadi , 2017 +# Joseph Aditya P G, 2019 +# Xavier Ordoquy , 2020 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" +"POT-Creation-Date: 2020-10-13 21:45+0200\n" +"PO-Revision-Date: 2020-10-13 20:03+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,423 +21,556 @@ msgstr "" "Language: id\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: authentication.py:73 +#: authentication.py:70 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:76 +#: authentication.py:73 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:82 +#: authentication.py:83 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:99 +#: authentication.py:101 msgid "Invalid username/password." -msgstr "" +msgstr "Nama pengguna atau kata sandi salah." -#: authentication.py:102 authentication.py:198 +#: authentication.py:104 authentication.py:206 msgid "User inactive or deleted." -msgstr "" +msgstr "Pengguna tidak akfif atau telah dihapus." -#: authentication.py:176 +#: authentication.py:184 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:179 +#: authentication.py:187 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:185 +#: authentication.py:193 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:195 +#: authentication.py:203 msgid "Invalid token." msgstr "" #: authtoken/apps.py:7 msgid "Auth Token" -msgstr "" +msgstr "Token Autentikasi" -#: authtoken/models.py:15 +#: authtoken/models.py:13 msgid "Key" msgstr "" -#: authtoken/models.py:18 +#: authtoken/models.py:16 msgid "User" -msgstr "" +msgstr "Pengguna" -#: authtoken/models.py:20 +#: authtoken/models.py:18 msgid "Created" msgstr "" -#: authtoken/models.py:29 +#: authtoken/models.py:27 authtoken/serializers.py:19 msgid "Token" -msgstr "" +msgstr "Token" -#: authtoken/models.py:30 +#: authtoken/models.py:28 msgid "Tokens" -msgstr "" - -#: authtoken/serializers.py:8 -msgid "Username" -msgstr "" +msgstr "Token" #: authtoken/serializers.py:9 +msgid "Username" +msgstr "Nama pengguna" + +#: authtoken/serializers.py:13 msgid "Password" -msgstr "" +msgstr "Kata sandi" -#: authtoken/serializers.py:20 -msgid "User account is disabled." -msgstr "" - -#: authtoken/serializers.py:23 +#: authtoken/serializers.py:35 msgid "Unable to log in with provided credentials." -msgstr "" +msgstr "Tidak dapat masuk dengan data pengguna ini." -#: authtoken/serializers.py:26 +#: authtoken/serializers.py:38 msgid "Must include \"username\" and \"password\"." -msgstr "" +msgstr "Nama pengguna dan password harus diisi." -#: exceptions.py:49 +#: exceptions.py:102 msgid "A server error occurred." +msgstr "Terjadi galat di server." + +#: exceptions.py:142 +msgid "Invalid input." msgstr "" -#: exceptions.py:84 +#: exceptions.py:161 msgid "Malformed request." msgstr "" -#: exceptions.py:89 +#: exceptions.py:167 msgid "Incorrect authentication credentials." -msgstr "" +msgstr "Data autentikasi salah." -#: exceptions.py:94 +#: exceptions.py:173 msgid "Authentication credentials were not provided." -msgstr "" +msgstr "Data autentikasi tidak diberikan." -#: exceptions.py:99 +#: exceptions.py:179 msgid "You do not have permission to perform this action." -msgstr "" +msgstr "Anda tidak memiliki izin untuk melakukan tindakan ini." -#: exceptions.py:104 views.py:81 +#: exceptions.py:185 msgid "Not found." -msgstr "" +msgstr "Data tidak ditemukan." -#: exceptions.py:109 +#: exceptions.py:191 +#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "" -#: exceptions.py:120 +#: exceptions.py:202 msgid "Could not satisfy the request Accept header." -msgstr "" +msgstr "Permintaan dengan header Accept ini tidak dapat dipenuhi." -#: exceptions.py:132 +#: exceptions.py:212 +#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." -msgstr "" +msgstr "Jenis media \"{media_type}\" dalam permintaan ini tidak didukung." -#: exceptions.py:145 +#: exceptions.py:223 msgid "Request was throttled." +msgstr "Permintaan ini telah dibatasi." + +#: exceptions.py:224 +#, python-brace-format +msgid "Expected available in {wait} second." msgstr "" -#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 -#: validators.py:181 +#: exceptions.py:225 +#, python-brace-format +msgid "Expected available in {wait} seconds." +msgstr "" + +#: fields.py:316 relations.py:245 relations.py:279 validators.py:90 +#: validators.py:183 msgid "This field is required." -msgstr "" +msgstr "Bidang ini harus diisi." -#: fields.py:270 +#: fields.py:317 msgid "This field may not be null." +msgstr "Bidang ini tidak boleh diisi dengan \"null\"." + +#: fields.py:701 +msgid "Must be a valid boolean." msgstr "" -#: fields.py:608 fields.py:639 -msgid "\"{input}\" is not a valid boolean." +#: fields.py:766 +msgid "Not a valid string." msgstr "" -#: fields.py:674 +#: fields.py:767 msgid "This field may not be blank." -msgstr "" +msgstr "Bidang ini tidak boleh kosong." -#: fields.py:675 fields.py:1675 +#: fields.py:768 fields.py:1881 +#, python-brace-format msgid "Ensure this field has no more than {max_length} characters." -msgstr "" +msgstr "Isi bidang ini tidak boleh melebihi {max_length} karakter." -#: fields.py:676 +#: fields.py:769 +#, python-brace-format msgid "Ensure this field has at least {min_length} characters." -msgstr "" +msgstr "Isi bidang ini minimal {min_length} karakter." -#: fields.py:713 +#: fields.py:816 msgid "Enter a valid email address." -msgstr "" +msgstr "Masukkan alamat email dengan format yang benar." -#: fields.py:724 +#: fields.py:827 msgid "This value does not match the required pattern." msgstr "" -#: fields.py:735 +#: fields.py:838 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." +msgstr "Karakter \"slug\" hanya dapat terdiri dari huruf, angka, underscore dan tanda hubung." + +#: fields.py:839 +msgid "" +"Enter a valid \"slug\" consisting of Unicode letters, numbers, underscores, " +"or hyphens." msgstr "" -#: fields.py:747 +#: fields.py:854 msgid "Enter a valid URL." +msgstr "Masukkan URL dengan format yang benar." + +#: fields.py:867 +msgid "Must be a valid UUID." msgstr "" -#: fields.py:760 -msgid "\"{value}\" is not a valid UUID." -msgstr "" - -#: fields.py:796 +#: fields.py:903 msgid "Enter a valid IPv4 or IPv6 address." -msgstr "" +msgstr "Masukkan alamat IPv4 atau IPv6 dengan format yang benar." -#: fields.py:821 +#: fields.py:931 msgid "A valid integer is required." -msgstr "" +msgstr "Nilai bidang ini harus berupa bilangan bulat." -#: fields.py:822 fields.py:857 fields.py:891 +#: fields.py:932 fields.py:969 fields.py:1005 fields.py:1366 +#, python-brace-format msgid "Ensure this value is less than or equal to {max_value}." -msgstr "" +msgstr "Isi bidang ini harus kurang atau sama dengan {max_value}." -#: fields.py:823 fields.py:858 fields.py:892 +#: fields.py:933 fields.py:970 fields.py:1006 fields.py:1367 +#, python-brace-format msgid "Ensure this value is greater than or equal to {min_value}." -msgstr "" +msgstr "Isi bidang ini harus lebih atau sama dengan {min_value}." -#: fields.py:824 fields.py:859 fields.py:896 +#: fields.py:934 fields.py:971 fields.py:1010 msgid "String value too large." msgstr "" -#: fields.py:856 fields.py:890 +#: fields.py:968 fields.py:1004 msgid "A valid number is required." msgstr "" -#: fields.py:893 +#: fields.py:1007 +#, python-brace-format msgid "Ensure that there are no more than {max_digits} digits in total." -msgstr "" +msgstr "Panjang angka tidak boleh lebih dari {max_digits}." -#: fields.py:894 +#: fields.py:1008 +#, python-brace-format msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." -msgstr "" +msgstr "Panjang angka di belakang koma tidak boleh lebih dari {max_decimal_places}." -#: fields.py:895 +#: fields.py:1009 +#, python-brace-format msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." -msgstr "" +msgstr "Panjang angka bulat tidak boleh lebih dari {max_whole_digits}." -#: fields.py:1025 +#: fields.py:1148 +#, python-brace-format msgid "Datetime has wrong format. Use one of these formats instead: {format}." -msgstr "" +msgstr "Format tanggal dan waktu salah. Gunakan salah satu format berikut: {format}." -#: fields.py:1026 +#: fields.py:1149 msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1103 -msgid "Date has wrong format. Use one of these formats instead: {format}." +#: fields.py:1150 +#, python-brace-format +msgid "Invalid datetime for the timezone \"{timezone}\"." msgstr "" -#: fields.py:1104 +#: fields.py:1151 +msgid "Datetime value out of range." +msgstr "" + +#: fields.py:1236 +#, python-brace-format +msgid "Date has wrong format. Use one of these formats instead: {format}." +msgstr "Format tanggal salah. Gunakan salah satu format berikut: {format}." + +#: fields.py:1237 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1170 +#: fields.py:1303 +#, python-brace-format msgid "Time has wrong format. Use one of these formats instead: {format}." -msgstr "" +msgstr "Format waktu salah. Gunakan salah satu format berikut: {format}." -#: fields.py:1232 +#: fields.py:1365 +#, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." -msgstr "" +msgstr "Format durasi salah. Gunakan salah satu format berikut: {format}." -#: fields.py:1251 fields.py:1300 +#: fields.py:1399 fields.py:1456 +#, python-brace-format msgid "\"{input}\" is not a valid choice." -msgstr "" +msgstr "\"{input}\" tidak ada dalam daftar pilihan." -#: fields.py:1254 relations.py:71 relations.py:441 +#: fields.py:1402 +#, python-brace-format msgid "More than {count} items..." msgstr "" -#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 +#: fields.py:1457 fields.py:1603 relations.py:485 serializers.py:570 +#, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1302 +#: fields.py:1458 msgid "This selection may not be empty." -msgstr "" +msgstr "Pilihan tidak boleh kosong." -#: fields.py:1339 +#: fields.py:1495 +#, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1358 +#: fields.py:1514 msgid "No file was submitted." -msgstr "" +msgstr "Pilih berkas terlebih dahulu." -#: fields.py:1359 +#: fields.py:1515 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1360 +#: fields.py:1516 msgid "No filename could be determined." msgstr "" -#: fields.py:1361 +#: fields.py:1517 msgid "The submitted file is empty." -msgstr "" +msgstr "Berkas kosong." -#: fields.py:1362 +#: fields.py:1518 +#, python-brace-format msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." -msgstr "" +msgstr "Panjang nama berkas tidak boleh lebih dari {max_length}. Panjang nama berkas ini {length} karakter." -#: fields.py:1410 +#: fields.py:1566 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 +#: fields.py:1604 relations.py:486 serializers.py:571 msgid "This list may not be empty." msgstr "" -#: fields.py:1502 +#: fields.py:1605 +#, python-brace-format +msgid "Ensure this field has at least {min_length} elements." +msgstr "" + +#: fields.py:1606 +#, python-brace-format +msgid "Ensure this field has no more than {max_length} elements." +msgstr "" + +#: fields.py:1682 +#, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." +msgstr "Isi bidang ini harus berupa dictionary, bukan \"{input_type}\"." + +#: fields.py:1683 +msgid "This dictionary may not be empty." msgstr "" -#: fields.py:1549 +#: fields.py:1755 msgid "Value must be valid JSON." +msgstr "Isi bidang ini harus berupa JSON." + +#: filters.py:49 templates/rest_framework/filters/search.html:2 +msgid "Search" msgstr "" -#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 -msgid "Submit" +#: filters.py:50 +msgid "A search term." msgstr "" -#: filters.py:336 +#: filters.py:180 templates/rest_framework/filters/ordering.html:3 +msgid "Ordering" +msgstr "" + +#: filters.py:181 +msgid "Which field to use when ordering the results." +msgstr "" + +#: filters.py:287 msgid "ascending" msgstr "" -#: filters.py:337 +#: filters.py:288 msgid "descending" msgstr "" -#: pagination.py:193 +#: pagination.py:174 +msgid "A page number within the paginated result set." +msgstr "" + +#: pagination.py:179 pagination.py:372 pagination.py:590 +msgid "Number of results to return per page." +msgstr "" + +#: pagination.py:189 msgid "Invalid page." msgstr "" -#: pagination.py:427 +#: pagination.py:374 +msgid "The initial index from which to return the results." +msgstr "" + +#: pagination.py:581 +msgid "The pagination cursor value." +msgstr "" + +#: pagination.py:583 msgid "Invalid cursor" msgstr "" -#: relations.py:207 +#: relations.py:246 +#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." -msgstr "" +msgstr "Objek dengan primary key \"{pk_value}\" tidak ditemukan." -#: relations.py:208 +#: relations.py:247 +#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" -#: relations.py:240 +#: relations.py:280 msgid "Invalid hyperlink - No URL match." msgstr "" -#: relations.py:241 +#: relations.py:281 msgid "Invalid hyperlink - Incorrect URL match." msgstr "" -#: relations.py:242 +#: relations.py:282 msgid "Invalid hyperlink - Object does not exist." msgstr "" -#: relations.py:243 +#: relations.py:283 +#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:401 +#: relations.py:448 +#, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:402 +#: relations.py:449 msgid "Invalid value." msgstr "" -#: serializers.py:326 +#: schemas/utils.py:32 +msgid "unique integer value" +msgstr "" + +#: schemas/utils.py:34 +msgid "UUID string" +msgstr "" + +#: schemas/utils.py:36 +msgid "unique value" +msgstr "" + +#: schemas/utils.py:38 +#, python-brace-format +msgid "A {value_type} identifying this {name}." +msgstr "" + +#: serializers.py:337 +#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "" #: templates/rest_framework/admin.html:116 -#: templates/rest_framework/base.html:128 +#: templates/rest_framework/base.html:136 +msgid "Extra Actions" +msgstr "" + +#: templates/rest_framework/admin.html:130 +#: templates/rest_framework/base.html:150 msgid "Filters" msgstr "" -#: templates/rest_framework/filters/django_filter.html:2 -#: templates/rest_framework/filters/django_filter_crispyforms.html:4 -msgid "Field filters" +#: templates/rest_framework/base.html:37 +msgid "navbar" msgstr "" -#: templates/rest_framework/filters/ordering.html:3 -msgid "Ordering" +#: templates/rest_framework/base.html:75 +msgid "content" msgstr "" -#: templates/rest_framework/filters/search.html:2 -msgid "Search" +#: templates/rest_framework/base.html:78 +msgid "request form" msgstr "" -#: templates/rest_framework/horizontal/radio.html:2 -#: templates/rest_framework/inline/radio.html:2 -#: templates/rest_framework/vertical/radio.html:2 +#: templates/rest_framework/base.html:157 +msgid "main content" +msgstr "" + +#: templates/rest_framework/base.html:173 +msgid "request info" +msgstr "" + +#: templates/rest_framework/base.html:177 +msgid "response info" +msgstr "" + +#: templates/rest_framework/horizontal/radio.html:4 +#: templates/rest_framework/inline/radio.html:3 +#: templates/rest_framework/vertical/radio.html:3 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 +#: templates/rest_framework/horizontal/select_multiple.html:4 +#: templates/rest_framework/inline/select_multiple.html:3 +#: templates/rest_framework/vertical/select_multiple.html:3 msgid "No items to select." msgstr "" -#: validators.py:43 +#: validators.py:39 msgid "This field must be unique." msgstr "" -#: validators.py:97 +#: validators.py:89 +#, python-brace-format msgid "The fields {field_names} must make a unique set." msgstr "" -#: validators.py:245 +#: validators.py:171 +#, python-brace-format +msgid "Surrogate characters are not allowed: U+{code_point:X}." +msgstr "" + +#: validators.py:243 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" date." msgstr "" -#: validators.py:260 +#: validators.py:258 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" month." msgstr "" -#: validators.py:273 +#: validators.py:271 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" year." msgstr "" -#: versioning.py:42 +#: versioning.py:40 msgid "Invalid version in \"Accept\" header." msgstr "" -#: versioning.py:73 +#: versioning.py:71 msgid "Invalid version in URL path." msgstr "" -#: versioning.py:115 +#: versioning.py:116 msgid "Invalid version in URL path. Does not match any version namespace." msgstr "" -#: versioning.py:147 +#: versioning.py:148 msgid "Invalid version in hostname." msgstr "" -#: versioning.py:169 +#: versioning.py:170 msgid "Invalid version in query parameter." msgstr "" - -#: views.py:88 -msgid "Permission denied." -msgstr "" diff --git a/rest_framework/locale/it/LC_MESSAGES/django.mo b/rest_framework/locale/it/LC_MESSAGES/django.mo index 1d4fd34c38965b195e1c86708ecd37ea7e246b8c..6c84273a9228807bff9e2698eaf72d15892722cc 100644 GIT binary patch delta 2662 zcmYk+X>6259LMqLfvvQKQd&wu;Nh?>S1E-8y`ZJstu1Y7X%&UX?qj=BcFXRzoVp1f z1R^MTg80S|5s!c->WVK^Vzeac3$GXxhz3uLFEk)vLV`rUzh}3BNoPMZ&-3(oX8!Y^ z`Evc0mgvQt)T4&7g?f)_iZM^fyZE6LryFD8OuQG@;dtyvJ%0cv;;T3kKf$^91(6&f{InH_)OPMko0f1-Z^HM6%-Gx`n{ z%BzWf`Iz|qR!rggASwd8aWWo4z3&Yy!cTD=UdE_J<1U^ai$$1ex z6@kroJjs|xQA;qA)SrPR$mC2LDrX)+h58xP|DDDq_#SGYmr;=_<6~>E0w2JAQ5x%L zTuj`U$wJl951}4-7i%$_Fs#HD^x-j7&isp2SV>%4a1dwVXQ+^0Lk&1%63K?833p>F z{pdLwjWqHZzDDT7nYb0#<59d1f5!#5a7uh_dr={N3l)i9P&4}nYjCL*kHB8klAS?4 zcL~ez2A1=EGn>6~KNoD&3_e6Qgc&u>7~W+jqyBLzYG5s>EZ&0~@a07R25MVbtdn*@ zGqTL44K4H|!88X^5qibD9yR7`8gseuH|m2^h*ugeL(T}Z8g+jIa@LrAsN^|}O15LD zBpgD0@N=xdAMs%s7Z=1()A)Z8K@deb3f5Rk9 zp(`fq>s17x8P=~CP0ZA4l%Ek^E-yRiQ3^^iT^NY zFVQqG4a%abC}&nul`~pbO<*InfvTc`tF%$my_PX6kW<<#)%?!U`G04rqtlhRplm17 zrjxpqnoCvD2}eN8gH(l6OQ($Hi12m_cnRE!3cHr>A*!~Y@<3$`wU(Nx?@y&FBUO|b zOLe-~#w_7r@(v2{ ziV{g#I$U%HEK78faXB@O>fTJ7;9gHFaqH4M(ya}_txmwyxlLIG?wjd#Y4st;jyS&9 zU+K$JV>MY5l2hy+C)PN6M^Z_9Yopa~M|w-F6+tI#1%eT4n;q%ywd}wyYtRXW{lS10 zu(vtke!JUok7Vb$L)j%M4bHCEmF&!yL5e)g`ck_w01j z9(F>OKVWx9{DY1a3|T&>&tW(v-W|Q$J)GB+Ylpj?fX^T3F+OLw>3*NrF{-R|?tK0h zSo13?7nZxr#^qa`_Mo4aHivw{?E|~4>YWTht=c|+AUNo^V}s)glH3pS7r8m(J4efasA^T%kZKRG>x|9bB`3PjLj?fBQ-XA^4{cZyN6*CgMc+?_xXKx?4)%rsk*P| zc95F5*BuOn{Nes!z~|5=I!-t|a7U0VpMN-Vj@vw~%L~?P(`s%9>)P~nvHBT*CZ+3B z{R2bqxK)ML?M_eOp{#fq*CvL2t?=wDh0(M}oIu1;G$TYaXay~&&%aIG;2q(-TC^!Y O9!@=Ne10#UUi*I;8g-EX delta 2508 zcmZwHTWnNC7{Kw_x}`0*+9K^%DIHpRlXlsbOSu$iX(`Yma%+J$QMT+m?P#4Ff=4SAj^^#qO8419_$m@`qS9$bS>IEG8{9CqQfNlGojM^S!%71!Zc zSb=4el`6zGlnM2qj3;~#pgiv*Tp&yRjm8uP>iNf_)KZicwxPVp#6|cPuD}b}hNV-L z3S$)cQ!nsOt{cM|JdYB&K)zBBVg*KUJ%%xbYbDh0(O8DRBloC<_bPQiu0rYWKv{u} zvLe^_h(CTBWyM!fQW7l4++Ts!^p|51?nI6Ia2mdjsUVH_X%JoY0nWt}NSf3yC=dP< z>juHA@D5)GpndnKB>%RB*LFkPt5jcpllA|aSyoC~hWjd3R5tPurjSKJ_?8W?9nFZ`d z_O%*EZdIpHo_iUYP)gmRA-lA;JmW@`2J)w- zutDU-jkp9i`R+%#|8xKMtg6fc%TYF8CobguYJ^4yzKe3hb(9OjgrysMk!PqQNV?To zzkdzq(=VxE=i}`n>69X2mjy|>R#8_|=78)^O63T`PB+dnR{lI+E8KoMglX^-eS981Y2fno^pTekDH^aMu)s(@zyl z3KSUeAv2LMZA%XtmT3%z-RBCMCTvdj51CH-MB(-qGG*empv3s z=(b&PGvSzqZg%XU7V3aMkPa4?1VWim*n%B5ZimDUyLq9`(B0Kr%=@!LI%#Qd;hmwV zdo(nfUR=_UU8IL)b}>B=9U8V(2O)@?s?9wUnvs5H<|A3@8~S*_&97)lZ?0$#, 2015 +# Marco Ventura, 2019 # Mattia Procopio , 2015 +# Riccardo Magliocchetti , 2019 # Sergio Morstabilini , 2015 # Xavier Ordoquy , 2015 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: 2017-08-03 14:58+0000\n" -"Last-Translator: Thomas Christie \n" +"POT-Creation-Date: 2020-10-13 21:45+0200\n" +"PO-Revision-Date: 2020-10-13 19:45+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,423 +23,556 @@ msgstr "" "Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:73 +#: authentication.py:70 msgid "Invalid basic header. No credentials provided." msgstr "Header di base invalido. Credenziali non fornite." -#: authentication.py:76 +#: authentication.py:73 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "Header di base invalido. Le credenziali non dovrebbero contenere spazi." -#: authentication.py:82 +#: authentication.py:83 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Credenziali non correttamente codificate in base64." -#: authentication.py:99 +#: authentication.py:101 msgid "Invalid username/password." msgstr "Nome utente/password non validi" -#: authentication.py:102 authentication.py:198 +#: authentication.py:104 authentication.py:206 msgid "User inactive or deleted." msgstr "Utente inattivo o eliminato." -#: authentication.py:176 +#: authentication.py:184 msgid "Invalid token header. No credentials provided." msgstr "Header del token non valido. Credenziali non fornite." -#: authentication.py:179 +#: authentication.py:187 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:185 +#: authentication.py:193 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:195 +#: authentication.py:203 msgid "Invalid token." msgstr "Token invalido." #: authtoken/apps.py:7 msgid "Auth Token" -msgstr "" +msgstr "Auth Token" -#: authtoken/models.py:15 +#: authtoken/models.py:13 msgid "Key" -msgstr "" +msgstr "Key" + +#: authtoken/models.py:16 +msgid "User" +msgstr "User" #: authtoken/models.py:18 -msgid "User" -msgstr "" - -#: authtoken/models.py:20 msgid "Created" -msgstr "" +msgstr "Creato" -#: authtoken/models.py:29 +#: authtoken/models.py:27 authtoken/serializers.py:19 msgid "Token" -msgstr "" +msgstr "Token" -#: authtoken/models.py:30 +#: authtoken/models.py:28 msgid "Tokens" -msgstr "" - -#: authtoken/serializers.py:8 -msgid "Username" -msgstr "" +msgstr "I Token" #: authtoken/serializers.py:9 +msgid "Username" +msgstr "Username" + +#: authtoken/serializers.py:13 msgid "Password" -msgstr "" +msgstr "Password" -#: authtoken/serializers.py:20 -msgid "User account is disabled." -msgstr "L'account dell'utente è disabilitato" - -#: authtoken/serializers.py:23 +#: authtoken/serializers.py:35 msgid "Unable to log in with provided credentials." msgstr "Impossibile eseguire il login con le credenziali immesse." -#: authtoken/serializers.py:26 +#: authtoken/serializers.py:38 msgid "Must include \"username\" and \"password\"." msgstr "Deve includere \"nome utente\" e \"password\"." -#: exceptions.py:49 +#: exceptions.py:102 msgid "A server error occurred." msgstr "Errore del server." -#: exceptions.py:84 +#: exceptions.py:142 +msgid "Invalid input." +msgstr "" + +#: exceptions.py:161 msgid "Malformed request." msgstr "Richiesta malformata." -#: exceptions.py:89 +#: exceptions.py:167 msgid "Incorrect authentication credentials." msgstr "Credenziali di autenticazione incorrette." -#: exceptions.py:94 +#: exceptions.py:173 msgid "Authentication credentials were not provided." msgstr "Non sono state immesse le credenziali di autenticazione." -#: exceptions.py:99 +#: exceptions.py:179 msgid "You do not have permission to perform this action." msgstr "Non hai l'autorizzazione per eseguire questa azione." -#: exceptions.py:104 views.py:81 +#: exceptions.py:185 msgid "Not found." msgstr "Non trovato." -#: exceptions.py:109 +#: exceptions.py:191 +#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "Metodo \"{method}\" non consentito" -#: exceptions.py:120 +#: exceptions.py:202 msgid "Could not satisfy the request Accept header." msgstr "Impossibile soddisfare l'header \"Accept\" presente nella richiesta." -#: exceptions.py:132 +#: exceptions.py:212 +#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "Tipo di media \"{media_type}\"non supportato." -#: exceptions.py:145 +#: exceptions.py:223 msgid "Request was throttled." msgstr "La richiesta è stata limitata (throttled)." -#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 -#: validators.py:181 +#: exceptions.py:224 +#, python-brace-format +msgid "Expected available in {wait} second." +msgstr "" + +#: exceptions.py:225 +#, python-brace-format +msgid "Expected available in {wait} seconds." +msgstr "" + +#: fields.py:316 relations.py:245 relations.py:279 validators.py:90 +#: validators.py:183 msgid "This field is required." msgstr "Campo obbligatorio." -#: fields.py:270 +#: fields.py:317 msgid "This field may not be null." msgstr "Il campo non può essere nullo." -#: fields.py:608 fields.py:639 -msgid "\"{input}\" is not a valid boolean." -msgstr "\"{input}\" non è un valido valore booleano." +#: fields.py:701 +msgid "Must be a valid boolean." +msgstr "" -#: fields.py:674 +#: fields.py:766 +msgid "Not a valid string." +msgstr "" + +#: fields.py:767 msgid "This field may not be blank." msgstr "Questo campo non può essere omesso." -#: fields.py:675 fields.py:1675 +#: fields.py:768 fields.py:1881 +#, 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." -#: fields.py:676 +#: fields.py:769 +#, python-brace-format msgid "Ensure this field has at least {min_length} characters." msgstr "Assicurati che questo campo abbia almeno {min_length} caratteri." -#: fields.py:713 +#: fields.py:816 msgid "Enter a valid email address." msgstr "Inserisci un indirizzo email valido." -#: fields.py:724 +#: fields.py:827 msgid "This value does not match the required pattern." msgstr "Questo valore non corrisponde alla sequenza richiesta." -#: fields.py:735 +#: fields.py:838 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:747 +#: fields.py:839 +msgid "" +"Enter a valid \"slug\" consisting of Unicode letters, numbers, underscores, " +"or hyphens." +msgstr "" + +#: fields.py:854 msgid "Enter a valid URL." msgstr "Inserisci un URL valido" -#: fields.py:760 -msgid "\"{value}\" is not a valid UUID." -msgstr "\"{value}\" non è un UUID valido." +#: fields.py:867 +msgid "Must be a valid UUID." +msgstr "" -#: fields.py:796 +#: fields.py:903 msgid "Enter a valid IPv4 or IPv6 address." msgstr "Inserisci un indirizzo IPv4 o IPv6 valido." -#: fields.py:821 +#: fields.py:931 msgid "A valid integer is required." msgstr "È richiesto un numero intero valido." -#: fields.py:822 fields.py:857 fields.py:891 +#: fields.py:932 fields.py:969 fields.py:1005 fields.py:1366 +#, python-brace-format 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:823 fields.py:858 fields.py:892 +#: fields.py:933 fields.py:970 fields.py:1006 fields.py:1367 +#, python-brace-format 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:824 fields.py:859 fields.py:896 +#: fields.py:934 fields.py:971 fields.py:1010 msgid "String value too large." msgstr "Stringa troppo lunga." -#: fields.py:856 fields.py:890 +#: fields.py:968 fields.py:1004 msgid "A valid number is required." msgstr "È richiesto un numero valido." -#: fields.py:893 +#: fields.py:1007 +#, python-brace-format 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:894 +#: fields.py:1008 +#, python-brace-format 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:895 +#: fields.py:1009 +#, python-brace-format 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:1025 +#: fields.py:1148 +#, python-brace-format 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:1026 +#: fields.py:1149 msgid "Expected a datetime but got a date." msgstr "Atteso un oggetto di tipo datetime ma l'oggetto ricevuto è di tipo date." -#: fields.py:1103 +#: fields.py:1150 +#, python-brace-format +msgid "Invalid datetime for the timezone \"{timezone}\"." +msgstr "" + +#: fields.py:1151 +msgid "Datetime value out of range." +msgstr "" + +#: fields.py:1236 +#, 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:1104 +#: fields.py:1237 msgid "Expected a date but got a datetime." msgstr "Atteso un oggetto di tipo date ma l'oggetto ricevuto è di tipo datetime." -#: fields.py:1170 +#: fields.py:1303 +#, 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:1232 +#: fields.py:1365 +#, 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:1251 fields.py:1300 +#: fields.py:1399 fields.py:1456 +#, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" non è una scelta valida." -#: fields.py:1254 relations.py:71 relations.py:441 +#: fields.py:1402 +#, python-brace-format msgid "More than {count} items..." msgstr "Più di {count} oggetti..." -#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 +#: fields.py:1457 fields.py:1603 relations.py:485 serializers.py:570 +#, 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:1302 +#: fields.py:1458 msgid "This selection may not be empty." -msgstr "Questa selezione potrebbe non essere vuota." +msgstr "Questa selezione non può essere vuota." -#: fields.py:1339 +#: fields.py:1495 +#, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "\"{input}\" non è un percorso valido." -#: fields.py:1358 +#: fields.py:1514 msgid "No file was submitted." msgstr "Non è stato inviato alcun file." -#: fields.py:1359 +#: fields.py:1515 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:1360 +#: fields.py:1516 msgid "No filename could be determined." msgstr "Il nome del file non può essere determinato." -#: fields.py:1361 +#: fields.py:1517 msgid "The submitted file is empty." msgstr "Il file inviato è vuoto." -#: fields.py:1362 +#: fields.py:1518 +#, 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:1410 +#: fields.py:1566 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:1449 relations.py:438 serializers.py:525 +#: fields.py:1604 relations.py:486 serializers.py:571 msgid "This list may not be empty." -msgstr "Questa lista potrebbe non essere vuota." +msgstr "Questa lista non può essere vuota." -#: fields.py:1502 +#: fields.py:1605 +#, python-brace-format +msgid "Ensure this field has at least {min_length} elements." +msgstr "" + +#: fields.py:1606 +#, python-brace-format +msgid "Ensure this field has no more than {max_length} elements." +msgstr "" + +#: fields.py:1682 +#, 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:1549 +#: fields.py:1683 +msgid "This dictionary may not be empty." +msgstr "" + +#: fields.py:1755 msgid "Value must be valid JSON." msgstr "Il valore deve essere un JSON valido." -#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 -msgid "Submit" -msgstr "Invia" +#: filters.py:49 templates/rest_framework/filters/search.html:2 +msgid "Search" +msgstr "Cerca" -#: filters.py:336 +#: filters.py:50 +msgid "A search term." +msgstr "" + +#: filters.py:180 templates/rest_framework/filters/ordering.html:3 +msgid "Ordering" +msgstr "Ordinamento" + +#: filters.py:181 +msgid "Which field to use when ordering the results." +msgstr "" + +#: filters.py:287 msgid "ascending" -msgstr "" +msgstr "ascendente" -#: filters.py:337 +#: filters.py:288 msgid "descending" +msgstr "discendente" + +#: pagination.py:174 +msgid "A page number within the paginated result set." msgstr "" -#: pagination.py:193 +#: pagination.py:179 pagination.py:372 pagination.py:590 +msgid "Number of results to return per page." +msgstr "" + +#: pagination.py:189 msgid "Invalid page." +msgstr "Pagina non valida." + +#: pagination.py:374 +msgid "The initial index from which to return the results." msgstr "" -#: pagination.py:427 +#: pagination.py:581 +msgid "The pagination cursor value." +msgstr "" + +#: pagination.py:583 msgid "Invalid cursor" msgstr "Cursore non valido" -#: relations.py:207 +#: relations.py:246 +#, 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 +#: relations.py:247 +#, 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:240 +#: relations.py:280 msgid "Invalid hyperlink - No URL match." msgstr "Collegamento non valido - Nessuna corrispondenza di URL." -#: relations.py:241 +#: relations.py:281 msgid "Invalid hyperlink - Incorrect URL match." msgstr "Collegamento non valido - Corrispondenza di URL non corretta." -#: relations.py:242 +#: relations.py:282 msgid "Invalid hyperlink - Object does not exist." msgstr "Collegamento non valido - L'oggetto non esiste." -#: relations.py:243 +#: relations.py:283 +#, 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:401 +#: relations.py:448 +#, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "L'oggetto con {slug_name}={value} non esiste." -#: relations.py:402 +#: relations.py:449 msgid "Invalid value." msgstr "Valore non valido." -#: serializers.py:326 +#: schemas/utils.py:32 +msgid "unique integer value" +msgstr "" + +#: schemas/utils.py:34 +msgid "UUID string" +msgstr "" + +#: schemas/utils.py:36 +msgid "unique value" +msgstr "" + +#: schemas/utils.py:38 +#, python-brace-format +msgid "A {value_type} identifying this {name}." +msgstr "" + +#: serializers.py:337 +#, 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:116 -#: templates/rest_framework/base.html:128 +#: templates/rest_framework/base.html:136 +msgid "Extra Actions" +msgstr "" + +#: templates/rest_framework/admin.html:130 +#: templates/rest_framework/base.html:150 msgid "Filters" msgstr "Filtri" -#: templates/rest_framework/filters/django_filter.html:2 -#: templates/rest_framework/filters/django_filter_crispyforms.html:4 -msgid "Field filters" -msgstr "Filtri per il campo" +#: templates/rest_framework/base.html:37 +msgid "navbar" +msgstr "" -#: templates/rest_framework/filters/ordering.html:3 -msgid "Ordering" -msgstr "Ordinamento" +#: templates/rest_framework/base.html:75 +msgid "content" +msgstr "" -#: templates/rest_framework/filters/search.html:2 -msgid "Search" -msgstr "Cerca" +#: templates/rest_framework/base.html:78 +msgid "request form" +msgstr "" -#: templates/rest_framework/horizontal/radio.html:2 -#: templates/rest_framework/inline/radio.html:2 -#: templates/rest_framework/vertical/radio.html:2 +#: templates/rest_framework/base.html:157 +msgid "main content" +msgstr "" + +#: templates/rest_framework/base.html:173 +msgid "request info" +msgstr "" + +#: templates/rest_framework/base.html:177 +msgid "response info" +msgstr "" + +#: templates/rest_framework/horizontal/radio.html:4 +#: templates/rest_framework/inline/radio.html:3 +#: templates/rest_framework/vertical/radio.html:3 msgid "None" msgstr "Nessuno" -#: templates/rest_framework/horizontal/select_multiple.html:2 -#: templates/rest_framework/inline/select_multiple.html:2 -#: templates/rest_framework/vertical/select_multiple.html:2 +#: templates/rest_framework/horizontal/select_multiple.html:4 +#: templates/rest_framework/inline/select_multiple.html:3 +#: templates/rest_framework/vertical/select_multiple.html:3 msgid "No items to select." msgstr "Nessun elemento da selezionare." -#: validators.py:43 +#: validators.py:39 msgid "This field must be unique." msgstr "Questo campo deve essere unico." -#: validators.py:97 +#: validators.py:89 +#, python-brace-format msgid "The fields {field_names} must make a unique set." msgstr "I campi {field_names} devono costituire un insieme unico." -#: validators.py:245 +#: validators.py:171 +#, python-brace-format +msgid "Surrogate characters are not allowed: U+{code_point:X}." +msgstr "" + +#: validators.py:243 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" date." msgstr "Questo campo deve essere unico per la data \"{date_field}\"." -#: validators.py:260 +#: validators.py:258 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" month." msgstr "Questo campo deve essere unico per il mese \"{date_field}\"." -#: validators.py:273 +#: validators.py:271 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" year." msgstr "Questo campo deve essere unico per l'anno \"{date_field}\"." -#: versioning.py:42 +#: versioning.py:40 msgid "Invalid version in \"Accept\" header." msgstr "Versione non valida nell'header \"Accept\"." -#: versioning.py:73 +#: versioning.py:71 msgid "Invalid version in URL path." msgstr "Versione non valida nella sequenza URL." -#: versioning.py:115 +#: versioning.py:116 msgid "Invalid version in URL path. Does not match any version namespace." -msgstr "" +msgstr "Versione non valida nell'URL path. Non corrisponde con nessun namespace di versione." -#: versioning.py:147 +#: versioning.py:148 msgid "Invalid version in hostname." msgstr "Versione non valida nel nome dell'host." -#: versioning.py:169 +#: versioning.py:170 msgid "Invalid version in query parameter." msgstr "Versione non valida nel parametro della query." - -#: views.py:88 -msgid "Permission denied." -msgstr "Permesso negato." diff --git a/rest_framework/locale/ja/LC_MESSAGES/django.mo b/rest_framework/locale/ja/LC_MESSAGES/django.mo index 5b9dbd8da62bf95a71c3f4a6e24ce0ddcb47d3c2..e949a57f792568f3e4200b448b49a1f59b8b6bab 100644 GIT binary patch delta 2239 zcmYk-TWnNC9LMq5cH3?*T*~&gP-Kf}Tj}-!Y%kktE3{y{RSLGWwMx4I#cJ(J3l$+| zwJ5|(3A%yk111o_`-54Hi3w5B#Q0!hf+REnQXWW5#GuBQs4@8coik0Gbk1jH&Yn4Q z`OoRq;hRH=t4qAc3~7X1s+?}jL7B;gRN*rwh?RH;c3}xVjr#q|xD3x?4xYylevei7 z4`yLSwlV9m7B}LgYr=d^VG|7=o^HcV+=j1U175>s4CERU#XgMSN!0zz*o_5w#@voE zT!Js52Kc6J|I|8*>hE6+n}jh<3)~ULQ8Ro7^@0=Fh?lSx^A{Sk0k>c^9z*`jH(d0) z3s`}9i;OA5Fy4jzNEc=rYw;*n<5$?p`^~Qu?#9Ssx5It7l=@*?KZTmv$EX=yL@nj- zwjR!R?{CF)+NV$}upe*38B~8CVmW?`MR*evK?<4t+K=Vv#b#vHO&iu=6xl{|!1^Mp zgBetqoW^4O0BiAU)Rz8%8gL7p>;53Bz8e)YNBpdRJ%#saaP}Hi4-~i~?m_+VNetp) z)PUYat-vMBz-5K*K+146^$M)RUL3?jsEN&C0I#DabgPi{SA&n~tihE?Jeoe#3Jl|0 z9%G)sdg@+6U$M}P+S>yd!n4*Nkx830I@SF`+=6Y$E}J)SJD#$75^RhbM(|<$0;5>U zw0rS!d;rg3KjyK1L%0*e_@(tv+)uq~xiRhd4r%~5umy_=1WlmV`YNiw#CZx2QCPZy z&T%j5!D-xqAK@dIA2enZ<2Zt|sDVZZb-FNza1hU++HYY8MpwG^*O57xE7*m9AuE$G z?SyumhU54cX0CEOdcbL|5qregIvyrjz=q(Ox%S`!i-}h9<}Y?q4x3z)Bxvfdp?I>D^Y?S*nl(m94ba~ zE8Y7|$RlO|D|o+op27gWXH8@MRUbl){1emzKcimgC&aa)X=#)KXmrmzmjP)m3cwF1|yKcR7LfG<1#UB$ z_dBVHt5!xwe1tqq*2G8&v)C;-(aZ<8sF%P28mfMl9w3D=gRoegmr+cX=ij@=-god*f3YY@2l9rAwbxwsBBV>I$ipckq zl@uRa$$ezv+S#T~vv@wYZu*A!V7UR_Jd>5fhA3H46I#wW*O zd*Tz3;6Q9@^wEjn=82v0-Fu%6w(N_$rM9ur@%YqeER|i7?Me0o##6rq(y~&E%69mY RM=JYMH!3|D$?}@d{sZ9P-bMfb delta 2607 zcmZYAX>1f_9LMpecMFuGlwP!SED9Cd(gHm!&_X#&Yq?P<*S6ilgk{&Ttq@Q*v>wy~ zRyHL{AaWR^@Pfn|5Mo3zL1QHGh*F8m`Cs!TKG9WhSzZ%4oNX43m-?_Ux#CH0}jDm zSd6b=5q^kC_&e4a6EZi+%%`G=)-s3-@I21K*rCR(!Z}!phj2Q6hYdJZlE?@NKNcpKuOl zjWDJJ*CJJ>7uD_%7UK7)nY@paaNJ1xp?_0PrWBt>Jzx*k<5`@EF{7dnti>G4O>Wsn zjbsOEWQUO{HRs&&efRflh95`$Ow>%w=AxxrfgwFGNM<7L#|%7!7GB2DcpKv}mIA9{ zl5jGnA=|*zxi%n8%?i|WHleoBir~#CXiMDG*i}GgF3-+KhBbY$>KI(;HdAlbtC4>1dBU4VrYTSex>1UXY zmt22Cjr5*dj$=4eDCZ&j*DOKJ%o;oqV~iKIbSXTf0vDk6%8RJ`K0)n)ze8k-$>cH& zxd=6dJ5UXJaVefb_KitqI@V*B>vq>GxR&~IrcI~f0ItAm*o0H_*k9O%&G-wJW2l0i zpo|Z9;&GgddHK;7Xu%nj_n}7em1~R@eP9)?p}r4!2lFR#@=Ow2T?0tRR;fgY5c-1YBf7IO*xQO~*)C^t002Xpq+wo1*^Zr3? zws8}TVfoEsRN3noGUgx|-S`Dg#Y&DsEpEX?JcSy`2dEjiiW+G;hq?w!QA-y<-G2mW zV!lP)e-{}vpUCLsi;4MbUxS7}5<#$*AKmQEPn{*JA}wABO#|$5FqZM*V&Z_hAEH ztrYwjpTr32d3l^c-QR@Muo*S8eW)4uW-{xq%#T#Wpmu0A!RNpXB_1UGgHZ>(my?FL z3Qf6^HZfbsNqWf!LbITxSy)6Q5cvcX<$O10)4#KMC>u_MGrh_)Fy}aJ#03O1=ZpxP zZ@V^9Dlwm6e>rI`R~@-lLPvNZp|m)Pvv-o+JS*s=bz1)=Zb2WSId0xUCdE0cvDi*% zkE|lJ)=F^%-x+60bz+o85_}YmhiD^`2qkU6QBE#;@j^Ti+Q3C?^c11JppV6LqJ_|! ztt2Xm3B)pDCZSYA=-fY?W>Lr>IH^w39?|l0GM!Y%HP_ASKOyLV;xmEq|cH@>tJ#e0H1F5(xOb9)C%=FnM8K!7eI0z5j2u za%KJ80e^B_!cecT&1$!O9o}uh0e@^^vc@Kj=9W{D?w&|@f28Y#@?94OI`VzVi8tPR z|K?kL;iVHZ!&OD2!gnUlOT6)V-{7m~2Pz6<6LRRKi^lKLSEPGSWcS`bUOL8`4DLM` Mt}o6HR~CQtFR>O}8UO$Q diff --git a/rest_framework/locale/ja/LC_MESSAGES/django.po b/rest_framework/locale/ja/LC_MESSAGES/django.po index a5e72d9a1..6b8d71429 100644 --- a/rest_framework/locale/ja/LC_MESSAGES/django.po +++ b/rest_framework/locale/ja/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-07-12 16:13+0100\n" -"PO-Revision-Date: 2017-08-03 14:58+0000\n" -"Last-Translator: Kouichi Nishizawa \n" +"POT-Creation-Date: 2020-10-13 21:45+0200\n" +"PO-Revision-Date: 2020-10-13 19:45+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,40 +19,40 @@ msgstr "" "Language: ja\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: authentication.py:73 +#: authentication.py:70 msgid "Invalid basic header. No credentials provided." msgstr "不正な基本ヘッダです。認証情報が含まれていません。" -#: authentication.py:76 +#: authentication.py:73 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "不正な基本ヘッダです。認証情報文字列に空白を含めてはいけません。" -#: authentication.py:82 +#: authentication.py:83 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "不正な基本ヘッダです。認証情報がBASE64で正しくエンコードされていません。" -#: authentication.py:99 +#: authentication.py:101 msgid "Invalid username/password." msgstr "ユーザ名かパスワードが違います。" -#: authentication.py:102 authentication.py:198 +#: authentication.py:104 authentication.py:206 msgid "User inactive or deleted." msgstr "ユーザが無効か削除されています。" -#: authentication.py:176 +#: authentication.py:184 msgid "Invalid token header. No credentials provided." msgstr "不正なトークンヘッダです。認証情報が含まれていません。" -#: authentication.py:179 +#: authentication.py:187 msgid "Invalid token header. Token string should not contain spaces." msgstr "不正なトークンヘッダです。トークン文字列に空白を含めてはいけません。" -#: authentication.py:185 +#: authentication.py:193 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "不正なトークンヘッダです。トークン文字列に不正な文字を含めてはいけません。" -#: authentication.py:195 +#: authentication.py:203 msgid "Invalid token." msgstr "不正なトークンです。" @@ -60,382 +60,515 @@ msgstr "不正なトークンです。" msgid "Auth Token" msgstr "認証トークン" -#: authtoken/models.py:15 +#: authtoken/models.py:13 msgid "Key" msgstr "キー" -#: authtoken/models.py:18 +#: authtoken/models.py:16 msgid "User" msgstr "ユーザ" -#: authtoken/models.py:20 +#: authtoken/models.py:18 msgid "Created" msgstr "作成された" -#: authtoken/models.py:29 +#: authtoken/models.py:27 authtoken/serializers.py:19 msgid "Token" msgstr "トークン" -#: authtoken/models.py:30 +#: authtoken/models.py:28 msgid "Tokens" msgstr "トークン" -#: authtoken/serializers.py:8 +#: authtoken/serializers.py:9 msgid "Username" msgstr "ユーザ名" -#: authtoken/serializers.py:9 +#: authtoken/serializers.py:13 msgid "Password" msgstr "パスワード" -#: authtoken/serializers.py:20 -msgid "User account is disabled." -msgstr "ユーザアカウントが無効化されています。" - -#: authtoken/serializers.py:23 +#: authtoken/serializers.py:35 msgid "Unable to log in with provided credentials." msgstr "提供された認証情報でログインできません。" -#: authtoken/serializers.py:26 +#: authtoken/serializers.py:38 msgid "Must include \"username\" and \"password\"." msgstr "\"username\"と\"password\"を含まなければなりません。" -#: exceptions.py:49 +#: exceptions.py:102 msgid "A server error occurred." msgstr "サーバエラーが発生しました。" -#: exceptions.py:84 +#: exceptions.py:142 +msgid "Invalid input." +msgstr "" + +#: exceptions.py:161 msgid "Malformed request." msgstr "不正な形式のリクエストです。" -#: exceptions.py:89 +#: exceptions.py:167 msgid "Incorrect authentication credentials." msgstr "認証情報が正しくありません。" -#: exceptions.py:94 +#: exceptions.py:173 msgid "Authentication credentials were not provided." msgstr "認証情報が含まれていません。" -#: exceptions.py:99 +#: exceptions.py:179 msgid "You do not have permission to perform this action." msgstr "このアクションを実行する権限がありません。" -#: exceptions.py:104 views.py:81 +#: exceptions.py:185 msgid "Not found." msgstr "見つかりませんでした。" -#: exceptions.py:109 +#: exceptions.py:191 +#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "メソッド \"{method}\" は許されていません。" -#: exceptions.py:120 +#: exceptions.py:202 msgid "Could not satisfy the request Accept header." msgstr "リクエストのAcceptヘッダを満たすことができませんでした。" -#: exceptions.py:132 +#: exceptions.py:212 +#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "リクエストのメディアタイプ \"{media_type}\" はサポートされていません。" -#: exceptions.py:145 +#: exceptions.py:223 msgid "Request was throttled." msgstr "リクエストの処理は絞られました。" -#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 -#: validators.py:181 +#: exceptions.py:224 +#, python-brace-format +msgid "Expected available in {wait} second." +msgstr "" + +#: exceptions.py:225 +#, python-brace-format +msgid "Expected available in {wait} seconds." +msgstr "" + +#: fields.py:316 relations.py:245 relations.py:279 validators.py:90 +#: validators.py:183 msgid "This field is required." msgstr "この項目は必須です。" -#: fields.py:270 +#: fields.py:317 msgid "This field may not be null." msgstr "この項目はnullにできません。" -#: fields.py:608 fields.py:639 -msgid "\"{input}\" is not a valid boolean." -msgstr "\"{input}\" は有効なブーリアンではありません。" +#: fields.py:701 +msgid "Must be a valid boolean." +msgstr "" -#: fields.py:674 +#: fields.py:766 +msgid "Not a valid string." +msgstr "" + +#: fields.py:767 msgid "This field may not be blank." msgstr "この項目は空にできません。" -#: fields.py:675 fields.py:1675 +#: fields.py:768 fields.py:1881 +#, python-brace-format msgid "Ensure this field has no more than {max_length} characters." msgstr "この項目が{max_length}文字より長くならないようにしてください。" -#: fields.py:676 +#: fields.py:769 +#, python-brace-format msgid "Ensure this field has at least {min_length} characters." msgstr "この項目は少なくとも{min_length}文字以上にしてください。" -#: fields.py:713 +#: fields.py:816 msgid "Enter a valid email address." msgstr "有効なメールアドレスを入力してください。" -#: fields.py:724 +#: fields.py:827 msgid "This value does not match the required pattern." msgstr "この値は所要のパターンにマッチしません。" -#: fields.py:735 +#: fields.py:838 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "文字、数字、アンダースコア、またはハイフンから成る有効な \"slug\" を入力してください。" -#: fields.py:747 +#: fields.py:839 +msgid "" +"Enter a valid \"slug\" consisting of Unicode letters, numbers, underscores, " +"or hyphens." +msgstr "" + +#: fields.py:854 msgid "Enter a valid URL." msgstr "有効なURLを入力してください。" -#: fields.py:760 -msgid "\"{value}\" is not a valid UUID." -msgstr "\"{value}\" は有効なUUIDではありません。" +#: fields.py:867 +msgid "Must be a valid UUID." +msgstr "" -#: fields.py:796 +#: fields.py:903 msgid "Enter a valid IPv4 or IPv6 address." msgstr "有効なIPv4またはIPv6アドレスを入力してください。" -#: fields.py:821 +#: fields.py:931 msgid "A valid integer is required." msgstr "有効な整数を入力してください。" -#: fields.py:822 fields.py:857 fields.py:891 +#: fields.py:932 fields.py:969 fields.py:1005 fields.py:1366 +#, python-brace-format msgid "Ensure this value is less than or equal to {max_value}." msgstr "この値は{max_value}以下にしてください。" -#: fields.py:823 fields.py:858 fields.py:892 +#: fields.py:933 fields.py:970 fields.py:1006 fields.py:1367 +#, python-brace-format msgid "Ensure this value is greater than or equal to {min_value}." msgstr "この値は{min_value}以上にしてください。" -#: fields.py:824 fields.py:859 fields.py:896 +#: fields.py:934 fields.py:971 fields.py:1010 msgid "String value too large." msgstr "文字列が長過ぎます。" -#: fields.py:856 fields.py:890 +#: fields.py:968 fields.py:1004 msgid "A valid number is required." msgstr "有効な数値を入力してください。" -#: fields.py:893 +#: fields.py:1007 +#, python-brace-format msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "合計で最大{max_digits}桁以下になるようにしてください。" -#: fields.py:894 +#: fields.py:1008 +#, python-brace-format msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "小数点以下の桁数を{max_decimal_places}を超えないようにしてください。" -#: fields.py:895 +#: fields.py:1009 +#, python-brace-format msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "整数部の桁数を{max_whole_digits}を超えないようにしてください。" -#: fields.py:1025 +#: fields.py:1148 +#, python-brace-format msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "日時の形式が違います。以下のどれかの形式にしてください: {format}。" -#: fields.py:1026 +#: fields.py:1149 msgid "Expected a datetime but got a date." msgstr "日付ではなく日時を入力してください。" -#: fields.py:1103 +#: fields.py:1150 +#, python-brace-format +msgid "Invalid datetime for the timezone \"{timezone}\"." +msgstr "" + +#: fields.py:1151 +msgid "Datetime value out of range." +msgstr "" + +#: fields.py:1236 +#, python-brace-format msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "日付の形式が違います。以下のどれかの形式にしてください: {format}。" -#: fields.py:1104 +#: fields.py:1237 msgid "Expected a date but got a datetime." msgstr "日時ではなく日付を入力してください。" -#: fields.py:1170 +#: fields.py:1303 +#, python-brace-format msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "時刻の形式が違います。以下のどれかの形式にしてください: {format}。" -#: fields.py:1232 +#: fields.py:1365 +#, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "機関の形式が違います。以下のどれかの形式にしてください: {format}。" -#: fields.py:1251 fields.py:1300 +#: fields.py:1399 fields.py:1456 +#, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\"は有効な選択肢ではありません。" -#: fields.py:1254 relations.py:71 relations.py:441 +#: fields.py:1402 +#, python-brace-format msgid "More than {count} items..." msgstr " {count} 個より多い..." -#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 +#: fields.py:1457 fields.py:1603 relations.py:485 serializers.py:570 +#, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." msgstr "\"{input_type}\" 型のデータではなく項目のリストを入力してください。" -#: fields.py:1302 +#: fields.py:1458 msgid "This selection may not be empty." msgstr "空でない項目を選択してください。" -#: fields.py:1339 +#: fields.py:1495 +#, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "\"{input}\"は有効なパスの選択肢ではありません。" -#: fields.py:1358 +#: fields.py:1514 msgid "No file was submitted." msgstr "ファイルが添付されていません。" -#: fields.py:1359 +#: fields.py:1515 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "添付されたデータはファイルではありません。フォームのエンコーディングタイプを確認してください。" -#: fields.py:1360 +#: fields.py:1516 msgid "No filename could be determined." msgstr "ファイル名が取得できませんでした。" -#: fields.py:1361 +#: fields.py:1517 msgid "The submitted file is empty." msgstr "添付ファイルの中身が空でした。" -#: fields.py:1362 +#: fields.py:1518 +#, python-brace-format msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "ファイル名は最大{max_length}文字にしてください({length}文字でした)。" -#: fields.py:1410 +#: fields.py:1566 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 +#: fields.py:1604 relations.py:486 serializers.py:571 msgid "This list may not be empty." msgstr "リストは空ではいけません。" -#: fields.py:1502 +#: fields.py:1605 +#, python-brace-format +msgid "Ensure this field has at least {min_length} elements." +msgstr "" + +#: fields.py:1606 +#, python-brace-format +msgid "Ensure this field has no more than {max_length} elements." +msgstr "" + +#: fields.py:1682 +#, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "\"{input_type}\" 型のデータではなく項目の辞書を入力してください。" -#: fields.py:1549 +#: fields.py:1683 +msgid "This dictionary may not be empty." +msgstr "" + +#: fields.py:1755 msgid "Value must be valid JSON." msgstr "値は有効なJSONでなければなりません。" -#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 -msgid "Submit" -msgstr "提出" +#: filters.py:49 templates/rest_framework/filters/search.html:2 +msgid "Search" +msgstr "検索" -#: filters.py:336 +#: filters.py:50 +msgid "A search term." +msgstr "" + +#: filters.py:180 templates/rest_framework/filters/ordering.html:3 +msgid "Ordering" +msgstr "順序" + +#: filters.py:181 +msgid "Which field to use when ordering the results." +msgstr "" + +#: filters.py:287 msgid "ascending" msgstr "昇順" -#: filters.py:337 +#: filters.py:288 msgid "descending" msgstr "降順" -#: pagination.py:193 +#: pagination.py:174 +msgid "A page number within the paginated result set." +msgstr "" + +#: pagination.py:179 pagination.py:372 pagination.py:590 +msgid "Number of results to return per page." +msgstr "" + +#: pagination.py:189 msgid "Invalid page." msgstr "不正なページです。" -#: pagination.py:427 +#: pagination.py:374 +msgid "The initial index from which to return the results." +msgstr "" + +#: pagination.py:581 +msgid "The pagination cursor value." +msgstr "" + +#: pagination.py:583 msgid "Invalid cursor" msgstr "カーソルが不正です。" -#: relations.py:207 +#: relations.py:246 +#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "主キー \"{pk_value}\" は不正です - データが存在しません。" -#: relations.py:208 +#: relations.py:247 +#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "不正な型です。{data_type} 型ではなく主キーの値を入力してください。" -#: relations.py:240 +#: relations.py:280 msgid "Invalid hyperlink - No URL match." msgstr "ハイパーリンクが不正です - URLにマッチしません。" -#: relations.py:241 +#: relations.py:281 msgid "Invalid hyperlink - Incorrect URL match." msgstr "ハイパーリンクが不正です - 不正なURLにマッチします。" -#: relations.py:242 +#: relations.py:282 msgid "Invalid hyperlink - Object does not exist." msgstr "ハイパーリンクが不正です - リンク先が存在しません。" -#: relations.py:243 +#: relations.py:283 +#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "不正なデータ型です。{data_type} 型ではなくURL文字列を入力してください。" -#: relations.py:401 +#: relations.py:448 +#, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "{slug_name}={value} のデータが存在しません。" -#: relations.py:402 +#: relations.py:449 msgid "Invalid value." msgstr "不正な値です。" -#: serializers.py:326 +#: schemas/utils.py:32 +msgid "unique integer value" +msgstr "" + +#: schemas/utils.py:34 +msgid "UUID string" +msgstr "" + +#: schemas/utils.py:36 +msgid "unique value" +msgstr "" + +#: schemas/utils.py:38 +#, python-brace-format +msgid "A {value_type} identifying this {name}." +msgstr "" + +#: serializers.py:337 +#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "不正なデータです。{datatype} 型ではなく辞書を入力してください。" #: templates/rest_framework/admin.html:116 -#: templates/rest_framework/base.html:128 +#: templates/rest_framework/base.html:136 +msgid "Extra Actions" +msgstr "" + +#: templates/rest_framework/admin.html:130 +#: templates/rest_framework/base.html:150 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/base.html:37 +msgid "navbar" +msgstr "" -#: templates/rest_framework/filters/ordering.html:3 -msgid "Ordering" -msgstr "順序" +#: templates/rest_framework/base.html:75 +msgid "content" +msgstr "" -#: templates/rest_framework/filters/search.html:2 -msgid "Search" -msgstr "検索" +#: templates/rest_framework/base.html:78 +msgid "request form" +msgstr "" -#: templates/rest_framework/horizontal/radio.html:2 -#: templates/rest_framework/inline/radio.html:2 -#: templates/rest_framework/vertical/radio.html:2 +#: templates/rest_framework/base.html:157 +msgid "main content" +msgstr "" + +#: templates/rest_framework/base.html:173 +msgid "request info" +msgstr "" + +#: templates/rest_framework/base.html:177 +msgid "response info" +msgstr "" + +#: templates/rest_framework/horizontal/radio.html:4 +#: templates/rest_framework/inline/radio.html:3 +#: templates/rest_framework/vertical/radio.html:3 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 +#: templates/rest_framework/horizontal/select_multiple.html:4 +#: templates/rest_framework/inline/select_multiple.html:3 +#: templates/rest_framework/vertical/select_multiple.html:3 msgid "No items to select." msgstr "選択する項目がありません。" -#: validators.py:43 +#: validators.py:39 msgid "This field must be unique." msgstr "この項目は一意でなければなりません。" -#: validators.py:97 +#: validators.py:89 +#, python-brace-format msgid "The fields {field_names} must make a unique set." msgstr "項目 {field_names} は一意な組でなければなりません。" -#: validators.py:245 +#: validators.py:171 +#, python-brace-format +msgid "Surrogate characters are not allowed: U+{code_point:X}." +msgstr "" + +#: validators.py:243 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" date." msgstr "この項目は \"{date_field}\" の日に対して一意でなければなりません。" -#: validators.py:260 +#: validators.py:258 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" month." msgstr "この項目は \"{date_field}\" の月に対して一意でなければなりません。" -#: validators.py:273 +#: validators.py:271 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" year." msgstr "この項目は \"{date_field}\" の年に対して一意でなければなりません。" -#: versioning.py:42 +#: versioning.py:40 msgid "Invalid version in \"Accept\" header." msgstr "\"Accept\" 内のバージョンが不正です。" -#: versioning.py:73 +#: versioning.py:71 msgid "Invalid version in URL path." msgstr "URLパス内のバージョンが不正です。" -#: versioning.py:115 +#: versioning.py:116 msgid "Invalid version in URL path. Does not match any version namespace." msgstr "不正なバージョンのURLのパスです。どのバージョンの名前空間にも一致しません。" -#: versioning.py:147 +#: versioning.py:148 msgid "Invalid version in hostname." msgstr "ホスト名内のバージョンが不正です。" -#: versioning.py:169 +#: versioning.py:170 msgid "Invalid version in query parameter." msgstr "クエリパラメータ内のバージョンが不正です。" - -#: views.py:88 -msgid "Permission denied." -msgstr "権限がありません。" diff --git a/rest_framework/locale/ko_KR/LC_MESSAGES/django.mo b/rest_framework/locale/ko_KR/LC_MESSAGES/django.mo index 570ff6f538532729f73753ecc2bf9135aa3de88f..c3aeb27a96e5c3b3ef9e61ac79e9ad229463ec7c 100644 GIT binary patch delta 2349 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 GpZf<{iC`1} diff --git a/rest_framework/locale/ko_KR/LC_MESSAGES/django.po b/rest_framework/locale/ko_KR/LC_MESSAGES/django.po index 43dbe0cdd..722dc2c82 100644 --- a/rest_framework/locale/ko_KR/LC_MESSAGES/django.po +++ b/rest_framework/locale/ko_KR/LC_MESSAGES/django.po @@ -4,15 +4,16 @@ # # Translators: # GarakdongBigBoy , 2017 +# Hochul Kwak , 2018 # Joon Hwan 김준환 , 2017 # SUN CHOI , 2015 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: 2017-09-28 09:41+0000\n" -"Last-Translator: GarakdongBigBoy \n" +"POT-Creation-Date: 2020-10-13 21:45+0200\n" +"PO-Revision-Date: 2020-10-13 19:45+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,423 +21,556 @@ msgstr "" "Language: ko_KR\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: authentication.py:73 +#: authentication.py:70 msgid "Invalid basic header. No credentials provided." msgstr "기본 헤더(basic header)가 유효하지 않습니다. 인증데이터(credentials)가 제공되지 않았습니다." -#: authentication.py:76 +#: authentication.py:73 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "기본 헤더(basic header)가 유효하지 않습니다. 인증데이터(credentials) 문자열은 빈칸(spaces)을 포함하지 않아야 합니다." -#: authentication.py:82 +#: authentication.py:83 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "기본 헤더(basic header)가 유효하지 않습니다. 인증데이터(credentials)가 base64로 적절히 부호화(encode)되지 않았습니다." -#: authentication.py:99 +#: authentication.py:101 msgid "Invalid username/password." msgstr "아이디/비밀번호가 유효하지 않습니다." -#: authentication.py:102 authentication.py:198 +#: authentication.py:104 authentication.py:206 msgid "User inactive or deleted." msgstr "계정이 중지되었거나 삭제되었습니다." -#: authentication.py:176 +#: authentication.py:184 msgid "Invalid token header. No credentials provided." msgstr "토큰 헤더가 유효하지 않습니다. 인증데이터(credentials)가 제공되지 않았습니다." -#: authentication.py:179 +#: authentication.py:187 msgid "Invalid token header. Token string should not contain spaces." msgstr "토큰 헤더가 유효하지 않습니다. 토큰 문자열은 빈칸(spaces)을 포함하지 않아야 합니다." -#: authentication.py:185 +#: authentication.py:193 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "토큰 헤더가 유효하지 않습니다. 토큰 문자열은 유효하지 않은 문자를 포함하지 않아야 합니다." -#: authentication.py:195 +#: authentication.py:203 msgid "Invalid token." msgstr "토큰이 유효하지 않습니다." #: authtoken/apps.py:7 msgid "Auth Token" -msgstr "" +msgstr "인증 토큰" -#: authtoken/models.py:15 +#: authtoken/models.py:13 msgid "Key" -msgstr "" +msgstr "키" + +#: authtoken/models.py:16 +msgid "User" +msgstr "유저" #: authtoken/models.py:18 -msgid "User" -msgstr "" - -#: authtoken/models.py:20 msgid "Created" -msgstr "" +msgstr "생성됨" -#: authtoken/models.py:29 +#: authtoken/models.py:27 authtoken/serializers.py:19 msgid "Token" -msgstr "" +msgstr "토큰" -#: authtoken/models.py:30 +#: authtoken/models.py:28 msgid "Tokens" msgstr "" -#: authtoken/serializers.py:8 -msgid "Username" -msgstr "" - #: authtoken/serializers.py:9 +msgid "Username" +msgstr "유저이름" + +#: authtoken/serializers.py:13 msgid "Password" -msgstr "" +msgstr "비밀번호" -#: authtoken/serializers.py:20 -msgid "User account is disabled." -msgstr "사용자 계정을 사용할 수 없습니다." - -#: authtoken/serializers.py:23 +#: authtoken/serializers.py:35 msgid "Unable to log in with provided credentials." msgstr "제공된 인증데이터(credentials)로는 로그인할 수 없습니다." -#: authtoken/serializers.py:26 +#: authtoken/serializers.py:38 msgid "Must include \"username\" and \"password\"." msgstr "\"아이디\"와 \"비밀번호\"를 포함해야 합니다." -#: exceptions.py:49 +#: exceptions.py:102 msgid "A server error occurred." msgstr "서버 장애가 발생했습니다." -#: exceptions.py:84 +#: exceptions.py:142 +msgid "Invalid input." +msgstr "" + +#: exceptions.py:161 msgid "Malformed request." msgstr "잘못된 요청입니다." -#: exceptions.py:89 +#: exceptions.py:167 msgid "Incorrect authentication credentials." msgstr "자격 인증데이터(authentication credentials)가 정확하지 않습니다." -#: exceptions.py:94 +#: exceptions.py:173 msgid "Authentication credentials were not provided." msgstr "자격 인증데이터(authentication credentials)가 제공되지 않았습니다." -#: exceptions.py:99 +#: exceptions.py:179 msgid "You do not have permission to perform this action." msgstr "이 작업을 수행할 권한(permission)이 없습니다." -#: exceptions.py:104 views.py:81 +#: exceptions.py:185 msgid "Not found." msgstr "찾을 수 없습니다." -#: exceptions.py:109 +#: exceptions.py:191 +#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "메소드(Method) \"{method}\"는 허용되지 않습니다." -#: exceptions.py:120 +#: exceptions.py:202 msgid "Could not satisfy the request Accept header." msgstr "Accept header 요청을 만족할 수 없습니다." -#: exceptions.py:132 +#: exceptions.py:212 +#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "요청된 \"{media_type}\"가 지원되지 않는 미디어 형태입니다." -#: exceptions.py:145 +#: exceptions.py:223 msgid "Request was throttled." msgstr "요청이 지연(throttled)되었습니다." -#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 -#: validators.py:181 +#: exceptions.py:224 +#, python-brace-format +msgid "Expected available in {wait} second." +msgstr "" + +#: exceptions.py:225 +#, python-brace-format +msgid "Expected available in {wait} seconds." +msgstr "" + +#: fields.py:316 relations.py:245 relations.py:279 validators.py:90 +#: validators.py:183 msgid "This field is required." msgstr "이 필드는 필수 항목입니다." -#: fields.py:270 +#: fields.py:317 msgid "This field may not be null." msgstr "이 필드는 null일 수 없습니다." -#: fields.py:608 fields.py:639 -msgid "\"{input}\" is not a valid boolean." -msgstr "\"{input}\"이 유효하지 않은 부울(boolean)입니다." +#: fields.py:701 +msgid "Must be a valid boolean." +msgstr "" -#: fields.py:674 +#: fields.py:766 +msgid "Not a valid string." +msgstr "" + +#: fields.py:767 msgid "This field may not be blank." msgstr "이 필드는 blank일 수 없습니다." -#: fields.py:675 fields.py:1675 +#: fields.py:768 fields.py:1881 +#, python-brace-format msgid "Ensure this field has no more than {max_length} characters." msgstr "이 필드의 글자 수가 {max_length} 이하인지 확인하십시오." -#: fields.py:676 +#: fields.py:769 +#, python-brace-format msgid "Ensure this field has at least {min_length} characters." msgstr "이 필드의 글자 수가 적어도 {min_length} 이상인지 확인하십시오." -#: fields.py:713 +#: fields.py:816 msgid "Enter a valid email address." msgstr "유효한 이메일 주소를 입력하십시오." -#: fields.py:724 +#: fields.py:827 msgid "This value does not match the required pattern." msgstr "형식에 맞지 않는 값입니다." -#: fields.py:735 +#: fields.py:838 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "문자, 숫자, 밑줄( _ ) 또는 하이픈( - )으로 이루어진 유효한 \"slug\"를 입력하십시오." -#: fields.py:747 +#: fields.py:839 +msgid "" +"Enter a valid \"slug\" consisting of Unicode letters, numbers, underscores, " +"or hyphens." +msgstr "" + +#: fields.py:854 msgid "Enter a valid URL." msgstr "유효한 URL을 입력하십시오." -#: fields.py:760 -msgid "\"{value}\" is not a valid UUID." -msgstr "\"{value}\"가 유효하지 않은 UUID 입니다." +#: fields.py:867 +msgid "Must be a valid UUID." +msgstr "" -#: fields.py:796 +#: fields.py:903 msgid "Enter a valid IPv4 or IPv6 address." msgstr "유효한 IPv4 또는 IPv6 주소를 입력하십시오." -#: fields.py:821 +#: fields.py:931 msgid "A valid integer is required." msgstr "유효한 정수(integer)를 넣어주세요." -#: fields.py:822 fields.py:857 fields.py:891 +#: fields.py:932 fields.py:969 fields.py:1005 fields.py:1366 +#, python-brace-format msgid "Ensure this value is less than or equal to {max_value}." msgstr "이 값이 {max_value}보다 작거나 같은지 확인하십시오." -#: fields.py:823 fields.py:858 fields.py:892 +#: fields.py:933 fields.py:970 fields.py:1006 fields.py:1367 +#, python-brace-format msgid "Ensure this value is greater than or equal to {min_value}." msgstr "이 값이 {min_value}보다 크거나 같은지 확인하십시오." -#: fields.py:824 fields.py:859 fields.py:896 +#: fields.py:934 fields.py:971 fields.py:1010 msgid "String value too large." msgstr "문자열 값이 너무 큽니다." -#: fields.py:856 fields.py:890 +#: fields.py:968 fields.py:1004 msgid "A valid number is required." msgstr "유효한 숫자를 넣어주세요." -#: fields.py:893 +#: fields.py:1007 +#, python-brace-format msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "전체 숫자(digits)가 {max_digits} 이하인지 확인하십시오." -#: fields.py:894 +#: fields.py:1008 +#, python-brace-format msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "소수점 자릿수가 {max_decimal_places} 이하인지 확인하십시오." -#: fields.py:895 +#: fields.py:1009 +#, python-brace-format msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "소수점 자리 앞에 숫자(digits)가 {max_whole_digits} 이하인지 확인하십시오." -#: fields.py:1025 +#: fields.py:1148 +#, python-brace-format msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "Datetime의 포멧이 잘못되었습니다. 이 형식들 중 한가지를 사용하세요: {format}." -#: fields.py:1026 +#: fields.py:1149 msgid "Expected a datetime but got a date." msgstr "예상된 datatime 대신 date를 받았습니다." -#: fields.py:1103 +#: fields.py:1150 +#, python-brace-format +msgid "Invalid datetime for the timezone \"{timezone}\"." +msgstr "" + +#: fields.py:1151 +msgid "Datetime value out of range." +msgstr "" + +#: fields.py:1236 +#, python-brace-format msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "Date의 포멧이 잘못되었습니다. 이 형식들 중 한가지를 사용하세요: {format}." -#: fields.py:1104 +#: fields.py:1237 msgid "Expected a date but got a datetime." msgstr "예상된 date 대신 datetime을 받았습니다." -#: fields.py:1170 +#: fields.py:1303 +#, python-brace-format msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "Time의 포멧이 잘못되었습니다. 이 형식들 중 한가지를 사용하세요: {format}." -#: fields.py:1232 +#: fields.py:1365 +#, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "Duration의 포멧이 잘못되었습니다. 이 형식들 중 한가지를 사용하세요: {format}." -#: fields.py:1251 fields.py:1300 +#: fields.py:1399 fields.py:1456 +#, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\"이 유효하지 않은 선택(choice)입니다." -#: fields.py:1254 relations.py:71 relations.py:441 +#: fields.py:1402 +#, python-brace-format msgid "More than {count} items..." msgstr "" -#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 +#: fields.py:1457 fields.py:1603 relations.py:485 serializers.py:570 +#, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." msgstr "아이템 리스트가 예상되었으나 \"{input_type}\"를 받았습니다." -#: fields.py:1302 +#: fields.py:1458 msgid "This selection may not be empty." msgstr "이 선택 항목은 비워 둘 수 없습니다." -#: fields.py:1339 +#: fields.py:1495 +#, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "\"{input}\"이 유효하지 않은 경로 선택입니다." -#: fields.py:1358 +#: fields.py:1514 msgid "No file was submitted." msgstr "파일이 제출되지 않았습니다." -#: fields.py:1359 +#: fields.py:1515 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "제출된 데이터는 파일이 아닙니다. 제출된 서식의 인코딩 형식을 확인하세요." -#: fields.py:1360 +#: fields.py:1516 msgid "No filename could be determined." msgstr "파일명을 알 수 없습니다." -#: fields.py:1361 +#: fields.py:1517 msgid "The submitted file is empty." msgstr "제출한 파일이 비어있습니다." -#: fields.py:1362 +#: fields.py:1518 +#, python-brace-format msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "이 파일명의 글자수가 최대 {max_length}를 넘지 않는지 확인하십시오. (이것은 {length}가 있습니다)." -#: fields.py:1410 +#: fields.py:1566 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 +#: fields.py:1604 relations.py:486 serializers.py:571 msgid "This list may not be empty." msgstr "이 리스트는 비워 둘 수 없습니다." -#: fields.py:1502 +#: fields.py:1605 +#, python-brace-format +msgid "Ensure this field has at least {min_length} elements." +msgstr "" + +#: fields.py:1606 +#, python-brace-format +msgid "Ensure this field has no more than {max_length} elements." +msgstr "" + +#: fields.py:1682 +#, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "아이템 딕셔너리가 예상되었으나 \"{input_type}\" 타입을 받았습니다." -#: fields.py:1549 +#: fields.py:1683 +msgid "This dictionary may not be empty." +msgstr "" + +#: fields.py:1755 msgid "Value must be valid JSON." msgstr "Value 는 유효한 JSON형식이어야 합니다." -#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 -msgid "Submit" +#: filters.py:49 templates/rest_framework/filters/search.html:2 +msgid "Search" +msgstr "검색" + +#: filters.py:50 +msgid "A search term." msgstr "" -#: filters.py:336 +#: filters.py:180 templates/rest_framework/filters/ordering.html:3 +msgid "Ordering" +msgstr "순서" + +#: filters.py:181 +msgid "Which field to use when ordering the results." +msgstr "" + +#: filters.py:287 msgid "ascending" msgstr "오름차순" -#: filters.py:337 +#: filters.py:288 msgid "descending" msgstr "내림차순" -#: pagination.py:193 +#: pagination.py:174 +msgid "A page number within the paginated result set." +msgstr "" + +#: pagination.py:179 pagination.py:372 pagination.py:590 +msgid "Number of results to return per page." +msgstr "" + +#: pagination.py:189 msgid "Invalid page." msgstr "페이지가 유효하지 않습니다." -#: pagination.py:427 +#: pagination.py:374 +msgid "The initial index from which to return the results." +msgstr "" + +#: pagination.py:581 +msgid "The pagination cursor value." +msgstr "" + +#: pagination.py:583 msgid "Invalid cursor" msgstr "커서(cursor)가 유효하지 않습니다." -#: relations.py:207 +#: relations.py:246 +#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "유효하지 않은 pk \"{pk_value}\" - 객체가 존재하지 않습니다." -#: relations.py:208 +#: relations.py:247 +#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "잘못된 형식입니다. pk 값 대신 {data_type}를 받았습니다." -#: relations.py:240 +#: relations.py:280 msgid "Invalid hyperlink - No URL match." msgstr "유효하지 않은 하이퍼링크 - 일치하는 URL이 없습니다." -#: relations.py:241 +#: relations.py:281 msgid "Invalid hyperlink - Incorrect URL match." msgstr "유효하지 않은 하이퍼링크 - URL이 일치하지 않습니다." -#: relations.py:242 +#: relations.py:282 msgid "Invalid hyperlink - Object does not exist." msgstr "유효하지 않은 하이퍼링크 - 객체가 존재하지 않습니다." -#: relations.py:243 +#: relations.py:283 +#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "잘못된 형식입니다. URL 문자열을 예상했으나 {data_type}을 받았습니다." -#: relations.py:401 +#: relations.py:448 +#, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "{slug_name}={value} 객체가 존재하지 않습니다." -#: relations.py:402 +#: relations.py:449 msgid "Invalid value." msgstr "값이 유효하지 않습니다." -#: serializers.py:326 +#: schemas/utils.py:32 +msgid "unique integer value" +msgstr "" + +#: schemas/utils.py:34 +msgid "UUID string" +msgstr "" + +#: schemas/utils.py:36 +msgid "unique value" +msgstr "" + +#: schemas/utils.py:38 +#, python-brace-format +msgid "A {value_type} identifying this {name}." +msgstr "" + +#: serializers.py:337 +#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "유효하지 않은 데이터. 딕셔너리(dictionary)대신 {datatype}를 받았습니다." #: templates/rest_framework/admin.html:116 -#: templates/rest_framework/base.html:128 +#: templates/rest_framework/base.html:136 +msgid "Extra Actions" +msgstr "" + +#: templates/rest_framework/admin.html:130 +#: templates/rest_framework/base.html:150 msgid "Filters" +msgstr "필터" + +#: templates/rest_framework/base.html:37 +msgid "navbar" msgstr "" -#: templates/rest_framework/filters/django_filter.html:2 -#: templates/rest_framework/filters/django_filter_crispyforms.html:4 -msgid "Field filters" +#: templates/rest_framework/base.html:75 +msgid "content" msgstr "" -#: templates/rest_framework/filters/ordering.html:3 -msgid "Ordering" +#: templates/rest_framework/base.html:78 +msgid "request form" msgstr "" -#: templates/rest_framework/filters/search.html:2 -msgid "Search" -msgstr "검색" +#: templates/rest_framework/base.html:157 +msgid "main content" +msgstr "" -#: templates/rest_framework/horizontal/radio.html:2 -#: templates/rest_framework/inline/radio.html:2 -#: templates/rest_framework/vertical/radio.html:2 +#: templates/rest_framework/base.html:173 +msgid "request info" +msgstr "" + +#: templates/rest_framework/base.html:177 +msgid "response info" +msgstr "" + +#: templates/rest_framework/horizontal/radio.html:4 +#: templates/rest_framework/inline/radio.html:3 +#: templates/rest_framework/vertical/radio.html:3 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 +#: templates/rest_framework/horizontal/select_multiple.html:4 +#: templates/rest_framework/inline/select_multiple.html:3 +#: templates/rest_framework/vertical/select_multiple.html:3 msgid "No items to select." msgstr "선택할 아이템이 없습니다." -#: validators.py:43 +#: validators.py:39 msgid "This field must be unique." msgstr "이 필드는 반드시 고유(unique)해야 합니다." -#: validators.py:97 +#: validators.py:89 +#, python-brace-format msgid "The fields {field_names} must make a unique set." msgstr "필드 {field_names} 는 반드시 고유(unique)해야 합니다." -#: validators.py:245 +#: validators.py:171 +#, python-brace-format +msgid "Surrogate characters are not allowed: U+{code_point:X}." +msgstr "" + +#: validators.py:243 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" date." msgstr "이 필드는 고유(unique)한 \"{date_field}\" 날짜를 갖습니다." -#: validators.py:260 +#: validators.py:258 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" month." msgstr "이 필드는 고유(unique)한 \"{date_field}\" 월을 갖습니다. " -#: validators.py:273 +#: validators.py:271 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" year." msgstr "이 필드는 고유(unique)한 \"{date_field}\" 년을 갖습니다. " -#: versioning.py:42 +#: versioning.py:40 msgid "Invalid version in \"Accept\" header." msgstr "\"Accept\" 헤더(header)의 버전이 유효하지 않습니다." -#: versioning.py:73 +#: versioning.py:71 msgid "Invalid version in URL path." msgstr "URL path의 버전이 유효하지 않습니다." -#: versioning.py:115 +#: versioning.py:116 msgid "Invalid version in URL path. Does not match any version namespace." msgstr "URL 경로에 유효하지 않은 버전이 있습니다. 버전 네임 스페이스와 일치하지 않습니다." -#: versioning.py:147 +#: versioning.py:148 msgid "Invalid version in hostname." msgstr "hostname내 버전이 유효하지 않습니다." -#: versioning.py:169 +#: versioning.py:170 msgid "Invalid version in query parameter." msgstr "쿼리 파라메터내 버전이 유효하지 않습니다." - -#: views.py:88 -msgid "Permission denied." -msgstr "사용 권한이 거부되었습니다." diff --git a/rest_framework/locale/lt/LC_MESSAGES/django.mo b/rest_framework/locale/lt/LC_MESSAGES/django.mo new file mode 100644 index 0000000000000000000000000000000000000000..b43a6a8a4dfe2dd8777393c186c605423e76089c GIT binary patch literal 5056 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, 2019 +msgid "" +msgstr "" +"Project-Id-Version: Django REST framework\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-10-13 21:45+0200\n" +"PO-Revision-Date: 2020-10-13 19:45+0000\n" +"Last-Translator: Xavier Ordoquy \n" +"Language-Team: Lithuanian (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/lt/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: lt\n" +"Plural-Forms: nplurals=4; plural=(n % 10 == 1 && (n % 100 > 19 || n % 100 < 11) ? 0 : (n % 10 >= 2 && n % 10 <=9) && (n % 100 > 19 || n % 100 < 11) ? 1 : n % 1 != 0 ? 2: 3);\n" + +#: authentication.py:70 +msgid "Invalid basic header. No credentials provided." +msgstr "" + +#: authentication.py:73 +msgid "Invalid basic header. Credentials string should not contain spaces." +msgstr "" + +#: authentication.py:83 +msgid "Invalid basic header. Credentials not correctly base64 encoded." +msgstr "" + +#: authentication.py:101 +msgid "Invalid username/password." +msgstr "" + +#: authentication.py:104 authentication.py:206 +msgid "User inactive or deleted." +msgstr "Vartotojas neaktyvus arba pašalintas." + +#: authentication.py:184 +msgid "Invalid token header. No credentials provided." +msgstr "" + +#: authentication.py:187 +msgid "Invalid token header. Token string should not contain spaces." +msgstr "" + +#: authentication.py:193 +msgid "" +"Invalid token header. Token string should not contain invalid characters." +msgstr "" + +#: authentication.py:203 +msgid "Invalid token." +msgstr "" + +#: authtoken/apps.py:7 +msgid "Auth Token" +msgstr "" + +#: authtoken/models.py:13 +msgid "Key" +msgstr "Raktas" + +#: authtoken/models.py:16 +msgid "User" +msgstr "Vartotojas" + +#: authtoken/models.py:18 +msgid "Created" +msgstr "Sukurta" + +#: authtoken/models.py:27 authtoken/serializers.py:19 +msgid "Token" +msgstr "" + +#: authtoken/models.py:28 +msgid "Tokens" +msgstr "" + +#: authtoken/serializers.py:9 +msgid "Username" +msgstr "Vartotojo vardas" + +#: authtoken/serializers.py:13 +msgid "Password" +msgstr "Slaptažodis" + +#: authtoken/serializers.py:35 +msgid "Unable to log in with provided credentials." +msgstr "" + +#: authtoken/serializers.py:38 +msgid "Must include \"username\" and \"password\"." +msgstr "" + +#: exceptions.py:102 +msgid "A server error occurred." +msgstr "Įvyko serverio klaida." + +#: exceptions.py:142 +msgid "Invalid input." +msgstr "" + +#: exceptions.py:161 +msgid "Malformed request." +msgstr "Netinkamai suformuota užklausa." + +#: exceptions.py:167 +msgid "Incorrect authentication credentials." +msgstr "Neteisingi autentifikacijos duomenys." + +#: exceptions.py:173 +msgid "Authentication credentials were not provided." +msgstr "Autentifikacijos duomenys nesuteikti." + +#: exceptions.py:179 +msgid "You do not have permission to perform this action." +msgstr "" + +#: exceptions.py:185 +msgid "Not found." +msgstr "Nerasta." + +#: exceptions.py:191 +#, python-brace-format +msgid "Method \"{method}\" not allowed." +msgstr "Metodas \"{method}\" yra neleidžiamas." + +#: exceptions.py:202 +msgid "Could not satisfy the request Accept header." +msgstr "Nepavyko patenkinti užklausos Accept antraštės." + +#: exceptions.py:212 +#, python-brace-format +msgid "Unsupported media type \"{media_type}\" in request." +msgstr "Nepalaikomas duomenų formatas \"{media_type}\" užklausoje." + +#: exceptions.py:223 +msgid "Request was throttled." +msgstr "Užklausa pristabdyta." + +#: exceptions.py:224 +#, python-brace-format +msgid "Expected available in {wait} second." +msgstr "" + +#: exceptions.py:225 +#, python-brace-format +msgid "Expected available in {wait} seconds." +msgstr "" + +#: fields.py:316 relations.py:245 relations.py:279 validators.py:90 +#: validators.py:183 +msgid "This field is required." +msgstr "Šis laukas yra privalomas." + +#: fields.py:317 +msgid "This field may not be null." +msgstr "Šis laukas negali būti nustatytas kaip null." + +#: fields.py:701 +msgid "Must be a valid boolean." +msgstr "" + +#: fields.py:766 +msgid "Not a valid string." +msgstr "" + +#: fields.py:767 +msgid "This field may not be blank." +msgstr "Šis laukas negali būti tuščias." + +#: fields.py:768 fields.py:1881 +#, python-brace-format +msgid "Ensure this field has no more than {max_length} characters." +msgstr "Patikrinkite, ar šis laukas turi ne daugiau nei {max_length} simbolių." + +#: fields.py:769 +#, python-brace-format +msgid "Ensure this field has at least {min_length} characters." +msgstr "Patikrinkite, ar šis laukas turi ne mažiau nei {min_length} simbolių." + +#: fields.py:816 +msgid "Enter a valid email address." +msgstr "Įveskite tinkamą el. pašto adresą." + +#: fields.py:827 +msgid "This value does not match the required pattern." +msgstr "Ši vertė neatitinka nustatyto šablono." + +#: fields.py:838 +msgid "" +"Enter a valid \"slug\" consisting of letters, numbers, underscores or " +"hyphens." +msgstr "Įveskite tinkamą \"slug\" tekstą, turintį tik raidžių, skaičių, pabraukimų arba brūkšnelių." + +#: fields.py:839 +msgid "" +"Enter a valid \"slug\" consisting of Unicode letters, numbers, underscores, " +"or hyphens." +msgstr "" + +#: fields.py:854 +msgid "Enter a valid URL." +msgstr "Įveskite tinkamą URL adresą." + +#: fields.py:867 +msgid "Must be a valid UUID." +msgstr "" + +#: fields.py:903 +msgid "Enter a valid IPv4 or IPv6 address." +msgstr "Įveskite tinkamą IPv4 arba IPv6 adresą." + +#: fields.py:931 +msgid "A valid integer is required." +msgstr "Reikiama tinkama integer tipo reikšmė." + +#: fields.py:932 fields.py:969 fields.py:1005 fields.py:1366 +#, python-brace-format +msgid "Ensure this value is less than or equal to {max_value}." +msgstr "Patikrinkite, ar ši reikšmė yra mažesnė arba lygi {max_value}." + +#: fields.py:933 fields.py:970 fields.py:1006 fields.py:1367 +#, python-brace-format +msgid "Ensure this value is greater than or equal to {min_value}." +msgstr "Patikrinkite, ar ši reikšmė yra didesnė arba lygi {min_value}." + +#: fields.py:934 fields.py:971 fields.py:1010 +msgid "String value too large." +msgstr "String tipo reikšmė per ilga." + +#: fields.py:968 fields.py:1004 +msgid "A valid number is required." +msgstr "Reikiamas tinkamas skaičius." + +#: fields.py:1007 +#, python-brace-format +msgid "Ensure that there are no more than {max_digits} digits in total." +msgstr "Patikrinkite, ar nėra daugiau nei {max_digits} skaitmenų." + +#: fields.py:1008 +#, python-brace-format +msgid "" +"Ensure that there are no more than {max_decimal_places} decimal places." +msgstr "Patikrinkite, ar nėra daugiau nei {max_decimal_places} skaitmenų po kablelio." + +#: fields.py:1009 +#, python-brace-format +msgid "" +"Ensure that there are no more than {max_whole_digits} digits before the " +"decimal point." +msgstr "Patikrinkite, ar nėra daugiau nei {max_whole_digits} skaitmenų priešais kablelį." + +#: fields.py:1148 +#, python-brace-format +msgid "Datetime has wrong format. Use one of these formats instead: {format}." +msgstr "Datetime tipo reikšmė yra netinkamo formato. Naudokite vieną iš šių formatų: {format}." + +#: fields.py:1149 +msgid "Expected a datetime but got a date." +msgstr "Tikėtasi datetime, gauta date tipo reikšmė." + +#: fields.py:1150 +#, python-brace-format +msgid "Invalid datetime for the timezone \"{timezone}\"." +msgstr "" + +#: fields.py:1151 +msgid "Datetime value out of range." +msgstr "" + +#: fields.py:1236 +#, python-brace-format +msgid "Date has wrong format. Use one of these formats instead: {format}." +msgstr "Date tipo reikšmė yra netinkamo formato. Naudokite vieną iš šių formatų: {format}." + +#: fields.py:1237 +msgid "Expected a date but got a datetime." +msgstr "Tikėtasi date, gauta datetime tipo reikšmė." + +#: fields.py:1303 +#, python-brace-format +msgid "Time has wrong format. Use one of these formats instead: {format}." +msgstr "Time tipo reikšmė yra netinkamo formato. Naudokite vieną iš šių formatų: {format}." + +#: fields.py:1365 +#, python-brace-format +msgid "Duration has wrong format. Use one of these formats instead: {format}." +msgstr "Duration tipo reikšmė yra netinkamo formato. Naudokite vieną iš šių formatų: {format}." + +#: fields.py:1399 fields.py:1456 +#, python-brace-format +msgid "\"{input}\" is not a valid choice." +msgstr "\"{input}\" nėra tinkamas pasirinkimas." + +#: fields.py:1402 +#, python-brace-format +msgid "More than {count} items..." +msgstr "" + +#: fields.py:1457 fields.py:1603 relations.py:485 serializers.py:570 +#, python-brace-format +msgid "Expected a list of items but got type \"{input_type}\"." +msgstr "" + +#: fields.py:1458 +msgid "This selection may not be empty." +msgstr "Šis pasirinkimas negali būti tuščias." + +#: fields.py:1495 +#, python-brace-format +msgid "\"{input}\" is not a valid path choice." +msgstr "" + +#: fields.py:1514 +msgid "No file was submitted." +msgstr "" + +#: fields.py:1515 +msgid "" +"The submitted data was not a file. Check the encoding type on the form." +msgstr "" + +#: fields.py:1516 +msgid "No filename could be determined." +msgstr "" + +#: fields.py:1517 +msgid "The submitted file is empty." +msgstr "" + +#: fields.py:1518 +#, python-brace-format +msgid "" +"Ensure this filename has at most {max_length} characters (it has {length})." +msgstr "" + +#: fields.py:1566 +msgid "" +"Upload a valid image. The file you uploaded was either not an image or a " +"corrupted image." +msgstr "" + +#: fields.py:1604 relations.py:486 serializers.py:571 +msgid "This list may not be empty." +msgstr "" + +#: fields.py:1605 +#, python-brace-format +msgid "Ensure this field has at least {min_length} elements." +msgstr "" + +#: fields.py:1606 +#, python-brace-format +msgid "Ensure this field has no more than {max_length} elements." +msgstr "" + +#: fields.py:1682 +#, python-brace-format +msgid "Expected a dictionary of items but got type \"{input_type}\"." +msgstr "" + +#: fields.py:1683 +msgid "This dictionary may not be empty." +msgstr "" + +#: fields.py:1755 +msgid "Value must be valid JSON." +msgstr "" + +#: filters.py:49 templates/rest_framework/filters/search.html:2 +msgid "Search" +msgstr "" + +#: filters.py:50 +msgid "A search term." +msgstr "" + +#: filters.py:180 templates/rest_framework/filters/ordering.html:3 +msgid "Ordering" +msgstr "" + +#: filters.py:181 +msgid "Which field to use when ordering the results." +msgstr "" + +#: filters.py:287 +msgid "ascending" +msgstr "" + +#: filters.py:288 +msgid "descending" +msgstr "" + +#: pagination.py:174 +msgid "A page number within the paginated result set." +msgstr "" + +#: pagination.py:179 pagination.py:372 pagination.py:590 +msgid "Number of results to return per page." +msgstr "" + +#: pagination.py:189 +msgid "Invalid page." +msgstr "Netinkamas puslapis." + +#: pagination.py:374 +msgid "The initial index from which to return the results." +msgstr "" + +#: pagination.py:581 +msgid "The pagination cursor value." +msgstr "" + +#: pagination.py:583 +msgid "Invalid cursor" +msgstr "" + +#: relations.py:246 +#, python-brace-format +msgid "Invalid pk \"{pk_value}\" - object does not exist." +msgstr "" + +#: relations.py:247 +#, python-brace-format +msgid "Incorrect type. Expected pk value, received {data_type}." +msgstr "" + +#: relations.py:280 +msgid "Invalid hyperlink - No URL match." +msgstr "" + +#: relations.py:281 +msgid "Invalid hyperlink - Incorrect URL match." +msgstr "" + +#: relations.py:282 +msgid "Invalid hyperlink - Object does not exist." +msgstr "" + +#: relations.py:283 +#, python-brace-format +msgid "Incorrect type. Expected URL string, received {data_type}." +msgstr "" + +#: relations.py:448 +#, python-brace-format +msgid "Object with {slug_name}={value} does not exist." +msgstr "" + +#: relations.py:449 +msgid "Invalid value." +msgstr "" + +#: schemas/utils.py:32 +msgid "unique integer value" +msgstr "" + +#: schemas/utils.py:34 +msgid "UUID string" +msgstr "" + +#: schemas/utils.py:36 +msgid "unique value" +msgstr "" + +#: schemas/utils.py:38 +#, python-brace-format +msgid "A {value_type} identifying this {name}." +msgstr "" + +#: serializers.py:337 +#, python-brace-format +msgid "Invalid data. Expected a dictionary, but got {datatype}." +msgstr "" + +#: templates/rest_framework/admin.html:116 +#: templates/rest_framework/base.html:136 +msgid "Extra Actions" +msgstr "" + +#: templates/rest_framework/admin.html:130 +#: templates/rest_framework/base.html:150 +msgid "Filters" +msgstr "" + +#: templates/rest_framework/base.html:37 +msgid "navbar" +msgstr "" + +#: templates/rest_framework/base.html:75 +msgid "content" +msgstr "" + +#: templates/rest_framework/base.html:78 +msgid "request form" +msgstr "" + +#: templates/rest_framework/base.html:157 +msgid "main content" +msgstr "" + +#: templates/rest_framework/base.html:173 +msgid "request info" +msgstr "" + +#: templates/rest_framework/base.html:177 +msgid "response info" +msgstr "" + +#: templates/rest_framework/horizontal/radio.html:4 +#: templates/rest_framework/inline/radio.html:3 +#: templates/rest_framework/vertical/radio.html:3 +msgid "None" +msgstr "" + +#: templates/rest_framework/horizontal/select_multiple.html:4 +#: templates/rest_framework/inline/select_multiple.html:3 +#: templates/rest_framework/vertical/select_multiple.html:3 +msgid "No items to select." +msgstr "" + +#: validators.py:39 +msgid "This field must be unique." +msgstr "" + +#: validators.py:89 +#, python-brace-format +msgid "The fields {field_names} must make a unique set." +msgstr "" + +#: validators.py:171 +#, python-brace-format +msgid "Surrogate characters are not allowed: U+{code_point:X}." +msgstr "" + +#: validators.py:243 +#, python-brace-format +msgid "This field must be unique for the \"{date_field}\" date." +msgstr "" + +#: validators.py:258 +#, python-brace-format +msgid "This field must be unique for the \"{date_field}\" month." +msgstr "" + +#: validators.py:271 +#, python-brace-format +msgid "This field must be unique for the \"{date_field}\" year." +msgstr "" + +#: versioning.py:40 +msgid "Invalid version in \"Accept\" header." +msgstr "" + +#: versioning.py:71 +msgid "Invalid version in URL path." +msgstr "" + +#: versioning.py:116 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:148 +msgid "Invalid version in hostname." +msgstr "" + +#: versioning.py:170 +msgid "Invalid version in query parameter." +msgstr "" diff --git a/rest_framework/locale/lv/LC_MESSAGES/django.mo b/rest_framework/locale/lv/LC_MESSAGES/django.mo index b4accc34ef160c63fdff67361e4f0154487a6ba6..7ee7172407f2e4b860d57c55ce1d73a04f42f0a7 100644 GIT binary patch delta 2243 zcmYk-S!`5Q9LMp0ZKoTxKnpEn3%x~aJJKDdc7wK5C|#g*14=;{mzc7Rw6zpX9HJn> zST#;ad?9YdAmEmXA^Knu?J1pncMBzmA&O`=}YsqL%W8-wrSK zKJUk5?oXmt;Bj1m)2RL~Vkut1Jp2`74wY1%&c#wp!6szYtre@V8`(yC!uL3;gK1Qn z%wRrVz-s&ywWYtK2HZ^N`g|DGK8(tl=W|*AIx6S6;qEo69bDp#cq{6`{pjFH)PT;R zR$vYTSg_O^NHMOWU4}I{h{N~{YGOZN5U-&obZaT=uN&!1rxsTt`DjC^71)E9lg##E z5$y_6UpcZF^}TTn;WRGCOQ@O7qW1U~RKJBhtbTj3ABS-lUW`%cqmsb}ZN?E)F1&?Z z_%mu{YFUPLxDU7KbL>Q|=O*aF2QZFz;h)H2S^=X{4pgC5ZVPIQp2RH}dzVTNm48rs z+0D~;V?QeEk765sh(mZ22e6Oj(D%+Fd1N&Tzo;-Z-puk>aXM#gG8aRW}Fw&Y{f-v5N!+eI817RiFh*es0d zZwSlr2s%3dGgP!>pCgmA>lnZcZt{+>g{YYnBJUdOK&{jOx&uMI;igbObPTm+uVM?% zp`KgDC`kvaL$!OcfZw-+RP^8}Y{M^bEiPamG~!Nla6jsc&!P74JSum-L(RB?!>uH% zL+x!VY9KG5a^?yusaKSF{f026J?W;xAZ^6=7^cxai|X)gOu}SBd(N@`uXIr3G`U4@ zIXyo}G!fbkl?Fm9tHJCg_7HUhC1$+D+!E%hMA}7YwDW~QyJvX~YV;1FvXj_AXazVV zZVqh6ZbC&{rJ`g_cWY+%VYXjy#&Yfd|4SQ$CcCWmQ7q+i7fqoF`)!g(KcxBR8l?MYdu#Tn~g+~d&m1X zs|+9U+ac6RQc?c!3UEu8uc##23FQ$7#lp(Sd}6)?sOY%Om#tJ<{Kjp#o=A(INnakn znqHX*Wh4a>_1T4i_#?S>iJ9Eee_J2efBYr?ClDVaTy@rjDTvB;tE z1Cfd7SfjHeGCBJ2nA1DaFnTcYM}Bise0Q)aaV|I) XNK6;yq{iPVX;1uB@=|jALg>W57r@%^ delta 2558 zcmZYAU2Icj9LMoz>)v31SYR8Ijl)13Fa`t0aIlRH*ch9*!2o#?Y}d1Tq_o)60SRg~ zh)O^t*2RQiQ1L>;jY$avyb|l%1sA?0MiU|tF(k%B??f*A{!S0k#3%iq&-0v~KJVx0 zrNIw}($|AUV}>+B%pm#$#vH?EO1O~TE;D8pzJnHif)C)y)mT_=%vM~3EqEGN;@8-RlO`C`iaSu> zk6}Mv!`WCp(U>5%qdGWL=xUx*Rp)c2q+VT!Ck?1HZ>L zSaqKG+xNPpFaJ@yh{*vxIUDvVYA0YG!ueg#u%2R0GviG84N|duRkTpcBZ)yr1SekIYr9 z!QYVIn(+)vd!Y{1&>*Uz7jYAw#9ep;2eF-6AHh?oJ#!s5;0&g*1*6!GXK|~(NA0n6 zGp(*y2E+IT&cOxj5LU$upf*c{i>CAlYVESP5pSYix1|h|H_kkdn&MY+F1~>s_z`yE z-?#hc|$ff_(RK8j=5jlUq< z!!+=U@DtOC8qhFmfCsUL_RSeG>$q_RwMP0@Yd06Q=9^G!wiD^RIf$z8O>Dr+XyGm7 zV@j!nNihvrjD4t?8AJ_aH3qLwO$nwf8X|H4wrwey+(ab)H)F9o=bXeG2xnxcD2 zqtkPmZY4E#FD>;m&B&5_X%*K#g8q5wF|HekVnQ=YbKbepsrA?Eqof&F=jHPMSi8tS zLG%#X51JVzEfwd8_aD)XtcI7?avdUui6F6_P|~JUT27RCx%?}y?Bld=2K<{kh}QUd z3l|YPi9%w8(3)zxHN{E+qLR=WZzq%{6WaA5B0^}Im9!jsyY3~MOc9aZ!$rGOhX>2= zt?x<<6Uzv_t6FRJkazHC11Yr=JG|V#m(^q|h}r(F-B?0s?UlL+&K)o5pOLiLJLNd^ zy!5blCx0I3MlYcaq@+{OOLd2x`2Nwh!{r{)7Z0TK_jh6+A%k5ai8gXJNJLzWQ6K56&2khiN$90`V+=|$7$Br~+P6S&@ zHjjq)IjQW`V0~a}Xm~g=8c(U|h~tLBF+Fs1+K-c(S{5!|v2by-)wHCwX=&zKMPD=k%2I+Ae*Mrm|<} dWCGJd*4{)sjwE)z|;%uxMn{{V#IEJFYQ diff --git a/rest_framework/locale/lv/LC_MESSAGES/django.po b/rest_framework/locale/lv/LC_MESSAGES/django.po index 2bc978866..876f6f367 100644 --- a/rest_framework/locale/lv/LC_MESSAGES/django.po +++ b/rest_framework/locale/lv/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-07-12 16:13+0100\n" -"PO-Revision-Date: 2017-08-05 12:13+0000\n" -"Last-Translator: peterisb \n" +"POT-Creation-Date: 2020-10-13 21:45+0200\n" +"PO-Revision-Date: 2020-10-13 19:45+0000\n" +"Last-Translator: Xavier Ordoquy \n" "Language-Team: Latvian (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/lv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,40 +18,40 @@ msgstr "" "Language: lv\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n" -#: authentication.py:73 +#: authentication.py:70 msgid "Invalid basic header. No credentials provided." msgstr "Nederīgs pieprasījuma sākums. Akreditācijas parametri nav nodrošināti." -#: authentication.py:76 +#: authentication.py:73 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "Nederīgs pieprasījuma sākums. Akreditācijas parametriem jābūt bez atstarpēm." -#: authentication.py:82 +#: authentication.py:83 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Nederīgs pieprasījuma sākums. Akreditācijas parametri nav korekti base64 kodēti." -#: authentication.py:99 +#: authentication.py:101 msgid "Invalid username/password." msgstr "Nederīgs lietotājvārds/parole." -#: authentication.py:102 authentication.py:198 +#: authentication.py:104 authentication.py:206 msgid "User inactive or deleted." msgstr "Lietotājs neaktīvs vai dzēsts." -#: authentication.py:176 +#: authentication.py:184 msgid "Invalid token header. No credentials provided." msgstr "Nederīgs pilnvaras sākums. Akreditācijas parametri nav nodrošināti." -#: authentication.py:179 +#: authentication.py:187 msgid "Invalid token header. Token string should not contain spaces." msgstr "Nederīgs pilnvaras sākums. Pilnvaras parametros nevar būt tukšumi." -#: authentication.py:185 +#: authentication.py:193 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "Nederīgs pilnvaras sākums. Pilnvaras parametros nevar būt nederīgas zīmes." -#: authentication.py:195 +#: authentication.py:203 msgid "Invalid token." msgstr "Nederīga pilnavara." @@ -59,382 +59,515 @@ msgstr "Nederīga pilnavara." msgid "Auth Token" msgstr "Autorizācijas pilnvara" -#: authtoken/models.py:15 +#: authtoken/models.py:13 msgid "Key" msgstr "Atslēga" -#: authtoken/models.py:18 +#: authtoken/models.py:16 msgid "User" msgstr "Lietotājs" -#: authtoken/models.py:20 +#: authtoken/models.py:18 msgid "Created" msgstr "Izveidots" -#: authtoken/models.py:29 +#: authtoken/models.py:27 authtoken/serializers.py:19 msgid "Token" msgstr "Pilnvara" -#: authtoken/models.py:30 +#: authtoken/models.py:28 msgid "Tokens" msgstr "Pilnvaras" -#: authtoken/serializers.py:8 +#: authtoken/serializers.py:9 msgid "Username" msgstr "Lietotājvārds" -#: authtoken/serializers.py:9 +#: authtoken/serializers.py:13 msgid "Password" msgstr "Parole" -#: authtoken/serializers.py:20 -msgid "User account is disabled." -msgstr "Lietotāja konts ir atslēgts." - -#: authtoken/serializers.py:23 +#: authtoken/serializers.py:35 msgid "Unable to log in with provided credentials." msgstr "Neiespējami pieteikties sistēmā ar nodrošinātajiem akreditācijas datiem." -#: authtoken/serializers.py:26 +#: authtoken/serializers.py:38 msgid "Must include \"username\" and \"password\"." msgstr "Jābūt iekļautam \"username\" un \"password\"." -#: exceptions.py:49 +#: exceptions.py:102 msgid "A server error occurred." msgstr "Notikusi servera kļūda." -#: exceptions.py:84 +#: exceptions.py:142 +msgid "Invalid input." +msgstr "" + +#: exceptions.py:161 msgid "Malformed request." msgstr "Nenoformēts pieprasījums." -#: exceptions.py:89 +#: exceptions.py:167 msgid "Incorrect authentication credentials." msgstr "Nekorekti autentifikācijas parametri." -#: exceptions.py:94 +#: exceptions.py:173 msgid "Authentication credentials were not provided." msgstr "Netika nodrošināti autorizācijas parametri." -#: exceptions.py:99 +#: exceptions.py:179 msgid "You do not have permission to perform this action." msgstr "Tev nav tiesību veikt šo darbību." -#: exceptions.py:104 views.py:81 +#: exceptions.py:185 msgid "Not found." msgstr "Nav atrasts." -#: exceptions.py:109 +#: exceptions.py:191 +#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "Metode \"{method}\" nav atļauta." -#: exceptions.py:120 +#: exceptions.py:202 msgid "Could not satisfy the request Accept header." msgstr "Nevarēja apmierināt pieprasījuma Accept header." -#: exceptions.py:132 +#: exceptions.py:212 +#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "Pieprasījumā neatbalstīts datu tips \"{media_type}\" ." -#: exceptions.py:145 +#: exceptions.py:223 msgid "Request was throttled." msgstr "Pieprasījums tika apturēts." -#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 -#: validators.py:181 +#: exceptions.py:224 +#, python-brace-format +msgid "Expected available in {wait} second." +msgstr "" + +#: exceptions.py:225 +#, python-brace-format +msgid "Expected available in {wait} seconds." +msgstr "" + +#: fields.py:316 relations.py:245 relations.py:279 validators.py:90 +#: validators.py:183 msgid "This field is required." msgstr "Šis lauks ir obligāts." -#: fields.py:270 +#: fields.py:317 msgid "This field may not be null." msgstr "Šis lauks nevar būt null." -#: fields.py:608 fields.py:639 -msgid "\"{input}\" is not a valid boolean." -msgstr "\"{input}\" ir nederīga loģiskā vērtība." +#: fields.py:701 +msgid "Must be a valid boolean." +msgstr "" -#: fields.py:674 +#: fields.py:766 +msgid "Not a valid string." +msgstr "" + +#: fields.py:767 msgid "This field may not be blank." msgstr "Šis lauks nevar būt tukšs." -#: fields.py:675 fields.py:1675 +#: fields.py:768 fields.py:1881 +#, python-brace-format msgid "Ensure this field has no more than {max_length} characters." msgstr "Pārliecinies, ka laukā nav vairāk par {max_length} zīmēm." -#: fields.py:676 +#: fields.py:769 +#, python-brace-format msgid "Ensure this field has at least {min_length} characters." msgstr "Pārliecinies, ka laukā ir vismaz {min_length} zīmes." -#: fields.py:713 +#: fields.py:816 msgid "Enter a valid email address." msgstr "Ievadi derīgu e-pasta adresi." -#: fields.py:724 +#: fields.py:827 msgid "This value does not match the required pattern." msgstr "Šī vērtība neatbilst prasītajam pierakstam." -#: fields.py:735 +#: fields.py:838 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "Ievadi derīgu \"slug\" vērtību, kura sastāv no burtiem, skaitļiem, apakš-svītras vai defises." -#: fields.py:747 +#: fields.py:839 +msgid "" +"Enter a valid \"slug\" consisting of Unicode letters, numbers, underscores, " +"or hyphens." +msgstr "" + +#: fields.py:854 msgid "Enter a valid URL." msgstr "Ievadi derīgu URL." -#: fields.py:760 -msgid "\"{value}\" is not a valid UUID." -msgstr "\"{value}\" ir nedrīgs UUID." +#: fields.py:867 +msgid "Must be a valid UUID." +msgstr "" -#: fields.py:796 +#: fields.py:903 msgid "Enter a valid IPv4 or IPv6 address." msgstr "Ievadi derīgu IPv4 vai IPv6 adresi." -#: fields.py:821 +#: fields.py:931 msgid "A valid integer is required." msgstr "Prasīta ir derīga skaitliska vērtība." -#: fields.py:822 fields.py:857 fields.py:891 +#: fields.py:932 fields.py:969 fields.py:1005 fields.py:1366 +#, python-brace-format msgid "Ensure this value is less than or equal to {max_value}." msgstr "Pārliecinies, ka šī vērtība ir mazāka vai vienāda ar {max_value}." -#: fields.py:823 fields.py:858 fields.py:892 +#: fields.py:933 fields.py:970 fields.py:1006 fields.py:1367 +#, python-brace-format msgid "Ensure this value is greater than or equal to {min_value}." msgstr "Pārliecinies, ka šī vērtība ir lielāka vai vienāda ar {min_value}." -#: fields.py:824 fields.py:859 fields.py:896 +#: fields.py:934 fields.py:971 fields.py:1010 msgid "String value too large." msgstr "Teksta vērtība pārāk liela." -#: fields.py:856 fields.py:890 +#: fields.py:968 fields.py:1004 msgid "A valid number is required." msgstr "Derīgs skaitlis ir prasīts." -#: fields.py:893 +#: fields.py:1007 +#, python-brace-format msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "Pārliecinies, ka nav vairāk par {max_digits} zīmēm kopā." -#: fields.py:894 +#: fields.py:1008 +#, python-brace-format msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "Pārliecinies, ka nav vairāk par {max_decimal_places} decimālajām zīmēm." -#: fields.py:895 +#: fields.py:1009 +#, python-brace-format msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "Pārliecinies, ka nav vairāk par {max_whole_digits} zīmēm pirms komata." -#: fields.py:1025 +#: fields.py:1148 +#, python-brace-format msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "Datuma un laika formāts ir nepareizs. Lieto vienu no norādītajiem formātiem: \"{format}.\"" -#: fields.py:1026 +#: fields.py:1149 msgid "Expected a datetime but got a date." msgstr "Tika gaidīts datums un laiks, saņemts datums.." -#: fields.py:1103 +#: fields.py:1150 +#, python-brace-format +msgid "Invalid datetime for the timezone \"{timezone}\"." +msgstr "" + +#: fields.py:1151 +msgid "Datetime value out of range." +msgstr "" + +#: fields.py:1236 +#, python-brace-format msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "Datumam ir nepareizs formāts. Lieto vienu no norādītajiem formātiem: {format}." -#: fields.py:1104 +#: fields.py:1237 msgid "Expected a date but got a datetime." msgstr "Tika gaidīts datums, saņemts datums un laiks." -#: fields.py:1170 +#: fields.py:1303 +#, python-brace-format msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "Laikam ir nepareizs formāts. Lieto vienu no norādītajiem formātiem: {format}." -#: fields.py:1232 +#: fields.py:1365 +#, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "Ilgumam ir nepreizs formāts. Lieto vienu no norādītajiem formātiem: {format}." -#: fields.py:1251 fields.py:1300 +#: fields.py:1399 fields.py:1456 +#, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" ir nederīga izvēle." -#: fields.py:1254 relations.py:71 relations.py:441 +#: fields.py:1402 +#, python-brace-format msgid "More than {count} items..." msgstr "Vairāk par {count} ierakstiem..." -#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 +#: fields.py:1457 fields.py:1603 relations.py:485 serializers.py:570 +#, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Tika gaidīts saraksts ar ierakstiem, bet tika saņemts \"{input_type}\" tips." -#: fields.py:1302 +#: fields.py:1458 msgid "This selection may not be empty." msgstr "Šī daļa nevar būt tukša." -#: fields.py:1339 +#: fields.py:1495 +#, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "\"{input}\" ir nederīga ceļa izvēle." -#: fields.py:1358 +#: fields.py:1514 msgid "No file was submitted." msgstr "Neviens fails netika pievienots." -#: fields.py:1359 +#: fields.py:1515 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "Pievienotie dati nebija fails. Pārbaudi kodējuma tipu formā." -#: fields.py:1360 +#: fields.py:1516 msgid "No filename could be determined." msgstr "Faila nosaukums nevar tikt noteikts." -#: fields.py:1361 +#: fields.py:1517 msgid "The submitted file is empty." msgstr "Pievienotais fails ir tukšs." -#: fields.py:1362 +#: fields.py:1518 +#, python-brace-format msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "Pārliecinies, ka faila nosaukumā ir vismaz {max_length} zīmes (tajā ir {length})." -#: fields.py:1410 +#: fields.py:1566 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "Augšupielādē derīgu attēlu. Pievienotā datne nebija attēls vai bojāts attēls." -#: fields.py:1449 relations.py:438 serializers.py:525 +#: fields.py:1604 relations.py:486 serializers.py:571 msgid "This list may not be empty." msgstr "Šis saraksts nevar būt tukšs." -#: fields.py:1502 +#: fields.py:1605 +#, python-brace-format +msgid "Ensure this field has at least {min_length} elements." +msgstr "" + +#: fields.py:1606 +#, python-brace-format +msgid "Ensure this field has no more than {max_length} elements." +msgstr "" + +#: fields.py:1682 +#, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "Tika gaidīta vārdnīca ar ierakstiem, bet tika saņemts \"{input_type}\" tips." -#: fields.py:1549 +#: fields.py:1683 +msgid "This dictionary may not be empty." +msgstr "" + +#: fields.py:1755 msgid "Value must be valid JSON." msgstr "Vērtībai ir jābūt derīgam JSON." -#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 -msgid "Submit" -msgstr "Iesniegt" +#: filters.py:49 templates/rest_framework/filters/search.html:2 +msgid "Search" +msgstr "Meklēt" -#: filters.py:336 +#: filters.py:50 +msgid "A search term." +msgstr "" + +#: filters.py:180 templates/rest_framework/filters/ordering.html:3 +msgid "Ordering" +msgstr "Kārtošana" + +#: filters.py:181 +msgid "Which field to use when ordering the results." +msgstr "" + +#: filters.py:287 msgid "ascending" msgstr "augoši" -#: filters.py:337 +#: filters.py:288 msgid "descending" msgstr "dilstoši" -#: pagination.py:193 +#: pagination.py:174 +msgid "A page number within the paginated result set." +msgstr "" + +#: pagination.py:179 pagination.py:372 pagination.py:590 +msgid "Number of results to return per page." +msgstr "" + +#: pagination.py:189 msgid "Invalid page." msgstr "Nederīga lapa." -#: pagination.py:427 +#: pagination.py:374 +msgid "The initial index from which to return the results." +msgstr "" + +#: pagination.py:581 +msgid "The pagination cursor value." +msgstr "" + +#: pagination.py:583 msgid "Invalid cursor" msgstr "Nederīgs kursors" -#: relations.py:207 +#: relations.py:246 +#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Nederīga pk \"{pk_value}\" - objekts neeksistē." -#: relations.py:208 +#: relations.py:247 +#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Nepareizs tips. Tika gaidīta pk vērtība, saņemts {data_type}." -#: relations.py:240 +#: relations.py:280 msgid "Invalid hyperlink - No URL match." msgstr "Nederīga hipersaite - Nav URL sakritība." -#: relations.py:241 +#: relations.py:281 msgid "Invalid hyperlink - Incorrect URL match." msgstr "Nederīga hipersaite - Nederīga URL sakritība." -#: relations.py:242 +#: relations.py:282 msgid "Invalid hyperlink - Object does not exist." msgstr "Nederīga hipersaite - Objekts neeksistē." -#: relations.py:243 +#: relations.py:283 +#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Nepareizs tips. Tika gaidīts URL teksts, saņemts {data_type}." -#: relations.py:401 +#: relations.py:448 +#, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "Objekts ar {slug_name}={value} neeksistē." -#: relations.py:402 +#: relations.py:449 msgid "Invalid value." msgstr "Nedrīga vērtība." -#: serializers.py:326 +#: schemas/utils.py:32 +msgid "unique integer value" +msgstr "" + +#: schemas/utils.py:34 +msgid "UUID string" +msgstr "" + +#: schemas/utils.py:36 +msgid "unique value" +msgstr "" + +#: schemas/utils.py:38 +#, python-brace-format +msgid "A {value_type} identifying this {name}." +msgstr "" + +#: serializers.py:337 +#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "Nederīgi dati. Tika gaidīta vārdnīca, saņemts {datatype}." #: templates/rest_framework/admin.html:116 -#: templates/rest_framework/base.html:128 +#: templates/rest_framework/base.html:136 +msgid "Extra Actions" +msgstr "" + +#: templates/rest_framework/admin.html:130 +#: templates/rest_framework/base.html:150 msgid "Filters" msgstr "Filtri" -#: templates/rest_framework/filters/django_filter.html:2 -#: templates/rest_framework/filters/django_filter_crispyforms.html:4 -msgid "Field filters" -msgstr "Lauka filtri" +#: templates/rest_framework/base.html:37 +msgid "navbar" +msgstr "" -#: templates/rest_framework/filters/ordering.html:3 -msgid "Ordering" -msgstr "Kārtošana" +#: templates/rest_framework/base.html:75 +msgid "content" +msgstr "" -#: templates/rest_framework/filters/search.html:2 -msgid "Search" -msgstr "Meklēt" +#: templates/rest_framework/base.html:78 +msgid "request form" +msgstr "" -#: templates/rest_framework/horizontal/radio.html:2 -#: templates/rest_framework/inline/radio.html:2 -#: templates/rest_framework/vertical/radio.html:2 +#: templates/rest_framework/base.html:157 +msgid "main content" +msgstr "" + +#: templates/rest_framework/base.html:173 +msgid "request info" +msgstr "" + +#: templates/rest_framework/base.html:177 +msgid "response info" +msgstr "" + +#: templates/rest_framework/horizontal/radio.html:4 +#: templates/rest_framework/inline/radio.html:3 +#: templates/rest_framework/vertical/radio.html:3 msgid "None" msgstr "Nekas" -#: templates/rest_framework/horizontal/select_multiple.html:2 -#: templates/rest_framework/inline/select_multiple.html:2 -#: templates/rest_framework/vertical/select_multiple.html:2 +#: templates/rest_framework/horizontal/select_multiple.html:4 +#: templates/rest_framework/inline/select_multiple.html:3 +#: templates/rest_framework/vertical/select_multiple.html:3 msgid "No items to select." msgstr "Nav ierakstu, ko izvēlēties." -#: validators.py:43 +#: validators.py:39 msgid "This field must be unique." msgstr "Šim laukam ir jābūt unikālam." -#: validators.py:97 +#: validators.py:89 +#, python-brace-format msgid "The fields {field_names} must make a unique set." msgstr "Laukiem {field_names} jāveido unikālas kombinācijas." -#: validators.py:245 +#: validators.py:171 +#, python-brace-format +msgid "Surrogate characters are not allowed: U+{code_point:X}." +msgstr "" + +#: validators.py:243 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" date." msgstr "Šim laukam ir jābūt unikālam priekš \"{date_field}\" datuma." -#: validators.py:260 +#: validators.py:258 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" month." msgstr "Šim laukam ir jābūt unikālam priekš \"{date_field}\" mēneša." -#: validators.py:273 +#: validators.py:271 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" year." msgstr "Šim laukam ir jābūt unikālam priekš \"{date_field}\" gada." -#: versioning.py:42 +#: versioning.py:40 msgid "Invalid version in \"Accept\" header." msgstr "Nederīga versija \"Accept\" galvenē." -#: versioning.py:73 +#: versioning.py:71 msgid "Invalid version in URL path." msgstr "Nederīga versija URL ceļā." -#: versioning.py:115 +#: versioning.py:116 msgid "Invalid version in URL path. Does not match any version namespace." msgstr "Nederīga versija URL ceļā. Nav atbilstības esošo versiju telpā." -#: versioning.py:147 +#: versioning.py:148 msgid "Invalid version in hostname." msgstr "Nederīga versija servera nosaukumā." -#: versioning.py:169 +#: versioning.py:170 msgid "Invalid version in query parameter." msgstr "Nederīga versija pieprasījuma parametros." - -#: views.py:88 -msgid "Permission denied." -msgstr "Pieeja liegta." diff --git a/rest_framework/locale/mk/LC_MESSAGES/django.mo b/rest_framework/locale/mk/LC_MESSAGES/django.mo index 752263456cfbeed993de97e6ba73c4e06629f66f..4c13e5a3df71ee2357544a6a7386ed8cdce59f37 100644 GIT binary patch delta 2126 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 diff --git a/rest_framework/locale/mk/LC_MESSAGES/django.po b/rest_framework/locale/mk/LC_MESSAGES/django.po index 0e59663d0..03f313523 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-07-12 16:13+0100\n" -"PO-Revision-Date: 2017-08-03 14:58+0000\n" -"Last-Translator: Filip Dimitrovski \n" +"POT-Creation-Date: 2020-10-13 21:45+0200\n" +"PO-Revision-Date: 2020-10-13 19:45+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" "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:73 +#: authentication.py:70 msgid "Invalid basic header. No credentials provided." msgstr "Невалиден основен header. Не се внесени податоци за автентикација." -#: authentication.py:76 +#: authentication.py:73 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "Невалиден основен header. Автентикационата низа не треба да содржи празни места." -#: authentication.py:82 +#: authentication.py:83 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Невалиден основен header. Податоците за автентикација не се енкодирани со base64." -#: authentication.py:99 +#: authentication.py:101 msgid "Invalid username/password." msgstr "Невалидно корисничко име/лозинка." -#: authentication.py:102 authentication.py:198 +#: authentication.py:104 authentication.py:206 msgid "User inactive or deleted." msgstr "Корисникот е деактивиран или избришан." -#: authentication.py:176 +#: authentication.py:184 msgid "Invalid token header. No credentials provided." msgstr "Невалиден токен header. Не се внесени податоци за најава." -#: authentication.py:179 +#: authentication.py:187 msgid "Invalid token header. Token string should not contain spaces." msgstr "Невалиден токен во header. Токенот не треба да содржи празни места." -#: authentication.py:185 +#: authentication.py:193 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:195 +#: authentication.py:203 msgid "Invalid token." msgstr "Невалиден токен." @@ -59,382 +59,515 @@ msgstr "Невалиден токен." msgid "Auth Token" msgstr "Автентикациски токен" -#: authtoken/models.py:15 +#: authtoken/models.py:13 msgid "Key" msgstr "" -#: authtoken/models.py:18 +#: authtoken/models.py:16 msgid "User" msgstr "Корисник" -#: authtoken/models.py:20 +#: authtoken/models.py:18 msgid "Created" msgstr "" -#: authtoken/models.py:29 +#: authtoken/models.py:27 authtoken/serializers.py:19 msgid "Token" msgstr "Токен" -#: authtoken/models.py:30 +#: authtoken/models.py:28 msgid "Tokens" msgstr "Токени" -#: authtoken/serializers.py:8 +#: authtoken/serializers.py:9 msgid "Username" msgstr "Корисничко име" -#: authtoken/serializers.py:9 +#: authtoken/serializers.py:13 msgid "Password" msgstr "Лозинка" -#: authtoken/serializers.py:20 -msgid "User account is disabled." -msgstr "Сметката на корисникот е деактивирана." - -#: authtoken/serializers.py:23 +#: authtoken/serializers.py:35 msgid "Unable to log in with provided credentials." msgstr "Не може да се најавите со податоците за најава." -#: authtoken/serializers.py:26 +#: authtoken/serializers.py:38 msgid "Must include \"username\" and \"password\"." msgstr "Мора да се внесе „username“ и „password“." -#: exceptions.py:49 +#: exceptions.py:102 msgid "A server error occurred." msgstr "Настана серверска грешка." -#: exceptions.py:84 +#: exceptions.py:142 +msgid "Invalid input." +msgstr "" + +#: exceptions.py:161 msgid "Malformed request." msgstr "Неправилен request." -#: exceptions.py:89 +#: exceptions.py:167 msgid "Incorrect authentication credentials." msgstr "Неточни податоци за најава." -#: exceptions.py:94 +#: exceptions.py:173 msgid "Authentication credentials were not provided." msgstr "Не се внесени податоци за најава." -#: exceptions.py:99 +#: exceptions.py:179 msgid "You do not have permission to perform this action." msgstr "Немате дозвола да го сторите ова." -#: exceptions.py:104 views.py:81 +#: exceptions.py:185 msgid "Not found." msgstr "Не е пронајдено ништо." -#: exceptions.py:109 +#: exceptions.py:191 +#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "Методата \"{method}\" не е дозволена." -#: exceptions.py:120 +#: exceptions.py:202 msgid "Could not satisfy the request Accept header." msgstr "Не може да се исполни барањето на Accept header-от." -#: exceptions.py:132 +#: exceptions.py:212 +#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "Media типот „{media_type}“ не е поддржан." -#: exceptions.py:145 +#: exceptions.py:223 msgid "Request was throttled." msgstr "Request-от е забранет заради ограничувања." -#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 -#: validators.py:181 +#: exceptions.py:224 +#, python-brace-format +msgid "Expected available in {wait} second." +msgstr "" + +#: exceptions.py:225 +#, python-brace-format +msgid "Expected available in {wait} seconds." +msgstr "" + +#: fields.py:316 relations.py:245 relations.py:279 validators.py:90 +#: validators.py:183 msgid "This field is required." msgstr "Ова поле е задолжително." -#: fields.py:270 +#: fields.py:317 msgid "This field may not be null." msgstr "Ова поле не смее да биде недефинирано." -#: fields.py:608 fields.py:639 -msgid "\"{input}\" is not a valid boolean." -msgstr "\"{input}\" не е валиден boolean." +#: fields.py:701 +msgid "Must be a valid boolean." +msgstr "" -#: fields.py:674 +#: fields.py:766 +msgid "Not a valid string." +msgstr "" + +#: fields.py:767 msgid "This field may not be blank." msgstr "Ова поле не смее да биде празно." -#: fields.py:675 fields.py:1675 +#: fields.py:768 fields.py:1881 +#, python-brace-format msgid "Ensure this field has no more than {max_length} characters." msgstr "Ова поле не смее да има повеќе од {max_length} знаци." -#: fields.py:676 +#: fields.py:769 +#, python-brace-format msgid "Ensure this field has at least {min_length} characters." msgstr "Ова поле мора да има барем {min_length} знаци." -#: fields.py:713 +#: fields.py:816 msgid "Enter a valid email address." msgstr "Внесете валидна email адреса." -#: fields.py:724 +#: fields.py:827 msgid "This value does not match the required pattern." msgstr "Ова поле не е по правилната шема/барање." -#: fields.py:735 +#: fields.py:838 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "Внесете валидно име што содржи букви, бројки, долни црти или црти." -#: fields.py:747 +#: fields.py:839 +msgid "" +"Enter a valid \"slug\" consisting of Unicode letters, numbers, underscores, " +"or hyphens." +msgstr "" + +#: fields.py:854 msgid "Enter a valid URL." msgstr "Внесете валиден URL." -#: fields.py:760 -msgid "\"{value}\" is not a valid UUID." -msgstr "\"{value}\" не е валиден UUID." +#: fields.py:867 +msgid "Must be a valid UUID." +msgstr "" -#: fields.py:796 +#: fields.py:903 msgid "Enter a valid IPv4 or IPv6 address." msgstr "Внеси валидна IPv4 или IPv6 адреса." -#: fields.py:821 +#: fields.py:931 msgid "A valid integer is required." msgstr "Задолжителен е валиден цел број." -#: fields.py:822 fields.py:857 fields.py:891 +#: fields.py:932 fields.py:969 fields.py:1005 fields.py:1366 +#, python-brace-format msgid "Ensure this value is less than or equal to {max_value}." msgstr "Вредноста треба да биде помала или еднаква на {max_value}." -#: fields.py:823 fields.py:858 fields.py:892 +#: fields.py:933 fields.py:970 fields.py:1006 fields.py:1367 +#, python-brace-format msgid "Ensure this value is greater than or equal to {min_value}." msgstr "Вредноста треба да биде поголема или еднаква на {min_value}." -#: fields.py:824 fields.py:859 fields.py:896 +#: fields.py:934 fields.py:971 fields.py:1010 msgid "String value too large." msgstr "Вредноста е преголема." -#: fields.py:856 fields.py:890 +#: fields.py:968 fields.py:1004 msgid "A valid number is required." msgstr "Задолжителен е валиден број." -#: fields.py:893 +#: fields.py:1007 +#, python-brace-format msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "Не смее да има повеќе од {max_digits} цифри вкупно." -#: fields.py:894 +#: fields.py:1008 +#, python-brace-format msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "Не смее да има повеќе од {max_decimal_places} децимални места." -#: fields.py:895 +#: fields.py:1009 +#, python-brace-format msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "Не смее да има повеќе од {max_whole_digits} цифри пред децималната точка." -#: fields.py:1025 +#: fields.py:1148 +#, python-brace-format msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "Датата и времето се со погрешен формат. Користете го овој формат: {format}." -#: fields.py:1026 +#: fields.py:1149 msgid "Expected a datetime but got a date." msgstr "Очекувано беше дата и време, а внесено беше само дата." -#: fields.py:1103 +#: fields.py:1150 +#, python-brace-format +msgid "Invalid datetime for the timezone \"{timezone}\"." +msgstr "" + +#: fields.py:1151 +msgid "Datetime value out of range." +msgstr "" + +#: fields.py:1236 +#, python-brace-format msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "Датата е со погрешен формат. Користете го овој формат: {format}." -#: fields.py:1104 +#: fields.py:1237 msgid "Expected a date but got a datetime." msgstr "Очекувана беше дата, а внесени беа и дата и време." -#: fields.py:1170 +#: fields.py:1303 +#, python-brace-format msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "Времето е со погрешен формат. Користете го овој формат: {format}." -#: fields.py:1232 +#: fields.py:1365 +#, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1251 fields.py:1300 +#: fields.py:1399 fields.py:1456 +#, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "„{input}“ не е валиден избор." -#: fields.py:1254 relations.py:71 relations.py:441 +#: fields.py:1402 +#, python-brace-format msgid "More than {count} items..." msgstr "Повеќе од {count} ставки..." -#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 +#: fields.py:1457 fields.py:1603 relations.py:485 serializers.py:570 +#, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Очекувана беше листа од ставки, а внесено беше „{input_type}“." -#: fields.py:1302 +#: fields.py:1458 msgid "This selection may not be empty." msgstr "" -#: fields.py:1339 +#: fields.py:1495 +#, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1358 +#: fields.py:1514 msgid "No file was submitted." msgstr "Ниеден фајл не е качен (upload-иран)." -#: fields.py:1359 +#: fields.py:1515 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "Испратените податоци не се фајл. Проверете го encoding-от на формата." -#: fields.py:1360 +#: fields.py:1516 msgid "No filename could be determined." msgstr "Не може да се открие име на фајлот." -#: fields.py:1361 +#: fields.py:1517 msgid "The submitted file is empty." msgstr "Качениот (upload-иран) фајл е празен." -#: fields.py:1362 +#: fields.py:1518 +#, python-brace-format msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "Името на фајлот треба да има највеќе {max_length} знаци (а има {length})." -#: fields.py:1410 +#: fields.py:1566 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "Качете (upload-ирајте) валидна слика. Фајлот што го качивте не е валидна слика или е расипан." -#: fields.py:1449 relations.py:438 serializers.py:525 +#: fields.py:1604 relations.py:486 serializers.py:571 msgid "This list may not be empty." msgstr "Оваа листа не смее да биде празна." -#: fields.py:1502 +#: fields.py:1605 +#, python-brace-format +msgid "Ensure this field has at least {min_length} elements." +msgstr "" + +#: fields.py:1606 +#, python-brace-format +msgid "Ensure this field has no more than {max_length} elements." +msgstr "" + +#: fields.py:1682 +#, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "Очекуван беше dictionary од ставки, a внесен беше тип \"{input_type}\"." -#: fields.py:1549 +#: fields.py:1683 +msgid "This dictionary may not be empty." +msgstr "" + +#: fields.py:1755 msgid "Value must be valid JSON." msgstr "Вредноста мора да биде валиден JSON." -#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 -msgid "Submit" -msgstr "Испрати" +#: filters.py:49 templates/rest_framework/filters/search.html:2 +msgid "Search" +msgstr "Пребарај" -#: filters.py:336 +#: filters.py:50 +msgid "A search term." +msgstr "" + +#: filters.py:180 templates/rest_framework/filters/ordering.html:3 +msgid "Ordering" +msgstr "Подредување" + +#: filters.py:181 +msgid "Which field to use when ordering the results." +msgstr "" + +#: filters.py:287 msgid "ascending" msgstr "растечки" -#: filters.py:337 +#: filters.py:288 msgid "descending" msgstr "опаѓачки" -#: pagination.py:193 +#: pagination.py:174 +msgid "A page number within the paginated result set." +msgstr "" + +#: pagination.py:179 pagination.py:372 pagination.py:590 +msgid "Number of results to return per page." +msgstr "" + +#: pagination.py:189 msgid "Invalid page." msgstr "Невалидна вредност за страна." -#: pagination.py:427 +#: pagination.py:374 +msgid "The initial index from which to return the results." +msgstr "" + +#: pagination.py:581 +msgid "The pagination cursor value." +msgstr "" + +#: pagination.py:583 msgid "Invalid cursor" msgstr "Невалиден покажувач (cursor)" -#: relations.py:207 +#: relations.py:246 +#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Невалиден pk „{pk_value}“ - објектот не постои." -#: relations.py:208 +#: relations.py:247 +#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Неточен тип. Очекувано беше pk, а внесено {data_type}." -#: relations.py:240 +#: relations.py:280 msgid "Invalid hyperlink - No URL match." msgstr "Невалиден хиперлинк - не е внесен URL." -#: relations.py:241 +#: relations.py:281 msgid "Invalid hyperlink - Incorrect URL match." msgstr "Невалиден хиперлинк - внесен е неправилен URL." -#: relations.py:242 +#: relations.py:282 msgid "Invalid hyperlink - Object does not exist." msgstr "Невалиден хиперлинк - Објектот не постои." -#: relations.py:243 +#: relations.py:283 +#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Неточен тип. Очекувано беше URL, a внесено {data_type}." -#: relations.py:401 +#: relations.py:448 +#, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "Објектот со {slug_name}={value} не постои." -#: relations.py:402 +#: relations.py:449 msgid "Invalid value." msgstr "Невалидна вредност." -#: serializers.py:326 +#: schemas/utils.py:32 +msgid "unique integer value" +msgstr "" + +#: schemas/utils.py:34 +msgid "UUID string" +msgstr "" + +#: schemas/utils.py:36 +msgid "unique value" +msgstr "" + +#: schemas/utils.py:38 +#, python-brace-format +msgid "A {value_type} identifying this {name}." +msgstr "" + +#: serializers.py:337 +#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "Невалидни податоци. Очекуван беше dictionary, а внесен {datatype}." #: templates/rest_framework/admin.html:116 -#: templates/rest_framework/base.html:128 +#: templates/rest_framework/base.html:136 +msgid "Extra Actions" +msgstr "" + +#: templates/rest_framework/admin.html:130 +#: templates/rest_framework/base.html:150 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/base.html:37 +msgid "navbar" +msgstr "" -#: templates/rest_framework/filters/ordering.html:3 -msgid "Ordering" -msgstr "Подредување" +#: templates/rest_framework/base.html:75 +msgid "content" +msgstr "" -#: templates/rest_framework/filters/search.html:2 -msgid "Search" -msgstr "Пребарај" +#: templates/rest_framework/base.html:78 +msgid "request form" +msgstr "" -#: templates/rest_framework/horizontal/radio.html:2 -#: templates/rest_framework/inline/radio.html:2 -#: templates/rest_framework/vertical/radio.html:2 +#: templates/rest_framework/base.html:157 +msgid "main content" +msgstr "" + +#: templates/rest_framework/base.html:173 +msgid "request info" +msgstr "" + +#: templates/rest_framework/base.html:177 +msgid "response info" +msgstr "" + +#: templates/rest_framework/horizontal/radio.html:4 +#: templates/rest_framework/inline/radio.html:3 +#: templates/rest_framework/vertical/radio.html:3 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 +#: templates/rest_framework/horizontal/select_multiple.html:4 +#: templates/rest_framework/inline/select_multiple.html:3 +#: templates/rest_framework/vertical/select_multiple.html:3 msgid "No items to select." msgstr "Нема ставки за избирање." -#: validators.py:43 +#: validators.py:39 msgid "This field must be unique." msgstr "Ова поле мора да биде уникатно." -#: validators.py:97 +#: validators.py:89 +#, python-brace-format msgid "The fields {field_names} must make a unique set." msgstr "Полињата {field_names} заедно мора да формираат уникатен збир." -#: validators.py:245 +#: validators.py:171 +#, python-brace-format +msgid "Surrogate characters are not allowed: U+{code_point:X}." +msgstr "" + +#: validators.py:243 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" date." msgstr "Ова поле мора да биде уникатно за „{date_field}“ датата." -#: validators.py:260 +#: validators.py:258 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" month." msgstr "Ова поле мора да биде уникатно за „{date_field}“ месецот." -#: validators.py:273 +#: validators.py:271 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" year." msgstr "Ова поле мора да биде уникатно за „{date_field}“ годината." -#: versioning.py:42 +#: versioning.py:40 msgid "Invalid version in \"Accept\" header." msgstr "Невалидна верзија во „Accept“ header-от." -#: versioning.py:73 +#: versioning.py:71 msgid "Invalid version in URL path." msgstr "Невалидна верзија во URL патеката." -#: versioning.py:115 +#: versioning.py:116 msgid "Invalid version in URL path. Does not match any version namespace." msgstr "Верзијата во URL патеката не е валидна. Не се согласува со ниеден version namespace (именски простор за верзии)." -#: versioning.py:147 +#: versioning.py:148 msgid "Invalid version in hostname." msgstr "Невалидна верзија во hostname-от." -#: versioning.py:169 +#: versioning.py:170 msgid "Invalid version in query parameter." msgstr "Невалидна верзија во query параметарот." - -#: views.py:88 -msgid "Permission denied." -msgstr "Барањето не е дозволено." diff --git a/rest_framework/locale/nb/LC_MESSAGES/django.mo b/rest_framework/locale/nb/LC_MESSAGES/django.mo index fc57ebb9ff00848ccf5b869e51ecb703ea8c06a4..bd983b292c4cb1c0223b45b9624554ca496ec38d 100644 GIT binary patch delta 2239 zcmYk+drZ}39LMo59uA>*0b|Hujl!lbAG?) z`99z0Tx|VnXXN`OiDO1PK&({w%#O(<-e~zLW)2qM8r*@)@eu0!CvXK$;5_^ci}4~B z;h&g{`E$)SV<|S`kZZ&~qO*+)3H-Vqo3ImKz`Jn}QZNc4Gf@8?brg_u% zE@3{V-eH!FK`g{BwOF;tz2OnOlkstH{5EQ3AEH)t8I{Uk zy>W1{`*|DsxITi)z!SI{PonNOi2?i)Gw^4OICPTub{YmS5v!4`TRq-|&B!*|lb+9_ zZg3J+CgZpa-^Eh=9JQstp(b3z&GmUVYJ3<~GcTu+{|Y*1xe(uL)HpNUopCGbi;tj# z$59hHgUY}a^y7-9?nJV29pii~!*=Y(=TQs$5i@ZXwV;2Nl7C%DVL9cPgVdvSpfb>d z?KsXOPKT5+5pKxu|h3^0K46CF3}%=q8az*fg>R zyN&^z!z$Bt{tM}lb*n?_&$>}X^(bn_L#P!!joQOW)C0~T*|zhTh~J?e_yej)Z=o_3 z;Oy#qhfvRX33=HBZ`nNGzNQnzpHQbDhh=WSeW)3~f)2iiOy0gh?fp&Mf`x0`3HPHW zHjD-M6si^`@P536+TwC5SoaNKMAh0whi$V5P!E0vQ}CSU1x#S0eG6YA31*Wlc?!)%~@&14Iu|LC_+$$nC^4z#o#`M|67Eg!W2jSrgM_9YSp%(Ln4b zI27@}?k;R5)aJX`9@Jvgwi2o(H5F@-_W%EF6N7H=f~u5-+g@TLkxr2+N;_oHAt7f$S)TagYC!wmn-TZWP3U0SnI(6P)4sIrrqo-0< zMX#ll#0usn_+ym|SNfw5rB%en(*nNeY{un=^3vimUhAE*P}PRux>DM_mhjMUarm77<4L&$<__4>Gnj-^lul`_P|G-FJIQGY~+=OUjW<~6+%u0W3 VW_5u-nw1xdh4Z%iqSJvB{{o+}-6a43 delta 2574 zcmZYATWl0n9LMp~Zf_L9S_+g)=~x8IrIiAubxW@lXra_XTP_8~DLa%&hgs9zHY&(I zX(SM%7GgpWHG(h32UA5cQ6nYB2k=3IAzlb3MB;;&7}Fr>gWuomAP=7Ozn^nXXV09= ze`deha-}PEy)f&fq3kE-6CDv_j^g1QJ}7VI8S@~%g%*zEBD{$UFn@|M#kd6Z{T7^u zdodpmVFkW`%kcxu#hl*p44zJ!U+R9MY)^*&pTqJa^w*-^Jw7}oPob% z7G~1mR7@^Df`v#Ln3mAZ$fc$SHO>GkjgH`Kd_HWyj#}{98Jxe)`YIh-K}k{i!YHb} z4V6rBT!Y6@XM8bi-$5;)YG(Sn4zy?=Kuz!{20Mb;v?oy$%4BxSaLO$9zlusV9lLM< zwbCze4t^PW1GUmSVLQTdR?;p(^4D~scBT){W*Fn3&ODz%bmpsYG4_V-!^lwPOp1y{ zY|3ALih&_#5vr`?H7cmg%?tEer$fn|6LwNv@5P7A5W z2K12yq|AF%l=TzHlVKKF#;nC^)ENz-cH#_bfN|u}Hh<$P%wT`@{c7BRG1N}Hi+T)y zL;lQU*j~V_G+qVH=l*6Jm1a8PL5DH#qrUJp=Hj2oahlu698Cew9GhTPpq`peBoEC9 za%$!nlF#NGD(NnuCj2>SL6=cSc^h-NzsY1e8XzB)?WLH7b*LLRVIJ;8Wwnhu`&Urc ze~-HH1Tv;6;BBP^tj22Gjx~53SK}qr0{+32MP)XrsV~%`lA;gS;R(#fYp9*Lj!W>>6MdJDD@DvzZJUSL|Rigr=uah-oxP))yxwCySu zp|jpiWD@%co%MD?Td5Kulpl@6E<&Y%P%ha-jL0QabiDi={8t=mSww0tAIeU>6gVE! zNz@VjgwCp$Q1Wo(W*bpYs5B6LLG9j06IH#{7KUBQ4dn%S8I%@2dEEp>?;J{Z@a!sk zRg`?)M28xbc0%t26}?1)Qg+DopBhd+S7x~h%a125+ZwSwH)i$6m{9`#F#&=G`q0N89L}D5^mhLVvg@RvC7fog*7?d z!~F-{vsH@ f<@)~EL|J>JXfW<4;}+w_9D6Y7a#t>^UHtODNQf-M diff --git a/rest_framework/locale/nb/LC_MESSAGES/django.po b/rest_framework/locale/nb/LC_MESSAGES/django.po index f572f90be..9dbaf45de 100644 --- a/rest_framework/locale/nb/LC_MESSAGES/django.po +++ b/rest_framework/locale/nb/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: 2016-07-12 16:13+0100\n" -"PO-Revision-Date: 2017-11-28 15:25+0000\n" -"Last-Translator: Håken Lid \n" +"POT-Creation-Date: 2020-10-13 21:45+0200\n" +"PO-Revision-Date: 2020-10-13 19:45+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" @@ -20,40 +20,40 @@ msgstr "" "Language: nb\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:73 +#: authentication.py:70 msgid "Invalid basic header. No credentials provided." msgstr "Ugyldig basic header. Ingen legitimasjon gitt." -#: authentication.py:76 +#: authentication.py:73 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "Ugyldig basic header. Legitimasjonsstreng bør ikke inneholde mellomrom." -#: authentication.py:82 +#: authentication.py:83 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Ugyldig basic header. Legitimasjonen ikke riktig Base64 kodet." -#: authentication.py:99 +#: authentication.py:101 msgid "Invalid username/password." msgstr "Ugyldig brukernavn eller passord." -#: authentication.py:102 authentication.py:198 +#: authentication.py:104 authentication.py:206 msgid "User inactive or deleted." msgstr "Bruker inaktiv eller slettet." -#: authentication.py:176 +#: authentication.py:184 msgid "Invalid token header. No credentials provided." msgstr "Ugyldig token header. Ingen legitimasjon gitt." -#: authentication.py:179 +#: authentication.py:187 msgid "Invalid token header. Token string should not contain spaces." msgstr "Ugyldig token header. Token streng skal ikke inneholde mellomrom." -#: authentication.py:185 +#: authentication.py:193 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "Ugyldig token header. Tokenstrengen skal ikke inneholde ugyldige tegn." -#: authentication.py:195 +#: authentication.py:203 msgid "Invalid token." msgstr "Ugyldig token." @@ -61,382 +61,515 @@ msgstr "Ugyldig token." msgid "Auth Token" msgstr "Auth Token" -#: authtoken/models.py:15 +#: authtoken/models.py:13 msgid "Key" msgstr "Nøkkel" -#: authtoken/models.py:18 +#: authtoken/models.py:16 msgid "User" msgstr "Bruker" -#: authtoken/models.py:20 +#: authtoken/models.py:18 msgid "Created" msgstr "Opprettet" -#: authtoken/models.py:29 +#: authtoken/models.py:27 authtoken/serializers.py:19 msgid "Token" msgstr "Token" -#: authtoken/models.py:30 +#: authtoken/models.py:28 msgid "Tokens" msgstr "Tokener" -#: authtoken/serializers.py:8 +#: authtoken/serializers.py:9 msgid "Username" msgstr "Brukernavn" -#: authtoken/serializers.py:9 +#: authtoken/serializers.py:13 msgid "Password" msgstr "Passord" -#: authtoken/serializers.py:20 -msgid "User account is disabled." -msgstr "Brukerkonto er deaktivert." - -#: authtoken/serializers.py:23 +#: authtoken/serializers.py:35 msgid "Unable to log in with provided credentials." msgstr "Kan ikke logge inn med gitt legitimasjon." -#: authtoken/serializers.py:26 +#: authtoken/serializers.py:38 msgid "Must include \"username\" and \"password\"." msgstr "Må inneholde \"username\" og \"password\"." -#: exceptions.py:49 +#: exceptions.py:102 msgid "A server error occurred." msgstr "En serverfeil skjedde." -#: exceptions.py:84 +#: exceptions.py:142 +msgid "Invalid input." +msgstr "" + +#: exceptions.py:161 msgid "Malformed request." msgstr "Misformet forespørsel." -#: exceptions.py:89 +#: exceptions.py:167 msgid "Incorrect authentication credentials." msgstr "Ugyldig autentiseringsinformasjon." -#: exceptions.py:94 +#: exceptions.py:173 msgid "Authentication credentials were not provided." msgstr "Manglende autentiseringsinformasjon." -#: exceptions.py:99 +#: exceptions.py:179 msgid "You do not have permission to perform this action." msgstr "Du har ikke tilgang til å utføre denne handlingen." -#: exceptions.py:104 views.py:81 +#: exceptions.py:185 msgid "Not found." msgstr "Ikke funnet." -#: exceptions.py:109 +#: exceptions.py:191 +#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "Metoden \"{method}\" ikke gyldig." -#: exceptions.py:120 +#: exceptions.py:202 msgid "Could not satisfy the request Accept header." msgstr "Kunne ikke tilfredsstille request Accept header." -#: exceptions.py:132 +#: exceptions.py:212 +#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "Ugyldig media type \"{media_type}\" i request." -#: exceptions.py:145 +#: exceptions.py:223 msgid "Request was throttled." msgstr "Forespørselen ble strupet." -#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 -#: validators.py:181 +#: exceptions.py:224 +#, python-brace-format +msgid "Expected available in {wait} second." +msgstr "" + +#: exceptions.py:225 +#, python-brace-format +msgid "Expected available in {wait} seconds." +msgstr "" + +#: fields.py:316 relations.py:245 relations.py:279 validators.py:90 +#: validators.py:183 msgid "This field is required." msgstr "Dette feltet er påkrevd." -#: fields.py:270 +#: fields.py:317 msgid "This field may not be null." msgstr "Dette feltet må ikke være tomt." -#: fields.py:608 fields.py:639 -msgid "\"{input}\" is not a valid boolean." -msgstr "\"{input}\" er ikke en gyldig bolsk verdi." +#: fields.py:701 +msgid "Must be a valid boolean." +msgstr "" -#: fields.py:674 +#: fields.py:766 +msgid "Not a valid string." +msgstr "" + +#: fields.py:767 msgid "This field may not be blank." msgstr "Dette feltet må ikke være blankt." -#: fields.py:675 fields.py:1675 +#: fields.py:768 fields.py:1881 +#, 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." -#: fields.py:676 +#: fields.py:769 +#, python-brace-format msgid "Ensure this field has at least {min_length} characters." msgstr "Forsikre deg at dette feltet har minst {min_length} tegn." -#: fields.py:713 +#: fields.py:816 msgid "Enter a valid email address." msgstr "Oppgi en gyldig epost-adresse." -#: fields.py:724 +#: fields.py:827 msgid "This value does not match the required pattern." msgstr "Denne verdien samsvarer ikke med de påkrevde mønsteret." -#: fields.py:735 +#: fields.py:838 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:747 +#: fields.py:839 +msgid "" +"Enter a valid \"slug\" consisting of Unicode letters, numbers, underscores, " +"or hyphens." +msgstr "" + +#: fields.py:854 msgid "Enter a valid URL." msgstr "Skriv inn en gyldig URL." -#: fields.py:760 -msgid "\"{value}\" is not a valid UUID." -msgstr "\"{value}\" er ikke en gyldig UUID." +#: fields.py:867 +msgid "Must be a valid UUID." +msgstr "" -#: fields.py:796 +#: fields.py:903 msgid "Enter a valid IPv4 or IPv6 address." msgstr "Skriv inn en gyldig IPv4 eller IPv6-adresse." -#: fields.py:821 +#: fields.py:931 msgid "A valid integer is required." msgstr "En gyldig heltall er nødvendig." -#: fields.py:822 fields.py:857 fields.py:891 +#: fields.py:932 fields.py:969 fields.py:1005 fields.py:1366 +#, python-brace-format 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:823 fields.py:858 fields.py:892 +#: fields.py:933 fields.py:970 fields.py:1006 fields.py:1367 +#, python-brace-format 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:824 fields.py:859 fields.py:896 +#: fields.py:934 fields.py:971 fields.py:1010 msgid "String value too large." msgstr "Strengverdien for stor." -#: fields.py:856 fields.py:890 +#: fields.py:968 fields.py:1004 msgid "A valid number is required." msgstr "Et gyldig nummer er nødvendig." -#: fields.py:893 +#: fields.py:1007 +#, python-brace-format 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:894 +#: fields.py:1008 +#, python-brace-format 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:895 +#: fields.py:1009 +#, python-brace-format 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:1025 +#: fields.py:1148 +#, python-brace-format 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:1026 +#: fields.py:1149 msgid "Expected a datetime but got a date." msgstr "Forventet en datetime, men fikk en date." -#: fields.py:1103 +#: fields.py:1150 +#, python-brace-format +msgid "Invalid datetime for the timezone \"{timezone}\"." +msgstr "" + +#: fields.py:1151 +msgid "Datetime value out of range." +msgstr "" + +#: fields.py:1236 +#, 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:1104 +#: fields.py:1237 msgid "Expected a date but got a datetime." msgstr "Forventet en date, men fikk en datetime." -#: fields.py:1170 +#: fields.py:1303 +#, 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:1232 +#: fields.py:1365 +#, 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:1251 fields.py:1300 +#: fields.py:1399 fields.py:1456 +#, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" er ikke et gyldig valg." -#: fields.py:1254 relations.py:71 relations.py:441 +#: fields.py:1402 +#, python-brace-format msgid "More than {count} items..." msgstr "Mer enn {count} elementer ..." -#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 +#: fields.py:1457 fields.py:1603 relations.py:485 serializers.py:570 +#, 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:1302 +#: fields.py:1458 msgid "This selection may not be empty." msgstr "Dette valget kan ikke være tomt." -#: fields.py:1339 +#: fields.py:1495 +#, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "\"{input}\" er ikke en gyldig bane valg." -#: fields.py:1358 +#: fields.py:1514 msgid "No file was submitted." msgstr "Ingen fil ble sendt." -#: fields.py:1359 +#: fields.py:1515 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:1360 +#: fields.py:1516 msgid "No filename could be determined." msgstr "Kunne ikke finne filnavn." -#: fields.py:1361 +#: fields.py:1517 msgid "The submitted file is empty." msgstr "Den innsendte filen er tom." -#: fields.py:1362 +#: fields.py:1518 +#, 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:1410 +#: fields.py:1566 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:1449 relations.py:438 serializers.py:525 +#: fields.py:1604 relations.py:486 serializers.py:571 msgid "This list may not be empty." msgstr "Denne listen kan ikke være tom." -#: fields.py:1502 +#: fields.py:1605 +#, python-brace-format +msgid "Ensure this field has at least {min_length} elements." +msgstr "" + +#: fields.py:1606 +#, python-brace-format +msgid "Ensure this field has no more than {max_length} elements." +msgstr "" + +#: fields.py:1682 +#, 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:1549 +#: fields.py:1683 +msgid "This dictionary may not be empty." +msgstr "" + +#: fields.py:1755 msgid "Value must be valid JSON." msgstr "Verdien må være gyldig JSON." -#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 -msgid "Submit" -msgstr "Send inn" +#: filters.py:49 templates/rest_framework/filters/search.html:2 +msgid "Search" +msgstr "Søk" -#: filters.py:336 +#: filters.py:50 +msgid "A search term." +msgstr "" + +#: filters.py:180 templates/rest_framework/filters/ordering.html:3 +msgid "Ordering" +msgstr "Sortering" + +#: filters.py:181 +msgid "Which field to use when ordering the results." +msgstr "" + +#: filters.py:287 msgid "ascending" msgstr "stigende" -#: filters.py:337 +#: filters.py:288 msgid "descending" msgstr "synkende" -#: pagination.py:193 +#: pagination.py:174 +msgid "A page number within the paginated result set." +msgstr "" + +#: pagination.py:179 pagination.py:372 pagination.py:590 +msgid "Number of results to return per page." +msgstr "" + +#: pagination.py:189 msgid "Invalid page." msgstr "Ugyldig side" -#: pagination.py:427 +#: pagination.py:374 +msgid "The initial index from which to return the results." +msgstr "" + +#: pagination.py:581 +msgid "The pagination cursor value." +msgstr "" + +#: pagination.py:583 msgid "Invalid cursor" msgstr "Ugyldig markør" -#: relations.py:207 +#: relations.py:246 +#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Ugyldig pk \"{pk_value}\" - objektet eksisterer ikke." -#: relations.py:208 +#: relations.py:247 +#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Feil type. Forventet pk verdi, fikk {data_type}." -#: relations.py:240 +#: relations.py:280 msgid "Invalid hyperlink - No URL match." msgstr "Ugyldig hyperkobling - No URL match." -#: relations.py:241 +#: relations.py:281 msgid "Invalid hyperlink - Incorrect URL match." msgstr "Ugyldig hyperkobling - Incorrect URL match." -#: relations.py:242 +#: relations.py:282 msgid "Invalid hyperlink - Object does not exist." msgstr "Ugyldig hyperkobling - Objektet eksisterer ikke." -#: relations.py:243 +#: relations.py:283 +#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Feil type. Forventet URL streng, fikk {data_type}." -#: relations.py:401 +#: relations.py:448 +#, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "Objekt med {slug_name}={value} finnes ikke." -#: relations.py:402 +#: relations.py:449 msgid "Invalid value." msgstr "Ugyldig verdi." -#: serializers.py:326 +#: schemas/utils.py:32 +msgid "unique integer value" +msgstr "" + +#: schemas/utils.py:34 +msgid "UUID string" +msgstr "" + +#: schemas/utils.py:36 +msgid "unique value" +msgstr "" + +#: schemas/utils.py:38 +#, python-brace-format +msgid "A {value_type} identifying this {name}." +msgstr "" + +#: serializers.py:337 +#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "Ugyldige data. Forventet en dictionary, men fikk {datatype}." #: templates/rest_framework/admin.html:116 -#: templates/rest_framework/base.html:128 +#: templates/rest_framework/base.html:136 +msgid "Extra Actions" +msgstr "" + +#: templates/rest_framework/admin.html:130 +#: templates/rest_framework/base.html:150 msgid "Filters" msgstr "Filtre" -#: templates/rest_framework/filters/django_filter.html:2 -#: templates/rest_framework/filters/django_filter_crispyforms.html:4 -msgid "Field filters" -msgstr "Feltfiltre" +#: templates/rest_framework/base.html:37 +msgid "navbar" +msgstr "" -#: templates/rest_framework/filters/ordering.html:3 -msgid "Ordering" -msgstr "Sortering" +#: templates/rest_framework/base.html:75 +msgid "content" +msgstr "" -#: templates/rest_framework/filters/search.html:2 -msgid "Search" -msgstr "Søk" +#: templates/rest_framework/base.html:78 +msgid "request form" +msgstr "" -#: templates/rest_framework/horizontal/radio.html:2 -#: templates/rest_framework/inline/radio.html:2 -#: templates/rest_framework/vertical/radio.html:2 +#: templates/rest_framework/base.html:157 +msgid "main content" +msgstr "" + +#: templates/rest_framework/base.html:173 +msgid "request info" +msgstr "" + +#: templates/rest_framework/base.html:177 +msgid "response info" +msgstr "" + +#: templates/rest_framework/horizontal/radio.html:4 +#: templates/rest_framework/inline/radio.html:3 +#: templates/rest_framework/vertical/radio.html:3 msgid "None" msgstr "Ingen" -#: templates/rest_framework/horizontal/select_multiple.html:2 -#: templates/rest_framework/inline/select_multiple.html:2 -#: templates/rest_framework/vertical/select_multiple.html:2 +#: templates/rest_framework/horizontal/select_multiple.html:4 +#: templates/rest_framework/inline/select_multiple.html:3 +#: templates/rest_framework/vertical/select_multiple.html:3 msgid "No items to select." msgstr "Ingenting å velge." -#: validators.py:43 +#: validators.py:39 msgid "This field must be unique." msgstr "Dette feltet må være unikt." -#: validators.py:97 +#: validators.py:89 +#, python-brace-format msgid "The fields {field_names} must make a unique set." msgstr "Feltene {field_names} må gjøre et unikt sett." -#: validators.py:245 +#: validators.py:171 +#, python-brace-format +msgid "Surrogate characters are not allowed: U+{code_point:X}." +msgstr "" + +#: validators.py:243 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" date." msgstr "Dette feltet må være unikt for \"{date_field}\" dato." -#: validators.py:260 +#: validators.py:258 +#, python-brace-format 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:273 +#: validators.py:271 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" year." msgstr "Dette feltet må være unikt for \"{date_field}\" år." -#: versioning.py:42 +#: versioning.py:40 msgid "Invalid version in \"Accept\" header." msgstr "Ugyldig versjon på \"Accept\" header." -#: versioning.py:73 +#: versioning.py:71 msgid "Invalid version in URL path." msgstr "Ugyldig versjon i URL-banen." -#: versioning.py:115 +#: versioning.py:116 msgid "Invalid version in URL path. Does not match any version namespace." msgstr "Ugyldig versjon i URL. Passer ikke med noen eksisterende versjon." -#: versioning.py:147 +#: versioning.py:148 msgid "Invalid version in hostname." msgstr "Ugyldig versjon i vertsnavn." -#: versioning.py:169 +#: versioning.py:170 msgid "Invalid version in query parameter." msgstr "Ugyldig versjon i søkeparameter." - -#: views.py:88 -msgid "Permission denied." -msgstr "Tillatelse avslått." diff --git a/rest_framework/locale/ne_NP/LC_MESSAGES/django.mo b/rest_framework/locale/ne_NP/LC_MESSAGES/django.mo new file mode 100644 index 0000000000000000000000000000000000000000..a9071d09e83417e0d10cf349f5e2f9f8d9f9a2d4 GIT binary patch literal 15636 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 literal 0 HcmV?d00001 diff --git a/rest_framework/locale/ne_NP/LC_MESSAGES/django.po b/rest_framework/locale/ne_NP/LC_MESSAGES/django.po new file mode 100644 index 000000000..74b56e47e --- /dev/null +++ b/rest_framework/locale/ne_NP/LC_MESSAGES/django.po @@ -0,0 +1,574 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Shrawan Poudel , 2018 +# Xavier Ordoquy , 2020 +msgid "" +msgstr "" +"Project-Id-Version: Django REST framework\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-10-13 21:45+0200\n" +"PO-Revision-Date: 2020-10-13 19:59+0000\n" +"Last-Translator: Xavier Ordoquy \n" +"Language-Team: Nepali (Nepal) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/ne_NP/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ne_NP\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: authentication.py:70 +msgid "Invalid basic header. No credentials provided." +msgstr "अमान्य हेडरहरू, क्रेडेन्सियलहरू प्रदान गरिएको छैन |" + +#: authentication.py:73 +msgid "Invalid basic header. Credentials string should not contain spaces." +msgstr "अमान्य हेडरहरू, क्रेडेन्सियलहरूमा स्पेस हुनु हुँदैन |" + +#: authentication.py:83 +msgid "Invalid basic header. Credentials not correctly base64 encoded." +msgstr "अमान्य हेडरहरू, क्रेडेन्सियलहरूमा सही तरिकाले base64 एन्कोड गरिएको छैन |" + +#: authentication.py:101 +msgid "Invalid username/password." +msgstr "अमान्य प्रयोगकर्तानाम/पासवर्ड |" + +#: authentication.py:104 authentication.py:206 +msgid "User inactive or deleted." +msgstr "प्रयोगकर्ता निष्क्रिय वा मेटायिएको छ |" + +#: authentication.py:184 +msgid "Invalid token header. No credentials provided." +msgstr "अमान्य टोकन हेडर । कुनै क्रेडेन्सियल प्रदान गरिएको छैन ।" + +#: authentication.py:187 +msgid "Invalid token header. Token string should not contain spaces." +msgstr "अमान्य टोकन हेडर | टोकनमा स्पेस हुनु हुँदैन |" + +#: authentication.py:193 +msgid "" +"Invalid token header. Token string should not contain invalid characters." +msgstr "अमान्य टोकन हेडर | टोकनमा अवैध अक्षरहरू हुनु हुँदैन |" + +#: authentication.py:203 +msgid "Invalid token." +msgstr "अमान्य टोकन |" + +#: authtoken/apps.py:7 +msgid "Auth Token" +msgstr "प्रयोगकर्ता प्रमाणिकरण टोकन " + +#: authtoken/models.py:13 +msgid "Key" +msgstr "मूल" + +#: authtoken/models.py:16 +msgid "User" +msgstr "प्रयोगकर्ता" + +#: authtoken/models.py:18 +msgid "Created" +msgstr "सिर्जना गरियो" + +#: authtoken/models.py:27 authtoken/serializers.py:19 +msgid "Token" +msgstr "टोकन" + +#: authtoken/models.py:28 +msgid "Tokens" +msgstr "टोकेनहरु" + +#: authtoken/serializers.py:9 +msgid "Username" +msgstr "प्रयोगकर्ताको नाम" + +#: authtoken/serializers.py:13 +msgid "Password" +msgstr "पासवर्ड" + +#: authtoken/serializers.py:35 +msgid "Unable to log in with provided credentials." +msgstr "प्रदान गरिएको क्रेडेन्सियलसँग लग इन गर्न सकिएन |" + +#: authtoken/serializers.py:38 +msgid "Must include \"username\" and \"password\"." +msgstr "\"प्रयोगकर्ताको नाम\" र \"पासवर्ड\" सामेल हुनु पर्छ |" + +#: exceptions.py:102 +msgid "A server error occurred." +msgstr "सर्भर त्रुटि देखापर्यो |" + +#: exceptions.py:142 +msgid "Invalid input." +msgstr "" + +#: exceptions.py:161 +msgid "Malformed request." +msgstr "विकृत अनुरोध |" + +#: exceptions.py:167 +msgid "Incorrect authentication credentials." +msgstr "गलत प्रमाणीकरण क्रेडेन्सियलहरू |" + +#: exceptions.py:173 +msgid "Authentication credentials were not provided." +msgstr "प्रमाणीकरण क्रेडेन्सियलहरू पयिएन | " + +#: exceptions.py:179 +msgid "You do not have permission to perform this action." +msgstr "तपाइँसँग यो कार्य गर्न अनुमति छैन |" + +#: exceptions.py:185 +msgid "Not found." +msgstr "फेला परेन |" + +#: exceptions.py:191 +#, python-brace-format +msgid "Method \"{method}\" not allowed." +msgstr "\"{method}\" गर्ने अनुमती छैन |" + +#: exceptions.py:202 +msgid "Could not satisfy the request Accept header." +msgstr "Accept Header अनुरोधलाई सन्तुष्ट गर्ने सकिएन |" + +#: exceptions.py:212 +#, python-brace-format +msgid "Unsupported media type \"{media_type}\" in request." +msgstr "असमर्थित मिडिया टाईप \"{media_type}\" अनुरोधको | " + +#: exceptions.py:223 +msgid "Request was throttled." +msgstr "अनुरोध प्रतिबन्दित गरियो |" + +#: exceptions.py:224 +#, python-brace-format +msgid "Expected available in {wait} second." +msgstr "" + +#: exceptions.py:225 +#, python-brace-format +msgid "Expected available in {wait} seconds." +msgstr "" + +#: fields.py:316 relations.py:245 relations.py:279 validators.py:90 +#: validators.py:183 +msgid "This field is required." +msgstr "यो फिल्ड आवश्यक छ |" + +#: fields.py:317 +msgid "This field may not be null." +msgstr "यो फिल्ड खाली हुनु हुँदैन |" + +#: fields.py:701 +msgid "Must be a valid boolean." +msgstr "" + +#: fields.py:766 +msgid "Not a valid string." +msgstr "" + +#: fields.py:767 +msgid "This field may not be blank." +msgstr "यो फिल्ड खाली हुन सक्दैन |" + +#: fields.py:768 fields.py:1881 +#, python-brace-format +msgid "Ensure this field has no more than {max_length} characters." +msgstr "यो फिल्डसँग {max_length} अक्षरहरू भन्दा बढी छ छैन सुनिश्चित गर्नुहोस् |" + +#: fields.py:769 +#, python-brace-format +msgid "Ensure this field has at least {min_length} characters." +msgstr "यो फिल्डमा कम से कम {min_length} अक्षरहरू छ छैन सुनिश्चित गर्नुहोस् |" + +#: fields.py:816 +msgid "Enter a valid email address." +msgstr "मान्य इमेल ठेगाना प्रविष्ट गर्नुहोस् |" + +#: fields.py:827 +msgid "This value does not match the required pattern." +msgstr "यो परिमाण आवश्यक ढाँचा मेल खाँदैन ।" + +#: fields.py:838 +msgid "" +"Enter a valid \"slug\" consisting of letters, numbers, underscores or " +"hyphens." +msgstr "अक्षरहरू, अङ्कहरू, अन्डरसेर्सहरू वा हाइफनहरू समावेश भएका एक मान्य \"slug\" प्रविष्टि गर्नुहोस् ।" + +#: fields.py:839 +msgid "" +"Enter a valid \"slug\" consisting of Unicode letters, numbers, underscores, " +"or hyphens." +msgstr "" + +#: fields.py:854 +msgid "Enter a valid URL." +msgstr "मान्य यूआरएल प्रविष्ट गर्नुहोस् ।" + +#: fields.py:867 +msgid "Must be a valid UUID." +msgstr "" + +#: fields.py:903 +msgid "Enter a valid IPv4 or IPv6 address." +msgstr "मान्य IPv4 वा IPv6 ठेगाना प्रविष्टि गर्नुहोस् ।" + +#: fields.py:931 +msgid "A valid integer is required." +msgstr "एक मान्य पूर्णांक आवश्यक छ ।" + +#: fields.py:932 fields.py:969 fields.py:1005 fields.py:1366 +#, python-brace-format +msgid "Ensure this value is less than or equal to {max_value}." +msgstr "यो परिमाण {max_value} को भन्दा कम वा बराबर छ सुनिश्चित गर्नुहोस् ।" + +#: fields.py:933 fields.py:970 fields.py:1006 fields.py:1367 +#, python-brace-format +msgid "Ensure this value is greater than or equal to {min_value}." +msgstr "यो परिमाण {min_value} भन्दा बढी वा बराबर छ सुनिश्चित गर्नुहोस् ।" + +#: fields.py:934 fields.py:971 fields.py:1010 +msgid "String value too large." +msgstr "स्ट्रिङ परिमाण धेरै ठूलो छ ।" + +#: fields.py:968 fields.py:1004 +msgid "A valid number is required." +msgstr "एउटा मान्य अङ्कहरू आवश्यक छ ।" + +#: fields.py:1007 +#, python-brace-format +msgid "Ensure that there are no more than {max_digits} digits in total." +msgstr "सुनिश्चित गर्नुहोस् कि {max_digits} अङ्कहरू भन्दा अधिक नहोस् ।" + +#: fields.py:1008 +#, python-brace-format +msgid "" +"Ensure that there are no more than {max_decimal_places} decimal places." +msgstr "सुनिश्चित गर्नुहोस् कि {max_decimal_places} दशमलव स्थानहरू भन्दा अधिक नहोस् ।" + +#: fields.py:1009 +#, python-brace-format +msgid "" +"Ensure that there are no more than {max_whole_digits} digits before the " +"decimal point." +msgstr "सुनिश्चित गर्नुहोस् कि दशमलव बिन्दुभन्दा पहिले {max_whole_digits} अङ्कहरू भन्दा अधिक नहोस् ।" + +#: fields.py:1148 +#, python-brace-format +msgid "Datetime has wrong format. Use one of these formats instead: {format}." +msgstr "डेटटाइममा गलत ढाँचा छ । यसको सट्टामा यी मध्ये एक ढाँचा प्रयोग गर्नुहोस्: {format} ।" + +#: fields.py:1149 +msgid "Expected a datetime but got a date." +msgstr "डेटटाइम अपेक्षित भए तर मिति प्राप्त भयो ।" + +#: fields.py:1150 +#, python-brace-format +msgid "Invalid datetime for the timezone \"{timezone}\"." +msgstr "" + +#: fields.py:1151 +msgid "Datetime value out of range." +msgstr "" + +#: fields.py:1236 +#, python-brace-format +msgid "Date has wrong format. Use one of these formats instead: {format}." +msgstr "डेटमा गलत ढाँचा छ । यसको सट्टामा यी मध्ये एक ढाँचा प्रयोग गर्नुहोस्: {format} ।" + +#: fields.py:1237 +msgid "Expected a date but got a datetime." +msgstr "डेट अपेक्षित भए तर डेटाटाइम प्राप्त भयो ।" + +#: fields.py:1303 +#, python-brace-format +msgid "Time has wrong format. Use one of these formats instead: {format}." +msgstr "समयमा गलत ढाँचा छ । यसको सट्टामा यी मध्ये एक ढाँचा प्रयोग गर्नुहोस्: {format} ।" + +#: fields.py:1365 +#, python-brace-format +msgid "Duration has wrong format. Use one of these formats instead: {format}." +msgstr "अवधिमा गलत ढाँचा छ । यसको सट्टामा यी मध्ये एक ढाँचा प्रयोग गर्नुहोस्: {format} ।" + +#: fields.py:1399 fields.py:1456 +#, python-brace-format +msgid "\"{input}\" is not a valid choice." +msgstr "\"{input}\" मान्य छनौट छैन ।" + +#: fields.py:1402 +#, python-brace-format +msgid "More than {count} items..." +msgstr "{count} वस्तुहरू भन्दा बढी ..." + +#: fields.py:1457 fields.py:1603 relations.py:485 serializers.py:570 +#, python-brace-format +msgid "Expected a list of items but got type \"{input_type}\"." +msgstr "वस्तुहरूको सूची अपेक्षित तर \"{input_type}\" टाइप प्राप्त भयो ।" + +#: fields.py:1458 +msgid "This selection may not be empty." +msgstr "यो चयन रिक्त हुन सक्दैन ।" + +#: fields.py:1495 +#, python-brace-format +msgid "\"{input}\" is not a valid path choice." +msgstr "\"{input}\" मान्य मार्गको विकल्प होइन ।" + +#: fields.py:1514 +msgid "No file was submitted." +msgstr "कुनै फाइल पेश गरिएको छैन ।" + +#: fields.py:1515 +msgid "" +"The submitted data was not a file. Check the encoding type on the form." +msgstr "पेश गरिएको डेटा फाईल थिएन । एन्कोडिङ प्रकार फारममा जाँच्नुहोस् ।" + +#: fields.py:1516 +msgid "No filename could be determined." +msgstr "कुनै फाइल नाम निर्धारण गर्न सकिएन ।" + +#: fields.py:1517 +msgid "The submitted file is empty." +msgstr "पेश गरिएको फाइल खाली छ ।" + +#: fields.py:1518 +#, python-brace-format +msgid "" +"Ensure this filename has at most {max_length} characters (it has {length})." +msgstr "यो फाइल नाममा अधिक {max_length} अक्षरहरू छ छैन (यसमा {length} छ) सुनिश्चित गर्नुहोस् ।" + +#: fields.py:1566 +msgid "" +"Upload a valid image. The file you uploaded was either not an image or a " +"corrupted image." +msgstr "मान्य चित्र अपलोड गर्नुहोस् । तपाईंले अपलोड गर्नुभएको फाइल होइन वा चित्र वा भ्रष्ट चित्र हो ।" + +#: fields.py:1604 relations.py:486 serializers.py:571 +msgid "This list may not be empty." +msgstr "यो सूची खाली हुन सक्दैन ।" + +#: fields.py:1605 +#, python-brace-format +msgid "Ensure this field has at least {min_length} elements." +msgstr "" + +#: fields.py:1606 +#, python-brace-format +msgid "Ensure this field has no more than {max_length} elements." +msgstr "" + +#: fields.py:1682 +#, python-brace-format +msgid "Expected a dictionary of items but got type \"{input_type}\"." +msgstr "वस्तुहरूको शब्दकोशको अपेक्षित तर \"{input_type}\" टाइप प्राप्त भयो ।" + +#: fields.py:1683 +msgid "This dictionary may not be empty." +msgstr "" + +#: fields.py:1755 +msgid "Value must be valid JSON." +msgstr "परिमाण मान्य JSON हुनु पर्छ ।" + +#: filters.py:49 templates/rest_framework/filters/search.html:2 +msgid "Search" +msgstr "खोजी गर्नुहोस्" + +#: filters.py:50 +msgid "A search term." +msgstr "" + +#: filters.py:180 templates/rest_framework/filters/ordering.html:3 +msgid "Ordering" +msgstr "क्रम" + +#: filters.py:181 +msgid "Which field to use when ordering the results." +msgstr "" + +#: filters.py:287 +msgid "ascending" +msgstr "आरोहण" + +#: filters.py:288 +msgid "descending" +msgstr "अवरोहण" + +#: pagination.py:174 +msgid "A page number within the paginated result set." +msgstr "" + +#: pagination.py:179 pagination.py:372 pagination.py:590 +msgid "Number of results to return per page." +msgstr "" + +#: pagination.py:189 +msgid "Invalid page." +msgstr "अमान्य पृष्ठ ।" + +#: pagination.py:374 +msgid "The initial index from which to return the results." +msgstr "" + +#: pagination.py:581 +msgid "The pagination cursor value." +msgstr "" + +#: pagination.py:583 +msgid "Invalid cursor" +msgstr "अमान्य कर्सर" + +#: relations.py:246 +#, python-brace-format +msgid "Invalid pk \"{pk_value}\" - object does not exist." +msgstr "अमान्य pk \"{pk_value}\" - वस्तुको अस्तित्व छैन ।" + +#: relations.py:247 +#, python-brace-format +msgid "Incorrect type. Expected pk value, received {data_type}." +msgstr "गलत प्रकार। अपेक्षित pk परिमाण, {data_type} प्राप्त भयो ।" + +#: relations.py:280 +msgid "Invalid hyperlink - No URL match." +msgstr "अमान्य हाइपरलिंक - कुनै यूआरएलको मेल छैन ।" + +#: relations.py:281 +msgid "Invalid hyperlink - Incorrect URL match." +msgstr "अमान्य हाइपरलिंक - गलत यूआरएलको मेल छ ।" + +#: relations.py:282 +msgid "Invalid hyperlink - Object does not exist." +msgstr "अमान्य हाइपरलिंक - वस्तुको अस्तित्व छैन ।" + +#: relations.py:283 +#, python-brace-format +msgid "Incorrect type. Expected URL string, received {data_type}." +msgstr "गलत प्रकार। अपेक्षित यूआरएल स्ट्रिङ, {data_type} प्राप्त भयो ।" + +#: relations.py:448 +#, python-brace-format +msgid "Object with {slug_name}={value} does not exist." +msgstr "वस्तु {slug_name} = {value} सँग अस्तित्व छैन ।" + +#: relations.py:449 +msgid "Invalid value." +msgstr "अमान्य परिमाण ।" + +#: schemas/utils.py:32 +msgid "unique integer value" +msgstr "" + +#: schemas/utils.py:34 +msgid "UUID string" +msgstr "" + +#: schemas/utils.py:36 +msgid "unique value" +msgstr "" + +#: schemas/utils.py:38 +#, python-brace-format +msgid "A {value_type} identifying this {name}." +msgstr "" + +#: serializers.py:337 +#, python-brace-format +msgid "Invalid data. Expected a dictionary, but got {datatype}." +msgstr "अमान्य डेटा । एक शब्दकोश अपेक्षित, तर {datatype} प्राप्त भयो ।" + +#: templates/rest_framework/admin.html:116 +#: templates/rest_framework/base.html:136 +msgid "Extra Actions" +msgstr "" + +#: templates/rest_framework/admin.html:130 +#: templates/rest_framework/base.html:150 +msgid "Filters" +msgstr "फिल्टरहरू" + +#: templates/rest_framework/base.html:37 +msgid "navbar" +msgstr "" + +#: templates/rest_framework/base.html:75 +msgid "content" +msgstr "" + +#: templates/rest_framework/base.html:78 +msgid "request form" +msgstr "" + +#: templates/rest_framework/base.html:157 +msgid "main content" +msgstr "" + +#: templates/rest_framework/base.html:173 +msgid "request info" +msgstr "" + +#: templates/rest_framework/base.html:177 +msgid "response info" +msgstr "" + +#: templates/rest_framework/horizontal/radio.html:4 +#: templates/rest_framework/inline/radio.html:3 +#: templates/rest_framework/vertical/radio.html:3 +msgid "None" +msgstr "कुनै पनि होइन" + +#: templates/rest_framework/horizontal/select_multiple.html:4 +#: templates/rest_framework/inline/select_multiple.html:3 +#: templates/rest_framework/vertical/select_multiple.html:3 +msgid "No items to select." +msgstr "चयन गर्न वस्तुहरू छैनन् ।" + +#: validators.py:39 +msgid "This field must be unique." +msgstr "यो फिल्ड अद्वितीय हुनुपर्छ ।" + +#: validators.py:89 +#, python-brace-format +msgid "The fields {field_names} must make a unique set." +msgstr "फिल्ड {field_names} ले एक अद्वितीय सेट गर्नु पर्छ ।" + +#: validators.py:171 +#, python-brace-format +msgid "Surrogate characters are not allowed: U+{code_point:X}." +msgstr "" + +#: validators.py:243 +#, python-brace-format +msgid "This field must be unique for the \"{date_field}\" date." +msgstr "यो फिल्ड \"{date_field}\" मितिको लागि अद्वितीय हुनुपर्छ ।" + +#: validators.py:258 +#, python-brace-format +msgid "This field must be unique for the \"{date_field}\" month." +msgstr "यो फिल्ड \"{date_field}\" महिनाको लागि अद्वितीय हुनुपर्छ ।" + +#: validators.py:271 +#, python-brace-format +msgid "This field must be unique for the \"{date_field}\" year." +msgstr "यो फिल्ड \"{date_field}\" वर्षको लागि अद्वितीय हुनुपर्छ ।" + +#: versioning.py:40 +msgid "Invalid version in \"Accept\" header." +msgstr "\"Accept\" हेडरमा अमान्य संस्करण ।" + +#: versioning.py:71 +msgid "Invalid version in URL path." +msgstr "यूआरएल मार्गमा अमान्य संस्करण ।" + +#: versioning.py:116 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "यूआरएल मार्गमा अमान्य संस्करण । कुनै पनि संस्करणको नामसँग मेल खाँदैन ।" + +#: versioning.py:148 +msgid "Invalid version in hostname." +msgstr "होस्ट नाममा अमान्य संस्करण ।" + +#: versioning.py:170 +msgid "Invalid version in query parameter." +msgstr " क्वेरी परिमितिमा अमान्य संस्करण ।" diff --git a/rest_framework/locale/nl/LC_MESSAGES/django.mo b/rest_framework/locale/nl/LC_MESSAGES/django.mo index ed74bffa0d3ab6df64a05899180d5a7f4049766b..4691ca63fffdb0a1e8a48941f95a499d7f227728 100644 GIT binary patch delta 2249 zcmYk+e@smjqH7{xN&iM+zjUjBkI?S&Q`#doMhWk8pj?zkVCFvX4+Jx{XTZpZ;|; z$NRn;)3`r^%D_vw1jkVCdml^iCg$Vsm~iOK=IIcYU^+G+S+{0<9NUp?w3mHfLA_uM zRVJ5lAzs4>euLW5Db$1;dAYvtLtP(3)y#zu`LCgKl^gC}qpk}Ucr)%oJ$M)$JcpXl z6;uZ9U=R!QyooHum0X9h3VW~*UqdbI7c9X0s0IC-NB(sqljW?!Wk@|*FDe6jaXesl z2(_n~l)fxO2Rl$J8oP$~Wm^};e{u?vS#dwdHS)26T(=QFzstnl59dSBu^9S!h3W?(iI z<6u5UaSb-$0Jh_Ms8jHl|9u^Ar;aR+O?VnrtY4$5{2nS3A;){J36+s9tY&;WO-D2N z3~O;3mBMQByc}Cl103?NPa=!52~@_uLgsF{%e?0!s8i63jBS0W37tTaY~!d5eU3|X z{(q)Z%8du8l!bXZ9oHjA+FG$3dr^CM#&--U3%i7R{zFuie}b#=7HW^R3Qc4?Qm;0I zTEOd)@$DTtH8|<}H!AfJevLHagGjdR6tY-*3stN)unVU!h%JwKr=T6Rpl(#EPvU<3 z09D+%EMM;_!h}}XL`NyyiW>MZ>Ud1}Uc~^{X+#H+OU$&*bU00J)32NcP(iC^bQIO< z2rWQId>^rw(1K|Rcdymcz}n}hi58`?uM<{m3mw)Rd37|ep)~A|pATxj1<@vocjWClE~4 zW)}sM&xLAImqR6K$@}@Y+g3#?s`y*&RMpj2M^{E@b30-~!xcS)v7b_5e(Z%4PUG>o*K0n~e>6VQAFF&eKJf9P!a%a6pfvSH!DKMCr+74&e6YMa U)wrT)R$w^QSJD_rUJqaR5ACzs{{R30 delta 2591 zcmZYAe@so4b6_Wqo6T(zF@y|3pv9L{;3 z@AG{wnN449N&gbb88Wo}#5AHKWXuVCK9>*LnS5hr;(KV}Wt@#Sa5|11V@xT|Mg4s% zPQ`sV77t@J9>e+g0p{U#Y&9lrZqixJh56hqleh*y#^snj&Y11E66CkA)8z z(}=rKzaPR59KlK~D=;R4&8P`(MqPJ3)5g3`M-RM!b@(UpW2y@MnJz)CxEb}L7&hQ( zY{4IKC6*Q$Q-gbuOXei%zG1Aw?@*Z>#d$b=Jn!NCrk&0L+<|()acswra2aMz@E_QM zWsEllV+Xa8XHhGA8%e3T7>q}Q-%nxrA+9e&Wnu*%+PW@G>w!r+bMO@`!3${N2u{S? zn1k62*cFq9k75KV1JfF~9=X+Yp`H^*mC+HLj4uV_cTfvHJCXg@UVqO8t)P68e`6zR zyaiQE30#6FQG0wT7~exJptjh*uLCW{PoXAw0=9 z?hxkSYpCyoA)JqAQCs<~?+>6Rb{RPc z<~LL=-3=^$*grK310B>>oIx$%2TW_`cj%BkQ^ayq)wS4(F%08}n2VpFR(J`O`db*o z@+yCVFQPJZ3iZ76sFhzsW%fF10{1Z=>*kVwb((o<7VaP#3BC@zVgj!zoyvgHr>68h zXv&D19?VX9t%*++8Sn9$3VR))#VBK{BMyvNq5a=XM@=(a<@NkZ-$VaNVhy1$3$0j9 zD=H@RKVmgOw!PNIr;cI|5h2zRYC48$O9(AiO<7ditNmB1)oO{AUe7-|`UZQP$R_p^ z9A)o6p|(sdM5sPmh+Tx*ctW)hCA2kpgqpTP)&HQ`bW~&MeSGkr(rh5uPP38FIqfEN zthN#L1SR4X-7-|u5#8|TzUdkH?x9qE2==%8ho~TXIs^%_86g~*r5Tf zohb5peqnmuio=e3U?BBEh2466SKM#iC#PE)(lqVuPv`Q%*6rw|95TM z*4~zJ^F!frc5lqu@ARhZ{$$22m=TV2+Wmb_GU+5-D`vZn9jh5U6{*kNI?&zcq%xNx zRiR1Io}R>jo6@UePBPlvtD9~V|5R98U%jBAdch*Ac5!1}!{A8CYTU!28kLqy#N3J diff --git a/rest_framework/locale/nl/LC_MESSAGES/django.po b/rest_framework/locale/nl/LC_MESSAGES/django.po index 370f3aa41..5f7ff05b4 100644 --- a/rest_framework/locale/nl/LC_MESSAGES/django.po +++ b/rest_framework/locale/nl/LC_MESSAGES/django.po @@ -8,13 +8,14 @@ # Mike Dingjan , 2017 # Mike Dingjan , 2015 # Hans van Luttikhuizen , 2016 +# Tom Hendrikx , 2017 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: 2017-08-03 14:58+0000\n" -"Last-Translator: Mike Dingjan \n" +"POT-Creation-Date: 2020-10-13 21:45+0200\n" +"PO-Revision-Date: 2020-10-13 19:45+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,40 +23,40 @@ msgstr "" "Language: nl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:73 +#: authentication.py:70 msgid "Invalid basic header. No credentials provided." msgstr "Ongeldige basic header. Geen logingegevens opgegeven." -#: authentication.py:76 +#: authentication.py:73 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "Ongeldige basic header. logingegevens kunnen geen spaties bevatten." -#: authentication.py:82 +#: authentication.py:83 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Ongeldige basic header. logingegevens zijn niet correct base64-versleuteld." -#: authentication.py:99 +#: authentication.py:101 msgid "Invalid username/password." msgstr "Ongeldige gebruikersnaam/wachtwoord." -#: authentication.py:102 authentication.py:198 +#: authentication.py:104 authentication.py:206 msgid "User inactive or deleted." msgstr "Gebruiker inactief of verwijderd." -#: authentication.py:176 +#: authentication.py:184 msgid "Invalid token header. No credentials provided." msgstr "Ongeldige token header. Geen logingegevens opgegeven" -#: authentication.py:179 +#: authentication.py:187 msgid "Invalid token header. Token string should not contain spaces." msgstr "Ongeldige token header. Token kan geen spaties bevatten." -#: authentication.py:185 +#: authentication.py:193 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "Ongeldige token header. Token kan geen ongeldige karakters bevatten." -#: authentication.py:195 +#: authentication.py:203 msgid "Invalid token." msgstr "Ongeldige token." @@ -63,382 +64,515 @@ msgstr "Ongeldige token." msgid "Auth Token" msgstr "Autorisatietoken" -#: authtoken/models.py:15 +#: authtoken/models.py:13 msgid "Key" msgstr "Key" -#: authtoken/models.py:18 +#: authtoken/models.py:16 msgid "User" msgstr "Gebruiker" -#: authtoken/models.py:20 +#: authtoken/models.py:18 msgid "Created" msgstr "Aangemaakt" -#: authtoken/models.py:29 +#: authtoken/models.py:27 authtoken/serializers.py:19 msgid "Token" msgstr "Token" -#: authtoken/models.py:30 +#: authtoken/models.py:28 msgid "Tokens" msgstr "Tokens" -#: authtoken/serializers.py:8 +#: authtoken/serializers.py:9 msgid "Username" msgstr "Gebruikersnaam" -#: authtoken/serializers.py:9 +#: authtoken/serializers.py:13 msgid "Password" msgstr "Wachtwoord" -#: authtoken/serializers.py:20 -msgid "User account is disabled." -msgstr "Gebruikersaccount is gedeactiveerd." - -#: authtoken/serializers.py:23 +#: authtoken/serializers.py:35 msgid "Unable to log in with provided credentials." msgstr "Kan niet inloggen met opgegeven gegevens." -#: authtoken/serializers.py:26 +#: authtoken/serializers.py:38 msgid "Must include \"username\" and \"password\"." msgstr "Moet \"username\" en \"password\" bevatten." -#: exceptions.py:49 +#: exceptions.py:102 msgid "A server error occurred." msgstr "Er is een serverfout opgetreden." -#: exceptions.py:84 +#: exceptions.py:142 +msgid "Invalid input." +msgstr "" + +#: exceptions.py:161 msgid "Malformed request." msgstr "Ongeldig samengestelde request." -#: exceptions.py:89 +#: exceptions.py:167 msgid "Incorrect authentication credentials." msgstr "Ongeldige authenticatiegegevens." -#: exceptions.py:94 +#: exceptions.py:173 msgid "Authentication credentials were not provided." msgstr "Authenticatiegegevens zijn niet opgegeven." -#: exceptions.py:99 +#: exceptions.py:179 msgid "You do not have permission to perform this action." msgstr "Je hebt geen toestemming om deze actie uit te voeren." -#: exceptions.py:104 views.py:81 +#: exceptions.py:185 msgid "Not found." msgstr "Niet gevonden." -#: exceptions.py:109 +#: exceptions.py:191 +#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "Methode \"{method}\" niet toegestaan." -#: exceptions.py:120 +#: exceptions.py:202 msgid "Could not satisfy the request Accept header." msgstr "Kan niet voldoen aan de opgegeven Accept header." -#: exceptions.py:132 +#: exceptions.py:212 +#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "Ongeldige media type \"{media_type}\" in aanvraag." -#: exceptions.py:145 +#: exceptions.py:223 msgid "Request was throttled." msgstr "Aanvraag was verstikt." -#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 -#: validators.py:181 +#: exceptions.py:224 +#, python-brace-format +msgid "Expected available in {wait} second." +msgstr "" + +#: exceptions.py:225 +#, python-brace-format +msgid "Expected available in {wait} seconds." +msgstr "" + +#: fields.py:316 relations.py:245 relations.py:279 validators.py:90 +#: validators.py:183 msgid "This field is required." msgstr "Dit veld is vereist." -#: fields.py:270 +#: fields.py:317 msgid "This field may not be null." msgstr "Dit veld mag niet leeg zijn." -#: fields.py:608 fields.py:639 -msgid "\"{input}\" is not a valid boolean." -msgstr "\"{input}\" is een ongeldige booleanwaarde." +#: fields.py:701 +msgid "Must be a valid boolean." +msgstr "" -#: fields.py:674 +#: fields.py:766 +msgid "Not a valid string." +msgstr "" + +#: fields.py:767 msgid "This field may not be blank." msgstr "Dit veld mag niet leeg zijn." -#: fields.py:675 fields.py:1675 +#: fields.py:768 fields.py:1881 +#, 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." -#: fields.py:676 +#: fields.py:769 +#, python-brace-format msgid "Ensure this field has at least {min_length} characters." msgstr "Zorg ervoor dat dit veld minimaal {min_length} karakters bevat." -#: fields.py:713 +#: fields.py:816 msgid "Enter a valid email address." msgstr "Voer een geldig e-mailadres in." -#: fields.py:724 +#: fields.py:827 msgid "This value does not match the required pattern." -msgstr "Deze waarde voldoet niet aan het vereisde formaat." +msgstr "Deze waarde voldoet niet aan het vereiste formaat." -#: fields.py:735 +#: fields.py:838 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "Voer een geldige \"slug\" in, bestaande uit letters, cijfers, lage streepjes of streepjes." -#: fields.py:747 +#: fields.py:839 +msgid "" +"Enter a valid \"slug\" consisting of Unicode letters, numbers, underscores, " +"or hyphens." +msgstr "" + +#: fields.py:854 msgid "Enter a valid URL." msgstr "Voer een geldige URL in." -#: fields.py:760 -msgid "\"{value}\" is not a valid UUID." -msgstr "\"{value}\" is een ongeldige UUID." +#: fields.py:867 +msgid "Must be a valid UUID." +msgstr "" -#: fields.py:796 +#: fields.py:903 msgid "Enter a valid IPv4 or IPv6 address." msgstr "Voer een geldig IPv4- of IPv6-adres in." -#: fields.py:821 +#: fields.py:931 msgid "A valid integer is required." msgstr "Een geldig getal is vereist." -#: fields.py:822 fields.py:857 fields.py:891 +#: fields.py:932 fields.py:969 fields.py:1005 fields.py:1366 +#, python-brace-format msgid "Ensure this value is less than or equal to {max_value}." msgstr "Zorg ervoor dat deze waarde kleiner is dan of gelijk is aan {max_value}." -#: fields.py:823 fields.py:858 fields.py:892 +#: fields.py:933 fields.py:970 fields.py:1006 fields.py:1367 +#, python-brace-format msgid "Ensure this value is greater than or equal to {min_value}." msgstr "Zorg ervoor dat deze waarde groter is dan of gelijk is aan {min_value}." -#: fields.py:824 fields.py:859 fields.py:896 +#: fields.py:934 fields.py:971 fields.py:1010 msgid "String value too large." msgstr "Tekstwaarde is te lang." -#: fields.py:856 fields.py:890 +#: fields.py:968 fields.py:1004 msgid "A valid number is required." msgstr "Een geldig nummer is vereist." -#: fields.py:893 +#: fields.py:1007 +#, python-brace-format msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "Zorg ervoor dat er in totaal niet meer dan {max_digits} cijfers zijn." -#: fields.py:894 +#: fields.py:1008 +#, python-brace-format msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "Zorg ervoor dat er niet meer dan {max_decimal_places} cijfers achter de komma zijn." -#: fields.py:895 +#: fields.py:1009 +#, python-brace-format 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} cijfers voor de komma zijn." -#: fields.py:1025 +#: fields.py:1148 +#, python-brace-format 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:1026 +#: fields.py:1149 msgid "Expected a datetime but got a date." msgstr "Verwachtte een datetime, maar kreeg een date." -#: fields.py:1103 +#: fields.py:1150 +#, python-brace-format +msgid "Invalid datetime for the timezone \"{timezone}\"." +msgstr "" + +#: fields.py:1151 +msgid "Datetime value out of range." +msgstr "" + +#: fields.py:1236 +#, python-brace-format msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "Date heeft het verkeerde formaat, gebruik 1 van deze formaten: {format}." -#: fields.py:1104 +#: fields.py:1237 msgid "Expected a date but got a datetime." msgstr "Verwachtte een date, maar kreeg een datetime." -#: fields.py:1170 +#: fields.py:1303 +#, 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:1232 +#: fields.py:1365 +#, 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:1251 fields.py:1300 +#: fields.py:1399 fields.py:1456 +#, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" is een ongeldige keuze." -#: fields.py:1254 relations.py:71 relations.py:441 +#: fields.py:1402 +#, python-brace-format msgid "More than {count} items..." msgstr "Meer dan {count} items..." -#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 +#: fields.py:1457 fields.py:1603 relations.py:485 serializers.py:570 +#, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Verwachtte een lijst met items, maar kreeg type \"{input_type}\"." -#: fields.py:1302 +#: fields.py:1458 msgid "This selection may not be empty." msgstr "Deze selectie mag niet leeg zijn." -#: fields.py:1339 +#: fields.py:1495 +#, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "\"{input}\" is niet een geldig pad." -#: fields.py:1358 +#: fields.py:1514 msgid "No file was submitted." msgstr "Er is geen bestand opgestuurd." -#: fields.py:1359 +#: fields.py:1515 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:1360 +#: fields.py:1516 msgid "No filename could be determined." msgstr "Bestandsnaam kon niet vastgesteld worden." -#: fields.py:1361 +#: fields.py:1517 msgid "The submitted file is empty." msgstr "Het verstuurde bestand is leeg." -#: fields.py:1362 +#: fields.py:1518 +#, python-brace-format msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "Zorg ervoor dat deze bestandsnaam hoogstens {max_length} karakters heeft (het heeft er {length})." -#: fields.py:1410 +#: fields.py:1566 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 is beschadigd geraakt," -#: fields.py:1449 relations.py:438 serializers.py:525 +#: fields.py:1604 relations.py:486 serializers.py:571 msgid "This list may not be empty." msgstr "Deze lijst mag niet leeg zijn." -#: fields.py:1502 +#: fields.py:1605 +#, python-brace-format +msgid "Ensure this field has at least {min_length} elements." +msgstr "" + +#: fields.py:1606 +#, python-brace-format +msgid "Ensure this field has no more than {max_length} elements." +msgstr "" + +#: fields.py:1682 +#, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "Verwachtte een dictionary van items, maar kreeg type \"{input_type}\"." -#: fields.py:1549 +#: fields.py:1683 +msgid "This dictionary may not be empty." +msgstr "" + +#: fields.py:1755 msgid "Value must be valid JSON." msgstr "Waarde moet valide JSON zijn." -#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 -msgid "Submit" -msgstr "Verzenden" +#: filters.py:49 templates/rest_framework/filters/search.html:2 +msgid "Search" +msgstr "Zoek" -#: filters.py:336 +#: filters.py:50 +msgid "A search term." +msgstr "" + +#: filters.py:180 templates/rest_framework/filters/ordering.html:3 +msgid "Ordering" +msgstr "Sorteer op" + +#: filters.py:181 +msgid "Which field to use when ordering the results." +msgstr "" + +#: filters.py:287 msgid "ascending" msgstr "oplopend" -#: filters.py:337 +#: filters.py:288 msgid "descending" msgstr "aflopend" -#: pagination.py:193 +#: pagination.py:174 +msgid "A page number within the paginated result set." +msgstr "" + +#: pagination.py:179 pagination.py:372 pagination.py:590 +msgid "Number of results to return per page." +msgstr "" + +#: pagination.py:189 msgid "Invalid page." msgstr "Ongeldige pagina." -#: pagination.py:427 +#: pagination.py:374 +msgid "The initial index from which to return the results." +msgstr "" + +#: pagination.py:581 +msgid "The pagination cursor value." +msgstr "" + +#: pagination.py:583 msgid "Invalid cursor" msgstr "Ongeldige cursor." -#: relations.py:207 +#: relations.py:246 +#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Ongeldige pk \"{pk_value}\" - object bestaat niet." -#: relations.py:208 +#: relations.py:247 +#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Ongeldig type. Verwacht een pk-waarde, ontving {data_type}." -#: relations.py:240 +#: relations.py:280 msgid "Invalid hyperlink - No URL match." msgstr "Ongeldige hyperlink - Geen overeenkomende URL." -#: relations.py:241 +#: relations.py:281 msgid "Invalid hyperlink - Incorrect URL match." msgstr "Ongeldige hyperlink - Ongeldige URL" -#: relations.py:242 +#: relations.py:282 msgid "Invalid hyperlink - Object does not exist." msgstr "Ongeldige hyperlink - Object bestaat niet." -#: relations.py:243 +#: relations.py:283 +#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Ongeldig type. Verwacht een URL, ontving {data_type}." -#: relations.py:401 +#: relations.py:448 +#, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "Object met {slug_name}={value} bestaat niet." -#: relations.py:402 +#: relations.py:449 msgid "Invalid value." msgstr "Ongeldige waarde." -#: serializers.py:326 +#: schemas/utils.py:32 +msgid "unique integer value" +msgstr "" + +#: schemas/utils.py:34 +msgid "UUID string" +msgstr "" + +#: schemas/utils.py:36 +msgid "unique value" +msgstr "" + +#: schemas/utils.py:38 +#, python-brace-format +msgid "A {value_type} identifying this {name}." +msgstr "" + +#: serializers.py:337 +#, 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:116 -#: templates/rest_framework/base.html:128 +#: templates/rest_framework/base.html:136 +msgid "Extra Actions" +msgstr "" + +#: templates/rest_framework/admin.html:130 +#: templates/rest_framework/base.html:150 msgid "Filters" msgstr "Filters" -#: templates/rest_framework/filters/django_filter.html:2 -#: templates/rest_framework/filters/django_filter_crispyforms.html:4 -msgid "Field filters" -msgstr "Veldfilters" +#: templates/rest_framework/base.html:37 +msgid "navbar" +msgstr "" -#: templates/rest_framework/filters/ordering.html:3 -msgid "Ordering" -msgstr "Sorteer op" +#: templates/rest_framework/base.html:75 +msgid "content" +msgstr "" -#: templates/rest_framework/filters/search.html:2 -msgid "Search" -msgstr "Zoek" +#: templates/rest_framework/base.html:78 +msgid "request form" +msgstr "" -#: templates/rest_framework/horizontal/radio.html:2 -#: templates/rest_framework/inline/radio.html:2 -#: templates/rest_framework/vertical/radio.html:2 +#: templates/rest_framework/base.html:157 +msgid "main content" +msgstr "" + +#: templates/rest_framework/base.html:173 +msgid "request info" +msgstr "" + +#: templates/rest_framework/base.html:177 +msgid "response info" +msgstr "" + +#: templates/rest_framework/horizontal/radio.html:4 +#: templates/rest_framework/inline/radio.html:3 +#: templates/rest_framework/vertical/radio.html:3 msgid "None" msgstr "Geen" -#: templates/rest_framework/horizontal/select_multiple.html:2 -#: templates/rest_framework/inline/select_multiple.html:2 -#: templates/rest_framework/vertical/select_multiple.html:2 +#: templates/rest_framework/horizontal/select_multiple.html:4 +#: templates/rest_framework/inline/select_multiple.html:3 +#: templates/rest_framework/vertical/select_multiple.html:3 msgid "No items to select." msgstr "Geen items geselecteerd." -#: validators.py:43 +#: validators.py:39 msgid "This field must be unique." msgstr "Dit veld moet uniek zijn." -#: validators.py:97 +#: validators.py:89 +#, python-brace-format msgid "The fields {field_names} must make a unique set." msgstr "De velden {field_names} moeten een unieke set zijn." -#: validators.py:245 +#: validators.py:171 +#, python-brace-format +msgid "Surrogate characters are not allowed: U+{code_point:X}." +msgstr "" + +#: validators.py:243 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" date." msgstr "Dit veld moet uniek zijn voor de \"{date_field}\" datum." -#: validators.py:260 +#: validators.py:258 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" month." msgstr "Dit veld moet uniek zijn voor de \"{date_field}\" maand." -#: validators.py:273 +#: validators.py:271 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" year." msgstr "Dit veld moet uniek zijn voor de \"{date_field}\" year." -#: versioning.py:42 +#: versioning.py:40 msgid "Invalid version in \"Accept\" header." msgstr "Ongeldige versie in \"Accept\" header." -#: versioning.py:73 +#: versioning.py:71 msgid "Invalid version in URL path." msgstr "Ongeldige versie in URL-pad." -#: versioning.py:115 +#: versioning.py:116 msgid "Invalid version in URL path. Does not match any version namespace." msgstr "Ongeldige versie in het URL pad, komt niet overeen met een geldige versie namespace" -#: versioning.py:147 +#: versioning.py:148 msgid "Invalid version in hostname." msgstr "Ongeldige versie in hostnaam." -#: versioning.py:169 +#: versioning.py:170 msgid "Invalid version in query parameter." msgstr "Ongeldige versie in query parameter." - -#: views.py:88 -msgid "Permission denied." -msgstr "Toestemming geweigerd." diff --git a/rest_framework/locale/pl/LC_MESSAGES/django.mo b/rest_framework/locale/pl/LC_MESSAGES/django.mo index 436580b3566dd8aeb7a9b70494ada40df969625d..f265186aef076fe1a2729562bc13a39773879530 100644 GIT binary patch delta 2239 zcmYk-e@s8~<%am2K z-0oOyMa|}_XT(kJ-#D0m6bATv;*`d>d9uOWhw_+ahjQfC3rt>#e4B7)c0S&0(=J-;597A?{GE# zjq|ZM-E1RH=d}gOk{ZnTyOe;dZRRQRL6QWmbti(?2!Lz81-NAgEMs4Wd9OADNX>6woS0eRjU8o4`$Iv{p zCs4KVI;F21UqyxVH(Z4Q7STGT95`i7s8H`kt$PNw?#H+uui-9Cim}Qz2EEvYmr%u~ zZFfKf>oJZhzVGod3=+pC9QOSJpJkr1)VuI$NV9ZakO8O0WaTu04Y~e;y-T z-@awg#)*Y1y#;%by0N!VkI#ol^zCOX#2Iw3fJZ_RYC!JAUO}bi15`~+qEa;Fe?E)+ z)bh!fQqzDrdj1bG&UP&>Pg%2^e+s|EHU!Lng2$2YJUzrg@zvi(%d z!*#d}Yj6)Lb)%>a%plix^Ac023rUdfxEA&NK8b1gCZ^-Nn1so6rAoh6 z>HD2@Pw7v8c zdL6xruG}h(YN{Khu!~OJx#4d?9(%Vv#4$q8(Djv5Rk|9rWskTcFPHw%&7+D?`Cjgy zR1K&ucKdU(qErE@=)f=S+pb&e>_;7xEL%-j!);_*jyDVujFryQ(0TLHe42>Eoh4l9xLx0 zh#na{96i=QQ0MH54)r}c;A|T>*njltlTO2les2^x+;^mZs4tqB%^OdOPvwUb)r)@! XByyeh)cEnj#>D4^SCZqemX7}iAokpP delta 2596 zcmZYAS!`5Q9LMoPrz?d5EtIkpE)=jVt+dd^LQ5$KlosqlK@h38?X+HII=AV}P%BD9 z0xCibIsp@qh>4n*@Pfq}H;h1uF9cCACMGTkCPJbQJV-I@;lUIB^Ev0t<(}<- zre|Bf-a7PCcJeVp=_Y0pjXq-z;R~sJP)?^CGY8*63oqh)yos}LY=$v;xDfUK>u?6P z<5=8_Mfegf!E=~~zha#+L*^Ehb#yG@X&J`#_$k(6Ql>FmaSc}B30#5SVgqK4Go}i6 zpuRtbjd%qMaQb*-vatp=!Ddu{$aBb;H>l`^BUpxakbkByD?Zb5)QW3R19f2~zKyH! z2V8@B6O1Xwok*8CjC$?_7UFlPoxG2WaMnb|VSH0hWhrh$z2FtB$B(fZ$4rX9a1~Cc zy*bf#P%C*3wX(O6Ej6Dc+V>ORPhGZ-4-0u3&T_%!PhVsN6^A6n1g>} zGA7aBR7@H^irGjSn7V`w$fITp>ODQEG}?z#@nE8T3bo*Ob2xvU^$j|-g8a$x2dhx+ z7F061SdNELXM7>izK2>s$&~nWjcCz+7B#^`=p6h&cz&Nt%;Xw z|L0L@Mh&K-W+MC9@qhn1xT`CVT?l$2R;6m6VNaUke_=75FnMNoVB8 zuX;PKr9E^xQOP7D_R-OV8u%*mmAQ*LiYc?>TULtNv0bqQSCa00(F~4CA{)1&$#eQi8eYgo#s)JSi)10qxCbF}{gX(N-Nt7GZ9o&MJe0Q__?oyKgE{-?t)TnlNgo zj-w`iKGA<2NfUDylQE0Yxbh|km6Qd@Z$RJiJ<8`*6$pfB(^Di=;+8jhfn z>O8K&JIHaHa%Q0cTTn;lAZsu$<0d?V+wdN0p)IUV+5a96=>^xQu-oPjEW!!w^E#}? z6g+^b_$pT8>!@G0tEjU~XMeS#9%Q#o7+Jh|6Lkb%peFte>fR?adODUZX8$v&)X*^o zHOneO=c^Y!DB1-*wi3Wo8cttm5Bca9U2$_d>q^ouQ%`{ZB zb&q?s_%7_E{tU66V1C}r!TW93c`MtsOIoSQT4D>)Nods@2o+sVm2yI>R$=43^0dys zDbdii(z&Wwgp%bcB8liGbW~dj<%o)p;CIHm@7vWuQ6BN5Xl$a3NF!8qypz0I{KF4Q z&Y^Zb_)F;}3i)9+6Dx=gLif9ks2~;)N*)rDXbpT~@afjQIP*!=drBQ?i@<{k={&?6@JT z%O7(5UB$5@*%hg+(T-jxGJGMs&^Ouc>~y1{h=%TR!gfbc58a&dV^&E;(bCGIrOT|6 zsu`9V#r}wtoosK_Xt?ZS%i``(rt?lWxo#1ft)U#vqE*-Q6?EZ*5da~1@9&~%0 z&gVmy4#vLBn;H8kuWZi4H82@#w?7=Q`rN*LdmuE}YkBMVJ@0zT_$D`Kdkg8mI6N@? z*{tT&iFN&Uz>0d0I{wiE#j(u!wQ1W1M^6Tw-NPH_kN652+)%`|qNAS=Mgs0Y$O+i- T0T{^+L!{^Hobg&+P0mvTK{ diff --git a/rest_framework/locale/pl/LC_MESSAGES/django.po b/rest_framework/locale/pl/LC_MESSAGES/django.po index 611426556..9e8d3eac3 100644 --- a/rest_framework/locale/pl/LC_MESSAGES/django.po +++ b/rest_framework/locale/pl/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Janusz Harkot , 2015 +# Janusz Harkot , 2015 # Piotr Jakimiak , 2015 # m_aciek , 2016 # m_aciek , 2015-2016 @@ -11,9 +11,9 @@ 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: 2017-08-03 14:58+0000\n" -"Last-Translator: m_aciek \n" +"POT-Creation-Date: 2020-10-13 21:45+0200\n" +"PO-Revision-Date: 2020-10-13 19:45+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" @@ -21,40 +21,40 @@ msgstr "" "Language: pl\n" "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n" -#: authentication.py:73 +#: authentication.py:70 msgid "Invalid basic header. No credentials provided." msgstr "Niepoprawny podstawowy nagłówek. Brak danych uwierzytelniających." -#: authentication.py:76 +#: authentication.py:73 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:82 +#: authentication.py:83 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Niepoprawny podstawowy nagłówek. Niewłaściwe kodowanie base64 danych uwierzytelniających." -#: authentication.py:99 +#: authentication.py:101 msgid "Invalid username/password." msgstr "Niepoprawna nazwa użytkownika lub hasło." -#: authentication.py:102 authentication.py:198 +#: authentication.py:104 authentication.py:206 msgid "User inactive or deleted." msgstr "Użytkownik nieaktywny lub usunięty." -#: authentication.py:176 +#: authentication.py:184 msgid "Invalid token header. No credentials provided." msgstr "Niepoprawny nagłówek tokena. Brak danych uwierzytelniających." -#: authentication.py:179 +#: authentication.py:187 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:185 +#: authentication.py:193 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:195 +#: authentication.py:203 msgid "Invalid token." msgstr "Niepoprawny token." @@ -62,382 +62,515 @@ msgstr "Niepoprawny token." msgid "Auth Token" msgstr "Token uwierzytelniający" -#: authtoken/models.py:15 +#: authtoken/models.py:13 msgid "Key" msgstr "Klucz" -#: authtoken/models.py:18 +#: authtoken/models.py:16 msgid "User" msgstr "Użytkownik" -#: authtoken/models.py:20 +#: authtoken/models.py:18 msgid "Created" msgstr "Stworzono" -#: authtoken/models.py:29 +#: authtoken/models.py:27 authtoken/serializers.py:19 msgid "Token" msgstr "Token" -#: authtoken/models.py:30 +#: authtoken/models.py:28 msgid "Tokens" msgstr "Tokeny" -#: authtoken/serializers.py:8 +#: authtoken/serializers.py:9 msgid "Username" msgstr "Nazwa użytkownika" -#: authtoken/serializers.py:9 +#: authtoken/serializers.py:13 msgid "Password" msgstr "Hasło" -#: authtoken/serializers.py:20 -msgid "User account is disabled." -msgstr "Konto użytkownika jest nieaktywne." - -#: authtoken/serializers.py:23 +#: authtoken/serializers.py:35 msgid "Unable to log in with provided credentials." msgstr "Podane dane uwierzytelniające nie pozwalają na zalogowanie." -#: authtoken/serializers.py:26 +#: authtoken/serializers.py:38 msgid "Must include \"username\" and \"password\"." msgstr "Musi zawierać \"username\" i \"password\"." -#: exceptions.py:49 +#: exceptions.py:102 msgid "A server error occurred." msgstr "Wystąpił błąd serwera." -#: exceptions.py:84 +#: exceptions.py:142 +msgid "Invalid input." +msgstr "" + +#: exceptions.py:161 msgid "Malformed request." msgstr "Zniekształcone żądanie." -#: exceptions.py:89 +#: exceptions.py:167 msgid "Incorrect authentication credentials." msgstr "Błędne dane uwierzytelniające." -#: exceptions.py:94 +#: exceptions.py:173 msgid "Authentication credentials were not provided." msgstr "Nie podano danych uwierzytelniających." -#: exceptions.py:99 +#: exceptions.py:179 msgid "You do not have permission to perform this action." msgstr "Nie masz uprawnień, by wykonać tę czynność." -#: exceptions.py:104 views.py:81 +#: exceptions.py:185 msgid "Not found." msgstr "Nie znaleziono." -#: exceptions.py:109 +#: exceptions.py:191 +#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "Niedozwolona metoda \"{method}\"." -#: exceptions.py:120 +#: exceptions.py:202 msgid "Could not satisfy the request Accept header." msgstr "Nie można zaspokoić nagłówka Accept żądania." -#: exceptions.py:132 +#: exceptions.py:212 +#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "Brak wsparcia dla żądanego typu danych \"{media_type}\"." -#: exceptions.py:145 +#: exceptions.py:223 msgid "Request was throttled." msgstr "Żądanie zostało zdławione." -#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 -#: validators.py:181 +#: exceptions.py:224 +#, python-brace-format +msgid "Expected available in {wait} second." +msgstr "" + +#: exceptions.py:225 +#, python-brace-format +msgid "Expected available in {wait} seconds." +msgstr "" + +#: fields.py:316 relations.py:245 relations.py:279 validators.py:90 +#: validators.py:183 msgid "This field is required." msgstr "To pole jest wymagane." -#: fields.py:270 +#: fields.py:317 msgid "This field may not be null." msgstr "Pole nie może mieć wartości null." -#: fields.py:608 fields.py:639 -msgid "\"{input}\" is not a valid boolean." -msgstr "\"{input}\" nie jest poprawną wartością logiczną." +#: fields.py:701 +msgid "Must be a valid boolean." +msgstr "" -#: fields.py:674 +#: fields.py:766 +msgid "Not a valid string." +msgstr "" + +#: fields.py:767 msgid "This field may not be blank." msgstr "To pole nie może być puste." -#: fields.py:675 fields.py:1675 +#: fields.py:768 fields.py:1881 +#, 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." -#: fields.py:676 +#: fields.py:769 +#, python-brace-format msgid "Ensure this field has at least {min_length} characters." msgstr "Upewnij się, że pole ma co najmniej {min_length} znaków." -#: fields.py:713 +#: fields.py:816 msgid "Enter a valid email address." msgstr "Podaj poprawny adres e-mail." -#: fields.py:724 +#: fields.py:827 msgid "This value does not match the required pattern." msgstr "Ta wartość nie pasuje do wymaganego wzorca." -#: fields.py:735 +#: fields.py:838 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:747 +#: fields.py:839 +msgid "" +"Enter a valid \"slug\" consisting of Unicode letters, numbers, underscores, " +"or hyphens." +msgstr "" + +#: fields.py:854 msgid "Enter a valid URL." msgstr "Wprowadź poprawny adres URL." -#: fields.py:760 -msgid "\"{value}\" is not a valid UUID." -msgstr "\"{value}\" nie jest poprawnym UUID." +#: fields.py:867 +msgid "Must be a valid UUID." +msgstr "" -#: fields.py:796 +#: fields.py:903 msgid "Enter a valid IPv4 or IPv6 address." msgstr "Wprowadź poprawny adres IPv4 lub IPv6." -#: fields.py:821 +#: fields.py:931 msgid "A valid integer is required." msgstr "Wymagana poprawna liczba całkowita." -#: fields.py:822 fields.py:857 fields.py:891 +#: fields.py:932 fields.py:969 fields.py:1005 fields.py:1366 +#, python-brace-format 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:823 fields.py:858 fields.py:892 +#: fields.py:933 fields.py:970 fields.py:1006 fields.py:1367 +#, python-brace-format 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:824 fields.py:859 fields.py:896 +#: fields.py:934 fields.py:971 fields.py:1010 msgid "String value too large." msgstr "Za długi ciąg znaków." -#: fields.py:856 fields.py:890 +#: fields.py:968 fields.py:1004 msgid "A valid number is required." msgstr "Wymagana poprawna liczba." -#: fields.py:893 +#: fields.py:1007 +#, python-brace-format 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:894 +#: fields.py:1008 +#, python-brace-format 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:895 +#: fields.py:1009 +#, python-brace-format 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:1025 +#: fields.py:1148 +#, python-brace-format 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:1026 +#: fields.py:1149 msgid "Expected a datetime but got a date." msgstr "Oczekiwano datę z czasem, otrzymano tylko datę." -#: fields.py:1103 +#: fields.py:1150 +#, python-brace-format +msgid "Invalid datetime for the timezone \"{timezone}\"." +msgstr "" + +#: fields.py:1151 +msgid "Datetime value out of range." +msgstr "" + +#: fields.py:1236 +#, 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:1104 +#: fields.py:1237 msgid "Expected a date but got a datetime." msgstr "Oczekiwano daty a otrzymano datę z czasem." -#: fields.py:1170 +#: fields.py:1303 +#, 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:1232 +#: fields.py:1365 +#, 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:1251 fields.py:1300 +#: fields.py:1399 fields.py:1456 +#, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" nie jest poprawnym wyborem." -#: fields.py:1254 relations.py:71 relations.py:441 +#: fields.py:1402 +#, python-brace-format msgid "More than {count} items..." msgstr "Więcej niż {count} elementów..." -#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 +#: fields.py:1457 fields.py:1603 relations.py:485 serializers.py:570 +#, 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:1302 +#: fields.py:1458 msgid "This selection may not be empty." msgstr "Zaznaczenie nie może być puste." -#: fields.py:1339 +#: fields.py:1495 +#, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "\"{input}\" nie jest poprawną ścieżką." -#: fields.py:1358 +#: fields.py:1514 msgid "No file was submitted." msgstr "Nie przesłano pliku." -#: fields.py:1359 +#: fields.py:1515 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:1360 +#: fields.py:1516 msgid "No filename could be determined." msgstr "Nie można określić nazwy pliku." -#: fields.py:1361 +#: fields.py:1517 msgid "The submitted file is empty." msgstr "Przesłany plik jest pusty." -#: fields.py:1362 +#: fields.py:1518 +#, 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:1410 +#: fields.py:1566 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:1449 relations.py:438 serializers.py:525 +#: fields.py:1604 relations.py:486 serializers.py:571 msgid "This list may not be empty." msgstr "Lista nie może być pusta." -#: fields.py:1502 +#: fields.py:1605 +#, python-brace-format +msgid "Ensure this field has at least {min_length} elements." +msgstr "" + +#: fields.py:1606 +#, python-brace-format +msgid "Ensure this field has no more than {max_length} elements." +msgstr "" + +#: fields.py:1682 +#, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "Oczekiwano słownika, ale otrzymano \"{input_type}\"." -#: fields.py:1549 +#: fields.py:1683 +msgid "This dictionary may not be empty." +msgstr "" + +#: fields.py:1755 msgid "Value must be valid JSON." msgstr "Wartość musi być poprawnym ciągiem znaków JSON" -#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 -msgid "Submit" -msgstr "Wyślij" +#: filters.py:49 templates/rest_framework/filters/search.html:2 +msgid "Search" +msgstr "Szukaj" -#: filters.py:336 +#: filters.py:50 +msgid "A search term." +msgstr "" + +#: filters.py:180 templates/rest_framework/filters/ordering.html:3 +msgid "Ordering" +msgstr "Kolejność" + +#: filters.py:181 +msgid "Which field to use when ordering the results." +msgstr "" + +#: filters.py:287 msgid "ascending" msgstr "rosnąco" -#: filters.py:337 +#: filters.py:288 msgid "descending" msgstr "malejąco" -#: pagination.py:193 +#: pagination.py:174 +msgid "A page number within the paginated result set." +msgstr "" + +#: pagination.py:179 pagination.py:372 pagination.py:590 +msgid "Number of results to return per page." +msgstr "" + +#: pagination.py:189 msgid "Invalid page." msgstr "Niepoprawna strona." -#: pagination.py:427 +#: pagination.py:374 +msgid "The initial index from which to return the results." +msgstr "" + +#: pagination.py:581 +msgid "The pagination cursor value." +msgstr "" + +#: pagination.py:583 msgid "Invalid cursor" msgstr "Niepoprawny wskaźnik" -#: relations.py:207 +#: relations.py:246 +#, 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 +#: relations.py:247 +#, 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:240 +#: relations.py:280 msgid "Invalid hyperlink - No URL match." msgstr "Błędny hyperlink - nie znaleziono pasującego adresu URL." -#: relations.py:241 +#: relations.py:281 msgid "Invalid hyperlink - Incorrect URL match." msgstr "Błędny hyperlink - błędne dopasowanie adresu URL." -#: relations.py:242 +#: relations.py:282 msgid "Invalid hyperlink - Object does not exist." msgstr "Błędny hyperlink - obiekt nie istnieje." -#: relations.py:243 +#: relations.py:283 +#, 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:401 +#: relations.py:448 +#, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "Obiekt z polem {slug_name}={value} nie istnieje" -#: relations.py:402 +#: relations.py:449 msgid "Invalid value." msgstr "Niepoprawna wartość." -#: serializers.py:326 +#: schemas/utils.py:32 +msgid "unique integer value" +msgstr "" + +#: schemas/utils.py:34 +msgid "UUID string" +msgstr "" + +#: schemas/utils.py:36 +msgid "unique value" +msgstr "" + +#: schemas/utils.py:38 +#, python-brace-format +msgid "A {value_type} identifying this {name}." +msgstr "" + +#: serializers.py:337 +#, 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:116 -#: templates/rest_framework/base.html:128 +#: templates/rest_framework/base.html:136 +msgid "Extra Actions" +msgstr "" + +#: templates/rest_framework/admin.html:130 +#: templates/rest_framework/base.html:150 msgid "Filters" msgstr "Filtry" -#: templates/rest_framework/filters/django_filter.html:2 -#: templates/rest_framework/filters/django_filter_crispyforms.html:4 -msgid "Field filters" -msgstr "Pola filtrów" +#: templates/rest_framework/base.html:37 +msgid "navbar" +msgstr "" -#: templates/rest_framework/filters/ordering.html:3 -msgid "Ordering" -msgstr "Kolejność" +#: templates/rest_framework/base.html:75 +msgid "content" +msgstr "" -#: templates/rest_framework/filters/search.html:2 -msgid "Search" -msgstr "Szukaj" +#: templates/rest_framework/base.html:78 +msgid "request form" +msgstr "" -#: templates/rest_framework/horizontal/radio.html:2 -#: templates/rest_framework/inline/radio.html:2 -#: templates/rest_framework/vertical/radio.html:2 +#: templates/rest_framework/base.html:157 +msgid "main content" +msgstr "" + +#: templates/rest_framework/base.html:173 +msgid "request info" +msgstr "" + +#: templates/rest_framework/base.html:177 +msgid "response info" +msgstr "" + +#: templates/rest_framework/horizontal/radio.html:4 +#: templates/rest_framework/inline/radio.html:3 +#: templates/rest_framework/vertical/radio.html:3 msgid "None" 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 +#: templates/rest_framework/horizontal/select_multiple.html:4 +#: templates/rest_framework/inline/select_multiple.html:3 +#: templates/rest_framework/vertical/select_multiple.html:3 msgid "No items to select." msgstr "Nie wybrano wartości." -#: validators.py:43 +#: validators.py:39 msgid "This field must be unique." msgstr "Wartość dla tego pola musi być unikalna." -#: validators.py:97 +#: validators.py:89 +#, python-brace-format msgid "The fields {field_names} must make a unique set." msgstr "Pola {field_names} muszą tworzyć unikalny zestaw." -#: validators.py:245 +#: validators.py:171 +#, python-brace-format +msgid "Surrogate characters are not allowed: U+{code_point:X}." +msgstr "" + +#: validators.py:243 +#, python-brace-format 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:260 +#: validators.py:258 +#, python-brace-format 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:273 +#: validators.py:271 +#, python-brace-format 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}\"." -#: versioning.py:42 +#: versioning.py:40 msgid "Invalid version in \"Accept\" header." msgstr "Błędna wersja w nagłówku \"Accept\"." -#: versioning.py:73 +#: versioning.py:71 msgid "Invalid version in URL path." msgstr "Błędna wersja w ścieżce URL." -#: versioning.py:115 +#: versioning.py:116 msgid "Invalid version in URL path. Does not match any version namespace." msgstr "Niepoprawna wersja w ścieżce URL. Nie pasuje do przestrzeni nazw żadnej wersji." -#: versioning.py:147 +#: versioning.py:148 msgid "Invalid version in hostname." msgstr "Błędna wersja w nazwie hosta." -#: versioning.py:169 +#: versioning.py:170 msgid "Invalid version in query parameter." msgstr "Błędna wersja w parametrach zapytania." - -#: views.py:88 -msgid "Permission denied." -msgstr "Brak uprawnień." diff --git a/rest_framework/locale/pt/LC_MESSAGES/django.mo b/rest_framework/locale/pt/LC_MESSAGES/django.mo index c88991bfa6fadadcefa6b6f09f12214ec7c5ff1d..653cce97ebb8df40090f661e659d22b6d322575d 100644 GIT binary patch literal 10382 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 diff --git a/rest_framework/locale/pt/LC_MESSAGES/django.po b/rest_framework/locale/pt/LC_MESSAGES/django.po index 9f1de1938..4cdf2bc4f 100644 --- a/rest_framework/locale/pt/LC_MESSAGES/django.po +++ b/rest_framework/locale/pt/LC_MESSAGES/django.po @@ -3,13 +3,18 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Craig Blaszczyk , 2015 +# Ederson Mota Pereira , 2015 +# Filipe Rinaldi , 2015 +# Hugo Leonardo Chalhoub Mendonça , 2015 +# Jonatas Baldin , 2017 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" +"POT-Creation-Date: 2020-10-13 21:45+0200\n" +"PO-Revision-Date: 2020-10-13 19:45+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,423 +22,556 @@ msgstr "" "Language: pt\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:73 +#: authentication.py:70 msgid "Invalid basic header. No credentials provided." -msgstr "" +msgstr "Cabeçalho básico inválido. Credenciais não fornecidas." -#: authentication.py:76 +#: authentication.py:73 msgid "Invalid basic header. Credentials string should not contain spaces." -msgstr "" +msgstr "Cabeçalho básico inválido. String de credenciais não deve incluir espaços." -#: authentication.py:82 +#: authentication.py:83 msgid "Invalid basic header. Credentials not correctly base64 encoded." -msgstr "" +msgstr "Cabeçalho básico inválido. Credenciais codificadas em base64 incorretamente." -#: authentication.py:99 +#: authentication.py:101 msgid "Invalid username/password." -msgstr "" +msgstr "Usuário ou senha inválido." -#: authentication.py:102 authentication.py:198 +#: authentication.py:104 authentication.py:206 msgid "User inactive or deleted." -msgstr "" +msgstr "Usuário inativo ou removido." -#: authentication.py:176 +#: authentication.py:184 msgid "Invalid token header. No credentials provided." -msgstr "" +msgstr "Cabeçalho de token inválido. Credenciais não fornecidas." -#: authentication.py:179 +#: authentication.py:187 msgid "Invalid token header. Token string should not contain spaces." -msgstr "" +msgstr "Cabeçalho de token inválido. String de token não deve incluir espaços." -#: authentication.py:185 +#: authentication.py:193 msgid "" "Invalid token header. Token string should not contain invalid characters." -msgstr "" +msgstr "Cabeçalho de token inválido. String de token não deve possuir caracteres inválidos." -#: authentication.py:195 +#: authentication.py:203 msgid "Invalid token." -msgstr "" +msgstr "Token inválido." #: authtoken/apps.py:7 msgid "Auth Token" -msgstr "" +msgstr "Token de autenticação" -#: authtoken/models.py:15 +#: authtoken/models.py:13 msgid "Key" -msgstr "" +msgstr "Chave" + +#: authtoken/models.py:16 +msgid "User" +msgstr "Usuário" #: authtoken/models.py:18 -msgid "User" -msgstr "" - -#: authtoken/models.py:20 msgid "Created" -msgstr "" +msgstr "Criado" -#: authtoken/models.py:29 +#: authtoken/models.py:27 authtoken/serializers.py:19 msgid "Token" -msgstr "" +msgstr "Token" -#: authtoken/models.py:30 +#: authtoken/models.py:28 msgid "Tokens" -msgstr "" - -#: authtoken/serializers.py:8 -msgid "Username" -msgstr "" +msgstr "Tokens" #: authtoken/serializers.py:9 +msgid "Username" +msgstr "Nome do usuário" + +#: authtoken/serializers.py:13 msgid "Password" -msgstr "" +msgstr "Senha" -#: authtoken/serializers.py:20 -msgid "User account is disabled." -msgstr "" - -#: authtoken/serializers.py:23 +#: authtoken/serializers.py:35 msgid "Unable to log in with provided credentials." -msgstr "" +msgstr "Impossível fazer login com as credenciais fornecidas." -#: authtoken/serializers.py:26 +#: authtoken/serializers.py:38 msgid "Must include \"username\" and \"password\"." -msgstr "" +msgstr "Obrigatório incluir \"usuário\" e \"senha\"." -#: exceptions.py:49 +#: exceptions.py:102 msgid "A server error occurred." +msgstr "Ocorreu um erro de servidor." + +#: exceptions.py:142 +msgid "Invalid input." msgstr "" -#: exceptions.py:84 +#: exceptions.py:161 msgid "Malformed request." -msgstr "" +msgstr "Pedido malformado." -#: exceptions.py:89 +#: exceptions.py:167 msgid "Incorrect authentication credentials." -msgstr "" +msgstr "Credenciais de autenticação incorretas." -#: exceptions.py:94 +#: exceptions.py:173 msgid "Authentication credentials were not provided." -msgstr "" +msgstr "As credenciais de autenticação não foram fornecidas." -#: exceptions.py:99 +#: exceptions.py:179 msgid "You do not have permission to perform this action." -msgstr "" +msgstr "Você não tem permissão para executar essa ação." -#: exceptions.py:104 views.py:81 +#: exceptions.py:185 msgid "Not found." -msgstr "" +msgstr "Não encontrado." -#: exceptions.py:109 +#: exceptions.py:191 +#, python-brace-format msgid "Method \"{method}\" not allowed." -msgstr "" +msgstr "Método \"{method}\" não é permitido." -#: exceptions.py:120 +#: exceptions.py:202 msgid "Could not satisfy the request Accept header." -msgstr "" +msgstr "Não foi possível satisfazer a requisição do cabeçalho Accept." -#: exceptions.py:132 +#: exceptions.py:212 +#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." -msgstr "" +msgstr "Tipo de mídia \"{media_type}\" no pedido não é suportado." -#: exceptions.py:145 +#: exceptions.py:223 msgid "Request was throttled." +msgstr "Pedido foi limitado." + +#: exceptions.py:224 +#, python-brace-format +msgid "Expected available in {wait} second." msgstr "" -#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 -#: validators.py:181 +#: exceptions.py:225 +#, python-brace-format +msgid "Expected available in {wait} seconds." +msgstr "" + +#: fields.py:316 relations.py:245 relations.py:279 validators.py:90 +#: validators.py:183 msgid "This field is required." -msgstr "" +msgstr "Este campo é obrigatório." -#: fields.py:270 +#: fields.py:317 msgid "This field may not be null." +msgstr "Este campo não pode ser nulo." + +#: fields.py:701 +msgid "Must be a valid boolean." msgstr "" -#: fields.py:608 fields.py:639 -msgid "\"{input}\" is not a valid boolean." +#: fields.py:766 +msgid "Not a valid string." msgstr "" -#: fields.py:674 +#: fields.py:767 msgid "This field may not be blank." -msgstr "" +msgstr "Este campo não pode ser em branco." -#: fields.py:675 fields.py:1675 +#: fields.py:768 fields.py:1881 +#, python-brace-format msgid "Ensure this field has no more than {max_length} characters." -msgstr "" +msgstr "Certifique-se de que este campo não tenha mais de {max_length} caracteres." -#: fields.py:676 +#: fields.py:769 +#, python-brace-format msgid "Ensure this field has at least {min_length} characters." -msgstr "" +msgstr "Certifique-se de que este campo tenha mais de {min_length} caracteres." -#: fields.py:713 +#: fields.py:816 msgid "Enter a valid email address." -msgstr "" +msgstr "Insira um endereço de email válido." -#: fields.py:724 +#: fields.py:827 msgid "This value does not match the required pattern." -msgstr "" +msgstr "Este valor não corresponde ao padrão exigido." -#: fields.py:735 +#: fields.py:838 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:839 +msgid "" +"Enter a valid \"slug\" consisting of Unicode letters, numbers, underscores, " +"or hyphens." msgstr "" -#: fields.py:747 +#: fields.py:854 msgid "Enter a valid URL." +msgstr "Entrar um URL válido." + +#: fields.py:867 +msgid "Must be a valid UUID." msgstr "" -#: fields.py:760 -msgid "\"{value}\" is not a valid UUID." -msgstr "" - -#: fields.py:796 +#: fields.py:903 msgid "Enter a valid IPv4 or IPv6 address." -msgstr "" +msgstr "Informe um endereço IPv4 ou IPv6 válido." -#: fields.py:821 +#: fields.py:931 msgid "A valid integer is required." -msgstr "" +msgstr "Um número inteiro válido é exigido." -#: fields.py:822 fields.py:857 fields.py:891 +#: fields.py:932 fields.py:969 fields.py:1005 fields.py:1366 +#, python-brace-format msgid "Ensure this value is less than or equal to {max_value}." -msgstr "" +msgstr "Certifique-se de que este valor seja inferior ou igual a {max_value}." -#: fields.py:823 fields.py:858 fields.py:892 +#: fields.py:933 fields.py:970 fields.py:1006 fields.py:1367 +#, python-brace-format msgid "Ensure this value is greater than or equal to {min_value}." -msgstr "" +msgstr "Certifque-se de que este valor seja maior ou igual a {min_value}." -#: fields.py:824 fields.py:859 fields.py:896 +#: fields.py:934 fields.py:971 fields.py:1010 msgid "String value too large." -msgstr "" +msgstr "Valor da string é muito grande." -#: fields.py:856 fields.py:890 +#: fields.py:968 fields.py:1004 msgid "A valid number is required." -msgstr "" +msgstr "Um número válido é necessário." -#: fields.py:893 +#: fields.py:1007 +#, python-brace-format msgid "Ensure that there are no more than {max_digits} digits in total." -msgstr "" +msgstr "Certifique-se de que não haja mais de {max_digits} dígitos no total." -#: fields.py:894 +#: fields.py:1008 +#, python-brace-format msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." -msgstr "" +msgstr "Certifique-se de que não haja mais de {max_decimal_places} casas decimais." -#: fields.py:895 +#: fields.py:1009 +#, python-brace-format msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." -msgstr "" +msgstr "Certifique-se de que não haja mais de {max_whole_digits} dígitos antes do ponto decimal." -#: fields.py:1025 +#: fields.py:1148 +#, python-brace-format msgid "Datetime has wrong format. Use one of these formats instead: {format}." -msgstr "" +msgstr "Formato inválido para data e hora. Use um dos formatos a seguir: {format}." -#: fields.py:1026 +#: fields.py:1149 msgid "Expected a datetime but got a date." +msgstr "Necessário uma data e hora mas recebeu uma data." + +#: fields.py:1150 +#, python-brace-format +msgid "Invalid datetime for the timezone \"{timezone}\"." msgstr "" -#: fields.py:1103 +#: fields.py:1151 +msgid "Datetime value out of range." +msgstr "" + +#: fields.py:1236 +#, python-brace-format msgid "Date has wrong format. Use one of these formats instead: {format}." -msgstr "" +msgstr "Formato inválido para data. Use um dos formatos a seguir: {format}." -#: fields.py:1104 +#: fields.py:1237 msgid "Expected a date but got a datetime." -msgstr "" +msgstr "Necessário uma data mas recebeu uma data e hora." -#: fields.py:1170 +#: fields.py:1303 +#, python-brace-format msgid "Time has wrong format. Use one of these formats instead: {format}." -msgstr "" +msgstr "Formato inválido para Tempo. Use um dos formatos a seguir: {format}." -#: fields.py:1232 +#: fields.py:1365 +#, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." -msgstr "" +msgstr "Formato inválido para Duração. Use um dos formatos a seguir: {format}." -#: fields.py:1251 fields.py:1300 +#: fields.py:1399 fields.py:1456 +#, python-brace-format msgid "\"{input}\" is not a valid choice." -msgstr "" +msgstr "\"{input}\" não é um escolha válido." -#: fields.py:1254 relations.py:71 relations.py:441 +#: fields.py:1402 +#, python-brace-format msgid "More than {count} items..." -msgstr "" +msgstr "Mais de {count} itens..." -#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 +#: fields.py:1457 fields.py:1603 relations.py:485 serializers.py:570 +#, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." -msgstr "" +msgstr "Necessário uma lista de itens, mas recebeu tipo \"{input_type}\"." -#: fields.py:1302 +#: fields.py:1458 msgid "This selection may not be empty." -msgstr "" +msgstr "Esta seleção não pode estar vazia." -#: fields.py:1339 +#: fields.py:1495 +#, python-brace-format msgid "\"{input}\" is not a valid path choice." -msgstr "" +msgstr "\"{input}\" não é uma escolha válida para um caminho." -#: fields.py:1358 +#: fields.py:1514 msgid "No file was submitted." -msgstr "" +msgstr "Nenhum arquivo foi submetido." -#: fields.py:1359 +#: fields.py:1515 msgid "" "The submitted data was not a file. Check the encoding type on the form." -msgstr "" +msgstr "O dado submetido não é um arquivo. Certifique-se do tipo de codificação no formulário." -#: fields.py:1360 +#: fields.py:1516 msgid "No filename could be determined." -msgstr "" +msgstr "Nome do arquivo não pode ser determinado." -#: fields.py:1361 +#: fields.py:1517 msgid "The submitted file is empty." -msgstr "" +msgstr "O arquivo submetido está vázio." -#: fields.py:1362 +#: fields.py:1518 +#, python-brace-format msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." -msgstr "" +msgstr "Certifique-se de que o nome do arquivo tem menos de {max_length} caracteres (tem {length})." -#: fields.py:1410 +#: fields.py:1566 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." -msgstr "" +msgstr "Fazer upload de uma imagem válida. O arquivo enviado não é um arquivo de imagem ou está corrompido." -#: fields.py:1449 relations.py:438 serializers.py:525 +#: fields.py:1604 relations.py:486 serializers.py:571 msgid "This list may not be empty." +msgstr "Esta lista não pode estar vazia." + +#: fields.py:1605 +#, python-brace-format +msgid "Ensure this field has at least {min_length} elements." msgstr "" -#: fields.py:1502 +#: fields.py:1606 +#, python-brace-format +msgid "Ensure this field has no more than {max_length} elements." +msgstr "" + +#: fields.py:1682 +#, 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:1683 +msgid "This dictionary may not be empty." msgstr "" -#: fields.py:1549 +#: fields.py:1755 msgid "Value must be valid JSON." +msgstr "Valor devo ser JSON válido." + +#: filters.py:49 templates/rest_framework/filters/search.html:2 +msgid "Search" +msgstr "Buscar" + +#: filters.py:50 +msgid "A search term." msgstr "" -#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 -msgid "Submit" +#: filters.py:180 templates/rest_framework/filters/ordering.html:3 +msgid "Ordering" +msgstr "Ordenando" + +#: filters.py:181 +msgid "Which field to use when ordering the results." msgstr "" -#: filters.py:336 +#: filters.py:287 msgid "ascending" -msgstr "" +msgstr "ascendente" -#: filters.py:337 +#: filters.py:288 msgid "descending" +msgstr "descendente" + +#: pagination.py:174 +msgid "A page number within the paginated result set." msgstr "" -#: pagination.py:193 +#: pagination.py:179 pagination.py:372 pagination.py:590 +msgid "Number of results to return per page." +msgstr "" + +#: pagination.py:189 msgid "Invalid page." +msgstr "Página inválida." + +#: pagination.py:374 +msgid "The initial index from which to return the results." msgstr "" -#: pagination.py:427 +#: pagination.py:581 +msgid "The pagination cursor value." +msgstr "" + +#: pagination.py:583 msgid "Invalid cursor" -msgstr "" +msgstr "Cursor inválido" -#: relations.py:207 +#: relations.py:246 +#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." -msgstr "" +msgstr "Pk inválido \"{pk_value}\" - objeto não existe." -#: relations.py:208 +#: relations.py:247 +#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." -msgstr "" +msgstr "Tipo incorreto. Esperado valor pk, recebeu {data_type}." -#: relations.py:240 +#: relations.py:280 msgid "Invalid hyperlink - No URL match." -msgstr "" +msgstr "Hyperlink inválido - Sem combinação para a URL." -#: relations.py:241 +#: relations.py:281 msgid "Invalid hyperlink - Incorrect URL match." -msgstr "" +msgstr "Hyperlink inválido - Combinação URL incorreta." -#: relations.py:242 +#: relations.py:282 msgid "Invalid hyperlink - Object does not exist." -msgstr "" +msgstr "Hyperlink inválido - Objeto não existe." -#: relations.py:243 +#: relations.py:283 +#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." -msgstr "" +msgstr "Tipo incorreto. Necessário string URL, recebeu {data_type}." -#: relations.py:401 +#: relations.py:448 +#, python-brace-format msgid "Object with {slug_name}={value} does not exist." -msgstr "" +msgstr "Objeto com {slug_name}={value} não existe." -#: relations.py:402 +#: relations.py:449 msgid "Invalid value." +msgstr "Valor inválido." + +#: schemas/utils.py:32 +msgid "unique integer value" msgstr "" -#: serializers.py:326 -msgid "Invalid data. Expected a dictionary, but got {datatype}." +#: schemas/utils.py:34 +msgid "UUID string" msgstr "" +#: schemas/utils.py:36 +msgid "unique value" +msgstr "" + +#: schemas/utils.py:38 +#, python-brace-format +msgid "A {value_type} identifying this {name}." +msgstr "" + +#: serializers.py:337 +#, 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:116 -#: templates/rest_framework/base.html:128 +#: templates/rest_framework/base.html:136 +msgid "Extra Actions" +msgstr "" + +#: templates/rest_framework/admin.html:130 +#: templates/rest_framework/base.html:150 msgid "Filters" +msgstr "Filtra" + +#: templates/rest_framework/base.html:37 +msgid "navbar" msgstr "" -#: templates/rest_framework/filters/django_filter.html:2 -#: templates/rest_framework/filters/django_filter_crispyforms.html:4 -msgid "Field filters" +#: templates/rest_framework/base.html:75 +msgid "content" msgstr "" -#: templates/rest_framework/filters/ordering.html:3 -msgid "Ordering" +#: templates/rest_framework/base.html:78 +msgid "request form" msgstr "" -#: templates/rest_framework/filters/search.html:2 -msgid "Search" +#: templates/rest_framework/base.html:157 +msgid "main content" msgstr "" -#: templates/rest_framework/horizontal/radio.html:2 -#: templates/rest_framework/inline/radio.html:2 -#: templates/rest_framework/vertical/radio.html:2 +#: templates/rest_framework/base.html:173 +msgid "request info" +msgstr "" + +#: templates/rest_framework/base.html:177 +msgid "response info" +msgstr "" + +#: templates/rest_framework/horizontal/radio.html:4 +#: templates/rest_framework/inline/radio.html:3 +#: templates/rest_framework/vertical/radio.html:3 msgid "None" -msgstr "" +msgstr "Nenhum(a/as)" -#: templates/rest_framework/horizontal/select_multiple.html:2 -#: templates/rest_framework/inline/select_multiple.html:2 -#: templates/rest_framework/vertical/select_multiple.html:2 +#: templates/rest_framework/horizontal/select_multiple.html:4 +#: templates/rest_framework/inline/select_multiple.html:3 +#: templates/rest_framework/vertical/select_multiple.html:3 msgid "No items to select." -msgstr "" +msgstr "Nenhum item para escholher." -#: validators.py:43 +#: validators.py:39 msgid "This field must be unique." -msgstr "" +msgstr "Esse campo deve ser único." -#: validators.py:97 +#: validators.py:89 +#, python-brace-format msgid "The fields {field_names} must make a unique set." +msgstr "Os campos {field_names} devem criar um set único." + +#: validators.py:171 +#, python-brace-format +msgid "Surrogate characters are not allowed: U+{code_point:X}." msgstr "" -#: validators.py:245 +#: validators.py:243 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" date." -msgstr "" +msgstr "O campo \"{date_field}\" deve ser único para a data." -#: validators.py:260 +#: validators.py:258 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" month." -msgstr "" +msgstr "O campo \"{date_field}\" deve ser único para o mês." -#: validators.py:273 +#: validators.py:271 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" year." -msgstr "" +msgstr "O campo \"{date_field}\" deve ser único para o ano." -#: versioning.py:42 +#: versioning.py:40 msgid "Invalid version in \"Accept\" header." -msgstr "" +msgstr "Versão inválida no cabeçalho \"Accept\"." -#: versioning.py:73 +#: versioning.py:71 msgid "Invalid version in URL path." -msgstr "" +msgstr "Versão inválida no caminho de URL." -#: versioning.py:115 +#: versioning.py:116 msgid "Invalid version in URL path. Does not match any version namespace." -msgstr "" +msgstr "Versão inválida no caminho da URL. Não corresponde a nenhuma versão do namespace." -#: versioning.py:147 +#: versioning.py:148 msgid "Invalid version in hostname." -msgstr "" +msgstr "Versão inválida no hostname." -#: versioning.py:169 +#: versioning.py:170 msgid "Invalid version in query parameter." -msgstr "" - -#: views.py:88 -msgid "Permission denied." -msgstr "" +msgstr "Versão inválida no parâmetro de query." diff --git a/rest_framework/locale/pt_BR/LC_MESSAGES/django.mo b/rest_framework/locale/pt_BR/LC_MESSAGES/django.mo index 008629823ddf0a55141d9d8e1bcae86c9d7189a6..5a6e3788e651dfed18d4d5cb4efe1ab658b6ed59 100644 GIT binary patch delta 2242 zcmYk-YfRO39LMqR;cyU+`6Yy@8t1JZdR_bFYJ| zo#*}N<^B|E1s=r>ID=~Mbu7b=F%N&nn4d}--_FJ|OvOfI)vX1$Vi&TF_L%FFs0LtMA;%gYdE2u5~12y0#8rSm?)b&wR&Ya0+{p+c`%8le+qptIFoDuIseeogm<4M$j zUO}zE0{XBp*BM9&ZsEEdYj6NZ@C0gN-(o&4q9*iDF6*xw=}e~gY`LCxe7?8TH~$9@cPeICg}`wBJFpHLmu_?;C!h-&Y7BpvJn)D~XDM*25z z2}gt*&De=Apc?!hnT-AJUau;38Y;n?x!;9@cmx@nU3H%?qH-dOBcl#;Q7cf6?1uHA zR%jH9bpD@pZ(KrF)xJdD4R!-HkW_k8Qsts@qZQRb7m|P0huYf*(2oyeEuKMb)n#N3 zR>UaOelyavg>eJ@Ta3y!Jm>m3s(~~zODoWTYG4R?WYef6JcsT08Tv4X!<~i&s3a{x zme_`I6rV$7{a?tgn~%3uOf%d_MIF^)9rmHJ{{*hUXV8OQqMOjNE|oo0I8Di-x13gJ zfKbO;HI)WJTckWXKJ_fy+jAWX-}5De6|po>R)@Sj8q|4tS4D>_R_5;e_*udyNP1=W)&)- z!tS+>S+85)iP}~M5yERyi9tMtUf`Fj&r^MCZEL?;sO V7ys&uU)j`{@NGWkjlWoN_Fw;|*lYj* delta 2599 zcmZYATWl0n9LMp~%l1MkmqKYlTZXnk!M3zuTPVdTz_*{^WNhxn~UR0P!fXDaV*ocr1?(+S>)j%)|3&;W*C6J6MU63XLhpMX29* z;v={ZC*e`7$LFyQFJnIbfStx9&ChgtI8evgGKTB$8m__YB4c)77q;SAT#2`FBTkuY zOdAfMzCVMTa007wPO&j1*p8au7SwUqGil7LbacTh*o?m+f2MXyW~MEujN4H+3gU8n z3p?;@?85S?#x&qwTd7IE;d=NFkQ|PS-1{gm?O(>h$J%)v|SpOzE%^cW` z!>CMe;B36*`#mbt2mUyRbe1x%KU<-z^3NN4%yp^Q0 zfXRtb-~|JMOMK&YL6RnCGN+aIEEYW zKI(cMJR&4*`cUH$)OAi^4fSU((%H^|2_z{~U6VPX6IC=})D5Gkl{krdGX1C<+o+m|Vj;eX0q$=u($NjxM+(~9KrP{yXyLd1_%GB-1QulW za5=IV<~7s}uOK;?+o(kTz-3s)=uaJ^WV0Hf!-O_{=sKZb;E<Qp4=q0AALsR8?t?H=b9!kWIS6NQXawBoewhr52Cuj{uBH@tjHl%6` z)>l*=WVT;DqC$Xe{j(&kdCHg`y))EapU9D;RQ}P_QBO zVo7V>w#49w6HnhPsm+;b4-G{UZd|txIx%}Ntds7Pelw-1wZ3U-ePfH&xT39jS!!Zd zS+tw_5>6+|e+|sAnX5Hqj~t4a9+HXLrYrSlc}4oU%G-fyUOxJ< z8ydEQc0;PKraiCQJ?z-g^h-5Ia^`kL+_-mzL@Y6WKI%lc8fiIUC+?k}Tl>a8W`R3^ diff --git a/rest_framework/locale/pt_BR/LC_MESSAGES/django.po b/rest_framework/locale/pt_BR/LC_MESSAGES/django.po index 9489f20a0..40651552d 100644 --- a/rest_framework/locale/pt_BR/LC_MESSAGES/django.po +++ b/rest_framework/locale/pt_BR/LC_MESSAGES/django.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Cloves Oliveira , 2020 # Craig Blaszczyk , 2015 # Ederson Mota Pereira , 2015 # Filipe Rinaldi , 2015 @@ -12,9 +13,9 @@ 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: 2017-12-06 09:53+0000\n" -"Last-Translator: Jonatas Baldin \n" +"POT-Creation-Date: 2020-10-13 21:45+0200\n" +"PO-Revision-Date: 2020-10-13 19:45+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" @@ -22,40 +23,40 @@ msgstr "" "Language: pt_BR\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: authentication.py:73 +#: authentication.py:70 msgid "Invalid basic header. No credentials provided." msgstr "Cabeçalho básico inválido. Credenciais não fornecidas." -#: authentication.py:76 +#: authentication.py:73 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:82 +#: authentication.py:83 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Cabeçalho básico inválido. Credenciais codificadas em base64 incorretamente." -#: authentication.py:99 +#: authentication.py:101 msgid "Invalid username/password." msgstr "Usuário ou senha inválido." -#: authentication.py:102 authentication.py:198 +#: authentication.py:104 authentication.py:206 msgid "User inactive or deleted." msgstr "Usuário inativo ou removido." -#: authentication.py:176 +#: authentication.py:184 msgid "Invalid token header. No credentials provided." msgstr "Cabeçalho de token inválido. Credenciais não fornecidas." -#: authentication.py:179 +#: authentication.py:187 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:185 +#: authentication.py:193 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:195 +#: authentication.py:203 msgid "Invalid token." msgstr "Token inválido." @@ -63,382 +64,515 @@ msgstr "Token inválido." msgid "Auth Token" msgstr "Token de autenticação" -#: authtoken/models.py:15 +#: authtoken/models.py:13 msgid "Key" msgstr "Chave" -#: authtoken/models.py:18 +#: authtoken/models.py:16 msgid "User" msgstr "Usuário" -#: authtoken/models.py:20 +#: authtoken/models.py:18 msgid "Created" msgstr "Criado" -#: authtoken/models.py:29 +#: authtoken/models.py:27 authtoken/serializers.py:19 msgid "Token" msgstr "Token" -#: authtoken/models.py:30 +#: authtoken/models.py:28 msgid "Tokens" msgstr "Tokens" -#: authtoken/serializers.py:8 +#: authtoken/serializers.py:9 msgid "Username" msgstr "Nome do usuário" -#: authtoken/serializers.py:9 +#: authtoken/serializers.py:13 msgid "Password" msgstr "Senha" -#: authtoken/serializers.py:20 -msgid "User account is disabled." -msgstr "Conta de usuário desabilitada." - -#: authtoken/serializers.py:23 +#: authtoken/serializers.py:35 msgid "Unable to log in with provided credentials." msgstr "Impossível fazer login com as credenciais fornecidas." -#: authtoken/serializers.py:26 +#: authtoken/serializers.py:38 msgid "Must include \"username\" and \"password\"." msgstr "Obrigatório incluir \"usuário\" e \"senha\"." -#: exceptions.py:49 +#: exceptions.py:102 msgid "A server error occurred." msgstr "Ocorreu um erro de servidor." -#: exceptions.py:84 +#: exceptions.py:142 +msgid "Invalid input." +msgstr "" + +#: exceptions.py:161 msgid "Malformed request." msgstr "Pedido malformado." -#: exceptions.py:89 +#: exceptions.py:167 msgid "Incorrect authentication credentials." msgstr "Credenciais de autenticação incorretas." -#: exceptions.py:94 +#: exceptions.py:173 msgid "Authentication credentials were not provided." msgstr "As credenciais de autenticação não foram fornecidas." -#: exceptions.py:99 +#: exceptions.py:179 msgid "You do not have permission to perform this action." msgstr "Você não tem permissão para executar essa ação." -#: exceptions.py:104 views.py:81 +#: exceptions.py:185 msgid "Not found." msgstr "Não encontrado." -#: exceptions.py:109 +#: exceptions.py:191 +#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "Método \"{method}\" não é permitido." -#: exceptions.py:120 +#: exceptions.py:202 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 +#: exceptions.py:212 +#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "Tipo de mídia \"{media_type}\" no pedido não é suportado." -#: exceptions.py:145 +#: exceptions.py:223 msgid "Request was throttled." msgstr "Pedido foi limitado." -#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 -#: validators.py:181 +#: exceptions.py:224 +#, python-brace-format +msgid "Expected available in {wait} second." +msgstr "" + +#: exceptions.py:225 +#, python-brace-format +msgid "Expected available in {wait} seconds." +msgstr "" + +#: fields.py:316 relations.py:245 relations.py:279 validators.py:90 +#: validators.py:183 msgid "This field is required." msgstr "Este campo é obrigatório." -#: fields.py:270 +#: fields.py:317 msgid "This field may not be null." msgstr "Este campo não pode ser nulo." -#: fields.py:608 fields.py:639 -msgid "\"{input}\" is not a valid boolean." -msgstr "\"{input}\" não é um valor boleano válido." +#: fields.py:701 +msgid "Must be a valid boolean." +msgstr "" -#: fields.py:674 +#: fields.py:766 +msgid "Not a valid string." +msgstr "" + +#: fields.py:767 msgid "This field may not be blank." msgstr "Este campo não pode ser em branco." -#: fields.py:675 fields.py:1675 +#: fields.py:768 fields.py:1881 +#, 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." -#: fields.py:676 +#: fields.py:769 +#, python-brace-format 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:713 +#: fields.py:816 msgid "Enter a valid email address." msgstr "Insira um endereço de email válido." -#: fields.py:724 +#: fields.py:827 msgid "This value does not match the required pattern." msgstr "Este valor não corresponde ao padrão exigido." -#: fields.py:735 +#: fields.py:838 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:747 +#: fields.py:839 +msgid "" +"Enter a valid \"slug\" consisting of Unicode letters, numbers, underscores, " +"or hyphens." +msgstr "" + +#: fields.py:854 msgid "Enter a valid URL." msgstr "Entrar um URL válido." -#: fields.py:760 -msgid "\"{value}\" is not a valid UUID." -msgstr "\"{value}\" não é um UUID válido." +#: fields.py:867 +msgid "Must be a valid UUID." +msgstr "" -#: fields.py:796 +#: fields.py:903 msgid "Enter a valid IPv4 or IPv6 address." msgstr "Informe um endereço IPv4 ou IPv6 válido." -#: fields.py:821 +#: fields.py:931 msgid "A valid integer is required." msgstr "Um número inteiro válido é exigido." -#: fields.py:822 fields.py:857 fields.py:891 +#: fields.py:932 fields.py:969 fields.py:1005 fields.py:1366 +#, python-brace-format 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:823 fields.py:858 fields.py:892 +#: fields.py:933 fields.py:970 fields.py:1006 fields.py:1367 +#, python-brace-format 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:824 fields.py:859 fields.py:896 +#: fields.py:934 fields.py:971 fields.py:1010 msgid "String value too large." msgstr "Valor da string é muito grande." -#: fields.py:856 fields.py:890 +#: fields.py:968 fields.py:1004 msgid "A valid number is required." msgstr "Um número válido é necessário." -#: fields.py:893 +#: fields.py:1007 +#, python-brace-format 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:894 +#: fields.py:1008 +#, python-brace-format 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:895 +#: fields.py:1009 +#, python-brace-format 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:1025 +#: fields.py:1148 +#, python-brace-format 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:1026 +#: fields.py:1149 msgid "Expected a datetime but got a date." msgstr "Necessário uma data e hora mas recebeu uma data." -#: fields.py:1103 +#: fields.py:1150 +#, python-brace-format +msgid "Invalid datetime for the timezone \"{timezone}\"." +msgstr "" + +#: fields.py:1151 +msgid "Datetime value out of range." +msgstr "" + +#: fields.py:1236 +#, 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:1104 +#: fields.py:1237 msgid "Expected a date but got a datetime." msgstr "Necessário uma data mas recebeu uma data e hora." -#: fields.py:1170 +#: fields.py:1303 +#, 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:1232 +#: fields.py:1365 +#, 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:1251 fields.py:1300 +#: fields.py:1399 fields.py:1456 +#, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" não é um escolha válido." -#: fields.py:1254 relations.py:71 relations.py:441 +#: fields.py:1402 +#, python-brace-format msgid "More than {count} items..." msgstr "Mais de {count} itens..." -#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 +#: fields.py:1457 fields.py:1603 relations.py:485 serializers.py:570 +#, 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:1302 +#: fields.py:1458 msgid "This selection may not be empty." msgstr "Esta seleção não pode estar vazia." -#: fields.py:1339 +#: fields.py:1495 +#, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "\"{input}\" não é uma escolha válida para um caminho." -#: fields.py:1358 +#: fields.py:1514 msgid "No file was submitted." msgstr "Nenhum arquivo foi submetido." -#: fields.py:1359 +#: fields.py:1515 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:1360 +#: fields.py:1516 msgid "No filename could be determined." msgstr "Nome do arquivo não pode ser determinado." -#: fields.py:1361 +#: fields.py:1517 msgid "The submitted file is empty." msgstr "O arquivo submetido está vázio." -#: fields.py:1362 +#: fields.py:1518 +#, 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:1410 +#: fields.py:1566 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:1449 relations.py:438 serializers.py:525 +#: fields.py:1604 relations.py:486 serializers.py:571 msgid "This list may not be empty." msgstr "Esta lista não pode estar vazia." -#: fields.py:1502 +#: fields.py:1605 +#, python-brace-format +msgid "Ensure this field has at least {min_length} elements." +msgstr "" + +#: fields.py:1606 +#, python-brace-format +msgid "Ensure this field has no more than {max_length} elements." +msgstr "" + +#: fields.py:1682 +#, 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:1549 +#: fields.py:1683 +msgid "This dictionary may not be empty." +msgstr "" + +#: fields.py:1755 msgid "Value must be valid JSON." msgstr "Valor devo ser JSON válido." -#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 -msgid "Submit" -msgstr "Enviar" +#: filters.py:49 templates/rest_framework/filters/search.html:2 +msgid "Search" +msgstr "Buscar" -#: filters.py:336 +#: filters.py:50 +msgid "A search term." +msgstr "" + +#: filters.py:180 templates/rest_framework/filters/ordering.html:3 +msgid "Ordering" +msgstr "Ordenando" + +#: filters.py:181 +msgid "Which field to use when ordering the results." +msgstr "" + +#: filters.py:287 msgid "ascending" msgstr "ascendente" -#: filters.py:337 +#: filters.py:288 msgid "descending" msgstr "descendente" -#: pagination.py:193 +#: pagination.py:174 +msgid "A page number within the paginated result set." +msgstr "" + +#: pagination.py:179 pagination.py:372 pagination.py:590 +msgid "Number of results to return per page." +msgstr "" + +#: pagination.py:189 msgid "Invalid page." msgstr "Página inválida." -#: pagination.py:427 +#: pagination.py:374 +msgid "The initial index from which to return the results." +msgstr "" + +#: pagination.py:581 +msgid "The pagination cursor value." +msgstr "" + +#: pagination.py:583 msgid "Invalid cursor" msgstr "Cursor inválido" -#: relations.py:207 +#: relations.py:246 +#, 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 +#: relations.py:247 +#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Tipo incorreto. Esperado valor pk, recebeu {data_type}." -#: relations.py:240 +#: relations.py:280 msgid "Invalid hyperlink - No URL match." msgstr "Hyperlink inválido - Sem combinação para a URL." -#: relations.py:241 +#: relations.py:281 msgid "Invalid hyperlink - Incorrect URL match." msgstr "Hyperlink inválido - Combinação URL incorreta." -#: relations.py:242 +#: relations.py:282 msgid "Invalid hyperlink - Object does not exist." msgstr "Hyperlink inválido - Objeto não existe." -#: relations.py:243 +#: relations.py:283 +#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Tipo incorreto. Necessário string URL, recebeu {data_type}." -#: relations.py:401 +#: relations.py:448 +#, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "Objeto com {slug_name}={value} não existe." -#: relations.py:402 +#: relations.py:449 msgid "Invalid value." msgstr "Valor inválido." -#: serializers.py:326 +#: schemas/utils.py:32 +msgid "unique integer value" +msgstr "" + +#: schemas/utils.py:34 +msgid "UUID string" +msgstr "" + +#: schemas/utils.py:36 +msgid "unique value" +msgstr "" + +#: schemas/utils.py:38 +#, python-brace-format +msgid "A {value_type} identifying this {name}." +msgstr "" + +#: serializers.py:337 +#, 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:116 -#: templates/rest_framework/base.html:128 +#: templates/rest_framework/base.html:136 +msgid "Extra Actions" +msgstr "" + +#: templates/rest_framework/admin.html:130 +#: templates/rest_framework/base.html:150 msgid "Filters" -msgstr "Filtra" +msgstr "Filtros" -#: templates/rest_framework/filters/django_filter.html:2 -#: templates/rest_framework/filters/django_filter_crispyforms.html:4 -msgid "Field filters" -msgstr "Filtra de campo" +#: templates/rest_framework/base.html:37 +msgid "navbar" +msgstr "" -#: templates/rest_framework/filters/ordering.html:3 -msgid "Ordering" -msgstr "Ordenando" +#: templates/rest_framework/base.html:75 +msgid "content" +msgstr "" -#: templates/rest_framework/filters/search.html:2 -msgid "Search" -msgstr "Buscar" +#: templates/rest_framework/base.html:78 +msgid "request form" +msgstr "" -#: templates/rest_framework/horizontal/radio.html:2 -#: templates/rest_framework/inline/radio.html:2 -#: templates/rest_framework/vertical/radio.html:2 +#: templates/rest_framework/base.html:157 +msgid "main content" +msgstr "" + +#: templates/rest_framework/base.html:173 +msgid "request info" +msgstr "" + +#: templates/rest_framework/base.html:177 +msgid "response info" +msgstr "" + +#: templates/rest_framework/horizontal/radio.html:4 +#: templates/rest_framework/inline/radio.html:3 +#: templates/rest_framework/vertical/radio.html:3 msgid "None" msgstr "Nenhum(a/as)" -#: templates/rest_framework/horizontal/select_multiple.html:2 -#: templates/rest_framework/inline/select_multiple.html:2 -#: templates/rest_framework/vertical/select_multiple.html:2 +#: templates/rest_framework/horizontal/select_multiple.html:4 +#: templates/rest_framework/inline/select_multiple.html:3 +#: templates/rest_framework/vertical/select_multiple.html:3 msgid "No items to select." msgstr "Nenhum item para escholher." -#: validators.py:43 +#: validators.py:39 msgid "This field must be unique." msgstr "Esse campo deve ser único." -#: validators.py:97 +#: validators.py:89 +#, python-brace-format msgid "The fields {field_names} must make a unique set." msgstr "Os campos {field_names} devem criar um set único." -#: validators.py:245 +#: validators.py:171 +#, python-brace-format +msgid "Surrogate characters are not allowed: U+{code_point:X}." +msgstr "" + +#: validators.py:243 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" date." msgstr "O campo \"{date_field}\" deve ser único para a data." -#: validators.py:260 +#: validators.py:258 +#, python-brace-format 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:273 +#: validators.py:271 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" year." msgstr "O campo \"{date_field}\" deve ser único para o ano." -#: versioning.py:42 +#: versioning.py:40 msgid "Invalid version in \"Accept\" header." msgstr "Versão inválida no cabeçalho \"Accept\"." -#: versioning.py:73 +#: versioning.py:71 msgid "Invalid version in URL path." msgstr "Versão inválida no caminho de URL." -#: versioning.py:115 +#: versioning.py:116 msgid "Invalid version in URL path. Does not match any version namespace." msgstr "Versão inválida no caminho da URL. Não corresponde a nenhuma versão do namespace." -#: versioning.py:147 +#: versioning.py:148 msgid "Invalid version in hostname." msgstr "Versão inválida no hostname." -#: versioning.py:169 +#: versioning.py:170 msgid "Invalid version in query parameter." msgstr "Versão inválida no parâmetro de query." - -#: views.py:88 -msgid "Permission denied." -msgstr "Permissão negada." diff --git a/rest_framework/locale/ro/LC_MESSAGES/django.mo b/rest_framework/locale/ro/LC_MESSAGES/django.mo index 0d6f6f942f6f06ee70e7c98f5953e43e51ad93df..0c9fb9c560564aef7eedc70fb9bb634d02ccf74a 100644 GIT binary patch delta 2438 zcmYk-eQXp(7{~D`SIQLuE%b$2puj|^bXoy0WrA* zkOm0ExMBojqQ)2^5MNG%O87&>h*1)aAwYr(CX%R$qTwH6jDCN+i*eGq&&=%G>@&}7 zZ#P|Dll*>o`Y}Vi7*@irGVq8IKVh zj?bbd_);+bLEv@N{r<)ZlQd?|P=AJT)En+ZJ>V651h3&d%o=7)9j?L>Jcj(4i~Q)k zZ?PDMJZQ{VtiUO_4!MQdi>3G+mf$DY!1K)=8gsGgA^(QE@L~G>LH~8so4t#AqbsOT z{u%Tuvi#$#F~oQuDgsaA7(9Zy-)WqLpJOimj!8=+gR@8ABuvL@B0Q)>Yq+_NZ$R~TpmOHu2;yH!<1GffwMO;xv;7&bM4i}) z7W+{XI*E$FH5`ZqIsQb(;#B&@ScXlw0S};F>?Y>pPpB9ACx`fJAk6E`#BoSInr2i4 zTJeiCW1d3gMmedkwQa%C_zWt`Bm!F9L^PbFzI)5v6j z7GoOHC&#DGy*Jz8!cQ8|f!U zGkrav1GScC(Bk{3tiOVfVosqk>#+$t@C?>tuJx04Bd(&~iJHK9R78J8O<)XRBOS~l zRQ9(ZOPDkVX*|imSGW#mjPq~Uj}z&?h`R7R>PBB9rHG!SReDKWS#6B2|N|o~aAQHzB8* zEvN?^MlJ1UsHG_2ZHT(5L{`Z(NuF`F*;b63r{iL0WNrkA9hGxDAb>Uvj#1ByyT);F8QI&MM=6+d3 zBPZx6YPzn8T20kfR8cfYBX5gu##X8(MoAhzVqVdM`5<{&yw)G`et9`>FKZilvk#87 zU_Dhyr|=SGFMpPx3jY?oqU{zA+6$1cv{w}IXNo-)8WN5{a+ye`O`D zc|mUg&ZiD?yTYU0)8UfTy>QyVRCw46Avc+oS!5T)ogN#D_u8&VZ(E0r#CF?0r@JQ_ zkJ(tH%jwx3X>(HjSuJVq-Qks~vJsO)Zg*~HcBH4xiM2;#TTQ!jzvGU%G zX4$eiRpk|KZC;*TAL)xa-F8KHdwfS?x2@R~_gl5wqOo{iG?LnxH$Tn&Ze(SuJb!jZ zYENM@y{;{?&579N)k{n4@`UYi?DlwXceKyBbiCKGZ3!ETwnY;$%k(b298K7E$Ho#} zj*V>dXP<~gqwcNo)dMc>b4N`$TbQsByCvS!Yq?2Rlo#f5%k^8LmyRJ)_eaw)%+Kf(I_zh delta 2605 zcmZY9S!`5Q9LMofrj(X$($WQia_Iu4($dlbr7VS(rKRj`kwup2^j0pJ&d|;bCZL%I z1%wzN85E472`Cc6i;jsgCL~l1Zq-QChye^yiSa>Wga`>Het$DpiSeZW`J8im?zv|l z?!46%y^)vtydn9B2}Fa(m_xWSjUUqPbYmvt09qKs3Va(&@H;HVd#LyGGK?9IGjKF^ zU^Q;Q>G%we!Z)$Sn5cP|%rYL_cWvdZ<&+QOBD{hdFhA3nIk*ew;c4u^8`y+ZS;_y~ zxRUZIEW=+g4|B4U9h{7MzA$0bm>x1}@Bq%jA>_~84zeF{dJI0uYu>@6~ ziyBEAYU=&2hur69(ZlmkP&4p3YRPV*+R?-4R2)yH5L?m0&6tn-Fcps?t6+}f415(? zZu5ofx5%Hl$&cE(joLn$G*X0lsB#t7VjXIUd-7R-_58eB@iMCXJ!%u($JtmsHo3NI zQ00TD5nM#oyNVXxL3OaOAhEg3G8{?y5UK-5@ezCh>u{)m`QJq5HV-t?)pUOxcDnYX zMtaaKAH$iH&*R4_##~1&!5bU_or+IUYy3M}m``I9u>m#p>)rAI@~Sx+B~wl2EH>a* zs2*o9yiUx;t?0vUyo7C7#IQAmJ8(Om!zGx`^l9&`LK{z@PQzcg3RlpZ$M7WTyU{yj zXw#I@J?+wkI2#{#eFaxg{u=cGYZ9G88#Sd7wD3u6##6Wuuj59XU>UO$Be)cApf+zg z)3i?Kzn+YGvL7|Iaa2ccA^XVWmL^X{DRN<$b=ZT)@lpH})!-V|VG3?Ty|*9L&Pk*x zbIC3LfHjn}$~Dtb&ORBvuo!8}bfJY$;9NZEmapJ+%738Fuf>9AV+XQ*%qGApTV7PZ!^Q7^oPtdhBiETg&RdJpGQF60c$ zPS<0o5f3ASHNPQMO+M41rENmBKY-DZWG<6Q$6=g>-=HdHO*5t!TT$o#9MV@4N4A5x ziki8*$fTG|rbX}9VhU~`G$2l~;g^pG5Gz#3o*ZYY8RI*pfspxxcoM-%czebO-1nN_=0Nr-0B}E+sTVrB*^mu!qnn zmlH~>lO$$Hv!=uZB$AHS8aJ;Crp3)$sEcVcF@jLy#F}o6UsI{%A#`2p_~_^;arGN6 zHM4{85u*qttuNR3e^M%?ZA2Eal3>{rXTAx&gzlFvLP`69<7cAUI7$nMO^MutpJuX! zM49_&E2a@zYo*1+ghVcRJu9oDrA@2UNUSG1R3Nnxx;vC+CZXxleNJF^B>YsV<%Fz2 zFl>3PJzl@lYxM+!e%l+UiB+bzO)TBV!-)O=THW34OX7ia&&W*M-)r?b{;)k5iU+b! zc;animZs#bwFmp1P{;`etX@0d*u6Ee=kn&Hbw+ynop5|8uhKKt>+=O8fv~>c>x8^L zepULhU?8@uusf%2PIYZ#b#1*>*U&VpF*aOSWOeNf_IpEC>&`(Z6n1QDemK~_i14`& z;;BU~DPtmme@2iTPfe`8xP8)taRefk9SYkP^)!ZLrTE_BxoH`e@BP#LyCZ{6{6fir z)Yy@-(%4&N@02(`N45K$k6v`_L5l{wR$nj_wn7nx7<;z-y@KRuok+m82JODcUT^q= zr)y#@73~?F)Ct=ko^fJ_D_$BAio`3Ycsv!Y!9Y0TXJ)KO*zr5m4-O`~)obtd`ohj0 LZ@4B_HSNgXP18*# diff --git a/rest_framework/locale/ro/LC_MESSAGES/django.po b/rest_framework/locale/ro/LC_MESSAGES/django.po index d144d847e..0c9e900e3 100644 --- a/rest_framework/locale/ro/LC_MESSAGES/django.po +++ b/rest_framework/locale/ro/LC_MESSAGES/django.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Bogdan Mateescu, 2019 # Elena-Adela Neacsu , 2016 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: 2017-08-03 14:58+0000\n" -"Last-Translator: Thomas Christie \n" +"POT-Creation-Date: 2020-10-13 21:45+0200\n" +"PO-Revision-Date: 2020-10-13 19:45+0000\n" +"Last-Translator: Xavier Ordoquy \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" @@ -18,40 +19,40 @@ 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:73 +#: authentication.py:70 msgid "Invalid basic header. No credentials provided." msgstr "Antet de bază invalid. Datele de autentificare nu au fost furnizate." -#: authentication.py:76 +#: authentication.py:73 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "Antet de bază invalid. Şirul de caractere cu datele de autentificare nu trebuie să conțină spații." -#: authentication.py:82 +#: authentication.py:83 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Antet de bază invalid. Datele de autentificare nu au fost corect codificate în base64." -#: authentication.py:99 +#: authentication.py:101 msgid "Invalid username/password." msgstr "Nume utilizator / Parolă invalid(ă)." -#: authentication.py:102 authentication.py:198 +#: authentication.py:104 authentication.py:206 msgid "User inactive or deleted." msgstr "Utilizator inactiv sau șters." -#: authentication.py:176 +#: authentication.py:184 msgid "Invalid token header. No credentials provided." msgstr "Antet token invalid. Datele de autentificare nu au fost furnizate." -#: authentication.py:179 +#: authentication.py:187 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 +#: authentication.py:193 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "Antet token invalid. Şirul de caractere pentru token nu trebuie să conțină caractere nevalide." -#: authentication.py:195 +#: authentication.py:203 msgid "Invalid token." msgstr "Token nevalid." @@ -59,382 +60,515 @@ msgstr "Token nevalid." msgid "Auth Token" msgstr "Token de autentificare" -#: authtoken/models.py:15 +#: authtoken/models.py:13 msgid "Key" msgstr "Cheie" -#: authtoken/models.py:18 +#: authtoken/models.py:16 msgid "User" msgstr "Utilizator" -#: authtoken/models.py:20 +#: authtoken/models.py:18 msgid "Created" msgstr "Creat" -#: authtoken/models.py:29 +#: authtoken/models.py:27 authtoken/serializers.py:19 msgid "Token" msgstr "Token" -#: authtoken/models.py:30 +#: authtoken/models.py:28 msgid "Tokens" msgstr "Tokenuri" -#: authtoken/serializers.py:8 +#: authtoken/serializers.py:9 msgid "Username" msgstr "Nume de utilizator" -#: authtoken/serializers.py:9 +#: authtoken/serializers.py:13 msgid "Password" msgstr "Parola" -#: authtoken/serializers.py:20 -msgid "User account is disabled." -msgstr "Contul de utilizator este dezactivat." - -#: authtoken/serializers.py:23 +#: authtoken/serializers.py:35 msgid "Unable to log in with provided credentials." msgstr "Nu se poate conecta cu datele de conectare furnizate." -#: authtoken/serializers.py:26 +#: authtoken/serializers.py:38 msgid "Must include \"username\" and \"password\"." msgstr "Trebuie să includă \"numele de utilizator\" și \"parola\"." -#: exceptions.py:49 +#: exceptions.py:102 msgid "A server error occurred." msgstr "A apărut o eroare pe server." -#: exceptions.py:84 +#: exceptions.py:142 +msgid "Invalid input." +msgstr "" + +#: exceptions.py:161 msgid "Malformed request." msgstr "Cerere incorectă." -#: exceptions.py:89 +#: exceptions.py:167 msgid "Incorrect authentication credentials." msgstr "Date de autentificare incorecte." -#: exceptions.py:94 +#: exceptions.py:173 msgid "Authentication credentials were not provided." msgstr "Datele de autentificare nu au fost furnizate." -#: exceptions.py:99 +#: exceptions.py:179 msgid "You do not have permission to perform this action." msgstr "Nu aveți permisiunea de a efectua această acțiune." -#: exceptions.py:104 views.py:81 +#: exceptions.py:185 msgid "Not found." msgstr "Nu a fost găsit(ă)." -#: exceptions.py:109 +#: exceptions.py:191 +#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "Metoda \"{method}\" nu este permisa." -#: exceptions.py:120 +#: exceptions.py:202 msgid "Could not satisfy the request Accept header." msgstr "Antetul Accept al cererii nu a putut fi îndeplinit." -#: exceptions.py:132 +#: exceptions.py:212 +#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "Cererea conține tipul media neacceptat \"{media_type}\"" -#: exceptions.py:145 +#: exceptions.py:223 msgid "Request was throttled." msgstr "Cererea a fost gâtuită." -#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 -#: validators.py:181 +#: exceptions.py:224 +#, python-brace-format +msgid "Expected available in {wait} second." +msgstr "" + +#: exceptions.py:225 +#, python-brace-format +msgid "Expected available in {wait} seconds." +msgstr "" + +#: fields.py:316 relations.py:245 relations.py:279 validators.py:90 +#: validators.py:183 msgid "This field is required." msgstr "Acest câmp este obligatoriu." -#: fields.py:270 +#: fields.py:317 msgid "This field may not be null." msgstr "Acest câmp nu poate fi nul." -#: fields.py:608 fields.py:639 -msgid "\"{input}\" is not a valid boolean." -msgstr "\"{input}\" nu este un boolean valid." +#: fields.py:701 +msgid "Must be a valid boolean." +msgstr "" -#: fields.py:674 +#: fields.py:766 +msgid "Not a valid string." +msgstr "" + +#: fields.py:767 msgid "This field may not be blank." msgstr "Acest câmp nu poate fi gol." -#: fields.py:675 fields.py:1675 +#: fields.py:768 fields.py:1881 +#, python-brace-format msgid "Ensure this field has no more than {max_length} characters." msgstr "Asigurați-vă că acest câmp nu are mai mult de {max_length} caractere." -#: fields.py:676 +#: fields.py:769 +#, python-brace-format msgid "Ensure this field has at least {min_length} characters." msgstr "Asigurați-vă că acest câmp are cel puțin{min_length} caractere." -#: fields.py:713 +#: fields.py:816 msgid "Enter a valid email address." msgstr "Introduceți o adresă de email validă." -#: fields.py:724 +#: fields.py:827 msgid "This value does not match the required pattern." msgstr "Această valoare nu se potrivește cu şablonul cerut." -#: fields.py:735 +#: fields.py:838 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "Introduceți un \"slug\" valid format din litere, numere, caractere de subliniere sau cratime." -#: fields.py:747 +#: fields.py:839 +msgid "" +"Enter a valid \"slug\" consisting of Unicode letters, numbers, underscores, " +"or hyphens." +msgstr "" + +#: fields.py:854 msgid "Enter a valid URL." msgstr "Introduceți un URL valid." -#: fields.py:760 -msgid "\"{value}\" is not a valid UUID." -msgstr "\"{value}\" nu este un UUID valid." +#: fields.py:867 +msgid "Must be a valid UUID." +msgstr "" -#: fields.py:796 +#: fields.py:903 msgid "Enter a valid IPv4 or IPv6 address." msgstr "Introduceți o adresă IPv4 sau IPv6 validă." -#: fields.py:821 +#: fields.py:931 msgid "A valid integer is required." msgstr "Este necesar un întreg valid." -#: fields.py:822 fields.py:857 fields.py:891 +#: fields.py:932 fields.py:969 fields.py:1005 fields.py:1366 +#, python-brace-format msgid "Ensure this value is less than or equal to {max_value}." msgstr "Asigurați-vă că această valoare este mai mică sau egală cu {max_value}." -#: fields.py:823 fields.py:858 fields.py:892 +#: fields.py:933 fields.py:970 fields.py:1006 fields.py:1367 +#, python-brace-format msgid "Ensure this value is greater than or equal to {min_value}." msgstr "Asigurați-vă că această valoare este mai mare sau egală cu {min_value}." -#: fields.py:824 fields.py:859 fields.py:896 +#: fields.py:934 fields.py:971 fields.py:1010 msgid "String value too large." msgstr "Valoare șir de caractere prea mare." -#: fields.py:856 fields.py:890 +#: fields.py:968 fields.py:1004 msgid "A valid number is required." msgstr "Este necesar un număr valid." -#: fields.py:893 +#: fields.py:1007 +#, python-brace-format msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "Asigurați-vă că nu există mai mult de {max_digits} cifre în total." -#: fields.py:894 +#: fields.py:1008 +#, python-brace-format msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "Asigurați-vă că nu există mai mult de {max_decimal_places} zecimale." -#: fields.py:895 +#: fields.py:1009 +#, python-brace-format msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "Asigurați-vă că nu există mai mult de {max_whole_digits} cifre înainte de punctul zecimal." -#: fields.py:1025 +#: fields.py:1148 +#, python-brace-format msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "Câmpul datetime are format greșit. Utilizați unul dintre aceste formate în loc: {format}." -#: fields.py:1026 +#: fields.py:1149 msgid "Expected a datetime but got a date." msgstr "Se aștepta un câmp datetime, dar s-a primit o dată." -#: fields.py:1103 +#: fields.py:1150 +#, python-brace-format +msgid "Invalid datetime for the timezone \"{timezone}\"." +msgstr "" + +#: fields.py:1151 +msgid "Datetime value out of range." +msgstr "" + +#: fields.py:1236 +#, python-brace-format msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "Data are formatul greșit. Utilizați unul dintre aceste formate în loc: {format}." -#: fields.py:1104 +#: fields.py:1237 msgid "Expected a date but got a datetime." msgstr "Se aștepta o dată, dar s-a primit un câmp datetime." -#: fields.py:1170 +#: fields.py:1303 +#, python-brace-format msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "Timpul are formatul greșit. Utilizați unul dintre aceste formate în loc: {format}." -#: fields.py:1232 +#: fields.py:1365 +#, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "Durata are formatul greșit. Utilizați unul dintre aceste formate în loc: {format}." -#: fields.py:1251 fields.py:1300 +#: fields.py:1399 fields.py:1456 +#, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" nu este o opțiune validă." -#: fields.py:1254 relations.py:71 relations.py:441 +#: fields.py:1402 +#, python-brace-format msgid "More than {count} items..." msgstr "Mai mult de {count} articole ..." -#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 +#: fields.py:1457 fields.py:1603 relations.py:485 serializers.py:570 +#, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Se aștepta o listă de elemente, dar s-a primit tip \"{input_type}\"." -#: fields.py:1302 +#: fields.py:1458 msgid "This selection may not be empty." msgstr "Această selecție nu poate fi goală." -#: fields.py:1339 +#: fields.py:1495 +#, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "\"{input}\" nu este o cale validă." -#: fields.py:1358 +#: fields.py:1514 msgid "No file was submitted." -msgstr "Nici un fișier nu a fost sumis." +msgstr "Nu a fost trimis nici un fișier." -#: fields.py:1359 +#: fields.py:1515 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "Datele prezentate nu sunt un fișier. Verificați tipul de codificare de pe formular." -#: fields.py:1360 +#: fields.py:1516 msgid "No filename could be determined." msgstr "Numele fișierului nu a putut fi determinat." -#: fields.py:1361 +#: fields.py:1517 msgid "The submitted file is empty." -msgstr "Fișierul sumis este gol." +msgstr "Fișierul trimis este gol." -#: fields.py:1362 +#: fields.py:1518 +#, python-brace-format msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "Asigurați-vă că acest nume de fișier are cel mult {max_length} caractere (momentan are {length})." -#: fields.py:1410 +#: fields.py:1566 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "Încărcați o imagine validă. Fișierul încărcat a fost fie nu o imagine sau o imagine coruptă." -#: fields.py:1449 relations.py:438 serializers.py:525 +#: fields.py:1604 relations.py:486 serializers.py:571 msgid "This list may not be empty." msgstr "Această listă nu poate fi goală." -#: fields.py:1502 +#: fields.py:1605 +#, python-brace-format +msgid "Ensure this field has at least {min_length} elements." +msgstr "" + +#: fields.py:1606 +#, python-brace-format +msgid "Ensure this field has no more than {max_length} elements." +msgstr "" + +#: fields.py:1682 +#, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "Se aștepta un dicționar de obiecte, dar s-a primit tipul \"{input_type}\"." -#: fields.py:1549 +#: fields.py:1683 +msgid "This dictionary may not be empty." +msgstr "" + +#: fields.py:1755 msgid "Value must be valid JSON." msgstr "Valoarea trebuie să fie JSON valid." -#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 -msgid "Submit" -msgstr "Sumiteţi" +#: filters.py:49 templates/rest_framework/filters/search.html:2 +msgid "Search" +msgstr "Căutare" -#: filters.py:336 +#: filters.py:50 +msgid "A search term." +msgstr "" + +#: filters.py:180 templates/rest_framework/filters/ordering.html:3 +msgid "Ordering" +msgstr "Ordonare" + +#: filters.py:181 +msgid "Which field to use when ordering the results." +msgstr "" + +#: filters.py:287 msgid "ascending" -msgstr "" +msgstr "ascendent" -#: filters.py:337 +#: filters.py:288 msgid "descending" +msgstr "descendent" + +#: pagination.py:174 +msgid "A page number within the paginated result set." msgstr "" -#: pagination.py:193 +#: pagination.py:179 pagination.py:372 pagination.py:590 +msgid "Number of results to return per page." +msgstr "" + +#: pagination.py:189 msgid "Invalid page." msgstr "Pagină nevalidă." -#: pagination.py:427 +#: pagination.py:374 +msgid "The initial index from which to return the results." +msgstr "" + +#: pagination.py:581 +msgid "The pagination cursor value." +msgstr "" + +#: pagination.py:583 msgid "Invalid cursor" msgstr "Cursor nevalid" -#: relations.py:207 +#: relations.py:246 +#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Pk \"{pk_value}\" nevalid - obiectul nu există." -#: relations.py:208 +#: relations.py:247 +#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Tip incorect. Se aștepta un pk, dar s-a primit \"{data_type}\"." -#: relations.py:240 +#: relations.py:280 msgid "Invalid hyperlink - No URL match." msgstr "Hyperlink nevalid - Nici un URL nu se potrivește." -#: relations.py:241 +#: relations.py:281 msgid "Invalid hyperlink - Incorrect URL match." msgstr "Hyperlink nevalid - Potrivire URL incorectă." -#: relations.py:242 +#: relations.py:282 msgid "Invalid hyperlink - Object does not exist." msgstr "Hyperlink nevalid - Obiectul nu există." -#: relations.py:243 +#: relations.py:283 +#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Tip incorect. Se aștepta un URL, dar s-a primit \"{data_type}\"." -#: relations.py:401 +#: relations.py:448 +#, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "Obiectul cu {slug_name}={value} nu există." -#: relations.py:402 +#: relations.py:449 msgid "Invalid value." msgstr "Valoare nevalidă." -#: serializers.py:326 +#: schemas/utils.py:32 +msgid "unique integer value" +msgstr "" + +#: schemas/utils.py:34 +msgid "UUID string" +msgstr "" + +#: schemas/utils.py:36 +msgid "unique value" +msgstr "" + +#: schemas/utils.py:38 +#, python-brace-format +msgid "A {value_type} identifying this {name}." +msgstr "" + +#: serializers.py:337 +#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "Date nevalide. Se aștepta un dicționar de obiecte, dar s-a primit \"{datatype}\"." #: templates/rest_framework/admin.html:116 -#: templates/rest_framework/base.html:128 +#: templates/rest_framework/base.html:136 +msgid "Extra Actions" +msgstr "" + +#: templates/rest_framework/admin.html:130 +#: templates/rest_framework/base.html:150 msgid "Filters" msgstr "Filtre" -#: templates/rest_framework/filters/django_filter.html:2 -#: templates/rest_framework/filters/django_filter_crispyforms.html:4 -msgid "Field filters" -msgstr "Filtre câmpuri" +#: templates/rest_framework/base.html:37 +msgid "navbar" +msgstr "" -#: templates/rest_framework/filters/ordering.html:3 -msgid "Ordering" -msgstr "Ordonare" +#: templates/rest_framework/base.html:75 +msgid "content" +msgstr "" -#: templates/rest_framework/filters/search.html:2 -msgid "Search" -msgstr "Căutare" +#: templates/rest_framework/base.html:78 +msgid "request form" +msgstr "" -#: templates/rest_framework/horizontal/radio.html:2 -#: templates/rest_framework/inline/radio.html:2 -#: templates/rest_framework/vertical/radio.html:2 +#: templates/rest_framework/base.html:157 +msgid "main content" +msgstr "" + +#: templates/rest_framework/base.html:173 +msgid "request info" +msgstr "" + +#: templates/rest_framework/base.html:177 +msgid "response info" +msgstr "" + +#: templates/rest_framework/horizontal/radio.html:4 +#: templates/rest_framework/inline/radio.html:3 +#: templates/rest_framework/vertical/radio.html:3 msgid "None" 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 +#: templates/rest_framework/horizontal/select_multiple.html:4 +#: templates/rest_framework/inline/select_multiple.html:3 +#: templates/rest_framework/vertical/select_multiple.html:3 msgid "No items to select." msgstr "Nu există elemente pentru a fi selectate." -#: validators.py:43 +#: validators.py:39 msgid "This field must be unique." msgstr "Acest câmp trebuie să fie unic." -#: validators.py:97 +#: validators.py:89 +#, python-brace-format msgid "The fields {field_names} must make a unique set." msgstr "Câmpurile {field_names} trebuie să formeze un set unic." -#: validators.py:245 +#: validators.py:171 +#, python-brace-format +msgid "Surrogate characters are not allowed: U+{code_point:X}." +msgstr "" + +#: validators.py:243 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" date." msgstr "Acest câmp trebuie să fie unic pentru data \"{date_field}\"." -#: validators.py:260 +#: validators.py:258 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" month." msgstr "Acest câmp trebuie să fie unic pentru luna \"{date_field}\"." -#: validators.py:273 +#: validators.py:271 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" year." msgstr "Acest câmp trebuie să fie unic pentru anul \"{date_field}\"." -#: versioning.py:42 +#: versioning.py:40 msgid "Invalid version in \"Accept\" header." msgstr "Versiune nevalidă în antetul \"Accept\"." -#: versioning.py:73 +#: versioning.py:71 msgid "Invalid version in URL path." msgstr "Versiune nevalidă în calea URL." -#: versioning.py:115 +#: versioning.py:116 msgid "Invalid version in URL path. Does not match any version namespace." -msgstr "" +msgstr "Versiune nevalidă în calea URL. Nu se potrivește cu niciun spațiu de nume al versiunii." -#: versioning.py:147 +#: versioning.py:148 msgid "Invalid version in hostname." msgstr "Versiune nevalidă în numele de gazdă." -#: versioning.py:169 +#: versioning.py:170 msgid "Invalid version in query parameter." -msgstr "Versiune nevalid în parametrul de interogare." - -#: views.py:88 -msgid "Permission denied." -msgstr "Permisiune refuzată." +msgstr "Versiune nevalidă în parametrul de interogare." diff --git a/rest_framework/locale/ru/LC_MESSAGES/django.mo b/rest_framework/locale/ru/LC_MESSAGES/django.mo index 85918d65abc9769451f01eb9ecc1add82728bfcb..82688a41205544a65abef56ffcbdd70f883c70f4 100644 GIT binary patch delta 2405 zcmZYAeN0tl9Ki7hE-x2_EAIsOa?lh|AYKF!C_)?)U2rJAt=Yw!(}&u6g((-W0i zhHgy7V<-!J*}ndv?T;w)-N#B5P-<egPngjQ69|%;_}pUq$CVE|_PHGR{u7R=fq} z#(vcBILd_*u@5GBReaXsG0ow$ztQ*Y{ZJb=?Uj!Oe< zZ;(z9<${a+bl?<@;4SRM_C?k!dI{zJ91eCHp0xcH&oQoDVlDJ4N-^eY6f8DjEuOQz ziXO%R7o{pI96_mO11s?swqeFnrH)`99>X~#X=;#)^x_>{fn5)hB|L)N_y=yrmgQE) zUd2MjbJ&mRJTxj(9j5aV7yiNtJVE|=R>iS=nP3&lYcz)I@jO=H9LoK9%vz5@Y{r}D z#6liot*RW0umk0_JBo5tGq^&w@;jY6E+kVq#kd*etR|59QZL{m7({suXYJ2rRw=S1 zoQL%&HL(c~;y7-{yC^$vW^$>G11K8^Vu_^k8XdXO!SZ(DE|l>lT#Kp9Dhq5u`GZp^ zXa6b6^J%uFR}7qqO-J>PeJ(kk&-F%$}9eA~S#X1wpc~!ydC~v$EwV z)wg)!L0QL=8d0%x}caC~X1JM#!ryHM57|m5%cY+l!C}2A}y9q zT4aDy5B2sq8XJjteZaX$pLUjn{&q&ihMcZ54n2^Puv}~MdxkZie?%K_kM#6uZr_+T z>KPjL`hA+uJ>VH0boY2d$5XnZ^n0mQp|Z4mhdz|qpY9&+@%VbZzJ03K6Y1)+nVqik z(&93HDzvh-HLEN2hO8`YyL;5@8PZyZdj0zkjA?a;{8q2w8L!Vj>UD=Evc8GZU&-zX zt;v~jhN71Z#Ou{76CIin)ZZyxyv+FA_*gS88z0cQYE;csdAi(GQnD0iUT+wBPbK5XDT%wC!w@w zqdZ9?%GP^h4#xW5K@}Kcr=SkvbbJFj zZgnl@b>vUo;Ue?gM@gSlCdow$O1lKhu>$3Y9a)^eto&qb;1!hiZImQ>h_lc-HhQ)# zDD451Cm2B)_akcf0A+zW*+z1yC73{a5M=?w_&6TM3cQ@n{;#8QpALD_W|lt=TVr;i zJn2BJ{R+;YeG*IKl==yuqMgc@8qtX@_#R5GJVaSgHLI0eX-7%o<0w0SJ4mITN)nH; z0h^G7RqtXSeuU4Wjcw`1<0x(GM5Wp=gaN#VF5JigZ^qA1#urYGF7Qyy-|;a0^;&en z!JAYhJBvuoRoIMk@y(bw(M{W05MAIdZHgnJ!zCL4`L))#46p#kKe~vUpXp_(J{wB&wynHGv-GMILhimX2eu}lE zycOeSMw2EFYiYZ1G9JT4_yw-Sq)Memq0Au*$s$sTe~ZkOLa-6Cj_7t66)wzS6iF&M z7AcaD%LqwSDe@Fci3CCxz=;{Z2el{*kRn^Y*r-L1YXkL7#1ev&Gk%DS`3ekwi$zCo+xNqf0#1jf5QK3PN(GiI_v!2~I^lNl1}|UPS~Y zL8Qzl))}=&mxWYwh$*qIXE2eF*G-C?`2?dDeN&`LE*ifNQm-La6U(JRX(ZB(TJ%?x zDpMEqdwkt}f#(Y}Pp{_l2Q<63-R||cG>6~sb=!Sqq2lDmi3R<1_PPH*s;zD5;;=8- zl#uH7y0k4GZ@}Ht8}_BWW(qfE){nBRboX?5dV4*7pXPG=JZ@K6Xvk8X*xKjl@&v+{ zEybp>cBj+d=L^XFU7lXM!z+V+&fXU4$Z0cIRF{_5l$OubDk|qx)r7vy$t`T?@wEGU zc4|$Y-mT89ZeOQgo7dh$qtoB%57f4I**)HHeD0T{Qcg!+&@bp`^)sQ*tu3LeR%gn8 z&k@QjwI#^n%fhyCXOdGj{gOUn3_c&emj7H*_{y|~xCsaKk;tCNUZ%OE=^yK-^h=T5 z`q{`Jb6yOMvH3G!kL)%2PU&a#a||2`@3dV_7=JV}z_7jgMg3G{IQC6G-xC=MEi2Bm VjPTJX`i02LGE4@Qg%-_t@DJ8-ZFc|w diff --git a/rest_framework/locale/ru/LC_MESSAGES/django.po b/rest_framework/locale/ru/LC_MESSAGES/django.po index 7e09b227e..30df5d496 100644 --- a/rest_framework/locale/ru/LC_MESSAGES/django.po +++ b/rest_framework/locale/ru/LC_MESSAGES/django.po @@ -3,18 +3,20 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Anton Bazhanov , 2018 # Grigory Mishchenko , 2017 # Kirill Tarasenko, 2015 # koodjo , 2015 # Mike TUMS , 2015 # Sergei Sinitsyn , 2016 +# Val Grom , 2020 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: 2017-08-03 14:58+0000\n" -"Last-Translator: Grigory Mishchenko \n" +"POT-Creation-Date: 2020-10-13 21:45+0200\n" +"PO-Revision-Date: 2020-10-13 19:45+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,40 +24,40 @@ 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:73 +#: authentication.py:70 msgid "Invalid basic header. No credentials provided." msgstr "Недопустимый заголовок. Не предоставлены учетные данные." -#: authentication.py:76 +#: authentication.py:73 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "Недопустимый заголовок. Учетные данные не должны содержать пробелов." -#: authentication.py:82 +#: authentication.py:83 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Недопустимый заголовок. Учетные данные некорректно закодированны в base64." -#: authentication.py:99 +#: authentication.py:101 msgid "Invalid username/password." msgstr "Недопустимые имя пользователя или пароль." -#: authentication.py:102 authentication.py:198 +#: authentication.py:104 authentication.py:206 msgid "User inactive or deleted." msgstr "Пользователь неактивен или удален." -#: authentication.py:176 +#: authentication.py:184 msgid "Invalid token header. No credentials provided." msgstr "Недопустимый заголовок токена. Не предоставлены учетные данные." -#: authentication.py:179 +#: authentication.py:187 msgid "Invalid token header. Token string should not contain spaces." msgstr "Недопустимый заголовок токена. Токен не должен содержать пробелов." -#: authentication.py:185 +#: authentication.py:193 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "Недопустимый заголовок токена. Токен не должен содержать недопустимые символы." -#: authentication.py:195 +#: authentication.py:203 msgid "Invalid token." msgstr "Недопустимый токен." @@ -63,382 +65,515 @@ msgstr "Недопустимый токен." msgid "Auth Token" msgstr "Токен аутентификации" -#: authtoken/models.py:15 +#: authtoken/models.py:13 msgid "Key" msgstr "Ключ" -#: authtoken/models.py:18 +#: authtoken/models.py:16 msgid "User" msgstr "Пользователь" -#: authtoken/models.py:20 +#: authtoken/models.py:18 msgid "Created" msgstr "Создан" -#: authtoken/models.py:29 +#: authtoken/models.py:27 authtoken/serializers.py:19 msgid "Token" msgstr "Токен" -#: authtoken/models.py:30 +#: authtoken/models.py:28 msgid "Tokens" msgstr "Токены" -#: authtoken/serializers.py:8 +#: authtoken/serializers.py:9 msgid "Username" msgstr "Имя пользователя" -#: authtoken/serializers.py:9 +#: authtoken/serializers.py:13 msgid "Password" msgstr "Пароль" -#: authtoken/serializers.py:20 -msgid "User account is disabled." -msgstr "Учетная запись пользователя отключена." - -#: authtoken/serializers.py:23 +#: authtoken/serializers.py:35 msgid "Unable to log in with provided credentials." msgstr "Невозможно войти с предоставленными учетными данными." -#: authtoken/serializers.py:26 +#: authtoken/serializers.py:38 msgid "Must include \"username\" and \"password\"." msgstr "Должен включать \"username\" и \"password\"." -#: exceptions.py:49 +#: exceptions.py:102 msgid "A server error occurred." msgstr "Произошла ошибка сервера." -#: exceptions.py:84 +#: exceptions.py:142 +msgid "Invalid input." +msgstr "" + +#: exceptions.py:161 msgid "Malformed request." msgstr "Искаженный запрос." -#: exceptions.py:89 +#: exceptions.py:167 msgid "Incorrect authentication credentials." msgstr "Некорректные учетные данные." -#: exceptions.py:94 +#: exceptions.py:173 msgid "Authentication credentials were not provided." msgstr "Учетные данные не были предоставлены." -#: exceptions.py:99 +#: exceptions.py:179 msgid "You do not have permission to perform this action." msgstr "У вас нет прав для выполнения этой операции." -#: exceptions.py:104 views.py:81 +#: exceptions.py:185 msgid "Not found." msgstr "Не найдено." -#: exceptions.py:109 +#: exceptions.py:191 +#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "Метод \"{method}\" не разрешен." -#: exceptions.py:120 +#: exceptions.py:202 msgid "Could not satisfy the request Accept header." msgstr "Невозможно удовлетворить \"Accept\" заголовок запроса." -#: exceptions.py:132 +#: exceptions.py:212 +#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "Неподдерживаемый тип данных \"{media_type}\" в запросе." -#: exceptions.py:145 +#: exceptions.py:223 msgid "Request was throttled." msgstr "Запрос был проигнорирован." -#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 -#: validators.py:181 +#: exceptions.py:224 +#, python-brace-format +msgid "Expected available in {wait} second." +msgstr "" + +#: exceptions.py:225 +#, python-brace-format +msgid "Expected available in {wait} seconds." +msgstr "" + +#: fields.py:316 relations.py:245 relations.py:279 validators.py:90 +#: validators.py:183 msgid "This field is required." msgstr "Это поле обязательно." -#: fields.py:270 +#: fields.py:317 msgid "This field may not be null." msgstr "Это поле не может быть null." -#: fields.py:608 fields.py:639 -msgid "\"{input}\" is not a valid boolean." -msgstr "\"{input}\" не является корректным булевым значением." +#: fields.py:701 +msgid "Must be a valid boolean." +msgstr "" -#: fields.py:674 +#: fields.py:766 +msgid "Not a valid string." +msgstr "" + +#: fields.py:767 msgid "This field may not be blank." msgstr "Это поле не может быть пустым." -#: fields.py:675 fields.py:1675 +#: fields.py:768 fields.py:1881 +#, python-brace-format msgid "Ensure this field has no more than {max_length} characters." msgstr "Убедитесь, что в этом поле не больше {max_length} символов." -#: fields.py:676 +#: fields.py:769 +#, python-brace-format msgid "Ensure this field has at least {min_length} characters." msgstr "Убедитесь, что в этом поле как минимум {min_length} символов." -#: fields.py:713 +#: fields.py:816 msgid "Enter a valid email address." msgstr "Введите корректный адрес электронной почты." -#: fields.py:724 +#: fields.py:827 msgid "This value does not match the required pattern." msgstr "Значение не соответствует требуемому паттерну." -#: fields.py:735 +#: fields.py:838 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "Введите корректный \"slug\", состоящий из букв, цифр, знаков подчеркивания или дефисов." -#: fields.py:747 +#: fields.py:839 +msgid "" +"Enter a valid \"slug\" consisting of Unicode letters, numbers, underscores, " +"or hyphens." +msgstr "" + +#: fields.py:854 msgid "Enter a valid URL." msgstr "Введите корректный URL." -#: fields.py:760 -msgid "\"{value}\" is not a valid UUID." -msgstr "\"{value}\" не является корректным UUID." +#: fields.py:867 +msgid "Must be a valid UUID." +msgstr "" -#: fields.py:796 +#: fields.py:903 msgid "Enter a valid IPv4 or IPv6 address." msgstr "Введите действительный адрес IPv4 или IPv6." -#: fields.py:821 +#: fields.py:931 msgid "A valid integer is required." msgstr "Требуется целочисленное значение." -#: fields.py:822 fields.py:857 fields.py:891 +#: fields.py:932 fields.py:969 fields.py:1005 fields.py:1366 +#, python-brace-format msgid "Ensure this value is less than or equal to {max_value}." msgstr "Убедитесь, что значение меньше или равно {max_value}." -#: fields.py:823 fields.py:858 fields.py:892 +#: fields.py:933 fields.py:970 fields.py:1006 fields.py:1367 +#, python-brace-format msgid "Ensure this value is greater than or equal to {min_value}." msgstr "Убедитесь, что значение больше или равно {min_value}." -#: fields.py:824 fields.py:859 fields.py:896 +#: fields.py:934 fields.py:971 fields.py:1010 msgid "String value too large." msgstr "Слишком длинное значение." -#: fields.py:856 fields.py:890 +#: fields.py:968 fields.py:1004 msgid "A valid number is required." msgstr "Требуется численное значение." -#: fields.py:893 +#: fields.py:1007 +#, python-brace-format msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "Убедитесь, что в числе не больше {max_digits} знаков." -#: fields.py:894 +#: fields.py:1008 +#, python-brace-format msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "Убедитесь, что в числе не больше {max_decimal_places} знаков в дробной части." -#: fields.py:895 +#: fields.py:1009 +#, python-brace-format msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "Убедитесь, что в числе не больше {max_whole_digits} знаков в целой части." -#: fields.py:1025 +#: fields.py:1148 +#, python-brace-format msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "Неправильный формат datetime. Используйте один из этих форматов: {format}." -#: fields.py:1026 +#: fields.py:1149 msgid "Expected a datetime but got a date." msgstr "Ожидался datetime, но был получен date." -#: fields.py:1103 +#: fields.py:1150 +#, python-brace-format +msgid "Invalid datetime for the timezone \"{timezone}\"." +msgstr "" + +#: fields.py:1151 +msgid "Datetime value out of range." +msgstr "" + +#: fields.py:1236 +#, python-brace-format msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "Неправильный формат date. Используйте один из этих форматов: {format}." -#: fields.py:1104 +#: fields.py:1237 msgid "Expected a date but got a datetime." msgstr "Ожидался date, но был получен datetime." -#: fields.py:1170 +#: fields.py:1303 +#, python-brace-format msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "Неправильный формат времени. Используйте один из этих форматов: {format}." -#: fields.py:1232 +#: fields.py:1365 +#, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "Неправильный формат. Используйте один из этих форматов: {format}." -#: fields.py:1251 fields.py:1300 +#: fields.py:1399 fields.py:1456 +#, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" не является корректным значением." -#: fields.py:1254 relations.py:71 relations.py:441 +#: fields.py:1402 +#, python-brace-format msgid "More than {count} items..." msgstr "Элементов больше чем {count}" -#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 +#: fields.py:1457 fields.py:1603 relations.py:485 serializers.py:570 +#, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Ожидался list со значениями, но был получен \"{input_type}\"." -#: fields.py:1302 +#: fields.py:1458 msgid "This selection may not be empty." msgstr "Выбор не может быть пустым." -#: fields.py:1339 +#: fields.py:1495 +#, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "\"{input}\" не является корректным путем до файла" -#: fields.py:1358 +#: fields.py:1514 msgid "No file was submitted." msgstr "Не был загружен файл." -#: fields.py:1359 +#: fields.py:1515 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "Загруженный файл не является корректным файлом." -#: fields.py:1360 +#: fields.py:1516 msgid "No filename could be determined." msgstr "Невозможно определить имя файла." -#: fields.py:1361 +#: fields.py:1517 msgid "The submitted file is empty." msgstr "Загруженный файл пуст." -#: fields.py:1362 +#: fields.py:1518 +#, python-brace-format msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "Убедитесь, что имя файла меньше {max_length} символов (сейчас {length})." -#: fields.py:1410 +#: fields.py:1566 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 +#: fields.py:1604 relations.py:486 serializers.py:571 msgid "This list may not be empty." msgstr "Этот список не может быть пустым." -#: fields.py:1502 +#: fields.py:1605 +#, python-brace-format +msgid "Ensure this field has at least {min_length} elements." +msgstr "" + +#: fields.py:1606 +#, python-brace-format +msgid "Ensure this field has no more than {max_length} elements." +msgstr "" + +#: fields.py:1682 +#, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "Ожидался словарь со значениями, но был получен \"{input_type}\"." -#: fields.py:1549 +#: fields.py:1683 +msgid "This dictionary may not be empty." +msgstr "" + +#: fields.py:1755 msgid "Value must be valid JSON." msgstr "Значение должно быть правильным JSON." -#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 -msgid "Submit" -msgstr "Отправить" +#: filters.py:49 templates/rest_framework/filters/search.html:2 +msgid "Search" +msgstr "Поиск" -#: filters.py:336 +#: filters.py:50 +msgid "A search term." +msgstr "" + +#: filters.py:180 templates/rest_framework/filters/ordering.html:3 +msgid "Ordering" +msgstr "Порядок сортировки" + +#: filters.py:181 +msgid "Which field to use when ordering the results." +msgstr "" + +#: filters.py:287 msgid "ascending" -msgstr "" +msgstr "по возрастанию" -#: filters.py:337 +#: filters.py:288 msgid "descending" +msgstr "по убыванию" + +#: pagination.py:174 +msgid "A page number within the paginated result set." msgstr "" -#: pagination.py:193 +#: pagination.py:179 pagination.py:372 pagination.py:590 +msgid "Number of results to return per page." +msgstr "" + +#: pagination.py:189 msgid "Invalid page." msgstr "Неправильная страница" -#: pagination.py:427 +#: pagination.py:374 +msgid "The initial index from which to return the results." +msgstr "" + +#: pagination.py:581 +msgid "The pagination cursor value." +msgstr "" + +#: pagination.py:583 msgid "Invalid cursor" msgstr "Не корректный курсор" -#: relations.py:207 +#: relations.py:246 +#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Недопустимый первичный ключ \"{pk_value}\" - объект не существует." -#: relations.py:208 +#: relations.py:247 +#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Некорректный тип. Ожидалось значение первичного ключа, получен {data_type}." -#: relations.py:240 +#: relations.py:280 msgid "Invalid hyperlink - No URL match." msgstr "Недопустимая ссылка - нет совпадения по URL." -#: relations.py:241 +#: relations.py:281 msgid "Invalid hyperlink - Incorrect URL match." msgstr "Недопустимая ссылка - некорректное совпадение по URL," -#: relations.py:242 +#: relations.py:282 msgid "Invalid hyperlink - Object does not exist." msgstr "Недопустимая ссылка - объект не существует." -#: relations.py:243 +#: relations.py:283 +#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Некорректный тип. Ожидался URL, получен {data_type}." -#: relations.py:401 +#: relations.py:448 +#, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "Объект с {slug_name}={value} не существует." -#: relations.py:402 +#: relations.py:449 msgid "Invalid value." msgstr "Недопустимое значение." -#: serializers.py:326 +#: schemas/utils.py:32 +msgid "unique integer value" +msgstr "" + +#: schemas/utils.py:34 +msgid "UUID string" +msgstr "" + +#: schemas/utils.py:36 +msgid "unique value" +msgstr "" + +#: schemas/utils.py:38 +#, python-brace-format +msgid "A {value_type} identifying this {name}." +msgstr "" + +#: serializers.py:337 +#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "Недопустимые данные. Ожидался dictionary, но был получен {datatype}." #: templates/rest_framework/admin.html:116 -#: templates/rest_framework/base.html:128 +#: templates/rest_framework/base.html:136 +msgid "Extra Actions" +msgstr "" + +#: templates/rest_framework/admin.html:130 +#: templates/rest_framework/base.html:150 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/base.html:37 +msgid "navbar" +msgstr "" -#: templates/rest_framework/filters/ordering.html:3 -msgid "Ordering" -msgstr "Порядок сортировки" +#: templates/rest_framework/base.html:75 +msgid "content" +msgstr "" -#: templates/rest_framework/filters/search.html:2 -msgid "Search" -msgstr "Поиск" +#: templates/rest_framework/base.html:78 +msgid "request form" +msgstr "" -#: templates/rest_framework/horizontal/radio.html:2 -#: templates/rest_framework/inline/radio.html:2 -#: templates/rest_framework/vertical/radio.html:2 +#: templates/rest_framework/base.html:157 +msgid "main content" +msgstr "" + +#: templates/rest_framework/base.html:173 +msgid "request info" +msgstr "" + +#: templates/rest_framework/base.html:177 +msgid "response info" +msgstr "" + +#: templates/rest_framework/horizontal/radio.html:4 +#: templates/rest_framework/inline/radio.html:3 +#: templates/rest_framework/vertical/radio.html:3 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 +#: templates/rest_framework/horizontal/select_multiple.html:4 +#: templates/rest_framework/inline/select_multiple.html:3 +#: templates/rest_framework/vertical/select_multiple.html:3 msgid "No items to select." msgstr "Нет элементов для выбора" -#: validators.py:43 +#: validators.py:39 msgid "This field must be unique." msgstr "Это поле должно быть уникально." -#: validators.py:97 +#: validators.py:89 +#, python-brace-format msgid "The fields {field_names} must make a unique set." msgstr "Поля {field_names} должны производить массив с уникальными значениями." -#: validators.py:245 +#: validators.py:171 +#, python-brace-format +msgid "Surrogate characters are not allowed: U+{code_point:X}." +msgstr "" + +#: validators.py:243 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" date." msgstr "Это поле должно быть уникально для даты \"{date_field}\"." -#: validators.py:260 +#: validators.py:258 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" month." msgstr "Это поле должно быть уникально для месяца \"{date_field}\"." -#: validators.py:273 +#: validators.py:271 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" year." msgstr "Это поле должно быть уникально для года \"{date_field}\"." -#: versioning.py:42 +#: versioning.py:40 msgid "Invalid version in \"Accept\" header." msgstr "Недопустимая версия в заголовке \"Accept\"." -#: versioning.py:73 +#: versioning.py:71 msgid "Invalid version in URL path." msgstr "Недопустимая версия в пути URL." -#: versioning.py:115 +#: versioning.py:116 msgid "Invalid version in URL path. Does not match any version namespace." -msgstr "" +msgstr "Недопустимая версия в пути URL. Не соответствует ни одному version namespace." -#: versioning.py:147 +#: versioning.py:148 msgid "Invalid version in hostname." msgstr "Недопустимая версия в имени хоста." -#: versioning.py:169 +#: versioning.py:170 msgid "Invalid version in query parameter." msgstr "Недопустимая версия в параметре запроса." - -#: views.py:88 -msgid "Permission denied." -msgstr "Доступ запрещен" diff --git a/rest_framework/locale/ru_RU/LC_MESSAGES/django.mo b/rest_framework/locale/ru_RU/LC_MESSAGES/django.mo new file mode 100644 index 0000000000000000000000000000000000000000..d6da8f432d9025af1a83c7c408f46d16e8368f68 GIT binary patch literal 5208 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, 2018-2019 +msgid "" +msgstr "" +"Project-Id-Version: Django REST framework\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-10-13 21:45+0200\n" +"PO-Revision-Date: 2020-10-13 19:45+0000\n" +"Last-Translator: Xavier Ordoquy \n" +"Language-Team: Russian (Russia) (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/ru_RU/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ru_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:70 +msgid "Invalid basic header. No credentials provided." +msgstr "" + +#: authentication.py:73 +msgid "Invalid basic header. Credentials string should not contain spaces." +msgstr "" + +#: authentication.py:83 +msgid "Invalid basic header. Credentials not correctly base64 encoded." +msgstr "" + +#: authentication.py:101 +msgid "Invalid username/password." +msgstr "Пожалуйста, введите корректные имя пользователя и пароль учётной записи. Оба поля могут быть чувствительны к регистру." + +#: authentication.py:104 authentication.py:206 +msgid "User inactive or deleted." +msgstr "Пользователь неактивен или удален." + +#: authentication.py:184 +msgid "Invalid token header. No credentials provided." +msgstr "" + +#: authentication.py:187 +msgid "Invalid token header. Token string should not contain spaces." +msgstr "" + +#: authentication.py:193 +msgid "" +"Invalid token header. Token string should not contain invalid characters." +msgstr "" + +#: authentication.py:203 +msgid "Invalid token." +msgstr "" + +#: authtoken/apps.py:7 +msgid "Auth Token" +msgstr "" + +#: authtoken/models.py:13 +msgid "Key" +msgstr "Ключ" + +#: authtoken/models.py:16 +msgid "User" +msgstr "Пользователь" + +#: authtoken/models.py:18 +msgid "Created" +msgstr "" + +#: authtoken/models.py:27 authtoken/serializers.py:19 +msgid "Token" +msgstr "" + +#: authtoken/models.py:28 +msgid "Tokens" +msgstr "" + +#: authtoken/serializers.py:9 +msgid "Username" +msgstr "Имя пользователя" + +#: authtoken/serializers.py:13 +msgid "Password" +msgstr "Пароль" + +#: authtoken/serializers.py:35 +msgid "Unable to log in with provided credentials." +msgstr "" + +#: authtoken/serializers.py:38 +msgid "Must include \"username\" and \"password\"." +msgstr "" + +#: exceptions.py:102 +msgid "A server error occurred." +msgstr "Ошибка сервера." + +#: exceptions.py:142 +msgid "Invalid input." +msgstr "" + +#: exceptions.py:161 +msgid "Malformed request." +msgstr "" + +#: exceptions.py:167 +msgid "Incorrect authentication credentials." +msgstr "" + +#: exceptions.py:173 +msgid "Authentication credentials were not provided." +msgstr "" + +#: exceptions.py:179 +msgid "You do not have permission to perform this action." +msgstr "У вас недостаточно прав для выполнения данного действия." + +#: exceptions.py:185 +msgid "Not found." +msgstr "Страница не найдена." + +#: exceptions.py:191 +#, python-brace-format +msgid "Method \"{method}\" not allowed." +msgstr "" + +#: exceptions.py:202 +msgid "Could not satisfy the request Accept header." +msgstr "" + +#: exceptions.py:212 +#, python-brace-format +msgid "Unsupported media type \"{media_type}\" in request." +msgstr "" + +#: exceptions.py:223 +msgid "Request was throttled." +msgstr "" + +#: exceptions.py:224 +#, python-brace-format +msgid "Expected available in {wait} second." +msgstr "" + +#: exceptions.py:225 +#, python-brace-format +msgid "Expected available in {wait} seconds." +msgstr "" + +#: fields.py:316 relations.py:245 relations.py:279 validators.py:90 +#: validators.py:183 +msgid "This field is required." +msgstr "Обязательное поле." + +#: fields.py:317 +msgid "This field may not be null." +msgstr "Это поле не может быть пустым." + +#: fields.py:701 +msgid "Must be a valid boolean." +msgstr "" + +#: fields.py:766 +msgid "Not a valid string." +msgstr "" + +#: fields.py:767 +msgid "This field may not be blank." +msgstr "Это поле не может быть пустым." + +#: fields.py:768 fields.py:1881 +#, python-brace-format +msgid "Ensure this field has no more than {max_length} characters." +msgstr "Убедитесь, что это значение содержит не более {max_length} символов." + +#: fields.py:769 +#, python-brace-format +msgid "Ensure this field has at least {min_length} characters." +msgstr "Убедитесь, что это значение содержит не менее {min_length} символов." + +#: fields.py:816 +msgid "Enter a valid email address." +msgstr "Введите правильный адрес электронной почты." + +#: fields.py:827 +msgid "This value does not match the required pattern." +msgstr "" + +#: fields.py:838 +msgid "" +"Enter a valid \"slug\" consisting of letters, numbers, underscores or " +"hyphens." +msgstr "Значение должно состоять только из букв, цифр, символов подчёркивания или дефисов, входящих в стандарт Юникод." + +#: fields.py:839 +msgid "" +"Enter a valid \"slug\" consisting of Unicode letters, numbers, underscores, " +"or hyphens." +msgstr "" + +#: fields.py:854 +msgid "Enter a valid URL." +msgstr "Введите правильный URL." + +#: fields.py:867 +msgid "Must be a valid UUID." +msgstr "" + +#: fields.py:903 +msgid "Enter a valid IPv4 or IPv6 address." +msgstr "Введите действительный IPv4 или IPv6 адрес." + +#: fields.py:931 +msgid "A valid integer is required." +msgstr "Введите правильное число." + +#: fields.py:932 fields.py:969 fields.py:1005 fields.py:1366 +#, python-brace-format +msgid "Ensure this value is less than or equal to {max_value}." +msgstr "Убедитесь, что это значение меньше либо равно {max_value}." + +#: fields.py:933 fields.py:970 fields.py:1006 fields.py:1367 +#, python-brace-format +msgid "Ensure this value is greater than or equal to {min_value}." +msgstr "Убедитесь, что это значение больше либо равно {min_value}." + +#: fields.py:934 fields.py:971 fields.py:1010 +msgid "String value too large." +msgstr "" + +#: fields.py:968 fields.py:1004 +msgid "A valid number is required." +msgstr "" + +#: fields.py:1007 +#, python-brace-format +msgid "Ensure that there are no more than {max_digits} digits in total." +msgstr "Убедитесь, что вы ввели не более {max_digits} цифры." + +#: fields.py:1008 +#, python-brace-format +msgid "" +"Ensure that there are no more than {max_decimal_places} decimal places." +msgstr "Убедитесь, что вы ввели не более {max_decimal_places} цифры после запятой." + +#: fields.py:1009 +#, python-brace-format +msgid "" +"Ensure that there are no more than {max_whole_digits} digits before the " +"decimal point." +msgstr "Убедитесь, что вы ввели не более {max_whole_digits} цифры перед запятой." + +#: fields.py:1148 +#, python-brace-format +msgid "Datetime has wrong format. Use one of these formats instead: {format}." +msgstr "" + +#: fields.py:1149 +msgid "Expected a datetime but got a date." +msgstr "" + +#: fields.py:1150 +#, python-brace-format +msgid "Invalid datetime for the timezone \"{timezone}\"." +msgstr "" + +#: fields.py:1151 +msgid "Datetime value out of range." +msgstr "" + +#: fields.py:1236 +#, python-brace-format +msgid "Date has wrong format. Use one of these formats instead: {format}." +msgstr "" + +#: fields.py:1237 +msgid "Expected a date but got a datetime." +msgstr "" + +#: fields.py:1303 +#, python-brace-format +msgid "Time has wrong format. Use one of these formats instead: {format}." +msgstr "" + +#: fields.py:1365 +#, python-brace-format +msgid "Duration has wrong format. Use one of these formats instead: {format}." +msgstr "" + +#: fields.py:1399 fields.py:1456 +#, python-brace-format +msgid "\"{input}\" is not a valid choice." +msgstr "Значения {input} нет среди допустимых вариантов." + +#: fields.py:1402 +#, python-brace-format +msgid "More than {count} items..." +msgstr "" + +#: fields.py:1457 fields.py:1603 relations.py:485 serializers.py:570 +#, python-brace-format +msgid "Expected a list of items but got type \"{input_type}\"." +msgstr "" + +#: fields.py:1458 +msgid "This selection may not be empty." +msgstr "" + +#: fields.py:1495 +#, python-brace-format +msgid "\"{input}\" is not a valid path choice." +msgstr "" + +#: fields.py:1514 +msgid "No file was submitted." +msgstr "Ни одного файла не было отправлено." + +#: fields.py:1515 +msgid "" +"The submitted data was not a file. Check the encoding type on the form." +msgstr "" + +#: fields.py:1516 +msgid "No filename could be determined." +msgstr "" + +#: fields.py:1517 +msgid "The submitted file is empty." +msgstr "Отправленный файл пуст." + +#: fields.py:1518 +#, python-brace-format +msgid "" +"Ensure this filename has at most {max_length} characters (it has {length})." +msgstr "Убедитесь, что это имя файла содержит не более {max_length} символов (сейчас {length})." + +#: fields.py:1566 +msgid "" +"Upload a valid image. The file you uploaded was either not an image or a " +"corrupted image." +msgstr "Загрузите правильное изображение. Файл, который вы загрузили, поврежден или не является изображением." + +#: fields.py:1604 relations.py:486 serializers.py:571 +msgid "This list may not be empty." +msgstr "" + +#: fields.py:1605 +#, python-brace-format +msgid "Ensure this field has at least {min_length} elements." +msgstr "" + +#: fields.py:1606 +#, python-brace-format +msgid "Ensure this field has no more than {max_length} elements." +msgstr "" + +#: fields.py:1682 +#, python-brace-format +msgid "Expected a dictionary of items but got type \"{input_type}\"." +msgstr "" + +#: fields.py:1683 +msgid "This dictionary may not be empty." +msgstr "" + +#: fields.py:1755 +msgid "Value must be valid JSON." +msgstr "" + +#: filters.py:49 templates/rest_framework/filters/search.html:2 +msgid "Search" +msgstr "" + +#: filters.py:50 +msgid "A search term." +msgstr "" + +#: filters.py:180 templates/rest_framework/filters/ordering.html:3 +msgid "Ordering" +msgstr "Сортировка" + +#: filters.py:181 +msgid "Which field to use when ordering the results." +msgstr "" + +#: filters.py:287 +msgid "ascending" +msgstr "по возрастанию" + +#: filters.py:288 +msgid "descending" +msgstr "по убыванию" + +#: pagination.py:174 +msgid "A page number within the paginated result set." +msgstr "" + +#: pagination.py:179 pagination.py:372 pagination.py:590 +msgid "Number of results to return per page." +msgstr "" + +#: pagination.py:189 +msgid "Invalid page." +msgstr "" + +#: pagination.py:374 +msgid "The initial index from which to return the results." +msgstr "" + +#: pagination.py:581 +msgid "The pagination cursor value." +msgstr "" + +#: pagination.py:583 +msgid "Invalid cursor" +msgstr "" + +#: relations.py:246 +#, python-brace-format +msgid "Invalid pk \"{pk_value}\" - object does not exist." +msgstr "" + +#: relations.py:247 +#, python-brace-format +msgid "Incorrect type. Expected pk value, received {data_type}." +msgstr "" + +#: relations.py:280 +msgid "Invalid hyperlink - No URL match." +msgstr "" + +#: relations.py:281 +msgid "Invalid hyperlink - Incorrect URL match." +msgstr "" + +#: relations.py:282 +msgid "Invalid hyperlink - Object does not exist." +msgstr "" + +#: relations.py:283 +#, python-brace-format +msgid "Incorrect type. Expected URL string, received {data_type}." +msgstr "" + +#: relations.py:448 +#, python-brace-format +msgid "Object with {slug_name}={value} does not exist." +msgstr "" + +#: relations.py:449 +msgid "Invalid value." +msgstr "Введите правильное значение." + +#: schemas/utils.py:32 +msgid "unique integer value" +msgstr "" + +#: schemas/utils.py:34 +msgid "UUID string" +msgstr "" + +#: schemas/utils.py:36 +msgid "unique value" +msgstr "" + +#: schemas/utils.py:38 +#, python-brace-format +msgid "A {value_type} identifying this {name}." +msgstr "" + +#: serializers.py:337 +#, python-brace-format +msgid "Invalid data. Expected a dictionary, but got {datatype}." +msgstr "" + +#: templates/rest_framework/admin.html:116 +#: templates/rest_framework/base.html:136 +msgid "Extra Actions" +msgstr "" + +#: templates/rest_framework/admin.html:130 +#: templates/rest_framework/base.html:150 +msgid "Filters" +msgstr "Фильтры" + +#: templates/rest_framework/base.html:37 +msgid "navbar" +msgstr "" + +#: templates/rest_framework/base.html:75 +msgid "content" +msgstr "" + +#: templates/rest_framework/base.html:78 +msgid "request form" +msgstr "" + +#: templates/rest_framework/base.html:157 +msgid "main content" +msgstr "" + +#: templates/rest_framework/base.html:173 +msgid "request info" +msgstr "" + +#: templates/rest_framework/base.html:177 +msgid "response info" +msgstr "" + +#: templates/rest_framework/horizontal/radio.html:4 +#: templates/rest_framework/inline/radio.html:3 +#: templates/rest_framework/vertical/radio.html:3 +msgid "None" +msgstr "" + +#: templates/rest_framework/horizontal/select_multiple.html:4 +#: templates/rest_framework/inline/select_multiple.html:3 +#: templates/rest_framework/vertical/select_multiple.html:3 +msgid "No items to select." +msgstr "" + +#: validators.py:39 +msgid "This field must be unique." +msgstr "Значения поля должны быть уникальны." + +#: validators.py:89 +#, python-brace-format +msgid "The fields {field_names} must make a unique set." +msgstr "" + +#: validators.py:171 +#, python-brace-format +msgid "Surrogate characters are not allowed: U+{code_point:X}." +msgstr "" + +#: validators.py:243 +#, python-brace-format +msgid "This field must be unique for the \"{date_field}\" date." +msgstr "" + +#: validators.py:258 +#, python-brace-format +msgid "This field must be unique for the \"{date_field}\" month." +msgstr "" + +#: validators.py:271 +#, python-brace-format +msgid "This field must be unique for the \"{date_field}\" year." +msgstr "" + +#: versioning.py:40 +msgid "Invalid version in \"Accept\" header." +msgstr "" + +#: versioning.py:71 +msgid "Invalid version in URL path." +msgstr "" + +#: versioning.py:116 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:148 +msgid "Invalid version in hostname." +msgstr "" + +#: versioning.py:170 +msgid "Invalid version in query parameter." +msgstr "" diff --git a/rest_framework/locale/sk/LC_MESSAGES/django.mo b/rest_framework/locale/sk/LC_MESSAGES/django.mo index c82ae3e09733c4e8a03e23eec9a04bfdbba7635c..561c98e98847ec949c767ff3a251f017130b8dc9 100644 GIT binary patch delta 1748 zcmY+^eQ4EH9LMpmYtD!1u5LG{*0!@vHy^fn@7;rW@9yq(o6f02G!res4V89tY;NK# zur5(*#QN(p{}6*Dk_Lg;`e%v{K?s8X7!m|#5R%A(#0V*)e1Cqw+hm9Py{~hAkLR54 zIlnWVw>r}I3Ufz|(m}jT?94Ii!I514C=2q;94^Gg7(rdP1z*Bmti=zp2EWEu{24c5 z#Vr5XDNNG7h`aDHt~EA@^;h-3eX0D^A{vUh`qYSeJzrbd^kNdHlw`s&DumaCvCw{k>`AgpTU@iWJn!%;yA%UB5FMf>e_#jP1 z+oYz1Erv(X;R!6l^Qg6O3Cr-8tU1i17Gnjj!!FcJp28OV3U&Qt_IN%GJwJp=Y(>p@ z`U5I8RIcJqoWwUV>Bt*?iOjCuKz{a9)_<{$c3HW%zF~w z!vtQ#VeS9_sA$m)SNgdb!x^--AYULf?M*~0!E739a9XLF*77@}RA{v9Xm1^8AS;RW z1pTpD1WUl?YyYb^|Ceei>b(lvda7t-d}l04C@rLas%T5r6ZG3lNgQK@3S;wjfY;!U zb!>d!yuw=7_@5W$LxnG=wEEj-PbN*fU(>WFqig*9t438hUb&{t54 zF+iv&-Hr$oOUn3T4SF94eeJZrwV+BfU3n#$k-XXC<9QSLnUjT|7DPg|VSe>4ye`_% zmej#to+ z>uW^zVi*T-67R)V@c>@Mgh)v`H;5djqk#Ky4STVwR^)!{!zez7di^4f;$PT^$vSrc zk7FzClNHaQ{?8}ag@5B+7}@Cl-y_(=`(>F*KNr5hLEOAaB!Ca%W;~5Ocoy67Q`C%H z!w&S;iv+PB^|?8W&y{u!ojTC%*u?uKsug^=a-oPivlmcPy@I=N4Y%Vp zG+4Vugh@#U?!zwB>uJ0NpGFMo;5*wKI1m-b;m+%D) zuAyck!0>&T#1Wju1ip(8;U74Lqol>)In<1NjGF2y{$vu9IE*W(FZ>mmyaY+RK0m1W z_fuKMeYlFc8GpmaFx)IMglADdpRbTCOB4As7{G1#0O}q|;ZA(M;tJ{}{S5EM-%&Fe zO;FJXmiW;N@1VZmYfRuzs43rT-0yiB$7wI&G+sf*Bx5b^=F1^n@=V3^I7s^v z>Q}Uhw07Yz^1hNRQqh^ef`{=-OyI6oHxo0sK>H2U0q*2SH`5Sut2~A4PzT8^PBwL> zS~T@K%K#B3w6JBI&$tF7`u$%oES-~jZ4VIaLAgmA6qZeP6S}rKi#CES;0*jej1m7Y zoKH?BwOY+p*|)f0W#`kUd?r&ccCKhFLq}%HOiYXnT?l$U z*tpF~rE>FjQE!;a6s+Uf^i=uBhS!Ee`~ATle=ux9k!V-Xo*<=e)G8GH<9W+2WUXQ@ zA2s7Mxml}V250h_LNSvzv0`pEL8K}j<`IT-FWbJ_X4m5sOC@px#r={G?WHSKm^ zywkL`89Nq_XlIDd&fYrlEoSVw`67cpk#>h`uYP21%&W=U{jYi1yp`ML7?8dCraP}g U-uRZ\n" +"POT-Creation-Date: 2020-10-13 21:45+0200\n" +"PO-Revision-Date: 2020-10-13 19:45+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" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: sk\n" -"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n >= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);\n" -#: authentication.py:73 +#: authentication.py:70 msgid "Invalid basic header. No credentials provided." msgstr "Nesprávna hlavička. Neboli poskytnuté prihlasovacie údaje." -#: authentication.py:76 +#: authentication.py:73 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "Nesprávna hlavička. Prihlasovacie údaje nesmú obsahovať medzery." -#: authentication.py:82 +#: authentication.py:83 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:99 +#: authentication.py:101 msgid "Invalid username/password." msgstr "Nesprávne prihlasovacie údaje." -#: authentication.py:102 authentication.py:198 +#: authentication.py:104 authentication.py:206 msgid "User inactive or deleted." msgstr "Daný používateľ je neaktívny, alebo zmazaný." -#: authentication.py:176 +#: authentication.py:184 msgid "Invalid token header. No credentials provided." msgstr "Nesprávna token hlavička. Neboli poskytnuté prihlasovacie údaje." -#: authentication.py:179 +#: authentication.py:187 msgid "Invalid token header. Token string should not contain spaces." msgstr "Nesprávna token hlavička. Token hlavička nesmie obsahovať medzery." -#: authentication.py:185 +#: authentication.py:193 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:195 +#: authentication.py:203 msgid "Invalid token." msgstr "Nesprávny token." @@ -59,382 +59,515 @@ msgstr "Nesprávny token." msgid "Auth Token" msgstr "" -#: authtoken/models.py:15 +#: authtoken/models.py:13 msgid "Key" msgstr "" -#: authtoken/models.py:18 +#: authtoken/models.py:16 msgid "User" msgstr "" -#: authtoken/models.py:20 +#: authtoken/models.py:18 msgid "Created" msgstr "" -#: authtoken/models.py:29 +#: authtoken/models.py:27 authtoken/serializers.py:19 msgid "Token" msgstr "" -#: authtoken/models.py:30 +#: authtoken/models.py:28 msgid "Tokens" msgstr "" -#: authtoken/serializers.py:8 +#: authtoken/serializers.py:9 msgid "Username" msgstr "" -#: authtoken/serializers.py:9 +#: authtoken/serializers.py:13 msgid "Password" msgstr "" -#: authtoken/serializers.py:20 -msgid "User account is disabled." -msgstr "Daný používateľ je zablokovaný." - -#: authtoken/serializers.py:23 +#: authtoken/serializers.py:35 msgid "Unable to log in with provided credentials." msgstr "S danými prihlasovacími údajmi nebolo možné sa prihlásiť." -#: authtoken/serializers.py:26 +#: authtoken/serializers.py:38 msgid "Must include \"username\" and \"password\"." msgstr "Musí obsahovať parametre \"používateľské meno\" a \"heslo\"." -#: exceptions.py:49 +#: exceptions.py:102 msgid "A server error occurred." msgstr "Vyskytla sa chyba na strane servera." -#: exceptions.py:84 +#: exceptions.py:142 +msgid "Invalid input." +msgstr "" + +#: exceptions.py:161 msgid "Malformed request." msgstr "Požiadavok má nesprávny formát, alebo je poškodený." -#: exceptions.py:89 +#: exceptions.py:167 msgid "Incorrect authentication credentials." msgstr "Nesprávne prihlasovacie údaje." -#: exceptions.py:94 +#: exceptions.py:173 msgid "Authentication credentials were not provided." msgstr "Prihlasovacie údaje neboli zadané." -#: exceptions.py:99 +#: exceptions.py:179 msgid "You do not have permission to perform this action." msgstr "K danej akcii nemáte oprávnenie." -#: exceptions.py:104 views.py:81 +#: exceptions.py:185 msgid "Not found." msgstr "Nebolo nájdené." -#: exceptions.py:109 +#: exceptions.py:191 +#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "Metóda \"{method}\" nie je povolená." -#: exceptions.py:120 +#: exceptions.py:202 msgid "Could not satisfy the request Accept header." msgstr "Nie je možné vyhovieť požiadavku v hlavičke \"Accept\"." -#: exceptions.py:132 +#: exceptions.py:212 +#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "Požiadavok obsahuje nepodporovaný media type: \"{media_type}\"." -#: exceptions.py:145 +#: exceptions.py:223 msgid "Request was throttled." msgstr "Požiadavok bol obmedzený, z dôvodu prekročenia limitu." -#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 -#: validators.py:181 +#: exceptions.py:224 +#, python-brace-format +msgid "Expected available in {wait} second." +msgstr "" + +#: exceptions.py:225 +#, python-brace-format +msgid "Expected available in {wait} seconds." +msgstr "" + +#: fields.py:316 relations.py:245 relations.py:279 validators.py:90 +#: validators.py:183 msgid "This field is required." msgstr "Toto pole je povinné." -#: fields.py:270 +#: fields.py:317 msgid "This field may not be null." msgstr "Toto pole nemôže byť nulové." -#: fields.py:608 fields.py:639 -msgid "\"{input}\" is not a valid boolean." -msgstr "\"{input}\" je validný boolean." +#: fields.py:701 +msgid "Must be a valid boolean." +msgstr "" -#: fields.py:674 +#: fields.py:766 +msgid "Not a valid string." +msgstr "" + +#: fields.py:767 msgid "This field may not be blank." msgstr "Toto pole nemože byť prázdne." -#: fields.py:675 fields.py:1675 +#: fields.py:768 fields.py:1881 +#, 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." -#: fields.py:676 +#: fields.py:769 +#, python-brace-format msgid "Ensure this field has at least {min_length} characters." msgstr "Uistite sa, že toto pole má viac ako {min_length} znakov." -#: fields.py:713 +#: fields.py:816 msgid "Enter a valid email address." msgstr "Vložte správnu emailovú adresu." -#: fields.py:724 +#: fields.py:827 msgid "This value does not match the required pattern." msgstr "Toto pole nezodpovedá požadovanému formátu." -#: fields.py:735 +#: fields.py:838 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:747 +#: fields.py:839 +msgid "" +"Enter a valid \"slug\" consisting of Unicode letters, numbers, underscores, " +"or hyphens." +msgstr "" + +#: fields.py:854 msgid "Enter a valid URL." msgstr "Zadajte platnú URL adresu." -#: fields.py:760 -msgid "\"{value}\" is not a valid UUID." -msgstr "\"{value}\" nie je platné UUID." +#: fields.py:867 +msgid "Must be a valid UUID." +msgstr "" -#: fields.py:796 +#: fields.py:903 msgid "Enter a valid IPv4 or IPv6 address." msgstr "" -#: fields.py:821 +#: fields.py:931 msgid "A valid integer is required." msgstr "Je vyžadované celé číslo." -#: fields.py:822 fields.py:857 fields.py:891 +#: fields.py:932 fields.py:969 fields.py:1005 fields.py:1366 +#, python-brace-format 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:823 fields.py:858 fields.py:892 +#: fields.py:933 fields.py:970 fields.py:1006 fields.py:1367 +#, python-brace-format 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:824 fields.py:859 fields.py:896 +#: fields.py:934 fields.py:971 fields.py:1010 msgid "String value too large." msgstr "Zadaný textový reťazec je príliš dlhý." -#: fields.py:856 fields.py:890 +#: fields.py:968 fields.py:1004 msgid "A valid number is required." msgstr "Je vyžadované číslo." -#: fields.py:893 +#: fields.py:1007 +#, python-brace-format 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:894 +#: fields.py:1008 +#, python-brace-format 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:895 +#: fields.py:1009 +#, python-brace-format 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:1025 +#: fields.py:1148 +#, python-brace-format 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:1026 +#: fields.py:1149 msgid "Expected a datetime but got a date." msgstr "Vložený len dátum - date namiesto dátumu a času - datetime." -#: fields.py:1103 +#: fields.py:1150 +#, python-brace-format +msgid "Invalid datetime for the timezone \"{timezone}\"." +msgstr "" + +#: fields.py:1151 +msgid "Datetime value out of range." +msgstr "" + +#: fields.py:1236 +#, 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:1104 +#: fields.py:1237 msgid "Expected a date but got a datetime." msgstr "Vložený dátum a čas - datetime namiesto jednoduchého dátumu - date." -#: fields.py:1170 +#: fields.py:1303 +#, 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:1232 +#: fields.py:1365 +#, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1251 fields.py:1300 +#: fields.py:1399 fields.py:1456 +#, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" je nesprávny výber z daných možností." -#: fields.py:1254 relations.py:71 relations.py:441 +#: fields.py:1402 +#, python-brace-format msgid "More than {count} items..." msgstr "" -#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 +#: fields.py:1457 fields.py:1603 relations.py:485 serializers.py:570 +#, 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:1302 +#: fields.py:1458 msgid "This selection may not be empty." msgstr "" -#: fields.py:1339 +#: fields.py:1495 +#, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1358 +#: fields.py:1514 msgid "No file was submitted." msgstr "Nebol odoslaný žiadny súbor." -#: fields.py:1359 +#: fields.py:1515 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:1360 +#: fields.py:1516 msgid "No filename could be determined." msgstr "Nebolo možné určiť meno súboru." -#: fields.py:1361 +#: fields.py:1517 msgid "The submitted file is empty." msgstr "Odoslaný súbor je prázdny." -#: fields.py:1362 +#: fields.py:1518 +#, 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:1410 +#: fields.py:1566 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:1449 relations.py:438 serializers.py:525 +#: fields.py:1604 relations.py:486 serializers.py:571 msgid "This list may not be empty." msgstr "" -#: fields.py:1502 +#: fields.py:1605 +#, python-brace-format +msgid "Ensure this field has at least {min_length} elements." +msgstr "" + +#: fields.py:1606 +#, python-brace-format +msgid "Ensure this field has no more than {max_length} elements." +msgstr "" + +#: fields.py:1682 +#, 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:1549 +#: fields.py:1683 +msgid "This dictionary may not be empty." +msgstr "" + +#: fields.py:1755 msgid "Value must be valid JSON." msgstr "" -#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 -msgid "Submit" +#: filters.py:49 templates/rest_framework/filters/search.html:2 +msgid "Search" msgstr "" -#: filters.py:336 +#: filters.py:50 +msgid "A search term." +msgstr "" + +#: filters.py:180 templates/rest_framework/filters/ordering.html:3 +msgid "Ordering" +msgstr "" + +#: filters.py:181 +msgid "Which field to use when ordering the results." +msgstr "" + +#: filters.py:287 msgid "ascending" msgstr "" -#: filters.py:337 +#: filters.py:288 msgid "descending" msgstr "" -#: pagination.py:193 +#: pagination.py:174 +msgid "A page number within the paginated result set." +msgstr "" + +#: pagination.py:179 pagination.py:372 pagination.py:590 +msgid "Number of results to return per page." +msgstr "" + +#: pagination.py:189 msgid "Invalid page." msgstr "" -#: pagination.py:427 +#: pagination.py:374 +msgid "The initial index from which to return the results." +msgstr "" + +#: pagination.py:581 +msgid "The pagination cursor value." +msgstr "" + +#: pagination.py:583 msgid "Invalid cursor" msgstr "Nesprávny kurzor." -#: relations.py:207 +#: relations.py:246 +#, 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 +#: relations.py:247 +#, 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:240 +#: relations.py:280 msgid "Invalid hyperlink - No URL match." msgstr "Nesprávny hypertextový odkaz - žiadna zhoda." -#: relations.py:241 +#: relations.py:281 msgid "Invalid hyperlink - Incorrect URL match." msgstr "Nesprávny hypertextový odkaz - chybná URL." -#: relations.py:242 +#: relations.py:282 msgid "Invalid hyperlink - Object does not exist." msgstr "Nesprávny hypertextový odkaz - požadovný objekt neexistuje." -#: relations.py:243 +#: relations.py:283 +#, 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:401 +#: relations.py:448 +#, 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:402 +#: relations.py:449 msgid "Invalid value." msgstr "Nesprávna hodnota." -#: serializers.py:326 +#: schemas/utils.py:32 +msgid "unique integer value" +msgstr "" + +#: schemas/utils.py:34 +msgid "UUID string" +msgstr "" + +#: schemas/utils.py:36 +msgid "unique value" +msgstr "" + +#: schemas/utils.py:38 +#, python-brace-format +msgid "A {value_type} identifying this {name}." +msgstr "" + +#: serializers.py:337 +#, 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:116 -#: templates/rest_framework/base.html:128 +#: templates/rest_framework/base.html:136 +msgid "Extra Actions" +msgstr "" + +#: templates/rest_framework/admin.html:130 +#: templates/rest_framework/base.html:150 msgid "Filters" msgstr "" -#: templates/rest_framework/filters/django_filter.html:2 -#: templates/rest_framework/filters/django_filter_crispyforms.html:4 -msgid "Field filters" +#: templates/rest_framework/base.html:37 +msgid "navbar" msgstr "" -#: templates/rest_framework/filters/ordering.html:3 -msgid "Ordering" +#: templates/rest_framework/base.html:75 +msgid "content" msgstr "" -#: templates/rest_framework/filters/search.html:2 -msgid "Search" +#: templates/rest_framework/base.html:78 +msgid "request form" msgstr "" -#: templates/rest_framework/horizontal/radio.html:2 -#: templates/rest_framework/inline/radio.html:2 -#: templates/rest_framework/vertical/radio.html:2 +#: templates/rest_framework/base.html:157 +msgid "main content" +msgstr "" + +#: templates/rest_framework/base.html:173 +msgid "request info" +msgstr "" + +#: templates/rest_framework/base.html:177 +msgid "response info" +msgstr "" + +#: templates/rest_framework/horizontal/radio.html:4 +#: templates/rest_framework/inline/radio.html:3 +#: templates/rest_framework/vertical/radio.html:3 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 +#: templates/rest_framework/horizontal/select_multiple.html:4 +#: templates/rest_framework/inline/select_multiple.html:3 +#: templates/rest_framework/vertical/select_multiple.html:3 msgid "No items to select." msgstr "" -#: validators.py:43 +#: validators.py:39 msgid "This field must be unique." msgstr "Táto položka musí byť unikátna." -#: validators.py:97 +#: validators.py:89 +#, python-brace-format 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:245 +#: validators.py:171 +#, python-brace-format +msgid "Surrogate characters are not allowed: U+{code_point:X}." +msgstr "" + +#: validators.py:243 +#, python-brace-format 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:260 +#: validators.py:258 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" month." msgstr "Položka musí byť pre mesiac \"{date_field}\" unikátna." -#: validators.py:273 +#: validators.py:271 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" year." msgstr "Položka musí byť pre rok \"{date_field}\" unikátna." -#: versioning.py:42 +#: versioning.py:40 msgid "Invalid version in \"Accept\" header." msgstr "Nesprávna verzia v \"Accept\" hlavičke." -#: versioning.py:73 +#: versioning.py:71 msgid "Invalid version in URL path." msgstr "Nesprávna verzia v URL adrese." -#: versioning.py:115 +#: versioning.py:116 msgid "Invalid version in URL path. Does not match any version namespace." msgstr "" -#: versioning.py:147 +#: versioning.py:148 msgid "Invalid version in hostname." msgstr "Nesprávna verzia v \"hostname\"." -#: versioning.py:169 +#: versioning.py:170 msgid "Invalid version in query parameter." msgstr "Nesprávna verzia v parametri požiadavku." - -#: views.py:88 -msgid "Permission denied." -msgstr "" diff --git a/rest_framework/locale/sl/LC_MESSAGES/django.mo b/rest_framework/locale/sl/LC_MESSAGES/django.mo index 33aba7cf4cf2c5b5626d26774d5915b2daedfe53..7ec83f821634b41b2c0a9f5ffef75ec33aedf0d6 100644 GIT binary patch delta 2244 zcmYk+e@vBC9LMo5!R3b%#YK^;Xcr@afE%C}`7MfR{78`aA!f?$#~OuR1tYVzXO`w_ zgIag4+G0_o#>ju#t<{?UXl=GyYpc<8W2RfS{-|ip*{n5sf1dleb;kF;&hzlx^PF?O z-*bQKI<~{PiM99JAV66ElpWR`@jP1(R5V7jP41XPLF&P7L8Gfu;;M?U&Rof#a7;Lf6!^fy4w>29>JAdpY*QZMXl^Z)QaX%TluGV z9nMbtzZ;XeKZe?YqqqjgQRAJ)B0P_|xPVTOPAX65U=gNZJ+kZ8jQ3zWl16*h^EhgN zaa5U1;|lx$EAVqvO0S_N+`!=a{{ZUx5UOS-a@hZBI!w=Ge|aV9!v07+<>{fMB}z&8}?!^PC0Zs=v+rtWebT? z(KxsjXHhFzKn+yDcHEDBsQc5NKcL1*XMfjWFKU9%p(gkms^~sJ?a;b;ClQTNwY0t4f@#zy|5kmiXBAl!~{}r_9-fbUm+=X z>~A_6xGHG28IPg{JcAnOTO`eP4T~^?+0nI1)E0K5UND1Y_#J8?i>Pr@$rp380BS-t zSdM*|r}KZDjs}=SRq1(5!5>jI@Du7>FQCqG9%oTSw+_jQm0=ogM^2=5Vm%JxW_%0v z+$GdPZXmmFS*&g)@3&Gq+LCRkoQ|Q6(G2Rri>LvvBb#N}{7R`tD)BztgIe)>sEM3L z?Zii@ajsw|`Y8+*;ls%0*f2Vp@q~BdZRF3+^1+Xp{et?!Uzmi+go;etdb25YDl|3i zj-Kx!v;!(MwOT?c&=DUb_7SQrn&WPndSOBZvWMs+ZZ_pyyQ1n>I)a4SZsJ~IC!yV8 zk=9SBIMtRWum@0QU2Q9&g{d_VWy=5moANc_-B5LFH+B(CgmR~*Emb`{M5GXPL>0kL zgnKl>{SD|w6)5Spy+kX)DR-OF)=XsT{mO;%sYZ%zhucf!)a$xO%dHV^s0P$j#TrclWaax}kLOg!r*n#uV^?$M+NvtbEBRX=tgNlu5H78tE$N7i9xm@0i5wUm zjvS7T)CG4%#)cjn33iS=8a?#XGr@)<(L}F#c<4ZMY$y_XB)Y#T{`-oyq*#9-6rT#@ Y`{G}&dBqpoUsxTVE%YbHE*Fje2Ra4c5C8xG delta 2549 zcmZYATWl0n9LMp~ZnrHIS}hbxu`rZdxwKMfX|1-U7lD?F1qw(7ako3vDcc#cyKO|o zl?Mz2A;yX^-~|#)3@^r%p!gsW&}a-V5)BE7(MV!^z!)Mv)SCGH%?{zg6aMo#b2>Y7 z&j0*pIJEIjPx`0goRfyOhj@hO4jFS4U(V$~JCkqBJUojQUd4rY8|UEUNye1o64dY8 za5nD7$#?*(@HJeH7cdWh!8T*k=65=48CcHMGKuT(b6kVj1;%W{cC5!!_&9!#8?bPS zF^$-V`uj=j#_KpA%cdGrjLoPCZbFT_zG-9Lq@x>N#5%l-{4nVGIet+*NWpcppb z2iSr)u^mf`jH$+*$dEaPy6zNK;tf|G?K=2CDz5&V4?%MUT$gvvxK2W?$1rgg(4oyB+pXW&J&@H$Sz zKQITgIbl~!9zKf2NEw*6zzxWyrWbXe0aO{if-~`OaQ+@@!RMy2|Jv&x7|;sJr)Mr~ zM4fL&6_ban@fd24uLS4gs0GxNWUlK*i}M#y6FiE3Mlj6z1ZqOr%x)P@nnC_+=+rT= z0|!tm{Ss&4*MUEyRyrP>hgi-^&dZVdH9e@z^x@?!V{BB47jlzw?7#|)q9%M8nTt7- zrn7*~MVyPbkoqwH;1Vq0>RPNrJ!lZSFoj$3GOF53NRx^-$FEwGSu>OO1m zDI7+Pr>_Q`d#D>NX1a?og__}M)C50473Ytr)P-4|wyp-7aX<1#n$J)vzJ{vy?{GEV z!6sb5D)qZ4^7^LDc{-~Y_#0I`ORdan(}a5P2=YvG8kLbtNMV~_QG0w3>v17Z(~Wmw zD}IQ&-*2ek4%CGDu?i2N zzJMR2e*X=!{pK#_;AEbz+9*PO2g*?2mv#*Ee6xv;QoSA7PBVmgcm(+bm^V-pIg8rk zkFXVQqpn}X*GVgDMRw6_Lyad<89IU5>n~8R-JhuI=CRNI``=85?3*2^;@OYu@f_yj z9n^&WLS<$Gb)zNZ@oDTs73X9l?(I?Fo()m!ED8JVSI5VL}VlB9)<5?f)h^YTDB$ z{a$8YchY~JSVt@)v|=^QT-&8RTuYEmzjbizCHe`~i!!LD45{fY$oG4hI#G9*_P-|> z)E>15eG9dB&l1_h9)efd|DRArs1_nrXf4DJLQUybEkuYIkw>U$JM`AvZ#JDABE6f# z6ha>bw#jTHRAf=2me8A_*Gv1hnb13|)=c#Iy$6RibooH~HK5Vwh+Kj?^;;W96`oo{ zhAsX_g^!)z9^<%$=+2z_{|goc{gr{H;(+7s8%`apu$-jjdMPVnjYQ&3%!+zm+>W@_ zqm}vV%PS5rIBfs_s;yf)JI37nP`JR3$E-b0JY^@6WA4`HNEXnLf--y3#QdUVW5Mxt?Dbi3qMVNHG2iiWBctE`&Z#=3^l z>oaB+txMPgUczd3hPZFU9h)?>E33eEAI!6*w5{yHJYB~cvEzf05iap3`D$r-IL}U4 z`@Hzz*gNHKg-bfT5&E_}Xj?BuMiS_H)uYSi*XN`XF=uS|{F2b@ug>mutVHD6@nP5E TI?uI-yaDgpaht^KUG(;Ua?K=& diff --git a/rest_framework/locale/sl/LC_MESSAGES/django.po b/rest_framework/locale/sl/LC_MESSAGES/django.po index 9af0fc8fc..205190383 100644 --- a/rest_framework/locale/sl/LC_MESSAGES/django.po +++ b/rest_framework/locale/sl/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-07-12 16:13+0100\n" -"PO-Revision-Date: 2017-08-03 14:58+0000\n" -"Last-Translator: Gregor Cimerman\n" +"POT-Creation-Date: 2020-10-13 21:45+0200\n" +"PO-Revision-Date: 2020-10-13 19:45+0000\n" +"Last-Translator: Xavier Ordoquy \n" "Language-Team: Slovenian (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/sl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,40 +18,40 @@ msgstr "" "Language: sl\n" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" -#: authentication.py:73 +#: authentication.py:70 msgid "Invalid basic header. No credentials provided." msgstr "Napačno enostavno zagalvje. Ni podanih poverilnic." -#: authentication.py:76 +#: authentication.py:73 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "Napačno enostavno zaglavje. Poverilniški niz ne sme vsebovati presledkov." -#: authentication.py:82 +#: authentication.py:83 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Napačno enostavno zaglavje. Poverilnice niso pravilno base64 kodirane." -#: authentication.py:99 +#: authentication.py:101 msgid "Invalid username/password." msgstr "Napačno uporabniško ime ali geslo." -#: authentication.py:102 authentication.py:198 +#: authentication.py:104 authentication.py:206 msgid "User inactive or deleted." msgstr "Uporabnik neaktiven ali izbrisan." -#: authentication.py:176 +#: authentication.py:184 msgid "Invalid token header. No credentials provided." msgstr "Neveljaven žeton v zaglavju. Ni vsebovanih poverilnic." -#: authentication.py:179 +#: authentication.py:187 msgid "Invalid token header. Token string should not contain spaces." msgstr "Neveljaven žeton v zaglavju. Žeton ne sme vsebovati presledkov." -#: authentication.py:185 +#: authentication.py:193 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "Neveljaven žeton v zaglavju. Žeton ne sme vsebovati napačnih znakov." -#: authentication.py:195 +#: authentication.py:203 msgid "Invalid token." msgstr "Neveljaven žeton." @@ -59,382 +59,515 @@ msgstr "Neveljaven žeton." msgid "Auth Token" msgstr "Prijavni žeton" -#: authtoken/models.py:15 +#: authtoken/models.py:13 msgid "Key" msgstr "Ključ" -#: authtoken/models.py:18 +#: authtoken/models.py:16 msgid "User" msgstr "Uporabnik" -#: authtoken/models.py:20 +#: authtoken/models.py:18 msgid "Created" msgstr "Ustvarjen" -#: authtoken/models.py:29 +#: authtoken/models.py:27 authtoken/serializers.py:19 msgid "Token" msgstr "Žeton" -#: authtoken/models.py:30 +#: authtoken/models.py:28 msgid "Tokens" msgstr "Žetoni" -#: authtoken/serializers.py:8 +#: authtoken/serializers.py:9 msgid "Username" msgstr "Uporabniško ime" -#: authtoken/serializers.py:9 +#: authtoken/serializers.py:13 msgid "Password" msgstr "Geslo" -#: authtoken/serializers.py:20 -msgid "User account is disabled." -msgstr "Uporabniški račun je onemogočen." - -#: authtoken/serializers.py:23 +#: authtoken/serializers.py:35 msgid "Unable to log in with provided credentials." msgstr "Neuspešna prijava s podanimi poverilnicami." -#: authtoken/serializers.py:26 +#: authtoken/serializers.py:38 msgid "Must include \"username\" and \"password\"." msgstr "Mora vsebovati \"uporabniško ime\" in \"geslo\"." -#: exceptions.py:49 +#: exceptions.py:102 msgid "A server error occurred." msgstr "Napaka na strežniku." -#: exceptions.py:84 +#: exceptions.py:142 +msgid "Invalid input." +msgstr "" + +#: exceptions.py:161 msgid "Malformed request." msgstr "Okvarjen zahtevek." -#: exceptions.py:89 +#: exceptions.py:167 msgid "Incorrect authentication credentials." msgstr "Napačni avtentikacijski podatki." -#: exceptions.py:94 +#: exceptions.py:173 msgid "Authentication credentials were not provided." msgstr "Avtentikacijski podatki niso bili podani." -#: exceptions.py:99 +#: exceptions.py:179 msgid "You do not have permission to perform this action." msgstr "Nimate dovoljenj za izvedbo te akcije." -#: exceptions.py:104 views.py:81 +#: exceptions.py:185 msgid "Not found." msgstr "Ni najdeno" -#: exceptions.py:109 +#: exceptions.py:191 +#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "Metoda \"{method}\" ni dovoljena" -#: exceptions.py:120 +#: exceptions.py:202 msgid "Could not satisfy the request Accept header." msgstr "Ni bilo mogoče zagotoviti zaglavja Accept zahtevka." -#: exceptions.py:132 +#: exceptions.py:212 +#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "Nepodprt medijski tip \"{media_type}\" v zahtevku." -#: exceptions.py:145 +#: exceptions.py:223 msgid "Request was throttled." msgstr "Zahtevek je bil pridržan." -#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 -#: validators.py:181 +#: exceptions.py:224 +#, python-brace-format +msgid "Expected available in {wait} second." +msgstr "" + +#: exceptions.py:225 +#, python-brace-format +msgid "Expected available in {wait} seconds." +msgstr "" + +#: fields.py:316 relations.py:245 relations.py:279 validators.py:90 +#: validators.py:183 msgid "This field is required." msgstr "To polje je obvezno." -#: fields.py:270 +#: fields.py:317 msgid "This field may not be null." msgstr "To polje ne sme biti null." -#: fields.py:608 fields.py:639 -msgid "\"{input}\" is not a valid boolean." -msgstr "\"{input}\" ni veljaven boolean." +#: fields.py:701 +msgid "Must be a valid boolean." +msgstr "" -#: fields.py:674 +#: fields.py:766 +msgid "Not a valid string." +msgstr "" + +#: fields.py:767 msgid "This field may not be blank." msgstr "To polje ne sme biti prazno." -#: fields.py:675 fields.py:1675 +#: fields.py:768 fields.py:1881 +#, python-brace-format msgid "Ensure this field has no more than {max_length} characters." msgstr "To polje ne sme biti daljše od {max_length} znakov." -#: fields.py:676 +#: fields.py:769 +#, python-brace-format msgid "Ensure this field has at least {min_length} characters." msgstr "To polje mora vsebovati vsaj {min_length} znakov." -#: fields.py:713 +#: fields.py:816 msgid "Enter a valid email address." msgstr "Vnesite veljaven elektronski naslov." -#: fields.py:724 +#: fields.py:827 msgid "This value does not match the required pattern." msgstr "Ta vrednost ne ustreza zahtevanemu vzorcu." -#: fields.py:735 +#: fields.py:838 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "Vnesite veljaven \"slug\", ki vsebuje črke, številke, podčrtaje ali vezaje." -#: fields.py:747 +#: fields.py:839 +msgid "" +"Enter a valid \"slug\" consisting of Unicode letters, numbers, underscores, " +"or hyphens." +msgstr "" + +#: fields.py:854 msgid "Enter a valid URL." msgstr "Vnesite veljaven URL." -#: fields.py:760 -msgid "\"{value}\" is not a valid UUID." -msgstr "\"{value}\" ni veljaven UUID" +#: fields.py:867 +msgid "Must be a valid UUID." +msgstr "" -#: fields.py:796 +#: fields.py:903 msgid "Enter a valid IPv4 or IPv6 address." msgstr "Vnesite veljaven IPv4 ali IPv6 naslov." -#: fields.py:821 +#: fields.py:931 msgid "A valid integer is required." msgstr "Zahtevano je veljavno celo število." -#: fields.py:822 fields.py:857 fields.py:891 +#: fields.py:932 fields.py:969 fields.py:1005 fields.py:1366 +#, python-brace-format msgid "Ensure this value is less than or equal to {max_value}." msgstr "Vrednost mora biti manjša ali enaka {max_value}." -#: fields.py:823 fields.py:858 fields.py:892 +#: fields.py:933 fields.py:970 fields.py:1006 fields.py:1367 +#, python-brace-format msgid "Ensure this value is greater than or equal to {min_value}." msgstr "Vrednost mora biti večija ali enaka {min_value}." -#: fields.py:824 fields.py:859 fields.py:896 +#: fields.py:934 fields.py:971 fields.py:1010 msgid "String value too large." msgstr "Niz je prevelik." -#: fields.py:856 fields.py:890 +#: fields.py:968 fields.py:1004 msgid "A valid number is required." msgstr "Zahtevano je veljavno število." -#: fields.py:893 +#: fields.py:1007 +#, python-brace-format msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "Vnesete lahko največ {max_digits} števk." -#: fields.py:894 +#: fields.py:1008 +#, python-brace-format msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "Vnesete lahko največ {max_decimal_places} decimalnih mest." -#: fields.py:895 +#: fields.py:1009 +#, python-brace-format msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "Vnesete lahko največ {max_whole_digits} števk pred decimalno piko." -#: fields.py:1025 +#: fields.py:1148 +#, python-brace-format msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "Datim in čas v napačnem formatu. Uporabite eno izmed naslednjih formatov: {format}." -#: fields.py:1026 +#: fields.py:1149 msgid "Expected a datetime but got a date." msgstr "Pričakovan datum in čas, prejet le datum." -#: fields.py:1103 +#: fields.py:1150 +#, python-brace-format +msgid "Invalid datetime for the timezone \"{timezone}\"." +msgstr "" + +#: fields.py:1151 +msgid "Datetime value out of range." +msgstr "" + +#: fields.py:1236 +#, python-brace-format msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "Datum je v napačnem formatu. Uporabnite enega izmed naslednjih: {format}." -#: fields.py:1104 +#: fields.py:1237 msgid "Expected a date but got a datetime." msgstr "Pričakovan datum vendar prejet datum in čas." -#: fields.py:1170 +#: fields.py:1303 +#, python-brace-format msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "Čas je v napačnem formatu. Uporabite enega izmed naslednjih: {format}." -#: fields.py:1232 +#: fields.py:1365 +#, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "Trajanje je v napačnem formatu. Uporabite enega izmed naslednjih: {format}." -#: fields.py:1251 fields.py:1300 +#: fields.py:1399 fields.py:1456 +#, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" ni veljavna izbira." -#: fields.py:1254 relations.py:71 relations.py:441 +#: fields.py:1402 +#, python-brace-format msgid "More than {count} items..." msgstr "Več kot {count} elementov..." -#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 +#: fields.py:1457 fields.py:1603 relations.py:485 serializers.py:570 +#, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Pričakovan seznam elementov vendar prejet tip \"{input_type}\"." -#: fields.py:1302 +#: fields.py:1458 msgid "This selection may not be empty." msgstr "Ta izbria ne sme ostati prazna." -#: fields.py:1339 +#: fields.py:1495 +#, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "\"{input}\" ni veljavna izbira poti." -#: fields.py:1358 +#: fields.py:1514 msgid "No file was submitted." msgstr "Datoteka ni bila oddana." -#: fields.py:1359 +#: fields.py:1515 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "Oddani podatki niso datoteka. Preverite vrsto kodiranja na formi." -#: fields.py:1360 +#: fields.py:1516 msgid "No filename could be determined." msgstr "Imena datoteke ni bilo mogoče določiti." -#: fields.py:1361 +#: fields.py:1517 msgid "The submitted file is empty." msgstr "Oddana datoteka je prazna." -#: fields.py:1362 +#: fields.py:1518 +#, python-brace-format msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "Ime datoteke lahko vsebuje največ {max_length} znakov (ta jih ima {length})." -#: fields.py:1410 +#: fields.py:1566 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "Naložite veljavno sliko. Naložena datoteka ni bila slika ali pa je okvarjena." -#: fields.py:1449 relations.py:438 serializers.py:525 +#: fields.py:1604 relations.py:486 serializers.py:571 msgid "This list may not be empty." msgstr "Seznam ne sme biti prazen." -#: fields.py:1502 +#: fields.py:1605 +#, python-brace-format +msgid "Ensure this field has at least {min_length} elements." +msgstr "" + +#: fields.py:1606 +#, python-brace-format +msgid "Ensure this field has no more than {max_length} elements." +msgstr "" + +#: fields.py:1682 +#, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "Pričakovan je slovar elementov, prejet element je tipa \"{input_type}\"." -#: fields.py:1549 +#: fields.py:1683 +msgid "This dictionary may not be empty." +msgstr "" + +#: fields.py:1755 msgid "Value must be valid JSON." msgstr "Vrednost mora biti veljaven JSON." -#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 -msgid "Submit" -msgstr "Potrdi" +#: filters.py:49 templates/rest_framework/filters/search.html:2 +msgid "Search" +msgstr "Iskanje" -#: filters.py:336 +#: filters.py:50 +msgid "A search term." +msgstr "" + +#: filters.py:180 templates/rest_framework/filters/ordering.html:3 +msgid "Ordering" +msgstr "Razvrščanje" + +#: filters.py:181 +msgid "Which field to use when ordering the results." +msgstr "" + +#: filters.py:287 msgid "ascending" msgstr "naraščujoče" -#: filters.py:337 +#: filters.py:288 msgid "descending" msgstr "padajoče" -#: pagination.py:193 +#: pagination.py:174 +msgid "A page number within the paginated result set." +msgstr "" + +#: pagination.py:179 pagination.py:372 pagination.py:590 +msgid "Number of results to return per page." +msgstr "" + +#: pagination.py:189 msgid "Invalid page." msgstr "Neveljavna stran." -#: pagination.py:427 +#: pagination.py:374 +msgid "The initial index from which to return the results." +msgstr "" + +#: pagination.py:581 +msgid "The pagination cursor value." +msgstr "" + +#: pagination.py:583 msgid "Invalid cursor" msgstr "Neveljaven kazalec" -#: relations.py:207 +#: relations.py:246 +#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Neveljaven pk \"{pk_value}\" - objekt ne obstaja." -#: relations.py:208 +#: relations.py:247 +#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Neveljaven tip. Pričakovana vrednost pk, prejet {data_type}." -#: relations.py:240 +#: relations.py:280 msgid "Invalid hyperlink - No URL match." msgstr "Neveljavna povezava - Ni URL." -#: relations.py:241 +#: relations.py:281 msgid "Invalid hyperlink - Incorrect URL match." msgstr "Ni veljavna povezava - Napačen URL." -#: relations.py:242 +#: relations.py:282 msgid "Invalid hyperlink - Object does not exist." msgstr "Ni veljavna povezava - Objekt ne obstaja." -#: relations.py:243 +#: relations.py:283 +#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Napačen tip. Pričakovan URL niz, prejet {data_type}." -#: relations.py:401 +#: relations.py:448 +#, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "Objekt z {slug_name}={value} ne obstaja." -#: relations.py:402 +#: relations.py:449 msgid "Invalid value." msgstr "Neveljavna vrednost." -#: serializers.py:326 +#: schemas/utils.py:32 +msgid "unique integer value" +msgstr "" + +#: schemas/utils.py:34 +msgid "UUID string" +msgstr "" + +#: schemas/utils.py:36 +msgid "unique value" +msgstr "" + +#: schemas/utils.py:38 +#, python-brace-format +msgid "A {value_type} identifying this {name}." +msgstr "" + +#: serializers.py:337 +#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "Napačni podatki. Pričakovan slovar, prejet {datatype}." #: templates/rest_framework/admin.html:116 -#: templates/rest_framework/base.html:128 +#: templates/rest_framework/base.html:136 +msgid "Extra Actions" +msgstr "" + +#: templates/rest_framework/admin.html:130 +#: templates/rest_framework/base.html:150 msgid "Filters" msgstr "Filtri" -#: templates/rest_framework/filters/django_filter.html:2 -#: templates/rest_framework/filters/django_filter_crispyforms.html:4 -msgid "Field filters" -msgstr "Filter polj" +#: templates/rest_framework/base.html:37 +msgid "navbar" +msgstr "" -#: templates/rest_framework/filters/ordering.html:3 -msgid "Ordering" -msgstr "Razvrščanje" +#: templates/rest_framework/base.html:75 +msgid "content" +msgstr "" -#: templates/rest_framework/filters/search.html:2 -msgid "Search" -msgstr "Iskanje" +#: templates/rest_framework/base.html:78 +msgid "request form" +msgstr "" -#: templates/rest_framework/horizontal/radio.html:2 -#: templates/rest_framework/inline/radio.html:2 -#: templates/rest_framework/vertical/radio.html:2 +#: templates/rest_framework/base.html:157 +msgid "main content" +msgstr "" + +#: templates/rest_framework/base.html:173 +msgid "request info" +msgstr "" + +#: templates/rest_framework/base.html:177 +msgid "response info" +msgstr "" + +#: templates/rest_framework/horizontal/radio.html:4 +#: templates/rest_framework/inline/radio.html:3 +#: templates/rest_framework/vertical/radio.html:3 msgid "None" 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 +#: templates/rest_framework/horizontal/select_multiple.html:4 +#: templates/rest_framework/inline/select_multiple.html:3 +#: templates/rest_framework/vertical/select_multiple.html:3 msgid "No items to select." msgstr "Ni elementov za izbiro." -#: validators.py:43 +#: validators.py:39 msgid "This field must be unique." msgstr "To polje mora biti unikatno." -#: validators.py:97 +#: validators.py:89 +#, python-brace-format msgid "The fields {field_names} must make a unique set." msgstr "Polja {field_names} morajo skupaj sestavljati unikaten niz." -#: validators.py:245 +#: validators.py:171 +#, python-brace-format +msgid "Surrogate characters are not allowed: U+{code_point:X}." +msgstr "" + +#: validators.py:243 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" date." msgstr "Polje mora biti unikatno za \"{date_field}\" dan." -#: validators.py:260 +#: validators.py:258 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" month." msgstr "Polje mora biti unikatno za \"{date_field} mesec.\"" -#: validators.py:273 +#: validators.py:271 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" year." msgstr "Polje mora biti unikatno za \"{date_field}\" leto." -#: versioning.py:42 +#: versioning.py:40 msgid "Invalid version in \"Accept\" header." msgstr "Neveljavna verzija v \"Accept\" zaglavju." -#: versioning.py:73 +#: versioning.py:71 msgid "Invalid version in URL path." msgstr "Neveljavna različca v poti URL." -#: versioning.py:115 +#: versioning.py:116 msgid "Invalid version in URL path. Does not match any version namespace." msgstr "Neveljavna različica v poti URL. Se ne ujema z nobeno različico imenskega prostora." -#: versioning.py:147 +#: versioning.py:148 msgid "Invalid version in hostname." msgstr "Neveljavna različica v imenu gostitelja." -#: versioning.py:169 +#: versioning.py:170 msgid "Invalid version in query parameter." msgstr "Neveljavna verzija v poizvedbenem parametru." - -#: views.py:88 -msgid "Permission denied." -msgstr "Dovoljenje zavrnjeno." diff --git a/rest_framework/locale/sv/LC_MESSAGES/django.mo b/rest_framework/locale/sv/LC_MESSAGES/django.mo index 7abf311b9686b66f9707b29da53763576aa6e928..fb1a9f6f9e3f6ec7ddc3294224384284e7f8d122 100644 GIT binary patch delta 2244 zcmYk-e@s-yzt z(rPz1tudEl%~fl2H#gV%qaSXyR;^`hxUp7$_(%VQYq`amtM})eW9!-dp4ao7bMJYc z^E}_@+}Xal-uTZ;)6N)WFHxvSHG5H}bD&gYnmJgBW!Q!H;t|yMU&R&p9%kVeScBhT zHU5nmSh2`#1J>bY9QTadCsaB(k;1Pd*ooWmHGBwv#TE=MHtWU#4CA|~>vPzH`PpWr z7{#UdGHQTl{qvW7ucPjF8$%X1YhL1wFot@gJq<_0fWgUj^@osn=@1uRnZ(l$?*(KBy&7h|8 z55FDC^{)3}D(5FqGw>YVkCUkTeTe1w6&Bz;#vLl@d^-=zF%4UgS+@wT#%^R8?Rnpq zP&b%FrO7ld#}BX$zeFwRpQr)1a&uiDM758ia_03s=D&%``8}D&D3f->%=DP#*=aX#J8yAD&VdW z+=c!44mROUT#w~U$2L5OoA3(iceimnwllw4KWKrO*EYB&6VmAHV~1*ML+g!LF9 z|13&HFN6!&j=v#^ZB^_cKGw=X?LAnEG2~vBz;;X`W3gMPj`K^r2Zv);(eN7b>Zi(3|#m9%>(#U{`-sCHoIxdZBfZm=wP9RqvY(2BW2j_Hpti?1zSl5?b}FG9U|auJI;gRm+@gDF zW|X)sgqA}^d88#$9_=ND3H3vXyKAdjh{z>|2xan}Lf`ImYTIe_4xzG(c$m->Yh5)X zI|ywnmBk+R80ukEHW6A2rZ$ezms5>yX6s%5h7dt7ZXY_6|KvoZp~Xuzv}+M=*_p8DDqF%pb|^l zQAJtZ>(;#dQ8KD@dALXY@oXg6)kdCMh!>OlZU(mmIO@f5r);It<~Q!b4Mav_DsyFG zF0(dSxhN%&T$@uENIa3(l$_2hPfgq?nCV(mS5wcY!KrT!H-@U}C|Nzx@nbdpW6{Io zqtRorv9Plz=9Y|bWwL2LsJDr-iTJhGuApza> delta 2559 zcmZYATWl0n9LMp~ZnqaMEi6z9S~?b#7D}N&DHhpoF9M|qg+h^v;I=!I$!>SCJ4H#+ zO*9Y@A<@bU7e!O!gT9yw3Oq@Ti7_M!A;EaVga_q;5E36G#Q6Qq4)MX0{mSrW;$a0Z-y8yow!IJjs|w z>_L5h0yp3loQtz38xz7Xs)L(R=aZfpW8R^n8=l8{yoY>DRdKebD^Md2qaGB)mH0k3 z;SFrXvJzuzaVK)h97SDs607hUY9=4x0-Q62=kR>fPGt#hN8R8JY{xHfHReps-mnR0 z)86Q}9n?r(Mvd$=GNtB%-+thKKa1f9IKLV-6U`j7bXzf_8>Xqu$KzOv=h4C|I1TS$ z9_G?uRZIac#t@PQrp31dxzub$-KQUwMz7*bJmj~}pawiTjrG@BU+08IP(D3-VI!)& z1(i%GT!BYXYkb*n-$xCgZbtUH4QSEci|XJJ^kxKuv>%{4luPdxVo@pcUq_{$6FaaU zHPWwe7JlP<6E)KNemlT$meMXq^4D~tW~K+<%rVABb>J>rLrY|Fv*p-^Y9By#{7lBL zeCc})nGACWYcQ9qp2Wqdo;#@A*oVsgi+($wX=>uA(|}A9;o;CS%m0YTs_u(!Gum{0`ZXW>Q7Aqh-j)RB+G$ny>*6 zptk2{_?-6tKU5-|=&_7pXP8qM#!padbQ`sOO4&Qr*o4}i4r+>D!U%qhdVlV2>SweR<00ghl1&o`&2XyhMZBc8)Nyo;=k`3u#N5N{zR>nzk7 zb|A}Z&LDj-7f?(03-U3+C$cZ7g&3h7$JO{L>iXN5QKgt)$)%_tcH*-^DFhp3VP)!jvWNg^UAXv*Ap5H>ElP}z*&-&F*h6Toy9rIPN`T-!0SI5Dd?l}gyrWbH^* z;kxq5VNMR&|G#S6w)VEMWMLpU(N4syJx;>42h(H8$rZs+r#(2}q|;6+X~pcMW5;So z-U>D3cMbIpIPTcxP*q@hw68BUlyvpzn3In7CUnuQ89x=*H7r`Pa?z4yR^9T(`jsPB zN@q@4pNhtv0jnz&vj-DH$=F!YOe?3v>t#CbTKmUG2V?d~P1!u6q4HseElyib(zPwy zb*+B-=k&Xl*XwB6U~t0tXu{3*dhCbt\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,40 +19,40 @@ msgstr "" "Language: sv\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: authentication.py:73 +#: authentication.py:70 msgid "Invalid basic header. No credentials provided." msgstr "Ogiltig \"basic\"-header. Inga användaruppgifter tillhandahölls." -#: authentication.py:76 +#: authentication.py:73 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:82 +#: authentication.py:83 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "Ogiltig \"basic\"-header. Användaruppgifterna är inte korrekt base64-kodade." -#: authentication.py:99 +#: authentication.py:101 msgid "Invalid username/password." msgstr "Ogiltigt användarnamn/lösenord." -#: authentication.py:102 authentication.py:198 +#: authentication.py:104 authentication.py:206 msgid "User inactive or deleted." msgstr "Användaren borttagen eller inaktiv." -#: authentication.py:176 +#: authentication.py:184 msgid "Invalid token header. No credentials provided." msgstr "Ogiltig \"token\"-header. Inga användaruppgifter tillhandahölls." -#: authentication.py:179 +#: authentication.py:187 msgid "Invalid token header. Token string should not contain spaces." msgstr "Ogiltig \"token\"-header. Strängen ska inte innehålla mellanslag." -#: authentication.py:185 +#: authentication.py:193 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:195 +#: authentication.py:203 msgid "Invalid token." msgstr "Ogiltig \"token\"." @@ -60,382 +60,515 @@ msgstr "Ogiltig \"token\"." msgid "Auth Token" msgstr "Autentiseringstoken" -#: authtoken/models.py:15 +#: authtoken/models.py:13 msgid "Key" msgstr "Nyckel" -#: authtoken/models.py:18 +#: authtoken/models.py:16 msgid "User" msgstr "Användare" -#: authtoken/models.py:20 +#: authtoken/models.py:18 msgid "Created" msgstr "Skapad" -#: authtoken/models.py:29 +#: authtoken/models.py:27 authtoken/serializers.py:19 msgid "Token" msgstr "Token" -#: authtoken/models.py:30 +#: authtoken/models.py:28 msgid "Tokens" msgstr "Tokens" -#: authtoken/serializers.py:8 +#: authtoken/serializers.py:9 msgid "Username" msgstr "Användarnamn" -#: authtoken/serializers.py:9 +#: authtoken/serializers.py:13 msgid "Password" msgstr "Lösenord" -#: authtoken/serializers.py:20 -msgid "User account is disabled." -msgstr "Användarkontot är borttaget." - -#: authtoken/serializers.py:23 +#: authtoken/serializers.py:35 msgid "Unable to log in with provided credentials." msgstr "Kunde inte logga in med de angivna inloggningsuppgifterna." -#: authtoken/serializers.py:26 +#: authtoken/serializers.py:38 msgid "Must include \"username\" and \"password\"." msgstr "Användarnamn och lösenord måste anges." -#: exceptions.py:49 +#: exceptions.py:102 msgid "A server error occurred." msgstr "Ett serverfel inträffade." -#: exceptions.py:84 +#: exceptions.py:142 +msgid "Invalid input." +msgstr "" + +#: exceptions.py:161 msgid "Malformed request." msgstr "Ogiltig förfrågan." -#: exceptions.py:89 +#: exceptions.py:167 msgid "Incorrect authentication credentials." msgstr "Ogiltiga inloggningsuppgifter. " -#: exceptions.py:94 +#: exceptions.py:173 msgid "Authentication credentials were not provided." msgstr "Autentiseringsuppgifter ej tillhandahållna." -#: exceptions.py:99 +#: exceptions.py:179 msgid "You do not have permission to perform this action." msgstr "Du har inte tillåtelse att utföra denna förfrågan." -#: exceptions.py:104 views.py:81 +#: exceptions.py:185 msgid "Not found." msgstr "Hittades inte." -#: exceptions.py:109 +#: exceptions.py:191 +#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "Metoden \"{method}\" tillåts inte." -#: exceptions.py:120 +#: exceptions.py:202 msgid "Could not satisfy the request Accept header." msgstr "Kunde inte tillfredsställa förfrågans \"Accept\"-header." -#: exceptions.py:132 +#: exceptions.py:212 +#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "Medietypen \"{media_type}\" stöds inte." -#: exceptions.py:145 +#: exceptions.py:223 msgid "Request was throttled." msgstr "Förfrågan stoppades eftersom du har skickat för många." -#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 -#: validators.py:181 +#: exceptions.py:224 +#, python-brace-format +msgid "Expected available in {wait} second." +msgstr "" + +#: exceptions.py:225 +#, python-brace-format +msgid "Expected available in {wait} seconds." +msgstr "" + +#: fields.py:316 relations.py:245 relations.py:279 validators.py:90 +#: validators.py:183 msgid "This field is required." msgstr "Det här fältet är obligatoriskt." -#: fields.py:270 +#: fields.py:317 msgid "This field may not be null." msgstr "Det här fältet får inte vara null." -#: fields.py:608 fields.py:639 -msgid "\"{input}\" is not a valid boolean." -msgstr "\"{input}\" är inte ett giltigt booleskt värde." +#: fields.py:701 +msgid "Must be a valid boolean." +msgstr "" -#: fields.py:674 +#: fields.py:766 +msgid "Not a valid string." +msgstr "" + +#: fields.py:767 msgid "This field may not be blank." msgstr "Det här fältet får inte vara blankt." -#: fields.py:675 fields.py:1675 +#: fields.py:768 fields.py:1881 +#, 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." -#: fields.py:676 +#: fields.py:769 +#, python-brace-format msgid "Ensure this field has at least {min_length} characters." msgstr "Se till att detta fält har minst {min_length} tecken." -#: fields.py:713 +#: fields.py:816 msgid "Enter a valid email address." msgstr "Ange en giltig mejladress." -#: fields.py:724 +#: fields.py:827 msgid "This value does not match the required pattern." msgstr "Det här värdet matchar inte mallen." -#: fields.py:735 +#: fields.py:838 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:747 +#: fields.py:839 +msgid "" +"Enter a valid \"slug\" consisting of Unicode letters, numbers, underscores, " +"or hyphens." +msgstr "" + +#: fields.py:854 msgid "Enter a valid URL." msgstr "Ange en giltig URL." -#: fields.py:760 -msgid "\"{value}\" is not a valid UUID." -msgstr "\"{value} är inte ett giltigt UUID." +#: fields.py:867 +msgid "Must be a valid UUID." +msgstr "" -#: fields.py:796 +#: fields.py:903 msgid "Enter a valid IPv4 or IPv6 address." msgstr "Ange en giltig IPv4- eller IPv6-adress." -#: fields.py:821 +#: fields.py:931 msgid "A valid integer is required." msgstr "Ett giltigt heltal krävs." -#: fields.py:822 fields.py:857 fields.py:891 +#: fields.py:932 fields.py:969 fields.py:1005 fields.py:1366 +#, python-brace-format 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:823 fields.py:858 fields.py:892 +#: fields.py:933 fields.py:970 fields.py:1006 fields.py:1367 +#, python-brace-format 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:824 fields.py:859 fields.py:896 +#: fields.py:934 fields.py:971 fields.py:1010 msgid "String value too large." msgstr "Textvärdet är för långt." -#: fields.py:856 fields.py:890 +#: fields.py:968 fields.py:1004 msgid "A valid number is required." msgstr "Ett giltigt nummer krävs." -#: fields.py:893 +#: fields.py:1007 +#, python-brace-format 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:894 +#: fields.py:1008 +#, python-brace-format 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:895 +#: fields.py:1009 +#, python-brace-format 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:1025 +#: fields.py:1148 +#, python-brace-format 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:1026 +#: fields.py:1149 msgid "Expected a datetime but got a date." msgstr "Förväntade en datumtid men fick ett datum." -#: fields.py:1103 +#: fields.py:1150 +#, python-brace-format +msgid "Invalid datetime for the timezone \"{timezone}\"." +msgstr "" + +#: fields.py:1151 +msgid "Datetime value out of range." +msgstr "" + +#: fields.py:1236 +#, 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:1104 +#: fields.py:1237 msgid "Expected a date but got a datetime." msgstr "Förväntade ett datum men fick en datumtid." -#: fields.py:1170 +#: fields.py:1303 +#, 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:1232 +#: fields.py:1365 +#, 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:1251 fields.py:1300 +#: fields.py:1399 fields.py:1456 +#, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" är inte ett giltigt val." -#: fields.py:1254 relations.py:71 relations.py:441 +#: fields.py:1402 +#, python-brace-format msgid "More than {count} items..." msgstr "Fler än {count} objekt..." -#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 +#: fields.py:1457 fields.py:1603 relations.py:485 serializers.py:570 +#, 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:1302 +#: fields.py:1458 msgid "This selection may not be empty." msgstr "Det här valet får inte vara tomt." -#: fields.py:1339 +#: fields.py:1495 +#, 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:1358 +#: fields.py:1514 msgid "No file was submitted." msgstr "Ingen fil skickades." -#: fields.py:1359 +#: fields.py:1515 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:1360 +#: fields.py:1516 msgid "No filename could be determined." msgstr "Inget filnamn kunde bestämmas." -#: fields.py:1361 +#: fields.py:1517 msgid "The submitted file is empty." msgstr "Den skickade filen var tom." -#: fields.py:1362 +#: fields.py:1518 +#, 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:1410 +#: fields.py:1566 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:1449 relations.py:438 serializers.py:525 +#: fields.py:1604 relations.py:486 serializers.py:571 msgid "This list may not be empty." msgstr "Den här listan får inte vara tom." -#: fields.py:1502 +#: fields.py:1605 +#, python-brace-format +msgid "Ensure this field has at least {min_length} elements." +msgstr "" + +#: fields.py:1606 +#, python-brace-format +msgid "Ensure this field has no more than {max_length} elements." +msgstr "" + +#: fields.py:1682 +#, 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:1549 +#: fields.py:1683 +msgid "This dictionary may not be empty." +msgstr "" + +#: fields.py:1755 msgid "Value must be valid JSON." msgstr "Värdet måste vara giltig JSON." -#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 -msgid "Submit" -msgstr "Skicka" +#: filters.py:49 templates/rest_framework/filters/search.html:2 +msgid "Search" +msgstr "Sök" -#: filters.py:336 +#: filters.py:50 +msgid "A search term." +msgstr "" + +#: filters.py:180 templates/rest_framework/filters/ordering.html:3 +msgid "Ordering" +msgstr "Ordning" + +#: filters.py:181 +msgid "Which field to use when ordering the results." +msgstr "" + +#: filters.py:287 msgid "ascending" msgstr "stigande" -#: filters.py:337 +#: filters.py:288 msgid "descending" msgstr "fallande" -#: pagination.py:193 +#: pagination.py:174 +msgid "A page number within the paginated result set." +msgstr "" + +#: pagination.py:179 pagination.py:372 pagination.py:590 +msgid "Number of results to return per page." +msgstr "" + +#: pagination.py:189 msgid "Invalid page." msgstr "Ogiltig sida." -#: pagination.py:427 +#: pagination.py:374 +msgid "The initial index from which to return the results." +msgstr "" + +#: pagination.py:581 +msgid "The pagination cursor value." +msgstr "" + +#: pagination.py:583 msgid "Invalid cursor" msgstr "Ogiltig cursor." -#: relations.py:207 +#: relations.py:246 +#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Ogiltigt pk \"{pk_value}\" - Objektet finns inte." -#: relations.py:208 +#: relations.py:247 +#, 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:240 +#: relations.py:280 msgid "Invalid hyperlink - No URL match." msgstr "Ogiltig hyperlänk - Ingen URL matchade." -#: relations.py:241 +#: relations.py:281 msgid "Invalid hyperlink - Incorrect URL match." msgstr "Ogiltig hyperlänk - Felaktig URL-matching." -#: relations.py:242 +#: relations.py:282 msgid "Invalid hyperlink - Object does not exist." msgstr "Ogiltig hyperlänk - Objektet finns inte." -#: relations.py:243 +#: relations.py:283 +#, 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:401 +#: relations.py:448 +#, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "Objekt med {slug_name}={value} finns inte." -#: relations.py:402 +#: relations.py:449 msgid "Invalid value." msgstr "Ogiltigt värde." -#: serializers.py:326 +#: schemas/utils.py:32 +msgid "unique integer value" +msgstr "" + +#: schemas/utils.py:34 +msgid "UUID string" +msgstr "" + +#: schemas/utils.py:36 +msgid "unique value" +msgstr "" + +#: schemas/utils.py:38 +#, python-brace-format +msgid "A {value_type} identifying this {name}." +msgstr "" + +#: serializers.py:337 +#, 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:116 -#: templates/rest_framework/base.html:128 +#: templates/rest_framework/base.html:136 +msgid "Extra Actions" +msgstr "" + +#: templates/rest_framework/admin.html:130 +#: templates/rest_framework/base.html:150 msgid "Filters" msgstr "Filter" -#: templates/rest_framework/filters/django_filter.html:2 -#: templates/rest_framework/filters/django_filter_crispyforms.html:4 -msgid "Field filters" -msgstr "Fältfilter" +#: templates/rest_framework/base.html:37 +msgid "navbar" +msgstr "" -#: templates/rest_framework/filters/ordering.html:3 -msgid "Ordering" -msgstr "Ordning" +#: templates/rest_framework/base.html:75 +msgid "content" +msgstr "" -#: templates/rest_framework/filters/search.html:2 -msgid "Search" -msgstr "Sök" +#: templates/rest_framework/base.html:78 +msgid "request form" +msgstr "" -#: templates/rest_framework/horizontal/radio.html:2 -#: templates/rest_framework/inline/radio.html:2 -#: templates/rest_framework/vertical/radio.html:2 +#: templates/rest_framework/base.html:157 +msgid "main content" +msgstr "" + +#: templates/rest_framework/base.html:173 +msgid "request info" +msgstr "" + +#: templates/rest_framework/base.html:177 +msgid "response info" +msgstr "" + +#: templates/rest_framework/horizontal/radio.html:4 +#: templates/rest_framework/inline/radio.html:3 +#: templates/rest_framework/vertical/radio.html:3 msgid "None" msgstr "Inget" -#: templates/rest_framework/horizontal/select_multiple.html:2 -#: templates/rest_framework/inline/select_multiple.html:2 -#: templates/rest_framework/vertical/select_multiple.html:2 +#: templates/rest_framework/horizontal/select_multiple.html:4 +#: templates/rest_framework/inline/select_multiple.html:3 +#: templates/rest_framework/vertical/select_multiple.html:3 msgid "No items to select." msgstr "Inga valbara objekt." -#: validators.py:43 +#: validators.py:39 msgid "This field must be unique." msgstr "Det här fältet måste vara unikt." -#: validators.py:97 +#: validators.py:89 +#, python-brace-format msgid "The fields {field_names} must make a unique set." msgstr "Fälten {field_names} måste skapa ett unikt set." -#: validators.py:245 +#: validators.py:171 +#, python-brace-format +msgid "Surrogate characters are not allowed: U+{code_point:X}." +msgstr "" + +#: validators.py:243 +#, python-brace-format 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:260 +#: validators.py:258 +#, python-brace-format 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:273 +#: validators.py:271 +#, python-brace-format 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}\"." -#: versioning.py:42 +#: versioning.py:40 msgid "Invalid version in \"Accept\" header." msgstr "Ogiltig version i \"Accept\"-headern." -#: versioning.py:73 +#: versioning.py:71 msgid "Invalid version in URL path." msgstr "Ogiltig version i URL-resursen." -#: versioning.py:115 +#: versioning.py:116 msgid "Invalid version in URL path. Does not match any version namespace." msgstr "Ogiltig version i URL-resursen. Matchar inget versions-namespace." -#: versioning.py:147 +#: versioning.py:148 msgid "Invalid version in hostname." msgstr "Ogiltig version i värdnamnet." -#: versioning.py:169 +#: versioning.py:170 msgid "Invalid version in query parameter." msgstr "Ogiltig version i förfrågningsparametern." - -#: views.py:88 -msgid "Permission denied." -msgstr "Åtkomst nekad." diff --git a/rest_framework/locale/th/LC_MESSAGES/django.mo b/rest_framework/locale/th/LC_MESSAGES/django.mo new file mode 100644 index 0000000000000000000000000000000000000000..4a2b85a9bb977c0b5c54ea19106fc5b912da14fa GIT binary patch literal 8880 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 literal 0 HcmV?d00001 diff --git a/rest_framework/locale/th/LC_MESSAGES/django.po b/rest_framework/locale/th/LC_MESSAGES/django.po new file mode 100644 index 000000000..353244db9 --- /dev/null +++ b/rest_framework/locale/th/LC_MESSAGES/django.po @@ -0,0 +1,573 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Preeti Yuankrathok , 2018 +msgid "" +msgstr "" +"Project-Id-Version: Django REST framework\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-10-13 21:45+0200\n" +"PO-Revision-Date: 2020-10-13 19:45+0000\n" +"Last-Translator: Xavier Ordoquy \n" +"Language-Team: Thai (http://www.transifex.com/django-rest-framework-1/django-rest-framework/language/th/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: th\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: authentication.py:70 +msgid "Invalid basic header. No credentials provided." +msgstr "" + +#: authentication.py:73 +msgid "Invalid basic header. Credentials string should not contain spaces." +msgstr "" + +#: authentication.py:83 +msgid "Invalid basic header. Credentials not correctly base64 encoded." +msgstr "" + +#: authentication.py:101 +msgid "Invalid username/password." +msgstr "ชื่อผู้ใช้งานหรือรหัสผ่านไม่ถูกต้อง" + +#: authentication.py:104 authentication.py:206 +msgid "User inactive or deleted." +msgstr "ผู้ใช้ไม่ได้เปิดใช้งานหรือถูกลบ" + +#: authentication.py:184 +msgid "Invalid token header. No credentials provided." +msgstr "" + +#: authentication.py:187 +msgid "Invalid token header. Token string should not contain spaces." +msgstr "" + +#: authentication.py:193 +msgid "" +"Invalid token header. Token string should not contain invalid characters." +msgstr "" + +#: authentication.py:203 +msgid "Invalid token." +msgstr "Token ไม่ถูกต้อง" + +#: authtoken/apps.py:7 +msgid "Auth Token" +msgstr "Auth Token" + +#: authtoken/models.py:13 +msgid "Key" +msgstr "คีย์" + +#: authtoken/models.py:16 +msgid "User" +msgstr "ผู้ใช้" + +#: authtoken/models.py:18 +msgid "Created" +msgstr "" + +#: authtoken/models.py:27 authtoken/serializers.py:19 +msgid "Token" +msgstr "Token" + +#: authtoken/models.py:28 +msgid "Tokens" +msgstr "Token" + +#: authtoken/serializers.py:9 +msgid "Username" +msgstr "ชื่อผู้ใช้งาน" + +#: authtoken/serializers.py:13 +msgid "Password" +msgstr "รหัสผ่าน" + +#: authtoken/serializers.py:35 +msgid "Unable to log in with provided credentials." +msgstr "ไม่สามารถเข้าสู่ระบบได้" + +#: authtoken/serializers.py:38 +msgid "Must include \"username\" and \"password\"." +msgstr "จำเป็นต้องใส่ชื่อผู้ใช้งานและรหัสผ่าน" + +#: exceptions.py:102 +msgid "A server error occurred." +msgstr "เซิร์ฟเวอร์เกิดข้อผิดพลาด" + +#: exceptions.py:142 +msgid "Invalid input." +msgstr "" + +#: exceptions.py:161 +msgid "Malformed request." +msgstr "" + +#: exceptions.py:167 +msgid "Incorrect authentication credentials." +msgstr "ข้อมูลการเข้าสู่ระบบไม่ถูกต้อง" + +#: exceptions.py:173 +msgid "Authentication credentials were not provided." +msgstr "ไม่พบข้อมูลการเข้าสู่ระบบ" + +#: exceptions.py:179 +msgid "You do not have permission to perform this action." +msgstr "คุณไม่มีสิทธิ์ที่จะดำเนินการ" + +#: exceptions.py:185 +msgid "Not found." +msgstr "ไม่พบ" + +#: exceptions.py:191 +#, python-brace-format +msgid "Method \"{method}\" not allowed." +msgstr "ไม่ใช่อนุญาติให้ใช้ Method \"{method}\"" + +#: exceptions.py:202 +msgid "Could not satisfy the request Accept header." +msgstr "" + +#: exceptions.py:212 +#, python-brace-format +msgid "Unsupported media type \"{media_type}\" in request." +msgstr "ไม่รองรับมีเดียประเภท \"{media_type}\" ใน Request" + +#: exceptions.py:223 +msgid "Request was throttled." +msgstr "" + +#: exceptions.py:224 +#, python-brace-format +msgid "Expected available in {wait} second." +msgstr "" + +#: exceptions.py:225 +#, python-brace-format +msgid "Expected available in {wait} seconds." +msgstr "" + +#: fields.py:316 relations.py:245 relations.py:279 validators.py:90 +#: validators.py:183 +msgid "This field is required." +msgstr "ฟิลด์นี้จำเป็น" + +#: fields.py:317 +msgid "This field may not be null." +msgstr "ฟิลด์นี้จำเป็นต้องมีค่า" + +#: fields.py:701 +msgid "Must be a valid boolean." +msgstr "" + +#: fields.py:766 +msgid "Not a valid string." +msgstr "" + +#: fields.py:767 +msgid "This field may not be blank." +msgstr "ฟิลด์นี้ไม่สามารถเว้นว่างได้" + +#: fields.py:768 fields.py:1881 +#, python-brace-format +msgid "Ensure this field has no more than {max_length} characters." +msgstr "ตรวจสอบฟิลด์ว่ามีความยาวไม่เกิน {max_length} ตัวอักษร" + +#: fields.py:769 +#, python-brace-format +msgid "Ensure this field has at least {min_length} characters." +msgstr "ตรวตสอบฟิลด์ว่ามีความยาวอย่างน้อย {min_length} ตัวอักษร" + +#: fields.py:816 +msgid "Enter a valid email address." +msgstr "กรอกอีเมลให้ถูกต้อง" + +#: fields.py:827 +msgid "This value does not match the required pattern." +msgstr "ค่านี้ไม่ตรงกับรูปแบบที่ต้องการ" + +#: fields.py:838 +msgid "" +"Enter a valid \"slug\" consisting of letters, numbers, underscores or " +"hyphens." +msgstr "กรอกข้อมูลที่ประกอบด้วยตัวอักษร ตัวเลข สัญประกาศ และยัติภังค์เท่านั้น" + +#: fields.py:839 +msgid "" +"Enter a valid \"slug\" consisting of Unicode letters, numbers, underscores, " +"or hyphens." +msgstr "" + +#: fields.py:854 +msgid "Enter a valid URL." +msgstr "กรอก URL ให้ถูกต้อง" + +#: fields.py:867 +msgid "Must be a valid UUID." +msgstr "" + +#: fields.py:903 +msgid "Enter a valid IPv4 or IPv6 address." +msgstr "กรอก IPv4 หรือ IPv6 ให้ถูกต้อง" + +#: fields.py:931 +msgid "A valid integer is required." +msgstr "ต้องการค่าจำนวนเต็มที่ถูกต้อง" + +#: fields.py:932 fields.py:969 fields.py:1005 fields.py:1366 +#, python-brace-format +msgid "Ensure this value is less than or equal to {max_value}." +msgstr "ตรวจสอบว่าค่านี้น้อยกว่าหรือเท่ากับ {max_value}" + +#: fields.py:933 fields.py:970 fields.py:1006 fields.py:1367 +#, python-brace-format +msgid "Ensure this value is greater than or equal to {min_value}." +msgstr "ตรวจสอบว่าค่านี้มากกว่าหรือเท่ากับ {min_value}" + +#: fields.py:934 fields.py:971 fields.py:1010 +msgid "String value too large." +msgstr "ข้อความยาวเกินไป" + +#: fields.py:968 fields.py:1004 +msgid "A valid number is required." +msgstr "ต้องการตัวเลขที่ถูกต้อง" + +#: fields.py:1007 +#, python-brace-format +msgid "Ensure that there are no more than {max_digits} digits in total." +msgstr "ตรวจสอบตัวเลขว่ามีไม่เกิน {max_digits} ตัว" + +#: fields.py:1008 +#, python-brace-format +msgid "" +"Ensure that there are no more than {max_decimal_places} decimal places." +msgstr "ตรวจสอบทศนิยมว่ามีไม่เกิน {max_decimal_places} หลัก" + +#: fields.py:1009 +#, python-brace-format +msgid "" +"Ensure that there are no more than {max_whole_digits} digits before the " +"decimal point." +msgstr "ตรวจสอบตัวเลขและทศนิยมรวมกันว่ามีไม่เกิน {max_whole_digits} ตัว" + +#: fields.py:1148 +#, python-brace-format +msgid "Datetime has wrong format. Use one of these formats instead: {format}." +msgstr "รูปแบบวันที่และเวลาไม่ถูกต้อง โปรดใช้รูปแบบใดรูปแบบหนึ่งจาก: {format}" + +#: fields.py:1149 +msgid "Expected a datetime but got a date." +msgstr "ต้องการวันที่และเวลา แต่ได้รับเพียงวันที่" + +#: fields.py:1150 +#, python-brace-format +msgid "Invalid datetime for the timezone \"{timezone}\"." +msgstr "" + +#: fields.py:1151 +msgid "Datetime value out of range." +msgstr "" + +#: fields.py:1236 +#, python-brace-format +msgid "Date has wrong format. Use one of these formats instead: {format}." +msgstr "รูปแบบวันที่ไม่ถูกต้อง โปรดใช้รูปแบบใดรูปแบบหนึ่งจาก: {format}" + +#: fields.py:1237 +msgid "Expected a date but got a datetime." +msgstr "ต้องการวันที่ แต่ได้รับวันที่และเวลา" + +#: fields.py:1303 +#, python-brace-format +msgid "Time has wrong format. Use one of these formats instead: {format}." +msgstr "รูปแบบเวลาไม่ถูกต้อง โปรดใช้รูปแบบใดรูปแบบหนึ่งจาก: {format}" + +#: fields.py:1365 +#, python-brace-format +msgid "Duration has wrong format. Use one of these formats instead: {format}." +msgstr "รูปแบบระยะเวลาไม่ถูกต้อง โปรดใช้รูปแบบใดรูปแบบหนึ่งจาก: {format}" + +#: fields.py:1399 fields.py:1456 +#, python-brace-format +msgid "\"{input}\" is not a valid choice." +msgstr "\"{input}\" ไม่ใช่ตัวเลือกที่ถูกต้อง" + +#: fields.py:1402 +#, python-brace-format +msgid "More than {count} items..." +msgstr "มีมากกว่า {count} ไอเทม..." + +#: fields.py:1457 fields.py:1603 relations.py:485 serializers.py:570 +#, python-brace-format +msgid "Expected a list of items but got type \"{input_type}\"." +msgstr "ต้องการ List ของข้อมูล แต่ได้รับ \"{input_type}\"" + +#: fields.py:1458 +msgid "This selection may not be empty." +msgstr "" + +#: fields.py:1495 +#, python-brace-format +msgid "\"{input}\" is not a valid path choice." +msgstr "" + +#: fields.py:1514 +msgid "No file was submitted." +msgstr "ไม่พบไฟล์" + +#: fields.py:1515 +msgid "" +"The submitted data was not a file. Check the encoding type on the form." +msgstr "ข้อมูลที่ส่งไม่ใช่ไฟล์ โปรดตรวจสอบการเข้ารหัสของฟอร์ม" + +#: fields.py:1516 +msgid "No filename could be determined." +msgstr "ไม่สามารถระบุชื่อไฟล์ได้" + +#: fields.py:1517 +msgid "The submitted file is empty." +msgstr "ไฟล์ที่ส่งว่างเปล่า" + +#: fields.py:1518 +#, python-brace-format +msgid "" +"Ensure this filename has at most {max_length} characters (it has {length})." +msgstr "" + +#: fields.py:1566 +msgid "" +"Upload a valid image. The file you uploaded was either not an image or a " +"corrupted image." +msgstr "" + +#: fields.py:1604 relations.py:486 serializers.py:571 +msgid "This list may not be empty." +msgstr "List นี้ไม่สามารถว่างได้" + +#: fields.py:1605 +#, python-brace-format +msgid "Ensure this field has at least {min_length} elements." +msgstr "" + +#: fields.py:1606 +#, python-brace-format +msgid "Ensure this field has no more than {max_length} elements." +msgstr "" + +#: fields.py:1682 +#, python-brace-format +msgid "Expected a dictionary of items but got type \"{input_type}\"." +msgstr "ต้องการ Dictionary แต่ได้รับ \"{input_type}\"" + +#: fields.py:1683 +msgid "This dictionary may not be empty." +msgstr "" + +#: fields.py:1755 +msgid "Value must be valid JSON." +msgstr "ค่าจะต้องเป็น JSON ที่ถูกต้อง" + +#: filters.py:49 templates/rest_framework/filters/search.html:2 +msgid "Search" +msgstr "ค้นหา" + +#: filters.py:50 +msgid "A search term." +msgstr "" + +#: filters.py:180 templates/rest_framework/filters/ordering.html:3 +msgid "Ordering" +msgstr "การเรียงลำดับ" + +#: filters.py:181 +msgid "Which field to use when ordering the results." +msgstr "" + +#: filters.py:287 +msgid "ascending" +msgstr "น้อยไปมาก" + +#: filters.py:288 +msgid "descending" +msgstr "มากไปน้อย" + +#: pagination.py:174 +msgid "A page number within the paginated result set." +msgstr "" + +#: pagination.py:179 pagination.py:372 pagination.py:590 +msgid "Number of results to return per page." +msgstr "" + +#: pagination.py:189 +msgid "Invalid page." +msgstr "หน้าไม่ถูกต้อง" + +#: pagination.py:374 +msgid "The initial index from which to return the results." +msgstr "" + +#: pagination.py:581 +msgid "The pagination cursor value." +msgstr "" + +#: pagination.py:583 +msgid "Invalid cursor" +msgstr "เคอร์เซอร์ไม่ถูกต้อง" + +#: relations.py:246 +#, python-brace-format +msgid "Invalid pk \"{pk_value}\" - object does not exist." +msgstr "" + +#: relations.py:247 +#, python-brace-format +msgid "Incorrect type. Expected pk value, received {data_type}." +msgstr "" + +#: relations.py:280 +msgid "Invalid hyperlink - No URL match." +msgstr "" + +#: relations.py:281 +msgid "Invalid hyperlink - Incorrect URL match." +msgstr "" + +#: relations.py:282 +msgid "Invalid hyperlink - Object does not exist." +msgstr "" + +#: relations.py:283 +#, python-brace-format +msgid "Incorrect type. Expected URL string, received {data_type}." +msgstr "" + +#: relations.py:448 +#, python-brace-format +msgid "Object with {slug_name}={value} does not exist." +msgstr "" + +#: relations.py:449 +msgid "Invalid value." +msgstr "ค่าไม่ถูกต้อง" + +#: schemas/utils.py:32 +msgid "unique integer value" +msgstr "" + +#: schemas/utils.py:34 +msgid "UUID string" +msgstr "" + +#: schemas/utils.py:36 +msgid "unique value" +msgstr "" + +#: schemas/utils.py:38 +#, python-brace-format +msgid "A {value_type} identifying this {name}." +msgstr "" + +#: serializers.py:337 +#, python-brace-format +msgid "Invalid data. Expected a dictionary, but got {datatype}." +msgstr "ข้อมูลไม่ถูกต้อง ต้องการ Dictionary แต่ได้รับ {datatype}" + +#: templates/rest_framework/admin.html:116 +#: templates/rest_framework/base.html:136 +msgid "Extra Actions" +msgstr "" + +#: templates/rest_framework/admin.html:130 +#: templates/rest_framework/base.html:150 +msgid "Filters" +msgstr "การกรองข้อมูล" + +#: templates/rest_framework/base.html:37 +msgid "navbar" +msgstr "" + +#: templates/rest_framework/base.html:75 +msgid "content" +msgstr "" + +#: templates/rest_framework/base.html:78 +msgid "request form" +msgstr "" + +#: templates/rest_framework/base.html:157 +msgid "main content" +msgstr "" + +#: templates/rest_framework/base.html:173 +msgid "request info" +msgstr "" + +#: templates/rest_framework/base.html:177 +msgid "response info" +msgstr "" + +#: templates/rest_framework/horizontal/radio.html:4 +#: templates/rest_framework/inline/radio.html:3 +#: templates/rest_framework/vertical/radio.html:3 +msgid "None" +msgstr "ไม่มี" + +#: templates/rest_framework/horizontal/select_multiple.html:4 +#: templates/rest_framework/inline/select_multiple.html:3 +#: templates/rest_framework/vertical/select_multiple.html:3 +msgid "No items to select." +msgstr "" + +#: validators.py:39 +msgid "This field must be unique." +msgstr "" + +#: validators.py:89 +#, python-brace-format +msgid "The fields {field_names} must make a unique set." +msgstr "" + +#: validators.py:171 +#, python-brace-format +msgid "Surrogate characters are not allowed: U+{code_point:X}." +msgstr "" + +#: validators.py:243 +#, python-brace-format +msgid "This field must be unique for the \"{date_field}\" date." +msgstr "" + +#: validators.py:258 +#, python-brace-format +msgid "This field must be unique for the \"{date_field}\" month." +msgstr "" + +#: validators.py:271 +#, python-brace-format +msgid "This field must be unique for the \"{date_field}\" year." +msgstr "" + +#: versioning.py:40 +msgid "Invalid version in \"Accept\" header." +msgstr "" + +#: versioning.py:71 +msgid "Invalid version in URL path." +msgstr "" + +#: versioning.py:116 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "" + +#: versioning.py:148 +msgid "Invalid version in hostname." +msgstr "" + +#: versioning.py:170 +msgid "Invalid version in query parameter." +msgstr "" diff --git a/rest_framework/locale/tr/LC_MESSAGES/django.mo b/rest_framework/locale/tr/LC_MESSAGES/django.mo index fcdff0a983176ba0193a41a95a3141ea69bf66f2..6386aab5236ae56a95525a2b2c525baa555c3963 100644 GIT binary patch delta 2167 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 diff --git a/rest_framework/locale/tr/LC_MESSAGES/django.po b/rest_framework/locale/tr/LC_MESSAGES/django.po index d327ab9e2..106fe7177 100644 --- a/rest_framework/locale/tr/LC_MESSAGES/django.po +++ b/rest_framework/locale/tr/LC_MESSAGES/django.po @@ -8,16 +8,16 @@ # Ertaç Paprat , 2015 # José Luis , 2016 # Mesut Can Gürle , 2015 -# Murat Çorlu , 2015 +# Murat Çorlu , 2015 # Recep KIRMIZI , 2015 # Ülgen Sarıkavak , 2015 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: 2017-08-03 14:58+0000\n" -"Last-Translator: Thomas Christie \n" +"POT-Creation-Date: 2020-10-13 21:45+0200\n" +"PO-Revision-Date: 2020-10-13 19:45+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" @@ -25,40 +25,40 @@ msgstr "" "Language: tr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: authentication.py:73 +#: authentication.py:70 msgid "Invalid basic header. No credentials provided." msgstr "Geçersiz yetkilendirme başlığı. Gerekli uygunluk kriterleri sağlanmamış." -#: authentication.py:76 +#: authentication.py:73 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:82 +#: authentication.py:83 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:99 +#: authentication.py:101 msgid "Invalid username/password." msgstr "Geçersiz kullanıcı adı/parola" -#: authentication.py:102 authentication.py:198 +#: authentication.py:104 authentication.py:206 msgid "User inactive or deleted." msgstr "Kullanıcı aktif değil ya da silinmiş." -#: authentication.py:176 +#: authentication.py:184 msgid "Invalid token header. No credentials provided." msgstr "Geçersiz token başlığı. Kimlik bilgileri eksik." -#: authentication.py:179 +#: authentication.py:187 msgid "Invalid token header. Token string should not contain spaces." msgstr "Geçersiz token başlığı. Token'da boşluk olmamalı." -#: authentication.py:185 +#: authentication.py:193 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:195 +#: authentication.py:203 msgid "Invalid token." msgstr "Geçersiz token." @@ -66,382 +66,515 @@ msgstr "Geçersiz token." msgid "Auth Token" msgstr "Kimlik doğrulama belirteci" -#: authtoken/models.py:15 +#: authtoken/models.py:13 msgid "Key" msgstr "Anahtar" -#: authtoken/models.py:18 +#: authtoken/models.py:16 msgid "User" msgstr "Kullanan" -#: authtoken/models.py:20 +#: authtoken/models.py:18 msgid "Created" msgstr "Oluşturulan" -#: authtoken/models.py:29 +#: authtoken/models.py:27 authtoken/serializers.py:19 msgid "Token" msgstr "İşaret" -#: authtoken/models.py:30 +#: authtoken/models.py:28 msgid "Tokens" msgstr "İşaretler" -#: authtoken/serializers.py:8 +#: authtoken/serializers.py:9 msgid "Username" msgstr "Kullanıcı adı" -#: authtoken/serializers.py:9 +#: authtoken/serializers.py:13 msgid "Password" msgstr "Şifre" -#: authtoken/serializers.py:20 -msgid "User account is disabled." -msgstr "Kullanıcı hesabı devre dışı bırakılmış." - -#: authtoken/serializers.py:23 +#: authtoken/serializers.py:35 msgid "Unable to log in with provided credentials." msgstr "Verilen bilgiler ile giriş sağlanamadı." -#: authtoken/serializers.py:26 +#: authtoken/serializers.py:38 msgid "Must include \"username\" and \"password\"." msgstr "\"Kullanıcı Adı\" ve \"Parola\" eklenmeli." -#: exceptions.py:49 +#: exceptions.py:102 msgid "A server error occurred." msgstr "Sunucu hatası oluştu." -#: exceptions.py:84 +#: exceptions.py:142 +msgid "Invalid input." +msgstr "" + +#: exceptions.py:161 msgid "Malformed request." msgstr "Bozuk istek." -#: exceptions.py:89 +#: exceptions.py:167 msgid "Incorrect authentication credentials." msgstr "Giriş bilgileri hatalı." -#: exceptions.py:94 +#: exceptions.py:173 msgid "Authentication credentials were not provided." msgstr "Giriş bilgileri verilmedi." -#: exceptions.py:99 +#: exceptions.py:179 msgid "You do not have permission to perform this action." msgstr "Bu işlemi yapmak için izniniz bulunmuyor." -#: exceptions.py:104 views.py:81 +#: exceptions.py:185 msgid "Not found." msgstr "Bulunamadı." -#: exceptions.py:109 +#: exceptions.py:191 +#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "\"{method}\" metoduna izin verilmiyor." -#: exceptions.py:120 +#: exceptions.py:202 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 +#: exceptions.py:212 +#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "İstekte desteklenmeyen medya tipi: \"{media_type}\"." -#: exceptions.py:145 +#: exceptions.py:223 msgid "Request was throttled." msgstr "Üst üste çok fazla istek yapıldı." -#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 -#: validators.py:181 +#: exceptions.py:224 +#, python-brace-format +msgid "Expected available in {wait} second." +msgstr "" + +#: exceptions.py:225 +#, python-brace-format +msgid "Expected available in {wait} seconds." +msgstr "" + +#: fields.py:316 relations.py:245 relations.py:279 validators.py:90 +#: validators.py:183 msgid "This field is required." msgstr "Bu alan zorunlu." -#: fields.py:270 +#: fields.py:317 msgid "This field may not be null." msgstr "Bu alan boş bırakılmamalı." -#: fields.py:608 fields.py:639 -msgid "\"{input}\" is not a valid boolean." -msgstr "\"{input}\" geçerli bir boolean değil." +#: fields.py:701 +msgid "Must be a valid boolean." +msgstr "" -#: fields.py:674 +#: fields.py:766 +msgid "Not a valid string." +msgstr "" + +#: fields.py:767 msgid "This field may not be blank." msgstr "Bu alan boş bırakılmamalı." -#: fields.py:675 fields.py:1675 +#: fields.py:768 fields.py:1881 +#, 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." -#: fields.py:676 +#: fields.py:769 +#, python-brace-format 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:713 +#: fields.py:816 msgid "Enter a valid email address." msgstr "Geçerli bir e-posta adresi girin." -#: fields.py:724 +#: fields.py:827 msgid "This value does not match the required pattern." msgstr "Bu değer gereken düzenli ifade deseni ile uyuşmuyor." -#: fields.py:735 +#: fields.py:838 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:747 +#: fields.py:839 +msgid "" +"Enter a valid \"slug\" consisting of Unicode letters, numbers, underscores, " +"or hyphens." +msgstr "" + +#: fields.py:854 msgid "Enter a valid URL." msgstr "Geçerli bir URL girin." -#: fields.py:760 -msgid "\"{value}\" is not a valid UUID." -msgstr "\"{value}\" geçerli bir UUID değil." +#: fields.py:867 +msgid "Must be a valid UUID." +msgstr "" -#: fields.py:796 +#: fields.py:903 msgid "Enter a valid IPv4 or IPv6 address." msgstr "Geçerli bir IPv4 ya da IPv6 adresi girin." -#: fields.py:821 +#: fields.py:931 msgid "A valid integer is required." msgstr "Geçerli bir tam sayı girin." -#: fields.py:822 fields.py:857 fields.py:891 +#: fields.py:932 fields.py:969 fields.py:1005 fields.py:1366 +#, python-brace-format 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:823 fields.py:858 fields.py:892 +#: fields.py:933 fields.py:970 fields.py:1006 fields.py:1367 +#, python-brace-format 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:824 fields.py:859 fields.py:896 +#: fields.py:934 fields.py:971 fields.py:1010 msgid "String value too large." msgstr "String değeri çok uzun." -#: fields.py:856 fields.py:890 +#: fields.py:968 fields.py:1004 msgid "A valid number is required." msgstr "Geçerli bir numara gerekiyor." -#: fields.py:893 +#: fields.py:1007 +#, python-brace-format 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:894 +#: fields.py:1008 +#, python-brace-format 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:895 +#: fields.py:1009 +#, python-brace-format 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:1025 +#: fields.py:1148 +#, python-brace-format 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:1026 +#: fields.py:1149 msgid "Expected a datetime but got a date." msgstr "Datetime değeri bekleniyor, ama date değeri geldi." -#: fields.py:1103 +#: fields.py:1150 +#, python-brace-format +msgid "Invalid datetime for the timezone \"{timezone}\"." +msgstr "" + +#: fields.py:1151 +msgid "Datetime value out of range." +msgstr "" + +#: fields.py:1236 +#, 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:1104 +#: fields.py:1237 msgid "Expected a date but got a datetime." msgstr "Date tipi beklenmekteydi, fakat datetime tipi geldi." -#: fields.py:1170 +#: fields.py:1303 +#, 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:1232 +#: fields.py:1365 +#, 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:1251 fields.py:1300 +#: fields.py:1399 fields.py:1456 +#, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" geçerli bir seçim değil." -#: fields.py:1254 relations.py:71 relations.py:441 +#: fields.py:1402 +#, python-brace-format msgid "More than {count} items..." msgstr "{count} elemandan daha fazla..." -#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 +#: fields.py:1457 fields.py:1603 relations.py:485 serializers.py:570 +#, 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:1302 +#: fields.py:1458 msgid "This selection may not be empty." msgstr "Bu seçim boş bırakılmamalı." -#: fields.py:1339 +#: fields.py:1495 +#, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "\"{input}\" geçerli bir yol seçimi değil." -#: fields.py:1358 +#: fields.py:1514 msgid "No file was submitted." msgstr "Hiçbir dosya verilmedi." -#: fields.py:1359 +#: fields.py:1515 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:1360 +#: fields.py:1516 msgid "No filename could be determined." msgstr "Hiçbir dosya adı belirlenemedi." -#: fields.py:1361 +#: fields.py:1517 msgid "The submitted file is empty." msgstr "Gönderilen dosya boş." -#: fields.py:1362 +#: fields.py:1518 +#, 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:1410 +#: fields.py:1566 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:1449 relations.py:438 serializers.py:525 +#: fields.py:1604 relations.py:486 serializers.py:571 msgid "This list may not be empty." msgstr "Bu liste boş olmamalı." -#: fields.py:1502 +#: fields.py:1605 +#, python-brace-format +msgid "Ensure this field has at least {min_length} elements." +msgstr "" + +#: fields.py:1606 +#, python-brace-format +msgid "Ensure this field has no more than {max_length} elements." +msgstr "" + +#: fields.py:1682 +#, 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:1549 +#: fields.py:1683 +msgid "This dictionary may not be empty." +msgstr "" + +#: fields.py:1755 msgid "Value must be valid JSON." msgstr "Değer geçerli bir JSON olmalı." -#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 -msgid "Submit" -msgstr "Gönder" +#: filters.py:49 templates/rest_framework/filters/search.html:2 +msgid "Search" +msgstr "Arama" -#: filters.py:336 +#: filters.py:50 +msgid "A search term." +msgstr "" + +#: filters.py:180 templates/rest_framework/filters/ordering.html:3 +msgid "Ordering" +msgstr "Sıralama" + +#: filters.py:181 +msgid "Which field to use when ordering the results." +msgstr "" + +#: filters.py:287 msgid "ascending" msgstr "" -#: filters.py:337 +#: filters.py:288 msgid "descending" msgstr "" -#: pagination.py:193 +#: pagination.py:174 +msgid "A page number within the paginated result set." +msgstr "" + +#: pagination.py:179 pagination.py:372 pagination.py:590 +msgid "Number of results to return per page." +msgstr "" + +#: pagination.py:189 msgid "Invalid page." msgstr "Geçersiz sayfa." -#: pagination.py:427 +#: pagination.py:374 +msgid "The initial index from which to return the results." +msgstr "" + +#: pagination.py:581 +msgid "The pagination cursor value." +msgstr "" + +#: pagination.py:583 msgid "Invalid cursor" msgstr "Sayfalandırma imleci geçersiz" -#: relations.py:207 +#: relations.py:246 +#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Geçersiz pk \"{pk_value}\" - obje bulunamadı." -#: relations.py:208 +#: relations.py:247 +#, 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:240 +#: relations.py:280 msgid "Invalid hyperlink - No URL match." msgstr "Geçersiz bağlantı - Hiçbir URL eşleşmedi." -#: relations.py:241 +#: relations.py:281 msgid "Invalid hyperlink - Incorrect URL match." msgstr "Geçersiz bağlantı - Yanlış URL eşleşmesi." -#: relations.py:242 +#: relations.py:282 msgid "Invalid hyperlink - Object does not exist." msgstr "Geçersiz bağlantı - Obje bulunamadı." -#: relations.py:243 +#: relations.py:283 +#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Hatalı tip. URL metni bekleniyor, {data_type} alındı." -#: relations.py:401 +#: relations.py:448 +#, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "{slug_name}={value} değerini taşıyan obje bulunamadı." -#: relations.py:402 +#: relations.py:449 msgid "Invalid value." msgstr "Geçersiz değer." -#: serializers.py:326 +#: schemas/utils.py:32 +msgid "unique integer value" +msgstr "" + +#: schemas/utils.py:34 +msgid "UUID string" +msgstr "" + +#: schemas/utils.py:36 +msgid "unique value" +msgstr "" + +#: schemas/utils.py:38 +#, python-brace-format +msgid "A {value_type} identifying this {name}." +msgstr "" + +#: serializers.py:337 +#, 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:116 -#: templates/rest_framework/base.html:128 +#: templates/rest_framework/base.html:136 +msgid "Extra Actions" +msgstr "" + +#: templates/rest_framework/admin.html:130 +#: templates/rest_framework/base.html:150 msgid "Filters" msgstr "Filtreler" -#: templates/rest_framework/filters/django_filter.html:2 -#: templates/rest_framework/filters/django_filter_crispyforms.html:4 -msgid "Field filters" -msgstr "Alan filtreleri" +#: templates/rest_framework/base.html:37 +msgid "navbar" +msgstr "" -#: templates/rest_framework/filters/ordering.html:3 -msgid "Ordering" -msgstr "Sıralama" +#: templates/rest_framework/base.html:75 +msgid "content" +msgstr "" -#: templates/rest_framework/filters/search.html:2 -msgid "Search" -msgstr "Arama" +#: templates/rest_framework/base.html:78 +msgid "request form" +msgstr "" -#: templates/rest_framework/horizontal/radio.html:2 -#: templates/rest_framework/inline/radio.html:2 -#: templates/rest_framework/vertical/radio.html:2 +#: templates/rest_framework/base.html:157 +msgid "main content" +msgstr "" + +#: templates/rest_framework/base.html:173 +msgid "request info" +msgstr "" + +#: templates/rest_framework/base.html:177 +msgid "response info" +msgstr "" + +#: templates/rest_framework/horizontal/radio.html:4 +#: templates/rest_framework/inline/radio.html:3 +#: templates/rest_framework/vertical/radio.html:3 msgid "None" msgstr "Hiçbiri" -#: templates/rest_framework/horizontal/select_multiple.html:2 -#: templates/rest_framework/inline/select_multiple.html:2 -#: templates/rest_framework/vertical/select_multiple.html:2 +#: templates/rest_framework/horizontal/select_multiple.html:4 +#: templates/rest_framework/inline/select_multiple.html:3 +#: templates/rest_framework/vertical/select_multiple.html:3 msgid "No items to select." msgstr "Seçenek yok." -#: validators.py:43 +#: validators.py:39 msgid "This field must be unique." msgstr "Bu alan eşsiz olmalı." -#: validators.py:97 +#: validators.py:89 +#, python-brace-format 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:245 +#: validators.py:171 +#, python-brace-format +msgid "Surrogate characters are not allowed: U+{code_point:X}." +msgstr "" + +#: validators.py:243 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" date." msgstr "Bu alan \"{date_field}\" tarihine göre eşsiz olmalı." -#: validators.py:260 +#: validators.py:258 +#, python-brace-format 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:273 +#: validators.py:271 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" year." msgstr "Bu alan \"{date_field}\" yılına göre eşsiz olmalı." -#: versioning.py:42 +#: versioning.py:40 msgid "Invalid version in \"Accept\" header." msgstr "\"Accept\" başlığındaki sürüm geçersiz." -#: versioning.py:73 +#: versioning.py:71 msgid "Invalid version in URL path." msgstr "URL dizininde geçersiz versiyon." -#: versioning.py:115 +#: versioning.py:116 msgid "Invalid version in URL path. Does not match any version namespace." msgstr "" -#: versioning.py:147 +#: versioning.py:148 msgid "Invalid version in hostname." msgstr "Host adında geçersiz versiyon." -#: versioning.py:169 +#: versioning.py:170 msgid "Invalid version in query parameter." msgstr "Sorgu parametresinde geçersiz versiyon." - -#: views.py:88 -msgid "Permission denied." -msgstr "Erişim engellendi." diff --git a/rest_framework/locale/tr_TR/LC_MESSAGES/django.mo b/rest_framework/locale/tr_TR/LC_MESSAGES/django.mo index 2999352a2ab57f2e586958fad1b49c03fd194728..3751732bed5bf46bde9aeb814b71f2a8e1d419a5 100644 GIT binary patch delta 2430 zcmZwHU2IfE7{>8gmX?BmmM*jfk)gD9i?pGMq`LkTOv0YzeoU)NQ^fmL?Oh)pwa)cduqIJ(szF|=bX-& zd1vO_YWkoter?j|qlU7TxL@Hl=Ag{vhvLsN#$pK;;Tp`tov7yz;WT^)$Ke-PiWhJW z-o-KKA8X7qEXS4Dn>KDfp|Xk#9{#%)>#+r2#E0=Z1~LC0V;Zm-tMEAL{#9IyzVXJ) zLI)?|^QZy7=3f8M^)jlzzc66p#w?nU9$^$U!vWL_-oS-;32QKWqA|;{3Cr*(@@Izm z(R1ISAIINo%uEd6Y}|x&VV=cudE zrSi7h4rHhAuSYM}`%xL#hY#RkRDY+j7{A0R_$$UOl}w(_!D1YZK_u&@7UyCEvW#ZG z>vO0M4x_fo+n9^*VL1+=mh=v4z>Dcz_uEkIU8p_tat`@lK;>O7q}CeM&iAE9+=zN` z2U;9N4d@gq1D7xZr%g@|WF|gD+m98v5!>(u)Wm+meEbD9p}!}Se_hC8I+a*}>_^j# z%0LIc?=j{n)ZWNr>uXJ`Q8Vhs>G%vP)yGf+{?zpfZl?V^vfoS-FI$RRa4o(Wr&34d zCbnTE3#Co=5~}?*DwVV8wHad=!}HjHLGr1N25~ihj~d`~Mx_C+#sb`m^YNhT$Eg0| zH>oV5vYg>-=1(JIF@v}ekE8Bi!6(o+gRJ0wY{VasePrfX))}i&ORygw#FMB2e1+^+ za|=sx6i0*s#Z5UCtz`)H!c(XRuVW$JM!g`HUUY0qkg=Fn)Qks^IhfB-FT93hFoPqb zlutnQGZh)DslgKLz&xG*LsWQ&Ie|K-!>G0Y7S+Lzs0`ddWvGzeGO-Nx!T@R$wxcq) z4Xf|~*5OB}rT7yyF&`UA6DX3r-_%hFU?RrKRAjB7;asVD=NQEPV>Gq9MaGO-jr=q1z<$NJy0 ziW;XWRg^ttXd@9M)R&5~r-^9LTZs;00YQnUQlgqNpmlC1T8NRtSW;(MyI0F%36;&n z3ZjYNkfe_1CTt*7lnIp$gl4Ux<=`uwD%z}bwEq7sOKG&Z7nC|OXj+MC!bhl-6H4FX z#Arfmt#1dP2=fS`!WZ4FCv?QvHf9S^PiTLrtR`xS@p`{fuk})4kC;bOwRGy;YU*U@ z%eRu4;a=1+;xk|#bKBb0>)iShPC~T%FP~v9i3hg1>pT zVo}xnK%zD`*S0$S-JzIW7wd}d>f37_NmPnUlw}*yKYJ~f2@6g%U(Al0c)4YDI-5U+} z{r_#dA^n_ny24Iu_>7(kojVpLLJ_;IkNe*lRWCGY?M delta 2571 zcmZY9e@s@g{aCiPYW|qbKbmVbi#D6K_5PfDTx~tO-}8E&hr@H8 z-zVE{u8m*GO@G6XI*I#rLfnlOCU7>M#2NS_`tdK+|L2Z1W*W}L zakvW0a08a&9?ZmHY&0frPLWwo#U0Nk{%Zy0S8)km#0@xkyfHPn3+wR+uEHx=hb0qI zf46Zp<#%u<-oRYU$xd~!5LLg(HEv7?88!GaR^wUZXKwLOPcw2-BhEp6s0wQ_f{XEe zY{H+h97`wiG2DuJZxxgDdw!4n%rzcrXB4%4#?#1D%te(;umUSlOWZM;^;gf2doO;DDqlryqB}Sr{ZmqF z+lnghMUCK7)O$amg@2+tn4jlvF0&lRP##2eU_U;Lhp-aQ<}v@9$&6B=k*=Zp1-Q<$ z8#U6sUio!=gz|AbmS)Ule30@>908q*6R5Slh+3MzQ8Q3TqtkH#Y6&)?I^G}mG6!%A z6(1oR){JF%OEDj{n>S%I9>vXg1GVXzX+`B%P*eI7wqps?7{%vNr{oV*JB#T>3+_X8 zH2xhK^-$d^0zXz^y=M=q!K1hUZzCJmR6jr`aT(HQ(~7m|px!%zJMj{3$0o~|HXK6s zpBcr4I{z7ksWoXrO=SetkweJFH>a=+FQ7Vh3mdVFm-N9N)O#P`EIf_+z*W>~x`~>4 zi}jF;P~X{xnS9^8NJdls8mfV}kWQO3_z+%3meFMLN4{+=)cw$iIu&iG|KExlc^7JC zj$j6!Ky@gI`tW(wru+p9_`dm_j4ql9?4UZFg3Z{9TAG8X5uQM1-<R9<2?4^rJS#3#bM^L~WXDsQ1c?Q^%$T`5A|Y zI(7gxGefB3bsp1j1ECq=6ua$%o75@IP^s2mNz-^Y>BCAI2}|dudY+FGwCkpgJXaE9 z2rZR5&4F-7)rLx1Yt5pP_Rm&gJF%QlCo2f|`?^Z=2(9Tdg4uLa6VG)-2f>Br9xpI! z^dQYAvfNy1pD4SHX!YuJ!8Ce#3w1GVA?_iRIH{&xFc}lF(++Xmvy)Av+K*PZVdhOfMRsvd{kiTkY*Do0H)z-rpt)Lxt>|l9fUv5pty1tHXr#E>vx7ar&(AgR33-{{#K_?dI z22t!H|^gcJ!PLeW=BJg)!{@fcR)M* z(=#S64F$sPh@y7LjylO_XI%Fsek;mPepb|%HfiMJXPmGVwSz%B=!Ak!d7^4oOXiAm vpM-;UG&wM6Ae5)G92nwMS0@gIfMTIWFJG% diff --git a/rest_framework/locale/tr_TR/LC_MESSAGES/django.po b/rest_framework/locale/tr_TR/LC_MESSAGES/django.po index 94856c70f..b0c96ddd1 100644 --- a/rest_framework/locale/tr_TR/LC_MESSAGES/django.po +++ b/rest_framework/locale/tr_TR/LC_MESSAGES/django.po @@ -3,55 +3,56 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Deniz , 2019 # José Luis , 2015-2016 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: 2017-08-03 14:58+0000\n" -"Last-Translator: Thomas Christie \n" +"POT-Creation-Date: 2020-10-13 21:45+0200\n" +"PO-Revision-Date: 2020-10-13 19:45+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" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: tr_TR\n" -"Plural-Forms: nplurals=1; plural=0;\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: authentication.py:73 +#: authentication.py:70 msgid "Invalid basic header. No credentials provided." msgstr "Geçersiz yetkilendirme başlığı. Gerekli uygunluk kriterleri sağlanmamış." -#: authentication.py:76 +#: authentication.py:73 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:82 +#: authentication.py:83 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:99 +#: authentication.py:101 msgid "Invalid username/password." msgstr "Geçersiz kullanıcı adı / şifre." -#: authentication.py:102 authentication.py:198 +#: authentication.py:104 authentication.py:206 msgid "User inactive or deleted." msgstr "Kullanıcı aktif değil ya da silinmiş" -#: authentication.py:176 +#: authentication.py:184 msgid "Invalid token header. No credentials provided." msgstr "Geçersiz token başlığı. Kimlik bilgileri eksik." -#: authentication.py:179 +#: authentication.py:187 msgid "Invalid token header. Token string should not contain spaces." msgstr "Geçersiz token başlığı. Token'da boşluk olmamalı." -#: authentication.py:185 +#: authentication.py:193 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:195 +#: authentication.py:203 msgid "Invalid token." msgstr "Geçersiz simge." @@ -59,382 +60,515 @@ msgstr "Geçersiz simge." msgid "Auth Token" msgstr "Kimlik doğrulama belirteci" -#: authtoken/models.py:15 +#: authtoken/models.py:13 msgid "Key" msgstr "Anahtar" -#: authtoken/models.py:18 +#: authtoken/models.py:16 msgid "User" msgstr "Kullanan" -#: authtoken/models.py:20 +#: authtoken/models.py:18 msgid "Created" msgstr "Oluşturulan" -#: authtoken/models.py:29 +#: authtoken/models.py:27 authtoken/serializers.py:19 msgid "Token" msgstr "İşaret" -#: authtoken/models.py:30 +#: authtoken/models.py:28 msgid "Tokens" msgstr "İşaretler" -#: authtoken/serializers.py:8 +#: authtoken/serializers.py:9 msgid "Username" msgstr "Kullanıcı adı" -#: authtoken/serializers.py:9 +#: authtoken/serializers.py:13 msgid "Password" msgstr "Şifre" -#: authtoken/serializers.py:20 -msgid "User account is disabled." -msgstr "Kullanıcı hesabı devre dışı bırakılmış." - -#: authtoken/serializers.py:23 +#: authtoken/serializers.py:35 msgid "Unable to log in with provided credentials." msgstr "Verilen bilgiler ile giriş sağlanamadı." -#: authtoken/serializers.py:26 +#: authtoken/serializers.py:38 msgid "Must include \"username\" and \"password\"." msgstr "\"Kullanıcı Adı\" ve \"Parola\" eklenmeli." -#: exceptions.py:49 +#: exceptions.py:102 msgid "A server error occurred." msgstr "Sunucu hatası oluştu." -#: exceptions.py:84 +#: exceptions.py:142 +msgid "Invalid input." +msgstr "" + +#: exceptions.py:161 msgid "Malformed request." msgstr "Bozuk istek." -#: exceptions.py:89 +#: exceptions.py:167 msgid "Incorrect authentication credentials." msgstr "Giriş bilgileri hatalı." -#: exceptions.py:94 +#: exceptions.py:173 msgid "Authentication credentials were not provided." msgstr "Giriş bilgileri verilmedi." -#: exceptions.py:99 +#: exceptions.py:179 msgid "You do not have permission to perform this action." msgstr "Bu işlemi yapmak için izniniz bulunmuyor." -#: exceptions.py:104 views.py:81 +#: exceptions.py:185 msgid "Not found." msgstr "Bulunamadı." -#: exceptions.py:109 +#: exceptions.py:191 +#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "\"{method}\" metoduna izin verilmiyor." -#: exceptions.py:120 +#: exceptions.py:202 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 +#: exceptions.py:212 +#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "İstekte desteklenmeyen medya tipi: \"{media_type}\"." -#: exceptions.py:145 +#: exceptions.py:223 msgid "Request was throttled." msgstr "Üst üste çok fazla istek yapıldı." -#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 -#: validators.py:181 +#: exceptions.py:224 +#, python-brace-format +msgid "Expected available in {wait} second." +msgstr "" + +#: exceptions.py:225 +#, python-brace-format +msgid "Expected available in {wait} seconds." +msgstr "" + +#: fields.py:316 relations.py:245 relations.py:279 validators.py:90 +#: validators.py:183 msgid "This field is required." msgstr "Bu alan zorunlu." -#: fields.py:270 +#: fields.py:317 msgid "This field may not be null." msgstr "Bu alan boş bırakılmamalı." -#: fields.py:608 fields.py:639 -msgid "\"{input}\" is not a valid boolean." -msgstr "\"{input}\" geçerli bir boolean değil." +#: fields.py:701 +msgid "Must be a valid boolean." +msgstr "" -#: fields.py:674 +#: fields.py:766 +msgid "Not a valid string." +msgstr "" + +#: fields.py:767 msgid "This field may not be blank." msgstr "Bu alan boş bırakılmamalı." -#: fields.py:675 fields.py:1675 +#: fields.py:768 fields.py:1881 +#, 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." -#: fields.py:676 +#: fields.py:769 +#, python-brace-format 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:713 +#: fields.py:816 msgid "Enter a valid email address." msgstr "Geçerli bir e-posta adresi girin." -#: fields.py:724 +#: fields.py:827 msgid "This value does not match the required pattern." msgstr "Bu değer gereken düzenli ifade deseni ile uyuşmuyor." -#: fields.py:735 +#: fields.py:838 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:747 +#: fields.py:839 +msgid "" +"Enter a valid \"slug\" consisting of Unicode letters, numbers, underscores, " +"or hyphens." +msgstr "" + +#: fields.py:854 msgid "Enter a valid URL." msgstr "Geçerli bir URL girin." -#: fields.py:760 -msgid "\"{value}\" is not a valid UUID." -msgstr "\"{value}\" geçerli bir UUID değil." +#: fields.py:867 +msgid "Must be a valid UUID." +msgstr "" -#: fields.py:796 +#: fields.py:903 msgid "Enter a valid IPv4 or IPv6 address." msgstr "Geçerli bir IPv4 ya da IPv6 adresi girin." -#: fields.py:821 +#: fields.py:931 msgid "A valid integer is required." msgstr "Geçerli bir tam sayı girin." -#: fields.py:822 fields.py:857 fields.py:891 +#: fields.py:932 fields.py:969 fields.py:1005 fields.py:1366 +#, python-brace-format 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:823 fields.py:858 fields.py:892 +#: fields.py:933 fields.py:970 fields.py:1006 fields.py:1367 +#, python-brace-format 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:824 fields.py:859 fields.py:896 +#: fields.py:934 fields.py:971 fields.py:1010 msgid "String value too large." msgstr "String değeri çok uzun." -#: fields.py:856 fields.py:890 +#: fields.py:968 fields.py:1004 msgid "A valid number is required." msgstr "Geçerli bir numara gerekiyor." -#: fields.py:893 +#: fields.py:1007 +#, python-brace-format 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:894 +#: fields.py:1008 +#, python-brace-format 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:895 +#: fields.py:1009 +#, python-brace-format 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:1025 +#: fields.py:1148 +#, python-brace-format 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:1026 +#: fields.py:1149 msgid "Expected a datetime but got a date." msgstr "Datetime değeri bekleniyor, ama date değeri geldi." -#: fields.py:1103 +#: fields.py:1150 +#, python-brace-format +msgid "Invalid datetime for the timezone \"{timezone}\"." +msgstr "" + +#: fields.py:1151 +msgid "Datetime value out of range." +msgstr "" + +#: fields.py:1236 +#, 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:1104 +#: fields.py:1237 msgid "Expected a date but got a datetime." msgstr "Date tipi beklenmekteydi, fakat datetime tipi geldi." -#: fields.py:1170 +#: fields.py:1303 +#, 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:1232 +#: fields.py:1365 +#, 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:1251 fields.py:1300 +#: fields.py:1399 fields.py:1456 +#, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" geçerli bir seçim değil." -#: fields.py:1254 relations.py:71 relations.py:441 +#: fields.py:1402 +#, python-brace-format msgid "More than {count} items..." msgstr "{count} elemandan daha fazla..." -#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 +#: fields.py:1457 fields.py:1603 relations.py:485 serializers.py:570 +#, 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:1302 +#: fields.py:1458 msgid "This selection may not be empty." msgstr "Bu seçim boş bırakılmamalı." -#: fields.py:1339 +#: fields.py:1495 +#, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "\"{input}\" geçerli bir yol seçimi değil." -#: fields.py:1358 +#: fields.py:1514 msgid "No file was submitted." msgstr "Hiçbir dosya verilmedi." -#: fields.py:1359 +#: fields.py:1515 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:1360 +#: fields.py:1516 msgid "No filename could be determined." msgstr "Hiçbir dosya adı belirlenemedi." -#: fields.py:1361 +#: fields.py:1517 msgid "The submitted file is empty." msgstr "Gönderilen dosya boş." -#: fields.py:1362 +#: fields.py:1518 +#, 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:1410 +#: fields.py:1566 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:1449 relations.py:438 serializers.py:525 +#: fields.py:1604 relations.py:486 serializers.py:571 msgid "This list may not be empty." msgstr "Bu liste boş olmamalı." -#: fields.py:1502 +#: fields.py:1605 +#, python-brace-format +msgid "Ensure this field has at least {min_length} elements." +msgstr "" + +#: fields.py:1606 +#, python-brace-format +msgid "Ensure this field has no more than {max_length} elements." +msgstr "" + +#: fields.py:1682 +#, 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:1549 +#: fields.py:1683 +msgid "This dictionary may not be empty." +msgstr "" + +#: fields.py:1755 msgid "Value must be valid JSON." msgstr "Değer geçerli bir JSON olmalı." -#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 -msgid "Submit" -msgstr "Gönder" +#: filters.py:49 templates/rest_framework/filters/search.html:2 +msgid "Search" +msgstr "Arama" -#: filters.py:336 +#: filters.py:50 +msgid "A search term." +msgstr "" + +#: filters.py:180 templates/rest_framework/filters/ordering.html:3 +msgid "Ordering" +msgstr "Sıralama" + +#: filters.py:181 +msgid "Which field to use when ordering the results." +msgstr "" + +#: filters.py:287 msgid "ascending" -msgstr "" +msgstr "artan" -#: filters.py:337 +#: filters.py:288 msgid "descending" +msgstr "azalan" + +#: pagination.py:174 +msgid "A page number within the paginated result set." msgstr "" -#: pagination.py:193 +#: pagination.py:179 pagination.py:372 pagination.py:590 +msgid "Number of results to return per page." +msgstr "" + +#: pagination.py:189 msgid "Invalid page." msgstr "Geçersiz sayfa." -#: pagination.py:427 +#: pagination.py:374 +msgid "The initial index from which to return the results." +msgstr "" + +#: pagination.py:581 +msgid "The pagination cursor value." +msgstr "" + +#: pagination.py:583 msgid "Invalid cursor" msgstr "Geçersiz imleç." -#: relations.py:207 +#: relations.py:246 +#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Geçersiz pk \"{pk_value}\" - obje bulunamadı." -#: relations.py:208 +#: relations.py:247 +#, 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:240 +#: relations.py:280 msgid "Invalid hyperlink - No URL match." msgstr "Geçersiz hyper link - URL maçı yok." -#: relations.py:241 +#: relations.py:281 msgid "Invalid hyperlink - Incorrect URL match." msgstr "Geçersiz hyper link - Yanlış URL maçı." -#: relations.py:242 +#: relations.py:282 msgid "Invalid hyperlink - Object does not exist." msgstr "Geçersiz hyper link - Nesne yok.." -#: relations.py:243 +#: relations.py:283 +#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Hatalı tip. URL metni bekleniyor, {data_type} alındı." -#: relations.py:401 +#: relations.py:448 +#, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "{slug_name}={value} değerini taşıyan obje bulunamadı." -#: relations.py:402 +#: relations.py:449 msgid "Invalid value." msgstr "Geçersiz değer." -#: serializers.py:326 +#: schemas/utils.py:32 +msgid "unique integer value" +msgstr "" + +#: schemas/utils.py:34 +msgid "UUID string" +msgstr "" + +#: schemas/utils.py:36 +msgid "unique value" +msgstr "" + +#: schemas/utils.py:38 +#, python-brace-format +msgid "A {value_type} identifying this {name}." +msgstr "" + +#: serializers.py:337 +#, 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:116 -#: templates/rest_framework/base.html:128 +#: templates/rest_framework/base.html:136 +msgid "Extra Actions" +msgstr "" + +#: templates/rest_framework/admin.html:130 +#: templates/rest_framework/base.html:150 msgid "Filters" msgstr "Filtreler" -#: templates/rest_framework/filters/django_filter.html:2 -#: templates/rest_framework/filters/django_filter_crispyforms.html:4 -msgid "Field filters" -msgstr "Alan filtreleri" +#: templates/rest_framework/base.html:37 +msgid "navbar" +msgstr "" -#: templates/rest_framework/filters/ordering.html:3 -msgid "Ordering" -msgstr "Sıralama" +#: templates/rest_framework/base.html:75 +msgid "content" +msgstr "" -#: templates/rest_framework/filters/search.html:2 -msgid "Search" -msgstr "Arama" +#: templates/rest_framework/base.html:78 +msgid "request form" +msgstr "" -#: templates/rest_framework/horizontal/radio.html:2 -#: templates/rest_framework/inline/radio.html:2 -#: templates/rest_framework/vertical/radio.html:2 +#: templates/rest_framework/base.html:157 +msgid "main content" +msgstr "" + +#: templates/rest_framework/base.html:173 +msgid "request info" +msgstr "" + +#: templates/rest_framework/base.html:177 +msgid "response info" +msgstr "" + +#: templates/rest_framework/horizontal/radio.html:4 +#: templates/rest_framework/inline/radio.html:3 +#: templates/rest_framework/vertical/radio.html:3 msgid "None" msgstr "Hiç kimse" -#: templates/rest_framework/horizontal/select_multiple.html:2 -#: templates/rest_framework/inline/select_multiple.html:2 -#: templates/rest_framework/vertical/select_multiple.html:2 +#: templates/rest_framework/horizontal/select_multiple.html:4 +#: templates/rest_framework/inline/select_multiple.html:3 +#: templates/rest_framework/vertical/select_multiple.html:3 msgid "No items to select." msgstr "Seçenek yok." -#: validators.py:43 +#: validators.py:39 msgid "This field must be unique." msgstr "Bu alan benzersiz olmalıdır." -#: validators.py:97 +#: validators.py:89 +#, python-brace-format msgid "The fields {field_names} must make a unique set." msgstr "{field_names} alanları benzersiz bir set yapmak gerekir." -#: validators.py:245 +#: validators.py:171 +#, python-brace-format +msgid "Surrogate characters are not allowed: U+{code_point:X}." +msgstr "" + +#: validators.py:243 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" date." msgstr "Bu alan \"{date_field}\" tarihine göre eşsiz olmalı." -#: validators.py:260 +#: validators.py:258 +#, python-brace-format 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:273 +#: validators.py:271 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" year." msgstr "Bu alan \"{date_field}\" yılına göre eşsiz olmalı." -#: versioning.py:42 +#: versioning.py:40 msgid "Invalid version in \"Accept\" header." msgstr "\"Kabul et\" başlığında geçersiz sürümü." -#: versioning.py:73 +#: versioning.py:71 msgid "Invalid version in URL path." -msgstr "URL yolu geçersiz sürümü." +msgstr "URL yolunda geçersiz sürüm." -#: versioning.py:115 +#: versioning.py:116 msgid "Invalid version in URL path. Does not match any version namespace." -msgstr "" +msgstr "URL yolunda geçersiz sürüm. Sürüm adlarında eşleşen bulunamadı." -#: versioning.py:147 +#: versioning.py:148 msgid "Invalid version in hostname." msgstr "Hostname geçersiz sürümü." -#: versioning.py:169 +#: versioning.py:170 msgid "Invalid version in query parameter." msgstr "Sorgu parametresi geçersiz sürümü." - -#: views.py:88 -msgid "Permission denied." -msgstr "İzin reddedildi." diff --git a/rest_framework/locale/uk/LC_MESSAGES/django.mo b/rest_framework/locale/uk/LC_MESSAGES/django.mo index 9772bedc56fe9bc27e1165f523ee45b920246a8b..18c3242bbed7b0a0ad675349c155e3939d2d3c1d 100644 GIT binary patch delta 2803 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, 2016 +# Denis Podlesniy , 2016 # Illarion , 2016 -# Kirill Tarasenko, 2016 +# Kirill Tarasenko, 2016,2018 # Victor Mireyev , 2017 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: 2017-08-03 14:58+0000\n" -"Last-Translator: Victor Mireyev \n" +"POT-Creation-Date: 2020-10-13 21:45+0200\n" +"PO-Revision-Date: 2020-10-13 19:45+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" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "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" +"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);\n" -#: authentication.py:73 +#: authentication.py:70 msgid "Invalid basic header. No credentials provided." msgstr "Недійсний основний заголовок. Облікові дані відсутні." -#: authentication.py:76 +#: authentication.py:73 msgid "Invalid basic header. Credentials string should not contain spaces." -msgstr "Недійсний основний заголовок. Облікові дані мають бути без пробілів." +msgstr "Недійсний основний заголовок. Строка з обліковими даними має бути без пробілів." -#: authentication.py:82 +#: authentication.py:83 msgid "Invalid basic header. Credentials not correctly base64 encoded." -msgstr "Недійсний основний заголовок. Облікові дані невірно закодовані у Base64." +msgstr "Недійсний основний заголовок. Облікові дані невірно закодовані у base64." -#: authentication.py:99 +#: authentication.py:101 msgid "Invalid username/password." msgstr "Недійсне iм'я користувача/пароль." -#: authentication.py:102 authentication.py:198 +#: authentication.py:104 authentication.py:206 msgid "User inactive or deleted." msgstr "Користувач неактивний або видалений." -#: authentication.py:176 +#: authentication.py:184 msgid "Invalid token header. No credentials provided." -msgstr "Недійсний заголовок токена. Облікові дані відсутні." +msgstr "Недійсний токен. Облікові дані відсутні." -#: authentication.py:179 +#: authentication.py:187 msgid "Invalid token header. Token string should not contain spaces." -msgstr "Недійсний заголовок токена. Значення токена не повинне містити пробіли." +msgstr "Недійсний токен. Значення токена не повинне містити пробіли." -#: authentication.py:185 +#: authentication.py:193 msgid "" "Invalid token header. Token string should not contain invalid characters." -msgstr "Недійсний заголовок токена. Значення токена не повинне містити некоректні символи." +msgstr "Недійсний токен. Значення токена не повинне містити некоректні символи." -#: authentication.py:195 +#: authentication.py:203 msgid "Invalid token." msgstr "Недійсний токен." @@ -62,382 +62,515 @@ msgstr "Недійсний токен." msgid "Auth Token" msgstr "Авторизаційний токен" -#: authtoken/models.py:15 +#: authtoken/models.py:13 msgid "Key" msgstr "Ключ" -#: authtoken/models.py:18 +#: authtoken/models.py:16 msgid "User" msgstr "Користувач" -#: authtoken/models.py:20 +#: authtoken/models.py:18 msgid "Created" msgstr "Створено" -#: authtoken/models.py:29 +#: authtoken/models.py:27 authtoken/serializers.py:19 msgid "Token" msgstr "Токен" -#: authtoken/models.py:30 +#: authtoken/models.py:28 msgid "Tokens" msgstr "Токени" -#: authtoken/serializers.py:8 +#: authtoken/serializers.py:9 msgid "Username" msgstr "Ім'я користувача" -#: authtoken/serializers.py:9 +#: authtoken/serializers.py:13 msgid "Password" msgstr "Пароль" -#: authtoken/serializers.py:20 -msgid "User account is disabled." -msgstr "Обліковий запис деактивований." - -#: authtoken/serializers.py:23 +#: authtoken/serializers.py:35 msgid "Unable to log in with provided credentials." msgstr "Неможливо зайти з введеними даними." -#: authtoken/serializers.py:26 +#: authtoken/serializers.py:38 msgid "Must include \"username\" and \"password\"." msgstr "Має включати iм'я користувача та пароль" -#: exceptions.py:49 +#: exceptions.py:102 msgid "A server error occurred." msgstr "Помилка сервера." -#: exceptions.py:84 +#: exceptions.py:142 +msgid "Invalid input." +msgstr "" + +#: exceptions.py:161 msgid "Malformed request." msgstr "Некоректний запит." -#: exceptions.py:89 +#: exceptions.py:167 msgid "Incorrect authentication credentials." msgstr "Некоректні реквізити перевірки достовірності." -#: exceptions.py:94 +#: exceptions.py:173 msgid "Authentication credentials were not provided." msgstr "Реквізити перевірки достовірності не надані." -#: exceptions.py:99 +#: exceptions.py:179 msgid "You do not have permission to perform this action." msgstr "У вас нема дозволу робити цю дію." -#: exceptions.py:104 views.py:81 +#: exceptions.py:185 msgid "Not found." msgstr "Не знайдено." -#: exceptions.py:109 +#: exceptions.py:191 +#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "Метод \"{method}\" не дозволений." -#: exceptions.py:120 +#: exceptions.py:202 msgid "Could not satisfy the request Accept header." -msgstr "Неможливо виконати запит прийняття заголовку." +msgstr "Неможливо виконати запит заголовку Accept." -#: exceptions.py:132 +#: exceptions.py:212 +#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "Непідтримуваний тип даних \"{media_type}\" в запиті." -#: exceptions.py:145 +#: exceptions.py:223 msgid "Request was throttled." msgstr "Запит було проігноровано." -#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 -#: validators.py:181 +#: exceptions.py:224 +#, python-brace-format +msgid "Expected available in {wait} second." +msgstr "" + +#: exceptions.py:225 +#, python-brace-format +msgid "Expected available in {wait} seconds." +msgstr "" + +#: fields.py:316 relations.py:245 relations.py:279 validators.py:90 +#: validators.py:183 msgid "This field is required." msgstr "Це поле обов'язкове." -#: fields.py:270 +#: fields.py:317 msgid "This field may not be null." msgstr "Це поле не може бути null." -#: fields.py:608 fields.py:639 -msgid "\"{input}\" is not a valid boolean." -msgstr "\"{input}\" не є коректним бульовим значенням." +#: fields.py:701 +msgid "Must be a valid boolean." +msgstr "" -#: fields.py:674 +#: fields.py:766 +msgid "Not a valid string." +msgstr "" + +#: fields.py:767 msgid "This field may not be blank." msgstr "Це поле не може бути порожнім." -#: fields.py:675 fields.py:1675 +#: fields.py:768 fields.py:1881 +#, python-brace-format msgid "Ensure this field has no more than {max_length} characters." msgstr "Переконайтесь, що кількість символів в цьому полі не перевищує {max_length}." -#: fields.py:676 +#: fields.py:769 +#, python-brace-format msgid "Ensure this field has at least {min_length} characters." msgstr "Переконайтесь, що в цьому полі мінімум {min_length} символів." -#: fields.py:713 +#: fields.py:816 msgid "Enter a valid email address." msgstr "Введіть коректну адресу електронної пошти." -#: fields.py:724 +#: fields.py:827 msgid "This value does not match the required pattern." msgstr "Значення не відповідає необхідному патерну." -#: fields.py:735 +#: fields.py:838 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "Введіть коректний \"slug\", що складається із букв, цифр, нижніх підкреслень або дефісів. " -#: fields.py:747 +#: fields.py:839 +msgid "" +"Enter a valid \"slug\" consisting of Unicode letters, numbers, underscores, " +"or hyphens." +msgstr "" + +#: fields.py:854 msgid "Enter a valid URL." msgstr "Введіть коректний URL." -#: fields.py:760 -msgid "\"{value}\" is not a valid UUID." -msgstr "\"{value}\" не є коректним UUID." +#: fields.py:867 +msgid "Must be a valid UUID." +msgstr "" -#: fields.py:796 +#: fields.py:903 msgid "Enter a valid IPv4 or IPv6 address." -msgstr "Введіть дійсну IPv4 або IPv6 адресу." +msgstr "Введіть коректну IPv4 або IPv6 адресу." -#: fields.py:821 +#: fields.py:931 msgid "A valid integer is required." msgstr "Необхідне цілочисельне значення." -#: fields.py:822 fields.py:857 fields.py:891 +#: fields.py:932 fields.py:969 fields.py:1005 fields.py:1366 +#, python-brace-format msgid "Ensure this value is less than or equal to {max_value}." msgstr "Переконайтесь, що значення менше або дорівнює {max_value}." -#: fields.py:823 fields.py:858 fields.py:892 +#: fields.py:933 fields.py:970 fields.py:1006 fields.py:1367 +#, python-brace-format msgid "Ensure this value is greater than or equal to {min_value}." msgstr "Переконайтесь, що значення більше або дорівнює {min_value}." -#: fields.py:824 fields.py:859 fields.py:896 +#: fields.py:934 fields.py:971 fields.py:1010 msgid "String value too large." msgstr "Строкове значення занадто велике." -#: fields.py:856 fields.py:890 +#: fields.py:968 fields.py:1004 msgid "A valid number is required." msgstr "Необхідне чисельне значення." -#: fields.py:893 +#: fields.py:1007 +#, python-brace-format msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "Переконайтесь, що в числі не більше {max_digits} знаків." -#: fields.py:894 +#: fields.py:1008 +#, python-brace-format msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "Переконайтесь, що в числі не більше {max_decimal_places} знаків у дробовій частині." -#: fields.py:895 +#: fields.py:1009 +#, python-brace-format msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "Переконайтесь, що в числі не більше {max_whole_digits} знаків у цілій частині." -#: fields.py:1025 +#: fields.py:1148 +#, python-brace-format msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "Невірний формат дата з часом. Використайте один з цих форматів: {format}." -#: fields.py:1026 +#: fields.py:1149 msgid "Expected a datetime but got a date." msgstr "Очікувалась дата з часом, але було отримано дату." -#: fields.py:1103 +#: fields.py:1150 +#, python-brace-format +msgid "Invalid datetime for the timezone \"{timezone}\"." +msgstr "" + +#: fields.py:1151 +msgid "Datetime value out of range." +msgstr "" + +#: fields.py:1236 +#, python-brace-format msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "Невірний формат дати. Використайте один з цих форматів: {format}." -#: fields.py:1104 +#: fields.py:1237 msgid "Expected a date but got a datetime." msgstr "Очікувалась дата, але було отримано дату з часом." -#: fields.py:1170 +#: fields.py:1303 +#, python-brace-format msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "Неправильний формат часу. Використайте один з цих форматів: {format}." -#: fields.py:1232 +#: fields.py:1365 +#, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "Невірний формат тривалості. Використайте один з цих форматів: {format}." -#: fields.py:1251 fields.py:1300 +#: fields.py:1399 fields.py:1456 +#, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "\"{input}\" не є коректним вибором." -#: fields.py:1254 relations.py:71 relations.py:441 +#: fields.py:1402 +#, python-brace-format msgid "More than {count} items..." msgstr "Елементів більше, ніж {count}..." -#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 +#: fields.py:1457 fields.py:1603 relations.py:485 serializers.py:570 +#, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Очікувався список елементів, але було отримано \"{input_type}\"." -#: fields.py:1302 +#: fields.py:1458 msgid "This selection may not be empty." msgstr "Вибір не може бути порожнім." -#: fields.py:1339 +#: fields.py:1495 +#, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "\"{input}\" вибраний шлях не є коректним." -#: fields.py:1358 +#: fields.py:1514 msgid "No file was submitted." msgstr "Файл не було відправленно." -#: fields.py:1359 +#: fields.py:1515 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "Відправленні дані не є файл. Перевірте тип кодування у формі." -#: fields.py:1360 +#: fields.py:1516 msgid "No filename could be determined." msgstr "Неможливо визначити ім'я файлу." -#: fields.py:1361 +#: fields.py:1517 msgid "The submitted file is empty." msgstr "Відправленний файл порожній." -#: fields.py:1362 +#: fields.py:1518 +#, python-brace-format msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "Переконайтесь, що ім'я файлу становить менше {max_length} символів (зараз {length})." -#: fields.py:1410 +#: fields.py:1566 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 +#: fields.py:1604 relations.py:486 serializers.py:571 msgid "This list may not be empty." msgstr "Цей список не може бути порожнім." -#: fields.py:1502 +#: fields.py:1605 +#, python-brace-format +msgid "Ensure this field has at least {min_length} elements." +msgstr "" + +#: fields.py:1606 +#, python-brace-format +msgid "Ensure this field has no more than {max_length} elements." +msgstr "" + +#: fields.py:1682 +#, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "Очікувався словник зі елементами, але було отримано \"{input_type}\"." -#: fields.py:1549 +#: fields.py:1683 +msgid "This dictionary may not be empty." +msgstr "" + +#: fields.py:1755 msgid "Value must be valid JSON." msgstr "Значення повинно бути коректним JSON." -#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 -msgid "Submit" -msgstr "Відправити" +#: filters.py:49 templates/rest_framework/filters/search.html:2 +msgid "Search" +msgstr "Пошук" -#: filters.py:336 +#: filters.py:50 +msgid "A search term." +msgstr "" + +#: filters.py:180 templates/rest_framework/filters/ordering.html:3 +msgid "Ordering" +msgstr "Впорядкування" + +#: filters.py:181 +msgid "Which field to use when ordering the results." +msgstr "" + +#: filters.py:287 msgid "ascending" -msgstr "в порядку зростання" +msgstr "у порядку зростання" -#: filters.py:337 +#: filters.py:288 msgid "descending" msgstr "у порядку зменшення" -#: pagination.py:193 +#: pagination.py:174 +msgid "A page number within the paginated result set." +msgstr "" + +#: pagination.py:179 pagination.py:372 pagination.py:590 +msgid "Number of results to return per page." +msgstr "" + +#: pagination.py:189 msgid "Invalid page." msgstr "Недійсна сторінка." -#: pagination.py:427 +#: pagination.py:374 +msgid "The initial index from which to return the results." +msgstr "" + +#: pagination.py:581 +msgid "The pagination cursor value." +msgstr "" + +#: pagination.py:583 msgid "Invalid cursor" msgstr "Недійсний курсор." -#: relations.py:207 +#: relations.py:246 +#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "Недопустимий первинний ключ \"{pk_value}\" - об'єкт не існує." -#: relations.py:208 +#: relations.py:247 +#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "Некоректний тип. Очікувалось значення первинного ключа, отримано {data_type}." -#: relations.py:240 +#: relations.py:280 msgid "Invalid hyperlink - No URL match." msgstr "Недійсне посилання - немає збігу за URL." -#: relations.py:241 +#: relations.py:281 msgid "Invalid hyperlink - Incorrect URL match." msgstr "Недійсне посилання - некоректний збіг за URL." -#: relations.py:242 +#: relations.py:282 msgid "Invalid hyperlink - Object does not exist." msgstr "Недійсне посилання - об'єкт не існує." -#: relations.py:243 +#: relations.py:283 +#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "Некоректний тип. Очікувався URL, отримано {data_type}." -#: relations.py:401 +#: relations.py:448 +#, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "Об'єкт із {slug_name}={value} не існує." -#: relations.py:402 +#: relations.py:449 msgid "Invalid value." msgstr "Недійсне значення." -#: serializers.py:326 +#: schemas/utils.py:32 +msgid "unique integer value" +msgstr "" + +#: schemas/utils.py:34 +msgid "UUID string" +msgstr "" + +#: schemas/utils.py:36 +msgid "unique value" +msgstr "" + +#: schemas/utils.py:38 +#, python-brace-format +msgid "A {value_type} identifying this {name}." +msgstr "" + +#: serializers.py:337 +#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "Недопустимі дані. Очікувався словник, але було отримано {datatype}." #: templates/rest_framework/admin.html:116 -#: templates/rest_framework/base.html:128 +#: templates/rest_framework/base.html:136 +msgid "Extra Actions" +msgstr "" + +#: templates/rest_framework/admin.html:130 +#: templates/rest_framework/base.html:150 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/base.html:37 +msgid "navbar" +msgstr "" -#: templates/rest_framework/filters/ordering.html:3 -msgid "Ordering" -msgstr "Впорядкування" +#: templates/rest_framework/base.html:75 +msgid "content" +msgstr "" -#: templates/rest_framework/filters/search.html:2 -msgid "Search" -msgstr "Пошук" +#: templates/rest_framework/base.html:78 +msgid "request form" +msgstr "" -#: templates/rest_framework/horizontal/radio.html:2 -#: templates/rest_framework/inline/radio.html:2 -#: templates/rest_framework/vertical/radio.html:2 +#: templates/rest_framework/base.html:157 +msgid "main content" +msgstr "" + +#: templates/rest_framework/base.html:173 +msgid "request info" +msgstr "" + +#: templates/rest_framework/base.html:177 +msgid "response info" +msgstr "" + +#: templates/rest_framework/horizontal/radio.html:4 +#: templates/rest_framework/inline/radio.html:3 +#: templates/rest_framework/vertical/radio.html:3 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 +#: templates/rest_framework/horizontal/select_multiple.html:4 +#: templates/rest_framework/inline/select_multiple.html:3 +#: templates/rest_framework/vertical/select_multiple.html:3 msgid "No items to select." msgstr "Немає елементів для вибору." -#: validators.py:43 +#: validators.py:39 msgid "This field must be unique." msgstr "Це поле повинне бути унікальним." -#: validators.py:97 +#: validators.py:89 +#, python-brace-format msgid "The fields {field_names} must make a unique set." msgstr "Поля {field_names} повинні створювати унікальний масив значень." -#: validators.py:245 +#: validators.py:171 +#, python-brace-format +msgid "Surrogate characters are not allowed: U+{code_point:X}." +msgstr "" + +#: validators.py:243 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" date." msgstr "Це поле повинне бути унікальним для дати \"{date_field}\"." -#: validators.py:260 +#: validators.py:258 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" month." msgstr "Це поле повинне бути унікальним для місяця \"{date_field}\"." -#: validators.py:273 +#: validators.py:271 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" year." msgstr "Це поле повинне бути унікальним для року \"{date_field}\"." -#: versioning.py:42 +#: versioning.py:40 msgid "Invalid version in \"Accept\" header." msgstr "Недопустима версія в загаловку \"Accept\"." -#: versioning.py:73 +#: versioning.py:71 msgid "Invalid version in URL path." msgstr "Недопустима версія в шляху URL." -#: versioning.py:115 +#: versioning.py:116 msgid "Invalid version in URL path. Does not match any version namespace." -msgstr "" +msgstr "Недопустима версія в шляху URL. Не співпадає з будь-яким простором версій." -#: versioning.py:147 +#: versioning.py:148 msgid "Invalid version in hostname." msgstr "Недопустима версія в імені хоста." -#: versioning.py:169 +#: versioning.py:170 msgid "Invalid version in query parameter." msgstr "Недопустима версія в параметрі запиту." - -#: views.py:88 -msgid "Permission denied." -msgstr "Доступ заборонено." diff --git a/rest_framework/locale/vi/LC_MESSAGES/django.mo b/rest_framework/locale/vi/LC_MESSAGES/django.mo index c76cfe595858a600a265c1bad77f18fb670ba781..6809b650c1d85cfa5ec65341ba957cd98eaa09da 100644 GIT binary patch literal 2179 zcmZvcO>Epm6vqcB6qfG-2R`)_4p6oBCIP9{mLO=8qR=J{&9;IAhgo}KPh-y*d%T;d zs#MfNg(^OB;804XMiqymR%rnVkv$;fs28MOxuLojgpjy$-~j*e?zTx(YiEC+ulN4% zy&3<$ZOfMo&ogK*psk_3h!)+0KRh?VtzZf61^)!?x}Enj_8d3~-Us^NOJE4T0-gq+ z0$0EqSbz_LH~Rbyd;tBMptbi0_&m4;#&&=NZUGO1&w}rPcK>|8Z@^LXKLgJ}(=VX) z^WpuBwZIUxc7E;i9}qwGGMtWq+rddN0ImOPpw)W=d>Fh1J_7#T@Ba(#M1L!iVfi|^ z8|2_);8)<=;3d%7`3u|y{s$facR@U4vTbOPT0K^e^|k(a2py!NiXB_4x;))qVD;GN zNi^%z`WZYn_9xIDMYDN&91W5g+m{M%gwMwDPa)5!lWG;voK9nITso2o(h6;kOeoOl zO=KihW(4;ebi6lm!etZ6h?F?Bc_e)jF_#f>-%mxBxolGPhVx9MipQd!@GR@-)OXnd zvB;)`3AIl{$K&ed#1JWMh)0p`2rQY(GXs}il>35)1~!I>E9@Cq8gkjRCTT>Rk*hq9 zm_?TzQM?ri>n_p(6jDc;kdjolr7wK)QsE0_B#)2+?n_NL9q=PB6?|iclOY<%RbOK`MQ!9a%@jT8p|w`T3H3?*;=4b2*x_l%4IXDK87?n zlfH9Qq;_e8#*c9oXgWMG+oZV^E>Va1+F_CC)HqXFAbn?V9%N2aH>fsq$T=+9((ZKZ zA!*R)@aV8Jg5PU+Z48g@7{*gO$TQcprcY4n*^M+S3_fxM!nwYbX;TY$~m!MH`V=0zk`EioZI@H zk-LxAQN+qay)En8Yg3a`6L&H(;ttpLX`EXH?TZP5Gh)HilZZ>ThrE!dnJ{BVn){vI zch*@gb0T#nl&5{1rUvb9Npm}r2DN2vCdyMDIr~wMtU)TNy4l#s9_qc04ezP3wJ(Z` zWXjcL&8CCm!Xjl{(%MqlJ)=VMF|Goa#*3eDALFun){v?0rV7jM3dT0B#OAyjI)wv( zGi<_g_2>21a~cCzlD?&CFGqxB_mlor#p}g{qOyD1WwQ`sif#m2;q|N6A=vuuUh?SH$*%`@`PRwvSX}&2Nxps+ZanLF^_!$; z7pHV@xw?YWo+C<+63ktcJcyPu;tWp@b` zV>HfDzpPmH!VSx9W=;)CG*~>4)Sp|Q?RMEchcfg6GWfQvE#bWMN`cSXhLmjT4itLD zcdDw|vZ)-ORl&|d6)S5{eufrMKz!zGy*DPBy(5d|DzG!ux=V>76k*dT?0u+E&t)|b ov9>fQdR23L0?O{kHX54_o0MxFg%aluQi}^not=TwDtRvZAC2wn00000 delta 140 zcmZn`yvl5GPl#nI0}wC*u?!Ha05LNV>i{tbSOD>Cprj>`2C0F8$p@IjTn){14a{{7 zjT8(`tqe`H4S;~lC$YFhH>4;ruQ(^MB)`Z?AtWO|H?dg3Iio1ExFj=G!KNfX*8zx= Lp#qzuS(q3B`#l}{ diff --git a/rest_framework/locale/vi/LC_MESSAGES/django.po b/rest_framework/locale/vi/LC_MESSAGES/django.po index ea43efb95..8054fb880 100644 --- a/rest_framework/locale/vi/LC_MESSAGES/django.po +++ b/rest_framework/locale/vi/LC_MESSAGES/django.po @@ -3,13 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Nguyen Tuan Anh , 2019 +# Xavier Ordoquy , 2020 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" +"POT-Creation-Date: 2020-10-13 21:45+0200\n" +"PO-Revision-Date: 2020-10-13 20:02+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,40 +19,40 @@ msgstr "" "Language: vi\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: authentication.py:73 +#: authentication.py:70 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:76 +#: authentication.py:73 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:82 +#: authentication.py:83 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:99 +#: authentication.py:101 msgid "Invalid username/password." -msgstr "" +msgstr "Sai tên đăng nhập hoặc mật khẩu." -#: authentication.py:102 authentication.py:198 +#: authentication.py:104 authentication.py:206 msgid "User inactive or deleted." -msgstr "" +msgstr "Người dùng không còn hoạt động, hoặc đã bị xoá." -#: authentication.py:176 +#: authentication.py:184 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:179 +#: authentication.py:187 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:185 +#: authentication.py:193 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:195 +#: authentication.py:203 msgid "Invalid token." msgstr "" @@ -58,382 +60,515 @@ msgstr "" msgid "Auth Token" msgstr "" -#: authtoken/models.py:15 +#: authtoken/models.py:13 msgid "Key" -msgstr "" +msgstr "Khoá" + +#: authtoken/models.py:16 +msgid "User" +msgstr "Người dùng" #: authtoken/models.py:18 -msgid "User" -msgstr "" - -#: authtoken/models.py:20 msgid "Created" -msgstr "" +msgstr "Đã tạo" -#: authtoken/models.py:29 +#: authtoken/models.py:27 authtoken/serializers.py:19 msgid "Token" msgstr "" -#: authtoken/models.py:30 +#: authtoken/models.py:28 msgid "Tokens" msgstr "" -#: authtoken/serializers.py:8 -msgid "Username" -msgstr "" - #: authtoken/serializers.py:9 +msgid "Username" +msgstr "Tên người dùng" + +#: authtoken/serializers.py:13 msgid "Password" -msgstr "" +msgstr "Mật khẩu" -#: authtoken/serializers.py:20 -msgid "User account is disabled." -msgstr "" - -#: authtoken/serializers.py:23 +#: authtoken/serializers.py:35 msgid "Unable to log in with provided credentials." -msgstr "" +msgstr "Không thể đăng nhập với thông tin đã nhập." -#: authtoken/serializers.py:26 +#: authtoken/serializers.py:38 msgid "Must include \"username\" and \"password\"." -msgstr "" +msgstr "Bắt buộc phải có “tên người dùng” và “mật khẩu”." -#: exceptions.py:49 +#: exceptions.py:102 msgid "A server error occurred." msgstr "" -#: exceptions.py:84 +#: exceptions.py:142 +msgid "Invalid input." +msgstr "" + +#: exceptions.py:161 msgid "Malformed request." msgstr "" -#: exceptions.py:89 +#: exceptions.py:167 msgid "Incorrect authentication credentials." msgstr "" -#: exceptions.py:94 +#: exceptions.py:173 msgid "Authentication credentials were not provided." msgstr "" -#: exceptions.py:99 +#: exceptions.py:179 msgid "You do not have permission to perform this action." -msgstr "" +msgstr "Bạn không được cấp quyền để thực hiện hành động này." -#: exceptions.py:104 views.py:81 +#: exceptions.py:185 msgid "Not found." -msgstr "" +msgstr "Không tìm thấy." -#: exceptions.py:109 +#: exceptions.py:191 +#, python-brace-format msgid "Method \"{method}\" not allowed." -msgstr "" +msgstr "Phương thức “{method}” không được chấp nhận." -#: exceptions.py:120 +#: exceptions.py:202 msgid "Could not satisfy the request Accept header." msgstr "" -#: exceptions.py:132 +#: exceptions.py:212 +#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "" -#: exceptions.py:145 +#: exceptions.py:223 msgid "Request was throttled." msgstr "" -#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 -#: validators.py:181 +#: exceptions.py:224 +#, python-brace-format +msgid "Expected available in {wait} second." +msgstr "" + +#: exceptions.py:225 +#, python-brace-format +msgid "Expected available in {wait} seconds." +msgstr "" + +#: fields.py:316 relations.py:245 relations.py:279 validators.py:90 +#: validators.py:183 msgid "This field is required." msgstr "" -#: fields.py:270 +#: fields.py:317 msgid "This field may not be null." msgstr "" -#: fields.py:608 fields.py:639 -msgid "\"{input}\" is not a valid boolean." +#: fields.py:701 +msgid "Must be a valid boolean." msgstr "" -#: fields.py:674 +#: fields.py:766 +msgid "Not a valid string." +msgstr "" + +#: fields.py:767 msgid "This field may not be blank." -msgstr "" +msgstr "Trường này không được bỏ trống." -#: fields.py:675 fields.py:1675 +#: fields.py:768 fields.py:1881 +#, python-brace-format msgid "Ensure this field has no more than {max_length} characters." msgstr "" -#: fields.py:676 +#: fields.py:769 +#, python-brace-format msgid "Ensure this field has at least {min_length} characters." msgstr "" -#: fields.py:713 +#: fields.py:816 msgid "Enter a valid email address." -msgstr "" +msgstr "Nhập một địa chỉ email hợp lệ." -#: fields.py:724 +#: fields.py:827 msgid "This value does not match the required pattern." msgstr "" -#: fields.py:735 +#: fields.py:838 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "" -#: fields.py:747 +#: fields.py:839 +msgid "" +"Enter a valid \"slug\" consisting of Unicode letters, numbers, underscores, " +"or hyphens." +msgstr "" + +#: fields.py:854 msgid "Enter a valid URL." msgstr "" -#: fields.py:760 -msgid "\"{value}\" is not a valid UUID." +#: fields.py:867 +msgid "Must be a valid UUID." msgstr "" -#: fields.py:796 +#: fields.py:903 msgid "Enter a valid IPv4 or IPv6 address." msgstr "" -#: fields.py:821 +#: fields.py:931 msgid "A valid integer is required." msgstr "" -#: fields.py:822 fields.py:857 fields.py:891 +#: fields.py:932 fields.py:969 fields.py:1005 fields.py:1366 +#, python-brace-format msgid "Ensure this value is less than or equal to {max_value}." msgstr "" -#: fields.py:823 fields.py:858 fields.py:892 +#: fields.py:933 fields.py:970 fields.py:1006 fields.py:1367 +#, python-brace-format msgid "Ensure this value is greater than or equal to {min_value}." msgstr "" -#: fields.py:824 fields.py:859 fields.py:896 +#: fields.py:934 fields.py:971 fields.py:1010 msgid "String value too large." msgstr "" -#: fields.py:856 fields.py:890 +#: fields.py:968 fields.py:1004 msgid "A valid number is required." msgstr "" -#: fields.py:893 +#: fields.py:1007 +#, python-brace-format msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "" -#: fields.py:894 +#: fields.py:1008 +#, python-brace-format msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "" -#: fields.py:895 +#: fields.py:1009 +#, python-brace-format msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "" -#: fields.py:1025 +#: fields.py:1148 +#, python-brace-format msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1026 +#: fields.py:1149 msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:1103 -msgid "Date has wrong format. Use one of these formats instead: {format}." +#: fields.py:1150 +#, python-brace-format +msgid "Invalid datetime for the timezone \"{timezone}\"." msgstr "" -#: fields.py:1104 +#: fields.py:1151 +msgid "Datetime value out of range." +msgstr "" + +#: fields.py:1236 +#, python-brace-format +msgid "Date has wrong format. Use one of these formats instead: {format}." +msgstr "Ngày sai định dạng. Dùng một trong những định dạng sau để thay thế: {format}." + +#: fields.py:1237 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:1170 +#: fields.py:1303 +#, python-brace-format msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1232 +#: fields.py:1365 +#, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1251 fields.py:1300 +#: fields.py:1399 fields.py:1456 +#, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "" -#: fields.py:1254 relations.py:71 relations.py:441 +#: fields.py:1402 +#, python-brace-format msgid "More than {count} items..." msgstr "" -#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 +#: fields.py:1457 fields.py:1603 relations.py:485 serializers.py:570 +#, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1302 +#: fields.py:1458 msgid "This selection may not be empty." msgstr "" -#: fields.py:1339 +#: fields.py:1495 +#, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1358 +#: fields.py:1514 msgid "No file was submitted." msgstr "" -#: fields.py:1359 +#: fields.py:1515 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1360 +#: fields.py:1516 msgid "No filename could be determined." msgstr "" -#: fields.py:1361 +#: fields.py:1517 msgid "The submitted file is empty." msgstr "" -#: fields.py:1362 +#: fields.py:1518 +#, python-brace-format msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1410 +#: fields.py:1566 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 +#: fields.py:1604 relations.py:486 serializers.py:571 msgid "This list may not be empty." +msgstr " Danh sách này không thể để trống." + +#: fields.py:1605 +#, python-brace-format +msgid "Ensure this field has at least {min_length} elements." msgstr "" -#: fields.py:1502 +#: fields.py:1606 +#, python-brace-format +msgid "Ensure this field has no more than {max_length} elements." +msgstr "" + +#: fields.py:1682 +#, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1549 +#: fields.py:1683 +msgid "This dictionary may not be empty." +msgstr "" + +#: fields.py:1755 msgid "Value must be valid JSON." +msgstr "Giá trị bắt buộc phải là định dạng JSON." + +#: filters.py:49 templates/rest_framework/filters/search.html:2 +msgid "Search" +msgstr "Tìm kiếm" + +#: filters.py:50 +msgid "A search term." msgstr "" -#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 -msgid "Submit" +#: filters.py:180 templates/rest_framework/filters/ordering.html:3 +msgid "Ordering" +msgstr "Sắp xếp" + +#: filters.py:181 +msgid "Which field to use when ordering the results." msgstr "" -#: filters.py:336 +#: filters.py:287 msgid "ascending" msgstr "" -#: filters.py:337 +#: filters.py:288 msgid "descending" msgstr "" -#: pagination.py:193 +#: pagination.py:174 +msgid "A page number within the paginated result set." +msgstr "" + +#: pagination.py:179 pagination.py:372 pagination.py:590 +msgid "Number of results to return per page." +msgstr "" + +#: pagination.py:189 msgid "Invalid page." msgstr "" -#: pagination.py:427 +#: pagination.py:374 +msgid "The initial index from which to return the results." +msgstr "" + +#: pagination.py:581 +msgid "The pagination cursor value." +msgstr "" + +#: pagination.py:583 msgid "Invalid cursor" msgstr "" -#: relations.py:207 +#: relations.py:246 +#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" -#: relations.py:208 +#: relations.py:247 +#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" -#: relations.py:240 +#: relations.py:280 msgid "Invalid hyperlink - No URL match." msgstr "" -#: relations.py:241 +#: relations.py:281 msgid "Invalid hyperlink - Incorrect URL match." msgstr "" -#: relations.py:242 +#: relations.py:282 msgid "Invalid hyperlink - Object does not exist." msgstr "" -#: relations.py:243 +#: relations.py:283 +#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:401 +#: relations.py:448 +#, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:402 +#: relations.py:449 msgid "Invalid value." msgstr "" -#: serializers.py:326 +#: schemas/utils.py:32 +msgid "unique integer value" +msgstr "" + +#: schemas/utils.py:34 +msgid "UUID string" +msgstr "" + +#: schemas/utils.py:36 +msgid "unique value" +msgstr "" + +#: schemas/utils.py:38 +#, python-brace-format +msgid "A {value_type} identifying this {name}." +msgstr "" + +#: serializers.py:337 +#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "" #: templates/rest_framework/admin.html:116 -#: templates/rest_framework/base.html:128 +#: templates/rest_framework/base.html:136 +msgid "Extra Actions" +msgstr "" + +#: templates/rest_framework/admin.html:130 +#: templates/rest_framework/base.html:150 msgid "Filters" msgstr "" -#: templates/rest_framework/filters/django_filter.html:2 -#: templates/rest_framework/filters/django_filter_crispyforms.html:4 -msgid "Field filters" +#: templates/rest_framework/base.html:37 +msgid "navbar" msgstr "" -#: templates/rest_framework/filters/ordering.html:3 -msgid "Ordering" +#: templates/rest_framework/base.html:75 +msgid "content" msgstr "" -#: templates/rest_framework/filters/search.html:2 -msgid "Search" +#: templates/rest_framework/base.html:78 +msgid "request form" msgstr "" -#: templates/rest_framework/horizontal/radio.html:2 -#: templates/rest_framework/inline/radio.html:2 -#: templates/rest_framework/vertical/radio.html:2 +#: templates/rest_framework/base.html:157 +msgid "main content" +msgstr "" + +#: templates/rest_framework/base.html:173 +msgid "request info" +msgstr "" + +#: templates/rest_framework/base.html:177 +msgid "response info" +msgstr "" + +#: templates/rest_framework/horizontal/radio.html:4 +#: templates/rest_framework/inline/radio.html:3 +#: templates/rest_framework/vertical/radio.html:3 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 +#: templates/rest_framework/horizontal/select_multiple.html:4 +#: templates/rest_framework/inline/select_multiple.html:3 +#: templates/rest_framework/vertical/select_multiple.html:3 msgid "No items to select." -msgstr "" +msgstr "Không có gì để chọn." -#: validators.py:43 +#: validators.py:39 msgid "This field must be unique." msgstr "" -#: validators.py:97 +#: validators.py:89 +#, python-brace-format msgid "The fields {field_names} must make a unique set." msgstr "" -#: validators.py:245 +#: validators.py:171 +#, python-brace-format +msgid "Surrogate characters are not allowed: U+{code_point:X}." +msgstr "" + +#: validators.py:243 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" date." msgstr "" -#: validators.py:260 +#: validators.py:258 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" month." msgstr "" -#: validators.py:273 +#: validators.py:271 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" year." msgstr "" -#: versioning.py:42 +#: versioning.py:40 msgid "Invalid version in \"Accept\" header." msgstr "" -#: versioning.py:73 +#: versioning.py:71 msgid "Invalid version in URL path." msgstr "" -#: versioning.py:115 +#: versioning.py:116 msgid "Invalid version in URL path. Does not match any version namespace." msgstr "" -#: versioning.py:147 +#: versioning.py:148 msgid "Invalid version in hostname." msgstr "" -#: versioning.py:169 +#: versioning.py:170 msgid "Invalid version in query parameter." msgstr "" - -#: views.py:88 -msgid "Permission denied." -msgstr "" diff --git a/rest_framework/locale/zh_CN/LC_MESSAGES/django.mo b/rest_framework/locale/zh_CN/LC_MESSAGES/django.mo index f30b04ea1247a5137aa9f627878327df308812bf..3bd1fd3efa65ee170719887e0f0eff038e4accb8 100644 GIT binary patch delta 2239 zcmYk-drXye9LMo5!9hf_@F0c=9*hKnLkIC7Hx(~fM=(%9rHgQu%|TA$5>dI%W~J3; zYo6)c%s(>by77k{TT9nk$?T8T`or1GTsP-GZO&?~*__q;^E^LV-|>B3zu$A7%kTQ| zN#~gjiSOrR95SMhT%b%hdqHM$Aj-4MLRf+K;Cj3ZpF~~%3KrrC%*M|#j9+0D-ozPL zKGSS9MsOXD_$KT$h5I>?#@#I#!!7tKF2kR&2@7VKwP80l;+v@7FJn9A<(S=#ah!uM zp&EF^o&V7JE$VrI=fJCEg< zbB9?8M)6+Uiaf&hVgz5uYWxgiyx)GMupArj^dC5m^QrH5_2a0XokaEM0%|CKclBtl z|NACP=lmFI1fIoWJb-%M`&fowU_M^QM2JErR|l~SGq4F6b!)-H!B( z%VYxQ;d>atv#2Tk1J&SW9dI| z+o%z^hyg5|>o=qXE2)=b4R&Dx=|z0izm{| z22fLw%hK1JMo|sxLk;mBS3ioZEBnZupTfn|ub`fr&C6C`9XQ~hH;(4Hs8gLC6TnjGp zM=p$o+W*_V0^0?3!(r3|-a);164m0`fP+2-`p^_@dh; zvYTXfZ95qwwEz{`SuJFa-p|7H<_o-O&~{X43Z|o;g1&s~$c65t_OsT*!>+E~p&g{q zj$&tfq3_Fd=pWA-lHF{qTkk{WeVZwJ5#Y#I_`m3+w9?gX!`0-B^3$^C{{@9S+!g=; delta 2556 zcmZYAe@vBC9LMnkmy0O)3l*;#`h=obAfoakP*5O+1Vs^lkfj&6;$4?}n-|JW^OC=Y zGn)%3buhJ>>mSRB`75hsn`TgF!J&vT#ZkIwks*ExrC&-0w~ zJZIo0!|)!K8xt{)s4S%;o6$0i%kT;=#`t7o)?x(~;&Cj&A87NAyKin>q>7U2mj z!ymB%J)@18gBy`9a}YJ|IA-BZ)J_iJGdOh&*Wvo6n#x>Uhnk=ZtMMW(!nm=q3CnOY z?G;Yjk6Oug)XI91Ej5>&_K@@cNi5$*|02{*Ea5|`TZ0iz7^X4{-^Mh&fEM1sarhf1 zU_1@7VuoQZrXt6{lshg*hMF~~d0J7&XctbzeNMX%wcroOk$>g-HXT|)`uNzuVpMxI z>M(_{01u*ae9dV;K`kI}LTp?OTC}&KZtwuwJA!W7L#P{y=kA`x;c4uD9+iALHef4i zrC;GByzcl5YNbz{wu|M=qn(bNUsH$LnMOPjXN(VL({?k7Qk09zdA-x#g<9DA5h}{X z7f#1d$iX##IQ@w%ZzkH|j2ibYmf&s2v21Gt?OId{ zA|E)FTi8g4J3aQCZbm)Vhft^XH0Izpj*n4~>kRIG1-^nDY;y&5qu-*wcMGfVF)9^h z(_&A{ZshwBbDc^){}^e-R$hS`SciISx*e~g9>XYVhmx6n0eY|)YjF{F;Yz%Yq}!xr z#CA9v^}Xe&)U3Dr$^ULD<#e2~J9x9<4B9Rdr^hA>b*i&bH&BLT$N13RLS%Q%S;y~C z;~%06|3qE*FVqdEFu4xl63O*V6%}pWO4OEbat3TitsvsGdvHGOUVI+EM~zS8u4Jxb z6>=Pm7qzoH9nYc8#zWNjDIBZ_X)z0^Xa)7ioF;^&cmxyirsEydDZYn=n8HhA4OXJY z9Yalg64`xo8Fd!!qUMb{jv%iZpPNPgRVkn&4%ZRNC9ea+>;2!NNi|Wn)1yc2pQ0U6 z(MrjjT^91G-v*r@mGy+45;wtdvlpQqTEg|sDk>@*XnR{#*Gb<y?y*oO}ih{z^BbUJGZ(qli%CD=shv^EgR z^-N+lp+`(b=cCcC{r9n$DlbU;ji=t138h!LS1BiW&Df;t#a@wuSqHBd57j>wMeV{Nb=a6tr4=LBFqMPWM}>g^BeYO>O@6 z{%fgOuJPXH=1@nlU6*e0hrLY!4H}qmcT`?s&fKD$x$~{O1;zPA-8a%EPO9+*d{#{; z*lH~dH*fW|d7HzFTid+;K!3u-S#c>3j_-|L+7mr{B-(kkJI~|k&h(U6_d9!?8^7P# zH*o3D;L%T_hr0&*dl+rs`9@EsJ286Zy}^$^?SDOezkBrHxl@C^2L}80JUVvx*UsJD rLm7pM17G$<&m8TaH$B;v`tbbe!LEzZi{~Dke)GYRk2IuU=DxoHAU8W` diff --git a/rest_framework/locale/zh_CN/LC_MESSAGES/django.po b/rest_framework/locale/zh_CN/LC_MESSAGES/django.po index 345bcfac8..7e131db42 100644 --- a/rest_framework/locale/zh_CN/LC_MESSAGES/django.po +++ b/rest_framework/locale/zh_CN/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: 2016-07-12 16:13+0100\n" -"PO-Revision-Date: 2017-08-03 14:58+0000\n" -"Last-Translator: Lele Long \n" +"POT-Creation-Date: 2020-10-13 21:45+0200\n" +"PO-Revision-Date: 2020-10-13 19:45+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,40 +20,40 @@ msgstr "" "Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: authentication.py:73 +#: authentication.py:70 msgid "Invalid basic header. No credentials provided." msgstr "无效的Basic认证头，没有提供认证信息。" -#: authentication.py:76 +#: authentication.py:73 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "认证字符串不应该包含空格（基本认证HTTP头无效）。" -#: authentication.py:82 +#: authentication.py:83 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "认证字符串base64编码错误（基本认证HTTP头无效）。" -#: authentication.py:99 +#: authentication.py:101 msgid "Invalid username/password." msgstr "用户名或者密码错误。" -#: authentication.py:102 authentication.py:198 +#: authentication.py:104 authentication.py:206 msgid "User inactive or deleted." msgstr "用户未激活或者已删除。" -#: authentication.py:176 +#: authentication.py:184 msgid "Invalid token header. No credentials provided." msgstr "没有提供认证信息（认证令牌HTTP头无效）。" -#: authentication.py:179 +#: authentication.py:187 msgid "Invalid token header. Token string should not contain spaces." msgstr "认证令牌字符串不应该包含空格（无效的认证令牌HTTP头）。" -#: authentication.py:185 +#: authentication.py:193 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "无效的Token。Token字符串不能包含非法的字符。" -#: authentication.py:195 +#: authentication.py:203 msgid "Invalid token." msgstr "认证令牌无效。" @@ -61,382 +61,515 @@ msgstr "认证令牌无效。" msgid "Auth Token" msgstr "认证令牌" -#: authtoken/models.py:15 +#: authtoken/models.py:13 msgid "Key" msgstr "键" -#: authtoken/models.py:18 +#: authtoken/models.py:16 msgid "User" msgstr "用户" -#: authtoken/models.py:20 +#: authtoken/models.py:18 msgid "Created" msgstr "已创建" -#: authtoken/models.py:29 +#: authtoken/models.py:27 authtoken/serializers.py:19 msgid "Token" msgstr "令牌" -#: authtoken/models.py:30 +#: authtoken/models.py:28 msgid "Tokens" msgstr "令牌" -#: authtoken/serializers.py:8 +#: authtoken/serializers.py:9 msgid "Username" msgstr "用户名" -#: authtoken/serializers.py:9 +#: authtoken/serializers.py:13 msgid "Password" msgstr "密码" -#: authtoken/serializers.py:20 -msgid "User account is disabled." -msgstr "用户账户已禁用。" - -#: authtoken/serializers.py:23 +#: authtoken/serializers.py:35 msgid "Unable to log in with provided credentials." msgstr "无法使用提供的认证信息登录。" -#: authtoken/serializers.py:26 +#: authtoken/serializers.py:38 msgid "Must include \"username\" and \"password\"." msgstr "必须包含 “用户名” 和 “密码”。" -#: exceptions.py:49 +#: exceptions.py:102 msgid "A server error occurred." msgstr "服务器出现了错误。" -#: exceptions.py:84 +#: exceptions.py:142 +msgid "Invalid input." +msgstr "" + +#: exceptions.py:161 msgid "Malformed request." msgstr "错误的请求。" -#: exceptions.py:89 +#: exceptions.py:167 msgid "Incorrect authentication credentials." msgstr "不正确的身份认证信息。" -#: exceptions.py:94 +#: exceptions.py:173 msgid "Authentication credentials were not provided." msgstr "身份认证信息未提供。" -#: exceptions.py:99 +#: exceptions.py:179 msgid "You do not have permission to perform this action." msgstr "您没有执行该操作的权限。" -#: exceptions.py:104 views.py:81 +#: exceptions.py:185 msgid "Not found." msgstr "未找到。" -#: exceptions.py:109 +#: exceptions.py:191 +#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "方法 “{method}” 不被允许。" -#: exceptions.py:120 +#: exceptions.py:202 msgid "Could not satisfy the request Accept header." msgstr "无法满足Accept HTTP头的请求。" -#: exceptions.py:132 +#: exceptions.py:212 +#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "不支持请求中的媒体类型 “{media_type}”。" -#: exceptions.py:145 +#: exceptions.py:223 msgid "Request was throttled." msgstr "请求超过了限速。" -#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 -#: validators.py:181 +#: exceptions.py:224 +#, python-brace-format +msgid "Expected available in {wait} second." +msgstr "" + +#: exceptions.py:225 +#, python-brace-format +msgid "Expected available in {wait} seconds." +msgstr "" + +#: fields.py:316 relations.py:245 relations.py:279 validators.py:90 +#: validators.py:183 msgid "This field is required." msgstr "该字段是必填项。" -#: fields.py:270 +#: fields.py:317 msgid "This field may not be null." msgstr "该字段不能为 null。" -#: fields.py:608 fields.py:639 -msgid "\"{input}\" is not a valid boolean." -msgstr "“{input}” 不是合法的布尔值。" +#: fields.py:701 +msgid "Must be a valid boolean." +msgstr "" -#: fields.py:674 +#: fields.py:766 +msgid "Not a valid string." +msgstr "" + +#: fields.py:767 msgid "This field may not be blank." msgstr "该字段不能为空。" -#: fields.py:675 fields.py:1675 +#: fields.py:768 fields.py:1881 +#, python-brace-format msgid "Ensure this field has no more than {max_length} characters." msgstr "请确保这个字段不能超过 {max_length} 个字符。" -#: fields.py:676 +#: fields.py:769 +#, python-brace-format msgid "Ensure this field has at least {min_length} characters." msgstr "请确保这个字段至少包含 {min_length} 个字符。" -#: fields.py:713 +#: fields.py:816 msgid "Enter a valid email address." msgstr "请输入合法的邮件地址。" -#: fields.py:724 +#: fields.py:827 msgid "This value does not match the required pattern." msgstr "输入值不匹配要求的模式。" -#: fields.py:735 +#: fields.py:838 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "请输入合法的“短语“，只能包含字母，数字，下划线或者中划线。" -#: fields.py:747 +#: fields.py:839 +msgid "" +"Enter a valid \"slug\" consisting of Unicode letters, numbers, underscores, " +"or hyphens." +msgstr "" + +#: fields.py:854 msgid "Enter a valid URL." msgstr "请输入合法的URL。" -#: fields.py:760 -msgid "\"{value}\" is not a valid UUID." -msgstr "“{value}”不是合法的UUID。" +#: fields.py:867 +msgid "Must be a valid UUID." +msgstr "" -#: fields.py:796 +#: fields.py:903 msgid "Enter a valid IPv4 or IPv6 address." msgstr "请输入一个有效的IPv4或IPv6地址。" -#: fields.py:821 +#: fields.py:931 msgid "A valid integer is required." msgstr "请填写合法的整数值。" -#: fields.py:822 fields.py:857 fields.py:891 +#: fields.py:932 fields.py:969 fields.py:1005 fields.py:1366 +#, python-brace-format msgid "Ensure this value is less than or equal to {max_value}." msgstr "请确保该值小于或者等于 {max_value}。" -#: fields.py:823 fields.py:858 fields.py:892 +#: fields.py:933 fields.py:970 fields.py:1006 fields.py:1367 +#, python-brace-format msgid "Ensure this value is greater than or equal to {min_value}." msgstr "请确保该值大于或者等于 {min_value}。" -#: fields.py:824 fields.py:859 fields.py:896 +#: fields.py:934 fields.py:971 fields.py:1010 msgid "String value too large." msgstr "字符串值太长。" -#: fields.py:856 fields.py:890 +#: fields.py:968 fields.py:1004 msgid "A valid number is required." msgstr "请填写合法的数字。" -#: fields.py:893 +#: fields.py:1007 +#, python-brace-format msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "请确保总计不超过 {max_digits} 个数字。" -#: fields.py:894 +#: fields.py:1008 +#, python-brace-format msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "请确保总计不超过 {max_decimal_places} 个小数位。" -#: fields.py:895 +#: fields.py:1009 +#, python-brace-format msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "请确保小数点前不超过 {max_whole_digits} 个数字。" -#: fields.py:1025 +#: fields.py:1148 +#, python-brace-format msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "日期时间格式错误。请从这些格式中选择：{format}。" -#: fields.py:1026 +#: fields.py:1149 msgid "Expected a datetime but got a date." msgstr "期望为日期时间，得到的是日期。" -#: fields.py:1103 +#: fields.py:1150 +#, python-brace-format +msgid "Invalid datetime for the timezone \"{timezone}\"." +msgstr "" + +#: fields.py:1151 +msgid "Datetime value out of range." +msgstr "" + +#: fields.py:1236 +#, python-brace-format msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "日期格式错误。请从这些格式中选择：{format}。" -#: fields.py:1104 +#: fields.py:1237 msgid "Expected a date but got a datetime." msgstr "期望为日期，得到的是日期时间。" -#: fields.py:1170 +#: fields.py:1303 +#, python-brace-format msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "时间格式错误。请从这些格式中选择：{format}。" -#: fields.py:1232 +#: fields.py:1365 +#, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "持续时间的格式错误。使用这些格式中的一个：{format}。" -#: fields.py:1251 fields.py:1300 +#: fields.py:1399 fields.py:1456 +#, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "“{input}” 不是合法选项。" -#: fields.py:1254 relations.py:71 relations.py:441 +#: fields.py:1402 +#, python-brace-format msgid "More than {count} items..." msgstr "多于{count}条记录。" -#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 +#: fields.py:1457 fields.py:1603 relations.py:485 serializers.py:570 +#, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." msgstr "期望为一个包含物件的列表，得到的类型是“{input_type}”。" -#: fields.py:1302 +#: fields.py:1458 msgid "This selection may not be empty." msgstr "这项选择不能为空。" -#: fields.py:1339 +#: fields.py:1495 +#, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "“{input}” 不是有效路径选项。" -#: fields.py:1358 +#: fields.py:1514 msgid "No file was submitted." msgstr "没有提交任何文件。" -#: fields.py:1359 +#: fields.py:1515 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "提交的数据不是一个文件。请检查表单的编码类型。" -#: fields.py:1360 +#: fields.py:1516 msgid "No filename could be determined." msgstr "无法检测到文件名。" -#: fields.py:1361 +#: fields.py:1517 msgid "The submitted file is empty." msgstr "提交的是空文件。" -#: fields.py:1362 +#: fields.py:1518 +#, python-brace-format msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "确保该文件名最多包含 {max_length} 个字符 ( 当前长度为{length} ) 。" -#: fields.py:1410 +#: fields.py:1566 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 +#: fields.py:1604 relations.py:486 serializers.py:571 msgid "This list may not be empty." msgstr "列表字段不能为空值。" -#: fields.py:1502 +#: fields.py:1605 +#, python-brace-format +msgid "Ensure this field has at least {min_length} elements." +msgstr "" + +#: fields.py:1606 +#, python-brace-format +msgid "Ensure this field has no more than {max_length} elements." +msgstr "" + +#: fields.py:1682 +#, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "期望是包含类目的字典，得到类型为 “{input_type}”。" -#: fields.py:1549 +#: fields.py:1683 +msgid "This dictionary may not be empty." +msgstr "" + +#: fields.py:1755 msgid "Value must be valid JSON." msgstr "值必须是有效的 JSON 数据。" -#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 -msgid "Submit" -msgstr "保存" +#: filters.py:49 templates/rest_framework/filters/search.html:2 +msgid "Search" +msgstr "查找" -#: filters.py:336 +#: filters.py:50 +msgid "A search term." +msgstr "" + +#: filters.py:180 templates/rest_framework/filters/ordering.html:3 +msgid "Ordering" +msgstr "排序" + +#: filters.py:181 +msgid "Which field to use when ordering the results." +msgstr "" + +#: filters.py:287 msgid "ascending" msgstr "升序" -#: filters.py:337 +#: filters.py:288 msgid "descending" msgstr "降序" -#: pagination.py:193 +#: pagination.py:174 +msgid "A page number within the paginated result set." +msgstr "" + +#: pagination.py:179 pagination.py:372 pagination.py:590 +msgid "Number of results to return per page." +msgstr "" + +#: pagination.py:189 msgid "Invalid page." msgstr "无效页。" -#: pagination.py:427 +#: pagination.py:374 +msgid "The initial index from which to return the results." +msgstr "" + +#: pagination.py:581 +msgid "The pagination cursor value." +msgstr "" + +#: pagination.py:583 msgid "Invalid cursor" msgstr "无效游标" -#: relations.py:207 +#: relations.py:246 +#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "无效主键 “{pk_value}” － 对象不存在。" -#: relations.py:208 +#: relations.py:247 +#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "类型错误。期望为主键，得到的类型为 {data_type}。" -#: relations.py:240 +#: relations.py:280 msgid "Invalid hyperlink - No URL match." msgstr "无效超链接 －没有匹配的URL。" -#: relations.py:241 +#: relations.py:281 msgid "Invalid hyperlink - Incorrect URL match." msgstr "无效超链接 －错误的URL匹配。" -#: relations.py:242 +#: relations.py:282 msgid "Invalid hyperlink - Object does not exist." msgstr "无效超链接 －对象不存在。" -#: relations.py:243 +#: relations.py:283 +#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "类型错误。期望为URL字符串，实际的类型是 {data_type}。" -#: relations.py:401 +#: relations.py:448 +#, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "属性 {slug_name} 为 {value} 的对象不存在。" -#: relations.py:402 +#: relations.py:449 msgid "Invalid value." msgstr "无效值。" -#: serializers.py:326 +#: schemas/utils.py:32 +msgid "unique integer value" +msgstr "" + +#: schemas/utils.py:34 +msgid "UUID string" +msgstr "" + +#: schemas/utils.py:36 +msgid "unique value" +msgstr "" + +#: schemas/utils.py:38 +#, python-brace-format +msgid "A {value_type} identifying this {name}." +msgstr "" + +#: serializers.py:337 +#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "无效数据。期待为字典类型，得到的是 {datatype} 。" #: templates/rest_framework/admin.html:116 -#: templates/rest_framework/base.html:128 +#: templates/rest_framework/base.html:136 +msgid "Extra Actions" +msgstr "" + +#: templates/rest_framework/admin.html:130 +#: templates/rest_framework/base.html:150 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/base.html:37 +msgid "navbar" +msgstr "" -#: templates/rest_framework/filters/ordering.html:3 -msgid "Ordering" -msgstr "排序" +#: templates/rest_framework/base.html:75 +msgid "content" +msgstr "" -#: templates/rest_framework/filters/search.html:2 -msgid "Search" -msgstr "查找" +#: templates/rest_framework/base.html:78 +msgid "request form" +msgstr "" -#: templates/rest_framework/horizontal/radio.html:2 -#: templates/rest_framework/inline/radio.html:2 -#: templates/rest_framework/vertical/radio.html:2 +#: templates/rest_framework/base.html:157 +msgid "main content" +msgstr "" + +#: templates/rest_framework/base.html:173 +msgid "request info" +msgstr "" + +#: templates/rest_framework/base.html:177 +msgid "response info" +msgstr "" + +#: templates/rest_framework/horizontal/radio.html:4 +#: templates/rest_framework/inline/radio.html:3 +#: templates/rest_framework/vertical/radio.html:3 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 +#: templates/rest_framework/horizontal/select_multiple.html:4 +#: templates/rest_framework/inline/select_multiple.html:3 +#: templates/rest_framework/vertical/select_multiple.html:3 msgid "No items to select." msgstr "没有可选项。" -#: validators.py:43 +#: validators.py:39 msgid "This field must be unique." msgstr "该字段必须唯一。" -#: validators.py:97 +#: validators.py:89 +#, python-brace-format msgid "The fields {field_names} must make a unique set." msgstr "字段 {field_names} 必须能构成唯一集合。" -#: validators.py:245 +#: validators.py:171 +#, python-brace-format +msgid "Surrogate characters are not allowed: U+{code_point:X}." +msgstr "" + +#: validators.py:243 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" date." msgstr "该字段必须在日期 “{date_field}” 唯一。" -#: validators.py:260 +#: validators.py:258 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" month." msgstr "该字段必须在月份 “{date_field}” 唯一。" -#: validators.py:273 +#: validators.py:271 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" year." msgstr "该字段必须在年 “{date_field}” 唯一。" -#: versioning.py:42 +#: versioning.py:40 msgid "Invalid version in \"Accept\" header." msgstr "“Accept” HTTP头包含无效版本。" -#: versioning.py:73 +#: versioning.py:71 msgid "Invalid version in URL path." msgstr "URL路径包含无效版本。" -#: versioning.py:115 +#: versioning.py:116 msgid "Invalid version in URL path. Does not match any version namespace." msgstr "URL路径中存在无效版本。版本空间中无法匹配上。" -#: versioning.py:147 +#: versioning.py:148 msgid "Invalid version in hostname." msgstr "主机名包含无效版本。" -#: versioning.py:169 +#: versioning.py:170 msgid "Invalid version in query parameter." msgstr "请求参数里包含无效版本。" - -#: views.py:88 -msgid "Permission denied." -msgstr "没有权限。" diff --git a/rest_framework/locale/zh_Hans/LC_MESSAGES/django.mo b/rest_framework/locale/zh_Hans/LC_MESSAGES/django.mo index d85317ebc9205a26b27dd681d7f17aac6297dcaa..670228a8346076571906d56e43817d7e8354163c 100644 GIT binary patch delta 2239 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 k;Nazx;p&;Oajx6vPet}#9J+XJ_|!|oht6n7, 2015 # hunter007 , 2015 -# nypisces , 2015 +# 3eb8e7e672c2428f1223e00920bfd2b3, 2015 # ppppfly , 2017 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: 2017-08-03 14:58+0000\n" -"Last-Translator: ppppfly \n" +"POT-Creation-Date: 2020-10-13 21:45+0200\n" +"PO-Revision-Date: 2020-10-13 19:45+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" @@ -21,40 +21,40 @@ msgstr "" "Language: zh-Hans\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: authentication.py:73 +#: authentication.py:70 msgid "Invalid basic header. No credentials provided." msgstr "无效的Basic认证头，没有提供认证信息。" -#: authentication.py:76 +#: authentication.py:73 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "认证字符串不应该包含空格（基本认证HTTP头无效）。" -#: authentication.py:82 +#: authentication.py:83 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "认证字符串base64编码错误（基本认证HTTP头无效）。" -#: authentication.py:99 +#: authentication.py:101 msgid "Invalid username/password." msgstr "用户名或者密码错误。" -#: authentication.py:102 authentication.py:198 +#: authentication.py:104 authentication.py:206 msgid "User inactive or deleted." msgstr "用户未激活或者已删除。" -#: authentication.py:176 +#: authentication.py:184 msgid "Invalid token header. No credentials provided." msgstr "没有提供认证信息（认证令牌HTTP头无效）。" -#: authentication.py:179 +#: authentication.py:187 msgid "Invalid token header. Token string should not contain spaces." msgstr "认证令牌字符串不应该包含空格（无效的认证令牌HTTP头）。" -#: authentication.py:185 +#: authentication.py:193 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "无效的Token。Token字符串不能包含非法的字符。" -#: authentication.py:195 +#: authentication.py:203 msgid "Invalid token." msgstr "认证令牌无效。" @@ -62,382 +62,515 @@ msgstr "认证令牌无效。" msgid "Auth Token" msgstr "认证令牌" -#: authtoken/models.py:15 +#: authtoken/models.py:13 msgid "Key" msgstr "键" -#: authtoken/models.py:18 +#: authtoken/models.py:16 msgid "User" msgstr "用户" -#: authtoken/models.py:20 +#: authtoken/models.py:18 msgid "Created" msgstr "已创建" -#: authtoken/models.py:29 +#: authtoken/models.py:27 authtoken/serializers.py:19 msgid "Token" msgstr "令牌" -#: authtoken/models.py:30 +#: authtoken/models.py:28 msgid "Tokens" msgstr "令牌" -#: authtoken/serializers.py:8 +#: authtoken/serializers.py:9 msgid "Username" msgstr "用户名" -#: authtoken/serializers.py:9 +#: authtoken/serializers.py:13 msgid "Password" msgstr "密码" -#: authtoken/serializers.py:20 -msgid "User account is disabled." -msgstr "用户账户已禁用。" - -#: authtoken/serializers.py:23 +#: authtoken/serializers.py:35 msgid "Unable to log in with provided credentials." msgstr "无法使用提供的认证信息登录。" -#: authtoken/serializers.py:26 +#: authtoken/serializers.py:38 msgid "Must include \"username\" and \"password\"." msgstr "必须包含 “用户名” 和 “密码”。" -#: exceptions.py:49 +#: exceptions.py:102 msgid "A server error occurred." msgstr "服务器出现了错误。" -#: exceptions.py:84 +#: exceptions.py:142 +msgid "Invalid input." +msgstr "" + +#: exceptions.py:161 msgid "Malformed request." msgstr "错误的请求。" -#: exceptions.py:89 +#: exceptions.py:167 msgid "Incorrect authentication credentials." msgstr "不正确的身份认证信息。" -#: exceptions.py:94 +#: exceptions.py:173 msgid "Authentication credentials were not provided." msgstr "身份认证信息未提供。" -#: exceptions.py:99 +#: exceptions.py:179 msgid "You do not have permission to perform this action." msgstr "您没有执行该操作的权限。" -#: exceptions.py:104 views.py:81 +#: exceptions.py:185 msgid "Not found." msgstr "未找到。" -#: exceptions.py:109 +#: exceptions.py:191 +#, python-brace-format msgid "Method \"{method}\" not allowed." msgstr "方法 “{method}” 不被允许。" -#: exceptions.py:120 +#: exceptions.py:202 msgid "Could not satisfy the request Accept header." msgstr "无法满足Accept HTTP头的请求。" -#: exceptions.py:132 +#: exceptions.py:212 +#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "不支持请求中的媒体类型 “{media_type}”。" -#: exceptions.py:145 +#: exceptions.py:223 msgid "Request was throttled." msgstr "请求超过了限速。" -#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 -#: validators.py:181 +#: exceptions.py:224 +#, python-brace-format +msgid "Expected available in {wait} second." +msgstr "" + +#: exceptions.py:225 +#, python-brace-format +msgid "Expected available in {wait} seconds." +msgstr "" + +#: fields.py:316 relations.py:245 relations.py:279 validators.py:90 +#: validators.py:183 msgid "This field is required." msgstr "该字段是必填项。" -#: fields.py:270 +#: fields.py:317 msgid "This field may not be null." msgstr "该字段不能为 null。" -#: fields.py:608 fields.py:639 -msgid "\"{input}\" is not a valid boolean." -msgstr "“{input}” 不是合法的布尔值。" +#: fields.py:701 +msgid "Must be a valid boolean." +msgstr "" -#: fields.py:674 +#: fields.py:766 +msgid "Not a valid string." +msgstr "" + +#: fields.py:767 msgid "This field may not be blank." msgstr "该字段不能为空。" -#: fields.py:675 fields.py:1675 +#: fields.py:768 fields.py:1881 +#, python-brace-format msgid "Ensure this field has no more than {max_length} characters." msgstr "请确保这个字段不能超过 {max_length} 个字符。" -#: fields.py:676 +#: fields.py:769 +#, python-brace-format msgid "Ensure this field has at least {min_length} characters." msgstr "请确保这个字段至少包含 {min_length} 个字符。" -#: fields.py:713 +#: fields.py:816 msgid "Enter a valid email address." msgstr "请输入合法的邮件地址。" -#: fields.py:724 +#: fields.py:827 msgid "This value does not match the required pattern." msgstr "输入值不匹配要求的模式。" -#: fields.py:735 +#: fields.py:838 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "请输入合法的“短语“，只能包含字母，数字，下划线或者中划线。" -#: fields.py:747 +#: fields.py:839 +msgid "" +"Enter a valid \"slug\" consisting of Unicode letters, numbers, underscores, " +"or hyphens." +msgstr "" + +#: fields.py:854 msgid "Enter a valid URL." msgstr "请输入合法的URL。" -#: fields.py:760 -msgid "\"{value}\" is not a valid UUID." -msgstr "“{value}”不是合法的UUID。" +#: fields.py:867 +msgid "Must be a valid UUID." +msgstr "" -#: fields.py:796 +#: fields.py:903 msgid "Enter a valid IPv4 or IPv6 address." msgstr "请输入一个有效的IPv4或IPv6地址。" -#: fields.py:821 +#: fields.py:931 msgid "A valid integer is required." msgstr "请填写合法的整数值。" -#: fields.py:822 fields.py:857 fields.py:891 +#: fields.py:932 fields.py:969 fields.py:1005 fields.py:1366 +#, python-brace-format msgid "Ensure this value is less than or equal to {max_value}." msgstr "请确保该值小于或者等于 {max_value}。" -#: fields.py:823 fields.py:858 fields.py:892 +#: fields.py:933 fields.py:970 fields.py:1006 fields.py:1367 +#, python-brace-format msgid "Ensure this value is greater than or equal to {min_value}." msgstr "请确保该值大于或者等于 {min_value}。" -#: fields.py:824 fields.py:859 fields.py:896 +#: fields.py:934 fields.py:971 fields.py:1010 msgid "String value too large." msgstr "字符串值太长。" -#: fields.py:856 fields.py:890 +#: fields.py:968 fields.py:1004 msgid "A valid number is required." msgstr "请填写合法的数字。" -#: fields.py:893 +#: fields.py:1007 +#, python-brace-format msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "请确保总计不超过 {max_digits} 个数字。" -#: fields.py:894 +#: fields.py:1008 +#, python-brace-format msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "请确保总计不超过 {max_decimal_places} 个小数位。" -#: fields.py:895 +#: fields.py:1009 +#, python-brace-format msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "请确保小数点前不超过 {max_whole_digits} 个数字。" -#: fields.py:1025 +#: fields.py:1148 +#, python-brace-format msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "日期时间格式错误。请从这些格式中选择：{format}。" -#: fields.py:1026 +#: fields.py:1149 msgid "Expected a datetime but got a date." msgstr "期望为日期时间，获得的是日期。" -#: fields.py:1103 +#: fields.py:1150 +#, python-brace-format +msgid "Invalid datetime for the timezone \"{timezone}\"." +msgstr "" + +#: fields.py:1151 +msgid "Datetime value out of range." +msgstr "" + +#: fields.py:1236 +#, python-brace-format msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "日期格式错误。请从这些格式中选择：{format}。" -#: fields.py:1104 +#: fields.py:1237 msgid "Expected a date but got a datetime." msgstr "期望为日期，获得的是日期时间。" -#: fields.py:1170 +#: fields.py:1303 +#, python-brace-format msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "时间格式错误。请从这些格式中选择：{format}。" -#: fields.py:1232 +#: fields.py:1365 +#, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "持续时间的格式错误。使用这些格式中的一个：{format}。" -#: fields.py:1251 fields.py:1300 +#: fields.py:1399 fields.py:1456 +#, python-brace-format msgid "\"{input}\" is not a valid choice." msgstr "“{input}” 不是合法选项。" -#: fields.py:1254 relations.py:71 relations.py:441 +#: fields.py:1402 +#, python-brace-format msgid "More than {count} items..." msgstr "多于{count}条记录。" -#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 +#: fields.py:1457 fields.py:1603 relations.py:485 serializers.py:570 +#, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." msgstr "期望为一个包含物件的列表，得到的类型是“{input_type}”。" -#: fields.py:1302 +#: fields.py:1458 msgid "This selection may not be empty." msgstr "这项选择不能为空。" -#: fields.py:1339 +#: fields.py:1495 +#, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "\"{input}\"不是一个有效路径选项。" -#: fields.py:1358 +#: fields.py:1514 msgid "No file was submitted." msgstr "没有提交任何文件。" -#: fields.py:1359 +#: fields.py:1515 msgid "" "The submitted data was not a file. Check the encoding type on the form." msgstr "提交的数据不是一个文件。请检查表单的编码类型。" -#: fields.py:1360 +#: fields.py:1516 msgid "No filename could be determined." msgstr "无法检测到文件名。" -#: fields.py:1361 +#: fields.py:1517 msgid "The submitted file is empty." msgstr "提交的是空文件。" -#: fields.py:1362 +#: fields.py:1518 +#, python-brace-format msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "确保该文件名最多包含 {max_length} 个字符 ( 当前长度为{length} ) 。" -#: fields.py:1410 +#: fields.py:1566 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 +#: fields.py:1604 relations.py:486 serializers.py:571 msgid "This list may not be empty." msgstr "列表不能为空。" -#: fields.py:1502 +#: fields.py:1605 +#, python-brace-format +msgid "Ensure this field has at least {min_length} elements." +msgstr "" + +#: fields.py:1606 +#, python-brace-format +msgid "Ensure this field has no more than {max_length} elements." +msgstr "" + +#: fields.py:1682 +#, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "期望是包含类目的字典，得到类型为 “{input_type}”。" -#: fields.py:1549 +#: fields.py:1683 +msgid "This dictionary may not be empty." +msgstr "" + +#: fields.py:1755 msgid "Value must be valid JSON." msgstr "值必须是有效的 JSON 数据。" -#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 -msgid "Submit" -msgstr "提交" +#: filters.py:49 templates/rest_framework/filters/search.html:2 +msgid "Search" +msgstr " 搜索" -#: filters.py:336 +#: filters.py:50 +msgid "A search term." +msgstr "" + +#: filters.py:180 templates/rest_framework/filters/ordering.html:3 +msgid "Ordering" +msgstr "排序" + +#: filters.py:181 +msgid "Which field to use when ordering the results." +msgstr "" + +#: filters.py:287 msgid "ascending" msgstr "正排序" -#: filters.py:337 +#: filters.py:288 msgid "descending" msgstr "倒排序" -#: pagination.py:193 +#: pagination.py:174 +msgid "A page number within the paginated result set." +msgstr "" + +#: pagination.py:179 pagination.py:372 pagination.py:590 +msgid "Number of results to return per page." +msgstr "" + +#: pagination.py:189 msgid "Invalid page." msgstr "无效页面。" -#: pagination.py:427 +#: pagination.py:374 +msgid "The initial index from which to return the results." +msgstr "" + +#: pagination.py:581 +msgid "The pagination cursor value." +msgstr "" + +#: pagination.py:583 msgid "Invalid cursor" msgstr "无效游标" -#: relations.py:207 +#: relations.py:246 +#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "无效主键 “{pk_value}” － 对象不存在。" -#: relations.py:208 +#: relations.py:247 +#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "类型错误。期望为主键，获得的类型为 {data_type}。" -#: relations.py:240 +#: relations.py:280 msgid "Invalid hyperlink - No URL match." msgstr "无效超链接 －没有匹配的URL。" -#: relations.py:241 +#: relations.py:281 msgid "Invalid hyperlink - Incorrect URL match." msgstr "无效超链接 －错误的URL匹配。" -#: relations.py:242 +#: relations.py:282 msgid "Invalid hyperlink - Object does not exist." msgstr "无效超链接 －对象不存在。" -#: relations.py:243 +#: relations.py:283 +#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "类型错误。期望为URL字符串，实际的类型是 {data_type}。" -#: relations.py:401 +#: relations.py:448 +#, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "属性 {slug_name} 为 {value} 的对象不存在。" -#: relations.py:402 +#: relations.py:449 msgid "Invalid value." msgstr "无效值。" -#: serializers.py:326 +#: schemas/utils.py:32 +msgid "unique integer value" +msgstr "" + +#: schemas/utils.py:34 +msgid "UUID string" +msgstr "" + +#: schemas/utils.py:36 +msgid "unique value" +msgstr "" + +#: schemas/utils.py:38 +#, python-brace-format +msgid "A {value_type} identifying this {name}." +msgstr "" + +#: serializers.py:337 +#, python-brace-format msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "无效数据。期待为字典类型，得到的是 {datatype} 。" #: templates/rest_framework/admin.html:116 -#: templates/rest_framework/base.html:128 +#: templates/rest_framework/base.html:136 +msgid "Extra Actions" +msgstr "" + +#: templates/rest_framework/admin.html:130 +#: templates/rest_framework/base.html:150 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/base.html:37 +msgid "navbar" +msgstr "" -#: templates/rest_framework/filters/ordering.html:3 -msgid "Ordering" -msgstr "排序" +#: templates/rest_framework/base.html:75 +msgid "content" +msgstr "" -#: templates/rest_framework/filters/search.html:2 -msgid "Search" -msgstr " 搜索" +#: templates/rest_framework/base.html:78 +msgid "request form" +msgstr "" -#: templates/rest_framework/horizontal/radio.html:2 -#: templates/rest_framework/inline/radio.html:2 -#: templates/rest_framework/vertical/radio.html:2 +#: templates/rest_framework/base.html:157 +msgid "main content" +msgstr "" + +#: templates/rest_framework/base.html:173 +msgid "request info" +msgstr "" + +#: templates/rest_framework/base.html:177 +msgid "response info" +msgstr "" + +#: templates/rest_framework/horizontal/radio.html:4 +#: templates/rest_framework/inline/radio.html:3 +#: templates/rest_framework/vertical/radio.html:3 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 +#: templates/rest_framework/horizontal/select_multiple.html:4 +#: templates/rest_framework/inline/select_multiple.html:3 +#: templates/rest_framework/vertical/select_multiple.html:3 msgid "No items to select." msgstr "没有可选项。" -#: validators.py:43 +#: validators.py:39 msgid "This field must be unique." msgstr "该字段必须唯一。" -#: validators.py:97 +#: validators.py:89 +#, python-brace-format msgid "The fields {field_names} must make a unique set." msgstr "字段 {field_names} 必须能构成唯一集合。" -#: validators.py:245 +#: validators.py:171 +#, python-brace-format +msgid "Surrogate characters are not allowed: U+{code_point:X}." +msgstr "" + +#: validators.py:243 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" date." msgstr "该字段必须在日期 “{date_field}” 唯一。" -#: validators.py:260 +#: validators.py:258 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" month." msgstr "该字段必须在月份 “{date_field}” 唯一。" -#: validators.py:273 +#: validators.py:271 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" year." msgstr "该字段必须在年 “{date_field}” 唯一。" -#: versioning.py:42 +#: versioning.py:40 msgid "Invalid version in \"Accept\" header." msgstr "“Accept” HTTP头包含无效版本。" -#: versioning.py:73 +#: versioning.py:71 msgid "Invalid version in URL path." msgstr "URL路径包含无效版本。" -#: versioning.py:115 +#: versioning.py:116 msgid "Invalid version in URL path. Does not match any version namespace." msgstr "在URL路径中发现无效的版本。无法匹配任何的版本命名空间。" -#: versioning.py:147 +#: versioning.py:148 msgid "Invalid version in hostname." msgstr "主机名包含无效版本。" -#: versioning.py:169 +#: versioning.py:170 msgid "Invalid version in query parameter." msgstr "请求参数里包含无效版本。" - -#: views.py:88 -msgid "Permission denied." -msgstr "没有权限。" diff --git a/rest_framework/locale/zh_Hant/LC_MESSAGES/django.mo b/rest_framework/locale/zh_Hant/LC_MESSAGES/django.mo index 0d8ccaa5557028d040bad7584707df8e7d6559f5..26ea0cee93d7fd2fd2dd8695ed3a50c0c1269b10 100644 GIT binary patch literal 4809 zcmai$YitzP6~}MeJX({sA#KvMY13OLZ6IXVHi48bAqo%EI0=D*p+S`zjd!niC!U>I zW@h~ea%CP4HrUuaY~y5km`7p^#s&&3el)EV+7_Ct4OcR%s5pDOi#?u_^0 z7#QvBZ|>uqbI;@6nSVX@zyQPbbKF0~{gMA7G4wS3w&80(=U*16F{G z9%Src@ClG~JPob}cYq=AsNerN_zc<)KE&8#;8KwEy$n+SPM_`IO0-8n()(9%75Hy( z3HT&Be*&%rp9jO>H^IYTHJAdw1%3|x0Q{%l{x3)_J@j>~5v%}dd@1-GxB+|u)Ihk# z_JQPI7lW{CVUXUjI^%+G|0I*Ka|x_nzM#06E%M!FAvl zAVS0*hf&i16iDl+1iueH2f_qf>$hJAm!lm4AueBz+Z+dUdiGBtKSyq~}*4<+BZ> z{GI?wZwe&237!s@@4>I2?@J#Fb4(=ClQw)%D z85<7%7F`^6ZvY+9mJwf}3E{Y>vROfTo z5NSZnkjZARZ~QY zgL*RF@TIY&9pm*zlhE0EQz*8Guv*2Bi>VvvtiC^gk2!GKoTRQM%Im?%g#o_ zjL+92mx`??;t9Kr1`B5Z9*QSQNq<~vlQC;R6>Ey#R3=n1s3$e8e2fAJsidy%N=k=d zLRNc;ROvb_p`mA+4-c|Id z!ME0KtLKd-)`9wNs@N(LhG_>jSy43-SeJ}ifqEmvE4FM7Y!%HaNd`9H6bkX>)yt~` zHTb>AYkm=0v2s~8u8KEtxCiP@MYlA?Hp~!zTWMBtLZUK_UCB27aw|3wJ-v#P!Dv>M zVAzPi0x>Yo z)(#XL3DhjyUxo6LrmEhH1zuBhyJ~60rn*hF#kkZ2t1H$UIJ0$lf-@|{ZP991B{W6V zSIc*mCG0iZ>o*2g73a}{8ig6C_4i1KuWC^3f?px-TdUZjB~3*OY((Cy5Z4p3X|1VQ z&ArDp)vGH?-qe|NuX|#`O?A5iUD*%z=l7)DV+a1zv6tm89m>t5oz4q|F?Zni?m*h< zn7P|<+8H0BvHZoM+<3SDzILXkvQX90NgA_fr*dPx?)Z84^8Ua+clUS@5V#vOZqMXlYR39 z3U6m$U|yK$<-CH!g7=noQj^Zfj)kY*|2i(D72o_c&GoSV(iVBNwd8wr! zj-u!|m%Y)C*Q?WWJKx!h#UOT6yW{6j7 za3p_Zl2M(Xz2tQ6$&Fq`1l+;f?)8C^uL4p&w-Njg0jJ}Tmqhv)a6akGpXqXXVDD1q z9=5%xWu~Vyvjgtfad)H(X5GI2%+z^*{mkwD1BI$Pu=d}qs~+x^ITwVf6AFW z#E|Dq`kJ@Ho%3UOkW-~DxZo8A>X%Z9V@Mh+)OF#&K-D>eS1><&YZUP*7TSGQih~Bb zh1^bccqfjuK6m_(2YnNmk-a#T9iClyjJ^oUM*JuqpU9-;wuTXJW0b1%C9n$+{x1!b zY{GocL~iUnwg8+(*=5p)pv;RvCOwX`7*?FV!OZlzJ2M~5eFl*BvJZhmHkp&Yo*O>x zrpBCs(S{a&5=I0hy2+7FLO)OS$&M3+(F3C()uqnyUbpYaIsK917Zc#=6NlzE# diff --git a/rest_framework/locale/zh_Hant/LC_MESSAGES/django.po b/rest_framework/locale/zh_Hant/LC_MESSAGES/django.po index 1960f1f5d..6d2630f31 100644 --- a/rest_framework/locale/zh_Hant/LC_MESSAGES/django.po +++ b/rest_framework/locale/zh_Hant/LC_MESSAGES/django.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Matsui Lin , 2019 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" +"POT-Creation-Date: 2020-10-13 21:45+0200\n" +"PO-Revision-Date: 2020-10-13 19:45+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,423 +18,556 @@ msgstr "" "Language: zh-Hant\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: authentication.py:73 +#: authentication.py:70 msgid "Invalid basic header. No credentials provided." msgstr "" -#: authentication.py:76 +#: authentication.py:73 msgid "Invalid basic header. Credentials string should not contain spaces." msgstr "" -#: authentication.py:82 +#: authentication.py:83 msgid "Invalid basic header. Credentials not correctly base64 encoded." msgstr "" -#: authentication.py:99 +#: authentication.py:101 msgid "Invalid username/password." -msgstr "" +msgstr "無效的使用者名稱及密碼。" -#: authentication.py:102 authentication.py:198 +#: authentication.py:104 authentication.py:206 msgid "User inactive or deleted." -msgstr "" +msgstr "帳號未啟用或已被刪除。" -#: authentication.py:176 +#: authentication.py:184 msgid "Invalid token header. No credentials provided." msgstr "" -#: authentication.py:179 +#: authentication.py:187 msgid "Invalid token header. Token string should not contain spaces." msgstr "" -#: authentication.py:185 +#: authentication.py:193 msgid "" "Invalid token header. Token string should not contain invalid characters." msgstr "" -#: authentication.py:195 +#: authentication.py:203 msgid "Invalid token." -msgstr "" +msgstr "無效的token。" #: authtoken/apps.py:7 msgid "Auth Token" -msgstr "" +msgstr "驗證 Token" -#: authtoken/models.py:15 +#: authtoken/models.py:13 msgid "Key" -msgstr "" +msgstr "金鑰" + +#: authtoken/models.py:16 +msgid "User" +msgstr "使用者" #: authtoken/models.py:18 -msgid "User" -msgstr "" - -#: authtoken/models.py:20 msgid "Created" -msgstr "" +msgstr "建立者" -#: authtoken/models.py:29 +#: authtoken/models.py:27 authtoken/serializers.py:19 msgid "Token" -msgstr "" +msgstr "Token" -#: authtoken/models.py:30 +#: authtoken/models.py:28 msgid "Tokens" -msgstr "" - -#: authtoken/serializers.py:8 -msgid "Username" -msgstr "" +msgstr "Tokens" #: authtoken/serializers.py:9 +msgid "Username" +msgstr "使用者名稱" + +#: authtoken/serializers.py:13 msgid "Password" -msgstr "" +msgstr "密碼" -#: authtoken/serializers.py:20 -msgid "User account is disabled." -msgstr "" - -#: authtoken/serializers.py:23 +#: authtoken/serializers.py:35 msgid "Unable to log in with provided credentials." msgstr "" -#: authtoken/serializers.py:26 +#: authtoken/serializers.py:38 msgid "Must include \"username\" and \"password\"." -msgstr "" +msgstr "必須包含使用者名稱及密碼。" -#: exceptions.py:49 +#: exceptions.py:102 msgid "A server error occurred." msgstr "" -#: exceptions.py:84 +#: exceptions.py:142 +msgid "Invalid input." +msgstr "" + +#: exceptions.py:161 msgid "Malformed request." msgstr "" -#: exceptions.py:89 +#: exceptions.py:167 msgid "Incorrect authentication credentials." msgstr "" -#: exceptions.py:94 +#: exceptions.py:173 msgid "Authentication credentials were not provided." msgstr "" -#: exceptions.py:99 +#: exceptions.py:179 msgid "You do not have permission to perform this action." -msgstr "" +msgstr "你沒有執行此操作的權限。" -#: exceptions.py:104 views.py:81 +#: exceptions.py:185 msgid "Not found." -msgstr "" +msgstr "找不到資源。" -#: exceptions.py:109 +#: exceptions.py:191 +#, python-brace-format msgid "Method \"{method}\" not allowed." -msgstr "" +msgstr "不被允許的方法 \"{method}\"。" -#: exceptions.py:120 +#: exceptions.py:202 msgid "Could not satisfy the request Accept header." msgstr "" -#: exceptions.py:132 +#: exceptions.py:212 +#, python-brace-format msgid "Unsupported media type \"{media_type}\" in request." msgstr "" -#: exceptions.py:145 +#: exceptions.py:223 msgid "Request was throttled." msgstr "" -#: fields.py:269 relations.py:206 relations.py:239 validators.py:98 -#: validators.py:181 +#: exceptions.py:224 +#, python-brace-format +msgid "Expected available in {wait} second." +msgstr "" + +#: exceptions.py:225 +#, python-brace-format +msgid "Expected available in {wait} seconds." +msgstr "" + +#: fields.py:316 relations.py:245 relations.py:279 validators.py:90 +#: validators.py:183 msgid "This field is required." -msgstr "" +msgstr "此為必需欄位。" -#: fields.py:270 +#: fields.py:317 msgid "This field may not be null." +msgstr "此欄位不可為null。" + +#: fields.py:701 +msgid "Must be a valid boolean." msgstr "" -#: fields.py:608 fields.py:639 -msgid "\"{input}\" is not a valid boolean." +#: fields.py:766 +msgid "Not a valid string." msgstr "" -#: fields.py:674 +#: fields.py:767 msgid "This field may not be blank." -msgstr "" +msgstr "此欄位不可為空白。" -#: fields.py:675 fields.py:1675 +#: fields.py:768 fields.py:1881 +#, python-brace-format msgid "Ensure this field has no more than {max_length} characters." -msgstr "" +msgstr "請確認此欄位字元長度不超過 {max_length}。" -#: fields.py:676 +#: fields.py:769 +#, python-brace-format msgid "Ensure this field has at least {min_length} characters." -msgstr "" +msgstr "請確認此欄位字元長度最少超過 {min_length}。" -#: fields.py:713 +#: fields.py:816 msgid "Enter a valid email address." -msgstr "" +msgstr "請輸入有效的電子郵件地址。" -#: fields.py:724 +#: fields.py:827 msgid "This value does not match the required pattern." msgstr "" -#: fields.py:735 +#: fields.py:838 msgid "" "Enter a valid \"slug\" consisting of letters, numbers, underscores or " "hyphens." msgstr "" -#: fields.py:747 +#: fields.py:839 +msgid "" +"Enter a valid \"slug\" consisting of Unicode letters, numbers, underscores, " +"or hyphens." +msgstr "" + +#: fields.py:854 msgid "Enter a valid URL." +msgstr "請輸入有效的URL。" + +#: fields.py:867 +msgid "Must be a valid UUID." msgstr "" -#: fields.py:760 -msgid "\"{value}\" is not a valid UUID." -msgstr "" - -#: fields.py:796 +#: fields.py:903 msgid "Enter a valid IPv4 or IPv6 address." -msgstr "" +msgstr "請輸入有效的 IPv4 或 IPv6 地址。" -#: fields.py:821 +#: fields.py:931 msgid "A valid integer is required." -msgstr "" +msgstr "請輸入有效的整數值。" -#: fields.py:822 fields.py:857 fields.py:891 +#: fields.py:932 fields.py:969 fields.py:1005 fields.py:1366 +#, python-brace-format msgid "Ensure this value is less than or equal to {max_value}." -msgstr "" +msgstr "請確認輸入值小於或等於 {max_value}。" -#: fields.py:823 fields.py:858 fields.py:892 +#: fields.py:933 fields.py:970 fields.py:1006 fields.py:1367 +#, python-brace-format msgid "Ensure this value is greater than or equal to {min_value}." -msgstr "" +msgstr "請確認輸入值大於或等於 {min_value}。" -#: fields.py:824 fields.py:859 fields.py:896 +#: fields.py:934 fields.py:971 fields.py:1010 msgid "String value too large." -msgstr "" +msgstr "字串長度太長。" -#: fields.py:856 fields.py:890 +#: fields.py:968 fields.py:1004 msgid "A valid number is required." -msgstr "" +msgstr "請輸入有效的數字。" -#: fields.py:893 +#: fields.py:1007 +#, python-brace-format msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "" -#: fields.py:894 +#: fields.py:1008 +#, python-brace-format msgid "" "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "" -#: fields.py:895 +#: fields.py:1009 +#, python-brace-format msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "" -#: fields.py:1025 +#: fields.py:1148 +#, python-brace-format msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1026 +#: fields.py:1149 msgid "Expected a datetime but got a date." +msgstr "應該為日期時間格式，並非日期格式。" + +#: fields.py:1150 +#, python-brace-format +msgid "Invalid datetime for the timezone \"{timezone}\"." msgstr "" -#: fields.py:1103 +#: fields.py:1151 +msgid "Datetime value out of range." +msgstr "" + +#: fields.py:1236 +#, python-brace-format msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1104 +#: fields.py:1237 msgid "Expected a date but got a datetime." -msgstr "" +msgstr "應該為日期格式，並非日期時間格式。" -#: fields.py:1170 +#: fields.py:1303 +#, python-brace-format msgid "Time has wrong format. Use one of these formats instead: {format}." -msgstr "" +msgstr "時間格式錯誤，請在下列格式中擇一取代：{format}。" -#: fields.py:1232 +#: fields.py:1365 +#, python-brace-format msgid "Duration has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:1251 fields.py:1300 +#: fields.py:1399 fields.py:1456 +#, python-brace-format msgid "\"{input}\" is not a valid choice." -msgstr "" +msgstr "\"{input}\" 不是有效的選擇。" -#: fields.py:1254 relations.py:71 relations.py:441 +#: fields.py:1402 +#, python-brace-format msgid "More than {count} items..." -msgstr "" +msgstr "超過 {count} 個項目..." -#: fields.py:1301 fields.py:1448 relations.py:437 serializers.py:524 +#: fields.py:1457 fields.py:1603 relations.py:485 serializers.py:570 +#, python-brace-format msgid "Expected a list of items but got type \"{input_type}\"." -msgstr "" +msgstr "應該為項目組成的列表，並非 \"{input_type}\" 類型。" -#: fields.py:1302 +#: fields.py:1458 msgid "This selection may not be empty." -msgstr "" +msgstr "此選項不可為空。" -#: fields.py:1339 +#: fields.py:1495 +#, python-brace-format msgid "\"{input}\" is not a valid path choice." msgstr "" -#: fields.py:1358 +#: fields.py:1514 msgid "No file was submitted." -msgstr "" +msgstr "沒有任何檔案被提交。" -#: fields.py:1359 +#: fields.py:1515 msgid "" "The submitted data was not a file. Check the encoding type on the form." -msgstr "" +msgstr "提交的資料並不是檔案格式，請確認表單的編碼類型。" -#: fields.py:1360 +#: fields.py:1516 msgid "No filename could be determined." msgstr "" -#: fields.py:1361 +#: fields.py:1517 msgid "The submitted file is empty." -msgstr "" +msgstr "沒有任何檔案被提交。" -#: fields.py:1362 +#: fields.py:1518 +#, python-brace-format msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1410 +#: fields.py:1566 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 +#: fields.py:1604 relations.py:486 serializers.py:571 msgid "This list may not be empty." +msgstr "此列表不可為空。" + +#: fields.py:1605 +#, python-brace-format +msgid "Ensure this field has at least {min_length} elements." msgstr "" -#: fields.py:1502 +#: fields.py:1606 +#, python-brace-format +msgid "Ensure this field has no more than {max_length} elements." +msgstr "" + +#: fields.py:1682 +#, python-brace-format msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1549 +#: fields.py:1683 +msgid "This dictionary may not be empty." +msgstr "" + +#: fields.py:1755 msgid "Value must be valid JSON." +msgstr "輸入值必須為有效的JSON。" + +#: filters.py:49 templates/rest_framework/filters/search.html:2 +msgid "Search" +msgstr "搜尋" + +#: filters.py:50 +msgid "A search term." msgstr "" -#: filters.py:36 templates/rest_framework/filters/django_filter.html:5 -msgid "Submit" +#: filters.py:180 templates/rest_framework/filters/ordering.html:3 +msgid "Ordering" +msgstr "排序" + +#: filters.py:181 +msgid "Which field to use when ordering the results." msgstr "" -#: filters.py:336 +#: filters.py:287 msgid "ascending" -msgstr "" +msgstr "升序排列" -#: filters.py:337 +#: filters.py:288 msgid "descending" +msgstr "降序排列" + +#: pagination.py:174 +msgid "A page number within the paginated result set." msgstr "" -#: pagination.py:193 +#: pagination.py:179 pagination.py:372 pagination.py:590 +msgid "Number of results to return per page." +msgstr "" + +#: pagination.py:189 msgid "Invalid page." +msgstr "無效的頁面。" + +#: pagination.py:374 +msgid "The initial index from which to return the results." msgstr "" -#: pagination.py:427 +#: pagination.py:581 +msgid "The pagination cursor value." +msgstr "" + +#: pagination.py:583 msgid "Invalid cursor" msgstr "" -#: relations.py:207 +#: relations.py:246 +#, python-brace-format msgid "Invalid pk \"{pk_value}\" - object does not exist." -msgstr "" +msgstr "無效的主鍵 \"{pk_value}\" - 物件不存在。" -#: relations.py:208 +#: relations.py:247 +#, python-brace-format msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" -#: relations.py:240 +#: relations.py:280 msgid "Invalid hyperlink - No URL match." -msgstr "" +msgstr "無效的超連結 - 沒有匹配的URL。" -#: relations.py:241 +#: relations.py:281 msgid "Invalid hyperlink - Incorrect URL match." -msgstr "" +msgstr "無效的超連結 - 匹配的URL不正確。" -#: relations.py:242 +#: relations.py:282 msgid "Invalid hyperlink - Object does not exist." -msgstr "" +msgstr "無效的超連結 - 物件不存在。" -#: relations.py:243 +#: relations.py:283 +#, python-brace-format msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:401 +#: relations.py:448 +#, python-brace-format msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:402 +#: relations.py:449 msgid "Invalid value." +msgstr "無效值。" + +#: schemas/utils.py:32 +msgid "unique integer value" msgstr "" -#: serializers.py:326 -msgid "Invalid data. Expected a dictionary, but got {datatype}." +#: schemas/utils.py:34 +msgid "UUID string" msgstr "" +#: schemas/utils.py:36 +msgid "unique value" +msgstr "" + +#: schemas/utils.py:38 +#, python-brace-format +msgid "A {value_type} identifying this {name}." +msgstr "" + +#: serializers.py:337 +#, python-brace-format +msgid "Invalid data. Expected a dictionary, but got {datatype}." +msgstr "無效的資料，應該為字典類型，並非 {datatype}。" + #: templates/rest_framework/admin.html:116 -#: templates/rest_framework/base.html:128 +#: templates/rest_framework/base.html:136 +msgid "Extra Actions" +msgstr "" + +#: templates/rest_framework/admin.html:130 +#: templates/rest_framework/base.html:150 msgid "Filters" +msgstr "篩選" + +#: templates/rest_framework/base.html:37 +msgid "navbar" msgstr "" -#: templates/rest_framework/filters/django_filter.html:2 -#: templates/rest_framework/filters/django_filter_crispyforms.html:4 -msgid "Field filters" +#: templates/rest_framework/base.html:75 +msgid "content" msgstr "" -#: templates/rest_framework/filters/ordering.html:3 -msgid "Ordering" +#: templates/rest_framework/base.html:78 +msgid "request form" msgstr "" -#: templates/rest_framework/filters/search.html:2 -msgid "Search" +#: templates/rest_framework/base.html:157 +msgid "main content" msgstr "" -#: templates/rest_framework/horizontal/radio.html:2 -#: templates/rest_framework/inline/radio.html:2 -#: templates/rest_framework/vertical/radio.html:2 +#: templates/rest_framework/base.html:173 +msgid "request info" +msgstr "" + +#: templates/rest_framework/base.html:177 +msgid "response info" +msgstr "" + +#: templates/rest_framework/horizontal/radio.html:4 +#: templates/rest_framework/inline/radio.html:3 +#: templates/rest_framework/vertical/radio.html:3 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 +#: templates/rest_framework/horizontal/select_multiple.html:4 +#: templates/rest_framework/inline/select_multiple.html:3 +#: templates/rest_framework/vertical/select_multiple.html:3 msgid "No items to select." msgstr "" -#: validators.py:43 +#: validators.py:39 msgid "This field must be unique." -msgstr "" +msgstr "此欄位必須唯一。" -#: validators.py:97 +#: validators.py:89 +#, python-brace-format msgid "The fields {field_names} must make a unique set." msgstr "" -#: validators.py:245 +#: validators.py:171 +#, python-brace-format +msgid "Surrogate characters are not allowed: U+{code_point:X}." +msgstr "" + +#: validators.py:243 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" date." msgstr "" -#: validators.py:260 +#: validators.py:258 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" month." msgstr "" -#: validators.py:273 +#: validators.py:271 +#, python-brace-format msgid "This field must be unique for the \"{date_field}\" year." msgstr "" -#: versioning.py:42 +#: versioning.py:40 msgid "Invalid version in \"Accept\" header." msgstr "" -#: versioning.py:73 +#: versioning.py:71 msgid "Invalid version in URL path." msgstr "" -#: versioning.py:115 +#: versioning.py:116 msgid "Invalid version in URL path. Does not match any version namespace." msgstr "" -#: versioning.py:147 +#: versioning.py:148 msgid "Invalid version in hostname." msgstr "" -#: versioning.py:169 +#: versioning.py:170 msgid "Invalid version in query parameter." msgstr "" - -#: views.py:88 -msgid "Permission denied." -msgstr "" From 9c29f5013f2741b215d537d12f7a6ddecda5677e Mon Sep 17 00:00:00 2001 From: Jon Dufresne Date: Sun, 1 Nov 2020 07:42:30 -0800 Subject: [PATCH 050/303] Use Python 3.9 release in Travis configuration --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2c2724bf6..7a820766e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,8 +21,8 @@ matrix: - { python: "3.8", env: DJANGO=3.1 } - { python: "3.8", env: DJANGO=master } - - { python: "3.9-dev", env: DJANGO=3.1 } - - { python: "3.9-dev", env: DJANGO=master } + - { python: "3.9", env: DJANGO=3.1 } + - { python: "3.9", env: DJANGO=master } - { python: "3.8", env: TOXENV=base } - { python: "3.8", env: TOXENV=lint } From 56e45081235783812f90098916a6e0131b08bbaa Mon Sep 17 00:00:00 2001 From: "James S Blachly, MD" Date: Mon, 2 Nov 2020 03:45:43 -0500 Subject: [PATCH 051/303] Fix #7612 (#7622) --- 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 22cc3d8aa..d5815127b 100644 --- a/docs/api-guide/viewsets.md +++ b/docs/api-guide/viewsets.md @@ -152,7 +152,7 @@ A more complete example of extra actions: user = self.get_object() serializer = PasswordSerializer(data=request.data) if serializer.is_valid(): - user.set_password(serializer.data['password']) + user.set_password(serializer.validated_data['password']) user.save() return Response({'status': 'password set'}) else: From 606df838856bd3fe2c2a76bead15a8fb7234479e Mon Sep 17 00:00:00 2001 From: Megan Gross <16373770+144mdgross@users.noreply.github.com> Date: Thu, 5 Nov 2020 01:43:45 -0700 Subject: [PATCH 052/303] Update throttling.md (#7606) There were recent updates to the `@action` decorator calling a little more attention to the kwargs it accepts. I thought it would be useful to also provide an example in the throttling section of how those kwargs can be used to define/override throttle_classes through the action decorator as well. --- docs/api-guide/throttling.md | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/docs/api-guide/throttling.md b/docs/api-guide/throttling.md index 215c735bf..a3e42cacf 100644 --- a/docs/api-guide/throttling.md +++ b/docs/api-guide/throttling.md @@ -59,7 +59,7 @@ using the `APIView` class-based views. } return Response(content) -Or, if you're using the `@api_view` decorator with function based views. +If you're using the `@api_view` decorator with function based views you can use the following decorator. @api_view(['GET']) @throttle_classes([UserRateThrottle]) @@ -69,6 +69,16 @@ Or, if you're using the `@api_view` decorator with function based views. } return Response(content) +It's also possible to set throttle classes for routes that are created using the `@action` decorator. +Throttle classes set in this way will override any viewset level class settings. + + @action(detail=True, methods=["post"], throttle_classes=[UserRateThrottle]) + def example_adhoc_method(request, pk=None): + content = { + 'status': 'request was permitted' + } + return Response(content) + ## How clients are identified The `X-Forwarded-For` HTTP header and `REMOTE_ADDR` WSGI variable are used to uniquely identify client IP addresses for throttling. If the `X-Forwarded-For` header is present then it will be used, otherwise the value of the `REMOTE_ADDR` variable from the WSGI environment will be used. From 80444a0afb1c05b4c85a34de2bc6c3f9614bdc86 Mon Sep 17 00:00:00 2001 From: bhealy-indeed <62403057+bhealy-indeed@users.noreply.github.com> Date: Thu, 5 Nov 2020 15:21:30 -0600 Subject: [PATCH 053/303] nit: Typo fix (#7629) --- 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 d7d73a2f2..fbf3097e0 100644 --- a/docs/api-guide/exceptions.md +++ b/docs/api-guide/exceptions.md @@ -38,7 +38,7 @@ Might receive an error response indicating that the `DELETE` method is not allow Validation errors are handled slightly differently, and will include the field names as the keys in the response. If the validation error was not specific to a particular field then it will use the "non_field_errors" key, or whatever string value has been set for the `NON_FIELD_ERRORS_KEY` setting. -Any example validation error might look like this: +An example validation error might look like this: HTTP/1.1 400 Bad Request Content-Type: application/json From 6da94e5700dd505f0fe2d9f376fbc212d02febc2 Mon Sep 17 00:00:00 2001 From: Georg Lukas Date: Thu, 12 Nov 2020 09:48:18 +0100 Subject: [PATCH 054/303] docs: outline the difference between JSON and form parsers. Fix #7633 --- docs/api-guide/parsers.md | 2 +- docs/api-guide/requests.md | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/api-guide/parsers.md b/docs/api-guide/parsers.md index e8f03de8b..dde77c3e0 100644 --- a/docs/api-guide/parsers.md +++ b/docs/api-guide/parsers.md @@ -73,7 +73,7 @@ Or, if you're using the `@api_view` decorator with function based views. ## JSONParser -Parses `JSON` request content. +Parses `JSON` request content. `request.data` will be populated with a dictionary of data. **.media_type**: `application/json` diff --git a/docs/api-guide/requests.md b/docs/api-guide/requests.md index 1c336953c..e877c868d 100644 --- a/docs/api-guide/requests.md +++ b/docs/api-guide/requests.md @@ -23,7 +23,7 @@ REST framework's Request objects provide flexible request parsing that allows yo * It includes all parsed content, including *file and non-file* inputs. * It supports parsing the content of HTTP methods other than `POST`, meaning that you can access the content of `PUT` and `PATCH` requests. -* It supports REST framework's flexible request parsing, rather than just supporting form data. For example you can handle incoming JSON data in the same way that you handle incoming form data. +* It supports REST framework's flexible request parsing, rather than just supporting form data. For example you can handle incoming [JSON data] similarly to how you handle incoming [form data]. For more details see the [parsers documentation]. @@ -136,5 +136,7 @@ Note that due to implementation reasons the `Request` class does not inherit fro [cite]: https://groups.google.com/d/topic/django-developers/dxI4qVzrBY4/discussion [parsers documentation]: parsers.md +[JSON data]: parsers.md#jsonparser +[form data]: parsers.md#formparser [authentication documentation]: authentication.md [browser enhancements documentation]: ../topics/browser-enhancements.md From 96993d817a6af9c037ece7253cfae49efc814f49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karol=20Ony=C5=9Bko?= Date: Thu, 12 Nov 2020 18:42:42 +0100 Subject: [PATCH 055/303] Changed url to django docs so it points to the stable version (#7628) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Karol Onyśko --- docs/api-guide/relations.md | 2 +- docs/topics/internationalization.md | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/api-guide/relations.md b/docs/api-guide/relations.md index d3d8b30b8..f444125cf 100644 --- a/docs/api-guide/relations.md +++ b/docs/api-guide/relations.md @@ -603,6 +603,6 @@ The [rest-framework-generic-relations][drf-nested-relations] library provides re [generic-relations]: https://docs.djangoproject.com/en/stable/ref/contrib/contenttypes/#id1 [drf-nested-routers]: https://github.com/alanjds/drf-nested-routers [drf-nested-relations]: https://github.com/Ian-Foote/rest-framework-generic-relations -[django-intermediary-manytomany]: https://docs.djangoproject.com/en/2.2/topics/db/models/#intermediary-manytomany +[django-intermediary-manytomany]: https://docs.djangoproject.com/en/stable/topics/db/models/#intermediary-manytomany [dealing-with-nested-objects]: https://www.django-rest-framework.org/api-guide/serializers/#dealing-with-nested-objects [to_internal_value]: https://www.django-rest-framework.org/api-guide/serializers/#to_internal_valueself-data diff --git a/docs/topics/internationalization.md b/docs/topics/internationalization.md index 7cfc6e247..c20cf9e33 100644 --- a/docs/topics/internationalization.md +++ b/docs/topics/internationalization.md @@ -103,10 +103,10 @@ You can find more information on how the language preference is determined in th For API clients the most appropriate of these will typically be to use the `Accept-Language` header; Sessions and cookies will not be available unless using session authentication, and generally better practice to prefer an `Accept-Language` header for API clients rather than using language URL prefixes. [cite]: https://youtu.be/Wa0VfS2q94Y -[django-translation]: https://docs.djangoproject.com/en/1.7/topics/i18n/translation +[django-translation]: https://docs.djangoproject.com/en/stable/topics/i18n/translation [custom-exception-handler]: ../api-guide/exceptions.md#custom-exception-handling [transifex-project]: https://www.transifex.com/projects/p/django-rest-framework/ [django-po-source]: https://raw.githubusercontent.com/encode/django-rest-framework/master/rest_framework/locale/en_US/LC_MESSAGES/django.po -[django-language-preference]: https://docs.djangoproject.com/en/1.7/topics/i18n/translation/#how-django-discovers-language-preference -[django-locale-paths]: https://docs.djangoproject.com/en/1.7/ref/settings/#std:setting-LOCALE_PATHS -[django-locale-name]: https://docs.djangoproject.com/en/1.7/topics/i18n/#term-locale-name +[django-language-preference]: https://docs.djangoproject.com/en/stable/topics/i18n/translation/#how-django-discovers-language-preference +[django-locale-paths]: https://docs.djangoproject.com/en/stable/ref/settings/#std:setting-LOCALE_PATHS +[django-locale-name]: https://docs.djangoproject.com/en/stable/topics/i18n/#term-locale-name From 3ab8d4706eb6c04b331ca4d57778a1989c668f2f Mon Sep 17 00:00:00 2001 From: babaroga Date: Sat, 21 Nov 2020 11:53:39 -0500 Subject: [PATCH 056/303] changed unicode to str --- docs/api-guide/authentication.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/api-guide/authentication.md b/docs/api-guide/authentication.md index 5878040a4..da932a06c 100644 --- a/docs/api-guide/authentication.md +++ b/docs/api-guide/authentication.md @@ -60,8 +60,8 @@ using the `APIView` class-based views. def get(self, request, format=None): content = { - 'user': unicode(request.user), # `django.contrib.auth.User` instance. - 'auth': unicode(request.auth), # None + 'user': str(request.user), # `django.contrib.auth.User` instance. + 'auth': str(request.auth), # None } return Response(content) @@ -72,8 +72,8 @@ Or, if you're using the `@api_view` decorator with function based views. @permission_classes([IsAuthenticated]) def example_view(request, format=None): content = { - 'user': unicode(request.user), # `django.contrib.auth.User` instance. - 'auth': unicode(request.auth), # None + 'user': str(request.user), # `django.contrib.auth.User` instance. + 'auth': str(request.auth), # None } return Response(content) From bb133522efaf6ce3ae8fdf1dec6cd79566cfd166 Mon Sep 17 00:00:00 2001 From: Erwin Junge Date: Sun, 22 Nov 2020 09:33:17 +0100 Subject: [PATCH 057/303] Small documentation fix --- 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 fd5dbb0e6..f05fe7e7e 100644 --- a/docs/api-guide/serializers.md +++ b/docs/api-guide/serializers.md @@ -282,7 +282,7 @@ If a nested representation may optionally accept the `None` value you should pas content = serializers.CharField(max_length=200) created = serializers.DateTimeField() -Similarly if a nested representation should be a list of items, you should pass the `many=True` flag to the nested serialized. +Similarly if a nested representation should be a list of items, you should pass the `many=True` flag to the nested serializer. class CommentSerializer(serializers.Serializer): user = UserSerializer(required=False) From 8351747d98b97907e6bb096914bf287a22c5314b Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 21 Dec 2020 16:41:12 +0000 Subject: [PATCH 058/303] Update index.md --- docs/index.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/docs/index.md b/docs/index.md index 0273da9f1..0e6bb48f2 100644 --- a/docs/index.md +++ b/docs/index.md @@ -190,11 +190,6 @@ For support please see the [REST framework discussion group][group], try the `# 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. - - - - ## Security If you believe you’ve found something in Django REST framework which has security implications, please **do not raise the issue in a public forum**. From 3db88778893579e1d7609b584ef35409c8aa5a22 Mon Sep 17 00:00:00 2001 From: Adrian Coveney Date: Wed, 25 Jul 2018 10:53:43 +0100 Subject: [PATCH 059/303] Clarify documentation for TemplateHTMLRenderer Clarify that the response from a view may need to be modified to provide TemplateHTMLRenderer with a dict for it to use. --- docs/api-guide/renderers.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/docs/api-guide/renderers.md b/docs/api-guide/renderers.md index ca3a29b82..954fb3bb9 100644 --- a/docs/api-guide/renderers.md +++ b/docs/api-guide/renderers.md @@ -103,6 +103,16 @@ Unlike other renderers, the data passed to the `Response` does not need to be se The TemplateHTMLRenderer will create a `RequestContext`, using the `response.data` as the context dict, and determine a template name to use to render the context. +--- + +**Note:** When used with a view that makes use of a serializer the `Response` sent for rendering may not be a dictionay and will need to be wrapped in a dict before returning to allow the TemplateHTMLRenderer to render it. For example: + +``` +response.data = {'results': response.data} +``` + +--- + The template name is determined by (in order of preference): 1. An explicit `template_name` argument passed to the response. From 19655edbf782aa1fbdd7f8cd56ff9e0b7786ad3c Mon Sep 17 00:00:00 2001 From: Sebastian Jordan Date: Wed, 6 Jan 2021 14:13:34 +0100 Subject: [PATCH 060/303] Handle tuples same as lists in ValidationError detail context (#7647) --- rest_framework/exceptions.py | 6 ++++-- tests/test_validation_error.py | 10 ++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/rest_framework/exceptions.py b/rest_framework/exceptions.py index 943dcc88c..fee8f024f 100644 --- a/rest_framework/exceptions.py +++ b/rest_framework/exceptions.py @@ -20,7 +20,7 @@ def _get_error_details(data, default_code=None): Descend into a nested data structure, forcing any lazy translation strings or strings into `ErrorDetail`. """ - if isinstance(data, list): + if isinstance(data, (list, tuple)): ret = [ _get_error_details(item, default_code) for item in data ] @@ -150,7 +150,9 @@ class ValidationError(APIException): # For validation failures, we may collect many 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): + if isinstance(detail, tuple): + detail = list(detail) + elif not isinstance(detail, dict) and not isinstance(detail, list): detail = [detail] self.detail = _get_error_details(detail, code) diff --git a/tests/test_validation_error.py b/tests/test_validation_error.py index 562fe37e6..341c4342a 100644 --- a/tests/test_validation_error.py +++ b/tests/test_validation_error.py @@ -2,6 +2,7 @@ from django.test import TestCase from rest_framework import serializers, status from rest_framework.decorators import api_view +from rest_framework.exceptions import ValidationError from rest_framework.response import Response from rest_framework.settings import api_settings from rest_framework.test import APIRequestFactory @@ -99,3 +100,12 @@ class TestValidationErrorWithCodes(TestCase): response = view(request) assert response.status_code == status.HTTP_400_BAD_REQUEST assert response.data == self.expected_response_data + + +class TestValidationErrorConvertsTuplesToLists(TestCase): + def test_validation_error_details(self): + error = ValidationError(detail=('message1', 'message2')) + assert isinstance(error.detail, list) + assert len(error.detail) == 2 + assert str(error.detail[0]) == 'message1' + assert str(error.detail[1]) == 'message2' From 3e956df6eb7e3b645d334fec372ad7f8a487d765 Mon Sep 17 00:00:00 2001 From: Tonye Jack Date: Tue, 2 Feb 2021 20:54:21 -0500 Subject: [PATCH 061/303] Fixed test --- requirements/requirements-testing.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements/requirements-testing.txt b/requirements/requirements-testing.txt index ad246e857..99463560e 100644 --- a/requirements/requirements-testing.txt +++ b/requirements/requirements-testing.txt @@ -2,3 +2,4 @@ pytest>=5.4.1,<5.5 pytest-django>=3.9.0,<3.10 pytest-cov>=2.7.1 +six>=1.14.0 From 1ec0f86b585cd87e4b413aeaad1ecc947bacfef2 Mon Sep 17 00:00:00 2001 From: Asif Saif Uddin Date: Tue, 16 Feb 2021 18:17:29 +0600 Subject: [PATCH 062/303] Dj32 (#7713) adds django 3.2 line to the build matrix --- .gitignore | 2 ++ .travis.yml | 7 +++++-- tox.ini | 5 ++++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 41768084c..82e885ede 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,8 @@ *.db *~ .* +*.py.bak + /site/ /htmlcov/ diff --git a/.travis.yml b/.travis.yml index 7a820766e..f9f22336f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,18 +10,20 @@ matrix: - { python: "3.6", env: DJANGO=2.2 } - { python: "3.6", env: DJANGO=3.0 } - { python: "3.6", env: DJANGO=3.1 } - - { python: "3.6", env: DJANGO=master } + - { python: "3.6", env: DJANGO=3.2 } - { python: "3.7", env: DJANGO=2.2 } - { python: "3.7", env: DJANGO=3.0 } - { python: "3.7", env: DJANGO=3.1 } - - { python: "3.7", env: DJANGO=master } + - { python: "3.7", env: DJANGO=3.2 } - { python: "3.8", env: DJANGO=3.0 } - { python: "3.8", env: DJANGO=3.1 } + - { python: "3.8", env: DJANGO=3.2 } - { python: "3.8", env: DJANGO=master } - { python: "3.9", env: DJANGO=3.1 } + - { python: "3.9", env: DJANGO=3.2 } - { python: "3.9", env: DJANGO=master } - { python: "3.8", env: TOXENV=base } @@ -38,6 +40,7 @@ matrix: allow_failures: - env: DJANGO=master + - env: DJANGO=3.2 install: - pip install tox tox-travis diff --git a/tox.ini b/tox.ini index df6387d5e..544bab163 100644 --- a/tox.ini +++ b/tox.ini @@ -3,7 +3,8 @@ envlist = {py35,py36,py37}-django22, {py36,py37,py38}-django30, {py36,py37,py38,py39}-django31, - {py36,py37,py38,py39}-djangomaster, + {py36,py37,py38,py39}-django32, + {py38,py39}-djangomaster, base,dist,lint,docs, [travis:env] @@ -11,6 +12,7 @@ DJANGO = 2.2: django22 3.0: django30 3.1: django31 + 3.2: django32 master: djangomaster [testenv] @@ -23,6 +25,7 @@ deps = django22: Django>=2.2,<3.0 django30: Django>=3.0,<3.1 django31: Django>=3.1,<3.2 + django32: Django>=3.2a1,<4.0 djangomaster: https://github.com/django/django/archive/master.tar.gz -rrequirements/requirements-testing.txt -rrequirements/requirements-optionals.txt From 8f6d2d2f9c7d9bb91a2b894533c0233620fa360f Mon Sep 17 00:00:00 2001 From: Usoof Mansoor Date: Tue, 2 Mar 2021 11:26:31 +0400 Subject: [PATCH 063/303] Update docs link to Django OAuth Toolkit. (#7737) --- docs/api-guide/authentication.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/api-guide/authentication.md b/docs/api-guide/authentication.md index da932a06c..61687e642 100644 --- a/docs/api-guide/authentication.md +++ b/docs/api-guide/authentication.md @@ -357,7 +357,7 @@ The following third party packages are also available. ## Django OAuth Toolkit -The [Django OAuth Toolkit][django-oauth-toolkit] package provides OAuth 2.0 support and works with Python 3.4+. The package is maintained by [Evonove][evonove] and uses the excellent [OAuthLib][oauthlib]. The package is well documented, and well supported and is currently our **recommended package for OAuth 2.0 support**. +The [Django OAuth Toolkit][django-oauth-toolkit] package provides OAuth 2.0 support and works with Python 3.4+. The package is maintained by [jazzband][jazzband] and uses the excellent [OAuthLib][oauthlib]. The package is well documented, and well supported and is currently our **recommended package for OAuth 2.0 support**. #### Installation & configuration @@ -448,7 +448,7 @@ There are currently two forks of this project. [djangorestframework-digestauth]: https://github.com/juanriaza/django-rest-framework-digestauth [oauth-1.0a]: https://oauth.net/core/1.0a/ [django-oauth-toolkit]: https://github.com/evonove/django-oauth-toolkit -[evonove]: https://github.com/evonove/ +[jazzband]: https://github.com/jazzband/ [oauthlib]: https://github.com/idan/oauthlib [djangorestframework-simplejwt]: https://github.com/davesque/django-rest-framework-simplejwt [etoccalino]: https://github.com/etoccalino/ From de7468d0b4c48007aed734fee22db0b79b22e70b Mon Sep 17 00:00:00 2001 From: Jonathan Mortensen <56177725+jmo-qap@users.noreply.github.com> Date: Wed, 3 Mar 2021 03:15:39 -0800 Subject: [PATCH 064/303] support multi db atomic_requests (#7739) --- rest_framework/views.py | 8 ++++---- tests/conftest.py | 4 ++++ tests/test_atomic_requests.py | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 43 insertions(+), 4 deletions(-) diff --git a/rest_framework/views.py b/rest_framework/views.py index d1b5e4ed9..5b0622069 100644 --- a/rest_framework/views.py +++ b/rest_framework/views.py @@ -3,7 +3,7 @@ Provides an APIView class that is the base of all views in REST framework. """ from django.conf import settings from django.core.exceptions import PermissionDenied -from django.db import connection, models, transaction +from django.db import connections, models from django.http import Http404 from django.http.response import HttpResponseBase from django.utils.cache import cc_delim_re, patch_vary_headers @@ -63,9 +63,9 @@ def get_view_description(view, html=False): def set_rollback(): - atomic_requests = connection.settings_dict.get('ATOMIC_REQUESTS', False) - if atomic_requests and connection.in_atomic_block: - transaction.set_rollback(True) + for db in connections.all(): + if db.settings_dict['ATOMIC_REQUESTS'] and db.in_atomic_block: + db.set_rollback(True) def exception_handler(exc, context): diff --git a/tests/conftest.py b/tests/conftest.py index ac29e4a42..cc32cc637 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -24,6 +24,10 @@ def pytest_configure(config): 'default': { 'ENGINE': 'django.db.backends.sqlite3', 'NAME': ':memory:' + }, + 'secondary': { + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': ':memory:' } }, SITE_ID=1, diff --git a/tests/test_atomic_requests.py b/tests/test_atomic_requests.py index 15b41e02f..beda5cba1 100644 --- a/tests/test_atomic_requests.py +++ b/tests/test_atomic_requests.py @@ -130,6 +130,41 @@ class DBTransactionAPIExceptionTests(TestCase): assert BasicModel.objects.count() == 0 +@unittest.skipUnless( + connection.features.uses_savepoints, + "'atomic' requires transactions and savepoints." +) +class MultiDBTransactionAPIExceptionTests(TestCase): + databases = '__all__' + + def setUp(self): + self.view = APIExceptionView.as_view() + connections.databases['default']['ATOMIC_REQUESTS'] = True + connections.databases['secondary']['ATOMIC_REQUESTS'] = True + + def tearDown(self): + connections.databases['default']['ATOMIC_REQUESTS'] = False + connections.databases['secondary']['ATOMIC_REQUESTS'] = False + + def test_api_exception_rollback_transaction(self): + """ + Transaction is rollbacked by our transaction atomic block. + """ + request = factory.post('/') + num_queries = 4 if connection.features.can_release_savepoints else 3 + with self.assertNumQueries(num_queries): + # 1 - begin savepoint + # 2 - insert + # 3 - rollback savepoint + # 4 - release savepoint + with transaction.atomic(), transaction.atomic(using='secondary'): + response = self.view(request) + assert transaction.get_rollback() + assert transaction.get_rollback(using='secondary') + assert response.status_code == status.HTTP_500_INTERNAL_SERVER_ERROR + assert BasicModel.objects.count() == 0 + + @unittest.skipUnless( connection.features.uses_savepoints, "'atomic' requires transactions and savepoints." From 1deb8ae370df6c65b6ec3fadf71d9391236be06f Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 3 Mar 2021 15:06:42 +0000 Subject: [PATCH 065/303] Update FUNDING.yml --- .github/FUNDING.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index d7c23d635..5a830ca53 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1 +1,2 @@ +github: encode custom: https://fund.django-rest-framework.org/topics/funding/ From 344235ab371dcd80e2ff2546bf673d586cde4310 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 3 Mar 2021 15:32:19 +0000 Subject: [PATCH 066/303] Create config.yml --- .github/ISSUE_TEMPLATE/config.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/config.yml diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 000000000..8bb8d8c21 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1,5 @@ +contact_links: +- name: Discussions + url: https://github.com/encode/django-rest-framework/discussions + about: > + The "Discussions" forum is where you want to be headed too. Please only raise an issue if you've been advised to do so after discussion. Thank you! 🙏 From c9a00bdb2c0838f17e9a64f6ccab69d14d8ea6e7 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 3 Mar 2021 15:33:14 +0000 Subject: [PATCH 067/303] Update config.yml --- .github/ISSUE_TEMPLATE/config.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 8bb8d8c21..fd0db4d66 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -2,4 +2,6 @@ contact_links: - name: Discussions url: https://github.com/encode/django-rest-framework/discussions about: > - The "Discussions" forum is where you want to be headed too. Please only raise an issue if you've been advised to do so after discussion. Thank you! 🙏 + The "Discussions" forum is where you want to be headed too. + Please only raise an issue if you've been advised to do so after discussion. + Thank you! 🙏 From db0bb5ef42879a69e7262aebf0f42ce173248a61 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 3 Mar 2021 15:39:22 +0000 Subject: [PATCH 068/303] Update config.yml --- .github/ISSUE_TEMPLATE/config.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index fd0db4d66..bf0c054a6 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -2,6 +2,4 @@ contact_links: - name: Discussions url: https://github.com/encode/django-rest-framework/discussions about: > - The "Discussions" forum is where you want to be headed too. - Please only raise an issue if you've been advised to do so after discussion. - Thank you! 🙏 + The "Discussions" forum is where you want to start. 💖 From 37b8d2018d4dbe2efc012f23baff1cca4df15675 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 3 Mar 2021 15:42:38 +0000 Subject: [PATCH 069/303] Create 1-issue.md --- .github/ISSUE_TEMPLATE/1-issue.md | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/1-issue.md diff --git a/.github/ISSUE_TEMPLATE/1-issue.md b/.github/ISSUE_TEMPLATE/1-issue.md new file mode 100644 index 000000000..0da154953 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/1-issue.md @@ -0,0 +1,10 @@ +--- +name: Issue +about: Please only raise an issue if you've been advised to do so after discussion. Thanks! 🙏 +--- + +## Checklist + +- [ ] Raised initially as discussion #... +- [ ] This cannot be dealt with as a third party library. (We prefer new functionality to be [in the form of third party libraries](https://www.django-rest-framework.org/community/third-party-packages/#about-third-party-packages) where possible.) +- [ ] I have reduced the issue to the simplest possible case. From ee51145574c9d868baab87a65ac18878dee4ee12 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 3 Mar 2021 15:43:57 +0000 Subject: [PATCH 070/303] Update config.yml --- .github/ISSUE_TEMPLATE/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index bf0c054a6..382fc521a 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,3 +1,4 @@ +blank_issues_enabled: false contact_links: - name: Discussions url: https://github.com/encode/django-rest-framework/discussions From ec29ff8a8013dd3383344bb78eea479d025e2a87 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 3 Mar 2021 15:45:40 +0000 Subject: [PATCH 071/303] Delete ISSUE_TEMPLATE.md --- ISSUE_TEMPLATE.md | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 ISSUE_TEMPLATE.md diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md deleted file mode 100644 index 566bf9543..000000000 --- a/ISSUE_TEMPLATE.md +++ /dev/null @@ -1,14 +0,0 @@ -## Checklist - -- [ ] I have verified that that issue exists against the `master` branch of Django REST framework. -- [ ] I have searched for similar issues in both open and closed tickets and cannot find a duplicate. -- [ ] This is not a usage question. (Those should be directed to the [discussion group](https://groups.google.com/forum/#!forum/django-rest-framework) instead.) -- [ ] This cannot be dealt with as a third party library. (We prefer new functionality to be [in the form of third party libraries](https://www.django-rest-framework.org/community/third-party-packages/#about-third-party-packages) where possible.) -- [ ] I have reduced the issue to the simplest possible case. -- [ ] I have included a failing test as a pull request. (If you are unable to do so we can still accept the issue.) - -## Steps to reproduce - -## Expected behavior - -## Actual behavior From ef112f5017bb6d3d6a331ff485dbf6a9209fb8b4 Mon Sep 17 00:00:00 2001 From: arcanemachine Date: Mon, 8 Mar 2021 04:46:35 -0700 Subject: [PATCH 072/303] Provide example for dict in ValidationError detail (#7788) Added a sentence describing the use of a dictionary as the `detail` argument of a ValidationError, and how it can be used to add field-level errors during object-level validation. --- 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 fbf3097e0..e62a7e4f9 100644 --- a/docs/api-guide/exceptions.md +++ b/docs/api-guide/exceptions.md @@ -222,7 +222,7 @@ By default this exception results in a response with the HTTP status code "429 T The `ValidationError` exception is slightly different from the other `APIException` classes: * The `detail` argument is mandatory, not optional. -* The `detail` argument may be a list or dictionary of error details, and may also be a nested data structure. +* The `detail` argument may be a list or dictionary of error details, and may also be a nested data structure. By using a dictionary, you can specify field-level errors while performing object-level validation in the `validate()` method of a serializer. For example. `raise serializers.ValidationError({'name': 'Please enter a valid name.'})` * By convention you should import the serializers module and use a fully qualified `ValidationError` style, in order to differentiate it from Django's built-in validation error. For example. `raise serializers.ValidationError('This field must be an integer value.')` The `ValidationError` class should be used for serializer and field validation, and by validator classes. It is also raised when calling `serializer.is_valid` with the `raise_exception` keyword argument: From 234527959d5ad6eef2bc0f8af1aa2e149fc8bc60 Mon Sep 17 00:00:00 2001 From: Jean-Pierre Merx Date: Mon, 8 Mar 2021 13:08:26 +0100 Subject: [PATCH 073/303] Have options example in documenting-your-api.md to return a Response (#7639) It was returning data which is not correct. Closes #7638. Co-authored-by: Jean-Pierre Merx --- docs/topics/documenting-your-api.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/topics/documenting-your-api.md b/docs/topics/documenting-your-api.md index cd7e5098f..5eabeee7b 100644 --- a/docs/topics/documenting-your-api.md +++ b/docs/topics/documenting-your-api.md @@ -202,7 +202,7 @@ You can modify the response behavior to `OPTIONS` requests by overriding the `op meta = self.metadata_class() data = meta.determine_metadata(request, self) data.pop('description') - return data + return Response(data=data, status=status.HTTP_200_OK) See [the Metadata docs][metadata-docs] for more details. From e32ebc41998ffd7f22f6e691badb86a709c89ba7 Mon Sep 17 00:00:00 2001 From: Alex Cotsarelis <57880995+alex-cots@users.noreply.github.com> Date: Mon, 8 Mar 2021 07:09:17 -0500 Subject: [PATCH 074/303] Docs: DjangoModelPermissions works on views with get_queryset() method. (#7693) Sentinel querysets not needed after v3.1.2 --- docs/api-guide/permissions.md | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/docs/api-guide/permissions.md b/docs/api-guide/permissions.md index ade146257..f694d6be5 100644 --- a/docs/api-guide/permissions.md +++ b/docs/api-guide/permissions.md @@ -169,7 +169,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 have 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 or `get_queryset()` method. 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. @@ -179,12 +179,6 @@ The default behaviour can also be overridden to support custom model permissions To use custom model permissions, override `DjangoModelPermissions` and set the `.perms_map` property. Refer to the source code for details. -#### 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 sentinel queryset, so that this class can determine the required permissions. For example: - - queryset = User.objects.none() # Required for DjangoModelPermissions - ## DjangoModelPermissionsOrAnonReadOnly Similar to `DjangoModelPermissions`, but also allows unauthenticated users to have read-only access to the API. From b463878132004d33182b2f61be8209bfad79af7f Mon Sep 17 00:00:00 2001 From: Igor Polyakov Date: Tue, 9 Mar 2021 17:16:19 +0700 Subject: [PATCH 075/303] Commas added in README (#7730) To make it more comfortable for users to copy and paste snippets --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 8af1466f8..305f92389 100644 --- a/README.md +++ b/README.md @@ -113,7 +113,7 @@ router.register(r'users', UserViewSet) # Additionally, we include login URLs for the browsable API. urlpatterns = [ path('', include(router.urls)), - path('api-auth/', include('rest_framework.urls', namespace='rest_framework')) + path('api-auth/', include('rest_framework.urls', namespace='rest_framework')), ] ``` @@ -131,7 +131,7 @@ REST_FRAMEWORK = { # Use Django's standard `django.contrib.auth` permissions, # or allow read-only access for unauthenticated users. 'DEFAULT_PERMISSION_CLASSES': [ - 'rest_framework.permissions.DjangoModelPermissionsOrAnonReadOnly' + 'rest_framework.permissions.DjangoModelPermissionsOrAnonReadOnly', ] } ``` From e9a54e38e1c864919c79a8b88d83b8d61d477053 Mon Sep 17 00:00:00 2001 From: kuter Date: Tue, 9 Mar 2021 11:17:30 +0100 Subject: [PATCH 076/303] add support for Yes/No literals with BooleanField (#7701) --- 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 fdfba13f2..b6c9ee5c5 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -704,7 +704,7 @@ class BooleanField(Field): initial = False TRUE_VALUES = { 't', 'T', - 'y', 'Y', 'yes', 'YES', + 'y', 'Y', 'yes', 'Yes', 'YES', 'true', 'True', 'TRUE', 'on', 'On', 'ON', '1', 1, @@ -712,7 +712,7 @@ class BooleanField(Field): } FALSE_VALUES = { 'f', 'F', - 'n', 'N', 'no', 'NO', + 'n', 'N', 'no', 'No', 'NO', 'false', 'False', 'FALSE', 'off', 'Off', 'OFF', '0', 0, 0.0, From 393f8679952b3e81b56db3e3c498aeb1f8849f52 Mon Sep 17 00:00:00 2001 From: Cas Ebbers <617080+CasEbbers@users.noreply.github.com> Date: Tue, 9 Mar 2021 11:21:11 +0100 Subject: [PATCH 077/303] Overlooked translation in search.html (#7551) --- rest_framework/templates/rest_framework/filters/search.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/templates/rest_framework/filters/search.html b/rest_framework/templates/rest_framework/filters/search.html index edb28d45d..065c3889a 100644 --- a/rest_framework/templates/rest_framework/filters/search.html +++ b/rest_framework/templates/rest_framework/filters/search.html @@ -5,7 +5,7 @@
- +
From a89a6427d3af7045c8c35693cc830c8b76b8a00d Mon Sep 17 00:00:00 2001 From: Nathan Glover <15344788+nathanglover@users.noreply.github.com> Date: Tue, 9 Mar 2021 05:22:37 -0500 Subject: [PATCH 078/303] #7703 adding deprecations to release notes (#7716) * #7703 adding deprecations to release notes * #7703 - update link for gh6687 --- docs/community/release-notes.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/community/release-notes.md b/docs/community/release-notes.md index c981b9ac9..49fb655b0 100644 --- a/docs/community/release-notes.md +++ b/docs/community/release-notes.md @@ -177,6 +177,8 @@ Date: 28th September 2020 * Don't strict disallow redundant `SerializerMethodField` field name arguments. * Don't render extra actions in browable API if not authenticated. * Strip null characters from search parameters. +* Deprecate the `detail_route` decorator in favor of `action`, which accepts a `detail` bool. Use `@action(detail=True)` instead. [gh6687] +* Deprecate the `list_route` decorator in favor of `action`, which accepts a `detail` bool. Use `@action(detail=False)` instead. [gh6687] ## 3.9.x series @@ -2270,6 +2272,7 @@ For older release notes, [please see the version 2.x documentation][old-release- [gh6680]: https://github.com/encode/django-rest-framework/issues/6680 [gh6317]: https://github.com/encode/django-rest-framework/issues/6317 +[gh6687]: https://github.com/encode/django-rest-framework/issues/6687 [gh6892]: https://github.com/encode/django-rest-framework/issues/6892 From 05512160abb4c2110afff9e82f8f523be68476cf Mon Sep 17 00:00:00 2001 From: David Kerkeslager Date: Tue, 9 Mar 2021 05:49:03 -0500 Subject: [PATCH 079/303] Respect allow_null=True on DecimalFields (#7718) * Handle None in to_representation() * Return None as '' in to_representation() when coerce_to_string=True * Handle '' as None in to_internal_value(), for symmetry with to_representation(), and because the empty concept doesn't make sense for Decimal. --- rest_framework/fields.py | 9 +++++++++ tests/test_fields.py | 29 +++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index b6c9ee5c5..d91299484 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -1063,6 +1063,9 @@ class DecimalField(Field): try: value = decimal.Decimal(data) except decimal.DecimalException: + if data == '' and self.allow_null: + return None + self.fail('invalid') if value.is_nan(): @@ -1112,6 +1115,12 @@ class DecimalField(Field): def to_representation(self, value): coerce_to_string = getattr(self, 'coerce_to_string', api_settings.COERCE_DECIMAL_TO_STRING) + if value is None: + if coerce_to_string: + return '' + else: + return None + if not isinstance(value, decimal.Decimal): value = decimal.Decimal(str(value).strip()) diff --git a/tests/test_fields.py b/tests/test_fields.py index fdd570d8a..5842553f0 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -1090,6 +1090,9 @@ class TestDecimalField(FieldValues): '2E+1': Decimal('20'), } invalid_inputs = ( + (None, ["This field may not be null."]), + ('', ["A valid number is required."]), + (' ', ["A valid number is required."]), ('abc', ["A valid number is required."]), (Decimal('Nan'), ["A valid number is required."]), (Decimal('Snan'), ["A valid number is required."]), @@ -1115,6 +1118,32 @@ class TestDecimalField(FieldValues): field = serializers.DecimalField(max_digits=3, decimal_places=1) +class TestAllowNullDecimalField(FieldValues): + valid_inputs = { + None: None, + '': None, + ' ': None, + } + invalid_inputs = {} + outputs = { + None: '', + } + field = serializers.DecimalField(max_digits=3, decimal_places=1, allow_null=True) + + +class TestAllowNullNoStringCoercionDecimalField(FieldValues): + valid_inputs = { + None: None, + '': None, + ' ': None, + } + invalid_inputs = {} + outputs = { + None: None, + } + field = serializers.DecimalField(max_digits=3, decimal_places=1, allow_null=True, coerce_to_string=False) + + class TestMinMaxDecimalField(FieldValues): """ Valid and invalid values for `DecimalField` with min and max limits. From 95ae92ef23859b45d03bcc2facf04fab0acee09d Mon Sep 17 00:00:00 2001 From: Berkant Date: Tue, 9 Mar 2021 14:34:18 +0300 Subject: [PATCH 080/303] Fix #7706 (#7724) Handle non-dict values for NestedSerializer during BrowsableAPI rendering. --- rest_framework/utils/serializer_helpers.py | 4 ++-- tests/test_bound_fields.py | 27 ++++++++++++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/rest_framework/utils/serializer_helpers.py b/rest_framework/utils/serializer_helpers.py index b18fbe0df..cd0373adc 100644 --- a/rest_framework/utils/serializer_helpers.py +++ b/rest_framework/utils/serializer_helpers.py @@ -1,5 +1,5 @@ from collections import OrderedDict -from collections.abc import MutableMapping +from collections.abc import Mapping, MutableMapping from django.utils.encoding import force_str @@ -101,7 +101,7 @@ class NestedBoundField(BoundField): """ def __init__(self, field, value, errors, prefix=''): - if value is None or value == '': + if value is None or value == '' or not isinstance(value, Mapping): value = {} super().__init__(field, value, errors, prefix) diff --git a/tests/test_bound_fields.py b/tests/test_bound_fields.py index dc5ab542f..dec8793c3 100644 --- a/tests/test_bound_fields.py +++ b/tests/test_bound_fields.py @@ -163,6 +163,33 @@ class TestNestedBoundField: rendered_packed = ''.join(rendered.split()) assert rendered_packed == expected_packed + def test_rendering_nested_fields_with_not_mappable_value(self): + from rest_framework.renderers import HTMLFormRenderer + + class Nested(serializers.Serializer): + text_field = serializers.CharField() + + class ExampleSerializer(serializers.Serializer): + nested = Nested() + + serializer = ExampleSerializer(data={'nested': 1}) + assert not serializer.is_valid() + renderer = HTMLFormRenderer() + for field in serializer: + rendered = renderer.render_field(field, {}) + expected_packed = ( + '
' + 'Nested' + '' + '' + '' + '' + '
' + ) + + rendered_packed = ''.join(rendered.split()) + assert rendered_packed == expected_packed + class TestJSONBoundField: def test_as_form_fields(self): From 82b8a64a02ccc4ff678ac9f9565f25463ecad871 Mon Sep 17 00:00:00 2001 From: Chris Guo <41265033+chrisguox@users.noreply.github.com> Date: Tue, 9 Mar 2021 19:49:19 +0800 Subject: [PATCH 081/303] docs: add example for caching (#7118) --- docs/api-guide/caching.md | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/docs/api-guide/caching.md b/docs/api-guide/caching.md index 96517b15e..ab4f82cd2 100644 --- a/docs/api-guide/caching.md +++ b/docs/api-guide/caching.md @@ -13,13 +13,13 @@ provided in Django. Django provides a [`method_decorator`][decorator] to use decorators with class based views. This can be used with -other cache decorators such as [`cache_page`][page] and -[`vary_on_cookie`][cookie]. +other cache decorators such as [`cache_page`][page], +[`vary_on_cookie`][cookie] and [`vary_on_headers`][headers]. ```python from django.utils.decorators import method_decorator from django.views.decorators.cache import cache_page -from django.views.decorators.vary import vary_on_cookie +from django.views.decorators.vary import vary_on_cookie, vary_on_headers from rest_framework.response import Response from rest_framework.views import APIView @@ -27,8 +27,7 @@ from rest_framework import viewsets class UserViewSet(viewsets.ViewSet): - - # Cache requested url for each user for 2 hours + # With cookie: cache requested url for each user for 2 hours @method_decorator(cache_page(60*60*2)) @method_decorator(vary_on_cookie) def list(self, request, format=None): @@ -38,8 +37,18 @@ class UserViewSet(viewsets.ViewSet): return Response(content) -class PostView(APIView): +class ProfileView(APIView): + # With auth: cache requested url for each user for 2 hours + @method_decorator(cache_page(60*60*2)) + @method_decorator(vary_on_headers("Authorization",)) + def get(self, request, format=None): + content = { + 'user_feed': request.user.get_user_feed() + } + return Response(content) + +class PostView(APIView): # Cache page for the requested url @method_decorator(cache_page(60*60*2)) def get(self, request, format=None): @@ -55,4 +64,5 @@ class PostView(APIView): [page]: https://docs.djangoproject.com/en/dev/topics/cache/#the-per-view-cache [cookie]: https://docs.djangoproject.com/en/dev/topics/http/decorators/#django.views.decorators.vary.vary_on_cookie +[headers]: https://docs.djangoproject.com/en/dev/topics/http/decorators/#django.views.decorators.vary.vary_on_headers [decorator]: https://docs.djangoproject.com/en/dev/topics/class-based-views/intro/#decorating-the-class From 747fef6134539c8ce9042b38639459c59e0440a5 Mon Sep 17 00:00:00 2001 From: Celia Oakley Date: Tue, 9 Mar 2021 22:51:52 +1100 Subject: [PATCH 082/303] Add django-rest-authemail to Third Party Packages (#7679) * Add django-rest-authemail to Authentication * Add django-rest-authemail to Third Party Packages --- docs/api-guide/authentication.md | 5 +++++ docs/community/third-party-packages.md | 2 ++ 2 files changed, 7 insertions(+) diff --git a/docs/api-guide/authentication.md b/docs/api-guide/authentication.md index 61687e642..d13c5a2f0 100644 --- a/docs/api-guide/authentication.md +++ b/docs/api-guide/authentication.md @@ -432,6 +432,10 @@ There are currently two forks of this project. [drfpasswordless][drfpasswordless] adds (Medium, Square Cash inspired) passwordless support to Django REST Framework's own TokenAuthentication scheme. Users log in and sign up with a token sent to a contact point like an email address or a mobile number. +## django-rest-authemail + +[django-rest-authemail][django-rest-authemail] provides a RESTful API interface for user signup and authentication. Email addresses are used for authentication, rather than usernames. API endpoints are available for signup, signup email verification, login, logout, password reset, password reset verification, email change, email change verification, password change, and user detail. A fully-functional example project and detailed instructions are included. + [cite]: https://jacobian.org/writing/rest-worst-practices/ [http401]: https://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html#sec10.4.2 [http403]: https://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html#sec10.4.4 @@ -466,3 +470,4 @@ There are currently two forks of this project. [django-rest-framework-social-oauth2]: https://github.com/PhilipGarnero/django-rest-framework-social-oauth2 [django-rest-knox]: https://github.com/James1345/django-rest-knox [drfpasswordless]: https://github.com/aaronn/django-rest-framework-passwordless +[django-rest-authemail]: https://github.com/celiao/django-rest-authemail diff --git a/docs/community/third-party-packages.md b/docs/community/third-party-packages.md index d4359890d..88836cfc6 100644 --- a/docs/community/third-party-packages.md +++ b/docs/community/third-party-packages.md @@ -190,6 +190,7 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque * [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. * [drfpasswordless][drfpasswordless] - Adds (Medium, Square Cash inspired) passwordless logins and signups via email and mobile numbers. +* [django-rest-authemail][django-rest-authemail] - Provides a RESTful API for user signup and authentication using email addresses. ### Permissions @@ -362,3 +363,4 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque [django-elasticsearch-dsl-drf]: https://github.com/barseghyanartur/django-elasticsearch-dsl-drf [django-api-client]: https://github.com/rhenter/django-api-client [drf-psq]: https://github.com/drf-psq/drf-psq +[django-rest-authemail]: https://github.com/celiao/django-rest-authemail From 4e0d6c411805743688bd25a2ad8021441a1ae1ac Mon Sep 17 00:00:00 2001 From: Vitor Hugo Date: Tue, 9 Mar 2021 08:54:58 -0300 Subject: [PATCH 083/303] Update default.css (#7643) When I apply a theme to the bootstrap used in the project, boolean inputs are out of line with the rest of the form. With this small payment, this no longer occurs. --- rest_framework/static/rest_framework/css/default.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/static/rest_framework/css/default.css b/rest_framework/static/rest_framework/css/default.css index 86fef1773..51ca3ba19 100644 --- a/rest_framework/static/rest_framework/css/default.css +++ b/rest_framework/static/rest_framework/css/default.css @@ -40,7 +40,7 @@ td.nested > table { margin: 0; } -form select, form input, form textarea { +form select, form input:not([type=checkbox]), form textarea { width: 90%; } From 750bad0a58bdec85fa5a630a519277bac3b36535 Mon Sep 17 00:00:00 2001 From: Romain Rigaux Date: Tue, 9 Mar 2021 04:00:51 -0800 Subject: [PATCH 084/303] Actually use the loginUser arguments in the example (#7714) --- docs/topics/api-clients.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/topics/api-clients.md b/docs/topics/api-clients.md index 9b61eaf42..b9f5e3ecd 100644 --- a/docs/topics/api-clients.md +++ b/docs/topics/api-clients.md @@ -453,7 +453,7 @@ For example, using the "Django REST framework JWT" package function loginUser(username, password) { let action = ["api-token-auth", "obtain-token"]; - let params = {username: "example", email: "example@example.com"}; + let params = {username: username, password: password}; client.action(schema, action, params).then(function(result) { // On success, instantiate an authenticated client. let auth = window.coreapi.auth.TokenAuthentication({ From a3ae8ea77efa2fa9af69da5dfda9128ef94c0fde Mon Sep 17 00:00:00 2001 From: Dmitry Mugtasimov Date: Tue, 9 Mar 2021 15:06:12 +0300 Subject: [PATCH 085/303] Do not do `SELECT count(*) FROM ...` if pagination is not requested (#6098) * Do not do `SELECT count(*) FROM ...` if pagination is not requested * Update pagination.py Co-authored-by: Tom Christie --- rest_framework/pagination.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py index 60a57c8e4..4db646116 100644 --- a/rest_framework/pagination.py +++ b/rest_framework/pagination.py @@ -376,11 +376,11 @@ class LimitOffsetPagination(BasePagination): template = 'rest_framework/pagination/numbers.html' def paginate_queryset(self, queryset, request, view=None): - self.count = self.get_count(queryset) self.limit = self.get_limit(request) if self.limit is None: return None + self.count = self.get_count(queryset) self.offset = self.get_offset(request) self.request = request if self.count > self.limit and self.template is not None: From c69e2e4eaafd7270565f0ecab7635f8988bc0f6d Mon Sep 17 00:00:00 2001 From: PaulGilmartin Date: Wed, 10 Mar 2021 10:02:38 +0100 Subject: [PATCH 086/303] Add graphwrap to third-party-packages.md (#7819) * Add graphwrap to third-party-packages documentation * Fix typo in third party packages docs * Remove additional newline Co-authored-by: Paul Gilmartin Co-authored-by: Tom Christie --- docs/community/third-party-packages.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/community/third-party-packages.md b/docs/community/third-party-packages.md index 88836cfc6..93ed3e2ca 100644 --- a/docs/community/third-party-packages.md +++ b/docs/community/third-party-packages.md @@ -215,6 +215,7 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque * [drf-action-serializer][drf-action-serializer] - Serializer providing per-action fields config for use with ViewSets to prevent having to write multiple serializers. * [djangorestframework-dataclasses][djangorestframework-dataclasses] - Serializer providing automatic field generation for Python dataclasses, like the built-in ModelSerializer does for models. * [django-restql][django-restql] - Turn your REST API into a GraphQL like API(It allows clients to control which fields will be sent in a response, uses GraphQL like syntax, supports read and write on both flat and nested fields). +* [graphwrap][graphwrap] - Transform your REST API into a fully compliant GraphQL API with just two lines of code. Leverages [Graphene-Django](https://docs.graphene-python.org/projects/django/en/latest/) to dynamically build, at runtime, a GraphQL ObjectType for each view in your API. ### Serializer fields @@ -364,3 +365,4 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque [django-api-client]: https://github.com/rhenter/django-api-client [drf-psq]: https://github.com/drf-psq/drf-psq [django-rest-authemail]: https://github.com/celiao/django-rest-authemail +[graphwrap]: https://github.com/PaulGilmartin/graph_wrap From c603b98403e05070e01852f18fa5b11b11e366c8 Mon Sep 17 00:00:00 2001 From: Pierre Chiquet Date: Wed, 10 Mar 2021 13:03:15 +0100 Subject: [PATCH 087/303] Fix OpenAPISchema rendering for timedelta (#7641) * Add failing test when rendering to json a schema with timedelta * Fix JSONOpenAPIRenderer for fields with default=timedelta() * fix isort * fix test for python 3.5 Co-authored-by: Pierre Chiquet --- rest_framework/renderers.py | 3 ++- tests/schemas/test_openapi.py | 16 +++++++++++++++- tests/schemas/views.py | 2 ++ 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index 3c4be8aeb..5b7ba8a8c 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -1063,7 +1063,8 @@ class OpenAPIRenderer(BaseRenderer): class JSONOpenAPIRenderer(BaseRenderer): media_type = 'application/vnd.oai.openapi+json' charset = None + encoder_class = encoders.JSONEncoder format = 'openapi-json' def render(self, data, media_type=None, renderer_context=None): - return json.dumps(data, indent=2).encode('utf-8') + return json.dumps(data, cls=self.encoder_class, indent=2).encode('utf-8') diff --git a/tests/schemas/test_openapi.py b/tests/schemas/test_openapi.py index 542c377b1..871eb1b30 100644 --- a/tests/schemas/test_openapi.py +++ b/tests/schemas/test_openapi.py @@ -11,7 +11,8 @@ from rest_framework.authtoken.views import obtain_auth_token from rest_framework.compat import uritemplate from rest_framework.parsers import JSONParser, MultiPartParser from rest_framework.renderers import ( - BaseRenderer, BrowsableAPIRenderer, JSONRenderer, OpenAPIRenderer + BaseRenderer, BrowsableAPIRenderer, JSONOpenAPIRenderer, JSONRenderer, + OpenAPIRenderer ) from rest_framework.request import Request from rest_framework.schemas.openapi import AutoSchema, SchemaGenerator @@ -992,6 +993,19 @@ class TestGenerator(TestCase): assert 'openapi' in schema assert 'paths' in schema + def test_schema_rendering_to_json(self): + patterns = [ + path('example/', views.ExampleGenericAPIView.as_view()), + ] + generator = SchemaGenerator(patterns=patterns) + + request = create_request('/') + schema = generator.get_schema(request=request) + ret = JSONOpenAPIRenderer().render(schema) + + assert b'"openapi": "' in ret + assert b'"default": "0.0"' in ret + def test_schema_with_no_paths(self): patterns = [] generator = SchemaGenerator(patterns=patterns) diff --git a/tests/schemas/views.py b/tests/schemas/views.py index 18b3beae4..f1ed0bd4e 100644 --- a/tests/schemas/views.py +++ b/tests/schemas/views.py @@ -1,4 +1,5 @@ import uuid +from datetime import timedelta from django.core.validators import ( DecimalValidator, MaxLengthValidator, MaxValueValidator, @@ -59,6 +60,7 @@ class DocStringExampleDetailView(APIView): class ExampleSerializer(serializers.Serializer): date = serializers.DateField() datetime = serializers.DateTimeField() + duration = serializers.DurationField(default=timedelta()) hstore = serializers.HStoreField() uuid_field = serializers.UUIDField(default=uuid.uuid4) From 6f6d402d043acb6400736f882c6a48e3c7e773f4 Mon Sep 17 00:00:00 2001 From: sarath ak Date: Wed, 10 Mar 2021 18:02:10 +0530 Subject: [PATCH 088/303] Allow 'get_page' method for overriding #7626 (#7652) --- rest_framework/pagination.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py index 4db646116..0f0aa9ccf 100644 --- a/rest_framework/pagination.py +++ b/rest_framework/pagination.py @@ -198,7 +198,7 @@ class PageNumberPagination(BasePagination): return None paginator = self.django_paginator_class(queryset, page_size) - page_number = request.query_params.get(self.page_query_param, 1) + page_number = self.get_page_number(request) if page_number in self.last_page_strings: page_number = paginator.num_pages @@ -217,6 +217,9 @@ class PageNumberPagination(BasePagination): self.request = request return list(self.page) + def get_page_number(self, request): + return request.query_params.get(self.page_query_param, 1) + def get_paginated_response(self, data): return Response(OrderedDict([ ('count', self.page.paginator.count), From cef74d1726a73991e6805c1bf31ec7464dc738d1 Mon Sep 17 00:00:00 2001 From: John Alexis Munera Date: Wed, 10 Mar 2021 07:37:06 -0500 Subject: [PATCH 089/303] Add rest-framework-actions to Third Party Packages (#7688) This pull request adds rest-framework-actions to Third Party Packages, under Views rest-framework-actions can be found on PyPi here: https://pypi.org/project/rest-framework-actions/ Co-authored-by: Tom Christie --- docs/community/third-party-packages.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/community/third-party-packages.md b/docs/community/third-party-packages.md index 93ed3e2ca..838122cbe 100644 --- a/docs/community/third-party-packages.md +++ b/docs/community/third-party-packages.md @@ -227,6 +227,7 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque * [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. * [drf-typed-views][drf-typed-views] - Use Python type annotations to validate/deserialize request parameters. Inspired by API Star, Hug and FastAPI. +* [rest-framework-actions][rest-framework-actions] - Provides control over each action in ViewSets. Serializers per action, method. ### Routers @@ -366,3 +367,4 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque [drf-psq]: https://github.com/drf-psq/drf-psq [django-rest-authemail]: https://github.com/celiao/django-rest-authemail [graphwrap]: https://github.com/PaulGilmartin/graph_wrap +[rest-framework-actions]: https://github.com/AlexisMunera98/rest-framework-actions From 4f3cd8c7b0495276e7dc99cc06a1069082a37f9d Mon Sep 17 00:00:00 2001 From: Eshaan Bansal Date: Wed, 10 Mar 2021 18:10:45 +0530 Subject: [PATCH 090/303] add django-rest-durin to 3rd party auth libs [docs] (#7615) Co-authored-by: Tom Christie --- docs/api-guide/authentication.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docs/api-guide/authentication.md b/docs/api-guide/authentication.md index d13c5a2f0..4497f73bd 100644 --- a/docs/api-guide/authentication.md +++ b/docs/api-guide/authentication.md @@ -436,6 +436,12 @@ There are currently two forks of this project. [django-rest-authemail][django-rest-authemail] provides a RESTful API interface for user signup and authentication. Email addresses are used for authentication, rather than usernames. API endpoints are available for signup, signup email verification, login, logout, password reset, password reset verification, email change, email change verification, password change, and user detail. A fully-functional example project and detailed instructions are included. +## Django-Rest-Durin + +[Django-Rest-Durin][django-rest-durin] is built with the idea to have one library that does token auth for multiple Web/CLI/Mobile API clients via one interface but allows different token configuration for each API Client that consumes the API. It provides support for multiple tokens per user via custom models, views, permissions that work with Django-Rest-Framework. The token expiration time can be different per API client and is customizable via the Django Admin Interface. + +More information can be found in the [Documentation](https://django-rest-durin.readthedocs.io/en/latest/index.html). + [cite]: https://jacobian.org/writing/rest-worst-practices/ [http401]: https://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html#sec10.4.2 [http403]: https://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html#sec10.4.4 @@ -471,3 +477,4 @@ There are currently two forks of this project. [django-rest-knox]: https://github.com/James1345/django-rest-knox [drfpasswordless]: https://github.com/aaronn/django-rest-framework-passwordless [django-rest-authemail]: https://github.com/celiao/django-rest-authemail +[django-rest-durin]: https://github.com/eshaan7/django-rest-durin From c78f99217673fbcdca23627817909d6419be0175 Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Wed, 10 Mar 2021 07:44:17 -0500 Subject: [PATCH 091/303] Make the doc on overriding the default permission classes more clear. (#7661) --- 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 f694d6be5..08031bceb 100644 --- a/docs/api-guide/permissions.md +++ b/docs/api-guide/permissions.md @@ -116,7 +116,7 @@ Or, if you're using the `@api_view` decorator with function based views. } return Response(content) -__Note:__ when you set new permission classes through class attribute or decorators you're telling the view to ignore the default list set over the __settings.py__ file. +__Note:__ when you set new permission classes via the class attribute or decorators you're telling the view to ignore the default list set in the __settings.py__ file. Provided they inherit from `rest_framework.permissions.BasePermission`, permissions can be composed using standard Python bitwise operators. For example, `IsAuthenticatedOrReadOnly` could be written: From ffe11d41bd357ab3acafebe9490bed89afc2039d Mon Sep 17 00:00:00 2001 From: Max Morlocke Date: Wed, 10 Mar 2021 07:45:47 -0500 Subject: [PATCH 092/303] upgrade pytest+pytest-django to eliminate dependencies on six (#7672) * upgrade to latest version of pytest+pytest-django to eliminate dependency on six * rollback pytest to 6.1 as py35 is dropped in 6.2 Co-authored-by: Tom Christie --- requirements/requirements-testing.txt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/requirements/requirements-testing.txt b/requirements/requirements-testing.txt index 99463560e..c5198dec5 100644 --- a/requirements/requirements-testing.txt +++ b/requirements/requirements-testing.txt @@ -1,5 +1,4 @@ # Pytest for running the tests. -pytest>=5.4.1,<5.5 -pytest-django>=3.9.0,<3.10 -pytest-cov>=2.7.1 -six>=1.14.0 +pytest>=6.1.1,<6.2 +pytest-django>=4.1.0,<4.2 +pytest-cov>=2.10.1 From c05cbe2da213ae6fef5ea66dbafb050b76923117 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 10 Mar 2021 12:50:59 +0000 Subject: [PATCH 093/303] Update pagination.py Include `last_page_strings` logic *inside* the `get_page_number method. --- rest_framework/pagination.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py index 0f0aa9ccf..87ff7d3d6 100644 --- a/rest_framework/pagination.py +++ b/rest_framework/pagination.py @@ -199,8 +199,6 @@ class PageNumberPagination(BasePagination): paginator = self.django_paginator_class(queryset, page_size) page_number = self.get_page_number(request) - if page_number in self.last_page_strings: - page_number = paginator.num_pages try: self.page = paginator.page(page_number) @@ -218,7 +216,10 @@ class PageNumberPagination(BasePagination): return list(self.page) def get_page_number(self, request): - return request.query_params.get(self.page_query_param, 1) + page_number = request.query_params.get(self.page_query_param, 1) + if page_number in self.last_page_strings: + page_number = paginator.num_pages + return page_number def get_paginated_response(self, data): return Response(OrderedDict([ From 39a98c80a6cb0b21fb6adb5ee97bc64b8b404433 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 11 Mar 2021 09:21:22 +0000 Subject: [PATCH 094/303] Fix 'get_page_number' implementation --- rest_framework/pagination.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py index 87ff7d3d6..91da73de6 100644 --- a/rest_framework/pagination.py +++ b/rest_framework/pagination.py @@ -198,7 +198,7 @@ class PageNumberPagination(BasePagination): return None paginator = self.django_paginator_class(queryset, page_size) - page_number = self.get_page_number(request) + page_number = self.get_page_number(request, paginator) try: self.page = paginator.page(page_number) @@ -215,7 +215,7 @@ class PageNumberPagination(BasePagination): self.request = request return list(self.page) - def get_page_number(self, request): + def get_page_number(self, request, paginator): page_number = request.query_params.get(self.page_query_param, 1) if page_number in self.last_page_strings: page_number = paginator.num_pages From f0706190614541fd47aeb7576c2030b58907d68b Mon Sep 17 00:00:00 2001 From: Carlton Gibson Date: Thu, 11 Mar 2021 11:26:11 +0100 Subject: [PATCH 095/303] Updated tox/travis to point to Django `main` branch. (#7827) --- .travis.yml | 6 +++--- tox.ini | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index f9f22336f..57a91e594 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,11 +20,11 @@ matrix: - { python: "3.8", env: DJANGO=3.0 } - { python: "3.8", env: DJANGO=3.1 } - { python: "3.8", env: DJANGO=3.2 } - - { python: "3.8", env: DJANGO=master } + - { python: "3.8", env: DJANGO=main } - { python: "3.9", env: DJANGO=3.1 } - { python: "3.9", env: DJANGO=3.2 } - - { python: "3.9", env: DJANGO=master } + - { python: "3.9", env: DJANGO=main } - { python: "3.8", env: TOXENV=base } - { python: "3.8", env: TOXENV=lint } @@ -39,7 +39,7 @@ matrix: - tox # test sdist allow_failures: - - env: DJANGO=master + - env: DJANGO=main - env: DJANGO=3.2 install: diff --git a/tox.ini b/tox.ini index 544bab163..df16cf947 100644 --- a/tox.ini +++ b/tox.ini @@ -4,7 +4,7 @@ envlist = {py36,py37,py38}-django30, {py36,py37,py38,py39}-django31, {py36,py37,py38,py39}-django32, - {py38,py39}-djangomaster, + {py38,py39}-djangomain, base,dist,lint,docs, [travis:env] @@ -13,7 +13,7 @@ DJANGO = 3.0: django30 3.1: django31 3.2: django32 - master: djangomaster + main: djangomain [testenv] commands = python -W error::DeprecationWarning -W error::PendingDeprecationWarning runtests.py --fast --coverage {posargs} @@ -26,7 +26,7 @@ deps = django30: Django>=3.0,<3.1 django31: Django>=3.1,<3.2 django32: Django>=3.2a1,<4.0 - djangomaster: https://github.com/django/django/archive/master.tar.gz + djangomain: https://github.com/django/django/archive/main.tar.gz -rrequirements/requirements-testing.txt -rrequirements/requirements-optionals.txt From 883f6fe814acdbc35032143275ae78f6ff832d82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=96mer=20Faruk=20Abac=C4=B1?= Date: Thu, 11 Mar 2021 14:39:06 +0300 Subject: [PATCH 096/303] Rename django-extra-fields to drf-extra-fields (#7833) --- docs/community/third-party-packages.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/community/third-party-packages.md b/docs/community/third-party-packages.md index 838122cbe..32fc8a0f5 100644 --- a/docs/community/third-party-packages.md +++ b/docs/community/third-party-packages.md @@ -220,7 +220,7 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque ### Serializer fields * [drf-compound-fields][drf-compound-fields] - Provides "compound" serializer fields, such as lists of simple values. -* [django-extra-fields][django-extra-fields] - Provides extra serializer fields. +* [drf-extra-fields][drf-extra-fields] - Provides extra serializer fields. * [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]. ### Views @@ -311,7 +311,7 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque [djangorestframework-gis]: https://github.com/djangonauts/django-rest-framework-gis [djangorestframework-hstore]: https://github.com/djangonauts/django-rest-framework-hstore [drf-compound-fields]: https://github.com/estebistec/drf-compound-fields -[django-extra-fields]: https://github.com/Hipo/drf-extra-fields +[drf-extra-fields]: https://github.com/Hipo/drf-extra-fields [django-rest-multiple-models]: https://github.com/MattBroach/DjangoRestMultipleModels [drf-nested-routers]: https://github.com/alanjds/drf-nested-routers [wq.db.rest]: https://wq.io/docs/about-rest From ff625ecff5026e2f1e25014a0399afabb73753d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henryk=20Pl=C3=B6tz?= Date: Mon, 15 Mar 2021 11:28:45 +0100 Subject: [PATCH 097/303] Document object level permissions gotchas (#7446) * Document the limitation that object level permissions do not apply to object creation. See for example #6409. * Add overview of three different ways to restrict access --- docs/api-guide/permissions.md | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/docs/api-guide/permissions.md b/docs/api-guide/permissions.md index 08031bceb..6912c375c 100644 --- a/docs/api-guide/permissions.md +++ b/docs/api-guide/permissions.md @@ -70,6 +70,8 @@ For performance reasons the generic views will not automatically apply object le Often when you're using object level permissions you'll also want to [filter the queryset][filtering] appropriately, to ensure that users only have visibility onto instances that they are permitted to view. +Because the `get_object()` method is not called, object level permissions from the `has_object_permission()` method **are not applied** when creating objects. In order to restrict object creation you need to implement the permission check either in your Serializer class or override the `perform_create()` method of your ViewSet class. + ## Setting the permission policy The default permission policy may be set globally, using the `DEFAULT_PERMISSION_CLASSES` setting. For example. @@ -272,6 +274,30 @@ Note that the generic views will check the appropriate object level permissions, Also note that the generic views will only check the object-level permissions for views that retrieve a single model instance. If you require object-level filtering of list views, you'll need to filter the queryset separately. See the [filtering documentation][filtering] for more details. +# Overview of access restriction methods + +REST framework offers three different methods to customize access restrictions on a case-by-case basis. These apply in different scenarios and have different effects and limitations. + + * `queryset`/`get_queryset()`: Limits the general visibility of existing objects from the database. The queryset limits which objects will be listed and which objects can be modified or deleted. The `get_queryset()` method can apply different querysets based on the current action. + * `permission_classes`/`get_permissions()`: General permission checks based on the current action, request and targeted object. Object level permissions can only be applied to retrieve, modify and deletion actions. Permission checks for list and create will be applied to the entire object type. (In case of list: subject to restrictions in the queryset.) + * `serializer_class`/`get_serializer()`: Instance level restrictions that apply to all objects on input and output. The serializer may have access to the request context. The `get_serializer()` method can apply different serializers based on the current action. + +The following table lists the access restriction methods and the level of control they offer over which actions. + +| | `queryset` | `permission_classes` | `serializer_class` | +|------------------------------------|------------|----------------------|--------------------| +| Action: list | global | no | object-level* | +| Action: create | no | global | object-level | +| Action: retrieve | global | object-level | object-level | +| Action: update | global | object-level | object-level | +| Action: partial_update | global | object-level | object-level | +| Action: destroy | global | object-level | no | +| Can reference action in decision | no** | yes | no** | +| Can reference request in decision | no** | yes | yes | + + \* A Serializer class should not raise PermissionDenied in a list action, or the entire list would not be returned.
+ \** The `get_*()` methods have access to the current view and can return different Serializer or QuerySet instances based on the request or action. + --- # Third party packages From b256c46cb1470f818328941e0005134d38087220 Mon Sep 17 00:00:00 2001 From: Alex Hedlund Date: Mon, 15 Mar 2021 12:44:03 +0200 Subject: [PATCH 098/303] Render JSON fields with proper indentation in browsable API forms. (#6243) * Fix JSONBoundField usage on nested serializers (#6211) * Unify JSONBoundField as_form_field output between py2 and py3 When using json.dumps with indenting, in python2 the default formatting prints whitespace after commas (,) and python3 does not. This can be unified with the separators keyword argument. --- rest_framework/fields.py | 3 +++ rest_framework/utils/serializer_helpers.py | 9 ++++++++- tests/test_bound_fields.py | 23 +++++++++++++++++++++- 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index d91299484..e4be54751 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -1764,6 +1764,9 @@ class JSONField(Field): 'invalid': _('Value must be valid JSON.') } + # Workaround for isinstance calls when importing the field isn't possible + _is_jsonfield = True + def __init__(self, *args, **kwargs): self.binary = kwargs.pop('binary', False) self.encoder = kwargs.pop('encoder', None) diff --git a/rest_framework/utils/serializer_helpers.py b/rest_framework/utils/serializer_helpers.py index cd0373adc..4cd2ada31 100644 --- a/rest_framework/utils/serializer_helpers.py +++ b/rest_framework/utils/serializer_helpers.py @@ -87,7 +87,12 @@ class JSONBoundField(BoundField): # value will be a JSONString, rather than a JSON primitive. if not getattr(value, 'is_json_string', False): try: - value = json.dumps(self.value, sort_keys=True, indent=4) + value = json.dumps( + self.value, + sort_keys=True, + indent=4, + separators=(',', ': '), + ) except (TypeError, ValueError): pass return self.__class__(self._field, value, self.errors, self._prefix) @@ -115,6 +120,8 @@ class NestedBoundField(BoundField): error = self.errors.get(key) if isinstance(self.errors, dict) else None if hasattr(field, 'fields'): return NestedBoundField(field, value, error, prefix=self.name + '.') + elif getattr(field, '_is_jsonfield', False): + return JSONBoundField(field, value, error, prefix=self.name + '.') return BoundField(field, value, error, prefix=self.name + '.') def as_form_field(self): diff --git a/tests/test_bound_fields.py b/tests/test_bound_fields.py index dec8793c3..eee7d9b85 100644 --- a/tests/test_bound_fields.py +++ b/tests/test_bound_fields.py @@ -91,6 +91,10 @@ class TestSimpleBoundField: assert rendered_packed == expected_packed +class CustomJSONField(serializers.JSONField): + pass + + class TestNestedBoundField: def test_nested_empty_bound_field(self): class Nested(serializers.Serializer): @@ -117,14 +121,31 @@ class TestNestedBoundField: class Nested(serializers.Serializer): bool_field = serializers.BooleanField() null_field = serializers.IntegerField(allow_null=True) + json_field = serializers.JSONField() + custom_json_field = CustomJSONField() class ExampleSerializer(serializers.Serializer): nested = Nested() - serializer = ExampleSerializer(data={'nested': {'bool_field': False, 'null_field': None}}) + serializer = ExampleSerializer( + data={'nested': { + 'bool_field': False, 'null_field': None, + 'json_field': {'bool_item': True, 'number': 1, 'text_item': 'text'}, + 'custom_json_field': {'bool_item': True, 'number': 1, 'text_item': 'text'}, + }}) assert serializer.is_valid() assert serializer['nested']['bool_field'].as_form_field().value == '' assert serializer['nested']['null_field'].as_form_field().value == '' + assert serializer['nested']['json_field'].as_form_field().value == '''{ + "bool_item": true, + "number": 1, + "text_item": "text" +}''' + assert serializer['nested']['custom_json_field'].as_form_field().value == '''{ + "bool_item": true, + "number": 1, + "text_item": "text" +}''' def test_rendering_nested_fields_with_none_value(self): from rest_framework.renderers import HTMLFormRenderer From ce1568322af61a6b41ccc5dc2c631c6927ed5e71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=96mer=20Faruk=20Abac=C4=B1?= Date: Tue, 16 Mar 2021 15:53:39 +0300 Subject: [PATCH 099/303] Ordering filter bug with model property serializer field (#7609) * Add failing tests for ordering filter with model property * Fix get_default_valid_fields of OrderingFilter * Filter model properties in get_default_valid_fields of OrderingFilter --- rest_framework/filters.py | 12 ++++++++- tests/test_filters.py | 51 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 1 deletion(-) diff --git a/rest_framework/filters.py b/rest_framework/filters.py index 366577519..1ffd9edc0 100644 --- a/rest_framework/filters.py +++ b/rest_framework/filters.py @@ -226,10 +226,20 @@ class OrderingFilter(BaseFilterBackend): ) raise ImproperlyConfigured(msg % self.__class__.__name__) + model_class = queryset.model + model_property_names = [ + # 'pk' is a property added in Django's Model class, however it is valid for ordering. + attr for attr in dir(model_class) if isinstance(getattr(model_class, attr), property) and attr != 'pk' + ] + return [ (field.source.replace('.', '__') or field_name, field.label) for field_name, field in serializer_class(context=context).fields.items() - if not getattr(field, 'write_only', False) and not field.source == '*' + if ( + not getattr(field, 'write_only', False) and + not field.source == '*' and + field.source not in model_property_names + ) ] def get_valid_fields(self, queryset, view, context={}): diff --git a/tests/test_filters.py b/tests/test_filters.py index 567e5f83f..37ae4c7cf 100644 --- a/tests/test_filters.py +++ b/tests/test_filters.py @@ -424,6 +424,10 @@ class OrderingFilterModel(models.Model): title = models.CharField(max_length=20, verbose_name='verbose title') text = models.CharField(max_length=100) + @property + def description(self): + return self.title + ": " + self.text + class OrderingFilterRelatedModel(models.Model): related_object = models.ForeignKey(OrderingFilterModel, related_name="relateds", on_delete=models.CASCADE) @@ -436,6 +440,17 @@ class OrderingFilterSerializer(serializers.ModelSerializer): fields = '__all__' +class OrderingFilterSerializerWithModelProperty(serializers.ModelSerializer): + class Meta: + model = OrderingFilterModel + fields = ( + "id", + "title", + "text", + "description" + ) + + class OrderingDottedRelatedSerializer(serializers.ModelSerializer): related_text = serializers.CharField(source='related_object.text') related_title = serializers.CharField(source='related_object.title') @@ -551,6 +566,42 @@ class OrderingFilterTests(TestCase): {'id': 1, 'title': 'zyx', 'text': 'abc'}, ] + def test_ordering_without_ordering_fields(self): + class OrderingListView(generics.ListAPIView): + queryset = OrderingFilterModel.objects.all() + serializer_class = OrderingFilterSerializerWithModelProperty + filter_backends = (filters.OrderingFilter,) + ordering = ('title',) + + view = OrderingListView.as_view() + + # Model field ordering works fine. + request = factory.get('/', {'ordering': 'text'}) + response = view(request) + assert response.data == [ + {'id': 1, 'title': 'zyx', 'text': 'abc', 'description': 'zyx: abc'}, + {'id': 2, 'title': 'yxw', 'text': 'bcd', 'description': 'yxw: bcd'}, + {'id': 3, 'title': 'xwv', 'text': 'cde', 'description': 'xwv: cde'}, + ] + + # `incorrectfield` ordering works fine. + request = factory.get('/', {'ordering': 'foobar'}) + response = view(request) + assert response.data == [ + {'id': 3, 'title': 'xwv', 'text': 'cde', 'description': 'xwv: cde'}, + {'id': 2, 'title': 'yxw', 'text': 'bcd', 'description': 'yxw: bcd'}, + {'id': 1, 'title': 'zyx', 'text': 'abc', 'description': 'zyx: abc'}, + ] + + # `description` is a Model property, which should be ignored. + request = factory.get('/', {'ordering': 'description'}) + response = view(request) + assert response.data == [ + {'id': 3, 'title': 'xwv', 'text': 'cde', 'description': 'xwv: cde'}, + {'id': 2, 'title': 'yxw', 'text': 'bcd', 'description': 'yxw: bcd'}, + {'id': 1, 'title': 'zyx', 'text': 'abc', 'description': 'zyx: abc'}, + ] + def test_default_ordering(self): class OrderingListView(generics.ListAPIView): queryset = OrderingFilterModel.objects.all() From b0ca248d88240c58ff04554bf5df07a6dd8d9e8f Mon Sep 17 00:00:00 2001 From: Jeff Baumes Date: Tue, 16 Mar 2021 08:57:04 -0400 Subject: [PATCH 100/303] Correct the use of "to" (#7696) --- 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 4cd4e9bbd..b0f338085 100644 --- a/docs/tutorial/5-relationships-and-hyperlinked-apis.md +++ b/docs/tutorial/5-relationships-and-hyperlinked-apis.md @@ -143,7 +143,7 @@ We can change the default list style to use pagination, by modifying our `tutori Note that settings in REST framework are all namespaced into a single dictionary setting, named `REST_FRAMEWORK`, which helps keep them well separated from your other project settings. -We could also customize the pagination style if we needed too, but in this case we'll just stick with the default. +We could also customize the pagination style if we needed to, but in this case we'll just stick with the default. ## Browsing the API From 9c9ffb18f44062fd05f0b4e06b756c0a35230561 Mon Sep 17 00:00:00 2001 From: Jesse London Date: Tue, 16 Mar 2021 08:25:21 -0500 Subject: [PATCH 101/303] made Browsable API base template cachable: omit CSRF token when unnecessary (#7717) HTML responses generated by the Browsable API otherwise generate inconsistent ETAGs -- due to the presence of CSRF tokens in the response -- even when the API is read-only, (and as such when the response contains no resource-modifying forms, i.e. neither POST nor PUT forms, which might require the CSRF token). While the template was appropriately including CSRF tokens only within POST and PUT forms, its AJAX overlay included the CSRF token in *every* response, regardless of whether it would be needed. This change brings the logic of the `script` block into line with that of the rest of the template -- and such that read-only APIs (and really the Browsable API pages of *any* read-only resources) will not needlessly include the CSRF token, and will now be safely cachable -- by both back-end systems and by the user agent. --- .../templates/rest_framework/base.html | 2 +- tests/test_templates.py | 20 +++++++++++++------ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/rest_framework/templates/rest_framework/base.html b/rest_framework/templates/rest_framework/base.html index a88e1591c..4d057b632 100644 --- a/rest_framework/templates/rest_framework/base.html +++ b/rest_framework/templates/rest_framework/base.html @@ -290,7 +290,7 @@ diff --git a/tests/test_templates.py b/tests/test_templates.py index 0dba78ea2..195296e16 100644 --- a/tests/test_templates.py +++ b/tests/test_templates.py @@ -3,15 +3,23 @@ import re from django.shortcuts import render -def test_base_template_with_context(): - context = {'request': True, 'csrf_token': 'TOKEN'} - result = render({}, 'rest_framework/base.html', context=context) - assert re.search(r'\bcsrfToken: "TOKEN"', result.content.decode()) - - def test_base_template_with_no_context(): # base.html should be renderable with no context, # so it can be easily extended. result = render({}, 'rest_framework/base.html') # note that this response will not include a valid CSRF token assert re.search(r'\bcsrfToken: ""', result.content.decode()) + + +def test_base_template_with_simple_context(): + context = {'request': True, 'csrf_token': 'TOKEN'} + result = render({}, 'rest_framework/base.html', context=context) + # note that response will STILL not include a CSRF token + assert re.search(r'\bcsrfToken: ""', result.content.decode()) + + +def test_base_template_with_editing_context(): + context = {'request': True, 'post_form': object(), 'csrf_token': 'TOKEN'} + result = render({}, 'rest_framework/base.html', context=context) + # response includes a CSRF token in support of the POST form + assert re.search(r'\bcsrfToken: "TOKEN"', result.content.decode()) From a40bce50cda95652afd822d69d91a67b78bc05b0 Mon Sep 17 00:00:00 2001 From: Yuekui Date: Tue, 16 Mar 2021 06:29:13 -0700 Subject: [PATCH 102/303] No need to explictitly set None as default (#7373) --- 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 d305ede6b..478e3bcf9 100644 --- a/docs/api-guide/filtering.md +++ b/docs/api-guide/filtering.md @@ -75,7 +75,7 @@ We can override `.get_queryset()` to deal with URLs such as `http://example.com/ by filtering against a `username` query parameter in the URL. """ queryset = Purchase.objects.all() - username = self.request.query_params.get('username', None) + username = self.request.query_params.get('username') if username is not None: queryset = queryset.filter(purchaser__username=username) return queryset From 3e274146fcd6baffa82ac6e146e2c3ca35d447cd Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 17 Mar 2021 13:24:38 +0000 Subject: [PATCH 103/303] Fix WSGI signature for DjangoTestAdapter (#7846) Closes https://github.com/encode/django-rest-framework/issues/7132 --- 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 f2581cacc..8ab0f2de1 100644 --- a/rest_framework/test.py +++ b/rest_framework/test.py @@ -79,7 +79,7 @@ if requests is not None: """ raw_kwargs = {} - def start_response(wsgi_status, wsgi_headers): + def start_response(wsgi_status, wsgi_headers, exc_info=None): status, _, reason = wsgi_status.partition(' ') raw_kwargs['status'] = int(status) raw_kwargs['reason'] = reason From 7b53960c3bef7ffc8deb727639afd2ea118879b0 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 17 Mar 2021 13:24:55 +0000 Subject: [PATCH 104/303] Revert "made Browsable API base template cachable: omit CSRF token when unnecessary (#7717)" (#7847) This reverts commit 9c9ffb18f44062fd05f0b4e06b756c0a35230561. --- .../templates/rest_framework/base.html | 2 +- tests/test_templates.py | 20 ++++++------------- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/rest_framework/templates/rest_framework/base.html b/rest_framework/templates/rest_framework/base.html index 4d057b632..a88e1591c 100644 --- a/rest_framework/templates/rest_framework/base.html +++ b/rest_framework/templates/rest_framework/base.html @@ -290,7 +290,7 @@ diff --git a/tests/test_templates.py b/tests/test_templates.py index 195296e16..0dba78ea2 100644 --- a/tests/test_templates.py +++ b/tests/test_templates.py @@ -3,23 +3,15 @@ import re from django.shortcuts import render +def test_base_template_with_context(): + context = {'request': True, 'csrf_token': 'TOKEN'} + result = render({}, 'rest_framework/base.html', context=context) + assert re.search(r'\bcsrfToken: "TOKEN"', result.content.decode()) + + def test_base_template_with_no_context(): # base.html should be renderable with no context, # so it can be easily extended. result = render({}, 'rest_framework/base.html') # note that this response will not include a valid CSRF token assert re.search(r'\bcsrfToken: ""', result.content.decode()) - - -def test_base_template_with_simple_context(): - context = {'request': True, 'csrf_token': 'TOKEN'} - result = render({}, 'rest_framework/base.html', context=context) - # note that response will STILL not include a CSRF token - assert re.search(r'\bcsrfToken: ""', result.content.decode()) - - -def test_base_template_with_editing_context(): - context = {'request': True, 'post_form': object(), 'csrf_token': 'TOKEN'} - result = render({}, 'rest_framework/base.html', context=context) - # response includes a CSRF token in support of the POST form - assert re.search(r'\bcsrfToken: "TOKEN"', result.content.decode()) From 67ebdd32cdab0ec9078c281d24971ccd9d119173 Mon Sep 17 00:00:00 2001 From: Aristotelis Mikropoulos Date: Wed, 17 Mar 2021 15:28:38 +0200 Subject: [PATCH 105/303] Reject PrimaryKeyRelatedField bool lookup values (#7597) * Reject PrimaryKeyRelatedField bool lookup values * Test PrimaryKeyRelatedField bool lookup rejection * Fix indentation in test --- rest_framework/relations.py | 2 ++ tests/test_relations.py | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/rest_framework/relations.py b/rest_framework/relations.py index eaf27e1d9..cbdf23369 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -259,6 +259,8 @@ class PrimaryKeyRelatedField(RelatedField): data = self.pk_field.to_internal_value(data) queryset = self.get_queryset() try: + if isinstance(data, bool): + raise TypeError return queryset.get(pk=data) except ObjectDoesNotExist: self.fail('does_not_exist', pk_value=data) diff --git a/tests/test_relations.py b/tests/test_relations.py index 92aeecf6c..bb719a65a 100644 --- a/tests/test_relations.py +++ b/tests/test_relations.py @@ -107,6 +107,12 @@ class TestPrimaryKeyRelatedField(APISimpleTestCase): msg = excinfo.value.detail[0] assert msg == 'Incorrect type. Expected pk value, received BadType.' + def test_pk_related_lookup_bool(self): + with pytest.raises(serializers.ValidationError) as excinfo: + self.field.to_internal_value(True) + msg = excinfo.value.detail[0] + assert msg == 'Incorrect type. Expected pk value, received bool.' + def test_pk_representation(self): representation = self.field.to_representation(self.instance) assert representation == self.instance.pk From b25ac6c5e36403f62b13163a0190eaa48b586c47 Mon Sep 17 00:00:00 2001 From: Anton Zaslavskiy Date: Fri, 19 Mar 2021 14:46:09 +0300 Subject: [PATCH 106/303] Don't hit db to access user_id in TokenProxy (#7852) --- rest_framework/authtoken/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/authtoken/models.py b/rest_framework/authtoken/models.py index 540049295..5a143d936 100644 --- a/rest_framework/authtoken/models.py +++ b/rest_framework/authtoken/models.py @@ -46,7 +46,7 @@ class TokenProxy(Token): """ @property def pk(self): - return self.user.pk + return self.user_id class Meta: proxy = 'rest_framework.authtoken' in settings.INSTALLED_APPS From 0cddf097ca50344355db79b048b12c1805bbe180 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hasan=20Talha=20Yaz=C4=B1c=C4=B1?= Date: Sun, 21 Mar 2021 10:53:09 +0100 Subject: [PATCH 107/303] Fix typo in docs (#7853) --- 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 d5815127b..d4ab5a731 100644 --- a/docs/api-guide/viewsets.md +++ b/docs/api-guide/viewsets.md @@ -185,7 +185,7 @@ The decorator allows you to override any viewset-level configuration such as `pe def set_password(self, request, pk=None): ... -The two new actions will then be available at the urls `^users/{pk}/set_password/$` and `^users/{pk}/unset_password/$`. Use the `url_path` and `url_name` parameters to change the URL segement and the reverse URL name of the action. +The two new actions will then be available at the urls `^users/{pk}/set_password/$` and `^users/{pk}/unset_password/$`. Use the `url_path` and `url_name` parameters to change the URL segment and the reverse URL name of the action. To view all extra actions, call the `.get_extra_actions()` method. From 7e3dd9cd1b7d9cd5d036b4b733937d93304b2dd8 Mon Sep 17 00:00:00 2001 From: Mohammad Ashraful Islam Date: Mon, 22 Mar 2021 18:07:48 +0600 Subject: [PATCH 108/303] Added fast-drf as a thirdparty package for making API development faster. (#7857) --- docs/community/third-party-packages.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/community/third-party-packages.md b/docs/community/third-party-packages.md index 32fc8a0f5..046966594 100644 --- a/docs/community/third-party-packages.md +++ b/docs/community/third-party-packages.md @@ -279,6 +279,7 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque * [djangorestframework-features][djangorestframework-features] - Advanced schema generation and more based on named features. * [django-elasticsearch-dsl-drf][django-elasticsearch-dsl-drf] - Integrate Elasticsearch DSL with Django REST framework. Package provides views, serializers, filter backends, pagination and other handy add-ons. * [django-api-client][django-api-client] - DRF client that groups the Endpoint response, for use in CBVs and FBV as if you were working with Django's Native Models.. +* [fast-drf] - A model based library for making API development faster and easier. [cite]: http://www.software-ecosystems.com/Software_Ecosystems/Ecosystems.html [cookiecutter]: https://github.com/jpadilla/cookiecutter-django-rest-framework @@ -368,3 +369,4 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque [django-rest-authemail]: https://github.com/celiao/django-rest-authemail [graphwrap]: https://github.com/PaulGilmartin/graph_wrap [rest-framework-actions]: https://github.com/AlexisMunera98/rest-framework-actions +[fast-drf]: https://github.com/iashraful/fast-drf From 71e6c30034a1dd35a39ca74f86c371713e762c79 Mon Sep 17 00:00:00 2001 From: Joe Michelini <66066937+afolksetapart@users.noreply.github.com> Date: Mon, 22 Mar 2021 08:08:19 -0400 Subject: [PATCH 109/303] update SerializerMethodField example in docs (#7858) * update SerializerMethodField example * fix formatting --- docs/api-guide/fields.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/api-guide/fields.md b/docs/api-guide/fields.md index 0492af9aa..04f993942 100644 --- a/docs/api-guide/fields.md +++ b/docs/api-guide/fields.md @@ -583,6 +583,7 @@ The serializer method referred to by the `method_name` argument should accept a class Meta: model = User + fields = '__all__' def get_days_since_joined(self, obj): return (now() - obj.date_joined).days From ebcb8d53108f1ebe56b9a7aa78bbe09b1079953c Mon Sep 17 00:00:00 2001 From: Jack Date: Thu, 25 Mar 2021 18:47:44 +0800 Subject: [PATCH 110/303] pick deque instead of list (#7849) Co-authored-by: Jack Zhang --- rest_framework/throttling.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rest_framework/throttling.py b/rest_framework/throttling.py index 0ba2ba66b..1374d4492 100644 --- a/rest_framework/throttling.py +++ b/rest_framework/throttling.py @@ -2,6 +2,7 @@ Provides various throttling policies. """ import time +from collections import deque from django.core.cache import cache as default_cache from django.core.exceptions import ImproperlyConfigured @@ -120,7 +121,7 @@ class SimpleRateThrottle(BaseThrottle): if self.key is None: return True - self.history = self.cache.get(self.key, []) + self.history = self.cache.get(self.key, deque()) self.now = self.timer() # Drop any requests from the history which have now passed the From 83ad265e138106c26745a49dce0576573f0d202c Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 25 Mar 2021 12:23:23 +0000 Subject: [PATCH 111/303] Version 3.12.3 (#7866) --- docs/community/release-notes.md | 16 ++++++++++++++++ rest_framework/__init__.py | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/docs/community/release-notes.md b/docs/community/release-notes.md index 49fb655b0..72e6b466b 100644 --- a/docs/community/release-notes.md +++ b/docs/community/release-notes.md @@ -38,6 +38,22 @@ You can determine your currently installed version using `pip show`: ### 3.12.2 +Date: 25th March 2021 + +* Properly handle ATOMIC_REQUESTS when multiple database configurations are used. [#7739] +* Bypass `COUNT` query when `LimitOffsetPagination` is configured but pagination params are not included on the request. [#6098] +* Respect `allow_null=True` on `DecimalField`. [#7718] +* Allow title cased `"Yes"`/`"No"` values with `BooleanField`. [#7739] +* Add `PageNumberPagination.get_page_number()` method for overriding behavior. [#7652] +* Fixed rendering of timedelta values in OpenAPI schemas, when present as default, min, or max fields. [#7641] +* Render JSONFields with indentation in browsable API forms. [#6243] +* Remove unnecessary database query in admin Token views. [#7852] +* Raise validation errors when bools are passed to `PrimaryKeyRelatedField` fields, instead of casting to ints. [#7597] +* Don't include model properties as automatically generated ordering fields with `OrderingFilter`. [#7609] +* Use `deque` instead of `list` for tracking throttling `.history`. [#7849] + +### 3.12.2 + Date: 13th October 2020 * Fix issue if `rest_framework.authtoken.models` is imported, but `rest_framework.authtoken` is not in INSTALLED_APPS. [#7571] diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py index 7ff188a5a..eb5d605b9 100644 --- a/rest_framework/__init__.py +++ b/rest_framework/__init__.py @@ -10,7 +10,7 @@ ______ _____ _____ _____ __ import django __title__ = 'Django REST framework' -__version__ = '3.12.2' +__version__ = '3.12.3' __author__ = 'Tom Christie' __license__ = 'BSD 3-Clause' __copyright__ = 'Copyright 2011-2019 Encode OSS Ltd' From dffa612134e89183bc081ddfd2528bd22108b558 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 25 Mar 2021 12:30:45 +0000 Subject: [PATCH 112/303] Fix release notes typo --- docs/community/release-notes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/community/release-notes.md b/docs/community/release-notes.md index 72e6b466b..392083005 100644 --- a/docs/community/release-notes.md +++ b/docs/community/release-notes.md @@ -36,7 +36,7 @@ You can determine your currently installed version using `pip show`: ## 3.12.x series -### 3.12.2 +### 3.12.3 Date: 25th March 2021 From 72c155d8f4897c13d302340e43eacb48ebe321f6 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 26 Mar 2021 09:17:47 +0000 Subject: [PATCH 113/303] Revert "pick deque instead of list (#7849)" (#7872) This reverts commit ebcb8d53108f1ebe56b9a7aa78bbe09b1079953c. --- rest_framework/throttling.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/rest_framework/throttling.py b/rest_framework/throttling.py index 1374d4492..0ba2ba66b 100644 --- a/rest_framework/throttling.py +++ b/rest_framework/throttling.py @@ -2,7 +2,6 @@ Provides various throttling policies. """ import time -from collections import deque from django.core.cache import cache as default_cache from django.core.exceptions import ImproperlyConfigured @@ -121,7 +120,7 @@ class SimpleRateThrottle(BaseThrottle): if self.key is None: return True - self.history = self.cache.get(self.key, deque()) + self.history = self.cache.get(self.key, []) self.now = self.timer() # Drop any requests from the history which have now passed the From f83620dcc9e87f81ddc846c56f2ad87c2e548f8d Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 26 Mar 2021 09:27:01 +0000 Subject: [PATCH 114/303] Version 3.12.4 (#7873) * Version 3.12.4 * Tweak release notes --- docs/community/release-notes.md | 6 ++++++ rest_framework/__init__.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/docs/community/release-notes.md b/docs/community/release-notes.md index 392083005..baeeaf874 100644 --- a/docs/community/release-notes.md +++ b/docs/community/release-notes.md @@ -36,6 +36,12 @@ You can determine your currently installed version using `pip show`: ## 3.12.x series +### 3.12.4 + +Date: 26th March 2021 + +* Revert use of `deque` instead of `list` for tracking throttling `.history`. (Due to incompatibility with DjangoRedis cache backend. See #7870) [#7872] + ### 3.12.3 Date: 25th March 2021 diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py index eb5d605b9..0c75d3617 100644 --- a/rest_framework/__init__.py +++ b/rest_framework/__init__.py @@ -10,7 +10,7 @@ ______ _____ _____ _____ __ import django __title__ = 'Django REST framework' -__version__ = '3.12.3' +__version__ = '3.12.4' __author__ = 'Tom Christie' __license__ = 'BSD 3-Clause' __copyright__ = 'Copyright 2011-2019 Encode OSS Ltd' From 0323d6f8955f987771269506ca5da461e2e7a248 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 26 Mar 2021 12:27:10 +0000 Subject: [PATCH 115/303] Linting fixes (#7874) * Fixed code quality issues - Added '.deepsource.toml' file for continuous analysis on bug risk - Remove `return` from `__init__()` method - Remove duplicate dictionary key(s) - Use `max` built-in to get the maximum of two values - Remove redundant `None` default - Remove unnecessary comprehension Signed-off-by: ankitdobhal * Delete .deepsource.toml * Delete test_fields.py * Reintroduce file from accidental deletion Co-authored-by: ankitdobhal --- rest_framework/pagination.py | 3 +-- rest_framework/relations.py | 8 ++++---- rest_framework/request.py | 2 +- rest_framework/routers.py | 2 +- rest_framework/templatetags/rest_framework.py | 4 ++-- rest_framework/test.py | 2 +- 6 files changed, 10 insertions(+), 11 deletions(-) diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py index 91da73de6..dc120d8e8 100644 --- a/rest_framework/pagination.py +++ b/rest_framework/pagination.py @@ -488,8 +488,7 @@ class LimitOffsetPagination(BasePagination): _divide_with_ceil(self.offset, self.limit) ) - if final < 1: - final = 1 + final = max(final, 1) else: current = 1 final = 1 diff --git a/rest_framework/relations.py b/rest_framework/relations.py index cbdf23369..c98700784 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -104,11 +104,11 @@ class RelatedField(Field): 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), ( + assert self.queryset is not None or kwargs.get('read_only'), ( 'Relational field must provide a `queryset` argument, ' 'override `get_queryset`, or set read_only=`True`.' ) - assert not (self.queryset is not None and kwargs.get('read_only', None)), ( + assert not (self.queryset is not None and kwargs.get('read_only')), ( 'Relational fields should not provide a `queryset` argument, ' 'when setting read_only=`True`.' ) @@ -339,7 +339,7 @@ class HyperlinkedRelatedField(RelatedField): return self.reverse(view_name, kwargs=kwargs, request=request, format=format) def to_internal_value(self, data): - request = self.context.get('request', None) + request = self.context.get('request') try: http_prefix = data.startswith(('http:', 'https:')) except AttributeError: @@ -382,7 +382,7 @@ class HyperlinkedRelatedField(RelatedField): ) request = self.context['request'] - format = self.context.get('format', None) + format = self.context.get('format') # By default use whatever format is given for the current context # unless the target is a different type to the source. diff --git a/rest_framework/request.py b/rest_framework/request.py index 2a007cd2b..17ceadb08 100644 --- a/rest_framework/request.py +++ b/rest_framework/request.py @@ -316,7 +316,7 @@ class Request: 'application/x-www-form-urlencoded', 'multipart/form-data' ) - return any([parser.media_type in form_media for parser in self.parsers]) + return any(parser.media_type in form_media for parser in self.parsers) def _parse(self): """ diff --git a/rest_framework/routers.py b/rest_framework/routers.py index e2afa573f..e0ae24b95 100644 --- a/rest_framework/routers.py +++ b/rest_framework/routers.py @@ -290,7 +290,7 @@ class APIRootView(views.APIView): args=args, kwargs=kwargs, request=request, - format=kwargs.get('format', None) + format=kwargs.get('format') ) except NoReverseMatch: # Don't bail out if eg. no list routes exist, only detail routes. diff --git a/rest_framework/templatetags/rest_framework.py b/rest_framework/templatetags/rest_framework.py index 7bfa8f599..db0e9c95c 100644 --- a/rest_framework/templatetags/rest_framework.py +++ b/rest_framework/templatetags/rest_framework.py @@ -206,7 +206,7 @@ def format_value(value): if value is None or isinstance(value, bool): return mark_safe('%s' % {True: 'true', False: 'false', None: 'null'}[value]) elif isinstance(value, list): - if any([isinstance(item, (list, dict)) for item in value]): + if any(isinstance(item, (list, dict)) for item in value): template = loader.get_template('rest_framework/admin/list_value.html') else: template = loader.get_template('rest_framework/admin/simple_list_value.html') @@ -285,7 +285,7 @@ def schema_links(section, sec_key=None): def add_nested_class(value): if isinstance(value, dict): return 'class=nested' - if isinstance(value, list) and any([isinstance(item, (list, dict)) for item in value]): + if isinstance(value, list) and any(isinstance(item, (list, dict)) for item in value): return 'class=nested' return '' diff --git a/rest_framework/test.py b/rest_framework/test.py index 8ab0f2de1..e934eff55 100644 --- a/rest_framework/test.py +++ b/rest_framework/test.py @@ -124,7 +124,7 @@ if coreapi is not None: def __init__(self, *args, **kwargs): self._session = RequestsClient() kwargs['transports'] = [coreapi.transports.HTTPTransport(session=self.session)] - return super().__init__(*args, **kwargs) + super().__init__(*args, **kwargs) @property def session(self): From 96885dd9a72e94df5e898bea65abba5345260f11 Mon Sep 17 00:00:00 2001 From: David Smith <39445562+smithdc1@users.noreply.github.com> Date: Thu, 1 Apr 2021 09:49:47 +0100 Subject: [PATCH 116/303] Fixed markdown test (#7892) The pygments rendering of invalid json changed in pygments>=2.7.3 --- tests/test_description.py | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/tests/test_description.py b/tests/test_description.py index 9e7e4dc32..3b7d95e0a 100644 --- a/tests/test_description.py +++ b/tests/test_description.py @@ -26,7 +26,7 @@ indented ``` json [{ "alpha": 1, - "beta: "this is a string" + "beta": "this is a string" }] ```""" @@ -48,20 +48,18 @@ MARKDOWN_gte_33 = """ 
[{
\
     "alpha":\
  1,
\
-    "beta: "this\
- is a \
-string"
}]\
-
+ "beta":\ + "this is a string"
\ +}]


""" MARKDOWN_lt_33 = """ 
[{
\
     "alpha":\
  1,
\
-    "beta: "this\
- is a\
- string"
}]\
-
+ "beta":\ + "this is a string"
\ +}]


""" @@ -112,7 +110,7 @@ class TestViewNamesAndDescriptions(TestCase): ``` json [{ "alpha": 1, - "beta: "this is a string" + "beta": "this is a string" }] ```""" From 406e6a2f352dd98623707fccc45fef7a7309eb59 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 1 Apr 2021 14:15:53 +0100 Subject: [PATCH 117/303] Update MANIFEST.in (#7893) --- MANIFEST.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MANIFEST.in b/MANIFEST.in index 262e3dc91..5159eeddc 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,6 +1,6 @@ include README.md include LICENSE.md -recursive-include tests/* * +recursive-include tests/ * recursive-include rest_framework/static *.js *.css *.png *.ico *.eot *.svg *.ttf *.woff *.woff2 recursive-include rest_framework/templates *.html schema.js recursive-include rest_framework/locale *.mo From 78da1a824f1de338e1678a0182237d4c9b6d58e7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Apr 2021 16:52:19 +0100 Subject: [PATCH 118/303] Bump pygments from 2.4.2 to 2.7.4 in /requirements (#7886) Bumps [pygments](https://github.com/pygments/pygments) from 2.4.2 to 2.7.4. - [Release notes](https://github.com/pygments/pygments/releases) - [Changelog](https://github.com/pygments/pygments/blob/master/CHANGES) - [Commits](https://github.com/pygments/pygments/compare/2.4.2...2.7.4) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- 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 739555667..121de580e 100644 --- a/requirements/requirements-optionals.txt +++ b/requirements/requirements-optionals.txt @@ -2,7 +2,7 @@ psycopg2-binary>=2.8.5, <2.9 markdown==3.3;python_version>="3.6" markdown==3.2.2;python_version=="3.5" -pygments==2.4.2 +pygments==2.7.4 django-guardian==2.2.0 django-filter>=2.2.0, <2.3 coreapi==2.3.1 From d82519bf8a0f0d4eb50d9ceadc52a01b1e06830e Mon Sep 17 00:00:00 2001 From: David Smith <39445562+smithdc1@users.noreply.github.com> Date: Mon, 5 Apr 2021 10:28:03 +0100 Subject: [PATCH 119/303] Updated dependencies (#7589) --- requirements/requirements-codestyle.txt | 7 +++---- requirements/requirements-documentation.txt | 2 +- requirements/requirements-optionals.txt | 14 +++++++------- requirements/requirements-packaging.txt | 6 +++--- requirements/requirements-testing.txt | 6 +++--- tests/test_status.py | 3 +-- tests/test_validators.py | 3 +-- 7 files changed, 19 insertions(+), 22 deletions(-) diff --git a/requirements/requirements-codestyle.txt b/requirements/requirements-codestyle.txt index 4f54d6e77..d9a93884c 100644 --- a/requirements/requirements-codestyle.txt +++ b/requirements/requirements-codestyle.txt @@ -1,7 +1,6 @@ # PEP8 code linting, which we run on all commits. -flake8==3.8.3 -flake8-tidy-imports==4.1.0 -pycodestyle==2.6.0 +flake8>=3.8.4,<3.9 +flake8-tidy-imports>=4.1.0,<4.2 # Sort and lint imports -isort==5.4.2 +isort>=5.6.2,<6.0 diff --git a/requirements/requirements-documentation.txt b/requirements/requirements-documentation.txt index e969ff471..ad4928730 100644 --- a/requirements/requirements-documentation.txt +++ b/requirements/requirements-documentation.txt @@ -1,2 +1,2 @@ # MkDocs to build our documentation. -mkdocs==1.1 +mkdocs>=1.1.2,<1.2 diff --git a/requirements/requirements-optionals.txt b/requirements/requirements-optionals.txt index 121de580e..4cb0e54f4 100644 --- a/requirements/requirements-optionals.txt +++ b/requirements/requirements-optionals.txt @@ -1,10 +1,10 @@ # Optional packages which may be used with REST framework. -psycopg2-binary>=2.8.5, <2.9 -markdown==3.3;python_version>="3.6" -markdown==3.2.2;python_version=="3.5" -pygments==2.7.4 -django-guardian==2.2.0 -django-filter>=2.2.0, <2.3 coreapi==2.3.1 coreschema==0.0.4 -pyyaml>=5.1 +django-filter>=2.4.0,<3.0 +django-guardian>=2.3.0,<2.4 +markdown==3.3;python_version>="3.6" +markdown==3.2.2;python_version=="3.5" +psycopg2-binary>=2.8.5,<2.9 +pygments>=2.7.1,<2.8 +pyyaml>=5.3.1,<5.4 diff --git a/requirements/requirements-packaging.txt b/requirements/requirements-packaging.txt index 091622fbe..3489c76ec 100644 --- a/requirements/requirements-packaging.txt +++ b/requirements/requirements-packaging.txt @@ -1,8 +1,8 @@ # Wheel for PyPI installs. -wheel==0.34.2 +wheel>=0.35.1,<0.36 # Twine for secured PyPI uploads. -twine==3.1.1 +twine>=3.2.0,<3.3 # Transifex client for managing translation resources. -transifex-client==0.13.9 +transifex-clien>=0.13.12,<0.14 diff --git a/requirements/requirements-testing.txt b/requirements/requirements-testing.txt index c5198dec5..313fdedc9 100644 --- a/requirements/requirements-testing.txt +++ b/requirements/requirements-testing.txt @@ -1,4 +1,4 @@ # Pytest for running the tests. -pytest>=6.1.1,<6.2 -pytest-django>=4.1.0,<4.2 -pytest-cov>=2.10.1 +pytest>=6.1,<7.0 +pytest-cov>=2.10.1,<3.0 +pytest-django>=4.1.0,<5.0 diff --git a/tests/test_status.py b/tests/test_status.py index 07d893bee..b10f7df99 100644 --- a/tests/test_status.py +++ b/tests/test_status.py @@ -1,8 +1,7 @@ from django.test import TestCase from rest_framework.status import ( - is_client_error, is_informational, is_redirect, is_server_error, - is_success + is_client_error, is_informational, is_redirect, is_server_error, is_success ) diff --git a/tests/test_validators.py b/tests/test_validators.py index 4962cf581..bccbe1514 100644 --- a/tests/test_validators.py +++ b/tests/test_validators.py @@ -7,8 +7,7 @@ from django.test import TestCase from rest_framework import serializers from rest_framework.exceptions import ValidationError from rest_framework.validators import ( - BaseUniqueForValidator, UniqueTogetherValidator, UniqueValidator, - qs_exists + BaseUniqueForValidator, UniqueTogetherValidator, UniqueValidator, qs_exists ) From 846fe70cff1232da93f4868216d625de4b835967 Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Mon, 5 Apr 2021 11:12:28 +0100 Subject: [PATCH 120/303] De-duplicate contributing guide (#7901) The contributing guide from `docs/community/contributing.md` was copy-pasted to `CONTRIBUTING.md` and the two have drifted apart over time. The docs page seems to have been updated a bit more so let's leave only that version. --- CONTRIBUTING.md | 206 +-------------------------------------- PULL_REQUEST_TEMPLATE.md | 2 +- 2 files changed, 2 insertions(+), 206 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2f1aad08f..a7f17b1a3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,207 +1,3 @@ # Contributing to REST framework -> The world can only really be changed one piece at a time. The art is picking that piece. -> -> — [Tim Berners-Lee][cite] - -There are many ways you can contribute to Django REST framework. We'd like it to be a community-led project, so please get involved and help shape the future of the project. - -## Community - -The most important thing you can do to help push the REST framework project forward is to be actively involved wherever possible. Code contributions are often overvalued as being the primary way to get involved in a project, we don't believe that needs to be the case. - -If you use REST framework, we'd love you to be vocal about your experiences with it - you might consider writing a blog post about using REST framework, or publishing a tutorial about building a project with a particular JavaScript framework. Experiences from beginners can be particularly helpful because you'll be in the best position to assess which bits of REST framework are more difficult to understand and work with. - -Other really great ways you can help move the community forward include helping to answer questions on the [discussion group][google-group], or setting up an [email alert on StackOverflow][so-filter] so that you get notified of any new questions with the `django-rest-framework` tag. - -When answering questions make sure to help future contributors find their way around by hyperlinking wherever possible to related threads and tickets, and include backlinks from those items if relevant. - -## Code of conduct - -Please keep the tone polite & professional. For some users a discussion on the REST framework mailing list or ticket tracker may be their first engagement with the open source community. First impressions count, so let's try to make everyone feel welcome. - -Be mindful in the language you choose. As an example, in an environment that is heavily male-dominated, posts that start 'Hey guys,' can come across as unintentionally exclusive. It's just as easy, and more inclusive to use gender neutral language in those situations. (e.g. 'Hey folks,') - -The [Django code of conduct][code-of-conduct] gives a fuller set of guidelines for participating in community forums. - -# Issues - -It's really helpful if you can make sure to address issues on the correct channel. Usage questions should be directed to the [discussion group][google-group]. Feature requests, bug reports and other issues should be raised on the GitHub [issue tracker][issues]. - -Some tips on good issue reporting: - -* When describing issues try to phrase your ticket in terms of the *behavior* you think needs changing rather than the *code* you think need changing. -* Search the issue list first for related items, and make sure you're running the latest version of REST framework before reporting an issue. -* If reporting a bug, then try to include a pull request with a failing test case. This will help us quickly identify if there is a valid issue, and make sure that it gets fixed more quickly if there is one. -* Feature requests will often be closed with a recommendation that they be implemented outside of the core REST framework library. Keeping new feature requests implemented as third party libraries allows us to keep down the maintenance overhead of REST framework, so that the focus can be on continued stability, bug fixes, and great documentation. -* Closing an issue doesn't necessarily mean the end of a discussion. If you believe your issue has been closed incorrectly, explain why and we'll consider if it needs to be reopened. - -## Triaging issues - -Getting involved in triaging incoming issues is a good way to start contributing. Every single ticket that comes into the ticket tracker needs to be reviewed in order to determine what the next steps should be. Anyone can help out with this, you just need to be willing to: - -* Read through the ticket - does it make sense, is it missing any context that would help explain it better? -* Is the ticket reported in the correct place, would it be better suited as a discussion on the discussion group? -* If the ticket is a bug report, can you reproduce it? Are you able to write a failing test case that demonstrates the issue and that can be submitted as a pull request? -* If the ticket is a feature request, do you agree with it, and could the feature request instead be implemented as a third party package? -* If a ticket hasn't had much activity and it addresses something you need, then comment on the ticket and try to find out what's needed to get it moving again. - -# Development - -To start developing on Django REST framework, clone the repo: - - git clone https://github.com/encode/django-rest-framework - -Changes should broadly follow the [PEP 8][pep-8] style conventions, and we recommend you set up your editor to automatically indicate non-conforming styles. - -## Testing - -To run the tests, clone the repository, and then: - - # Setup the virtual environment - python3 -m venv env - source env/bin/activate - pip install django - pip install -r requirements.txt - - # Run the tests - ./runtests.py - -### Test options - -Run using a more concise output style. - - ./runtests.py -q - -Run the tests using a more concise output style, no coverage, no flake8. - - ./runtests.py --fast - -Don't run the flake8 code linting. - - ./runtests.py --nolint - -Only run the flake8 code linting, don't run the tests. - - ./runtests.py --lintonly - -Run the tests for a given test case. - - ./runtests.py MyTestCase - -Run the tests for a given test method. - - ./runtests.py MyTestCase.test_this_method - -Shorter form to run the tests for a given test method. - - ./runtests.py test_this_method - -Note: The test case and test method matching is fuzzy and will sometimes run other tests that contain a partial string match to the given command line input. - -### Running against multiple environments - -You can also use the excellent [tox][tox] testing tool to run the tests against all supported versions of Python and Django. Install `tox` globally, and then simply run: - - tox - -## Pull requests - -It's a good idea to make pull requests early on. A pull request represents the start of a discussion, and doesn't necessarily need to be the final, finished submission. - -It's also always best to make a new branch before starting work on a pull request. This means that you'll be able to later switch back to working on another separate issue without interfering with an ongoing pull requests. - -It's also useful to remember that if you have an outstanding pull request then pushing new commits to your GitHub repo will also automatically update the pull requests. - -GitHub's documentation for working on pull requests is [available here][pull-requests]. - -Always run the tests before submitting pull requests, and ideally run `tox` in order to check that your modifications are compatible on all supported versions of Python and Django. - -Once you've made a pull request take a look at the Travis build status in the GitHub interface and make sure the tests are running as you'd expect. - -## Managing compatibility issues - -Sometimes, in order to ensure your code works on various different versions of Django, Python or third party libraries, you'll need to run slightly different code depending on the environment. Any code that branches in this way should be isolated into the `compat.py` module, and should provide a single common interface that the rest of the codebase can use. - -# Documentation - -The documentation for REST framework is built from the [Markdown][markdown] source files in [the docs directory][docs]. - -There are many great Markdown editors that make working with the documentation really easy. The [Mou editor for Mac][mou] is one such editor that comes highly recommended. - -## Building the documentation - -To build the documentation, install MkDocs with `pip install mkdocs` and then run the following command. - - mkdocs build - -This will build the documentation into the `site` directory. - -You can build the documentation and open a preview in a browser window by using the `serve` command. - - mkdocs serve - -## Language style - -Documentation should be in American English. The tone of the documentation is very important - try to stick to a simple, plain, objective and well-balanced style where possible. - -Some other tips: - -* Keep paragraphs reasonably short. -* Don't use abbreviations such as 'e.g.' but instead use the long form, such as 'For example'. - -## Markdown style - -There are a couple of conventions you should follow when working on the documentation. - -##### 1. Headers - -Headers should use the hash style. For example: - - ### Some important topic - -The underline style should not be used. **Don't do this:** - - Some important topic - ==================== - -##### 2. Links - -Links should always use the reference style, with the referenced hyperlinks kept at the end of the document. - - Here is a link to [some other thing][other-thing]. - - More text... - - [other-thing]: http://example.com/other/thing - -This style helps keep the documentation source consistent and readable. - -If you are hyperlinking to another REST framework document, you should use a relative link, and link to the `.md` suffix. For example: - - [authentication]: ../api-guide/authentication.md - -Linking in this style means you'll be able to click the hyperlink in your Markdown editor to open the referenced document. When the documentation is built, these links will be converted into regular links to HTML pages. - -##### 3. Notes - -If you want to draw attention to a note or warning, use a pair of enclosing lines, like so: - - --- - - **Note:** A useful documentation note. - - --- - - -[cite]: https://www.w3.org/People/Berners-Lee/FAQ.html -[code-of-conduct]: https://www.djangoproject.com/conduct/ -[google-group]: https://groups.google.com/forum/?fromgroups#!forum/django-rest-framework -[so-filter]: https://stackexchange.com/filters/66475/rest-framework -[issues]: https://github.com/encode/django-rest-framework/issues?state=open -[pep-8]: https://www.python.org/dev/peps/pep-0008/ -[pull-requests]: https://help.github.com/articles/using-pull-requests -[tox]: https://tox.readthedocs.io/en/latest/ -[markdown]: https://daringfireball.net/projects/markdown/basics -[docs]: https://github.com/encode/django-rest-framework/tree/master/docs -[mou]: http://mouapp.com/ +See the [Contributing guide in the documentation](https://www.django-rest-framework.org/community/contributing/). diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md index 70673c6c1..e9230d5c9 100644 --- a/PULL_REQUEST_TEMPLATE.md +++ b/PULL_REQUEST_TEMPLATE.md @@ -1,4 +1,4 @@ -*Note*: Before submitting this pull request, please review our [contributing guidelines](https://github.com/encode/django-rest-framework/blob/master/CONTRIBUTING.md#pull-requests). +*Note*: Before submitting this pull request, please review our [contributing guidelines](https://www.django-rest-framework.org/community/contributing/#pull-requests). ## Description From aa12a5f967705f70b1dbe457bb2396d106e3570b Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Mon, 5 Apr 2021 12:08:52 +0100 Subject: [PATCH 121/303] Lint with pre-commit (#7900) Following [my comment here](https://github.com/encode/django-rest-framework/pull/7589#issuecomment-813301322) and [Django's own move to pre-commit](https://docs.djangoproject.com/en/dev/internals/contributing/writing-code/coding-style/#pre-commit-checks). * Add pre-commit config file to run flake8 and isort. * Add extra "common sense" hooks. * Run pre-commit on GitHub actions using the [official action](https://github.com/pre-commit/action/). This is a good way to get up-and-running but it would be better if we activated [pre-commit.ci](https://pre-commit.ci/), which is faster and will auto-update the hooks for us going forwards. * Remove `runtests.py` code for running linting tools. * Remove `runtests.py --fast` flag, since that would now just run `pytest -q`, which can be done with `runtests.py -q` instead. * Remove tox configuration and requirements files for linting. * Update the contributing guide to mention setting up pre-commit. --- .github/workflows/pre-commit.yml | 24 +++++++++ .gitignore | 3 +- .pre-commit-config.yaml | 20 +++++++ .travis.yml | 1 - docs/community/contributing.md | 22 ++++---- requirements.txt | 1 - requirements/requirements-codestyle.txt | 6 --- runtests.py | 70 +------------------------ tox.ini | 12 ++--- 9 files changed, 59 insertions(+), 100 deletions(-) create mode 100644 .github/workflows/pre-commit.yml create mode 100644 .pre-commit-config.yaml delete mode 100644 requirements/requirements-codestyle.txt diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml new file mode 100644 index 000000000..9c29ed056 --- /dev/null +++ b/.github/workflows/pre-commit.yml @@ -0,0 +1,24 @@ +name: pre-commit + +on: + push: + branches: + - master + pull_request: + +jobs: + pre-commit: + runs-on: ubuntu-20.04 + + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + + - uses: actions/setup-python@v2 + with: + python-version: 3.9 + + - uses: pre-commit/action@v2.0.0 + with: + token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.gitignore b/.gitignore index 82e885ede..7cb1eb249 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,7 @@ MANIFEST coverage.* +!.github !.gitignore +!.pre-commit-config.yaml !.travis.yml -!.isort.cfg diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 000000000..0fc181b10 --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,20 @@ +repos: +- repo: https://github.com/pre-commit/pre-commit-hooks + rev: v3.4.0 + hooks: + - id: check-added-large-files + - id: check-case-conflict + - id: check-json + - id: check-merge-conflict + - id: check-symlinks + - id: check-toml +- repo: https://github.com/pycqa/isort + rev: 5.8.0 + hooks: + - id: isort +- repo: https://gitlab.com/pycqa/flake8 + rev: 3.9.0 + hooks: + - id: flake8 + additional_dependencies: + - flake8-tidy-imports diff --git a/.travis.yml b/.travis.yml index 57a91e594..244ab77fa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,6 @@ matrix: - { python: "3.9", env: DJANGO=main } - { python: "3.8", env: TOXENV=base } - - { python: "3.8", env: TOXENV=lint } - { python: "3.8", env: TOXENV=docs } - python: "3.8" diff --git a/docs/community/contributing.md b/docs/community/contributing.md index cb67100d2..e220f95fc 100644 --- a/docs/community/contributing.md +++ b/docs/community/contributing.md @@ -54,11 +54,19 @@ To start developing on Django REST framework, first create a Fork from the Then clone your fork. The clone command will look like this, with your GitHub username instead of YOUR-USERNAME: - git clone https://github.com/YOUR-USERNAME/Spoon-Knife + git clone https://github.com/YOUR-USERNAME/django-rest-framework See GitHub's [_Fork a Repo_][how-to-fork] Guide for more help. Changes should broadly follow the [PEP 8][pep-8] style conventions, and we recommend you set up your editor to automatically indicate non-conforming styles. +You can check your contributions against these conventions each time you commit using the [pre-commit](https://pre-commit.com/) hooks, which we also run on CI. +To set them up, first ensure you have the pre-commit tool installed, for example: + + python -m pip install pre-commit + +Then run: + + pre-commit install ## Testing @@ -79,18 +87,6 @@ Run using a more concise output style. ./runtests.py -q -Run the tests using a more concise output style, no coverage, no flake8. - - ./runtests.py --fast - -Don't run the flake8 code linting. - - ./runtests.py --nolint - -Only run the flake8 code linting, don't run the tests. - - ./runtests.py --lintonly - Run the tests for a given test case. ./runtests.py MyTestCase diff --git a/requirements.txt b/requirements.txt index b4e5ff579..395f3b7a8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,5 +9,4 @@ -r requirements/requirements-optionals.txt -r requirements/requirements-testing.txt -r requirements/requirements-documentation.txt --r requirements/requirements-codestyle.txt -r requirements/requirements-packaging.txt diff --git a/requirements/requirements-codestyle.txt b/requirements/requirements-codestyle.txt deleted file mode 100644 index d9a93884c..000000000 --- a/requirements/requirements-codestyle.txt +++ /dev/null @@ -1,6 +0,0 @@ -# PEP8 code linting, which we run on all commits. -flake8>=3.8.4,<3.9 -flake8-tidy-imports>=4.1.0,<4.2 - -# Sort and lint imports -isort>=5.6.2,<6.0 diff --git a/runtests.py b/runtests.py index 82028ea32..c340b55d8 100755 --- a/runtests.py +++ b/runtests.py @@ -1,42 +1,8 @@ #! /usr/bin/env python3 -import subprocess import sys import pytest -PYTEST_ARGS = { - 'default': [], - 'fast': ['-q'], -} - -FLAKE8_ARGS = ['rest_framework', 'tests'] - -ISORT_ARGS = ['--check-only', '--diff', 'rest_framework', 'tests'] - - -def exit_on_failure(ret, message=None): - if ret: - sys.exit(ret) - - -def flake8_main(args): - print('Running flake8 code linting') - ret = subprocess.call(['flake8'] + args) - print('flake8 failed' if ret else 'flake8 passed') - return ret - - -def isort_main(args): - print('Running isort code checking') - ret = subprocess.call(['isort'] + args) - - if ret: - print('isort failed: Some modules have incorrectly ordered imports. Fix by running `isort --recursive .`') - else: - print('isort passed') - - return ret - def split_class_and_function(string): class_string, function_string = string.split('.', 1) @@ -54,31 +20,6 @@ def is_class(string): if __name__ == "__main__": - try: - sys.argv.remove('--nolint') - except ValueError: - run_flake8 = True - run_isort = True - else: - run_flake8 = False - run_isort = False - - try: - sys.argv.remove('--lintonly') - except ValueError: - run_tests = True - else: - run_tests = False - - try: - sys.argv.remove('--fast') - except ValueError: - style = 'default' - else: - style = 'fast' - run_flake8 = False - run_isort = False - if len(sys.argv) > 1: pytest_args = sys.argv[1:] first_arg = pytest_args[0] @@ -104,14 +45,5 @@ if __name__ == "__main__": # `runtests.py TestCase [flags]` # `runtests.py test_function [flags]` pytest_args = ['tests', '-k', pytest_args[0]] + pytest_args[1:] - else: - pytest_args = PYTEST_ARGS[style] - if run_tests: - exit_on_failure(pytest.main(pytest_args)) - - if run_flake8: - exit_on_failure(flake8_main(FLAKE8_ARGS)) - - if run_isort: - exit_on_failure(isort_main(ISORT_ARGS)) + sys.exit(pytest.main(pytest_args)) diff --git a/tox.ini b/tox.ini index df16cf947..fc44b52d2 100644 --- a/tox.ini +++ b/tox.ini @@ -5,7 +5,7 @@ envlist = {py36,py37,py38,py39}-django31, {py36,py37,py38,py39}-django32, {py38,py39}-djangomain, - base,dist,lint,docs, + base,dist,docs, [travis:env] DJANGO = @@ -16,7 +16,7 @@ DJANGO = main: djangomain [testenv] -commands = python -W error::DeprecationWarning -W error::PendingDeprecationWarning runtests.py --fast --coverage {posargs} +commands = python -W error::DeprecationWarning -W error::PendingDeprecationWarning runtests.py --coverage {posargs} envdir = {toxworkdir}/venvs/{envname} setenv = PYTHONDONTWRITEBYTECODE=1 @@ -37,18 +37,12 @@ deps = -rrequirements/requirements-testing.txt [testenv:dist] -commands = ./runtests.py --fast --no-pkgroot --staticfiles {posargs} +commands = ./runtests.py --no-pkgroot --staticfiles {posargs} deps = django -rrequirements/requirements-testing.txt -rrequirements/requirements-optionals.txt -[testenv:lint] -commands = ./runtests.py --lintonly -deps = - -rrequirements/requirements-codestyle.txt - -rrequirements/requirements-testing.txt - [testenv:docs] skip_install = true commands = mkdocs build From 37ef62b0e650dfa4cb61416ec646fd67ebe1d565 Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Mon, 5 Apr 2021 18:18:35 +0100 Subject: [PATCH 122/303] Remove link to third party cookiecutter template (#7902) The template has not been maintained for six years, so it's out of date on versions and various "best practices" (e.g. pre-commit). I also think any template should be documented on its own repo rather than here, especially if it's not an official maintained project. --- docs/community/third-party-packages.md | 137 +------------------------ 1 file changed, 2 insertions(+), 135 deletions(-) diff --git a/docs/community/third-party-packages.md b/docs/community/third-party-packages.md index 046966594..63a5c4f5f 100644 --- a/docs/community/third-party-packages.md +++ b/docs/community/third-party-packages.md @@ -14,142 +14,9 @@ We aim to make creating third party packages as easy as possible, whilst keeping If you have an idea for a new feature please consider how it may be packaged as a Third Party Package. We're always happy to discuss ideas on the [Mailing List][discussion-group]. -## How to create a Third Party Package +## Creating a Third Party Package -### Creating your package - -You can use [this cookiecutter template][cookiecutter] for creating reusable Django REST Framework packages quickly. Cookiecutter creates projects from project templates. While optional, this cookiecutter template includes best practices from Django REST framework and other packages, as well as a Travis CI configuration, Tox configuration, and a sane setup.py for easy PyPI registration/distribution. - -Note: Let us know if you have an alternate cookiecutter package so we can also link to it. - -#### Running the initial cookiecutter command - -To run the initial cookiecutter command, you'll first need to install the Python `cookiecutter` package. - - $ pip install cookiecutter - -Once `cookiecutter` is installed just run the following to create a new project. - - $ cookiecutter gh:jpadilla/cookiecutter-django-rest-framework - -You'll be prompted for some questions, answer them, then it'll create your Python package in the current working directory based on those values. - - full_name (default is "Your full name here")? Johnny Appleseed - email (default is "you@example.com")? jappleseed@example.com - github_username (default is "yourname")? jappleseed - pypi_project_name (default is "dj-package")? djangorestframework-custom-auth - repo_name (default is "dj-package")? django-rest-framework-custom-auth - app_name (default is "djpackage")? custom_auth - project_short_description (default is "Your project description goes here")? - year (default is "2014")? - version (default is "0.1.0")? - -#### Getting it onto GitHub - -To put your project up on GitHub, you'll need a repository for it to live in. You can create a new repository [here][new-repo]. If you need help, check out the [Create A Repo][create-a-repo] article on GitHub. - - -#### Adding to Travis CI - -We recommend using [Travis CI][travis-ci], a hosted continuous integration service which integrates well with GitHub and is free for public repositories. - -To get started with Travis CI, [sign in][travis-ci] with your GitHub account. Once you're signed in, go to your [profile page][travis-profile] and enable the service hook for the repository you want. - -If you use the cookiecutter template, your project will already contain a `.travis.yml` file which Travis CI will use to build your project and run tests. By default, builds are triggered every time you push to your repository or create Pull Request. - -#### Uploading to PyPI - -Once you've got at least a prototype working and tests running, you should publish it on PyPI to allow others to install it via `pip`. - -You must [register][pypi-register] an account before publishing to PyPI. - -To register your package on PyPI run the following command. - - $ python setup.py register - -If this is the first time publishing to PyPI, you'll be prompted to login. - -Note: Before publishing you'll need to make sure you have the latest pip that supports `wheel` as well as install the `wheel` package. - - $ pip install --upgrade pip - $ pip install wheel - -After this, every time you want to release a new version on PyPI just run the following command. - - $ python setup.py publish - You probably want to also tag the version now: - git tag -a {0} -m 'version 0.1.0' - git push --tags - -After releasing a new version to PyPI, it's always a good idea to tag the version and make available as a GitHub Release. - -We recommend to follow [Semantic Versioning][semver] for your package's versions. - -### Development - -#### Version requirements - -The cookiecutter template assumes a set of supported versions will be provided for Python and Django. Make sure you correctly update your requirements, docs, `tox.ini`, `.travis.yml`, and `setup.py` to match the set of versions you wish to support. - -#### Tests - -The cookiecutter template includes a `runtests.py` which uses the `pytest` package as a test runner. - -Before running, you'll need to install a couple test requirements. - - $ pip install -r requirements.txt - -Once requirements installed, you can run `runtests.py`. - - $ ./runtests.py - -Run using a more concise output style. - - $ ./runtests.py -q - -Run the tests using a more concise output style, no coverage, no flake8. - - $ ./runtests.py --fast - -Don't run the flake8 code linting. - - $ ./runtests.py --nolint - -Only run the flake8 code linting, don't run the tests. - - $ ./runtests.py --lintonly - -Run the tests for a given test case. - - $ ./runtests.py MyTestCase - -Run the tests for a given test method. - - $ ./runtests.py MyTestCase.test_this_method - -Shorter form to run the tests for a given test method. - - $ ./runtests.py test_this_method - -To run your tests against multiple versions of Python as different versions of requirements such as Django we recommend using `tox`. [Tox][tox-docs] is a generic virtualenv management and test command line tool. - -First, install `tox` globally. - - $ pip install tox - -To run `tox`, just simply run: - - $ tox - -To run a particular `tox` environment: - - $ tox -e envlist - -`envlist` is a comma-separated value to that specifies the environments to run tests against. To view a list of all possible test environments, run: - - $ tox -l - -#### Version compatibility +### Version compatibility Sometimes, in order to ensure your code works on various different versions of Django, Python or third party libraries, you'll need to run slightly different code depending on the environment. Any code that branches in this way should be isolated into a `compat.py` module, and should provide a single common interface that the rest of the codebase can use. From 90635c138f073f617516a5733946acb63254a1cf Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Tue, 6 Apr 2021 17:49:17 +0100 Subject: [PATCH 123/303] Update pre-commit for flake8 move (#7907) See: https://twitter.com/codewithanthony/status/1378746934928699396 --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 0fc181b10..5a6e554b9 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -12,7 +12,7 @@ repos: rev: 5.8.0 hooks: - id: isort -- repo: https://gitlab.com/pycqa/flake8 +- repo: https://github.com/PyCQA/flake8 rev: 3.9.0 hooks: - id: flake8 From fd017d00f938c6629d2eeb1b4d81716dff6d006e Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Tue, 6 Apr 2021 18:34:18 +0100 Subject: [PATCH 124/303] Move CI to GitHub Actions (#7903) * Recreate all the jobs on GitHub Actions * Upgrade to Ubuntu 20.04 * Upgrade base/docs/dist to Python 3.9 --- .github/workflows/main.yml | 57 ++++++++++++++++++++++++++++++++++++++ .travis.yml | 55 ------------------------------------ tox.ini | 18 ++++++++++++ 3 files changed, 75 insertions(+), 55 deletions(-) create mode 100644 .github/workflows/main.yml delete mode 100644 .travis.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 000000000..6686ce759 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,57 @@ +name: CI + +on: + push: + branches: + - main + pull_request: + +jobs: + tests: + name: Python ${{ matrix.python-version }} + runs-on: ubuntu-20.04 + + strategy: + matrix: + python-version: + - '3.6' + - '3.7' + - '3.8' + - '3.9' + + steps: + - uses: actions/checkout@v2 + + - uses: actions/setup-python@v2 + with: + python-version: ${{ matrix.python-version }} + + - uses: actions/cache@v2 + with: + path: ~/.cache/pip + key: ${{ runner.os }}-pip-${{ hashFiles('requirements/*.txt') }} + restore-keys: | + ${{ runner.os }}-pip- + + - name: Upgrade packaging tools + run: python -m pip install --upgrade pip setuptools virtualenv wheel + + - name: Install dependencies + run: python -m pip install --upgrade codecov tox + + - name: Run tox targets for ${{ matrix.python-version }} + run: | + ENV_PREFIX=$(tr -C -d "0-9" <<< "${{ matrix.python-version }}") + TOXENV=$(tox --listenvs | grep "^py$ENV_PREFIX" | tr '\n' ',') tox + + - name: Run extra tox targets + if: ${{ matrix.python-version == '3.9' }} + run: | + python setup.py bdist_wheel + rm -r djangorestframework.egg-info # see #6139 + tox -e base,dist,docs + tox -e dist --installpkg ./dist/djangorestframework-*.whl + + - name: Upload coverage + run: | + codecov -e TOXENV,DJANGO diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 244ab77fa..000000000 --- a/.travis.yml +++ /dev/null @@ -1,55 +0,0 @@ -language: python -cache: pip -dist: bionic -matrix: - fast_finish: true - include: - - - { python: "3.5", env: DJANGO=2.2 } - - - { python: "3.6", env: DJANGO=2.2 } - - { python: "3.6", env: DJANGO=3.0 } - - { python: "3.6", env: DJANGO=3.1 } - - { python: "3.6", env: DJANGO=3.2 } - - - { python: "3.7", env: DJANGO=2.2 } - - { python: "3.7", env: DJANGO=3.0 } - - { python: "3.7", env: DJANGO=3.1 } - - { python: "3.7", env: DJANGO=3.2 } - - - { python: "3.8", env: DJANGO=3.0 } - - { python: "3.8", env: DJANGO=3.1 } - - { python: "3.8", env: DJANGO=3.2 } - - { python: "3.8", env: DJANGO=main } - - - { python: "3.9", env: DJANGO=3.1 } - - { python: "3.9", env: DJANGO=3.2 } - - { python: "3.9", env: DJANGO=main } - - - { python: "3.8", env: TOXENV=base } - - { python: "3.8", env: TOXENV=docs } - - - python: "3.8" - env: TOXENV=dist - script: - - python setup.py bdist_wheel - - rm -r djangorestframework.egg-info # see #6139 - - tox --installpkg ./dist/djangorestframework-*.whl - - tox # test sdist - - allow_failures: - - env: DJANGO=main - - env: DJANGO=3.2 - -install: - - pip install tox tox-travis - -script: - - tox - -after_success: - - pip install codecov - - codecov -e TOXENV,DJANGO - -notifications: - email: false diff --git a/tox.ini b/tox.ini index fc44b52d2..bf4de90d0 100644 --- a/tox.ini +++ b/tox.ini @@ -49,3 +49,21 @@ commands = mkdocs build deps = -rrequirements/requirements-testing.txt -rrequirements/requirements-documentation.txt + +[testenv:py36-django32] +ignore_outcome = true + +[testenv:py37-django32] +ignore_outcome = true + +[testenv:py38-django32] +ignore_outcome = true + +[testenv:py39-django32] +ignore_outcome = true + +[testenv:py38-djangomain] +ignore_outcome = true + +[testenv:py39-djangomain] +ignore_outcome = true From 9bdd6125a1fb1a0c429ce3ee0b68fe5d409fd1fe Mon Sep 17 00:00:00 2001 From: Lalit Suthar Date: Mon, 12 Apr 2021 16:29:58 +0530 Subject: [PATCH 125/303] fix broken article link (#7918) Co-authored-by: lalit97 --- docs/community/tutorials-and-resources.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/community/tutorials-and-resources.md b/docs/community/tutorials-and-resources.md index cfd3ba852..dae292f50 100644 --- a/docs/community/tutorials-and-resources.md +++ b/docs/community/tutorials-and-resources.md @@ -95,7 +95,7 @@ Want your Django REST Framework talk/tutorial/article to be added to our website [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 [web-api-performance-profiling-django-rest-framework]: https://www.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/ +[api-development-with-django-and-django-rest-framework]: https://bnotions.com/news-and-insights/api-development-with-django-and-django-rest-framework/ [cdrf.co]:http://www.cdrf.co [medium-django-rest-framework]: https://medium.com/django-rest-framework [django-rest-framework-course]: https://teamtreehouse.com/library/django-rest-framework From 1c494e3d944796bef5ec27348a617afeaad792b9 Mon Sep 17 00:00:00 2001 From: Terence Honles Date: Mon, 12 Apr 2021 05:14:26 -0700 Subject: [PATCH 126/303] Update references to Travis CI after moving to Github Actions (#7909) x-ref: https://github.com/encode/django-rest-framework/pull/7903 --- .gitignore | 1 - README.md | 6 +++--- docs/community/contributing.md | 8 ++++---- docs/community/third-party-packages.md | 2 -- docs/img/build-status.png | Bin 0 -> 12443 bytes docs/img/travis-status.png | Bin 10023 -> 0 bytes docs/index.md | 4 ++-- docs_theme/css/default.css | 2 +- 8 files changed, 10 insertions(+), 13 deletions(-) create mode 100644 docs/img/build-status.png delete mode 100644 docs/img/travis-status.png diff --git a/.gitignore b/.gitignore index 7cb1eb249..641714d16 100644 --- a/.gitignore +++ b/.gitignore @@ -18,4 +18,3 @@ coverage.* !.github !.gitignore !.pre-commit-config.yaml -!.travis.yml diff --git a/README.md b/README.md index 305f92389..ff76a5525 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # [Django REST framework][docs] -[![build-status-image]][travis] +[![build-status-image]][build-status] [![coverage-status-image]][codecov] [![pypi-version]][pypi] @@ -176,8 +176,8 @@ You may also want to [follow the author on Twitter][twitter]. Please see the [security policy][security-policy]. -[build-status-image]: https://secure.travis-ci.org/encode/django-rest-framework.svg?branch=master -[travis]: https://travis-ci.org/encode/django-rest-framework?branch=master +[build-status-image]: https://github.com/encode/django-rest-framework/actions/workflows/main.yml/badge.svg +[build-status]: https://github.com/encode/django-rest-framework/actions/workflows/main.yml [coverage-status-image]: https://img.shields.io/codecov/c/github/encode/django-rest-framework/master.svg [codecov]: https://codecov.io/github/encode/django-rest-framework?branch=master [pypi-version]: https://img.shields.io/pypi/v/djangorestframework.svg diff --git a/docs/community/contributing.md b/docs/community/contributing.md index e220f95fc..de1f8db0f 100644 --- a/docs/community/contributing.md +++ b/docs/community/contributing.md @@ -119,11 +119,11 @@ GitHub's documentation for working on pull requests is [available here][pull-req Always run the tests before submitting pull requests, and ideally run `tox` in order to check that your modifications are compatible on all supported versions of Python and Django. -Once you've made a pull request take a look at the Travis build status in the GitHub interface and make sure the tests are running as you'd expect. +Once you've made a pull request take a look at the build status in the GitHub interface and make sure the tests are running as you'd expect. -![Travis status][travis-status] +![Build status][build-status] -*Above: Travis build notifications* +*Above: build notifications* ## Managing compatibility issues @@ -206,7 +206,7 @@ If you want to draw attention to a note or warning, use a pair of enclosing line [so-filter]: https://stackexchange.com/filters/66475/rest-framework [issues]: https://github.com/encode/django-rest-framework/issues?state=open [pep-8]: https://www.python.org/dev/peps/pep-0008/ -[travis-status]: ../img/travis-status.png +[build-status]: ../img/build-status.png [pull-requests]: https://help.github.com/articles/using-pull-requests [tox]: https://tox.readthedocs.io/en/latest/ [markdown]: https://daringfireball.net/projects/markdown/basics diff --git a/docs/community/third-party-packages.md b/docs/community/third-party-packages.md index 63a5c4f5f..e53fc3d50 100644 --- a/docs/community/third-party-packages.md +++ b/docs/community/third-party-packages.md @@ -152,8 +152,6 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque [cookiecutter]: https://github.com/jpadilla/cookiecutter-django-rest-framework [new-repo]: https://github.com/new [create-a-repo]: https://help.github.com/articles/create-a-repo/ -[travis-ci]: https://travis-ci.org -[travis-profile]: https://travis-ci.org/profile [pypi-register]: https://pypi.org/account/register/ [semver]: https://semver.org/ [tox-docs]: https://tox.readthedocs.io/en/latest/ diff --git a/docs/img/build-status.png b/docs/img/build-status.png new file mode 100644 index 0000000000000000000000000000000000000000..bb043cb9e957085d8f693138b9625dc6095439fc GIT binary patch literal 12443 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 literal 0 HcmV?d00001 diff --git a/docs/img/travis-status.png b/docs/img/travis-status.png deleted file mode 100644 index fec98cf9b2ba728a532df7b50b89f505053e9012..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10023 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 - - + + diff --git a/docs_theme/css/default.css b/docs_theme/css/default.css index 992bc60a4..7006f2a66 100644 --- a/docs_theme/css/default.css +++ b/docs_theme/css/default.css @@ -37,7 +37,7 @@ body.index-page #main-content iframe.github-star-button { margin-right: -15px; } -/* Travis CI and PyPI badge */ +/* CI and PyPI badge */ body.index-page #main-content img.status-badge { float: right; margin-right: 8px; From f628db383a1cb47e7910ac2547d4dd53f0902211 Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Fri, 16 Apr 2021 17:23:18 +0100 Subject: [PATCH 127/303] Fix GitHub Actions to run on 'master' branch (#7926) The config I copied in #7903 was from a repo with the new name 'main', so tests have not been running on master since. --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6686ce759..1c9e49e34 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -3,7 +3,7 @@ name: CI on: push: branches: - - main + - master pull_request: jobs: From a0a2c5cb370ff80a95deaa8d23f099acc4e5e0c5 Mon Sep 17 00:00:00 2001 From: Terence Honles Date: Fri, 16 Apr 2021 09:27:22 -0700 Subject: [PATCH 128/303] Fix tests with mock timezone (#7911) After django/django#13877, Django no longer checks for `hasattr(timezone, 'localize')` and instead does an inheritance check. --- tests/test_fields.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_fields.py b/tests/test_fields.py index 5842553f0..78a9effb8 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -1485,7 +1485,7 @@ class TestNaiveDayLightSavingTimeTimeZoneDateTimeField(FieldValues): } outputs = {} - class MockTimezone: + class MockTimezone(pytz.BaseTzInfo): @staticmethod def localize(value, is_dst): raise pytz.InvalidTimeError() From 67b5093ca526d219b8f25abf427161e154c23c6e Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Fri, 16 Apr 2021 17:47:21 +0100 Subject: [PATCH 129/303] Fix pytest warnings (#7928) * Use `--strict-markers` instead of `--strict`, as per this warning: ``` /.../_pytest/config/__init__.py:1183: PytestDeprecationWarning: The --strict option is deprecated, use --strict-markers instead. ``` * Remove config option 'testspath' - pytest is logging a warning about this being unknown: ``` /.../_pytest/config/__init__.py:1233: PytestConfigWarning: Unknown config option: testspath ``` I can't find any reference to it in the pytest docs or changelog. --- setup.cfg | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/setup.cfg b/setup.cfg index abb7cca90..46ffb13c5 100644 --- a/setup.cfg +++ b/setup.cfg @@ -2,8 +2,7 @@ license_file = LICENSE.md [tool:pytest] -addopts=--tb=short --strict -ra -testspath = tests +addopts=--tb=short --strict-markers -ra [flake8] ignore = E501,W504 From 010c8d4f084c1c3c5f712e731351604f301d6906 Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Fri, 16 Apr 2021 17:59:27 +0100 Subject: [PATCH 130/303] Use tox-py in CI (#7925) --- .github/workflows/main.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1c9e49e34..fc166c434 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -37,12 +37,10 @@ jobs: run: python -m pip install --upgrade pip setuptools virtualenv wheel - name: Install dependencies - run: python -m pip install --upgrade codecov tox + run: python -m pip install --upgrade codecov tox tox-py - name: Run tox targets for ${{ matrix.python-version }} - run: | - ENV_PREFIX=$(tr -C -d "0-9" <<< "${{ matrix.python-version }}") - TOXENV=$(tox --listenvs | grep "^py$ENV_PREFIX" | tr '\n' ',') tox + run: tox --py current - name: Run extra tox targets if: ${{ matrix.python-version == '3.9' }} From 8812394ed83d7cce0ed5b2c5fcf093269d364b9b Mon Sep 17 00:00:00 2001 From: Denis Orehovsky Date: Tue, 20 Apr 2021 17:03:16 +0300 Subject: [PATCH 131/303] Add distinction between request and response serializers for OpenAPI (#7424) * Add distinction between request and response serializers * Add docs * document new functions in schemas.md * add a test case for different request vs response objects * Correct formatting for flake8 Co-authored-by: Shaun Gosse --- docs/api-guide/schemas.md | 14 +++++ rest_framework/schemas/openapi.py | 37 +++++++++++--- tests/schemas/test_openapi.py | 85 +++++++++++++++++++++++++++++++ 3 files changed, 128 insertions(+), 8 deletions(-) diff --git a/docs/api-guide/schemas.md b/docs/api-guide/schemas.md index b4832b369..acf2ecb93 100644 --- a/docs/api-guide/schemas.md +++ b/docs/api-guide/schemas.md @@ -375,6 +375,20 @@ operationIds. In order to work around this, you can override `get_operation_id_base()` to provide a different base for name part of the ID. +#### `get_serializer()` + +If the view has implemented `get_serializer()`, returns the result. + +#### `get_request_serializer()` + +By default returns `get_serializer()` but can be overridden to +differentiate between request and response objects. + +#### `get_response_serializer()` + +By default returns `get_serializer()` but can be overridden to +differentiate between request and response objects. + ### `AutoSchema.__init__()` kwargs `AutoSchema` provides a number of `__init__()` kwargs that can be used for diff --git a/rest_framework/schemas/openapi.py b/rest_framework/schemas/openapi.py index 4ecb7a65f..5e9d59f8b 100644 --- a/rest_framework/schemas/openapi.py +++ b/rest_framework/schemas/openapi.py @@ -192,15 +192,22 @@ class AutoSchema(ViewInspector): if method.lower() == 'delete': return {} - serializer = self.get_serializer(path, method) + request_serializer = self.get_request_serializer(path, method) + response_serializer = self.get_response_serializer(path, method) - if not isinstance(serializer, serializers.Serializer): - return {} + components = {} - component_name = self.get_component_name(serializer) + if isinstance(request_serializer, serializers.Serializer): + component_name = self.get_component_name(request_serializer) + content = self.map_serializer(request_serializer) + components.setdefault(component_name, content) - content = self.map_serializer(serializer) - return {component_name: content} + if isinstance(response_serializer, serializers.Serializer): + component_name = self.get_component_name(response_serializer) + content = self.map_serializer(response_serializer) + components.setdefault(component_name, content) + + return components def _to_camel_case(self, snake_str): components = snake_str.split('_') @@ -615,6 +622,20 @@ class AutoSchema(ViewInspector): .format(view.__class__.__name__, method, path)) return None + def get_request_serializer(self, path, method): + """ + Override this method if your view uses a different serializer for + handling request body. + """ + return self.get_serializer(path, method) + + def get_response_serializer(self, path, method): + """ + Override this method if your view uses a different serializer for + populating response data. + """ + return self.get_serializer(path, method) + def _get_reference(self, serializer): return {'$ref': '#/components/schemas/{}'.format(self.get_component_name(serializer))} @@ -624,7 +645,7 @@ class AutoSchema(ViewInspector): self.request_media_types = self.map_parsers(path, method) - serializer = self.get_serializer(path, method) + serializer = self.get_request_serializer(path, method) if not isinstance(serializer, serializers.Serializer): item_schema = {} @@ -648,7 +669,7 @@ class AutoSchema(ViewInspector): self.response_media_types = self.map_renderers(path, method) - serializer = self.get_serializer(path, method) + serializer = self.get_response_serializer(path, method) if not isinstance(serializer, serializers.Serializer): item_schema = {} diff --git a/tests/schemas/test_openapi.py b/tests/schemas/test_openapi.py index 871eb1b30..aef20670e 100644 --- a/tests/schemas/test_openapi.py +++ b/tests/schemas/test_openapi.py @@ -712,6 +712,91 @@ class TestOperationIntrospection(TestCase): operationId = inspector.get_operation_id(path, method) assert operationId == 'listItem' + def test_different_request_response_objects(self): + class RequestSerializer(serializers.Serializer): + text = serializers.CharField() + + class ResponseSerializer(serializers.Serializer): + text = serializers.BooleanField() + + class CustomSchema(AutoSchema): + def get_request_serializer(self, path, method): + return RequestSerializer() + + def get_response_serializer(self, path, method): + return ResponseSerializer() + + path = '/' + method = 'POST' + view = create_view( + views.ExampleGenericAPIView, + method, + create_request(path), + ) + inspector = CustomSchema() + inspector.view = view + + components = inspector.get_components(path, method) + assert components == { + 'Request': { + 'properties': { + 'text': { + 'type': 'string' + } + }, + 'required': ['text'], + 'type': 'object' + }, + 'Response': { + 'properties': { + 'text': { + 'type': 'boolean' + } + }, + 'required': ['text'], + 'type': 'object' + } + } + + operation = inspector.get_operation(path, method) + assert operation == { + 'operationId': 'createExample', + 'description': '', + 'parameters': [], + 'requestBody': { + 'content': { + 'application/json': { + 'schema': { + '$ref': '#/components/schemas/Request' + } + }, + 'application/x-www-form-urlencoded': { + 'schema': { + '$ref': '#/components/schemas/Request' + } + }, + 'multipart/form-data': { + 'schema': { + '$ref': '#/components/schemas/Request' + } + } + } + }, + 'responses': { + '201': { + 'content': { + 'application/json': { + 'schema': { + '$ref': '#/components/schemas/Response' + } + } + }, + 'description': '' + } + }, + 'tags': [''] + } + def test_repeat_operation_ids(self): router = routers.SimpleRouter() router.register('account', views.ExampleGenericViewSet, basename="account") From 431f7dfa3dc108d449044a6c9eef715416d53059 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Skar=C5=BCy=C5=84ski?= Date: Fri, 23 Apr 2021 10:34:58 +0200 Subject: [PATCH 132/303] fix typo in packaging requirements (#7949) --- requirements/requirements-packaging.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/requirements-packaging.txt b/requirements/requirements-packaging.txt index 3489c76ec..fae03baab 100644 --- a/requirements/requirements-packaging.txt +++ b/requirements/requirements-packaging.txt @@ -5,4 +5,4 @@ wheel>=0.35.1,<0.36 twine>=3.2.0,<3.3 # Transifex client for managing translation resources. -transifex-clien>=0.13.12,<0.14 +transifex-client>=0.13.12,<0.14 From a0083f7f9867113a37a5096a06ee69344781075a Mon Sep 17 00:00:00 2001 From: Julien Palard Date: Mon, 26 Apr 2021 10:30:41 +0200 Subject: [PATCH 133/303] FIX: Broken cite. (#7951) --- docs/api-guide/schemas.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/api-guide/schemas.md b/docs/api-guide/schemas.md index acf2ecb93..b9de6745f 100644 --- a/docs/api-guide/schemas.md +++ b/docs/api-guide/schemas.md @@ -421,6 +421,7 @@ If your views have related customizations that are needed frequently, you can create a base `AutoSchema` subclass for your project that takes additional `__init__()` kwargs to save subclassing `AutoSchema` for each view. +[cite]: https://blog.heroku.com/archives/2014/1/8/json_schema_for_heroku_platform_api [openapi]: https://github.com/OAI/OpenAPI-Specification [openapi-specification-extensions]: https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.2.md#specification-extensions [openapi-operation]: https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.2.md#operationObject From 3875d3284e73ed4d8e36c07d9b70c1b22c9d5998 Mon Sep 17 00:00:00 2001 From: Ishu Kumar Date: Mon, 10 May 2021 16:56:26 +0530 Subject: [PATCH 134/303] Punctuations and missing "to" preposition (#7966) Changes made in lines 221, 222, 223, and 224 for better readability. --- docs/api-guide/pagination.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/api-guide/pagination.md b/docs/api-guide/pagination.md index 8d9eb2288..632af6a82 100644 --- a/docs/api-guide/pagination.md +++ b/docs/api-guide/pagination.md @@ -218,10 +218,10 @@ To set these attributes you should override the `CursorPagination` class, and th # Custom pagination styles -To create a custom pagination serializer class you should subclass `pagination.BasePagination` and override the `paginate_queryset(self, queryset, request, view=None)` and `get_paginated_response(self, data)` methods: +To create a custom pagination serializer class, you should inherit the subclass `pagination.BasePagination`, override the `paginate_queryset(self, queryset, request, view=None)`, and `get_paginated_response(self, data)` methods: -* The `paginate_queryset` method is passed the initial queryset and should return an iterable object that contains only the data in the requested page. -* The `get_paginated_response` method is passed the serialized page data and should return a `Response` instance. +* The `paginate_queryset` method is passed to the initial queryset and should return an iterable object. That object contains only the data in the requested page. +* The `get_paginated_response` method is passed to the serialized page data and should return a `Response` instance. Note that the `paginate_queryset` method may set state on the pagination instance, that may later be used by the `get_paginated_response` method. From bc075212cb05a52a2b2b2b4c909cfbd03c7ebd8e Mon Sep 17 00:00:00 2001 From: Mariusz Felisiak Date: Mon, 24 May 2021 09:47:44 +0200 Subject: [PATCH 135/303] Fix running runtests.py without arguments. (#7954) Regression in aa12a5f967705f70b1dbe457bb2396d106e3570b. --- runtests.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/runtests.py b/runtests.py index c340b55d8..98f34c067 100755 --- a/runtests.py +++ b/runtests.py @@ -45,5 +45,7 @@ if __name__ == "__main__": # `runtests.py TestCase [flags]` # `runtests.py test_function [flags]` pytest_args = ['tests', '-k', pytest_args[0]] + pytest_args[1:] + else: + pytest_args = [] sys.exit(pytest.main(pytest_args)) From 9d149f23177055b3b1ea12cf62de0d669739b544 Mon Sep 17 00:00:00 2001 From: Abduaziz <68025869+AbduazizZiyodov@users.noreply.github.com> Date: Wed, 2 Jun 2021 14:02:11 +0500 Subject: [PATCH 136/303] Fixed some punctuation marks & small typos (#8015) --- docs/api-guide/authentication.md | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/docs/api-guide/authentication.md b/docs/api-guide/authentication.md index 4497f73bd..60544079f 100644 --- a/docs/api-guide/authentication.md +++ b/docs/api-guide/authentication.md @@ -11,7 +11,7 @@ source: Authentication is the mechanism of associating an incoming request with a set of identifying credentials, such as the user the request came from, or the token that it was signed with. The [permission] and [throttling] policies can then use those credentials to determine if the request should be permitted. -REST framework provides a number of authentication schemes out of the box, and also allows you to implement custom schemes. +REST framework provides several authentication schemes out of the box, and also allows you to implement custom schemes. Authentication is always run at the very start of the view, before the permission and throttling checks occur, and before any other code is allowed to proceed. @@ -23,7 +23,7 @@ The `request.auth` property is used for any additional authentication informatio **Note:** Don't forget that **authentication by itself won't allow or disallow an incoming request**, it simply identifies the credentials that the request was made with. -For information on how to setup the permission polices for your API please see the [permissions documentation][permission]. +For information on how to set up the permission policies for your API please see the [permissions documentation][permission]. --- @@ -195,7 +195,7 @@ If you've already created some users, you can generate tokens for all existing u ##### By exposing an api endpoint -When using `TokenAuthentication`, you may want to provide a mechanism for clients to obtain a token given the username and password. REST framework provides a built-in view to provide this behavior. To use it, add the `obtain_auth_token` view to your URLconf: +When using `TokenAuthentication`, you may want to provide a mechanism for clients to obtain a token given the username and password. REST framework provides a built-in view to provide this behaviour. To use it, add the `obtain_auth_token` view to your URLconf: from rest_framework.authtoken import views urlpatterns += [ @@ -210,7 +210,7 @@ The `obtain_auth_token` view will return a JSON response when valid `username` a Note that the default `obtain_auth_token` view explicitly uses JSON requests and responses, rather than using default renderer and parser classes in your settings. -By default there are no permissions or throttling applied to the `obtain_auth_token` view. If you do wish to apply throttling you'll need to override the view class, +By default, there are no permissions or throttling applied to the `obtain_auth_token` view. If you do wish to apply to throttle you'll need to override the view class, and include them using the `throttle_classes` attribute. If you need a customized version of the `obtain_auth_token` view, you can do so by subclassing the `ObtainAuthToken` view class, and using that in your url conf instead. @@ -244,7 +244,7 @@ And in your `urls.py`: ##### With Django admin -It is also possible to create Tokens manually through admin interface. In case you are using a large user base, we recommend that you monkey patch the `TokenAdmin` class to customize it to your needs, more specifically by declaring the `user` field as `raw_field`. +It is also possible to create Tokens manually through the admin interface. In case you are using a large user base, we recommend that you monkey patch the `TokenAdmin` class customize it to your needs, more specifically by declaring the `user` field as `raw_field`. `your_app/admin.py`: @@ -279,11 +279,11 @@ If successfully authenticated, `SessionAuthentication` provides the following cr Unauthenticated responses that are denied permission will result in an `HTTP 403 Forbidden` response. -If you're using an AJAX style API with SessionAuthentication, you'll need to make sure you include a valid CSRF token for any "unsafe" HTTP method calls, such as `PUT`, `PATCH`, `POST` or `DELETE` requests. See the [Django CSRF documentation][csrf-ajax] for more details. +If you're using an AJAX-style API with SessionAuthentication, you'll need to make sure you include a valid CSRF token for any "unsafe" HTTP method calls, such as `PUT`, `PATCH`, `POST` or `DELETE` requests. See the [Django CSRF documentation][csrf-ajax] for more details. **Warning**: Always use Django's standard login view when creating login pages. This will ensure your login views are properly protected. -CSRF validation in REST framework works slightly differently to standard Django due to the need to support both session and non-session based authentication to the same views. This means that only authenticated requests require CSRF tokens, and anonymous requests may be sent without CSRF tokens. This behaviour is not suitable for login views, which should always have CSRF validation applied. +CSRF validation in REST framework works slightly differently from standard Django due to the need to support both session and non-session based authentication to the same views. This means that only authenticated requests require CSRF tokens, and anonymous requests may be sent without CSRF tokens. This behaviour is not suitable for login views, which should always have CSRF validation applied. ## RemoteUserAuthentication @@ -316,7 +316,7 @@ In some circumstances instead of returning `None`, you may want to raise an `Aut Typically the approach you should take is: * If authentication is not attempted, return `None`. Any other authentication schemes also in use will still be checked. -* If authentication is attempted but fails, raise a `AuthenticationFailed` exception. An error response will be returned immediately, regardless of any permissions checks, and without checking any other authentication schemes. +* If authentication is attempted but fails, raise an `AuthenticationFailed` exception. An error response will be returned immediately, regardless of any permissions checks, and without checking any other authentication schemes. You *may* also override the `.authenticate_header(self, request)` method. If implemented, it should return a string that will be used as the value of the `WWW-Authenticate` header in a `HTTP 401 Unauthorized` response. @@ -353,7 +353,7 @@ The following example will authenticate any incoming request as the user given b # Third party packages -The following third party packages are also available. +The following third-party packages are also available. ## Django OAuth Toolkit @@ -384,7 +384,7 @@ For more details see the [Django REST framework - Getting started][django-oauth- The [Django REST framework OAuth][django-rest-framework-oauth] package provides both OAuth1 and OAuth2 support for REST framework. -This package was previously included directly in REST framework but is now supported and maintained as a third party package. +This package was previously included directly in the REST framework but is now supported and maintained as a third-party package. #### Installation & configuration @@ -408,7 +408,7 @@ HTTP Signature (currently a [IETF draft][http-signature-ietf-draft]) provides a ## Djoser -[Djoser][djoser] library provides a set of views to handle basic actions such as registration, login, logout, password reset and account activation. The package works with a custom user model and it uses token based authentication. This is a ready to use REST implementation of Django authentication system. +[Djoser][djoser] library provides a set of views to handle basic actions such as registration, login, logout, password reset and account activation. The package works with a custom user model and uses token-based authentication. This is ready to use REST implementation of the Django authentication system. ## django-rest-auth / dj-rest-auth @@ -426,15 +426,15 @@ There are currently two forks of this project. ## django-rest-knox -[Django-rest-knox][django-rest-knox] library provides models and views to handle token based authentication in a more secure and extensible way than the built-in TokenAuthentication scheme - with Single Page Applications and Mobile clients in mind. It provides per-client tokens, and views to generate them when provided some other authentication (usually basic authentication), to delete the token (providing a server enforced logout) and to delete all tokens (logs out all clients that a user is logged into). +[Django-rest-knox][django-rest-knox] library provides models and views to handle token-based authentication in a more secure and extensible way than the built-in TokenAuthentication scheme - with Single Page Applications and Mobile clients in mind. It provides per-client tokens, and views to generate them when provided some other authentication (usually basic authentication), to delete the token (providing a server enforced logout) and to delete all tokens (logs out all clients that a user is logged into). ## drfpasswordless -[drfpasswordless][drfpasswordless] adds (Medium, Square Cash inspired) passwordless support to Django REST Framework's own TokenAuthentication scheme. Users log in and sign up with a token sent to a contact point like an email address or a mobile number. +[drfpasswordless][drfpasswordless] adds (Medium, Square Cash inspired) passwordless support to Django REST Framework's TokenAuthentication scheme. Users log in and sign up with a token sent to a contact point like an email address or a mobile number. ## django-rest-authemail -[django-rest-authemail][django-rest-authemail] provides a RESTful API interface for user signup and authentication. Email addresses are used for authentication, rather than usernames. API endpoints are available for signup, signup email verification, login, logout, password reset, password reset verification, email change, email change verification, password change, and user detail. A fully-functional example project and detailed instructions are included. +[django-rest-authemail][django-rest-authemail] provides a RESTful API interface for user signup and authentication. Email addresses are used for authentication, rather than usernames. API endpoints are available for signup, signup email verification, login, logout, password reset, password reset verification, email change, email change verification, password change, and user detail. A fully functional example project and detailed instructions are included. ## Django-Rest-Durin From 61e7a993bd0702d30e3049179000bc7c5f284781 Mon Sep 17 00:00:00 2001 From: Ian De Bie Date: Mon, 7 Jun 2021 04:30:23 -0500 Subject: [PATCH 137/303] fix comments by using correct css comment syntax (#8019) these intended comments were causing errors in sonarqube scans due to using wrong css comment syntax --- rest_framework/static/rest_framework/docs/css/base.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rest_framework/static/rest_framework/docs/css/base.css b/rest_framework/static/rest_framework/docs/css/base.css index 0be2bafa9..06b240c52 100644 --- a/rest_framework/static/rest_framework/docs/css/base.css +++ b/rest_framework/static/rest_framework/docs/css/base.css @@ -7,15 +7,15 @@ h1 { } pre.highlight code * { - white-space: nowrap; // this sets all children inside to nowrap + white-space: nowrap; /* this sets all children inside to nowrap */ } pre.highlight { - overflow-x: auto; // this sets the scrolling in x + overflow-x: auto; /* this sets the scrolling in x */ } pre.highlight code { - white-space: pre; // forces to respect 
 formatting
+  white-space: pre;       /* forces  to respect 
 formatting */
 }
 
 .main-container {

From 24a938abaadd98b5482bec33defd285625842342 Mon Sep 17 00:00:00 2001
From: Finn Gundlach 
Date: Wed, 16 Jun 2021 15:53:29 +0200
Subject: [PATCH 138/303] Update documentation to include Django 3.2 as
 supported version (#8037)

---
 README.md     | 2 +-
 docs/index.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index ff76a5525..fce275256 100644
--- a/README.md
+++ b/README.md
@@ -53,7 +53,7 @@ There is a live example API for testing purposes, [available here][sandbox].
 # Requirements
 
 * Python (3.5, 3.6, 3.7, 3.8, 3.9)
-* Django (2.2, 3.0, 3.1)
+* Django (2.2, 3.0, 3.1, 3.2)
 
 We **highly recommend** and only officially support the latest patch release of
 each Python and Django series.
diff --git a/docs/index.md b/docs/index.md
index 530813684..28e330250 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -84,7 +84,7 @@ continued development by **[signing up for a paid plan][funding]**.
 REST framework requires the following:
 
 * Python (3.5, 3.6, 3.7, 3.8, 3.9)
-* Django (2.2, 3.0, 3.1)
+* Django (2.2, 3.0, 3.1, 3.2)
 
 We **highly recommend** and only officially support the latest patch release of
 each Python and Django series.

From e92016ac2e926483e05e296558fc3d1ea3279625 Mon Sep 17 00:00:00 2001
From: Adam Johnson 
Date: Mon, 21 Jun 2021 11:33:43 +0100
Subject: [PATCH 139/303] Stop ignoring test outcome for Django 3.2 (#7927)

---
 requirements/requirements-optionals.txt |  2 +-
 setup.py                                |  1 +
 tox.ini                                 | 12 ------------
 3 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/requirements/requirements-optionals.txt b/requirements/requirements-optionals.txt
index 4cb0e54f4..75b9ab4d6 100644
--- a/requirements/requirements-optionals.txt
+++ b/requirements/requirements-optionals.txt
@@ -2,7 +2,7 @@
 coreapi==2.3.1
 coreschema==0.0.4
 django-filter>=2.4.0,<3.0
-django-guardian>=2.3.0,<2.4
+django-guardian>=2.4.0,<2.5
 markdown==3.3;python_version>="3.6"
 markdown==3.2.2;python_version=="3.5"
 psycopg2-binary>=2.8.5,<2.9
diff --git a/setup.py b/setup.py
index e2a1c0222..5fd4df20d 100755
--- a/setup.py
+++ b/setup.py
@@ -92,6 +92,7 @@ setup(
         'Framework :: Django :: 2.2',
         'Framework :: Django :: 3.0',
         'Framework :: Django :: 3.1',
+        'Framework :: Django :: 3.2',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: BSD License',
         'Operating System :: OS Independent',
diff --git a/tox.ini b/tox.ini
index bf4de90d0..f23486a68 100644
--- a/tox.ini
+++ b/tox.ini
@@ -50,18 +50,6 @@ deps =
        -rrequirements/requirements-testing.txt
        -rrequirements/requirements-documentation.txt
 
-[testenv:py36-django32]
-ignore_outcome = true
-
-[testenv:py37-django32]
-ignore_outcome = true
-
-[testenv:py38-django32]
-ignore_outcome = true
-
-[testenv:py39-django32]
-ignore_outcome = true
-
 [testenv:py38-djangomain]
 ignore_outcome = true
 

From c8a9c856c25a1a360a91d2c7bc11e0dacfb9c3a4 Mon Sep 17 00:00:00 2001
From: Burak Kadir Er 
Date: Mon, 28 Jun 2021 14:51:21 +0300
Subject: [PATCH 140/303] fix a small typo (#8060)

---
 docs/api-guide/renderers.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/api-guide/renderers.md b/docs/api-guide/renderers.md
index 954fb3bb9..7dbc5eee8 100644
--- a/docs/api-guide/renderers.md
+++ b/docs/api-guide/renderers.md
@@ -105,7 +105,7 @@ The TemplateHTMLRenderer will create a `RequestContext`, using the `response.dat
 
 ---
 
-**Note:** When used with a view that makes use of a serializer the `Response` sent for rendering may not be a dictionay and will need to be wrapped in a dict before returning to allow the TemplateHTMLRenderer to render it. For example:
+**Note:** When used with a view that makes use of a serializer the `Response` sent for rendering may not be a dictionary and will need to be wrapped in a dict before returning to allow the TemplateHTMLRenderer to render it. For example:
 
 ```
 response.data = {'results': response.data}

From d2977cff989f9b14f402ecf1e9235ee3d110977b Mon Sep 17 00:00:00 2001
From: Nikita Sobolev 
Date: Mon, 28 Jun 2021 15:07:41 +0300
Subject: [PATCH 141/303] Fixes inconsistent headers in `serializer` docs
 (#8056)

Some headers were using `.`, some - were not.
Now, all of them are the same with `.`, because it was easier to fix.
---
 docs/api-guide/serializers.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md
index f05fe7e7e..13c0c8710 100644
--- a/docs/api-guide/serializers.md
+++ b/docs/api-guide/serializers.md
@@ -605,13 +605,13 @@ For `ModelSerializer` this defaults to `PrimaryKeyRelatedField`.
 
 For `HyperlinkedModelSerializer` this defaults to `serializers.HyperlinkedRelatedField`.
 
-### `serializer_url_field`
+### `.serializer_url_field`
 
 The serializer field class that should be used for any `url` field on the serializer.
 
 Defaults to `serializers.HyperlinkedIdentityField`
 
-### `serializer_choice_field`
+### `.serializer_choice_field`
 
 The serializer field class that should be used for any choice fields on the serializer.
 

From 98e56e0327596db352b35fa3b3dc8355dc9bd030 Mon Sep 17 00:00:00 2001
From: Evgeny Panfilov 
Date: Thu, 1 Jul 2021 17:04:44 +0300
Subject: [PATCH 142/303] fix empty string as a value for a validated
 DecimalField (#8064) (#8067)

---
 rest_framework/fields.py |  8 +++++---
 tests/test_fields.py     | 24 ++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index e4be54751..bedc02b94 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -1046,6 +1046,11 @@ class DecimalField(Field):
                 'Invalid rounding option %s. Valid values for rounding are: %s' % (rounding, valid_roundings))
         self.rounding = rounding
 
+    def validate_empty_values(self, data):
+        if smart_str(data).strip() == '' and self.allow_null:
+            return (True, None)
+        return super().validate_empty_values(data)
+
     def to_internal_value(self, data):
         """
         Validate that the input is a decimal number and return a Decimal
@@ -1063,9 +1068,6 @@ class DecimalField(Field):
         try:
             value = decimal.Decimal(data)
         except decimal.DecimalException:
-            if data == '' and self.allow_null:
-                return None
-
             self.fail('invalid')
 
         if value.is_nan():
diff --git a/tests/test_fields.py b/tests/test_fields.py
index 78a9effb8..d99ca9c40 100644
--- a/tests/test_fields.py
+++ b/tests/test_fields.py
@@ -1163,6 +1163,30 @@ class TestMinMaxDecimalField(FieldValues):
     )
 
 
+class TestAllowEmptyStrDecimalFieldWithValidators(FieldValues):
+    """
+    Check that empty string ('', ' ') is acceptable value for the DecimalField
+    if allow_null=True and there are max/min validators
+    """
+    valid_inputs = {
+        None: None,
+        '': None,
+        ' ': None,
+        '  ': None,
+        5: Decimal('5'),
+        '0': Decimal('0'),
+        '10': Decimal('10'),
+    }
+    invalid_inputs = {
+        -1: ['Ensure this value is greater than or equal to 0.'],
+        11: ['Ensure this value is less than or equal to 10.'],
+    }
+    outputs = {
+        None: '',
+    }
+    field = serializers.DecimalField(max_digits=3, decimal_places=1, allow_null=True, min_value=0, max_value=10)
+
+
 class TestNoMaxDigitsDecimalField(FieldValues):
     field = serializers.DecimalField(
         max_value=100, min_value=0,

From b215375125980114482779b36dd825775ef7e482 Mon Sep 17 00:00:00 2001
From: Nikhil Benesch 
Date: Fri, 6 Aug 2021 05:10:58 -0400
Subject: [PATCH 143/303] Propagate nullability in ModelSerializer (#8116)

Propagate the nullability of underlying model fields in ModelSerializer
when those fields are marked as read only. This ensures the correct
generation of OpenAPI schemas.

Fix #8041.
---
 rest_framework/serializers.py |  5 ++---
 tests/schemas/test_openapi.py | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index 49eec8259..9ea57f1af 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -1326,9 +1326,8 @@ class ModelSerializer(Serializer):
         """
         if extra_kwargs.get('read_only', False):
             for attr in [
-                'required', 'default', 'allow_blank', 'allow_null',
-                'min_length', 'max_length', 'min_value', 'max_value',
-                'validators', 'queryset'
+                'required', 'default', 'allow_blank', 'min_length',
+                'max_length', 'min_value', 'max_value', 'validators', 'queryset'
             ]:
                 kwargs.pop(attr, None)
 
diff --git a/tests/schemas/test_openapi.py b/tests/schemas/test_openapi.py
index aef20670e..daa035a3f 100644
--- a/tests/schemas/test_openapi.py
+++ b/tests/schemas/test_openapi.py
@@ -2,6 +2,7 @@ import uuid
 import warnings
 
 import pytest
+from django.db import models
 from django.test import RequestFactory, TestCase, override_settings
 from django.urls import path
 from django.utils.translation import gettext_lazy as _
@@ -110,6 +111,24 @@ class TestFieldMapping(TestCase):
         assert data['properties']['default_false']['default'] is False, "default must be false"
         assert 'default' not in data['properties']['without_default'], "default must not be defined"
 
+    def test_nullable_fields(self):
+        class Model(models.Model):
+            rw_field = models.CharField(null=True)
+            ro_field = models.CharField(null=True)
+
+        class Serializer(serializers.ModelSerializer):
+            class Meta:
+                model = Model
+                fields = ["rw_field", "ro_field"]
+                read_only_fields = ["ro_field"]
+
+        inspector = AutoSchema()
+
+        data = inspector.map_serializer(Serializer())
+        assert data['properties']['rw_field']['nullable'], "rw_field nullable must be true"
+        assert data['properties']['ro_field']['nullable'], "ro_field nullable must be true"
+        assert data['properties']['ro_field']['readOnly'], "ro_field read_only must be true"
+
 
 @pytest.mark.skipif(uritemplate is None, reason='uritemplate not installed.')
 class TestOperationIntrospection(TestCase):

From fdb49314754ff13d91c6eec7ccdb8ece52bea9eb Mon Sep 17 00:00:00 2001
From: Aarni Koskela 
Date: Fri, 6 Aug 2021 12:14:52 +0300
Subject: [PATCH 144/303] Make Field constructors keyword-only (#7632)

---
 rest_framework/fields.py | 46 ++++++++++++++++++++--------------------
 tests/test_fields.py     |  5 +++++
 2 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index bedc02b94..5cafed555 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -320,7 +320,7 @@ class Field:
     default_empty_html = empty
     initial = None
 
-    def __init__(self, read_only=False, write_only=False,
+    def __init__(self, *, read_only=False, write_only=False,
                  required=None, default=empty, initial=empty, source=None,
                  label=None, help_text=None, style=None,
                  error_messages=None, validators=None, allow_null=False):
@@ -1163,14 +1163,14 @@ class DateTimeField(Field):
     }
     datetime_parser = datetime.datetime.strptime
 
-    def __init__(self, format=empty, input_formats=None, default_timezone=None, *args, **kwargs):
+    def __init__(self, format=empty, input_formats=None, default_timezone=None, **kwargs):
         if format is not empty:
             self.format = format
         if input_formats is not None:
             self.input_formats = input_formats
         if default_timezone is not None:
             self.timezone = default_timezone
-        super().__init__(*args, **kwargs)
+        super().__init__(**kwargs)
 
     def enforce_timezone(self, value):
         """
@@ -1249,12 +1249,12 @@ class DateField(Field):
     }
     datetime_parser = datetime.datetime.strptime
 
-    def __init__(self, format=empty, input_formats=None, *args, **kwargs):
+    def __init__(self, format=empty, input_formats=None, **kwargs):
         if format is not empty:
             self.format = format
         if input_formats is not None:
             self.input_formats = input_formats
-        super().__init__(*args, **kwargs)
+        super().__init__(**kwargs)
 
     def to_internal_value(self, value):
         input_formats = getattr(self, 'input_formats', api_settings.DATE_INPUT_FORMATS)
@@ -1315,12 +1315,12 @@ class TimeField(Field):
     }
     datetime_parser = datetime.datetime.strptime
 
-    def __init__(self, format=empty, input_formats=None, *args, **kwargs):
+    def __init__(self, format=empty, input_formats=None, **kwargs):
         if format is not empty:
             self.format = format
         if input_formats is not None:
             self.input_formats = input_formats
-        super().__init__(*args, **kwargs)
+        super().__init__(**kwargs)
 
     def to_internal_value(self, value):
         input_formats = getattr(self, 'input_formats', api_settings.TIME_INPUT_FORMATS)
@@ -1470,9 +1470,9 @@ class MultipleChoiceField(ChoiceField):
     }
     default_empty_html = []
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, **kwargs):
         self.allow_empty = kwargs.pop('allow_empty', True)
-        super().__init__(*args, **kwargs)
+        super().__init__(**kwargs)
 
     def get_value(self, dictionary):
         if self.field_name not in dictionary:
@@ -1529,12 +1529,12 @@ class FileField(Field):
         'max_length': _('Ensure this filename has at most {max_length} characters (it has {length}).'),
     }
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, **kwargs):
         self.max_length = kwargs.pop('max_length', None)
         self.allow_empty_file = kwargs.pop('allow_empty_file', False)
         if 'use_url' in kwargs:
             self.use_url = kwargs.pop('use_url')
-        super().__init__(*args, **kwargs)
+        super().__init__(**kwargs)
 
     def to_internal_value(self, data):
         try:
@@ -1578,9 +1578,9 @@ class ImageField(FileField):
         ),
     }
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, **kwargs):
         self._DjangoImageField = kwargs.pop('_DjangoImageField', DjangoImageField)
-        super().__init__(*args, **kwargs)
+        super().__init__(**kwargs)
 
     def to_internal_value(self, data):
         # Image validation is a bit grungy, so we'll just outright
@@ -1595,8 +1595,8 @@ class ImageField(FileField):
 # Composite field types...
 
 class _UnvalidatedField(Field):
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
         self.allow_blank = True
         self.allow_null = True
 
@@ -1617,7 +1617,7 @@ class ListField(Field):
         'max_length': _('Ensure this field has no more than {max_length} elements.')
     }
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, **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)
@@ -1629,7 +1629,7 @@ class ListField(Field):
             "Remove `source=` from the field declaration."
         )
 
-        super().__init__(*args, **kwargs)
+        super().__init__(**kwargs)
         self.child.bind(field_name='', parent=self)
         if self.max_length is not None:
             message = lazy_format(self.error_messages['max_length'], max_length=self.max_length)
@@ -1694,7 +1694,7 @@ class DictField(Field):
         'empty': _('This dictionary may not be empty.'),
     }
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, **kwargs):
         self.child = kwargs.pop('child', copy.deepcopy(self.child))
         self.allow_empty = kwargs.pop('allow_empty', True)
 
@@ -1704,7 +1704,7 @@ class DictField(Field):
             "Remove `source=` from the field declaration."
         )
 
-        super().__init__(*args, **kwargs)
+        super().__init__(**kwargs)
         self.child.bind(field_name='', parent=self)
 
     def get_value(self, dictionary):
@@ -1753,8 +1753,8 @@ class DictField(Field):
 class HStoreField(DictField):
     child = CharField(allow_blank=True, allow_null=True)
 
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
         assert isinstance(self.child, CharField), (
             "The `child` argument must be an instance of `CharField`, "
             "as the hstore extension stores values as strings."
@@ -1769,11 +1769,11 @@ class JSONField(Field):
     # Workaround for isinstance calls when importing the field isn't possible
     _is_jsonfield = True
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, **kwargs):
         self.binary = kwargs.pop('binary', False)
         self.encoder = kwargs.pop('encoder', None)
         self.decoder = kwargs.pop('decoder', None)
-        super().__init__(*args, **kwargs)
+        super().__init__(**kwargs)
 
     def get_value(self, dictionary):
         if html.is_html_input(dictionary) and self.field_name in dictionary:
diff --git a/tests/test_fields.py b/tests/test_fields.py
index d99ca9c40..2d4cc44ae 100644
--- a/tests/test_fields.py
+++ b/tests/test_fields.py
@@ -2010,6 +2010,11 @@ class TestListField(FieldValues):
             field.to_internal_value(input_value)
         assert exc_info.value.detail == ['Expected a list of items but got type "dict".']
 
+    def test_constructor_misuse_raises(self):
+        # Test that `ListField` can only be instantiated with keyword arguments
+        with pytest.raises(TypeError):
+            serializers.ListField(serializers.CharField())
+
 
 class TestNestedListField(FieldValues):
     """

From 2942590ee3d3596683405dcdb1017e1833f5cb02 Mon Sep 17 00:00:00 2001
From: Ma77heus <58952630+MattheusHenrique@users.noreply.github.com>
Date: Fri, 6 Aug 2021 12:39:58 -0300
Subject: [PATCH 145/303] fix: broken cite (#8086)

Co-authored-by: MattheusHenrique 
---
 docs/api-guide/renderers.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/api-guide/renderers.md b/docs/api-guide/renderers.md
index 7dbc5eee8..f13b7ba94 100644
--- a/docs/api-guide/renderers.md
+++ b/docs/api-guide/renderers.md
@@ -528,7 +528,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/stable/stable/template-response/#the-rendering-process
+[cite]: https://docs.djangoproject.com/en/stable/ref/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

From cba24464e8f63377627f3016df88ee74d11a817d Mon Sep 17 00:00:00 2001
From: Paul Wayper 
Date: Sat, 7 Aug 2021 01:45:15 +1000
Subject: [PATCH 146/303] Botbot has been acquired, all paths now point to
 startupresources (#8050)

Signed-off-by: Paul Wayper 
---
 docs/index.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/index.md b/docs/index.md
index 28e330250..ccbaf7373 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -186,7 +186,7 @@ Framework.
 
 ## Support
 
-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.
+For support please see the [REST framework discussion group][group], try the  `#restframework` channel on `irc.freenode.net`, or raise a  question on [Stack Overflow][stack-overflow], making sure to include the ['django-rest-framework'][django-rest-framework-tag] tag.
 
 For priority support please sign up for a [professional or premium sponsorship plan](https://fund.django-rest-framework.org/topics/funding/).
 
@@ -257,7 +257,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 [funding]: community/funding.md
 
 [group]: https://groups.google.com/forum/?fromgroups#!forum/django-rest-framework
-[botbot]: https://botbot.me/freenode/restframework/
 [stack-overflow]: https://stackoverflow.com/
 [django-rest-framework-tag]: https://stackoverflow.com/questions/tagged/django-rest-framework
 [security-mail]: mailto:rest-framework-security@googlegroups.com

From c4404f3d5d2df2a5c7450517b48c4e6dfeb3c89e Mon Sep 17 00:00:00 2001
From: Paul Wayper 
Date: Sat, 7 Aug 2021 01:46:26 +1000
Subject: [PATCH 147/303] We now use Libera.chat rather than Freenode for IRC
 (#8049)

Signed-off-by: Paul Wayper 

Co-authored-by: Tom Christie 
---
 README.md     | 2 +-
 docs/index.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index fce275256..b8d8ca61b 100644
--- a/README.md
+++ b/README.md
@@ -168,7 +168,7 @@ Or to create a new user:
 
 Full documentation for the project is available at [https://www.django-rest-framework.org/][docs].
 
-For questions and support, use the [REST framework discussion group][group], or `#restframework` on freenode IRC.
+For questions and support, use the [REST framework discussion group][group], or `#restframework` on libera.chat IRC.
 
 You may also want to [follow the author on Twitter][twitter].
 
diff --git a/docs/index.md b/docs/index.md
index ccbaf7373..641800b93 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -186,7 +186,7 @@ Framework.
 
 ## Support
 
-For support please see the [REST framework discussion group][group], try the  `#restframework` channel on `irc.freenode.net`, or raise a  question on [Stack Overflow][stack-overflow], making sure to include the ['django-rest-framework'][django-rest-framework-tag] tag.
+For support please see the [REST framework discussion group][group], try the  `#restframework` channel on `irc.libera.chat`, or raise a  question on [Stack Overflow][stack-overflow], making sure to include the ['django-rest-framework'][django-rest-framework-tag] tag.
 
 For priority support please sign up for a [professional or premium sponsorship plan](https://fund.django-rest-framework.org/topics/funding/).
 

From b824b33dc3a3facad3ef2b41fbe02ab2a7578bc3 Mon Sep 17 00:00:00 2001
From: Thomas Grainger 
Date: Fri, 6 Aug 2021 16:46:57 +0100
Subject: [PATCH 148/303] add changelog project_url (#8085)

---
 setup.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setup.py b/setup.py
index 5fd4df20d..d755a00fe 100755
--- a/setup.py
+++ b/setup.py
@@ -109,6 +109,7 @@ setup(
     project_urls={
         'Funding': 'https://fund.django-rest-framework.org/topics/funding/',
         'Source': 'https://github.com/encode/django-rest-framework',
+        'Changelog': 'https://www.django-rest-framework.org/community/release-notes/',
     },
 )
 

From e95e91ccf2065cbf474892b73ebd5790e5a4ae14 Mon Sep 17 00:00:00 2001
From: Ben Hampson <77866043+Ben-Hampson@users.noreply.github.com>
Date: Fri, 6 Aug 2021 17:49:41 +0200
Subject: [PATCH 149/303] Use correct link for httpie (#8005)

Before it was linking to a fork of a fork of httpie. I've changed it to the right URL.
---
 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 85d8676b1..908b7474a 100644
--- a/docs/tutorial/1-serialization.md
+++ b/docs/tutorial/1-serialization.md
@@ -374,5 +374,5 @@ We'll see how we can start to improve things in [part 2 of the tutorial][tut-2].
 [sandbox]: https://restframework.herokuapp.com/
 [venv]: https://docs.python.org/3/library/venv.html
 [tut-2]: 2-requests-and-responses.md
-[httpie]: https://github.com/jakubroztocil/httpie#installation
+[httpie]: https://github.com/httpie/httpie#installation
 [curl]: https://curl.haxx.se/

From cdd53c7de912d5868c96f4e3883df248a3e6341d Mon Sep 17 00:00:00 2001
From: juliangeissler <81534590+juliangeissler@users.noreply.github.com>
Date: Sun, 8 Aug 2021 15:45:00 +0200
Subject: [PATCH 150/303] Update Tutorial - Relationships & Hyperlinked APIs
 (#7950)

unnecessary import, because it is already added in the previous section
---
 docs/tutorial/5-relationships-and-hyperlinked-apis.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/tutorial/5-relationships-and-hyperlinked-apis.md b/docs/tutorial/5-relationships-and-hyperlinked-apis.md
index b0f338085..f999fdf50 100644
--- a/docs/tutorial/5-relationships-and-hyperlinked-apis.md
+++ b/docs/tutorial/5-relationships-and-hyperlinked-apis.md
@@ -31,7 +31,6 @@ The other thing we need to consider when creating the code highlight view is tha
 Instead of using a concrete generic view, we'll use the base class for representing instances, and create our own `.get()` method.  In your `snippets/views.py` add:
 
     from rest_framework import renderers
-    from rest_framework.response import Response
 
     class SnippetHighlight(generics.GenericAPIView):
         queryset = Snippet.objects.all()

From c5d9144aef1144825942ddffe0a6af23102ef44a Mon Sep 17 00:00:00 2001
From: Mark <33526445+mark-gold@users.noreply.github.com>
Date: Wed, 11 Aug 2021 13:30:09 +0300
Subject: [PATCH 151/303] fix typo (#8122)

Co-authored-by: mgold 
---
 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 4451489d4..76dcb0d54 100644
--- a/docs/api-guide/validators.md
+++ b/docs/api-guide/validators.md
@@ -238,7 +238,7 @@ In the case of update operations on *nested* serializers there's no way of
 applying this exclusion, because the instance is not available.
 
 Again, you'll probably want to explicitly remove the validator from the
-serializer class, and write the code the for the validation constraint
+serializer class, and write the code for the validation constraint
 explicitly, in a `.validate()` method, or in the view.
 
 ## Debugging complex cases

From c927053d4b99ada6b3fd5d70c6536554ff5fe8c0 Mon Sep 17 00:00:00 2001
From: jefcolbi 
Date: Tue, 31 Aug 2021 12:51:47 +0100
Subject: [PATCH 152/303] Replacing django-rest-auth with dj-rest-auth (#8146)

---
 docs/community/third-party-packages.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/community/third-party-packages.md b/docs/community/third-party-packages.md
index e53fc3d50..933244a6a 100644
--- a/docs/community/third-party-packages.md
+++ b/docs/community/third-party-packages.md
@@ -54,7 +54,7 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque
 * [hawkrest][hawkrest] - Provides Hawk HTTP Authorization.
 * [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.
+* [dj-rest-auth][dj-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.
 * [drfpasswordless][drfpasswordless] - Adds (Medium, Square Cash inspired) passwordless logins and signups via email and mobile numbers.
 * [django-rest-authemail][django-rest-authemail] - Provides a RESTful API for user signup and authentication using email addresses.
@@ -193,7 +193,7 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque
 [gaiarestframework]: https://github.com/AppsFuel/gaiarestframework
 [drf-extensions]: https://github.com/chibisov/drf-extensions
 [ember-django-adapter]: https://github.com/dustinfarris/ember-django-adapter
-[django-rest-auth]: https://github.com/Tivix/django-rest-auth/
+[dj-rest-auth]: https://github.com/iMerica/dj-rest-auth
 [django-versatileimagefield]: https://github.com/WGBH/django-versatileimagefield
 [django-versatileimagefield-drf-docs]:https://django-versatileimagefield.readthedocs.io/en/latest/drf_integration.html
 [drf-tracking]: https://github.com/aschn/drf-tracking

From 88666629a70f5c3fbe31e11aecd9817338de9c92 Mon Sep 17 00:00:00 2001
From: Asif Saif Uddin 
Date: Tue, 31 Aug 2021 18:56:08 +0600
Subject: [PATCH 153/303] stop testing django 3.0 as its EOL (#8136)

---
 tox.ini | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/tox.ini b/tox.ini
index f23486a68..25f841821 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,6 @@
 [tox]
 envlist =
        {py35,py36,py37}-django22,
-       {py36,py37,py38}-django30,
        {py36,py37,py38,py39}-django31,
        {py36,py37,py38,py39}-django32,
        {py38,py39}-djangomain,
@@ -10,7 +9,6 @@ envlist =
 [travis:env]
 DJANGO =
     2.2: django22
-    3.0: django30
     3.1: django31
     3.2: django32
     main: djangomain
@@ -23,9 +21,8 @@ setenv =
        PYTHONWARNINGS=once
 deps =
         django22: Django>=2.2,<3.0
-        django30: Django>=3.0,<3.1
         django31: Django>=3.1,<3.2
-        django32: Django>=3.2a1,<4.0
+        django32: Django>=3.2,<4.0
         djangomain: https://github.com/django/django/archive/main.tar.gz
         -rrequirements/requirements-testing.txt
         -rrequirements/requirements-optionals.txt

From 6b392a46ea025148a24ce665e9c18e4386dde8fa Mon Sep 17 00:00:00 2001
From: Aditya Mitra <55396651+aditya-mitra@users.noreply.github.com>
Date: Tue, 31 Aug 2021 18:27:02 +0530
Subject: [PATCH 154/303] [FIX] Typo in api-guide/authentication (#8144)

---
 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 60544079f..57bbaeb67 100644
--- a/docs/api-guide/authentication.md
+++ b/docs/api-guide/authentication.md
@@ -13,7 +13,7 @@ Authentication is the mechanism of associating an incoming request with a set of
 
 REST framework provides several authentication schemes out of the box, and also allows you to implement custom schemes.
 
-Authentication is always run at the very start of the view, before the permission and throttling checks occur, and before any other code is allowed to proceed.
+Authentication always runs at the very start of the view, before the permission and throttling checks occur, and before any other code is allowed to proceed.
 
 The `request.user` property will typically be set to an instance of the `contrib.auth` package's `User` class.
 

From 4632b5daaed5a71a1be3e7d412a7f9a2e5520b90 Mon Sep 17 00:00:00 2001
From: Ryan Nowakowski 
Date: Tue, 31 Aug 2021 08:18:49 -0500
Subject: [PATCH 155/303] Fix subtitle of schemas for filtering (#8145)

Fix a likely copy/paste error
---
 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 478e3bcf9..3541388ca 100644
--- a/docs/api-guide/filtering.md
+++ b/docs/api-guide/filtering.md
@@ -335,7 +335,7 @@ 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
+## Filtering & schemas
 
 You can also make the filter controls available to the schema autogeneration
 that REST framework provides, by implementing a `get_schema_fields()` method. This method should have the following signature:

From cb206e4701dd67f859c015bea111d0e77e364c4a Mon Sep 17 00:00:00 2001
From: Juan Benitez 
Date: Fri, 3 Sep 2021 07:00:23 -0500
Subject: [PATCH 156/303] fix: change View class to Throttle class on
 SimpleRateThrottle Docstring (#8147)

---
 rest_framework/throttling.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rest_framework/throttling.py b/rest_framework/throttling.py
index 0ba2ba66b..e262b886b 100644
--- a/rest_framework/throttling.py
+++ b/rest_framework/throttling.py
@@ -52,7 +52,7 @@ class SimpleRateThrottle(BaseThrottle):
     A simple cache implementation, that only requires `.get_cache_key()`
     to be overridden.
 
-    The rate (requests / seconds) is set by a `rate` attribute on the View
+    The rate (requests / seconds) is set by a `rate` attribute on the Throttle
     class.  The attribute is a string of the form 'number_of_requests/period'.
 
     Period should be one of: ('s', 'sec', 'm', 'min', 'h', 'hour', 'd', 'day')

From 96001c5de61b5fe7c083bdd8e5810105e3575014 Mon Sep 17 00:00:00 2001
From: Anthony Randall 
Date: Fri, 3 Sep 2021 06:23:19 -0600
Subject: [PATCH 157/303] Added an article - implementing rest apis with
 embedded privacy from doordash engineering blog (#7956)

* Update tutorials-and-resources.md

* Update tutorials-and-resources.md
---
 docs/community/tutorials-and-resources.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/community/tutorials-and-resources.md b/docs/community/tutorials-and-resources.md
index dae292f50..23faf7912 100644
--- a/docs/community/tutorials-and-resources.md
+++ b/docs/community/tutorials-and-resources.md
@@ -76,6 +76,7 @@ There are a wide range of resources available for learning and using Django REST
 * [Chatbot Using Django REST Framework + api.ai + Slack — Part 1/3][chatbot-using-drf-part1]
 * [New Django Admin with DRF and EmberJS... What are the News?][new-django-admin-with-drf-and-emberjs]
 * [Blog posts about Django REST Framework][medium-django-rest-framework]
+* [Implementing Rest APIs With Embedded Privacy][doordash-implementing-rest-apis]
 
 ### Documentations
 * [Classy Django REST Framework][cdrf.co]
@@ -128,3 +129,4 @@ Want your Django REST Framework talk/tutorial/article to be added to our website
 [anna-email]: mailto:anna@django-rest-framework.org
 [pycon-us-2017]: https://www.youtube.com/watch?v=Rk6MHZdust4
 [django-rest-react-valentinog]: https://www.valentinog.com/blog/tutorial-api-django-rest-react/
+[doordash-implementing-rest-apis]: https://doordash.engineering/2013/10/07/implementing-rest-apis-with-embedded-privacy/

From 655e803adfb19b8cb5b94a4895f1baffed55a958 Mon Sep 17 00:00:00 2001
From: Peter Uittenbroek 
Date: Fri, 3 Sep 2021 15:37:03 +0200
Subject: [PATCH 158/303] #7157: Fix RemoteUserAuthentication calling django
 authenticate with request argument (#7158)

---
 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 9111007c0..382abf158 100644
--- a/rest_framework/authentication.py
+++ b/rest_framework/authentication.py
@@ -227,6 +227,6 @@ class RemoteUserAuthentication(BaseAuthentication):
     header = "REMOTE_USER"
 
     def authenticate(self, request):
-        user = authenticate(remote_user=request.META.get(self.header))
+        user = authenticate(request=request, remote_user=request.META.get(self.header))
         if user and user.is_active:
             return (user, None)

From 9716b1b6b7779543c134856e59f1c1393963e46f Mon Sep 17 00:00:00 2001
From: Ivan Trushin <33528037+WannaFight@users.noreply.github.com>
Date: Mon, 6 Sep 2021 14:18:13 +0300
Subject: [PATCH 159/303] Fix arguments (#7995)

`path()` has no argument `namespace`, it has `name` argument
---
 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 ee839790f..e19577f61 100644
--- a/docs/tutorial/quickstart.md
+++ b/docs/tutorial/quickstart.md
@@ -126,7 +126,7 @@ Okay, now let's wire up the API URLs.  On to `tutorial/urls.py`...
     # Additionally, we include login URLs for the browsable API.
     urlpatterns = [
         path('', include(router.urls)),
-        path('api-auth/', include('rest_framework.urls', namespace='rest_framework'))
+        path('api-auth/', include('rest_framework.urls', name='rest_framework'))
     ]
 
 Because we're using viewsets instead of views, we can automatically generate the URL conf for our API, by simply registering the viewsets with a router class.

From 9ce541e90990307e06da1b7f5a2576406366a5e5 Mon Sep 17 00:00:00 2001
From: Tom Christie 
Date: Mon, 6 Sep 2021 12:19:20 +0100
Subject: [PATCH 160/303] Revert "Fix arguments (#7995)" (#8156)

This reverts commit 9716b1b6b7779543c134856e59f1c1393963e46f.
---
 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 e19577f61..ee839790f 100644
--- a/docs/tutorial/quickstart.md
+++ b/docs/tutorial/quickstart.md
@@ -126,7 +126,7 @@ Okay, now let's wire up the API URLs.  On to `tutorial/urls.py`...
     # Additionally, we include login URLs for the browsable API.
     urlpatterns = [
         path('', include(router.urls)),
-        path('api-auth/', include('rest_framework.urls', name='rest_framework'))
+        path('api-auth/', include('rest_framework.urls', namespace='rest_framework'))
     ]
 
 Because we're using viewsets instead of views, we can automatically generate the URL conf for our API, by simply registering the viewsets with a router class.

From 73f3325f80a381d1d62ab1b84956295963f445ed Mon Sep 17 00:00:00 2001
From: Tom Christie 
Date: Fri, 10 Sep 2021 11:32:27 +0100
Subject: [PATCH 161/303] Update stream.io link (#8161)

---
 README.md     | 2 +-
 docs/index.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index b8d8ca61b..e3bcc2a1c 100644
--- a/README.md
+++ b/README.md
@@ -197,7 +197,7 @@ Please see the [security policy][security-policy].
 [bitio-img]: https://raw.githubusercontent.com/encode/django-rest-framework/master/docs/img/premium/bitio-readme.png
 
 [sentry-url]: https://getsentry.com/welcome/
-[stream-url]: https://getstream.io/try-the-api/?utm_source=drf&utm_medium=banner&utm_campaign=drf
+[stream-url]: https://getstream.io/?utm_source=drf&utm_medium=sponsorship&utm_content=developer
 [rollbar-url]: https://rollbar.com/?utm_source=django&utm_medium=sponsorship&utm_campaign=freetrial
 [esg-url]: https://software.esg-usa.com/
 [retool-url]: https://retool.com/?utm_source=djangorest&utm_medium=sponsorship
diff --git a/docs/index.md b/docs/index.md
index 641800b93..9b667c669 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -75,7 +75,7 @@ continued development by **[signing up for a paid plan][funding]**.
 
 

 
-*Many thanks to all our [wonderful sponsors][sponsors], and in particular to our premium backers, [Sentry](https://getsentry.com/welcome/), [Stream](https://getstream.io/?utm_source=drf&utm_medium=banner&utm_campaign=drf), [ESG](https://software.esg-usa.com/), [Rollbar](https://rollbar.com/?utm_source=django&utm_medium=sponsorship&utm_campaign=freetrial), [Cadre](https://cadre.com), [Kloudless](https://hubs.ly/H0f30Lf0), [Lights On Software](https://lightsonsoftware.com), [Retool](https://retool.com/?utm_source=djangorest&utm_medium=sponsorship), and [bit.io](https://bit.io/jobs?utm_source=DRF&utm_medium=sponsor&utm_campaign=DRF_sponsorship).*
+*Many thanks to all our [wonderful sponsors][sponsors], and in particular to our premium backers, [Sentry](https://getsentry.com/welcome/), [Stream](https://getstream.io/?utm_source=drf&utm_medium=sponsorship&utm_content=developer), [ESG](https://software.esg-usa.com/), [Rollbar](https://rollbar.com/?utm_source=django&utm_medium=sponsorship&utm_campaign=freetrial), [Cadre](https://cadre.com), [Kloudless](https://hubs.ly/H0f30Lf0), [Lights On Software](https://lightsonsoftware.com), [Retool](https://retool.com/?utm_source=djangorest&utm_medium=sponsorship), and [bit.io](https://bit.io/jobs?utm_source=DRF&utm_medium=sponsor&utm_campaign=DRF_sponsorship).*
 
 ---
 

From 761f56ef4025543e9cf39346d25641305e7d957d Mon Sep 17 00:00:00 2001
From: Tom Christie 
Date: Fri, 10 Sep 2021 14:45:06 +0100
Subject: [PATCH 162/303] Update stream.io link

---
 docs/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/index.md b/docs/index.md
index 9b667c669..f000d2e09 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -67,7 +67,7 @@ continued development by **[signing up for a paid plan][funding]**.
 
 
    
     
  • Sentry
    • 
-    
  • Stream
    • 
+    
  • Stream
    • 
     
  • ESG
    • 
     
  • Rollbar
    • 
     
  • Retool
    • 

From f0a5b958a134e8cd94e3ef3263e8fa623ac9b82f Mon Sep 17 00:00:00 2001
From: Dan Lousqui 
Date: Tue, 14 Sep 2021 14:45:55 +0200
Subject: [PATCH 163/303] Add max_length and min_length options to
 ListSerializer (#8165)

---
 docs/api-guide/serializers.md  |  8 ++++
 rest_framework/serializers.py  | 27 +++++++++++++-
 tests/test_serializer_lists.py | 67 ++++++++++++++++++++++++++++++++++
 3 files changed, 100 insertions(+), 2 deletions(-)

diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md
index 13c0c8710..cf8525748 100644
--- a/docs/api-guide/serializers.md
+++ b/docs/api-guide/serializers.md
@@ -755,6 +755,14 @@ The following argument can also be passed to a `ListSerializer` field or a seria
 
 This is `True` by default, but can be set to `False` if you want to disallow empty lists as valid input.
 
+### `max_length`
+
+This is `None` by default, but can be set to a positive integer if you want to validates that the list contains no more than this number of elements.
+
+### `min_length`
+
+This is `None` by default, but can be set to a positive integer if you want to validates that the list contains no fewer than this number of elements.
+
 ### Customizing `ListSerializer` behavior
 
 There *are* a few use cases when you might want to customize the `ListSerializer` behavior. For example:
diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index 9ea57f1af..389680517 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -71,7 +71,8 @@ from rest_framework.relations import Hyperlink, PKOnlyObject  # NOQA # isort:ski
 LIST_SERIALIZER_KWARGS = (
     'read_only', 'write_only', 'required', 'default', 'initial', 'source',
     'label', 'help_text', 'style', 'error_messages', 'allow_empty',
-    'instance', 'data', 'partial', 'context', 'allow_null'
+    'instance', 'data', 'partial', 'context', 'allow_null',
+    'max_length', 'min_length'
 )
 
 ALL_FIELDS = '__all__'
@@ -143,12 +144,18 @@ class BaseSerializer(Field):
             return CustomListSerializer(*args, **kwargs)
         """
         allow_empty = kwargs.pop('allow_empty', None)
+        max_length = kwargs.pop('max_length', None)
+        min_length = kwargs.pop('min_length', None)
         child_serializer = cls(*args, **kwargs)
         list_kwargs = {
             'child': child_serializer,
         }
         if allow_empty is not None:
             list_kwargs['allow_empty'] = allow_empty
+        if max_length is not None:
+            list_kwargs['max_length'] = max_length
+        if min_length is not None:
+            list_kwargs['min_length'] = min_length
         list_kwargs.update({
             key: value for key, value in kwargs.items()
             if key in LIST_SERIALIZER_KWARGS
@@ -568,12 +575,16 @@ class ListSerializer(BaseSerializer):
 
     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.'),
+        'max_length': _('Ensure this field has no more than {max_length} elements.'),
+        'min_length': _('Ensure this field has at least {min_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 self.child is not None, '`child` is a required argument.'
         assert not inspect.isclass(self.child), '`child` has not been instantiated.'
         super().__init__(*args, **kwargs)
@@ -635,6 +646,18 @@ class ListSerializer(BaseSerializer):
                 api_settings.NON_FIELD_ERRORS_KEY: [message]
             }, code='empty')
 
+        if self.max_length is not None and len(data) > self.max_length:
+            message = self.error_messages['max_length'].format(max_length=self.max_length)
+            raise ValidationError({
+                api_settings.NON_FIELD_ERRORS_KEY: [message]
+            }, code='max_length')
+
+        if self.min_length is not None and len(data) < self.min_length:
+            message = self.error_messages['min_length'].format(min_length=self.min_length)
+            raise ValidationError({
+                api_settings.NON_FIELD_ERRORS_KEY: [message]
+            }, code='min_length')
+
         ret = []
         errors = []
 
diff --git a/tests/test_serializer_lists.py b/tests/test_serializer_lists.py
index f35c4fcc9..551f62666 100644
--- a/tests/test_serializer_lists.py
+++ b/tests/test_serializer_lists.py
@@ -616,3 +616,70 @@ class TestEmptyListSerializer:
 
         assert serializer.is_valid()
         assert serializer.validated_data == []
+
+
+class TestMaxMinLengthListSerializer:
+    """
+    Tests the behaviour of ListSerializers when max_length and min_length are used
+    """
+
+    def setup(self):
+        class IntegerSerializer(serializers.Serializer):
+            some_int = serializers.IntegerField()
+
+        class MaxLengthSerializer(serializers.Serializer):
+            many_int = IntegerSerializer(many=True, max_length=5)
+
+        class MinLengthSerializer(serializers.Serializer):
+            many_int = IntegerSerializer(many=True, min_length=3)
+
+        class MaxMinLengthSerializer(serializers.Serializer):
+            many_int = IntegerSerializer(many=True, min_length=3, max_length=5)
+
+        self.MaxLengthSerializer = MaxLengthSerializer
+        self.MinLengthSerializer = MinLengthSerializer
+        self.MaxMinLengthSerializer = MaxMinLengthSerializer
+
+    def test_min_max_length_two_items(self):
+        input_data = {'many_int': [{'some_int': i} for i in range(2)]}
+
+        max_serializer = self.MaxLengthSerializer(data=input_data)
+        min_serializer = self.MinLengthSerializer(data=input_data)
+        max_min_serializer = self.MaxMinLengthSerializer(data=input_data)
+
+        assert max_serializer.is_valid()
+        assert max_serializer.validated_data == input_data
+
+        assert not min_serializer.is_valid()
+
+        assert not max_min_serializer.is_valid()
+
+    def test_min_max_length_four_items(self):
+        input_data = {'many_int': [{'some_int': i} for i in range(4)]}
+
+        max_serializer = self.MaxLengthSerializer(data=input_data)
+        min_serializer = self.MinLengthSerializer(data=input_data)
+        max_min_serializer = self.MaxMinLengthSerializer(data=input_data)
+
+        assert max_serializer.is_valid()
+        assert max_serializer.validated_data == input_data
+
+        assert min_serializer.is_valid()
+        assert min_serializer.validated_data == input_data
+
+        assert max_min_serializer.is_valid()
+        assert min_serializer.validated_data == input_data
+
+    def test_min_max_length_six_items(self):
+        input_data = {'many_int': [{'some_int': i} for i in range(6)]}
+
+        max_serializer = self.MaxLengthSerializer(data=input_data)
+        min_serializer = self.MinLengthSerializer(data=input_data)
+        max_min_serializer = self.MaxMinLengthSerializer(data=input_data)
+
+        assert not max_serializer.is_valid()
+
+        assert min_serializer.is_valid()
+        assert min_serializer.validated_data == input_data
+
+        assert not max_min_serializer.is_valid()

From 250479dc3799a281429c2c10d9605a1a85d3e517 Mon Sep 17 00:00:00 2001
From: Carlton Gibson 
Date: Wed, 22 Sep 2021 09:57:17 +0200
Subject: [PATCH 164/303] Added pytz to install_requires.

pytz will not automatically be installed with Django from v4.0.
---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index d755a00fe..b8e220cb4 100755
--- a/setup.py
+++ b/setup.py
@@ -82,7 +82,7 @@ setup(
     author_email='tom@tomchristie.com',  # SEE NOTE BELOW (*)
     packages=find_packages(exclude=['tests*']),
     include_package_data=True,
-    install_requires=["django>=2.2"],
+    install_requires=["django>=2.2", "pytz"],
     python_requires=">=3.5",
     zip_safe=False,
     classifiers=[

From f651878df33bf12d3b637f2377e234a2f0a0523c Mon Sep 17 00:00:00 2001
From: Carlton Gibson 
Date: Wed, 22 Sep 2021 09:58:34 +0200
Subject: [PATCH 165/303] Adjusted DateTimeField docs for zoneinfo.

---
 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 04f993942..b986009f9 100644
--- a/docs/api-guide/fields.md
+++ b/docs/api-guide/fields.md
@@ -325,7 +325,7 @@ Corresponds to `django.db.models.fields.DateTimeField`.
 
 * `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']`.
-* `default_timezone` - A `pytz.timezone` representing the timezone. If not specified and the `USE_TZ` setting is enabled, this defaults to the [current timezone][django-current-timezone]. If `USE_TZ` is disabled, then datetime objects will be naive.
+* `default_timezone` - A `tzinfo` subclass (`zoneinfo` or `pytz`) prepresenting the timezone. If not specified and the `USE_TZ` setting is enabled, this defaults to the [current timezone][django-current-timezone]. If `USE_TZ` is disabled, then datetime objects will be naive.
 
 #### `DateTimeField` format strings.
 

From 2d9eee5d022bf77d6bb25e1d8b57da9e9c94f96f Mon Sep 17 00:00:00 2001
From: Carlton Gibson 
Date: Wed, 22 Sep 2021 10:00:49 +0200
Subject: [PATCH 166/303] Adjusted URLPatternsTestCase to use addClassCleanup()
 from Django 4.0.

Refs https://github.com/django/django/commit/faba5b702a9c5bb9452a543100928bcb5f66ebcf.

addClassCleanup() is available from Python 3.8, which is the minimum supported
Python from Django 4.0.
---
 rest_framework/test.py | 30 ++++++++++++++++++++++--------
 tests/test_testing.py  | 22 +++++++++++++++++-----
 2 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/rest_framework/test.py b/rest_framework/test.py
index e934eff55..0212348ee 100644
--- a/rest_framework/test.py
+++ b/rest_framework/test.py
@@ -3,6 +3,7 @@
 import io
 from importlib import import_module
 
+import django
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
 from django.core.handlers.wsgi import WSGIHandler
@@ -357,6 +358,13 @@ class APILiveServerTestCase(testcases.LiveServerTestCase):
     client_class = APIClient
 
 
+def cleanup_url_patterns(cls):
+    if hasattr(cls, '_module_urlpatterns'):
+        cls._module.urlpatterns = cls._module_urlpatterns
+    else:
+        del cls._module.urlpatterns
+
+
 class URLPatternsTestCase(testcases.SimpleTestCase):
     """
     Isolate URL patterns on a per-TestCase basis. For example,
@@ -385,14 +393,20 @@ class URLPatternsTestCase(testcases.SimpleTestCase):
         cls._module.urlpatterns = cls.urlpatterns
 
         cls._override.enable()
+
+        if django.VERSION > (4, 0):
+            cls.addClassCleanup(cls._override.disable)
+            cls.addClassCleanup(cleanup_url_patterns, cls)
+
         super().setUpClass()
 
-    @classmethod
-    def tearDownClass(cls):
-        super().tearDownClass()
-        cls._override.disable()
+    if django.VERSION < (4, 0):
+        @classmethod
+        def tearDownClass(cls):
+            super().tearDownClass()
+            cls._override.disable()
 
-        if hasattr(cls, '_module_urlpatterns'):
-            cls._module.urlpatterns = cls._module_urlpatterns
-        else:
-            del cls._module.urlpatterns
+            if hasattr(cls, '_module_urlpatterns'):
+                cls._module.urlpatterns = cls._module_urlpatterns
+            else:
+                del cls._module.urlpatterns
diff --git a/tests/test_testing.py b/tests/test_testing.py
index cc60e4f00..5066ee142 100644
--- a/tests/test_testing.py
+++ b/tests/test_testing.py
@@ -1,5 +1,6 @@
 from io import BytesIO
 
+import django
 from django.contrib.auth.models import User
 from django.shortcuts import redirect
 from django.test import TestCase, override_settings
@@ -282,6 +283,10 @@ class TestAPIRequestFactory(TestCase):
         assert request.META['CONTENT_TYPE'] == 'application/json'
 
 
+def check_urlpatterns(cls):
+    assert urlpatterns is not cls.urlpatterns
+
+
 class TestUrlPatternTestCase(URLPatternsTestCase):
     urlpatterns = [
         path('', view),
@@ -293,11 +298,18 @@ class TestUrlPatternTestCase(URLPatternsTestCase):
         super().setUpClass()
         assert urlpatterns is cls.urlpatterns
 
-    @classmethod
-    def tearDownClass(cls):
-        assert urlpatterns is cls.urlpatterns
-        super().tearDownClass()
-        assert urlpatterns is not cls.urlpatterns
+        if django.VERSION > (4, 0):
+            cls.addClassCleanup(
+                check_urlpatterns,
+                cls
+            )
+
+    if django.VERSION < (4, 0):
+        @classmethod
+        def tearDownClass(cls):
+            assert urlpatterns is cls.urlpatterns
+            super().tearDownClass()
+            assert urlpatterns is not cls.urlpatterns
 
     def test_urlpatterns(self):
         assert self.client.get('/').status_code == 200

From 4916854492e6c999977b8577b5a15e6ffc784550 Mon Sep 17 00:00:00 2001
From: Carlton Gibson 
Date: Wed, 22 Sep 2021 10:02:28 +0200
Subject: [PATCH 167/303] Removed USE_L10N setting from Django 4.0.

USE_L10N defaults to True from Django 4.0, and will be removed in Django 5.0.
---
 tests/conftest.py    | 4 +++-
 tests/test_fields.py | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/tests/conftest.py b/tests/conftest.py
index cc32cc637..79cabd5e1 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -18,6 +18,8 @@ def pytest_addoption(parser):
 def pytest_configure(config):
     from django.conf import settings
 
+    # USE_L10N is deprecated, and will be removed in Django 5.0.
+    use_l10n = {"USE_L10N": True} if django.VERSION < (4, 0) else {}
     settings.configure(
         DEBUG_PROPAGATE_EXCEPTIONS=True,
         DATABASES={
@@ -33,7 +35,6 @@ def pytest_configure(config):
         SITE_ID=1,
         SECRET_KEY='not very secret in tests',
         USE_I18N=True,
-        USE_L10N=True,
         STATIC_URL='/static/',
         ROOT_URLCONF='tests.urls',
         TEMPLATES=[
@@ -68,6 +69,7 @@ def pytest_configure(config):
         PASSWORD_HASHERS=(
             'django.contrib.auth.hashers.MD5PasswordHasher',
         ),
+        **use_l10n,
     )
 
     # guardian is optional
diff --git a/tests/test_fields.py b/tests/test_fields.py
index 2d4cc44ae..a3b37584b 100644
--- a/tests/test_fields.py
+++ b/tests/test_fields.py
@@ -1220,12 +1220,12 @@ class TestNoStringCoercionDecimalField(FieldValues):
 
 
 class TestLocalizedDecimalField(TestCase):
-    @override_settings(USE_L10N=True, LANGUAGE_CODE='pl')
+    @override_settings(LANGUAGE_CODE='pl')
     def test_to_internal_value(self):
         field = serializers.DecimalField(max_digits=2, decimal_places=1, localize=True)
         assert field.to_internal_value('1,1') == Decimal('1.1')
 
-    @override_settings(USE_L10N=True, LANGUAGE_CODE='pl')
+    @override_settings(LANGUAGE_CODE='pl')
     def test_to_representation(self):
         field = serializers.DecimalField(max_digits=2, decimal_places=1, localize=True)
         assert field.to_representation(Decimal('1.1')) == '1,1'

From 19b609155479f967a41ffc20a58bb09229f1e64b Mon Sep 17 00:00:00 2001
From: Carlton Gibson 
Date: Wed, 22 Sep 2021 10:06:10 +0200
Subject: [PATCH 168/303] Adjusted authentication test for internal CSRF
 changes.

Private _get_new_csrf_token() was removed in
https://github.com/django/django/commit/231de683d86374c2b74da2185efc6ddfb5eb3341.
---
 tests/authentication/test_authentication.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/tests/authentication/test_authentication.py b/tests/authentication/test_authentication.py
index a73e0d79c..d771aaf8b 100644
--- a/tests/authentication/test_authentication.py
+++ b/tests/authentication/test_authentication.py
@@ -1,5 +1,6 @@
 import base64
 
+import django
 import pytest
 from django.conf import settings
 from django.contrib.auth.models import User
@@ -218,7 +219,16 @@ class SessionAuthTests(TestCase):
         Ensure POSTing form over session authentication with CSRF token succeeds.
         Regression test for #6088
         """
-        from django.middleware.csrf import _get_new_csrf_token
+        # Remove this shim when dropping support for Django 2.2.
+        if django.VERSION < (3, 0):
+            from django.middleware.csrf import _get_new_csrf_token
+        else:
+            from django.middleware.csrf import (
+                _get_new_csrf_string, _mask_cipher_secret
+            )
+
+            def _get_new_csrf_token():
+                return _mask_cipher_secret(_get_new_csrf_string())
 
         self.csrf_client.login(username=self.username, password=self.password)
 

From f46c33e4e2c545e3fd90de692242c53a6fe6e7e9 Mon Sep 17 00:00:00 2001
From: Carlton Gibson 
Date: Wed, 22 Sep 2021 10:07:00 +0200
Subject: [PATCH 169/303] Fixed TestDefaultTZDateTimeField to allow multiple
 tzinfo implementations.

zoneinfo was made the default time zone implementation in
https://github.com/django/django/commit/306607d5b99b6eca6ae2c1e726d8eb32b9b2ca1b.
---
 tests/test_fields.py | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/tests/test_fields.py b/tests/test_fields.py
index a3b37584b..7a5304a82 100644
--- a/tests/test_fields.py
+++ b/tests/test_fields.py
@@ -1464,15 +1464,24 @@ class TestDefaultTZDateTimeField(TestCase):
         cls.field = serializers.DateTimeField()
         cls.kolkata = pytz.timezone('Asia/Kolkata')
 
+    def assertUTC(self, tzinfo):
+        """
+        Check UTC for datetime.timezone, ZoneInfo, and pytz tzinfo instances.
+        """
+        assert (
+            tzinfo is utc or
+            (getattr(tzinfo, "key", None) or getattr(tzinfo, "zone", None)) == "UTC"
+        )
+
     def test_default_timezone(self):
-        assert self.field.default_timezone() == utc
+        self.assertUTC(self.field.default_timezone())
 
     def test_current_timezone(self):
-        assert self.field.default_timezone() == utc
+        self.assertUTC(self.field.default_timezone())
         activate(self.kolkata)
         assert self.field.default_timezone() == self.kolkata
         deactivate()
-        assert self.field.default_timezone() == utc
+        self.assertUTC(self.field.default_timezone())
 
 
 @pytest.mark.skipif(pytz is None, reason='pytz not installed')

From c62e3ca764d90e7b8402cc4022cffad2a07fa5be Mon Sep 17 00:00:00 2001
From: Carlton Gibson 
Date: Wed, 22 Sep 2021 10:08:14 +0200
Subject: [PATCH 170/303] Added Django 4.0 to test matrix.

---
 tox.ini | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 25f841821..6f49d373f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,7 +3,7 @@ envlist =
        {py35,py36,py37}-django22,
        {py36,py37,py38,py39}-django31,
        {py36,py37,py38,py39}-django32,
-       {py38,py39}-djangomain,
+       {py38,py39}-{django40,djangomain},
        base,dist,docs,
 
 [travis:env]
@@ -11,6 +11,7 @@ DJANGO =
     2.2: django22
     3.1: django31
     3.2: django32
+    4.0: django40
     main: djangomain
 
 [testenv]
@@ -23,6 +24,7 @@ deps =
         django22: Django>=2.2,<3.0
         django31: Django>=3.1,<3.2
         django32: Django>=3.2,<4.0
+        django40: Django>=4.0a1,<5.0
         djangomain: https://github.com/django/django/archive/main.tar.gz
         -rrequirements/requirements-testing.txt
         -rrequirements/requirements-optionals.txt

From 1fa5bc31c0c047eb2109929b17f8e53e84b7d40b Mon Sep 17 00:00:00 2001
From: Akhil Kokani 
Date: Mon, 27 Sep 2021 14:31:47 +0530
Subject: [PATCH 171/303] Update serializers.md (#8189)

* Update serializers.md

Removed unwanted word, "neither".

* Update docs/api-guide/serializers.md

Co-authored-by: Tom Christie 
---
 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 cf8525748..377f732ac 100644
--- a/docs/api-guide/serializers.md
+++ b/docs/api-guide/serializers.md
@@ -116,7 +116,7 @@ Calling `.save()` will either create a new instance, or update an existing insta
     # .save() will update the existing `comment` instance.
     serializer = CommentSerializer(comment, data=data)
 
-Both the `.create()` and `.update()` methods are optional. You can implement either neither, one, or both of them, depending on the use-case for your serializer class.
+Both the `.create()` and `.update()` methods are optional. You can implement either none, one, or both of them, depending on the use-case for your serializer class.
 
 #### Passing additional attributes to `.save()`
 

From 605a624da6958bd5e633a391eb65e72d0526f37c Mon Sep 17 00:00:00 2001
From: Phil Leggetter 
Date: Tue, 5 Oct 2021 14:02:34 +0100
Subject: [PATCH 172/303] Add PostHog as premium sponsors (#8193)

* Add PostHog as premium sponsors

* Adding 275x250 PostHog image
---
 README.md                           |   5 ++++-
 docs/img/premium/posthog-readme.png | Bin 0 -> 2402 bytes
 docs/index.md                       |   3 ++-
 3 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 docs/img/premium/posthog-readme.png

diff --git a/README.md b/README.md
index e3bcc2a1c..8ba0a5e1d 100644
--- a/README.md
+++ b/README.md
@@ -25,8 +25,9 @@ The initial aim is to provide a single full-time position on REST framework.
 [![][esg-img]][esg-url]
 [![][retool-img]][retool-url]
 [![][bitio-img]][bitio-url]
+[![][posthog-img]][posthog-url]
 
-Many thanks to all our [wonderful sponsors][sponsors], and in particular to our premium backers, [Sentry][sentry-url], [Stream][stream-url], [Rollbar][rollbar-url], [ESG][esg-url], [Retool][retool-url], and [bit.io][bitio-url].
+Many thanks to all our [wonderful sponsors][sponsors], and in particular to our premium backers, [Sentry][sentry-url], [Stream][stream-url], [Rollbar][rollbar-url], [ESG][esg-url], [Retool][retool-url], [bit.io][bitio-url], and [PostHog][posthog-url].
 
 ---
 
@@ -195,6 +196,7 @@ Please see the [security policy][security-policy].
 [esg-img]: https://raw.githubusercontent.com/encode/django-rest-framework/master/docs/img/premium/esg-readme.png
 [retool-img]: https://raw.githubusercontent.com/encode/django-rest-framework/master/docs/img/premium/retool-readme.png
 [bitio-img]: https://raw.githubusercontent.com/encode/django-rest-framework/master/docs/img/premium/bitio-readme.png
+[posthog-img]: https://raw.githubusercontent.com/encode/django-rest-framework/master/docs/img/premium/posthog-readme.png
 
 [sentry-url]: https://getsentry.com/welcome/
 [stream-url]: https://getstream.io/?utm_source=drf&utm_medium=sponsorship&utm_content=developer
@@ -202,6 +204,7 @@ Please see the [security policy][security-policy].
 [esg-url]: https://software.esg-usa.com/
 [retool-url]: https://retool.com/?utm_source=djangorest&utm_medium=sponsorship
 [bitio-url]: https://bit.io/jobs?utm_source=DRF&utm_medium=sponsor&utm_campaign=DRF_sponsorship
+[posthog-url]: https://posthog.com?utm_source=drf&utm_medium=sponsorship&utm_campaign=open-source-sponsorship
 
 [oauth1-section]: https://www.django-rest-framework.org/api-guide/authentication/#django-rest-framework-oauth
 [oauth2-section]: https://www.django-rest-framework.org/api-guide/authentication/#django-oauth-toolkit
diff --git a/docs/img/premium/posthog-readme.png b/docs/img/premium/posthog-readme.png
new file mode 100644
index 0000000000000000000000000000000000000000..9ca8b0ecf04599491790c65f6ac2382a1f45cb34
GIT binary patch
literal 2402
zcmai$dpy(oAIIm?kqEUVMI1|COS+h2jFQXTx1B9IU5@L*+;d$jLMd%T+LDdA=Y9!U
zO`&8o_mayIDdv_-A-UVxJbwN6dpyqL@p*i{ulM)+e7#=Z@At0{8Hcslxnuth5D2u>
z$`W-31QG!Y^y+po!Cqx!8!Whp6OA#(AW(UN)Vj+y!7LJV#=-^wfTCV04r1+CN^`RT6k>eVYF
zBcruOb2^VqMINXu5{N;Nm
zqHJ#!fI!<5tx(2xq5U(1Q-n$wWLu}W2EJU6rPH6guvvy==MQlDuww4toQBkVvx=gB
zS56+3F_shmk9B{jb$qEsJ>}{Re&V>w8v9)6amureTuaCH72!MtnmxS`rtIbfQ8e9$UWfTA8?9)t?!XzL_}Y0;vq!}N8n+<^&H^8AcCFY4@fNOCpmAEU**@Zl%mYXyJ-UgseWGAX^U|40*v+
zfXPrB@bc8vNIp9*MDikKcSEHwu|0PLVtGV@`6R2u#yu$wc8g+LOl>S2ad
zNlq75jnbj!Li+}4Hk8eTq?md-io$%ik8Vif4I@P%8K6VEX@g_9_%%>-ohogqEmNrl
zWWBQA=;}w`oukPTxMpbNgHp2WFZqNl@k?fK$Cs8z-!G%x@j@t#e39C>$l
zgZtJ{NLKmfDJJjzpM)p-zow=T7c!IAXmXAAa3Y5p5EM;Z>c
zOqrTzK1V;PP3h$!@uGlamb4CXM%Fvf9sS;PpLbw?dN;3?t`-CD<~==K$ffI8?KJBV
z$O0~1mn?g`EfXfhy#hsnfXpWyk2r#9m7z44^L5I$0d_@TD)J6|dUee^N(9NF1QIdW
z7c8JDBqEOj8U4gaCAneZ3DCwRAn``nY$?~Xx0?q80yo_Ds5fs2k_s70qc`RT8gvp`
zTmuBwT)-mjhWgODYlM1lVq4QO!B6S!<=I0&irx##s3-*T9Gs{@SVZkJf7v0pGL<_l
zXb8u|uZMka*Uc{xCpT@S)B;2g$(-4-#?`YOSJi-6!ACCYAY)CZ^w9FXyr)y%fk_sq
zKox&aL8E}ZYC|6VH1U2bs(rYDQ1M*QV@F-69=a(k=n+(2Uo7kG{ah1=LObq9E{v5P
z@wfuEW_yVEt^(zEYC-g_v**Icv2Uw@^!n2qc0lw;GgSyEajkc()wgzg
zMwx4?mmd*ZSzv-sS*PrXmPwoHCu{J#mEU6f3zKHcfstl%v;N|g@enS*%Ae54Yj}uj
z%lRoIKV@-jL<`+`t5!Mnl8aSt*vsldhPXT0zMwmyK)w{wBavcnpw(X>_Rr*HGi{_F
z`~2dwy1Ho@*a$7Y4t*SX^aNdgA^0qU)M;vy`e}AuIy{*?sC@UQs*0i<6PuK90L3BJ
z#nu2OGmkAxPU;{s;ymw-l>?7T5Yauir!94LW*z^DztyXG!f=i;5#G|L`JzA-TT^-W
zHSb#W!vG3FzjIEZh*9}Hxs6!gW;WIx?N=MJ7)t$m?ZjAUQpgDMNjqCLrYR@e8Ul8~
z+Psy>pX(WZ4Gf-eKGYK;%Zx|s>8`Sae1=jgch4VabK)gvvD*?Qv2i2$B^`H8g(+00
z8erfHDDIDivGiM~LzTQwW+tc7($y{!-|=5XBhem8GYv~9_Zy_fot1a<^}{Qx3@~0n
zS>`OXmrvV6GeX5woY=vOc{V)GTp#|EC$#lWGRBhLZsws0(C2FIb2}u9JexkenOO|F
z=vsfrkhza|EXMqeXfR2?fdF^x_TMO+4y!qL_>}X}ju(jP#?Fv{$BUg`IpaUv(gW(Z
zokCrLI|RF?YB?TgRZY3pmX*-GG86H1Km1GAOX<@~Si73-#j?8`_8RP`)TGykPIkqn
zX{gu7UC#Qv&Yk?s{{C}%Q7(!+Rdy)#y!uRZldTj(uRUy_tCLN2kOmNxK6b8dBUqK0
z3rQnZ0wp{|!dKhD!%!+SW46E;%T$M|%&@3Z6X%=%
E0-^VOCIA2c

literal 0
HcmV?d00001

diff --git a/docs/index.md b/docs/index.md
index f000d2e09..54b788107 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -72,10 +72,11 @@ continued development by **[signing up for a paid plan][funding]**.
     
  • Rollbar
    • 
     
  • Retool
    • 
     
  • bit.io
    • 
+    
  • PostHog
    • 
 

 

 
-*Many thanks to all our [wonderful sponsors][sponsors], and in particular to our premium backers, [Sentry](https://getsentry.com/welcome/), [Stream](https://getstream.io/?utm_source=drf&utm_medium=sponsorship&utm_content=developer), [ESG](https://software.esg-usa.com/), [Rollbar](https://rollbar.com/?utm_source=django&utm_medium=sponsorship&utm_campaign=freetrial), [Cadre](https://cadre.com), [Kloudless](https://hubs.ly/H0f30Lf0), [Lights On Software](https://lightsonsoftware.com), [Retool](https://retool.com/?utm_source=djangorest&utm_medium=sponsorship), and [bit.io](https://bit.io/jobs?utm_source=DRF&utm_medium=sponsor&utm_campaign=DRF_sponsorship).*
+*Many thanks to all our [wonderful sponsors][sponsors], and in particular to our premium backers, [Sentry](https://getsentry.com/welcome/), [Stream](https://getstream.io/?utm_source=drf&utm_medium=sponsorship&utm_content=developer), [ESG](https://software.esg-usa.com/), [Rollbar](https://rollbar.com/?utm_source=django&utm_medium=sponsorship&utm_campaign=freetrial), [Cadre](https://cadre.com), [Kloudless](https://hubs.ly/H0f30Lf0), [Lights On Software](https://lightsonsoftware.com), [Retool](https://retool.com/?utm_source=djangorest&utm_medium=sponsorship), [bit.io](https://bit.io/jobs?utm_source=DRF&utm_medium=sponsor&utm_campaign=DRF_sponsorship), and [bit.io](https://posthog.com?utm_source=DRF&utm_medium=sponsor&utm_campaign=DRF_sponsorship).*
 
 ---
 

From 6ea95b6ad1bc0d4a4234a267b1ba32701878c6bb Mon Sep 17 00:00:00 2001
From: thetarby <45286577+thetarby@users.noreply.github.com>
Date: Tue, 5 Oct 2021 17:33:55 +0300
Subject: [PATCH 173/303] Highlight `select_related` and `prefetch_related`
 usage in documentation (#7610)

* docs updated to highlight use of select_related and prefetch related to avoid n+1 problems

* Apply suggestions from code review

cosmetic changes

Co-authored-by: Xavier Ordoquy 

* cosmetic changes

Co-authored-by: Xavier Ordoquy 
---
 docs/api-guide/fields.md        | 10 +++++++++-
 docs/api-guide/generic-views.md |  7 +++++++
 docs/api-guide/relations.md     | 31 +++++++++++++++++++++++++++++++
 3 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/docs/api-guide/fields.md b/docs/api-guide/fields.md
index b986009f9..5b9688dca 100644
--- a/docs/api-guide/fields.md
+++ b/docs/api-guide/fields.md
@@ -78,7 +78,14 @@ Defaults to `False`
 
 ### `source`
 
-The name of the attribute that will be used to populate the field.  May be a method that only takes a `self` argument, such as `URLField(source='get_absolute_url')`, or may use dotted notation to traverse attributes, such as `EmailField(source='user.email')`. When serializing fields with dotted notation, it may be necessary to provide a `default` value if any object is not present or is empty during attribute traversal.
+The name of the attribute that will be used to populate the field.  May be a method that only takes a `self` argument, such as `URLField(source='get_absolute_url')`, or may use dotted notation to traverse attributes, such as `EmailField(source='user.email')`. 
+
+When serializing fields with dotted notation, it may be necessary to provide a `default` value if any object is not present or is empty during attribute traversal. Beware of possible n+1 problems when using source attribute if you are accessing a relational orm model. For example:
+
+    class CommentSerializer(serializers.Serializer):
+        email = serializers.EmailField(source="user.email")
+
+would require user object to be fetched from database when it is not prefetched. If that is not wanted, be sure to be using `prefetch_related` and `select_related` methods appropriately. For more information about the methods refer to [django documentation][django-docs-select-related].
 
 The value `source='*'` has a special meaning, and is used to indicate that the entire object should be passed through to the field.  This can be useful for creating nested representations, or for fields which require access to the complete object in order to determine the output representation.
 
@@ -855,3 +862,4 @@ The [django-rest-framework-hstore][django-rest-framework-hstore] package provide
 [django-hstore]: https://github.com/djangonauts/django-hstore
 [python-decimal-rounding-modes]: https://docs.python.org/3/library/decimal.html#rounding-modes
 [django-current-timezone]: https://docs.djangoproject.com/en/stable/topics/i18n/timezones/#default-time-zone-and-current-time-zone
+[django-docs-select-related]: https://docs.djangoproject.com/en/3.1/ref/models/querysets/#django.db.models.query.QuerySet.select_related
diff --git a/docs/api-guide/generic-views.md b/docs/api-guide/generic-views.md
index afc2cab56..fbafec93a 100644
--- a/docs/api-guide/generic-views.md
+++ b/docs/api-guide/generic-views.md
@@ -96,6 +96,12 @@ For example:
         user = self.request.user
         return user.accounts.all()
 
+---
+
+**Note:** If the serializer_class used in the generic view spans orm relations, leading to an n+1 problem, you could optimize your queryset in this method using `select_related` and `prefetch_related`. To get more information about n+1 problem and use cases of the mentioned methods refer to related section in [django documentation][django-docs-select-related].
+
+---
+
 #### `get_object(self)`
 
 Returns an object instance that should be used for detail views.  Defaults to using the `lookup_field` parameter to filter the base queryset.
@@ -389,3 +395,4 @@ The following third party packages provide additional generic view implementatio
 [UpdateModelMixin]: #updatemodelmixin
 [DestroyModelMixin]: #destroymodelmixin
 [django-rest-multiple-models]: https://github.com/MattBroach/DjangoRestMultipleModels
+[django-docs-select-related]: https://docs.djangoproject.com/en/3.1/ref/models/querysets/#django.db.models.query.QuerySet.select_related
\ No newline at end of file
diff --git a/docs/api-guide/relations.md b/docs/api-guide/relations.md
index f444125cf..4547253b0 100644
--- a/docs/api-guide/relations.md
+++ b/docs/api-guide/relations.md
@@ -17,6 +17,37 @@ Relational fields are used to represent model relationships.  They can be applie
 
 ---
 
+---
+
+**Note:** REST Framework does not attempt to automatically optimize querysets passed to serializers in terms of `select_related` and `prefetch_related` since it would be too much magic. A serializer with a field spanning an orm relation through its source attribute could require an additional database hit to fetch related object from the database. It is the programmer's responsibility to optimize queries to avoid additional database hits which could occur while using such a serializer.
+
+For example, the following serializer would lead to a database hit each time evaluating the tracks field if it is not prefetched:
+
+    class AlbumSerializer(serializers.ModelSerializer):
+        tracks = serializers.SlugRelatedField(
+            many=True,
+            read_only=True,
+            slug_field='title'
+        )
+
+        class Meta:
+            model = Album
+            fields = ['album_name', 'artist', 'tracks']
+    
+    # For each album object, tracks should be fetched from database
+    qs = Album.objects.all()
+    print(AlbumSerializer(qs, many=True).data)
+
+If `AlbumSerializer` is used to serialize a fairly large queryset with `many=True` then it could be a serious performance problem. Optimizing the queryset passed to `AlbumSerializer` with:
+
+    qs = Album.objects.prefetch_related('tracks')
+    # No additional database hits required
+    print(AlbumSerializer(qs, many=True).data)
+
+would solve the issue.
+
+---
+
 #### Inspecting relationships.
 
 When using the `ModelSerializer` class, serializer fields and relationships will be automatically generated for you. Inspecting these automatically generated fields can be a useful tool for determining how to customize the relationship style.

From 53a0585dacea328ce74083f0da0dea10c4df03e5 Mon Sep 17 00:00:00 2001
From: Edmund <2623895+edmundlam@users.noreply.github.com>
Date: Thu, 7 Oct 2021 04:09:00 -0400
Subject: [PATCH 174/303] Update permissions.md to fix garden path sentences
 (#8206)

---
 docs/api-guide/permissions.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/api-guide/permissions.md b/docs/api-guide/permissions.md
index 6912c375c..19bc0e66a 100644
--- a/docs/api-guide/permissions.md
+++ b/docs/api-guide/permissions.md
@@ -24,9 +24,9 @@ A slightly less strict style of permission would be to allow full access to auth
 Permissions in REST framework are always defined as a list of permission classes.
 
 Before running the main body of the view each permission in the list is checked.
-If any permission check fails an `exceptions.PermissionDenied` or `exceptions.NotAuthenticated` exception will be raised, and the main body of the view will not run.
+If any permission check fails, an `exceptions.PermissionDenied` or `exceptions.NotAuthenticated` exception will be raised, and the main body of the view will not run.
 
-When the permissions checks fail either a "403 Forbidden" or a "401 Unauthorized" response will be returned, according to the following rules:
+When the permission checks fail, either a "403 Forbidden" or a "401 Unauthorized" response will be returned, according to the following rules:
 
 * The request was successfully authenticated, but permission was denied. *— An HTTP 403 Forbidden response will be returned.*
 * The request was not successfully authenticated, and the highest priority authentication class *does not* use `WWW-Authenticate` headers. *— An HTTP 403 Forbidden response will be returned.*

From ddc5cd7e4b5f4bf250afd412b314af6728ea1726 Mon Sep 17 00:00:00 2001
From: Uzair Ali <72073401+uzair-ali10@users.noreply.github.com>
Date: Thu, 7 Oct 2021 20:22:44 +0530
Subject: [PATCH 175/303] Imported Response (#8207)

---
 docs/api-guide/views.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/api-guide/views.md b/docs/api-guide/views.md
index 2224c1f3a..878a291b2 100644
--- a/docs/api-guide/views.md
+++ b/docs/api-guide/views.md
@@ -145,6 +145,7 @@ REST framework also allows you to work with regular function based views.  It pr
 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:
 
     from rest_framework.decorators import api_view
+    from rest_framework.response import Response
 
     @api_view()
     def hello_world(request):

From 00cd4ef864a8bf6d6c90819a983017070f9f08a5 Mon Sep 17 00:00:00 2001
From: rgermain 
Date: Fri, 15 Oct 2021 16:13:20 +0200
Subject: [PATCH 176/303] add third packages  nested-multipart-parser (#8208)

---
 docs/community/third-party-packages.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/community/third-party-packages.md b/docs/community/third-party-packages.md
index 933244a6a..e25421f50 100644
--- a/docs/community/third-party-packages.md
+++ b/docs/community/third-party-packages.md
@@ -106,6 +106,7 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque
 * [djangorestframework-msgpack][djangorestframework-msgpack] - Provides MessagePack renderer and parser support.
 * [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.
 * [djangorestframework-camel-case][djangorestframework-camel-case] - Provides camel case JSON renderers and parsers.
+* [nested-multipart-parser][nested-multipart-parser] - Provides nested parser for http multipart request
 
 ### Renderers
 
@@ -183,6 +184,7 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque
 [wq.db.rest]: https://wq.io/docs/about-rest
 [djangorestframework-msgpack]: https://github.com/juanriaza/django-rest-framework-msgpack
 [djangorestframework-camel-case]: https://github.com/vbabiy/djangorestframework-camel-case
+[nested-multipart-parser]: https://github.com/remigermain/nested-multipart-parser
 [djangorestframework-csv]: https://github.com/mjumbewu/django-rest-framework-csv
 [drf_ujson2]: https://github.com/Amertz08/drf_ujson2
 [rest-pandas]: https://github.com/wq/django-rest-pandas

From 781890b7df88086d9cba07904e53db346ec4a715 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Lavoie?= 
Date: Mon, 8 Nov 2021 03:59:32 -0600
Subject: [PATCH 177/303] docs(api-guide-testing): Fix typo 'CRSF' and plural
 of word (#8238)

---
 docs/api-guide/testing.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/api-guide/testing.md b/docs/api-guide/testing.md
index 73de68a76..62eb8dd1a 100644
--- a/docs/api-guide/testing.md
+++ b/docs/api-guide/testing.md
@@ -234,7 +234,7 @@ 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
+First, make a `GET` request in order to obtain a CSRF token, then present that
 token in the following request.
 
 For example...
@@ -259,7 +259,7 @@ 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
+Using this style to create basic tests of a few core pieces 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.

From 060a3b632f6f6ff2f84235d1be5da55020c40ff3 Mon Sep 17 00:00:00 2001
From: Anton Burnashev 
Date: Wed, 10 Nov 2021 17:31:15 +0100
Subject: [PATCH 178/303] Docs: fix broken link (#8245)

---
 docs/api-guide/pagination.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/api-guide/pagination.md b/docs/api-guide/pagination.md
index 632af6a82..379c1975a 100644
--- a/docs/api-guide/pagination.md
+++ b/docs/api-guide/pagination.md
@@ -312,7 +312,7 @@ The [`drf-proxy-pagination` package][drf-proxy-pagination] includes a `ProxyPagi
 
 ## link-header-pagination
 
-The [`django-rest-framework-link-header-pagination` package][drf-link-header-pagination] includes a `LinkHeaderPagination` class which provides pagination via an HTTP `Link` header as described in [Github's developer documentation](github-link-pagination).
+The [`django-rest-framework-link-header-pagination` package][drf-link-header-pagination] includes a `LinkHeaderPagination` class which provides pagination via an HTTP `Link` header as described in [GitHub REST API documentation][github-traversing-with-pagination].
 
 [cite]: https://docs.djangoproject.com/en/stable/topics/pagination/
 [link-header]: ../img/link-header-pagination.png
@@ -322,3 +322,4 @@ The [`django-rest-framework-link-header-pagination` package][drf-link-header-pag
 [drf-link-header-pagination]: https://github.com/tbeadle/django-rest-framework-link-header-pagination
 [disqus-cursor-api]: https://cra.mr/2011/03/08/building-cursors-for-the-disqus-api
 [float_cursor_pagination_example]: https://gist.github.com/keturn/8bc88525a183fd41c73ffb729b8865be#file-fpcursorpagination-py
+[github-traversing-with-pagination]: https://docs.github.com/en/rest/guides/traversing-with-pagination

From 0d5250cffada2ac250e24407953d4862d04d3dae Mon Sep 17 00:00:00 2001
From: Dmytro Litvinov 
Date: Mon, 15 Nov 2021 10:54:19 +0200
Subject: [PATCH 179/303] Fix link to installation of httpie (#8257)

Right now httpie moved to "httpie" organization (https://github.com/httpie/httpie) and they don't have "installation" at their GitHub. Instead of that, they have "Getting started" section with link to "Installation instructions".
---
 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 ee839790f..f4dcc5606 100644
--- a/docs/tutorial/quickstart.md
+++ b/docs/tutorial/quickstart.md
@@ -225,4 +225,4 @@ If you want to get a more in depth understanding of how REST framework fits toge
 [image]: ../img/quickstart.png
 [tutorial]: 1-serialization.md
 [guide]: ../api-guide/requests.md
-[httpie]: https://github.com/jakubroztocil/httpie#installation
+[httpie]: https://httpie.io/docs#installation

From 580bf45ccfd5c423a938729907d813f4862dca38 Mon Sep 17 00:00:00 2001
From: Asif Saif Uddin 
Date: Mon, 22 Nov 2021 16:48:58 +0600
Subject: [PATCH 180/303] test v4 beta 1 (#8222)

* test v4 beta 1

* django 4 rc1
---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 6f49d373f..1ab505195 100644
--- a/tox.ini
+++ b/tox.ini
@@ -24,7 +24,7 @@ deps =
         django22: Django>=2.2,<3.0
         django31: Django>=3.1,<3.2
         django32: Django>=3.2,<4.0
-        django40: Django>=4.0a1,<5.0
+        django40: Django>=4.0rc1,<5.0
         djangomain: https://github.com/django/django/archive/main.tar.gz
         -rrequirements/requirements-testing.txt
         -rrequirements/requirements-optionals.txt

From 380ac8e79dd85e6798eb00a730b7d4c4c4a86ebd Mon Sep 17 00:00:00 2001
From: Yecine Megdiche 
Date: Mon, 6 Dec 2021 16:32:33 +0100
Subject: [PATCH 181/303] Remove old-style `super` calls (#8226)

---
 docs/api-guide/filtering.md                       | 2 +-
 docs/api-guide/serializers.md                     | 2 +-
 docs/tutorial/4-authentication-and-permissions.md | 2 +-
 rest_framework/fields.py                          | 2 ++
 rest_framework/schemas/coreapi.py                 | 8 ++++----
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/docs/api-guide/filtering.md b/docs/api-guide/filtering.md
index 3541388ca..512acafbd 100644
--- a/docs/api-guide/filtering.md
+++ b/docs/api-guide/filtering.md
@@ -241,7 +241,7 @@ To dynamically change search fields based on request content, it's possible to s
         def get_search_fields(self, view, request):
             if request.query_params.get('title_only'):
                 return ['title']
-            return super(CustomSearchFilter, self).get_search_fields(view, request)
+            return super().get_search_fields(view, request)
 
 For more details, see the [Django documentation][search-django-admin].
 
diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md
index 377f732ac..4d032bd9e 100644
--- a/docs/api-guide/serializers.md
+++ b/docs/api-guide/serializers.md
@@ -1095,7 +1095,7 @@ For example, if you wanted to be able to set which fields should be used by a se
             fields = kwargs.pop('fields', None)
 
             # Instantiate the superclass normally
-            super(DynamicFieldsModelSerializer, self).__init__(*args, **kwargs)
+            super().__init__(*args, **kwargs)
 
             if fields is not None:
                 # Drop any fields that are not specified in the `fields` argument.
diff --git a/docs/tutorial/4-authentication-and-permissions.md b/docs/tutorial/4-authentication-and-permissions.md
index 79ce355c9..cb0321ea2 100644
--- a/docs/tutorial/4-authentication-and-permissions.md
+++ b/docs/tutorial/4-authentication-and-permissions.md
@@ -38,7 +38,7 @@ And now we can add a `.save()` method to our model class:
         formatter = HtmlFormatter(style=self.style, linenos=linenos,
                                   full=True, **options)
         self.highlighted = highlight(self.code, lexer, formatter)
-        super(Snippet, self).save(*args, **kwargs)
+        super().save(*args, **kwargs)
 
 When that's all done we'll need to update our database tables.
 Normally we'd create a database migration in order to do that, but for the purposes of this tutorial, let's just delete the database and start again.
diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index 5cafed555..d7e7816ce 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -1491,6 +1491,8 @@ class MultipleChoiceField(ChoiceField):
             self.fail('empty')
 
         return {
+            # Arguments for super() are needed because of scoping inside
+            # comprehensions.
             super(MultipleChoiceField, self).to_internal_value(item)
             for item in data
         }
diff --git a/rest_framework/schemas/coreapi.py b/rest_framework/schemas/coreapi.py
index 75ed5671a..179f0fa3c 100644
--- a/rest_framework/schemas/coreapi.py
+++ b/rest_framework/schemas/coreapi.py
@@ -58,7 +58,7 @@ class LinkNode(OrderedDict):
     def __init__(self):
         self.links = []
         self.methods_counter = Counter()
-        super(LinkNode, self).__init__()
+        super().__init__()
 
     def get_available_key(self, preferred_key):
         if preferred_key not in self:
@@ -120,7 +120,7 @@ class SchemaGenerator(BaseSchemaGenerator):
         assert coreapi, '`coreapi` must be installed for schema support.'
         assert coreschema, '`coreschema` must be installed for schema support.'
 
-        super(SchemaGenerator, self).__init__(title, url, description, patterns, urlconf)
+        super().__init__(title, url, description, patterns, urlconf)
         self.coerce_method_names = api_settings.SCHEMA_COERCE_METHOD_NAMES
 
     def get_links(self, request=None):
@@ -346,7 +346,7 @@ class AutoSchema(ViewInspector):
         * `manual_fields`: list of `coreapi.Field` instances that
             will be added to auto-generated fields, overwriting on `Field.name`
         """
-        super(AutoSchema, self).__init__()
+        super().__init__()
         if manual_fields is None:
             manual_fields = []
         self._manual_fields = manual_fields
@@ -587,7 +587,7 @@ class ManualSchema(ViewInspector):
         * `fields`: list of `coreapi.Field` instances.
         * `description`: String description for view. Optional.
         """
-        super(ManualSchema, self).__init__()
+        super().__init__()
         assert all(isinstance(f, coreapi.Field) for f in fields), "`fields` must be a list of coreapi.Field instances"
         self._fields = fields
         self._description = description

From dabf2216c33a365f80354d962177d72914e8936f Mon Sep 17 00:00:00 2001
From: Jaap Roes 
Date: Wed, 8 Dec 2021 15:30:34 +0100
Subject: [PATCH 182/303] Update django-cors-headers links (#8176)

---
 docs/topics/ajax-csrf-cors.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/topics/ajax-csrf-cors.md b/docs/topics/ajax-csrf-cors.md
index 646f3f563..a65e3fdf8 100644
--- a/docs/topics/ajax-csrf-cors.md
+++ b/docs/topics/ajax-csrf-cors.md
@@ -31,11 +31,11 @@ In order to make AJAX requests, you need to include CSRF token in the HTTP heade
 
 The best way to deal with CORS in REST framework is to add the required response headers in middleware.  This ensures that CORS is supported transparently, without having to change any behavior in your views.
 
-[Otto Yiu][ottoyiu] maintains the [django-cors-headers] package, which is known to work correctly with REST framework APIs.
+[Adam Johnson][adamchainz] maintains the [django-cors-headers] package, which is known to work correctly with REST framework APIs.
 
 [cite]: https://blog.codinghorror.com/preventing-csrf-and-xsrf-attacks/
 [csrf]: https://www.owasp.org/index.php/Cross-Site_Request_Forgery_(CSRF)
 [csrf-ajax]: https://docs.djangoproject.com/en/stable/ref/csrf/#ajax
 [cors]: https://www.w3.org/TR/cors/
-[ottoyiu]: https://github.com/ottoyiu/
-[django-cors-headers]: https://github.com/ottoyiu/django-cors-headers/
+[adamchainz]: https://github.com/adamchainz
+[django-cors-headers]: https://github.com/adamchainz/django-cors-headers

From 37b73ef46e8cf4cc746709542d7d26f6b152a26d Mon Sep 17 00:00:00 2001
From: Jeremy Langley 
Date: Wed, 8 Dec 2021 06:33:41 -0800
Subject: [PATCH 183/303] IsAdmin permissions changed to IsAdminUser (#8227)

Documentation change to keep up with the code permission changes.

Co-authored-by: Jeremy Langley 
---
 docs/api-guide/viewsets.md         | 2 +-
 docs/community/3.9-announcement.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/api-guide/viewsets.md b/docs/api-guide/viewsets.md
index d4ab5a731..417972507 100644
--- a/docs/api-guide/viewsets.md
+++ b/docs/api-guide/viewsets.md
@@ -125,7 +125,7 @@ You may inspect these attributes to adjust behaviour based on the current action
         if self.action == 'list':
             permission_classes = [IsAuthenticated]
         else:
-            permission_classes = [IsAdmin]
+            permission_classes = [IsAdminUser]
         return [permission() for permission in permission_classes]
 
 ## Marking extra actions for routing
diff --git a/docs/community/3.9-announcement.md b/docs/community/3.9-announcement.md
index fee6e6909..d673fdd18 100644
--- a/docs/community/3.9-announcement.md
+++ b/docs/community/3.9-announcement.md
@@ -110,7 +110,7 @@ You can now compose permission classes using the and/or operators, `&` and `|`.
 For example...
 
 ```python
-permission_classes = [IsAuthenticated & (ReadOnly | IsAdmin)]
+permission_classes = [IsAuthenticated & (ReadOnly | IsAdminUser)]
 ```
 
 If you're using custom permission classes then make sure that you are subclassing

From 3a762d9aac526f26ea2e9798140cb99a1d3ebc18 Mon Sep 17 00:00:00 2001
From: Matthew Pull 
Date: Wed, 8 Dec 2021 14:35:06 +0000
Subject: [PATCH 184/303] Update permissions.md (#8260)

I might just be misunderstanding something (always a strong possibility!), but it seems to me that the table on the Permissions page is slightly inaccurate.

For `permission_classes`, wouldn't it have global-level permissions for list actions (rather than no permission control, as is currently listed)?
---
 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 19bc0e66a..5d6462b45 100644
--- a/docs/api-guide/permissions.md
+++ b/docs/api-guide/permissions.md
@@ -286,7 +286,7 @@ The following table lists the access restriction methods and the level of contro
 
 |                                    | `queryset` | `permission_classes` | `serializer_class` |
 |------------------------------------|------------|----------------------|--------------------|
-| Action: list                       | global     | no                   | object-level*      |
+| Action: list                       | global     | global               | object-level*      |
 | Action: create                     | no         | global               | object-level       |
 | Action: retrieve                   | global     | object-level         | object-level       |
 | Action: update                     | global     | object-level         | object-level       |

From b0d407fd6344e6be9a0f1374cf53cf7e5286b67f Mon Sep 17 00:00:00 2001
From: Alexander Klimenko 
Date: Wed, 8 Dec 2021 17:37:32 +0300
Subject: [PATCH 185/303] Made api_setting.UNICODE_JSON/ensure_ascii affecting
 json schema (#7991)

---
 rest_framework/renderers.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py
index 5b7ba8a8c..b0ddca2b5 100644
--- a/rest_framework/renderers.py
+++ b/rest_framework/renderers.py
@@ -1035,13 +1035,16 @@ class CoreAPIJSONOpenAPIRenderer(_BaseOpenAPIRenderer):
     media_type = 'application/vnd.oai.openapi+json'
     charset = None
     format = 'openapi-json'
+    ensure_ascii = not api_settings.UNICODE_JSON
 
     def __init__(self):
         assert coreapi, 'Using CoreAPIJSONOpenAPIRenderer, but `coreapi` is not installed.'
 
     def render(self, data, media_type=None, renderer_context=None):
         structure = self.get_structure(data)
-        return json.dumps(structure, indent=4).encode('utf-8')
+        return json.dumps(
+            structure, indent=4,
+            ensure_ascii=self.ensure_ascii).encode('utf-8')
 
 
 class OpenAPIRenderer(BaseRenderer):
@@ -1065,6 +1068,9 @@ class JSONOpenAPIRenderer(BaseRenderer):
     charset = None
     encoder_class = encoders.JSONEncoder
     format = 'openapi-json'
+    ensure_ascii = not api_settings.UNICODE_JSON
 
     def render(self, data, media_type=None, renderer_context=None):
-        return json.dumps(data, cls=self.encoder_class, indent=2).encode('utf-8')
+        return json.dumps(
+            data, cls=self.encoder_class, indent=2,
+            ensure_ascii=self.ensure_ascii).encode('utf-8')

From 47ee3fc9a999440e721424aa5100f9eb216f0096 Mon Sep 17 00:00:00 2001
From: Chen Wen Kang <23054115+cwkang1998@users.noreply.github.com>
Date: Wed, 8 Dec 2021 22:38:42 +0800
Subject: [PATCH 186/303] Update docs related to coreapi to include deprecation
 notice (#8186)

* Update docs related to coreapi to include deprecation notice

* Update docs to use reference to version 3.10 release notes instead of 3.9
---
 docs/coreapi/7-schemas-and-client-libraries.md | 11 +++++++++++
 docs/coreapi/from-documenting-your-api.md      | 11 +++++++++++
 docs/coreapi/index.md                          |  4 ++--
 docs/coreapi/schemas.md                        |  8 ++++++++
 4 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/docs/coreapi/7-schemas-and-client-libraries.md b/docs/coreapi/7-schemas-and-client-libraries.md
index 203d81ea5..d95019dab 100644
--- a/docs/coreapi/7-schemas-and-client-libraries.md
+++ b/docs/coreapi/7-schemas-and-client-libraries.md
@@ -1,5 +1,16 @@
 # Tutorial 7: Schemas & client libraries
 
+----
+
+**DEPRECATION NOTICE:** Use of CoreAPI-based schemas were deprecated with the introduction of native OpenAPI-based schema generation as of Django REST Framework v3.10. See the [Version 3.10 Release Announcement](../community/3.10-announcement.md) for more details.
+
+If you are looking for information regarding schemas, you might want to look at these updated resources:
+
+1. [Schema](../api-guide/schemas.md)
+2. [Documenting your API](../topics/documenting-your-api.md)
+
+----
+
 A schema is a machine-readable document that describes the available API
 endpoints, their URLS, and what operations they support.
 
diff --git a/docs/coreapi/from-documenting-your-api.md b/docs/coreapi/from-documenting-your-api.md
index 604dfa668..65ad71c7a 100644
--- a/docs/coreapi/from-documenting-your-api.md
+++ b/docs/coreapi/from-documenting-your-api.md
@@ -1,6 +1,17 @@
 
 ## Built-in API documentation
 
+----
+
+**DEPRECATION NOTICE:** Use of CoreAPI-based schemas were deprecated with the introduction of native OpenAPI-based schema generation as of Django REST Framework v3.10. See the [Version 3.10 Release Announcement](../community/3.10-announcement.md) for more details.
+
+If you are looking for information regarding schemas, you might want to look at these updated resources:
+
+1. [Schema](../api-guide/schemas.md)
+2. [Documenting your API](../topics/documenting-your-api.md)
+
+----
+
 The built-in API documentation includes:
 
 * Documentation of API endpoints.
diff --git a/docs/coreapi/index.md b/docs/coreapi/index.md
index 9195eb33e..dbcb11584 100644
--- a/docs/coreapi/index.md
+++ b/docs/coreapi/index.md
@@ -1,8 +1,8 @@
 # Legacy CoreAPI Schemas Docs
 
-Use of CoreAPI-based schemas were deprecated with the introduction of native OpenAPI-based schema generation in Django REST Framework v3.10.
+Use of CoreAPI-based schemas were deprecated with the introduction of native OpenAPI-based schema generation as of Django REST Framework v3.10.
 
-See the [Version 3.10 Release Announcement](/community/3.10-announcement.md) for more details.
+See the [Version 3.10 Release Announcement](../community/3.10-announcement.md) for more details.
 
 ----
 
diff --git a/docs/coreapi/schemas.md b/docs/coreapi/schemas.md
index 653105a7a..9f1482d2d 100644
--- a/docs/coreapi/schemas.md
+++ b/docs/coreapi/schemas.md
@@ -2,6 +2,14 @@ source: schemas.py
 
 # Schemas
 
+----
+
+**DEPRECATION NOTICE:** Use of CoreAPI-based schemas were deprecated with the introduction of native OpenAPI-based schema generation as of Django REST Framework v3.10. See the [Version 3.10 Release Announcement](../community/3.10-announcement.md) for more details.
+
+You are probably looking for [this page](../api-guide/schemas.md) if you want latest information regarding 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]

From 6e0cb8a7aa2db1694b46fa3eff5a5271fd7d828e Mon Sep 17 00:00:00 2001
From: Tom Christie 
Date: Wed, 8 Dec 2021 14:53:06 +0000
Subject: [PATCH 187/303] Add CryptAPI sponsorship (#8283)

---
 README.md                            |   5 ++++-
 docs/img/premium/cryptapi-readme.png | Bin 0 -> 17864 bytes
 2 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 docs/img/premium/cryptapi-readme.png

diff --git a/README.md b/README.md
index 8ba0a5e1d..4b089469f 100644
--- a/README.md
+++ b/README.md
@@ -26,8 +26,9 @@ The initial aim is to provide a single full-time position on REST framework.
 [![][retool-img]][retool-url]
 [![][bitio-img]][bitio-url]
 [![][posthog-img]][posthog-url]
+[![][cryptapi-img]][cryptapi-url]
 
-Many thanks to all our [wonderful sponsors][sponsors], and in particular to our premium backers, [Sentry][sentry-url], [Stream][stream-url], [Rollbar][rollbar-url], [ESG][esg-url], [Retool][retool-url], [bit.io][bitio-url], and [PostHog][posthog-url].
+Many thanks to all our [wonderful sponsors][sponsors], and in particular to our premium backers, [Sentry][sentry-url], [Stream][stream-url], [Rollbar][rollbar-url], [ESG][esg-url], [Retool][retool-url], [bit.io][bitio-url], [PostHog][posthog-url], and [CryptAPI][cryptapi-url].
 
 ---
 
@@ -197,6 +198,7 @@ Please see the [security policy][security-policy].
 [retool-img]: https://raw.githubusercontent.com/encode/django-rest-framework/master/docs/img/premium/retool-readme.png
 [bitio-img]: https://raw.githubusercontent.com/encode/django-rest-framework/master/docs/img/premium/bitio-readme.png
 [posthog-img]: https://raw.githubusercontent.com/encode/django-rest-framework/master/docs/img/premium/posthog-readme.png
+[posthog-img]: https://raw.githubusercontent.com/encode/django-rest-framework/master/docs/img/premium/cryptapi-readme.png
 
 [sentry-url]: https://getsentry.com/welcome/
 [stream-url]: https://getstream.io/?utm_source=drf&utm_medium=sponsorship&utm_content=developer
@@ -205,6 +207,7 @@ Please see the [security policy][security-policy].
 [retool-url]: https://retool.com/?utm_source=djangorest&utm_medium=sponsorship
 [bitio-url]: https://bit.io/jobs?utm_source=DRF&utm_medium=sponsor&utm_campaign=DRF_sponsorship
 [posthog-url]: https://posthog.com?utm_source=drf&utm_medium=sponsorship&utm_campaign=open-source-sponsorship
+[cryptapi-url]: https://cryptapi.io
 
 [oauth1-section]: https://www.django-rest-framework.org/api-guide/authentication/#django-rest-framework-oauth
 [oauth2-section]: https://www.django-rest-framework.org/api-guide/authentication/#django-oauth-toolkit
diff --git a/docs/img/premium/cryptapi-readme.png b/docs/img/premium/cryptapi-readme.png
new file mode 100644
index 0000000000000000000000000000000000000000..163f6a9ea20f17909e6e38537a627f19e5766a66
GIT binary patch
literal 17864
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
G_5WXyfz+@7

literal 0
HcmV?d00001


From d1bab643ab249f2c18cc0e6047033ca726c51605 Mon Sep 17 00:00:00 2001
From: Tom Christie 
Date: Wed, 8 Dec 2021 14:53:45 +0000
Subject: [PATCH 188/303] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4b089469f..8875d650e 100644
--- a/README.md
+++ b/README.md
@@ -198,7 +198,7 @@ Please see the [security policy][security-policy].
 [retool-img]: https://raw.githubusercontent.com/encode/django-rest-framework/master/docs/img/premium/retool-readme.png
 [bitio-img]: https://raw.githubusercontent.com/encode/django-rest-framework/master/docs/img/premium/bitio-readme.png
 [posthog-img]: https://raw.githubusercontent.com/encode/django-rest-framework/master/docs/img/premium/posthog-readme.png
-[posthog-img]: https://raw.githubusercontent.com/encode/django-rest-framework/master/docs/img/premium/cryptapi-readme.png
+[cryptapi-img]: https://raw.githubusercontent.com/encode/django-rest-framework/master/docs/img/premium/cryptapi-readme.png
 
 [sentry-url]: https://getsentry.com/welcome/
 [stream-url]: https://getstream.io/?utm_source=drf&utm_medium=sponsorship&utm_content=developer

From c05998f5ddedec7c8c012a9be08aa41130a46b75 Mon Sep 17 00:00:00 2001
From: Tom Christie 
Date: Wed, 8 Dec 2021 15:11:55 +0000
Subject: [PATCH 189/303] Add CryptAPI to docs homepage

---
 docs/index.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/index.md b/docs/index.md
index 54b788107..a86349df1 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -72,11 +72,12 @@ continued development by **[signing up for a paid plan][funding]**.
     
  • Rollbar
    • 
     
  • Retool
    • 
     
  • bit.io
    • 
-    
  • PostHog
    • 
+    
  • PostHog
    • 
+    
  • CryptAPI
    • 
 
 
    
 
-*Many thanks to all our [wonderful sponsors][sponsors], and in particular to our premium backers, [Sentry](https://getsentry.com/welcome/), [Stream](https://getstream.io/?utm_source=drf&utm_medium=sponsorship&utm_content=developer), [ESG](https://software.esg-usa.com/), [Rollbar](https://rollbar.com/?utm_source=django&utm_medium=sponsorship&utm_campaign=freetrial), [Cadre](https://cadre.com), [Kloudless](https://hubs.ly/H0f30Lf0), [Lights On Software](https://lightsonsoftware.com), [Retool](https://retool.com/?utm_source=djangorest&utm_medium=sponsorship), [bit.io](https://bit.io/jobs?utm_source=DRF&utm_medium=sponsor&utm_campaign=DRF_sponsorship), and [bit.io](https://posthog.com?utm_source=DRF&utm_medium=sponsor&utm_campaign=DRF_sponsorship).*
+*Many thanks to all our [wonderful sponsors][sponsors], and in particular to our premium backers, [Sentry](https://getsentry.com/welcome/), [Stream](https://getstream.io/?utm_source=drf&utm_medium=sponsorship&utm_content=developer), [ESG](https://software.esg-usa.com/), [Rollbar](https://rollbar.com/?utm_source=django&utm_medium=sponsorship&utm_campaign=freetrial), [Cadre](https://cadre.com), [Kloudless](https://hubs.ly/H0f30Lf0), [Lights On Software](https://lightsonsoftware.com), [Retool](https://retool.com/?utm_source=djangorest&utm_medium=sponsorship), [bit.io](https://bit.io/jobs?utm_source=DRF&utm_medium=sponsor&utm_campaign=DRF_sponsorship), [PostHog](https://posthog.com?utm_source=DRF&utm_medium=sponsor&utm_campaign=DRF_sponsorship), and [CryptAPI](https://cryptapi.io).*
 
 ---
 

From 1cb3fa2e81ae33d52f4dcfc8b873f7b8093acd50 Mon Sep 17 00:00:00 2001
From: Jet Li 
Date: Fri, 10 Dec 2021 17:31:05 +0800
Subject: [PATCH 190/303] Test Django 4.0 (#8280)

* Test Django 4.0

Django 4.0 released today.

* Test Django 4.0

* Test Django 4.0

* Test Django 4.0
---
 README.md     | 2 +-
 docs/index.md | 2 +-
 setup.py      | 1 +
 tox.ini       | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 8875d650e..7a899cdb4 100644
--- a/README.md
+++ b/README.md
@@ -55,7 +55,7 @@ There is a live example API for testing purposes, [available here][sandbox].
 # Requirements
 
 * Python (3.5, 3.6, 3.7, 3.8, 3.9)
-* Django (2.2, 3.0, 3.1, 3.2)
+* Django (2.2, 3.0, 3.1, 3.2, 4.0)
 
 We **highly recommend** and only officially support the latest patch release of
 each Python and Django series.
diff --git a/docs/index.md b/docs/index.md
index a86349df1..294e1e6d3 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -86,7 +86,7 @@ continued development by **[signing up for a paid plan][funding]**.
 REST framework requires the following:
 
 * Python (3.5, 3.6, 3.7, 3.8, 3.9)
-* Django (2.2, 3.0, 3.1, 3.2)
+* Django (2.2, 3.0, 3.1, 3.2, 4.0)
 
 We **highly recommend** and only officially support the latest patch release of
 each Python and Django series.
diff --git a/setup.py b/setup.py
index b8e220cb4..394845e14 100755
--- a/setup.py
+++ b/setup.py
@@ -93,6 +93,7 @@ setup(
         'Framework :: Django :: 3.0',
         'Framework :: Django :: 3.1',
         'Framework :: Django :: 3.2',
+        'Framework :: Django :: 4.0',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: BSD License',
         'Operating System :: OS Independent',
diff --git a/tox.ini b/tox.ini
index 1ab505195..f2ae6cd6b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -24,7 +24,7 @@ deps =
         django22: Django>=2.2,<3.0
         django31: Django>=3.1,<3.2
         django32: Django>=3.2,<4.0
-        django40: Django>=4.0rc1,<5.0
+        django40: Django>=4.0,<5.0
         djangomain: https://github.com/django/django/archive/main.tar.gz
         -rrequirements/requirements-testing.txt
         -rrequirements/requirements-optionals.txt

From 16ca0c24d3d6fdf5663f761cadc2d4b1baf8acc8 Mon Sep 17 00:00:00 2001
From: Tom Christie 
Date: Fri, 10 Dec 2021 11:53:48 +0000
Subject: [PATCH 191/303] Add 3.10 to tox.ini and setup.py

---
 setup.py | 2 +-
 tox.ini  | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/setup.py b/setup.py
index 394845e14..c18975ef2 100755
--- a/setup.py
+++ b/setup.py
@@ -99,11 +99,11 @@ setup(
         'Operating System :: OS Independent',
         'Programming Language :: Python',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: 3 :: Only',
         'Topic :: Internet :: WWW/HTTP',
     ],
diff --git a/tox.ini b/tox.ini
index f2ae6cd6b..b7d62e081 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,8 +2,8 @@
 envlist =
        {py35,py36,py37}-django22,
        {py36,py37,py38,py39}-django31,
-       {py36,py37,py38,py39}-django32,
-       {py38,py39}-{django40,djangomain},
+       {py36,py37,py38,py39,py310}-django32,
+       {py38,py39,py310}-{django40,djangomain},
        base,dist,docs,
 
 [travis:env]
@@ -54,3 +54,6 @@ ignore_outcome = true
 
 [testenv:py39-djangomain]
 ignore_outcome = true
+
+[testenv:py310-djangomain]
+ignore_outcome = true

From 217b0bf3af0b9332023113aab40283ea6929842d Mon Sep 17 00:00:00 2001
From: Tom Christie 
Date: Fri, 10 Dec 2021 12:04:27 +0000
Subject: [PATCH 192/303] Add Python 3.10 to test matrix (#8287)

* Add Python 3.10 to test matrix

* Update README, docs homepage to properly reflect Python versions that we test against
---
 .github/workflows/main.yml | 1 +
 README.md                  | 2 +-
 docs/index.md              | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index fc166c434..42fee2a12 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -18,6 +18,7 @@ jobs:
         - '3.7'
         - '3.8'
         - '3.9'
+        - '3.10'
 
     steps:
     - uses: actions/checkout@v2
diff --git a/README.md b/README.md
index 7a899cdb4..18d1364c6 100644
--- a/README.md
+++ b/README.md
@@ -54,7 +54,7 @@ There is a live example API for testing purposes, [available here][sandbox].
 
 # Requirements
 
-* Python (3.5, 3.6, 3.7, 3.8, 3.9)
+* Python (3.6, 3.7, 3.8, 3.9, 3.10)
 * Django (2.2, 3.0, 3.1, 3.2, 4.0)
 
 We **highly recommend** and only officially support the latest patch release of
diff --git a/docs/index.md b/docs/index.md
index 294e1e6d3..2954f793a 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -85,7 +85,7 @@ continued development by **[signing up for a paid plan][funding]**.
 
 REST framework requires the following:
 
-* Python (3.5, 3.6, 3.7, 3.8, 3.9)
+* Python (3.6, 3.7, 3.8, 3.9, 3.10)
 * Django (2.2, 3.0, 3.1, 3.2, 4.0)
 
 We **highly recommend** and only officially support the latest patch release of

From 773f479719755193af8b0b7cb9915893738df152 Mon Sep 17 00:00:00 2001
From: Paolo Melchiorre 
Date: Fri, 10 Dec 2021 16:31:01 +0100
Subject: [PATCH 193/303] Python/Django compatibility updates (#8288)

* Update python and django versions in tox.ini

* Update  python requires in setup.py

* Update tox.ini

Co-authored-by: Tom Christie 
---
 setup.py | 2 +-
 tox.ini  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index c18975ef2..210cc9ed0 100755
--- a/setup.py
+++ b/setup.py
@@ -83,7 +83,7 @@ setup(
     packages=find_packages(exclude=['tests*']),
     include_package_data=True,
     install_requires=["django>=2.2", "pytz"],
-    python_requires=">=3.5",
+    python_requires=">=3.6",
     zip_safe=False,
     classifiers=[
         'Development Status :: 5 - Production/Stable',
diff --git a/tox.ini b/tox.ini
index b7d62e081..a41176d72 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist =
-       {py35,py36,py37}-django22,
+       {py36,py37,py38,py39}-django22,
        {py36,py37,py38,py39}-django31,
        {py36,py37,py38,py39,py310}-django32,
        {py38,py39,py310}-{django40,djangomain},

From ba25869045f203c62a0a9ddf5c54b7f882d8308c Mon Sep 17 00:00:00 2001
From: Alexander Clausen 
Date: Mon, 13 Dec 2021 09:57:55 +0100
Subject: [PATCH 194/303] Fix `REQUIRED_PYTHON` in setup.py (#8292)

Just a left-over from #8288 to sync the "Unsupported Python version" message with `python_requires`.
---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 210cc9ed0..3c3761c86 100755
--- a/setup.py
+++ b/setup.py
@@ -8,7 +8,7 @@ from io import open
 from setuptools import find_packages, setup
 
 CURRENT_PYTHON = sys.version_info[:2]
-REQUIRED_PYTHON = (3, 5)
+REQUIRED_PYTHON = (3, 6)
 
 # This check and everything above must remain compatible with Python 2.7.
 if CURRENT_PYTHON < REQUIRED_PYTHON:

From d0bb4d877f95ea85446b8fc66d247f01337897d2 Mon Sep 17 00:00:00 2001
From: Tom Christie 
Date: Mon, 13 Dec 2021 09:33:03 +0000
Subject: [PATCH 195/303] Tweak test_description (#8293)

---
 tests/test_description.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/test_description.py b/tests/test_description.py
index 3b7d95e0a..363ad6513 100644
--- a/tests/test_description.py
+++ b/tests/test_description.py
@@ -23,7 +23,7 @@ indented
 
 # hash style header #
 
-``` json
+```json
 [{
     "alpha": 1,
     "beta": "this is a string"
@@ -107,7 +107,7 @@ class TestViewNamesAndDescriptions(TestCase):
 
             # hash style header #
 
-            ``` json
+            ```json
             [{
                 "alpha": 1,
                 "beta": "this is a string"

From 9c97946531b85858fcee5df56240de6d29571da2 Mon Sep 17 00:00:00 2001
From: tim-mccurrach <34194722+tim-mccurrach@users.noreply.github.com>
Date: Mon, 13 Dec 2021 13:08:40 +0000
Subject: [PATCH 196/303] Make api_view respect standard wrapper assignments
 (#8291)

---
 rest_framework/decorators.py | 20 ++++----------------
 tests/test_decorators.py     | 10 ++++++++++
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/rest_framework/decorators.py b/rest_framework/decorators.py
index 30b9d84d4..7ba43d37c 100644
--- a/rest_framework/decorators.py
+++ b/rest_framework/decorators.py
@@ -7,6 +7,7 @@ based views, as well as the `@action` decorator, which is used to annotate
 methods on viewsets that should be included by routers.
 """
 import types
+from functools import update_wrapper
 
 from django.forms.utils import pretty_name
 
@@ -22,18 +23,8 @@ def api_view(http_method_names=None):
 
     def decorator(func):
 
-        WrappedAPIView = type(
-            'WrappedAPIView',
-            (APIView,),
-            {'__doc__': func.__doc__}
-        )
-
-        # Note, the above allows us to set the docstring.
-        # It is the equivalent of:
-        #
-        #     class WrappedAPIView(APIView):
-        #         pass
-        #     WrappedAPIView.__doc__ = func.doc    <--- Not possible to do this
+        class WrappedAPIView(APIView):
+            pass
 
         # api_view applied without (method_names)
         assert not(isinstance(http_method_names, types.FunctionType)), \
@@ -52,9 +43,6 @@ def api_view(http_method_names=None):
         for method in http_method_names:
             setattr(WrappedAPIView, method.lower(), handler)
 
-        WrappedAPIView.__name__ = func.__name__
-        WrappedAPIView.__module__ = func.__module__
-
         WrappedAPIView.renderer_classes = getattr(func, 'renderer_classes',
                                                   APIView.renderer_classes)
 
@@ -73,7 +61,7 @@ def api_view(http_method_names=None):
         WrappedAPIView.schema = getattr(func, 'schema',
                                         APIView.schema)
 
-        return WrappedAPIView.as_view()
+        return update_wrapper(WrappedAPIView.as_view(), func)
 
     return decorator
 
diff --git a/tests/test_decorators.py b/tests/test_decorators.py
index 99ba13e60..116d6f1be 100644
--- a/tests/test_decorators.py
+++ b/tests/test_decorators.py
@@ -162,6 +162,16 @@ class DecoratorTestCase(TestCase):
 
         assert isinstance(view.cls.schema, CustomSchema)
 
+    def test_wrapper_assignments(self):
+        @api_view(["GET"])
+        def test_view(request):
+            """example docstring"""
+            pass
+
+        assert test_view.__name__ == "test_view"
+        assert test_view.__doc__ == "example docstring"
+        assert test_view.__qualname__ == "DecoratorTestCase.test_wrapper_assignments..test_view"
+
 
 class ActionDecoratorTestCase(TestCase):
 

From 7a84dc749cbc0db106c1ad40d7776ec307d08559 Mon Sep 17 00:00:00 2001
From: Tom Christie 
Date: Mon, 13 Dec 2021 13:10:17 +0000
Subject: [PATCH 197/303] Version 3.13 (#8285)

* Version 3.12.5

* Version 3.13

* Version 3.13
---
 docs/community/3.13-announcement.md | 55 +++++++++++++++++++++++++++++
 docs/community/release-notes.md     | 16 +++++++++
 mkdocs.yml                          |  1 +
 rest_framework/__init__.py          |  2 +-
 4 files changed, 73 insertions(+), 1 deletion(-)
 create mode 100644 docs/community/3.13-announcement.md

diff --git a/docs/community/3.13-announcement.md b/docs/community/3.13-announcement.md
new file mode 100644
index 000000000..e2c1fefa6
--- /dev/null
+++ b/docs/community/3.13-announcement.md
@@ -0,0 +1,55 @@
+
+
+# Django REST framework 3.13
+
+## Django 4.0 support
+
+The latest release now fully supports Django 4.0.
+
+Our requirements are now:
+
+* Python 3.6+
+* Django 4.0, 3.2, 3.1, 2.2 (LTS)
+
+## Fields arguments are now keyword-only
+
+When instantiating fields on serializers, you should always use keyword arguments,
+such as `serializers.CharField(max_length=200)`. This has always been the case,
+and all the examples that we have in the documentation use keyword arguments,
+rather than positional arguments.
+
+From REST framework 3.13 onwards, this is now *explicitly enforced*.
+
+The most feasible cases where users might be accidentally omitting the keyword arguments
+are likely in the composite fields, `ListField` and `DictField`. For instance...
+
+```python
+aliases = serializers.ListField(serializers.CharField())
+```
+
+They must now use the more explicit keyword argument style...
+
+```python
+aliases = serializers.ListField(child=serializers.CharField())
+```
+
+This change has been made because using positional arguments here *does not* result in the expected behaviour.
+
+See Pull Request [#7632](https://github.com/encode/django-rest-framework/pull/7632) for more details.
diff --git a/docs/community/release-notes.md b/docs/community/release-notes.md
index baeeaf874..d3e9dd7cc 100644
--- a/docs/community/release-notes.md
+++ b/docs/community/release-notes.md
@@ -34,6 +34,22 @@ You can determine your currently installed version using `pip show`:
 
 ---
 
+## 3.13.x series
+
+### 3.13.0
+
+Date: 13th December 2021
+
+* Django 4.0 compatability. [#8178]
+* Add `max_length` and `min_length` options to `ListSerializer`. [#8165]
+* Add `get_request_serializer` and `get_response_serializer` hooks to `AutoSchema`. [#7424]
+* Fix OpenAPI representation of null-able read only fields. [#8116]
+* Respect `UNICODE_JSON` setting in API schema outputs. [#7991]
+* Fix for `RemoteUserAuthentication`. [#7158]
+* Make Field constructors keyword-only. [#7632]
+
+---
+
 ## 3.12.x series
 
 ### 3.12.4
diff --git a/mkdocs.yml b/mkdocs.yml
index 573898bca..439245a8d 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -66,6 +66,7 @@ nav:
      - 'Contributing to REST framework': 'community/contributing.md'
      - 'Project management': 'community/project-management.md'
      - 'Release Notes': 'community/release-notes.md'
+     - '3.13 Announcement': 'community/3.13-announcement.md'
      - '3.12 Announcement': 'community/3.12-announcement.md'
      - '3.11 Announcement': 'community/3.11-announcement.md'
      - '3.10 Announcement': 'community/3.10-announcement.md'
diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py
index 0c75d3617..88d86c03e 100644
--- a/rest_framework/__init__.py
+++ b/rest_framework/__init__.py
@@ -10,7 +10,7 @@ ______ _____ _____ _____    __
 import django
 
 __title__ = 'Django REST framework'
-__version__ = '3.12.4'
+__version__ = '3.13.0'
 __author__ = 'Tom Christie'
 __license__ = 'BSD 3-Clause'
 __copyright__ = 'Copyright 2011-2019 Encode OSS Ltd'

From b3beb15b00ce8b251205aa5a344d6e6ddfac74a8 Mon Sep 17 00:00:00 2001
From: Jameel Al-Aziz <247849+jalaziz@users.noreply.github.com>
Date: Mon, 13 Dec 2021 06:03:09 -0800
Subject: [PATCH 198/303] Fix CursorPagination parameter schema type (#7708)

The CursorPagination's cursor query parameter expects a string and not
an integer.

Fixes #7691
---
 rest_framework/pagination.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py
index dc120d8e8..e815d8d5c 100644
--- a/rest_framework/pagination.py
+++ b/rest_framework/pagination.py
@@ -961,7 +961,7 @@ class CursorPagination(BasePagination):
                 'in': 'query',
                 'description': force_str(self.cursor_query_description),
                 'schema': {
-                    'type': 'integer',
+                    'type': 'string',
                 },
             }
         ]

From f3bb5b9cdc7cb53c27535e4817112e6d2eba08a0 Mon Sep 17 00:00:00 2001
From: Abhineet 
Date: Mon, 13 Dec 2021 19:34:04 +0530
Subject: [PATCH 199/303] Add missing commas in pagination response samples
 (#8185)

---
 docs/api-guide/pagination.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/api-guide/pagination.md b/docs/api-guide/pagination.md
index 379c1975a..aadc1bbc7 100644
--- a/docs/api-guide/pagination.md
+++ b/docs/api-guide/pagination.md
@@ -78,7 +78,7 @@ This pagination style accepts a single number page number in the request query p
 
     HTTP 200 OK
     {
-        "count": 1023
+        "count": 1023,
         "next": "https://api.example.org/accounts/?page=5",
         "previous": "https://api.example.org/accounts/?page=3",
         "results": [
@@ -126,7 +126,7 @@ This pagination style mirrors the syntax used when looking up multiple database
 
     HTTP 200 OK
     {
-        "count": 1023
+        "count": 1023,
         "next": "https://api.example.org/accounts/?limit=100&offset=500",
         "previous": "https://api.example.org/accounts/?limit=100&offset=300",
         "results": [

From 2d52c9e8bca06d5427596ea7f73b8294aa984036 Mon Sep 17 00:00:00 2001
From: juliangeissler <81534590+juliangeissler@users.noreply.github.com>
Date: Mon, 13 Dec 2021 15:08:55 +0100
Subject: [PATCH 200/303]  Update Tutorial - quickstart (#7943)

* Tutorial - Adjust quickstart

Add asgi.py file
Also add paragraph for the second user, which is later displayed

* Tutorial - Adjust quickstart

It seems that there is no CLI command to easily create a user
Remove the second user from the Markdown
Image next

* Tutorial - quickstart - Update browsable API image

Only show the admin user
New Image has similar width and is compressed
---
 docs/img/quickstart.png     | Bin 39050 -> 27279 bytes
 docs/tutorial/quickstart.md |  13 +------------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/docs/img/quickstart.png b/docs/img/quickstart.png
index 5006d60fe0c3f89723524ae5e8d45a115cd8e6d8..e3581f308b75b53443bab679e6ceb5a38b3776fa 100644
GIT binary patch
literal 27279
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≥1YOF3HI=x
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
aw|wZ70#vl|AAy6>q{S7)%0%D1`#%6AGMOC!

diff --git a/docs/tutorial/quickstart.md b/docs/tutorial/quickstart.md
index f4dcc5606..4fa2fbbe5 100644
--- a/docs/tutorial/quickstart.md
+++ b/docs/tutorial/quickstart.md
@@ -42,6 +42,7 @@ The project layout should look like:
     ./tutorial/quickstart/models.py
     ./tutorial/quickstart/tests.py
     ./tutorial/quickstart/views.py
+    ./tutorial/asgi.py
     ./tutorial/settings.py
     ./tutorial/urls.py
     ./tutorial/wsgi.py
@@ -176,12 +177,6 @@ We can now access our API, both from the command-line, using tools like `curl`..
                 "url": "http://127.0.0.1:8000/users/1/",
                 "username": "admin"
             },
-            {
-                "email": "tom@example.com",
-                "groups": [],
-                "url": "http://127.0.0.1:8000/users/2/",
-                "username": "tom"
-            }
         ]
     }
 
@@ -202,12 +197,6 @@ Or using the [httpie][httpie], command line tool...
                 "url": "http://localhost:8000/users/1/",
                 "username": "paul"
             },
-            {
-                "email": "tom@example.com",
-                "groups": [],
-                "url": "http://127.0.0.1:8000/users/2/",
-                "username": "tom"
-            }
         ]
     }
 

From a780e80debac0d12bb62fbb0ed98635e601e76de Mon Sep 17 00:00:00 2001
From: Tom Christie 
Date: Wed, 15 Dec 2021 15:16:38 +0000
Subject: [PATCH 201/303] Revert "Make api_view respect standard wrapper
 assignments (#8291)" (#8297)

This reverts commit 9c97946531b85858fcee5df56240de6d29571da2.
---
 rest_framework/decorators.py | 20 ++++++++++++++++----
 tests/test_decorators.py     | 10 ----------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/rest_framework/decorators.py b/rest_framework/decorators.py
index 7ba43d37c..30b9d84d4 100644
--- a/rest_framework/decorators.py
+++ b/rest_framework/decorators.py
@@ -7,7 +7,6 @@ based views, as well as the `@action` decorator, which is used to annotate
 methods on viewsets that should be included by routers.
 """
 import types
-from functools import update_wrapper
 
 from django.forms.utils import pretty_name
 
@@ -23,8 +22,18 @@ def api_view(http_method_names=None):
 
     def decorator(func):
 
-        class WrappedAPIView(APIView):
-            pass
+        WrappedAPIView = type(
+            'WrappedAPIView',
+            (APIView,),
+            {'__doc__': func.__doc__}
+        )
+
+        # Note, the above allows us to set the docstring.
+        # It is the equivalent of:
+        #
+        #     class WrappedAPIView(APIView):
+        #         pass
+        #     WrappedAPIView.__doc__ = func.doc    <--- Not possible to do this
 
         # api_view applied without (method_names)
         assert not(isinstance(http_method_names, types.FunctionType)), \
@@ -43,6 +52,9 @@ def api_view(http_method_names=None):
         for method in http_method_names:
             setattr(WrappedAPIView, method.lower(), handler)
 
+        WrappedAPIView.__name__ = func.__name__
+        WrappedAPIView.__module__ = func.__module__
+
         WrappedAPIView.renderer_classes = getattr(func, 'renderer_classes',
                                                   APIView.renderer_classes)
 
@@ -61,7 +73,7 @@ def api_view(http_method_names=None):
         WrappedAPIView.schema = getattr(func, 'schema',
                                         APIView.schema)
 
-        return update_wrapper(WrappedAPIView.as_view(), func)
+        return WrappedAPIView.as_view()
 
     return decorator
 
diff --git a/tests/test_decorators.py b/tests/test_decorators.py
index 116d6f1be..99ba13e60 100644
--- a/tests/test_decorators.py
+++ b/tests/test_decorators.py
@@ -162,16 +162,6 @@ class DecoratorTestCase(TestCase):
 
         assert isinstance(view.cls.schema, CustomSchema)
 
-    def test_wrapper_assignments(self):
-        @api_view(["GET"])
-        def test_view(request):
-            """example docstring"""
-            pass
-
-        assert test_view.__name__ == "test_view"
-        assert test_view.__doc__ == "example docstring"
-        assert test_view.__qualname__ == "DecoratorTestCase.test_wrapper_assignments..test_view"
-
 
 class ActionDecoratorTestCase(TestCase):
 

From f4cf0260bf3c9323e798325702be690ca25949ca Mon Sep 17 00:00:00 2001
From: Tom Christie 
Date: Wed, 15 Dec 2021 15:18:24 +0000
Subject: [PATCH 202/303] Version 3.13.1

---
 docs/community/release-notes.md | 6 ++++++
 rest_framework/__init__.py      | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/docs/community/release-notes.md b/docs/community/release-notes.md
index d3e9dd7cc..8629e4fee 100644
--- a/docs/community/release-notes.md
+++ b/docs/community/release-notes.md
@@ -36,6 +36,12 @@ You can determine your currently installed version using `pip show`:
 
 ## 3.13.x series
 
+### 3.13.1
+
+Date: 15th December 2021
+
+* Revert schema naming changes with function based `@api_view`. [#8297]
+
 ### 3.13.0
 
 Date: 13th December 2021
diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py
index 88d86c03e..8b0679ef9 100644
--- a/rest_framework/__init__.py
+++ b/rest_framework/__init__.py
@@ -10,7 +10,7 @@ ______ _____ _____ _____    __
 import django
 
 __title__ = 'Django REST framework'
-__version__ = '3.13.0'
+__version__ = '3.13.1'
 __author__ = 'Tom Christie'
 __license__ = 'BSD 3-Clause'
 __copyright__ = 'Copyright 2011-2019 Encode OSS Ltd'

From 45082b39368729caa70534dde11b0788ef186a37 Mon Sep 17 00:00:00 2001
From: Guilouf 
Date: Fri, 17 Dec 2021 16:20:14 +0100
Subject: [PATCH 203/303] Fixed missing "fields" meta argument in docs (#8243)

* Fixed missing "fields" meta argument in docs, leading to an assertion error

* Update docs/api-guide/serializers.md

Co-authored-by: Tom Christie 

Co-authored-by: Tom Christie 
---
 docs/api-guide/serializers.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md
index 4d032bd9e..da57ac0a4 100644
--- a/docs/api-guide/serializers.md
+++ b/docs/api-guide/serializers.md
@@ -524,6 +524,7 @@ You can add extra fields to a `ModelSerializer` or override the default fields b
 
         class Meta:
             model = Account
+            fields = ['url', 'groups']
 
 Extra fields can correspond to any property or callable on the model.
 

From bce9df9b5e0f54a6076519835393fea59accb40c Mon Sep 17 00:00:00 2001
From: Luke Plant 
Date: Wed, 22 Dec 2021 15:08:58 +0000
Subject: [PATCH 204/303] Make ReturnDict support dict union operators on
 Python 3.9 and later (#8302)

Fixes issue #8301
---
 rest_framework/utils/serializer_helpers.py | 17 +++++++++++++++++
 tests/test_serializer.py                   | 22 ++++++++++++++++++++++
 2 files changed, 39 insertions(+)

diff --git a/rest_framework/utils/serializer_helpers.py b/rest_framework/utils/serializer_helpers.py
index 4cd2ada31..54068f5fb 100644
--- a/rest_framework/utils/serializer_helpers.py
+++ b/rest_framework/utils/serializer_helpers.py
@@ -1,3 +1,4 @@
+import sys
 from collections import OrderedDict
 from collections.abc import Mapping, MutableMapping
 
@@ -28,6 +29,22 @@ class ReturnDict(OrderedDict):
         # but preserve the raw data.
         return (dict, (dict(self),))
 
+    if sys.version_info >= (3, 9):
+        # These are basically copied from OrderedDict, with `serializer` added.
+        def __or__(self, other):
+            if not isinstance(other, dict):
+                return NotImplemented
+            new = self.__class__(self, serializer=self.serializer)
+            new.update(other)
+            return new
+
+        def __ror__(self, other):
+            if not isinstance(other, dict):
+                return NotImplemented
+            new = self.__class__(other, serializer=self.serializer)
+            new.update(self)
+            return new
+
 
 class ReturnList(list):
     """
diff --git a/tests/test_serializer.py b/tests/test_serializer.py
index afefd70e1..c4c29ba4a 100644
--- a/tests/test_serializer.py
+++ b/tests/test_serializer.py
@@ -740,3 +740,25 @@ class TestDeclaredFieldInheritance:
             'f4': serializers.CharField,
             'f5': serializers.CharField,
         }
+
+
+class Test8301Regression:
+    @pytest.mark.skipif(
+        sys.version_info < (3, 9),
+        reason="dictionary union operator requires Python 3.9 or higher",
+    )
+    def test_ReturnDict_merging(self):
+        # Serializer.data returns ReturnDict, this is essentially a test for that.
+
+        class TestSerializer(serializers.Serializer):
+            char = serializers.CharField()
+
+        s = TestSerializer(data={'char': 'x'})
+        assert s.is_valid()
+        assert s.data | {} == {'char': 'x'}
+        assert s.data | {'other': 'y'} == {'char': 'x', 'other': 'y'}
+        assert {} | s.data == {'char': 'x'}
+        assert {'other': 'y'} | s.data == {'char': 'x', 'other': 'y'}
+
+        assert (s.data | {}).__class__ == s.data.__class__
+        assert ({} | s.data).__class__ == s.data.__class__

From 5b2abbed25ef41c4cc1b3806037c6bd7631db327 Mon Sep 17 00:00:00 2001
From: kaushik kothiya <46051127+kaushikk25@users.noreply.github.com>
Date: Wed, 22 Dec 2021 20:47:57 +0530
Subject: [PATCH 205/303] Correct variable name (#8306)

urlpatterns name variable name in space remove.
---
 docs/api-guide/format-suffixes.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/api-guide/format-suffixes.md b/docs/api-guide/format-suffixes.md
index dfdf24953..da4a1af78 100644
--- a/docs/api-guide/format-suffixes.md
+++ b/docs/api-guide/format-suffixes.md
@@ -62,7 +62,7 @@ Also note that `format_suffix_patterns` does not support descending into `includ
 
 If using the `i18n_patterns` function provided by Django, as well as `format_suffix_patterns` you should make sure that the `i18n_patterns` function is applied as the final, or outermost function. For example:
 
-    url patterns = [
+    urlpatterns = [
         …
     ]
 

From f9ccbad4d910d19e4298300ee90467051fc08f47 Mon Sep 17 00:00:00 2001
From: Suntae Kim 
Date: Thu, 6 Jan 2022 22:55:44 +0900
Subject: [PATCH 206/303] minor update on tutorial serialization (#8323)

---
 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 908b7474a..67746c517 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.
@@ -77,7 +77,7 @@ For the purposes of this tutorial we're going to start by creating a simple `Sni
 We'll also need to create an initial migration for our snippet model, and sync the database for the first time.
 
     python manage.py makemigrations snippets
-    python manage.py migrate
+    python manage.py migrate snippets
 
 ## Creating a Serializer class
 
@@ -307,8 +307,8 @@ Quit out of the shell...
     Validating models...
 
     0 errors found
-    Django version 1.11, using settings 'tutorial.settings'
-    Development server is running at http://127.0.0.1:8000/
+    Django version 4.0,1 using settings 'tutorial.settings'
+    Starting Development server at http://127.0.0.1:8000/
     Quit the server with CONTROL-C.
 
 In another terminal window, we can test the server.

From c5be86a6dbf3d21b00a296af5994fa075826bf0b Mon Sep 17 00:00:00 2001
From: Tom Christie 
Date: Tue, 11 Jan 2022 13:01:25 +0000
Subject: [PATCH 207/303] Update sponsor URL (#8328)

* Update sponsor URL

* Update index.md
---
 README.md     | 2 +-
 docs/index.md | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 18d1364c6..d8fd83d67 100644
--- a/README.md
+++ b/README.md
@@ -201,7 +201,7 @@ Please see the [security policy][security-policy].
 [cryptapi-img]: https://raw.githubusercontent.com/encode/django-rest-framework/master/docs/img/premium/cryptapi-readme.png
 
 [sentry-url]: https://getsentry.com/welcome/
-[stream-url]: https://getstream.io/?utm_source=drf&utm_medium=sponsorship&utm_content=developer
+[stream-url]: https://getstream.io/?utm_source=DjangoRESTFramework&utm_medium=Webpage_Logo_Ad&utm_content=Developer&utm_campaign=DjangoRESTFramework_Jan2022_HomePage
 [rollbar-url]: https://rollbar.com/?utm_source=django&utm_medium=sponsorship&utm_campaign=freetrial
 [esg-url]: https://software.esg-usa.com/
 [retool-url]: https://retool.com/?utm_source=djangorest&utm_medium=sponsorship
diff --git a/docs/index.md b/docs/index.md
index 2954f793a..4871ba458 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -67,7 +67,7 @@ continued development by **[signing up for a paid plan][funding]**.
 
 
    
 
    
 
-*Many thanks to all our [wonderful sponsors][sponsors], and in particular to our premium backers, [Sentry](https://getsentry.com/welcome/), [Stream](https://getstream.io/?utm_source=drf&utm_medium=sponsorship&utm_content=developer), [ESG](https://software.esg-usa.com/), [Rollbar](https://rollbar.com/?utm_source=django&utm_medium=sponsorship&utm_campaign=freetrial), [Cadre](https://cadre.com), [Kloudless](https://hubs.ly/H0f30Lf0), [Lights On Software](https://lightsonsoftware.com), [Retool](https://retool.com/?utm_source=djangorest&utm_medium=sponsorship), [bit.io](https://bit.io/jobs?utm_source=DRF&utm_medium=sponsor&utm_campaign=DRF_sponsorship), [PostHog](https://posthog.com?utm_source=DRF&utm_medium=sponsor&utm_campaign=DRF_sponsorship), and [CryptAPI](https://cryptapi.io).*
+*Many thanks to all our [wonderful sponsors][sponsors], and in particular to our premium backers, [Sentry](https://getsentry.com/welcome/), [Stream](https://getstream.io/?utm_source=DjangoRESTFramework&utm_medium=Webpage_Logo_Ad&utm_content=Developer&utm_campaign=DjangoRESTFramework_Jan2022_HomePage), [ESG](https://software.esg-usa.com/), [Rollbar](https://rollbar.com/?utm_source=django&utm_medium=sponsorship&utm_campaign=freetrial), [Cadre](https://cadre.com), [Kloudless](https://hubs.ly/H0f30Lf0), [Lights On Software](https://lightsonsoftware.com), [Retool](https://retool.com/?utm_source=djangorest&utm_medium=sponsorship), [bit.io](https://bit.io/jobs?utm_source=DRF&utm_medium=sponsor&utm_campaign=DRF_sponsorship), [PostHog](https://posthog.com?utm_source=DRF&utm_medium=sponsor&utm_campaign=DRF_sponsorship), and [CryptAPI](https://cryptapi.io).*
 
 ---
 

From 94eb804abe5d414d59b3a84332e93fbb58811e9c Mon Sep 17 00:00:00 2001
From: Shivendra Pratap Kushwaha <33164379+kushshiv@users.noreply.github.com>
Date: Mon, 17 Jan 2022 15:11:23 +0530
Subject: [PATCH 208/303] Update filtering.md (#8331)

---
 docs/api-guide/filtering.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/api-guide/filtering.md b/docs/api-guide/filtering.md
index 512acafbd..9a4ae2745 100644
--- a/docs/api-guide/filtering.md
+++ b/docs/api-guide/filtering.md
@@ -224,7 +224,7 @@ The search behavior may be restricted by prepending various characters to the `s
 
 * '^' Starts-with search.
 * '=' Exact matches.
-* '@' Full-text search.  (Currently only supported Django's [PostgreSQL backend](https://docs.djangoproject.com/en/dev/ref/contrib/postgres/search/).)
+* '@' Full-text search.  (Currently only supported Django's [PostgreSQL backend][postgres-search].)
 * '$' Regex search.
 
 For example:
@@ -374,3 +374,4 @@ The [djangorestframework-word-filter][django-rest-framework-word-search-filter]
 [drf-url-filter]: https://github.com/manjitkumar/drf-url-filters
 [HStoreField]: https://docs.djangoproject.com/en/3.0/ref/contrib/postgres/fields/#hstorefield
 [JSONField]: https://docs.djangoproject.com/en/3.0/ref/contrib/postgres/fields/#jsonfield
+[postgres-search]: https://docs.djangoproject.com/en/stable/ref/contrib/postgres/search/

From 02eeb6fa003b5cbe3851ac18392f129d31a1a6bd Mon Sep 17 00:00:00 2001
From: denniskloyn <97915409+denniskloyn@users.noreply.github.com>
Date: Tue, 18 Jan 2022 08:52:11 +0000
Subject: [PATCH 209/303] Change `MIDDLEWARE_CLASSES` to `MIDDLEWARE` (#8333)

The `MIDDLEWARE_CLASSES` setting got changed to `MIDDLEWARE` in [Django 1.10](https://docs.djangoproject.com/en/1.10/topics/http/middleware/).
---
 docs/topics/internationalization.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/topics/internationalization.md b/docs/topics/internationalization.md
index c20cf9e33..267ccdb37 100644
--- a/docs/topics/internationalization.md
+++ b/docs/topics/internationalization.md
@@ -17,9 +17,9 @@ You can change the default language by using the standard Django `LANGUAGE_CODE`
 
     LANGUAGE_CODE = "es-es"
 
-You can turn on per-request language requests by adding `LocalMiddleware` to your `MIDDLEWARE_CLASSES` setting:
+You can turn on per-request language requests by adding `LocalMiddleware` to your `MIDDLEWARE` setting:
 
-    MIDDLEWARE_CLASSES = [
+    MIDDLEWARE = [
         ...
         'django.middleware.locale.LocaleMiddleware'
     ]
@@ -90,7 +90,7 @@ If you're only translating custom error messages that exist inside your project
 
 ## How the language is determined
 
-If you want to allow per-request language preferences you'll need to include `django.middleware.locale.LocaleMiddleware` in your `MIDDLEWARE_CLASSES` setting.
+If you want to allow per-request language preferences you'll need to include `django.middleware.locale.LocaleMiddleware` in your `MIDDLEWARE` setting.
 
 You can find more information on how the language preference is determined in the [Django documentation][django-language-preference]. For reference, the method is:
 

From f378f98a401f28df4ef9bdaf3ee56a1017c195ab Mon Sep 17 00:00:00 2001
From: Sevdimali 
Date: Thu, 27 Jan 2022 19:02:20 +0400
Subject: [PATCH 210/303] if else optimization (#8340)

Removed redundant parentheses
---
 rest_framework/decorators.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rest_framework/decorators.py b/rest_framework/decorators.py
index 30b9d84d4..3b572c09e 100644
--- a/rest_framework/decorators.py
+++ b/rest_framework/decorators.py
@@ -142,7 +142,7 @@ def action(methods=None, detail=None, url_path=None, url_name=None, **kwargs):
                    how the `@renderer_classes` etc. decorators work for function-
                    based API views.
     """
-    methods = ['get'] if (methods is None) else methods
+    methods = ['get'] if methods is None else methods
     methods = [method.lower() for method in methods]
 
     assert detail is not None, (

From a5d741aba473d5099d59ff622dbf9702df842441 Mon Sep 17 00:00:00 2001
From: Tom Christie 
Date: Tue, 1 Feb 2022 09:42:43 +0000
Subject: [PATCH 211/303] Update renderers.py

---
 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 b0ddca2b5..8824fa660 100644
--- a/rest_framework/renderers.py
+++ b/rest_framework/renderers.py
@@ -105,7 +105,7 @@ class JSONRenderer(BaseRenderer):
 
         # We always fully escape \u2028 and \u2029 to ensure we output JSON
         # that is a strict javascript subset.
-        # See: http://timelessrepo.com/json-isnt-a-javascript-subset
+        # See: https://gist.github.com/damncabbage/623b879af56f850a6ddc
         ret = ret.replace('\u2028', '\\u2028').replace('\u2029', '\\u2029')
         return ret.encode()
 

From c26ec5a3b8080d528112557f86423aee317ed8a4 Mon Sep 17 00:00:00 2001
From: Bhuwan Panta <67514385+Bhuwan-web@users.noreply.github.com>
Date: Tue, 1 Feb 2022 19:33:22 +0545
Subject: [PATCH 212/303] Update 6-viewsets-and-routers.md (#8349)

# Basename key missing in the tutorial
```diff
+router.register(r'snippets', views.SnippetViewSet,basename="snippets")
+router.register(r'users', views.UserViewSet,basename="users")
-router.register(r'snippets', views.SnippetViewSet)
-router.register(r'users', views.UserViewSet)
```
---
 docs/tutorial/6-viewsets-and-routers.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/tutorial/6-viewsets-and-routers.md b/docs/tutorial/6-viewsets-and-routers.md
index f012677d3..18066f056 100644
--- a/docs/tutorial/6-viewsets-and-routers.md
+++ b/docs/tutorial/6-viewsets-and-routers.md
@@ -112,8 +112,8 @@ Here's our re-wired `snippets/urls.py` file.
 
     # Create a router and register our viewsets with it.
     router = DefaultRouter()
-    router.register(r'snippets', views.SnippetViewSet)
-    router.register(r'users', views.UserViewSet)
+    router.register(r'snippets', views.SnippetViewSet,basename="snippets")
+    router.register(r'users', views.UserViewSet,basename="users")
 
     # The API URLs are now determined automatically by the router.
     urlpatterns = [

From 5bea22f32179276596b4c8152616d54a735a5341 Mon Sep 17 00:00:00 2001
From: Partho Kumar Rajvor 
Date: Thu, 3 Feb 2022 17:57:47 +0600
Subject: [PATCH 213/303] Added http 102, 103, 421, and 425 status codes
 (#8350)

---
 rest_framework/status.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/rest_framework/status.py b/rest_framework/status.py
index 2561d7689..7df26b388 100644
--- a/rest_framework/status.py
+++ b/rest_framework/status.py
@@ -29,6 +29,8 @@ def is_server_error(code):
 
 HTTP_100_CONTINUE = 100
 HTTP_101_SWITCHING_PROTOCOLS = 101
+HTTP_102_PROCESSING = 102
+HTTP_103_EARLY_HINTS = 103
 HTTP_200_OK = 200
 HTTP_201_CREATED = 201
 HTTP_202_ACCEPTED = 202
@@ -67,9 +69,11 @@ HTTP_415_UNSUPPORTED_MEDIA_TYPE = 415
 HTTP_416_REQUESTED_RANGE_NOT_SATISFIABLE = 416
 HTTP_417_EXPECTATION_FAILED = 417
 HTTP_418_IM_A_TEAPOT = 418
+HTTP_421_MISDIRECTED_REQUEST = 421
 HTTP_422_UNPROCESSABLE_ENTITY = 422
 HTTP_423_LOCKED = 423
 HTTP_424_FAILED_DEPENDENCY = 424
+HTTP_425_TOO_EARLY = 425
 HTTP_426_UPGRADE_REQUIRED = 426
 HTTP_428_PRECONDITION_REQUIRED = 428
 HTTP_429_TOO_MANY_REQUESTS = 429

From efc7c1d664e5909f5f1f4d07a7bb70daef1c396e Mon Sep 17 00:00:00 2001
From: Josh 
Date: Sat, 12 Feb 2022 10:21:59 -0600
Subject: [PATCH 214/303] Update `accepted_media_type` argument in Renderer
 docs (#8364)

---
 docs/api-guide/renderers.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/api-guide/renderers.md b/docs/api-guide/renderers.md
index f13b7ba94..67dff441c 100644
--- a/docs/api-guide/renderers.md
+++ b/docs/api-guide/renderers.md
@@ -257,7 +257,7 @@ This renderer is used for rendering HTML multipart form data.  **It is not suita
 
 # Custom renderers
 
-To implement a custom renderer, you should override `BaseRenderer`, set the `.media_type` and `.format` properties, and implement the `.render(self, data, media_type=None, renderer_context=None)` method.
+To implement a custom renderer, you should override `BaseRenderer`, set the `.media_type` and `.format` properties, and implement the `.render(self, data, accepted_media_type=None, renderer_context=None)` method.
 
 The method should return a bytestring, which will be used as the body of the HTTP response.
 
@@ -267,7 +267,7 @@ The arguments passed to the `.render()` method are:
 
 The request data, as set by the `Response()` instantiation.
 
-### `media_type=None`
+### `accepted_media_type=None`
 
 Optional.  If provided, this is the accepted media type, as determined by the content negotiation stage.
 
@@ -291,7 +291,7 @@ The following is an example plaintext renderer that will return a response with
         media_type = 'text/plain'
         format = 'txt'
 
-        def render(self, data, media_type=None, renderer_context=None):
+        def render(self, data, accepted_media_type=None, renderer_context=None):
             return smart_text(data, encoding=self.charset)
 
 ## Setting the character set
@@ -303,7 +303,7 @@ By default renderer classes are assumed to be using the `UTF-8` encoding.  To us
         format = 'txt'
         charset = 'iso-8859-1'
 
-        def render(self, data, media_type=None, renderer_context=None):
+        def render(self, data, accepted_media_type=None, renderer_context=None):
             return data.encode(self.charset)
 
 Note that if a renderer class returns a unicode string, then the response content will be coerced into a bytestring by the `Response` class, with the `charset` attribute set on the renderer used to determine the encoding.
@@ -318,7 +318,7 @@ In some cases you may also want to set the `render_style` attribute to `'binary'
         charset = None
         render_style = 'binary'
 
-        def render(self, data, media_type=None, renderer_context=None):
+        def render(self, data, accepted_media_type=None, renderer_context=None):
             return data
 
 ---

From a53e523f939332189b4ba8db7f99758b7d63e59b Mon Sep 17 00:00:00 2001
From: Timothy Allen 
Date: Tue, 8 Mar 2022 05:39:16 -0500
Subject: [PATCH 215/303] We've renamed the drf-renderer-xlsx package to
 drf-excel. (#8396)

---
 docs/api-guide/renderers.md | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/api-guide/renderers.md b/docs/api-guide/renderers.md
index 67dff441c..685a98f5e 100644
--- a/docs/api-guide/renderers.md
+++ b/docs/api-guide/renderers.md
@@ -470,15 +470,15 @@ Modify your REST framework settings.
 
 [MessagePack][messagepack] is a fast, efficient binary serialization format.  [Juan Riaza][juanriaza] maintains the [djangorestframework-msgpack][djangorestframework-msgpack] package which provides MessagePack renderer and parser support for REST framework.
 
-## XLSX (Binary Spreadsheet Endpoints)
+## Microsoft Excel: XLSX (Binary Spreadsheet Endpoints)
 
-XLSX is the world's most popular binary spreadsheet format. [Tim Allen][flipperpa] of [The Wharton School][wharton] maintains [drf-renderer-xlsx][drf-renderer-xlsx], which renders an endpoint as an XLSX spreadsheet using OpenPyXL, and allows the client to download it. Spreadsheets can be styled on a per-view basis.
+XLSX is the world's most popular binary spreadsheet format. [Tim Allen][flipperpa] of [The Wharton School][wharton] maintains [drf-excel][drf-excel], which renders an endpoint as an XLSX spreadsheet using OpenPyXL, and allows the client to download it. Spreadsheets can be styled on a per-view basis.
 
 #### Installation & configuration
 
 Install using pip.
 
-    $ pip install drf-renderer-xlsx
+    $ pip install drf-excel
 
 Modify your REST framework settings.
 
@@ -488,15 +488,15 @@ Modify your REST framework settings.
         'DEFAULT_RENDERER_CLASSES': [
             'rest_framework.renderers.JSONRenderer',
             'rest_framework.renderers.BrowsableAPIRenderer',
-            'drf_renderer_xlsx.renderers.XLSXRenderer',
+            'drf_excel.renderers.XLSXRenderer',
         ],
     }
 
 To avoid having a file streamed without a filename (which the browser will often default to the filename "download", with no extension), we need to use a mixin to override the `Content-Disposition` header. If no filename is provided, it will default to `export.xlsx`. For example:
 
     from rest_framework.viewsets import ReadOnlyModelViewSet
-    from drf_renderer_xlsx.mixins import XLSXFileMixin
-    from drf_renderer_xlsx.renderers import XLSXRenderer
+    from drf_excel.mixins import XLSXFileMixin
+    from drf_excel.renderers import XLSXRenderer
 
     from .models import MyExampleModel
     from .serializers import MyExampleSerializer
@@ -549,7 +549,7 @@ Comma-separated values are a plain-text tabular data format, that can be easily
 [mjumbewu]: https://github.com/mjumbewu
 [flipperpa]: https://github.com/flipperpa
 [wharton]: https://github.com/wharton
-[drf-renderer-xlsx]: https://github.com/wharton/drf-renderer-xlsx
+[drf-excel]: https://github.com/wharton/drf-excel
 [vbabiy]: https://github.com/vbabiy
 [rest-framework-yaml]: https://jpadilla.github.io/django-rest-framework-yaml/
 [rest-framework-xml]: https://jpadilla.github.io/django-rest-framework-xml/

From 0e3bc2b1e0189ecc143868ca31dd3393a8aa76f4 Mon Sep 17 00:00:00 2001
From: Tom Christie 
Date: Fri, 11 Mar 2022 10:58:59 +0000
Subject: [PATCH 216/303] Throttling disclaimer (#8403)

* Throttling disclaimer

* Expand throttling disclaimer.
---
 docs/api-guide/throttling.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/api-guide/throttling.md b/docs/api-guide/throttling.md
index a3e42cacf..6fab79a2b 100644
--- a/docs/api-guide/throttling.md
+++ b/docs/api-guide/throttling.md
@@ -19,6 +19,8 @@ Multiple throttles can also be used if you want to impose both burst throttling
 
 Throttles do not necessarily only refer to rate-limiting requests.  For example a storage service might also need to throttle against bandwidth, and a paid data service might want to throttle against a certain number of a records being accessed.
 
+**The application-level throttling that REST framework provides should not be considered a security measure or protection against brute forcing or denial-of-service attacks. Deliberately malicious actors will always be able to spoof IP origins, and application-level throttling is intended for implementing policies such as different business tiers and basic protections against service over-use.**
+
 ## How throttling is determined
 
 As with permissions and authentication, throttling in REST framework is always defined as a list of classes.
@@ -79,7 +81,7 @@ Throttle classes set in this way will override any viewset level class settings.
         }
         return Response(content)
 
-## How clients are identified
+## How clients are identified
 
 The `X-Forwarded-For` HTTP header and `REMOTE_ADDR` WSGI variable are used to uniquely identify client IP addresses for throttling.  If the `X-Forwarded-For` header is present then it will be used, otherwise the value of the `REMOTE_ADDR` variable from the WSGI environment will be used.
 

From b3083d83ae197e92591116d1cd4231ae9565dbfa Mon Sep 17 00:00:00 2001
From: Tom Christie 
Date: Wed, 16 Mar 2022 11:35:04 +0000
Subject: [PATCH 217/303] Update index.md (#8411)

Update security email.
---
 docs/index.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/index.md b/docs/index.md
index 4871ba458..e58f24df8 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -194,9 +194,11 @@ For priority support please sign up for a [professional or premium sponsorship p
 
 ## Security
 
-If you believe you’ve found something in Django REST framework which has security implications, please **do not raise the issue in a public forum**.
+Security issues are handled under the supervision of the [Django security team](https://www.djangoproject.com/foundation/teams/#security-team).
 
-Send a description of the issue via email to [rest-framework-security@googlegroups.com][security-mail].  The project maintainers will then work with you to resolve any issues where required, prior to any public disclosure.
+**Please report security issues by emailing security@djangoproject.com**.
+
+The project maintainers will then work with you to resolve any issues where required, prior to any public disclosure.
 
 ## License
 

From b521160c92783b9d2a76d6bc3fa30df10d7251ac Mon Sep 17 00:00:00 2001
From: baseplate-admin <61817579+baseplate-admin@users.noreply.github.com>
Date: Wed, 16 Mar 2022 17:35:24 +0600
Subject: [PATCH 218/303] Fix code block in `README.md` (#8408)

Hi there,

The code block below show imply `Python` as it lives in `settings.py`

```
INSTALLED_APPS = [
    ...
    'rest_framework',
]
```

This pull request essentially fixes that.
---
 README.md | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index d8fd83d67..bf4016751 100644
--- a/README.md
+++ b/README.md
@@ -67,11 +67,12 @@ Install using `pip`...
     pip install djangorestframework
 
 Add `'rest_framework'` to your `INSTALLED_APPS` setting.
-
-    INSTALLED_APPS = [
-        ...
-        'rest_framework',
-    ]
+```python
+INSTALLED_APPS = [
+    ...
+    'rest_framework',
+]
+```
 
 # Example
 

From 070c32f4a62ef0544f58de404c87d86db36fd825 Mon Sep 17 00:00:00 2001
From: Tom Christie 
Date: Wed, 16 Mar 2022 12:12:25 +0000
Subject: [PATCH 219/303] Update SECURITY.md (#8412)

---
 SECURITY.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/SECURITY.md b/SECURITY.md
index d3faefa3c..a92a1b0cf 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -2,8 +2,8 @@
 
 ## Reporting a Vulnerability
 
-If you believe you've found something in Django REST framework which has security implications, please **do not raise the issue in a public forum**.
+Security issues are handled under the supervision of the [Django security team](https://www.djangoproject.com/foundation/teams/#security-team).
 
-Send a description of the issue via email to [rest-framework-security@googlegroups.com][security-mail].  The project maintainers will then work with you to resolve any issues where required, prior to any public disclosure.
+ **Please report security issues by emailing security@djangoproject.com**.
 
-[security-mail]: mailto:rest-framework-security@googlegroups.com
+ The project maintainers will then work with you to resolve any issues where required, prior to any public disclosure.

From 0b88583a101d6eb95bf9bfb5dd9df47014a45a71 Mon Sep 17 00:00:00 2001
From: Mariusz Felisiak 
Date: Wed, 23 Mar 2022 12:28:46 +0100
Subject: [PATCH 220/303] Bumped versions in Github actions configuration to
 v3. (#8414)

---
 .github/workflows/main.yml | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 42fee2a12..c88dc55cd 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -21,18 +21,13 @@ jobs:
         - '3.10'
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
-    - uses: actions/setup-python@v2
+    - uses: actions/setup-python@v3
       with:
         python-version: ${{ matrix.python-version }}
-
-    - uses: actions/cache@v2
-      with:
-        path: ~/.cache/pip
-        key: ${{ runner.os }}-pip-${{ hashFiles('requirements/*.txt') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
+        cache: 'pip'
+        cache-dependency-path: 'requirements/*.txt'
 
     - name: Upgrade packaging tools
       run: python -m pip install --upgrade pip setuptools virtualenv wheel

From 75f19981233c112326b13e4b2abb4b71effd9fbe Mon Sep 17 00:00:00 2001
From: Tom Christie 
Date: Wed, 23 Mar 2022 11:52:26 +0000
Subject: [PATCH 221/303] Update throttling docs (#8424)

---
 docs/api-guide/throttling.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/api-guide/throttling.md b/docs/api-guide/throttling.md
index 6fab79a2b..719378247 100644
--- a/docs/api-guide/throttling.md
+++ b/docs/api-guide/throttling.md
@@ -19,7 +19,9 @@ Multiple throttles can also be used if you want to impose both burst throttling
 
 Throttles do not necessarily only refer to rate-limiting requests.  For example a storage service might also need to throttle against bandwidth, and a paid data service might want to throttle against a certain number of a records being accessed.
 
-**The application-level throttling that REST framework provides should not be considered a security measure or protection against brute forcing or denial-of-service attacks. Deliberately malicious actors will always be able to spoof IP origins, and application-level throttling is intended for implementing policies such as different business tiers and basic protections against service over-use.**
+**The application-level throttling that REST framework provides should not be considered a security measure or protection against brute forcing or denial-of-service attacks. Deliberately malicious actors will always be able to spoof IP origins. In addition to this, the built-in throttling implementations are implemented using Django's cache framework, and use non-atomic operations to determine the request rate, which may sometimes result in some fuzziness.
+
+The application-level throttling provided by REST framework is intended for implementing policies such as different business tiers and basic protections against service over-use.**
 
 ## How throttling is determined
 

From a4334a81260b15df07550f7a9e96c1753beaa269 Mon Sep 17 00:00:00 2001
From: Tom Christie 
Date: Wed, 23 Mar 2022 11:52:45 +0000
Subject: [PATCH 222/303] Update contribution guidelines (#8422)

---
 CONTRIBUTING.md                |  6 +++++-
 docs/community/contributing.md | 15 ++++++++++-----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index a7f17b1a3..d567d45a8 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,3 +1,7 @@
 # Contributing to REST framework
 
-See the [Contributing guide in the documentation](https://www.django-rest-framework.org/community/contributing/).
+At this point in it's lifespan we consider Django REST framework to be essentially feature-complete. We may accept pull requests that track the continued development of Django versions, but would prefer not to accept new features or code formatting changes.
+
+Apart from minor documentation changes, the [GitHub discussions page](https://github.com/encode/django-rest-framework/discussions) should generally be your starting point. Please only raise an issue or pull request if you've been recommended to do so after discussion.
+
+The [Contributing guide in the documentation](https://www.django-rest-framework.org/community/contributing/) gives some more information on our process and code of conduct.
diff --git a/docs/community/contributing.md b/docs/community/contributing.md
index de1f8db0f..2232bd10b 100644
--- a/docs/community/contributing.md
+++ b/docs/community/contributing.md
@@ -6,6 +6,12 @@
 
 There are many ways you can contribute to Django REST framework.  We'd like it to be a community-led project, so please get involved and help shape the future of the project.
 
+---
+
+**Note**: At this point in it's lifespan we consider Django REST framework to be essentially feature-complete. We may accept pull requests that track the continued development of Django versions, but would prefer not to accept new features or code formatting changes.
+
+---
+
 ## Community
 
 The most important thing you can do to help push the REST framework project forward is to be actively involved wherever possible.  Code contributions are often overvalued as being the primary way to get involved in a project, we don't believe that needs to be the case.
@@ -26,14 +32,13 @@ The [Django code of conduct][code-of-conduct] gives a fuller set of guidelines f
 
 # Issues
 
-It's really helpful if you can make sure to address issues on the correct channel.  Usage questions should be directed to the [discussion group][google-group].  Feature requests, bug reports and other issues should be raised on the GitHub [issue tracker][issues].
+Our contribution process is that the [GitHub discussions page](https://github.com/encode/django-rest-framework/discussions) should generally be your starting point. Please only raise an issue or pull request if you've been recommended to do so after discussion.
 
-Some tips on good issue reporting:
+Some tips on good potential issue reporting:
 
 * When describing issues try to phrase your ticket in terms of the *behavior* you think needs changing rather than the *code* you think need changing.
-* Search the issue list first for related items, and make sure you're running the latest version of REST framework before reporting an issue.
-* If reporting a bug, then try to include a pull request with a failing test case.  This will help us quickly identify if there is a valid issue, and make sure that it gets fixed more quickly if there is one.
-* Feature requests will often be closed with a recommendation that they be implemented outside of the core REST framework library.  Keeping new feature requests implemented as third party libraries allows us to keep down the maintenance overhead of REST framework, so that the focus can be on continued stability, bugfixes, and great documentation.
+* Search the GitHub project page for related items, and make sure you're running the latest version of REST framework before reporting an issue.
+* Feature requests will often be closed with a recommendation that they be implemented outside of the core REST framework library.  Keeping new feature requests implemented as third party libraries allows us to keep down the maintenance overhead of REST framework, so that the focus can be on continued stability, bugfixes, and great documentation. At this point in it's lifespan we consider Django REST framework to be essentially feature-complete.
 * Closing an issue doesn't necessarily mean the end of a discussion.  If you believe your issue has been closed incorrectly, explain why and we'll consider if it needs to be reopened.
 
 ## Triaging issues

From 4464ce7270e6242fec212a4257aa1277d023ff1b Mon Sep 17 00:00:00 2001
From: Shivendra Pratap Kushwaha <33164379+kushshiv@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:37:44 +0530
Subject: [PATCH 223/303] Link added for Test Case Classes and corrected stable
 link for Refresh from DB (#8381)

Link added for Test Case Classes and corrected stable link for Refresh from DB.
---
 docs/api-guide/testing.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/api-guide/testing.md b/docs/api-guide/testing.md
index 62eb8dd1a..261df80f2 100644
--- a/docs/api-guide/testing.md
+++ b/docs/api-guide/testing.md
@@ -299,7 +299,7 @@ similar way as with `RequestsClient`.
 
 # API 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`.
+REST framework includes the following test case classes, that mirror the existing [Django's test case classes][provided_test_case_classes], but use `APIClient` instead of Django's default `Client`.
 
 * `APISimpleTestCase`
 * `APITransactionTestCase`
@@ -413,5 +413,6 @@ For example, to add support for using `format='html'` in test requests, you migh
 [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
-[refresh_from_db_docs]: https://docs.djangoproject.com/en/1.11/ref/models/instances/#django.db.models.Model.refresh_from_db
+[refresh_from_db_docs]: https://docs.djangoproject.com/en/stable/ref/models/instances/#django.db.models.Model.refresh_from_db
 [session_objects]: https://requests.readthedocs.io/en/master/user/advanced/#session-objects
+[provided_test_case_classes]: https://docs.djangoproject.com/en/stable/topics/testing/tools/#provided-test-case-classes

From 7e4e6d207070d50736827a281b5cb70eb161b782 Mon Sep 17 00:00:00 2001
From: Wagner de Lima 
Date: Wed, 23 Mar 2022 13:09:05 +0100
Subject: [PATCH 224/303] docs: include drf-social-oauth2 to docs. (#8310)

django-rest-framework-social-oauth2 is not a maintained library anymore.
---
 docs/api-guide/authentication.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/api-guide/authentication.md b/docs/api-guide/authentication.md
index 57bbaeb67..2f23e1718 100644
--- a/docs/api-guide/authentication.md
+++ b/docs/api-guide/authentication.md
@@ -420,9 +420,9 @@ There are currently two forks of this project.
 * [Django-rest-auth][django-rest-auth] is the original project, [but is not currently receiving updates](https://github.com/Tivix/django-rest-auth/issues/568).
 * [Dj-rest-auth][dj-rest-auth] is a newer fork of the project.
 
-## django-rest-framework-social-oauth2
+## drf-social-oauth2
 
-[Django-rest-framework-social-oauth2][django-rest-framework-social-oauth2] library provides an easy way to integrate social plugins (facebook, twitter, google, etc.) to your authentication system and an easy oauth2 setup. With this library, you will be able to authenticate users based on external tokens (e.g. facebook access token), convert these tokens to "in-house" oauth2 tokens and use and generate oauth2 tokens to authenticate your users.
+[Drf-social-oauth2][drf-social-oauth2] is a framework that helps you authenticate with major social oauth2 vendors, such as Facebook, Google, Twitter, Orcid, etc. It generates tokens in a JWTed way with an easy setup. 
 
 ## django-rest-knox
 
@@ -473,7 +473,7 @@ More information can be found in the [Documentation](https://django-rest-durin.r
 [djoser]: https://github.com/sunscrapers/djoser
 [django-rest-auth]: https://github.com/Tivix/django-rest-auth
 [dj-rest-auth]: https://github.com/jazzband/dj-rest-auth
-[django-rest-framework-social-oauth2]: https://github.com/PhilipGarnero/django-rest-framework-social-oauth2
+[drf-social-oauth2]: https://github.com/wagnerdelima/drf-social-oauth2
 [django-rest-knox]: https://github.com/James1345/django-rest-knox
 [drfpasswordless]: https://github.com/aaronn/django-rest-framework-passwordless
 [django-rest-authemail]: https://github.com/celiao/django-rest-authemail

From df4d16d2f17bd53626266eb829fed40cf8a73e48 Mon Sep 17 00:00:00 2001
From: Tom Christie 
Date: Thu, 24 Mar 2022 09:23:16 +0000
Subject: [PATCH 225/303] Add StaleBot (#8423)

---
 .github/stale.yml | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 .github/stale.yml

diff --git a/.github/stale.yml b/.github/stale.yml
new file mode 100644
index 000000000..f9ebbced4
--- /dev/null
+++ b/.github/stale.yml
@@ -0,0 +1,22 @@
+# Documentation: https://github.com/probot/stale
+
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 60
+
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false
+
+# Limit the number of actions per hour, from 1-30. Default is 30
+limitPerRun: 1
+
+# Label to use when marking as stale
+staleLabel: stale

From df92e57ad6c8394ca54654dfc7a2722f822ed8c8 Mon Sep 17 00:00:00 2001
From: hashlash 
Date: Thu, 24 Mar 2022 16:57:42 +0700
Subject: [PATCH 226/303] Added test client support for HTTP 307 and 308
 redirects (#8419)

* Add retain test data on follow=True

* Simplify TestAPITestClient.test_follow_redirect

Inspired from Django's ClientTest.test_follow_307_and_308_redirect

* Add 307 308 follow redirect test
---
 rest_framework/test.py | 12 ++++----
 tests/test_testing.py  | 70 +++++++++++++++++++++---------------------
 2 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/rest_framework/test.py b/rest_framework/test.py
index 0212348ee..07df743c8 100644
--- a/rest_framework/test.py
+++ b/rest_framework/test.py
@@ -288,7 +288,7 @@ class APIClient(APIRequestFactory, DjangoClient):
     def get(self, path, data=None, follow=False, **extra):
         response = super().get(path, data=data, **extra)
         if follow:
-            response = self._handle_redirects(response, **extra)
+            response = self._handle_redirects(response, data=data, **extra)
         return response
 
     def post(self, path, data=None, format=None, content_type=None,
@@ -296,7 +296,7 @@ class APIClient(APIRequestFactory, DjangoClient):
         response = super().post(
             path, data=data, format=format, content_type=content_type, **extra)
         if follow:
-            response = self._handle_redirects(response, **extra)
+            response = self._handle_redirects(response, data=data, format=format, content_type=content_type, **extra)
         return response
 
     def put(self, path, data=None, format=None, content_type=None,
@@ -304,7 +304,7 @@ class APIClient(APIRequestFactory, DjangoClient):
         response = super().put(
             path, data=data, format=format, content_type=content_type, **extra)
         if follow:
-            response = self._handle_redirects(response, **extra)
+            response = self._handle_redirects(response, data=data, format=format, content_type=content_type, **extra)
         return response
 
     def patch(self, path, data=None, format=None, content_type=None,
@@ -312,7 +312,7 @@ class APIClient(APIRequestFactory, DjangoClient):
         response = super().patch(
             path, data=data, format=format, content_type=content_type, **extra)
         if follow:
-            response = self._handle_redirects(response, **extra)
+            response = self._handle_redirects(response, data=data, format=format, content_type=content_type, **extra)
         return response
 
     def delete(self, path, data=None, format=None, content_type=None,
@@ -320,7 +320,7 @@ class APIClient(APIRequestFactory, DjangoClient):
         response = super().delete(
             path, data=data, format=format, content_type=content_type, **extra)
         if follow:
-            response = self._handle_redirects(response, **extra)
+            response = self._handle_redirects(response, data=data, format=format, content_type=content_type, **extra)
         return response
 
     def options(self, path, data=None, format=None, content_type=None,
@@ -328,7 +328,7 @@ class APIClient(APIRequestFactory, DjangoClient):
         response = super().options(
             path, data=data, format=format, content_type=content_type, **extra)
         if follow:
-            response = self._handle_redirects(response, **extra)
+            response = self._handle_redirects(response, data=data, format=format, content_type=content_type, **extra)
         return response
 
     def logout(self):
diff --git a/tests/test_testing.py b/tests/test_testing.py
index 5066ee142..b6579e369 100644
--- a/tests/test_testing.py
+++ b/tests/test_testing.py
@@ -1,7 +1,10 @@
+import itertools
 from io import BytesIO
+from unittest.mock import patch
 
 import django
 from django.contrib.auth.models import User
+from django.http import HttpResponseRedirect
 from django.shortcuts import redirect
 from django.test import TestCase, override_settings
 from django.urls import path
@@ -14,7 +17,7 @@ from rest_framework.test import (
 )
 
 
-@api_view(['GET', 'POST'])
+@api_view(['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'OPTIONS'])
 def view(request):
     return Response({
         'auth': request.META.get('HTTP_AUTHORIZATION', b''),
@@ -36,6 +39,11 @@ def redirect_view(request):
     return redirect('/view/')
 
 
+@api_view(['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'OPTIONS'])
+def redirect_307_308_view(request, code):
+    return HttpResponseRedirect('/view/', status=code)
+
+
 class BasicSerializer(serializers.Serializer):
     flag = fields.BooleanField(default=lambda: True)
 
@@ -51,6 +59,7 @@ urlpatterns = [
     path('view/', view),
     path('session-view/', session_view),
     path('redirect-view/', redirect_view),
+    path('redirect-view//', redirect_307_308_view),
     path('post-view/', post_view)
 ]
 
@@ -146,41 +155,32 @@ class TestAPITestClient(TestCase):
         """
         Follow redirect by setting follow argument.
         """
-        response = self.client.get('/redirect-view/')
-        assert response.status_code == 302
-        response = self.client.get('/redirect-view/', follow=True)
-        assert response.redirect_chain is not None
-        assert response.status_code == 200
+        for method in ('get', 'post', 'put', 'patch', 'delete', 'options'):
+            with self.subTest(method=method):
+                req_method = getattr(self.client, method)
+                response = req_method('/redirect-view/')
+                assert response.status_code == 302
+                response = req_method('/redirect-view/', follow=True)
+                assert response.redirect_chain is not None
+                assert response.status_code == 200
 
-        response = self.client.post('/redirect-view/')
-        assert response.status_code == 302
-        response = self.client.post('/redirect-view/', follow=True)
-        assert response.redirect_chain is not None
-        assert response.status_code == 200
-
-        response = self.client.put('/redirect-view/')
-        assert response.status_code == 302
-        response = self.client.put('/redirect-view/', follow=True)
-        assert response.redirect_chain is not None
-        assert response.status_code == 200
-
-        response = self.client.patch('/redirect-view/')
-        assert response.status_code == 302
-        response = self.client.patch('/redirect-view/', follow=True)
-        assert response.redirect_chain is not None
-        assert response.status_code == 200
-
-        response = self.client.delete('/redirect-view/')
-        assert response.status_code == 302
-        response = self.client.delete('/redirect-view/', follow=True)
-        assert response.redirect_chain is not None
-        assert response.status_code == 200
-
-        response = self.client.options('/redirect-view/')
-        assert response.status_code == 302
-        response = self.client.options('/redirect-view/', follow=True)
-        assert response.redirect_chain is not None
-        assert response.status_code == 200
+    def test_follow_307_308_preserve_kwargs(self, *mocked_methods):
+        """
+        Follow redirect by setting follow argument, and make sure the following
+        method called with appropriate kwargs.
+        """
+        methods = ('get', 'post', 'put', 'patch', 'delete', 'options')
+        codes = (307, 308)
+        for method, code in itertools.product(methods, codes):
+            subtest_ctx = self.subTest(method=method, code=code)
+            patch_ctx = patch.object(self.client, method, side_effect=getattr(self.client, method))
+            with subtest_ctx, patch_ctx as req_method:
+                kwargs = {'data': {'example': 'test'}, 'format': 'json'}
+                response = req_method('/redirect-view/%s/' % code, follow=True, **kwargs)
+                assert response.redirect_chain is not None
+                assert response.status_code == 200
+                for _, call_args, call_kwargs in req_method.mock_calls:
+                    assert all(call_kwargs[k] == kwargs[k] for k in kwargs if k in call_kwargs)
 
     def test_invalid_multipart_data(self):
         """

From 86673a337a4fe8861c090b4532379b97e3921fef Mon Sep 17 00:00:00 2001
From: Kojo Idrissa 
Date: Thu, 14 Apr 2022 15:00:38 -0500
Subject: [PATCH 227/303] corrected grammar to improve clarity (#8466)

---
 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 4547253b0..9c8295b85 100644
--- a/docs/api-guide/relations.md
+++ b/docs/api-guide/relations.md
@@ -19,7 +19,7 @@ Relational fields are used to represent model relationships.  They can be applie
 
 ---
 
-**Note:** REST Framework does not attempt to automatically optimize querysets passed to serializers in terms of `select_related` and `prefetch_related` since it would be too much magic. A serializer with a field spanning an orm relation through its source attribute could require an additional database hit to fetch related object from the database. It is the programmer's responsibility to optimize queries to avoid additional database hits which could occur while using such a serializer.
+**Note:** REST Framework does not attempt to automatically optimize querysets passed to serializers in terms of `select_related` and `prefetch_related` since it would be too much magic. A serializer with a field spanning an orm relation through its source attribute could require an additional database hit to fetch related objects from the database. It is the programmer's responsibility to optimize queries to avoid additional database hits which could occur while using such a serializer.
 
 For example, the following serializer would lead to a database hit each time evaluating the tracks field if it is not prefetched:
 

From b1004a47334a0dd1929e6d50b8f7ff6badc959f4 Mon Sep 17 00:00:00 2001
From: Aarni Koskela 
Date: Mon, 25 Apr 2022 01:16:18 +0300
Subject: [PATCH 228/303] docs: Add a note on concurrency and races (#6950)

Refs #5181

Co-authored-by: Adam Johnson 
---
 docs/api-guide/throttling.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/api-guide/throttling.md b/docs/api-guide/throttling.md
index 719378247..b87522197 100644
--- a/docs/api-guide/throttling.md
+++ b/docs/api-guide/throttling.md
@@ -106,6 +106,12 @@ If you need to use a cache other than `'default'`, you can do so by creating a c
 
 You'll need to remember to also set your custom throttle class in the `'DEFAULT_THROTTLE_CLASSES'` settings key, or using the `throttle_classes` view attribute.
 
+## A note on concurrency
+
+The built-in throttle implementations are open to [race conditions][race], so under high concurrency they may allow a few extra requests through.
+
+If your project relies on guaranteeing the number of requests during concurrent requests, you will need to implement your own throttle class. See [issue #5181][gh5181] for more details.
+
 ---
 
 # API Reference
@@ -214,3 +220,5 @@ The following is an example of a rate throttle, that will randomly throttle 1 in
 [identifying-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/ref/settings/#caches
 [cache-docs]: https://docs.djangoproject.com/en/stable/topics/cache/#setting-up-the-cache
+[gh5181]: https://github.com/encode/django-rest-framework/issues/5181
+[race]: https://en.wikipedia.org/wiki/Race_condition#Data_race

From cdc956a96caafddcf4ecaf6218e340ebb3ce6d72 Mon Sep 17 00:00:00 2001
From: Q_back 
Date: Tue, 3 May 2022 12:10:37 +0200
Subject: [PATCH 229/303] Update description of docs/api-guide/fields.md ->
 required (#8476)

fix: Documentation did not point out that default value of `required`
`Field` parameter is `False` depending on the Django's `Model.field`.
---
 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 5b9688dca..e9ef5c6b6 100644
--- a/docs/api-guide/fields.md
+++ b/docs/api-guide/fields.md
@@ -42,7 +42,7 @@ Set to false if this field is not required to be present during deserialization.
 
 Setting this to `False` also allows the object attribute or dictionary key to be omitted from output when serializing the instance. If the key is not present it will simply not be included in the output representation.
 
-Defaults to `True`.
+Defaults to `True`. If you're using [Model Serializer](https://www.django-rest-framework.org/api-guide/serializers/#modelserializer) default value will be `False` if you have specified `blank=True` or `default` or `null=True` at your field in your `Model`.
 
 ### `default`
 

From 33b86a8e5383ae7c6bba03cf09b12b8f7cadd20f Mon Sep 17 00:00:00 2001
From: Tom Christie 
Date: Wed, 18 May 2022 13:10:38 +0100
Subject: [PATCH 230/303] Recommend Django REST Knox (#8490)

* Recommend Django REST Knox

* Pin jinja2 to fix docs builds
---
 docs/api-guide/authentication.md            | 26 +++++++++++++--------
 requirements/requirements-documentation.txt |  1 +
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/docs/api-guide/authentication.md b/docs/api-guide/authentication.md
index 2f23e1718..fca9374d0 100644
--- a/docs/api-guide/authentication.md
+++ b/docs/api-guide/authentication.md
@@ -120,6 +120,14 @@ Unauthenticated responses that are denied permission will result in an `HTTP 401
 
 ## TokenAuthentication
 
+---
+
+**Note:** The token authentication provided by Django REST framework is a fairly simple implementation.
+
+For an implementation which allows more than one token per user, has some tighter security implementation details, and supports token expiry, please see the [Django REST Knox][django-rest-knox] third party package.
+
+---
+
 This authentication scheme uses a simple token-based HTTP Authentication scheme.  Token authentication is appropriate for client-server setups, such as native desktop and mobile clients.
 
 To use the `TokenAuthentication` scheme you'll need to [configure the authentication classes](#setting-the-authentication-scheme) to include `TokenAuthentication`, and additionally include `rest_framework.authtoken` in your `INSTALLED_APPS` setting:
@@ -129,11 +137,9 @@ To use the `TokenAuthentication` scheme you'll need to [configure the authentica
         'rest_framework.authtoken'
     ]
 
----
+Make sure to run `manage.py migrate` after changing your settings.
 
-**Note:** Make sure to run `manage.py migrate` after changing your settings. The `rest_framework.authtoken` app provides Django database migrations.
-
----
+The `rest_framework.authtoken` app provides Django database migrations.
 
 You'll also need to create tokens for your users.
 
@@ -146,7 +152,7 @@ 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 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.
 
@@ -355,6 +361,10 @@ The following example will authenticate any incoming request as the user given b
 
 The following third-party packages are also available.
 
+## django-rest-knox
+
+[Django-rest-knox][django-rest-knox] library provides models and views to handle token-based authentication in a more secure and extensible way than the built-in TokenAuthentication scheme - with Single Page Applications and Mobile clients in mind. It provides per-client tokens, and views to generate them when provided some other authentication (usually basic authentication), to delete the token (providing a server enforced logout) and to delete all tokens (logs out all clients that a user is logged into).
+
 ## Django OAuth Toolkit
 
 The [Django OAuth Toolkit][django-oauth-toolkit] package provides OAuth 2.0 support and works with Python 3.4+. The package is maintained by [jazzband][jazzband] and uses the excellent [OAuthLib][oauthlib].  The package is well documented, and well supported and is currently our **recommended package for OAuth 2.0 support**.
@@ -422,11 +432,7 @@ There are currently two forks of this project.
 
 ## drf-social-oauth2
 
-[Drf-social-oauth2][drf-social-oauth2] is a framework that helps you authenticate with major social oauth2 vendors, such as Facebook, Google, Twitter, Orcid, etc. It generates tokens in a JWTed way with an easy setup. 
-
-## django-rest-knox
-
-[Django-rest-knox][django-rest-knox] library provides models and views to handle token-based authentication in a more secure and extensible way than the built-in TokenAuthentication scheme - with Single Page Applications and Mobile clients in mind. It provides per-client tokens, and views to generate them when provided some other authentication (usually basic authentication), to delete the token (providing a server enforced logout) and to delete all tokens (logs out all clients that a user is logged into).
+[Drf-social-oauth2][drf-social-oauth2] is a framework that helps you authenticate with major social oauth2 vendors, such as Facebook, Google, Twitter, Orcid, etc. It generates tokens in a JWTed way with an easy setup.
 
 ## drfpasswordless
 
diff --git a/requirements/requirements-documentation.txt b/requirements/requirements-documentation.txt
index ad4928730..cf2dc26e8 100644
--- a/requirements/requirements-documentation.txt
+++ b/requirements/requirements-documentation.txt
@@ -1,2 +1,3 @@
 # MkDocs to build our documentation.
 mkdocs>=1.1.2,<1.2
+jinja2>=2.10,<3.1.0 # contextfilter has been renamed

From ed00e11cc5f338062ff2e90b552643804fc67dba Mon Sep 17 00:00:00 2001
From: Tom Christie 
Date: Thu, 26 May 2022 10:40:46 +0100
Subject: [PATCH 231/303] Add FEZTO

---
 README.md                         |  11 ++++-------
 docs/img/premium/fezto-readme.png | Bin 0 -> 22592 bytes
 2 files changed, 4 insertions(+), 7 deletions(-)
 create mode 100644 docs/img/premium/fezto-readme.png

diff --git a/README.md b/README.md
index bf4016751..9476e92d2 100644
--- a/README.md
+++ b/README.md
@@ -21,14 +21,13 @@ The initial aim is to provide a single full-time position on REST framework.
 
 [![][sentry-img]][sentry-url]
 [![][stream-img]][stream-url]
-[![][rollbar-img]][rollbar-url]
-[![][esg-img]][esg-url]
 [![][retool-img]][retool-url]
 [![][bitio-img]][bitio-url]
 [![][posthog-img]][posthog-url]
 [![][cryptapi-img]][cryptapi-url]
+[![][fezto-img]][fezto-url]
 
-Many thanks to all our [wonderful sponsors][sponsors], and in particular to our premium backers, [Sentry][sentry-url], [Stream][stream-url], [Rollbar][rollbar-url], [ESG][esg-url], [Retool][retool-url], [bit.io][bitio-url], [PostHog][posthog-url], and [CryptAPI][cryptapi-url].
+Many thanks to all our [wonderful sponsors][sponsors], and in particular to our premium backers, [Sentry][sentry-url], [Stream][stream-url], [Retool][retool-url], [bit.io][bitio-url], [PostHog][posthog-url], [CryptAPI][cryptapi-url], and [FEZTO][fezto-url].
 
 ---
 
@@ -194,21 +193,19 @@ Please see the [security policy][security-policy].
 
 [sentry-img]: https://raw.githubusercontent.com/encode/django-rest-framework/master/docs/img/premium/sentry-readme.png
 [stream-img]: https://raw.githubusercontent.com/encode/django-rest-framework/master/docs/img/premium/stream-readme.png
-[rollbar-img]: https://raw.githubusercontent.com/encode/django-rest-framework/master/docs/img/premium/rollbar-readme.png
-[esg-img]: https://raw.githubusercontent.com/encode/django-rest-framework/master/docs/img/premium/esg-readme.png
 [retool-img]: https://raw.githubusercontent.com/encode/django-rest-framework/master/docs/img/premium/retool-readme.png
 [bitio-img]: https://raw.githubusercontent.com/encode/django-rest-framework/master/docs/img/premium/bitio-readme.png
 [posthog-img]: https://raw.githubusercontent.com/encode/django-rest-framework/master/docs/img/premium/posthog-readme.png
 [cryptapi-img]: https://raw.githubusercontent.com/encode/django-rest-framework/master/docs/img/premium/cryptapi-readme.png
+[fezto-img]: https://raw.githubusercontent.com/encode/django-rest-framework/master/docs/img/premium/fezto-readme.png
 
 [sentry-url]: https://getsentry.com/welcome/
 [stream-url]: https://getstream.io/?utm_source=DjangoRESTFramework&utm_medium=Webpage_Logo_Ad&utm_content=Developer&utm_campaign=DjangoRESTFramework_Jan2022_HomePage
-[rollbar-url]: https://rollbar.com/?utm_source=django&utm_medium=sponsorship&utm_campaign=freetrial
-[esg-url]: https://software.esg-usa.com/
 [retool-url]: https://retool.com/?utm_source=djangorest&utm_medium=sponsorship
 [bitio-url]: https://bit.io/jobs?utm_source=DRF&utm_medium=sponsor&utm_campaign=DRF_sponsorship
 [posthog-url]: https://posthog.com?utm_source=drf&utm_medium=sponsorship&utm_campaign=open-source-sponsorship
 [cryptapi-url]: https://cryptapi.io
+[fezto-url]: https://www.fezto.xyz/?utm_source=DjangoRESTFramework
 
 [oauth1-section]: https://www.django-rest-framework.org/api-guide/authentication/#django-rest-framework-oauth
 [oauth2-section]: https://www.django-rest-framework.org/api-guide/authentication/#django-oauth-toolkit
diff --git a/docs/img/premium/fezto-readme.png b/docs/img/premium/fezto-readme.png
new file mode 100644
index 0000000000000000000000000000000000000000..7cc3be6e6c18de05af1c8c2601f4edc627bac0b6
GIT binary patch
literal 22592
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
Date: Thu, 26 May 2022 10:48:08 +0100
Subject: [PATCH 232/303] Resize sponsor images

---
 docs/img/premium/bitio-readme.png    | Bin 18526 -> 18479 bytes
 docs/img/premium/cryptapi-readme.png | Bin 17864 -> 17824 bytes
 docs/img/premium/posthog-readme.png  | Bin 2402 -> 4881 bytes
 docs/img/premium/retool-readme.png   | Bin 8962 -> 8921 bytes
 docs/img/premium/sentry-readme.png   | Bin 24504 -> 24506 bytes
 docs/img/premium/stream-readme.png   | Bin 19213 -> 19170 bytes
 6 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/docs/img/premium/bitio-readme.png b/docs/img/premium/bitio-readme.png
index c47118cc6956b8a27a1be8edf3b84f8fa119e54c..d5d6259e61946a911024aaf9835d885539323c31 100644
GIT binary patch
delta 17556
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
a@`qhkO^(>-(f~YWgu&C*&t;ucLK6TrZLfp?

delta 17605
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
QcrFQpr>mdKI;Vst0HO}u@&Et;

diff --git a/docs/img/premium/cryptapi-readme.png b/docs/img/premium/cryptapi-readme.png
index 163f6a9ea20f17909e6e38537a627f19e5766a66..10839b13b4835ea1abf18dbb89b0b8e9c5b6e0fa 100644
GIT binary patch
delta 16101
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
Pe1VXcR*|ZfF#Y*I_$DB3

delta 16128
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
ME$q!}&R@OzA3!)iFaQ7m

literal 2402
zcmai$dpy(oAIIm?kqEUVMI1|COS+h2jFQXTx1B9IU5@L*+;d$jLMd%T+LDdA=Y9!U
zO`&8o_mayIDdv_-A-UVxJbwN6dpyqL@p*i{ulM)+e7#=Z@At0{8Hcslxnuth5D2u>
z$`W-31QG!Y^y+po!Cqx!8!Whp6OA#(AW(UN)Vj+y!7LJV#=-^wfTCV04r1+CN^`RT6k>eVYF
zBcruOb2^VqMINXu5{N;Nm
zqHJ#!fI!<5tx(2xq5U(1Q-n$wWLu}W2EJU6rPH6guvvy==MQlDuww4toQBkVvx=gB
zS56+3F_shmk9B{jb$qEsJ>}{Re&V>w8v9)6amureTuaCH72!MtnmxS`rtIbfQ8e9$UWfTA8?9)t?!XzL_}Y0;vq!}N8n+<^&H^8AcCFY4@fNOCpmAEU**@Zl%mYXyJ-UgseWGAX^U|40*v+
zfXPrB@bc8vNIp9*MDikKcSEHwu|0PLVtGV@`6R2u#yu$wc8g+LOl>S2ad
zNlq75jnbj!Li+}4Hk8eTq?md-io$%ik8Vif4I@P%8K6VEX@g_9_%%>-ohogqEmNrl
zWWBQA=;}w`oukPTxMpbNgHp2WFZqNl@k?fK$Cs8z-!G%x@j@t#e39C>$l
zgZtJ{NLKmfDJJjzpM)p-zow=T7c!IAXmXAAa3Y5p5EM;Z>c
zOqrTzK1V;PP3h$!@uGlamb4CXM%Fvf9sS;PpLbw?dN;3?t`-CD<~==K$ffI8?KJBV
z$O0~1mn?g`EfXfhy#hsnfXpWyk2r#9m7z44^L5I$0d_@TD)J6|dUee^N(9NF1QIdW
z7c8JDBqEOj8U4gaCAneZ3DCwRAn``nY$?~Xx0?q80yo_Ds5fs2k_s70qc`RT8gvp`
zTmuBwT)-mjhWgODYlM1lVq4QO!B6S!<=I0&irx##s3-*T9Gs{@SVZkJf7v0pGL<_l
zXb8u|uZMka*Uc{xCpT@S)B;2g$(-4-#?`YOSJi-6!ACCYAY)CZ^w9FXyr)y%fk_sq
zKox&aL8E}ZYC|6VH1U2bs(rYDQ1M*QV@F-69=a(k=n+(2Uo7kG{ah1=LObq9E{v5P
z@wfuEW_yVEt^(zEYC-g_v**Icv2Uw@^!n2qc0lw;GgSyEajkc()wgzg
zMwx4?mmd*ZSzv-sS*PrXmPwoHCu{J#mEU6f3zKHcfstl%v;N|g@enS*%Ae54Yj}uj
z%lRoIKV@-jL<`+`t5!Mnl8aSt*vsldhPXT0zMwmyK)w{wBavcnpw(X>_Rr*HGi{_F
z`~2dwy1Ho@*a$7Y4t*SX^aNdgA^0qU)M;vy`e}AuIy{*?sC@UQs*0i<6PuK90L3BJ
z#nu2OGmkAxPU;{s;ymw-l>?7T5Yauir!94LW*z^DztyXG!f=i;5#G|L`JzA-TT^-W
zHSb#W!vG3FzjIEZh*9}Hxs6!gW;WIx?N=MJ7)t$m?ZjAUQpgDMNjqCLrYR@e8Ul8~
z+Psy>pX(WZ4Gf-eKGYK;%Zx|s>8`Sae1=jgch4VabK)gvvD*?Qv2i2$B^`H8g(+00
z8erfHDDIDivGiM~LzTQwW+tc7($y{!-|=5XBhem8GYv~9_Zy_fot1a<^}{Qx3@~0n
zS>`OXmrvV6GeX5woY=vOc{V)GTp#|EC$#lWGRBhLZsws0(C2FIb2}u9JexkenOO|F
z=vsfrkhza|EXMqeXfR2?fdF^x_TMO+4y!qL_>}X}ju(jP#?Fv{$BUg`IpaUv(gW(Z
zokCrLI|RF?YB?TgRZY3pmX*-GG86H1Km1GAOX<@~Si73-#j?8`_8RP`)TGykPIkqn
zX{gu7UC#Qv&Yk?s{{C}%Q7(!+Rdy)#y!uRZldTj(uRUy_tCLN2kOmNxK6b8dBUqK0
z3rQnZ0wp{|!dKhD!%!+SW46E;%T$M|%&@3Z6X%=%
E0-^VOCIA2c

diff --git a/docs/img/premium/retool-readme.png b/docs/img/premium/retool-readme.png
index 56adba04d3acc812f5499e19ecd9c72d3632eb32..9715634274d3a17d50099384201259e6e2d4c172 100644
GIT binary patch
literal 8921
zcmeHNhgVbE(x*vLLJ{eqD_`R=;!FZeENh0K{fzcVv?&&+O#)YsDjon<>qL_`F-rmb;{h=`a5
zppPiYf&cpW=bXS7nWL(%DiKj-{J9gGGr%*IyS536i0B-{&kr%tlMEI>hTqB17;UVp
zqhN=0h1l35Z4nTxt2-b~M5KgO07zE^+J+nJ>f(k{z$)|pl28EXpKK^E_b(B&vof!-
zu0FRq(i6cg4UvL~@xsn>b8{D?p+5@85^qmxLfa9iig#
z^72qI38;jGC?Fw<@^(YpU`5?fe1E*;U+>XCpzJ)I+|f=*H}0SBwXsEdp_O@ge=7R-
z-ye3OogDt7$qn_VTY!VmpDj>vh#2(mU(zUjcAWC%{vipLW5-|5Wfh@2~PE
zf2ZJg=5K(XU9X_;ghjX*Yd8TN`pXLmS-_9KZTTxw9qEGfG;p`EL;SSt7vwkAU!{NP
zG5Jl8^ndC3t>rhQy`2Ke%l00^4*lDB0i*US`qgY4p}(<}pnof^1jK@ZF4Eq~!CS)y
zjetprNk}M&Nh?UmaEpumBqZgPpnsA1&4QmT>YfN2G}6-$iFASea>MoKBex_(9`Yyl
zcZom2O3wA{(7fS&blkB%z@M3R?OmGuyzYlJ
zmwgR?@5fCX>ylAU9p5MCo@_$OdAUja9<~W8Lmc*s#A%N#$TU>Q%t_AEq~OXlRmk$l
zE`o1rY;%+F&YXYfUZ;T;CE=yJ#7)5QKBl0jBTfkn?YxxdOivdiNKB=5;gJ$9kg^Vd
zKl<
zOz#dr%y}D_i0N^FJ`MWb5K3I&4V4bU`Jq>oIF-b}P`)T_&VNk&rx*W;#b46U-Et;tVv>Ohh&l~B*gLn%b893%NoY2>qeCrC4KeVOCr+o)Ce
zyFg;ne%SGvT{jrj@6exO1!O%rWz6uL?bN*oF4NvinGVZ?xtexv+>@ymNv+dfqZSU`
ztd3G45e*d#aL~hEE+Yk|{GN@~=Fx&qgEhAotgjfGs4in*k
z5W&^&nC*9)QVVfU`n%khqWmYwmcwq}@83qH@kMum7+ELXKDQ}s^8vwmhRSI$u1*&iT=9p!#coE!7Il_Ce)x$MlhHOUs*vUS9dEpU9)mCh3jN(R}
zLpZC0Sf5CB%*u3YYntbq%Vtq`f{r+ezqCXM;`%@*`QMoHyny-7Syl>vgDlknSY~_E5cc~e7z`F~}^Jwa`2bqS3Z0(RS=;-$^
z$}}nrUe`?IO%+7aqZPt(vTvhx``7aM*lw}IbUt;y+PNomcKH0*4oy5$e)
z{j@c6pOu0E+h|c4wemR5(fiYWj#Ga77CXZ?pp1o&=p%&oPW+G8YtyAi&8v-D)|s@&
zbkdHx;vX1!e@RxFchC~;AeQBu;9M*wC@hhE({+*0p_!)L&lZT+fBr`Ar>c(BA_nK0_n`$eXjvl@?P&46XwtGYuQGCdsyprXA
zv~vB5jHO?+3J#dXG@j8;EuGQY)nS2zgFD*!dBWvAc?X4nS+r!nLFzN0#Z1RA!iS@u
zxuP|Mpj%rv2EMws@7AlOhj}m4(|+y4{VDIlZKqM@_9{=w0jZJQG%AG$4q?sgEsPL0
z9)>cU7GIpr`GuoycI1T{4QsVITI!!)Jk?cPe~CX#1){c|;JSljdmwvIvlr?@xWDI7
zu^r4uU4qTce3XmDu9KP_kN0&ri(bn<06aErekW<;j9mE=>YMgnt7%zU-o2OIVYRjSul^qQ!hLx+6MV>+d@)(#+|*
z*&fCsCJ=&aA782qm~gF4qu|8mXlHl(zvhXMGGrP%SC(e!Pg
zfVF6cYP+NXoH*2BSJ`Pl(oD%B+i!1tHnOj`6R2>ttLtv_*A`^5JfCf}p8BJPG?^LU
zj=n>uM`ec2!UA@+W*=RMfBB-yLe?9zbV2UQ;uDcOR?&Gr_
zu7JqrppKkwKWF_=U_0%5`Ae
zUE|~zQv(+HZ3$lvGC7|0aNN(RKl)N~PBpLJ)N7uU@N~&@IXB`-JnX25P*f4J{+&{+
z!#ILt*PJEK?_{e7G%=(Xe?E?UWm{_2sk>3Haa?(C%x*CO4x@tg(o@!~Hp0vLAdN4u
z3d6?5S<961-wiz~VmA^E^qf{ejz%8G{(M%u=+uPBg?45bI=(KoUuhP{$7UL7D{ni7h>qF9Gqh{zuH1V5fq-R7$eC|`^U9W@KP@2F5vPwC{vgpa)Jr}85MxB!ws;!G
zY$;Zli7_3TDEh)SLYZ1x8|NmCA~Dpkk`t0^^|&1lau6}$1yfQ9xUCSx(%#G$K$TW3
z{0|o#dM~Aj+_uzawwWv69;!RIV&l}+;`@gwz{1v82{mpm2#ra#Mc{gpW@_1iG{?I-mGU0yQh))0rfY!`$l=tgO+Y*(Hu2M
zW!HH=5yUMjCv3|bJ-z~)uT^~z{EL=}oU!8yAcvSKXjZbSc?q|%9gA{iPjv{)A5#u&^J&Km!PO6@|m9k9B9rdH0I)`T=AuLtVBrty&hLdT^trTbO2
zY}qAnv#LA~h;3v*cG?`>=_+OD!bS?$?jnk?P881l=G^*xOlg69e@&}W_yW4|P~EiU
z%{954Mx(D;g
zsW7TM>j~wJagTRV*hAQ94^7ufASn%HR5*M1=+(7~PMUUk#;%aanX!y$cBIAV
z`M3t{8gWjxGqL3-gsk$)#DScSTWNiaWxmp=qRk`L
zPcGvWIARxpn#J`z!fvE3PWq#9eyUaFKHH&#TxUiMluOEZDkyl_G~&u)sxL_lm;cfx
zAuk$oFGOlrmt|4H7xR#*xlyl~=9YR=cvJ<_JC87N7)MM>o?2S-saVcnb}_g%_qZ!!
z69;;rmb&Tuo}Rg{sYTAoT}sC1`htAa)w#XHxf3ekYhCLK+iin^-mwlGdy>RQKy1cc
zNStQjZ8_QQbJ!bqg!(U?P^qUrnt^RHV{EG9Xbt
zl;q84ew3Y^n+{_#eVxt=iZ=1JLKNO_(=(BQNv{?SKK-gNYyUX0bW!K*M?wV`&$jZ)
zO01a39G#_bT*|G=?O?&WnAd#p2di|Tt}aK41yy)VXGE!7@>^DN&nK+m2rbs+b-~k*
z8>c{S>ehuHIFT8i@9s5VKylLXg&vh&VrtyzVo7z|3uRnw8eg?LDUCXt6KVGX$w}#ij7{U1fJQ%+RuF4Sjd>
zQL5IAQs+%A4#pSnT@0%x>L#(vOp-jc12PjaQe~L$GALb5$EtEjPdDWLXXM;7@q(<2
z3m}V@gIgdM>U2a~ubmS${2fYk^1JsVbhtUg>`_>g!oy<%&
z3o((v5L$C#=(+{eWa0*8OD^ZO!s3e(*D3KsamQ@MFGKFJ&pj=ySS@R0f-6mjrs=W;
zWH?&e-FjWwKu8zJ2_A7KaL`SzJVyjpmPYTLHajn(f#d~1i)skH|mm1rS0y$!q
zgWRXRfVCsGE1z+Hvy+w?L4Q88ilek^`d+GOD5(+XazIJ=W%E=b_IPp-o78a4k|$-u
z+kUvaZF1=sSdTNEI^*NB?-cDzx)0qlbl!XHg4<_j%s*(9vDYLy`{*>8j|uqCXYYDj
z1j3DrheMd5gsl%wT|ot(wuLXQcyM>LT)VYq9Y><*+i?p)F{_MT9t>YEiYnQdzDG~<
zK6%o4y-d){u?5=GvsgBWu}_DF^SRI|EM=h9O6gnDBy+b8*^<|7tvq`#@r6Ebu)eFI
zDbNh;ohE?I80R9eV-%`+Ql0x^Jlt;NY?%7)7~2K|O^1ZN-M&C<&CQ50UjJMI@oZa5
zOq!40m}vw@hC*3Y2q$&$r=n`i!QLY}3QR?1Op5URjt{)xBB2C~&e)-0Ed#5w))T`S
z{Y!3IK1LqH6($H9=elyjL`5Rijh7kAXpTJ9Fj^`Y=<6rva%pCBchx~!k6VjPsxfv8
zI(3ivV{vwSVD+WgMR1_=0lpN
zAo4=KFW3T63oL1FC!blspUbgfHCwmQ5@DF2Hc;C!9%~=Z*N?AsF;o0uH8C#;hwAZc
z2j9UAf1d!K!7H+uPAYt+;Y7!q9M1SL<(|FTUt`&~wJzBUfHEmm#yxaN
z34Y9A+}t3eS*3|)TjdV=V3V-;(F`f-U-;;g+`+TTO`E#Ty|1@r)aV5m+MC2uGc&px
zzkM`ghPJnp*My<+lBVLmu3H@loSwW*qdkGt%>?7KVcbZiai=2ifR_1qB&z~jeA{*+
zw3U*I-Mt^>4p}~0Er*8goNoO1YUNBJvT~-h>Wxr%{*G8BrsAlB%65-17_Nqh8lX-}
zHgl^#y)@W&TB0jg(P-7`uNjVQ7p7}iSTScdXuy|d`4#n%%W`Jj&WTLmxVP@Bj*-L7OXb#<28=Vv
zF2VL^*qSY-_EqDFb3HQ$ND~T_#^_jTJSWKeHg2%-@iM-l@Jg$zop4ix3Jia?Ptc7@
z5gJ;KobW;@Vo~10m`$Smj0kGh^CC#uNsM{Cj=VS{e-u`t_Ztmy*0ZMCAcMyuJV!zz
z$%EY3A!_&(up{#%o2z@KwWarNSR}S*Y0a-;+@-SnQBCvLbLw{adB7RRUXt>whciiY
z7p;8hXof`~8Qs=zaq8Ay7g{O?s{*khGv0Ub;)~+JOoYfHJz@ILg%P_!g-3M
zjH?$={qo%RD#MwgBX*bl2y_n(wO})NMfl24sE>r3f|QH!yw{j2c&uIjF0c=w-m^DX
z{Nyc4xGOMe8JGU%4VkS`d61g~kadn89Fv>*@vsK0DhNJ4mM{T&CmpQHMh(B~lACKF
zFTxPFd)@e38;0!Z7XzBrAK6#qh$MV@XiIVQHgwi|&J|DlH}fC)Cc5T6;=;}Z;X{3j
zIr=YG3WW*EIBShRQ#iFc25V(@<7e|8i_18AmK0BbqYEERM+N}rcy3OJ93lT>G|gcy
zkId2gyvog%{!ZE}P1~=P;Ci>!UdJEv+RCJCIYPXJQWs>#Am;8Bd@4;@o#L*w~W1#{iSH^B9QFM{KeHv|Dq1MrtG;aN|
zcokRyRzAkV&Tr#2JS8y|SE3lfGRO5LHazLeY5I=7BYM(WSqCApB|}@=>;A?j)(j>%
zj=n@GrDV!+I{Z_?y|FhD13GaXAqdm(8%^yKcbwQ4Gz+xkiuV*Mc2~@Nz7+&bN|~l^
zI=I(8q$rl)+Ky|+o!J^*&1)}g^6hb?Sh6%e?4Y@gQ^RmG^&g5PfF9-L1&LcoleN{1>(N>hiN$k?m#X
zx2&C9$0}^_o@V1y3P0X?a->H#tQ)#;cpHFuXZRk*x*tfCKLBoWO6l)v$Q|v1wVaJF
zTnBD@l7OSGq@0dum2luzh?S|KN`&M&Ks_g8v?PAN
z4#2|0%0!}7ejbGhsfIBJQ3F>(5+Z1X3E3@xxXQ3plz!j3c@$#E0%BKMJ^t>UK{`Et^piZ?r$(sL|_D`?<
c|BJN)sMuD6Q}=U$U%xiFrm3eVQG_VVZYW0C)?qXzSL^mFw=xO#hmF4lE`dIumBI5{r_
z{rB^So(Na?Uy{81|1=9QQ1oI(R9r+%^q*j`AlLr~b}{q+!kircYn4xcpT|#|oE$}A
z9xzXs7s4OFiT|TGz_5Qilt@AmV=t_?7l|
ze#?In@GJ2bz=iAO3|)g@9u{h@fJ1*;At8MWEc%Z#e@Ci%dwBbq_&7MiE;RcI`Gxd%
z?w@ijf01(w@Yi2*ewq0N>EtNq9{_cOIU;`9FJRYxo_-YvXVG8CV9|f%1_Nh7PS4xP
z6&|eSfPg_H#3aPz#AM{eZh^#aUJPWVz@mTS`9*_^8C5@+1H#+S)Z5zw^3x2@i%XEC
zi0mK8U+4dXf<-Ul=$E+qBWQn8fvAO$0m%Pk00@~df#oC~9tT2OP1!UEe=84$;(mQK
zmK6x(z`*I>djfndog94mXNt?Z7K!zZnp=gaVp>Cm6I)wbXTR;WFYfPu-pn3yTFGrI
ze?QR+&BLIia5iH}Zz(R~sv-TOW_P$cn@>Pk>(O3GW3cqJPAhuSnEml^SC
zQNXm2#4Zy)EeR(`oV2U>9k3=N{=xM*xoOM{;niAHmBMbOejfe7f*KzGT6{#Ei{PyTx*|2J?n
znmXdK=TmkOJqa80K^m-{4H4&4ia^NCDi^?@yJM=2QX`eO+w^Gp5{)RV^gG$#?hGz}
zY26-yKXWbd7%NbIeSaeqh-F6lcsV?sij@)h?ID-P4OUtUDv5;3M@OsAtsiN>2Qt71
zP8u`adnY@6xNoD1qdi6DUE&?r0zMekd%r!EI{uvF4OJ_ZQBxv(1_Jn)Zj}1m#zOF0BO~o?@Jz
z4?B1EGCMv3>Cn)X^!2d^&Un0h$U9JyAF|=`Ioo*zp5xi*@ngNz+d5OS-{rE`ji~vE
za|QX0vckGi$nnte6J?kExzKHox!~2uZgFUCfstOW3(f~)
zK5d%TXWyDuYvqRU={qJXAoshe6`h!D5Jt$aoy4mK6(ZtB@I7%LokEbR;TQ)WMk5v}
z4+|uqg7fy<^A1sqzEca)z1hI|?3(#|$5qQx19&+~AH1l-Z`p1k^0eynjuNvO6Hg#N
z)(UYC==J;U0M+gdt>q+bwtX8JoSwjb;@H`&c?-|+?g*YUbCFqqsEJZ@}X|DX+`Qu5BRYCFi!Vq)FoN6)O`o#n+A>8x@$3ckJ>gStQU*
zW_>5j56*sU*64}5_7phuNqi!vPZHq0S)A?HvR;xSQBrCp-fz-IY?=!|6mpzWwG-yT
zcO!^QGcDoS9y>iu*IsOR@kOFhw#aeO<(?7{Uf3`Z4+cU5obq|aG1~mAO@>)@AUiBYQ_EV
z^i=m9XL16Y1U)GXIzj*JqIOA((dMbSsGf)o2`H>E6n^jG=5N5B}`pgmb
zr=&K8UcRq;)!f48g^#p8CapR0;ugXWW&;JEC$!T_Noq{!%X`+a5F$bm7S>BSmW5D>
zvc!T9%WF_yyZNwh!(k!W-$4yw@i{DQfa65wsc#Mn)qiN`!F%E8NxD74G052AoJT4N
zk*RjrAG2C??dhgv@vye9qSQ=Cg)AHCYDzvCRe;;k$9eTwJ;v3?giB6$rXIXx*M;hW
zchE;2uPmMOZq3uZzbzlucx!{nOt-m{4HE>Iu>b7#9Z?y$(&t?N5s$A6o$b)b>;dVX
zD<-BKqwh{t3}3Om?8G+(QcMKI5gkH(=V&(IizGwpa7^xK>+fzA*!5Pij=+*AYT1=1
zcR|d{%F_!t|3lz-ZegOSAz7u#cx)kSF9K%CJ?`OZ`*tNC+J$btZgcPZE+!zCNv-A<
z%L4EJRy!b2;gn_o2^P2LKIe+1Ry^@R&W9ght=ZS0lXcOjW`fnt(0gjGLh@Hflpd28
zCXmKNu@HDA+)6X-&aXawR{GU{R3TF_8hK+x>~1DflJl^{mPdz`oG8&&DA?nWb}7
zCA!&;BI3lxP3SA
za1L-UrnZmcc-um=Y7-hZdK&|z7D(&oXYPI}OZm4p`iY^p$yZU`RD+PS!{wI3E~-Wm
z&_FzlLf&O@to?W;&0wRk&<3A}H>xPuZRf)>4&#MPRy+&Z2Qua>D=7iPk>d8@
z!M{w;{!KUh+)=wjlj4X@dQl{f?drr9puQrt&oYg&Ru{(Pc2F`bEgJIZa5|s_O
zugvV@Nn+pkxte#wk_OP!b#La41!7;UZ`)3O7Xi<=qS}tTE{-aTVv|Zm#elCcGL6Y&
zHE*;-#s-W?cS+|oe^BLj$0ooGGIo2e;w~5RUG5H>)suMVrsgt7-r3ah4mV9Rolfi#
zP}+y|6;Jot%#1%)mO#aH7TEOsdYSoiJ2v_E!usYwj6LGv30WW!oLUJFI#T#jQOBnC
zc7kAae}!=sUJ6;?`CXl!eQesEHg(EE1iA=JrJ~OFxbE#B7qCMB@0nGJ$o@gTE$39hnS+Qz25M6ceV2K<4kGti%1BmXm2p;GEKIdOb1`3`eG@%4A*d}
z`?l=bK`f~P2-k8{XJR-;TW0&pSgXZ)t5Hb??CeF4@LQ-xJPeRPc$g%5Rrz6^q*cp#F=R1A#`I+FSi1X8Wbw*3>?Gca|OvJ|#
z@9B4G?Bi5~qJ@ef54X@R7bW5JYJc~P|7hM@#=Ab9ZSvjWf{8N7vDBC3Z-9z={L-yr
zzQ69%wx*E%u78?KfLM=NO}ha}tBuUui6Z!b2Ei9=c}8i>M7h&3zWR6B?yW}Plu%UQuSzCb15-ZeUZ5nqB)tdmQ%Fr+
z?Y`0XDPfc@&D_w_DA)9gfYVOQ^BMvMy#gAOcSkoU$RsW|tl5UF^LVST$Pp%d4vJr1
zAHfKc7-1ab6*p-oj8bfa7GqMZR75Co7XHJxzU^FHy)!CrbGvD^a*HtF@>)u-d@`?M&?Yo(vaTDD!c+d=t4pq7)y+s>mW{uhjT`(t0)2
zW#G-?mC)xPUj+j6GX^4t%>Z=I(|S>Tf$I!U7|nc#3g?=`7pJ|uDHwe-*@FwLJ7u)X
zy6+KLJ`dR_PZ7b&w`A6|?cSE^WAk5`ub+?ok_;mb^{Q0itk
zt{0_cAyV&=PiUyQn0;-P-796X4RY{yGnIlTo$cyTYtK--8
zdi9|XNxN3yZUc==qc@R-Nt5(BOyR=Uc2z3+-w4PvPdy9Y$JmT51QO-bs*MXKl0HvF
z5^8d+->2mfF)m8rh2TGMin`3$KNSmNG)o%Ll`hP9LPLD&BhbXdYqoAN|1lvk0V{>G
z^nGwRL0LhE+7+08(o8yN#cX$Cx&-~b=RDjMjk<({5pQRK2Y059EuqGu@7k
zg~&_0e4gnAW9{|~{Krr?S%HT&FF&+YXK!mKpP>C3AVQkz-vXK{ze3JmZQ8h}Y`)sP
z(oI#NetSk;J}lTJ?m4=M{V7**RHPxw65Jb_PGb0OM0Pdz87mzNF@N&qE5kgLR-(0b
zW{pe}HLDR7slLMNVoI1tj%>i%`u30AU$ZxW!jr&$)OqY3Vq0G)vb5#-HT9#vi~vsp
zx!Z3Y6yipWnwc~0&wGL7>B)#-yz_=<0~_RGEV9*QzsC=py4w5tO9
zCXsAvhfQ%d;>vxi2dHq}RMk7AX^Gt-&Wv%6qG3qTO?CN78LO=tFZ~MACjNU?SAbhv
z>occ4%7Hgdq@P
zHF}sRsg5&xS$sbN<3Ox)M*CD_hASDII!~?>pMbnc7xBpbWdiAjyTWxSbA^ls_d960
zax~H7hN4#H1i17vJB}O9(lP2wSZtkKk
zdev-oWMe9>oNgI2wb38LrC9+o#r3WFQ3xhK^hjIx=`3TP{nAaMoYzB~s
z-FFEPrlFX8JTz1PZCVy*FO5uRZ$QvsLh|ann?_<}P|-a;Y>~6Bz@4Oq}V<3R22
z-#39Hw
z`{YrtcMnA)g<8qW>u5*_E3Kr>Kl!E*dY7biOobe)=%_sBf^Qfs+l$u;
zQ!fvAg!fX%y&$OhiqrzLw8OOzl+rU#64xWb&(EhY_&QcP71b?nz2cX|e34?C-6L+3
zq(*U-p$Wr?`V6~!N9TNFo#!tTNrTsc@|UkowRl;#3Ebo8TcSO?W}9pw^>lghhBnV)
zsYc~(C5Phk;X_h`Ht6-@-$uM=#}sz-q)kXk3}Qa_AcREOsxD7K`FkxJXj7H~?JSlI
z?mm{mtrAKg`|0e0zj0JSM|57mqJq-%1}|Nz1LJ7eGs;_U4+$6x@OQzm(RI2rpS<6;
zXVSZR0S~`N%4Q_^zL_@fsq}Nb(Nr96GppBCW3vugbG<4QlXbzy2^1PTglX>7`1vil
zp`BlhN+iQ$n03my+2*?GLn^8ouXf5nCU%3GoS$WpVf{y*^U4kO`4(-Rgijgb-#C%S
zp;TdsBXph6+?7Nos7i~vrgWUhwKzzc?NKPx95OQbu+E0-mi$=
zAk1mAUcx+LZ%87d=E!Yw6O#XZOL1w|C2-@mr~rP8Em*u<%Zy4{S(iDQU#{0??d7hm
z`%og;l0c)GWqi&6T8M}*_5JHIKiwU=4wk-*OU$4vuVw6|36^Zl)}c(ZH?34FcgnFc
zw^OS5(mTxauhvFO!Usy*KGv0goY&E{(rX^xIoO_8tZA4WcOQE3)wti1-8x?ct{WX?
zOc+z@BMFomwku%*=E8l?YR^$(xk)Lk0P0z$HsSSt-x4B8BTx3aax&e
zT3OnyG!H3Z4Tj18{@oHfE;8<^8%Hn%f|+gJ=ari1!Oh>0fA$rq_Tk#T`+F5fYo5lu^
zghs<1YPq$7u(1wHdFDc>6vYdQ*M%-76=&Xpufu3d8c19&f
z!IZ;Vrp4I&C39v0=XL{W0h-lJ4qr5FdLQ}M2QZ@8lc&^)aAh{dr~%jA6E75NoH9tL
z_Y0}M@~Rjw+*)OS!G08YLzh1~#4_*^0jowfDNAprv&2EmEtoeSvbdrqBJ1#)2rQ&Sdn6qFicdWSZu@E%f!#f
z2SS;v9W;u<;CTgXD7xcBk{uQrT1`0~SMW}x){BmwjBt4L6$^=TU}YegoWa&B+EWYH
z028pOoEo*S!y*eq-fk>&?fXZ!*Cz83X|w9q{g+z3f4fvAEWnmdZlpqCS)*d>(%vwh
z!V9%@dg!S;C@+sHW>NN32SK~7?%fClsjOFrK`oYo+!fUmft+KR
zq219A$G~
zAv)PcHof!aJj$Vaw_MTLy)v+b$`bFRXKRcj)?g=IDO+hAY8?Aw6nOjmn4W|o4I&O7
zml3hK0ko8WW)3%_b`KZ9L;5FK+_rd6!)fDzJ`!DG(GqPGnp8`dP84sTg9Ht9haRdM
z18Xe-@4y~1;lb<(p+HLr%~>9#2J!{on4!rd>qH4^fp!x##T3l>L%D)^-bH9co#Q#Kwzx)xY~wEem7=Y#uU4&MfB*jg;5kKS

diff --git a/docs/img/premium/sentry-readme.png b/docs/img/premium/sentry-readme.png
index 420e8ee8770b07df2af147c9b95293331158db18..3c8858aca7093410b568e373f0a6ad78469f6c62 100644
GIT binary patch
delta 23629
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
    #CGJW@%-Vi_DV!G=cC3Dxq)931F
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
Prr~5I6(!2W4gCKH;KJcb

diff --git a/docs/img/premium/stream-readme.png b/docs/img/premium/stream-readme.png
index 15da6ba71d07b65483d340b7dd519c6171126eba..a6a7317b7c2ef88c011e7cb8a98b649287ac0657 100644
GIT binary patch
literal 19170
zcmeFZgLkCQx;7k5Y}-c1wmY^a?AUfP!Nj&E)+7^SV%wZdY}?j+nZ3_B@9*2|y#K-5
zYjtWZqP!^&J
zqF`XPaR{%VPakzSN1%=i7#IS^-#0kew=CQb9cn9eZC7mtc|H>dI{?Vk!PpGoY3KN%
z4F)FQ$@fvTGjj!zdfM6AyYP7mlK)GC@1y)z%uG)DFBMlCL2_*cWm0hmXERbx00)4D
zTnL_&lvKdk)SORMLh8TZA2mU8OIKG%K4xYQ4-bF`JHWx&f|-?%Lk72
ze>L}!+y4Rn|D5y$IsV(&zmoXx*aZH1&ZlbT;$Z9cHw7B@R<1&90{;r=KgItiBmYK;
zJJ>loo4L4rz=T--3-V9df9h-hA2UMS|83)+!v6#)Ia_^13i|7p5bJ*#_^0eY^>zL?
z1OF8M1MoNXe9BgyX13ZARv!udR}^gAA94JzE&quWcd&JER&xZInEmzaUyy%@{!{y3
zc69z>hlBT@cK*@w52UFHpNpHZwV8?QKd#ruRr}ZI7Xw)^|3fUm{J&}oe2fJ?1qV|r
zb1w;ytCt-vTR#0P}z7{KJF4E#l5*AXf)xbq5Dqp?`&8_qR&Q
z4&ViR#PFXQ{{AAW89x=;3IrqIznR4sl
zTVbP8O-}D;gib);NzA+fa67q7!hy_LAXgtcL@&7T*VxyBc)I_T1sok6J$5{FK9oFk
zp~ESg|GAV`3+TI3mJ~swWrJ#bJ=;VVj?+6nAQhBCQ-;C>=ZBCbbmwr@{iyho<@IkN
zPzwS-%BQfjPKz_sb|0|IkO1^B=JZ?Ak8%w~UOz}$ya@|jvK!|E*=aNzg!xg9{ZJu7
zTGRaK(C`EK_*Di)_5XGL|I&im=s#m882~FGMui?1nJg(+R3t;0VxPFIey@h63Kjk_
zY#M{GVf)Fc*z7!kooxKnax@ZDnCMIHMWO~9$%$?-1e6KZ=#CMo1|LIAn%M#DejzSY
z&UC3L+}FZO?|WRh-rEmvZ{T-CgfX?;`LRr0RaKPh>De|kWdiAosz2opN_VDP%{9JX
zWaMURka0Ol8RM8D$0C2IL`5LlGENwBH%;Xnm8KtlxIk_RxO*H4{ezo-`emxBl
zb7dLFN1tj#>x3z%&~U|zx7h#&ZV=ad#^>f~KWiyrRJx|tYj-}T!7)gI!zXybO%KgZ5i~`3#k}#pmn;v
zq&E*(;K>CyK-!Fqdnnp1c9Y?CURNZHxgHG-e!ah;G#}lEj%Fo}6DzyzhZ`(k
zG!c02-Yd_+W-f~K=|Y!wTF5>4Ro|!CFFU@P=nHP})9@5R=hayuJA?1SZH8!QHdKI%
zM6szRkSDImSRhp)QkFMIbfhmr`O1IFj*8*^;UvYOJ9e}kKWb2VcU=J7K!G$yJf1p7
zUxS9hgL`+tX5t+>UX%#kll-=ap3`kTKXuPu98`I?D@@xH*}S@ianr&IfRNG2)Y?Y_xUC5BB~-pOs+}
z%|A~aVsLUDvxa+DK8-JgA+Lt!JB(3tPLe9fmswv=<(M68`L>!Zw2-6+zSZ7J2ZAl7
z&dBsV&(aA!RGs|J6sRxpJ5{e4yU#%|hi6ej?kd#@7a^k|(}lC(k$BKh$*PM(8Tm|?
z9L2fuFw#MFhU$(Fv%I!eE6d;4DS|zsq2p`=5$sj}A
z63dvgu^76Ty7+yuv4U%mYeC##rh(1-r&dVHXSljjDaO9rtzz_`z;k%1!Li5k9}eiT
z>35c=9G5dxBVE+D#fa{U4>Oj-7Yd6;TJ@c60Uz
z>pyr7qI+7RajS!K!adV>&mJEBHT-ol!F{O+SIY2#zn_)k4;o_AX`Vxn0HBfG>+&76
zi4N^G)7FoyNR9x?Oa$j8`#RzmU21k-z~T*NC+_5{834BJNTD?#k?x&`{sV$O?~au?
zbj3V(Y2Rrv%%r_tGP#pB;?31eb#i|9UZ{oQcgMs1N2rA@E>haWhM#llp|!8xSU%rI
z9SBtXjX(u8zVZf#gi~N*Haugw_#7o2h
z&{*AC$nw8Vyn-@=lLxPoLr+6M8ehibc4P5WynJO45ol`}T5;A*4xD81;g%dr-(>n)
zPu!uyIpv6N2BoNu$-HhO!lHLoAlv=ISlqYwJOzK%S~Zb@*TgPvO>pt?3fFIB`g23Y
z3sOV(7VN48#u~^#bh~2>=e3JK)T}cd(!kI+cI?FS8E7w9Zfk!vDC8&E2#OHj?Q8*G
zA{9{xVb#0aF|;?Zb{oKyD)@{F8xcxWQuV|xCy?yf97hhI%4XcUd@Krbq?MiOX4Hy&
zKMgks39kR+DwQK1_I?_r9u_r0fLz2XOEaw^XSP3FQ$qBk)dASqP%-XW`j##tJwnO=
z&Vd2O$0zLyotP2?Mh|NJ0fvDG7f=RH1?D=*D5Fe2EDI&7O6m=o&v{vbHe5;{+R+`0Y3)VMO+js?0mqEQSRq|8
zR$>rLv;A_*upkCrE8
z*T%cf^nS=nfE4TP%K5wqy@c)a`ARc7>Q!OMb3;nPv??P@@;#E5B)1m7JpWsJ3n$2y
zkr(AWfaE04TCkzc05?aGK+1tpum$PfXj{aTlAM5>NDSfJEQAU0`@ukLNvqA8s#
z=P*8rfppCQG+9COJ=%8ObS>1W@IFcS$?{l%3*Vt^m!f{809r92Fx5S^Djr(q(N;M<
z%_W%{o)WH1^7q#*cAEH9*^T*HWPzGG!GlsYyS@ljF0Ag1K`?y^FqH>e>)OXitx?T`
ze<_JT$vdg3k2di&^rq!mxvTFGjm8&MfpdSw1`1QwdHy7PQly~HAz#FT=U;aA$V|s~
zHSk$QDh`lB)q!LwL}&*Of;6#}6<1JI6lW6P<`BS9^>A&gpQt^<8VkU{+#*&WgbG61
zy_=xR5atSD)UNGD3S@<%veZWW_SplhM*#KhB>%0ZcHjtLnin5I@ZpPB=EfGW=?+7f
zT_fSjf-xGZ4_HC1F}ge{`tSf0Q$E+Y$4^Z^Xse$b-9&Bifvm|}8*55}x-BK(QnTJq
z^Vh0)!nCIAQw}C(2ZcYCAchA!NE<&rX5yw{zkG`WCo6J9k67=YFG5v6;cED8WBRKM&#EwLLbb`|xIv)$yx>!8iKwN6t>Um80md1Aw)I+}
zpwPy8s@S*;9mM>0uO87;ctZB`bj#0-FS;-|uJc&gXQv#UpEvL>dW{6o10&*ONTEY#
z$zW-;wyfRtaLoI`5<+&2>j>qfqw#Q&C9Ee;*k^9ygiATm=}(GFQjI!FfhwD{j+eHD
zuLQl7e|GdWsJGcR%9VqQEp1RVEGocD%BKc5ikI1RTu7kj=$Z!ag07%T3nUg8`A~
zU^OKi#fJ0@PpKe=sBM~WcHwM!puJiP6^0=k$$^URNxqqeL@#_Yy^vW9K6NZzy!OR(
z8A``VeOom`okV-FKV9c!63@(eX)3YNxhLb5`ruAqPLg9
zSvIK1Jx}GV$p~+fGuhrC)i|Kq!--o-2jz@~h+_(DT9=I`Aw{Q8*dDu5MeOhbw#5O`
z8PB&sSrD2-4L5y=oOY#g?f
z7)>UXH2JJ|*-UUC{!PrUIR@THPBr9o&+on(g7{)T#t9JCx(jOp9m(g0(*53fiy|a<
z$ZHaUO(iyJZl!m25P{|K^0?q5UDDX8JxJfag4mdJY}jYdig`oT4nMMGqpi6a#=J1x)gyF$O3xuw
z5j+?w04d`gMw*WXLFNSjQ=E47$<#8@3f1!_RBHXUi!PoJkG(&oTylK#LW`)
zDP+jX7bU~VJcZwV`ytO~MD1ja<`>X1Q!CO5&IHEr=}Frt_GOo@GtR;JDz|OiLwmwq
zks|b{Jww9~?{vcfE)rE?_U%y64Nkww@D?jZwFiYh7UEdF^yg$PK8hK(g3&kAq)nSQ
zl!#@RfpkoZ2reOt-3`s@GwAVZRlOdIP8Fg#V&>QSj!#%NyohbTl1Ss=ap?}?B7k#+
zoX*QH9WG;}Ug59sH};BpU*960Ouc*`4`N-5@`*rzCxV$=-c|P!0=8y
z+}|!OmU!hoM_X}>qun*19Zo52wWGs*y}rnc83QUykbi%T5Z90KtfJG%s(~^qT9rin5Zxv@oR__C+Z|vMl+xmmwbUrweV=8B2*Mgqc!^iSVJhhs
zc5-PUs>3!(A7RjHnyU5MJmh@-euKjak+o5m5da45hZg;6Au
z7s%2#1Bd(NSi>_esb-2rbB8n9QLwVO6M=k}ak-k}X`(dn!{?ude~($vNrSE9L)HdO
zLDFA~wRRa-=fY66YQ6n6v9?r^Q|XO~PF@LPGFmH6e63K@vyMs}JI=+6>^p7vE@m(~
zA3kpz?LE28I8*N6Q*B6XXZU+It>YfI)91zJIILEAOtQ)c80S<)2!<5pHM3Pp7~8dt|Rq
z3e1ovuzro1^1C`$Np24@4MR76lB%~;ws`Kluf;XU7{DlSgpro7n(kCKb3U5Zq$p_a
zz+-319r!wp=yCBQjvLHqxm3KDzYe}4sh1~C4F37x1U
zh3pD>;DL#H(*;hxtPmlg4s3l5W(u|!b59I}{c21vAeZ7~kfu@s2ZiNSIX{Zq&USgp
zvQG*eax|!K`(p9^5?on4^lnUQDUmUQX08%-3ctB=N)*0u!U7U;a-7e7m+&B4SqQ=4
zJJM8Z&rOSg6~j|n-0?1Dk*tuk15-y1kMfyAc2Hwc#SSo!wF=Dt3=UE?k%?z3-Mefz5=sbge^I9E3@X
z&=hJf9R2c)8K?jVkmlU3FGqr7&4il_V^AnPp2%CCcwLR5KVaje5ZfvD&WC%2QH%2Y}BdPR|*_rj0
zm14TXck$}D2TsSTQuCyulgn>b%@(X$(1jNvt>+Gp?e?gCLpVknqtCVzlhO
z%~AJyhUuKX%eQ)E$$JqjkZPXWWiLx!m7vrsX_Z!)Xmzjs?-jjj&6j$AdMA#;9@eO&
zX`ZOmU!5)!1rvJ(4M8U!nM9i$>KWXuZ+|-MkS_a^)6;`LDVs_4j83(%CG#=#Gj0g-Ij_K@rtf0cYtJCb}h$z7EMnxb$O8_gmc%seElV
z$n7;&d#M?haQN#+b^n$~$T??d3j4@~xHkAC{H8OZdB1fR;PXL?Usru!h1h`(0y*v?
z4aj^P5K0vAum^8HP6N_1vm|IfYE5U%Bn;Y301qr0=d0DDxF-Y_VZ+%ii?>hRy;4Fc
z0t%BkI$PDTMXf*cu_BJZWpvqEr@0}u(Tj~ll&x5o+8^M$%&_``?1}pCp3m=tN0!%h
z^{X}YmxNPzPAxec)a3oXdtslw64qNHIL)-K0xkgVq>6doL{7*TqFTl;RkXiVpX?;rwDx(@|J>2i}+q7fYulIZ1%DG(<)
z5f{QfEw%!Ovkd6+_<&~0wBia|HlKqDamr^gQ2#N2ssbK3RIy#Te^2$+l?$ct=*1tD
z+M3VIO1@|`Te>iwN<8S30Y0a#JTFTwFk--*@kUr3nZYe0Ov{jkD5rpo3Ed6a*78WM
z4H#iYrr&%pZG5Lu<${g_>+y<2`=j-7i8ErW-^*~w&?51
z)IbB`+$t;ASsUVyy>W?tj2ig`24GtuRl};%>YJa&_GKx?@+aKpfs8mmy`M_yIzJl*
zmoJ<~+}9>zrA7|b#&dO$+{_)Z)bUVZA;+mn$Fmtq@5D>Yjm@y})ul}uY5$ymQy`Fa
zuR^qg9b(bQPWU0;mR1d^hLw*gsu2vjW|s;@q|*-zsV*(xLAd#9U^@Ouz4#04pYImN
zoUnaD7{9#~rTs{t5^vZ~IKkr+XKa;O1g9Nk9zOX-tQhIi4T?($kFg&f4pY
z@%^Qq{o*UV3x4CLraP^pP%b$|RP3|a?)
z^w4~ExEq+lodP%JZIf6O_aTGW0QEq???!EO$V6GLPtxRP<75}I=Pqw
zQwAf$2A;_1HNw-1JtjJe
zcv4=kXn#VdGyQC6rAY}lS!{v0Cr%|%q$Pv`QqX1GN{Ny1kz&#nuH|6s2zP!w`Yd~S
zqB&aix)gqeQkP^zAB^hYdf@c_0b1gF&uMo;ENJMv)_x3=j2FJBg2R@}A1i#YHxEzZF&9rjb&t)}x3vTg%LOC-
zaq;Zk%!pT^M76FM`MtF(LB2vesFpBULZO*$S|4z-BjyU3UK=#FP|0ewBe%!daa=yN
zpbWGVH$AP>gYdD^1({(7S^hyxT)v~;4r|`K8|8NB$^5GZi2TbeCi%PQE3&l-yB1^X
z{<#ocfrvK^I$l;3reC~uRSmmRA`ukaLQH>hwSvn=JyA*P{nL2V6MUxzs0as9;7k%f15*{g-h#`QmYoL9
z^&k&3TIp$2mLqJWxOKM<=jW&Q4|GXvTL}5*voh(wRb_wir-}^-SCco4XpWE}IN5th
zOY!;sQizoc=hIv|8@FC1nWu5!LAlRN6sR3Fa#?|!2^~`q&jH=HIC3askx&qO6>IJmQ0HBID
zyMC&*AZqpssPH&2x}?@SAE%MSsl)dF`!u=l=vc+}vtIY3#_n5IxSJ&}cYiqx33VYC
zZ`%#hxbGPv4%1N{;q0ekxWoZMO6Bi3A!LX5;i@MYbgAr*CkTs-rJv72R~iV9hXm_Q
zv?79Pi5$ol=t>%uz~K}mYZfGM)mzxU4G2?`PcH6lkoS8M4phv?gu|O*J0-#vqbo{Z
zL|4faG+QXn8C|3%&3SwHRSnI;GTQ;ujanx?xn4S=ymTW91D1EdMi-&W7!hkmj|xJX
zwmVy#>fO)GU5jGr^~S9{{bg}T;elAU=`}9DQjWhzDyJCTGcxRd%|UawukvpNtCDNe
z3S@Uj0nL=8q+eVw;ZUVBB(W_t8H*2oEjpDGi_Zg=-OgvV5Q5W*!uQ;Hh~kqa5Dpc!
ziLtvq^*B(c0zCt&w2X4g3Bz0^7Z^GWvqg_va*7xI)V67B1}oxSg#n-4YhZAa18wVW
zh~eAK%72L|V?C46C#!a2x~i{RumOW+Lv(Lxax>rpXu(gv3UwVwxc8irZf#_p4m8J~
zr8iE6WXhoaq*5*;vqB1rH2J~ix}&+n{|8rEl+F}I15cJro51`b0x=akfc{tP{BS-H
zR-qyykP4{*0-2x3VSm64uD_-9~O{;27Af(pc(gxW`5925D_-%j+!bEU
z_{yI#lB*#)@@rSmUvt|rWMD(FTy0iTF03LLo^WjwF8K<3og
z%*J|xjAOlYPab^A*Lw`P6c8h92b(;UUO0W9j9-7c_5po=(34q)eJ#RiV+(Pm<;MlH
zG||xc*a_&1;4smAZNZA1Cg&PGUaCqi!ZnxS{szaG
zu@WFaqJC|wcl9h|%c7sU^Ws&BhW>oBN{Z^I3SX-Zi%#6Z{i-`xF^Y=?KQ%F_VAWqu
zFYW_hOEoxuw|2Rw3P06*C!2VzNOomEwVeGx=k!zj?9pvzwpZB4Rh>9}!BX|Kt;LdV
zdFTi$@EC-cJuy4L<7+Wb-=rGWpowfW%EzC{DrP*lkLeCzTG9xibVrTwLe5dZD?H|r
zzoUtWf2&TTAp)Lh3503!sKM)G39#Mkth(mKiQV
zqT7jihsZ~@N=qsXUClVN+?FRjISqtbtX`BFqX*pkqYyzMEY%syGAPz+3A!)}-q(&U
zH3-2QNYBsu)tCWbF8^xUfxeWE0MJ}(#n4letV@*Cq#6;qqsuX6*F)GxL@YZoQYMNh
z5*suSFW{g@LMmHmC;Kq?B+TO!4{eYb{?yO)ixz!MPiI*h<>$jIM3okP2)~@&P1&EE
znvFKMhv24@T@Mz(G6mB0>oS!2OsY7hhZa-s;zaCqzd}lQF>nmCf?4i&zZ#aPIRG8;
zAlQ^&9$Lm}Rv$fP*&rUBp-k&lx8>oRwN%r!o3=*Gpm~*|LrMjG&|8g}atf;fUIhZb
zx6!=2n0yDkMMvk)PU1k%WAD3O+Cx98*u3yP-W!+-gdHRq*?*#SHckIIxiPFS^a87qvcEeh(e^zmh5kCGhCxl@qD-~ya?rU2lR?4U^jlV
zrNFijD$q273Es_WoyT6QA6XZxkIxS~s1lDbR&;w_NrV=^Di>=bu(fDkTz(PqLTD~M
zB-=ujl%!+&c*YUc?X1NX{j~Bf!7xhsvxe);6+!PEA*xv9QnxY5m#E)&;YExgqSO2~
z={NUOREM=x<1ZQd+W}PzlYrlz`)Dwl@-IJ1NgIFpqouY54x;WzZ3P$i=S-*
z+OY?l(W^~0rSoCRYRf)I8H7z|oWe^`vj#Vl+1CZG4^AEN3oPZyGnt?HZ~_%rf;)c-
znIR4fPEgOa09!W{BKnBZ+?V7Y=uD8)&2ur@f4U+=SO84s8Pt>ey7ly{iGo_trH3}X
z@5)^HtA>uPx}@sT`6|}RicQe+A|EI3lOr&;8dGCMMIs7K9POMm_UYe{(21%gQh!LL
zWa=9IS~r~kTI4ow<5Rf&>@7=J$!hf=NEu}UG`K;UMqDzS)x^uu=gl<$o
zKDjp2FOaR~Bukhbbo0B7#cWLxNc{S%02Y%0qO1(lX5z?&0Yd+SQY4M@wYo_YDiZ61
zFJoNE`^8=|58*F?N9^)$K2oHXJg;A+g0p0*64sUMV~?Q^+qwQ3jaKu63KZF}f7^l;
z2$1+l4MNX?E(63sfHHKb
z{OgA-;lO8?=ha9NoDVBAA)6K
z1piWqAm|fLq)`Up&t(Zd1(cNB!v3{dI>>X1&rros^?L=uQ$bJ??NTCd0au!ih$F*4
zNBi+Pu*hklqI8wB?IxlSb4tm?cB2`{p+^r_A*mbG@Yy=4lel9*RK4L4?^sQfT(9%c
zxj^OEF?-UWh&LL0u|&Rz4L{MeRR!=HK`66kSwCv%ESVXrboL#K%xIbt=NO-ADS!*(
zlGpM9U%rsH-Hx*~7oouur{WF$k}dnX)2>A(juP3uW(HE6&BFDA>=gxc)A(^jSuw|O
zNLm80*kPI{0v_l|=49KjU@PGBk}}rD565>>)fw5!@5jUp2f)7`(iXG$Ar7$K3^j%}
zAXhC1S+p3TMwfYZk}11k$J%(UN^;C2h0T74)J+4xsK}GxrAjs*%%PFF)~K53Zq>8e
zQ$}>jHQ+7zF)~#g!
z8!Rh&`SjR`5At1>$7-Wu>RvphtOM&c_G6L9YTk>*e$Uc}O>vG+VjPuU{H8G=AES}p
z9i&s4bJO1T6av(w4Z0BazI^OplYhVba)yqw^kQNdvG|4}uO-ir#2O@91RwLM-JYdV
z)Q8`Zi%IX7J5p7j2b`?be7#4>R4P*wzn~8IRPUh2T1}0wnWFlBbfm1X>p6XNnQc1A
z)whwvJ)V;O!ugB(d2U+5R3~u6p{DgIko_<)7G1KW)z4VI)9K5qt2_I$N$~f%Eln27
z(cUXoJYlHHDV6(NnXy0K)r!cuW9c?A;I&`;CC#D=V@-61<<+u%8=JtVbjg#-&P$19N#d?8!^M8NQYXX83kBiz%+9FhRhs{civPu@VaQ$Xc4a40
z-w{bu9g%1&A%yh_UOgQ2)~gx<@5(?3*Gq~Kc|;f}jf6NhE2HwXc3&h=&qo$Rid|k~
za>u}&aAis82hVS1=o;F2H9u6(u6II7Ns_Sj_PGx1cPPOnViL972?m7pXTVrwEPp?ct3B7Icm4!+)r{MD?oHdyP;@#g=*de37mWR6XU?z^O
zvZ6g*y)-yuYbTlFD1{Guqz;%-hle${U^S984wTi!BM!C21>8QLe&h3U6E7=WKyDO0
zzF%JRH*Bm;8%D8@89PJ8Iy$@5^|bfrsOpSY3R5o-Elha5-Fa5TLt5?ENW`NmW}c7@
zf*Lcuo(?Y$-tz4li=cjb^(^~zR9jn>j-PU|s%@{%Da#@XA4i>_K!lbc8n61CoH9B_
zfZ=?c=zmQss0YHbr7>a=fcdnxw-nUwFQx`liFmpn$4yE;*@kr@4`S4zx-DQ`dNw31-`8CEJi
zlcN|vUw%y&fYq>B&8vAl$}^biJ|F>a*nUVGq(XL!fjTKk_PiZ&3ZmepVy?Ei>1-0+
zKqgccRQLeKJ{@aZ$)=#CYLdvui7j2*Mc0Rze(ma~X3i1!Gw;4VW(!I%})UOd^ki;`QYI8p=|lnMEriXA&QsaBWv7z@J`OG$^;!-
z+=ETZ@5<95f!6oED!Ef4eaA+qTuzR}CPY(opA2>N0AHMCBohTArCIk{7`h@k@oWTb$oS@-Dvrp;;}P(j`Trc4KIBJr2OGw8
zoal8Aa`#@ViT6DTbyk`!4SI3EdoOx*hiRw2%q#k4$PV3$yWS;XpMjrLJiTUxQj0?_
zfJr|_gzJO?v2X{|euW3a`cAyaVael4fz-;+-6Qg-yU6ICJq{~~g5+6(N*~bAYpqPT
zZCb!GJ1AhMac{xkn%UprtORdINk_xX-2;}@AbuA{_H4fxV&Bg`U3tu?=$3w8z5o(<
z19NlTf?v_WI1W8yq>K|)$b@K%P73$@T|FK#QavpcrE*OB@eDAiNL!eI3)~`~%4aG9
z`e}y0p^jw!G3svN);X~+CyA==gMQZ8(GCarnR
zf{?Q~PwNU!cqkW%E_02s56`Zhg>TJ$2ea1#K$8o)=5Iv56QweFAqdx3XDN4JsP@*q
zoG9RyrkWZzmQxcwE{A%0XXcbG6wIeTo?m{G7eK3ZMJF}!@)V+~GNxzJl|&QdC73}i
z#j+1EtwqY-kiowggwY)6rp%%n!7?CQxsMF6CKiJIG@Z3-zEVkGV
zkXlWv;u{p)WtfCE70&5z+ESLyd8GyM)xB|7+d(I<@lw#=it!-)&NOt88HM3jqn@36
zYJ20~$SAr(V|>4*L>$Wf6~&4cJh54cq|A+PTP>@E%-_rLy3eQ%X<(3>_;G?)B8sm_
z*XJeBl_Vg%mc#+LqS+)WP+<#x8R_v=X=?btX;#8Deye4(9Wolgj*)z4_+69EOe;q
zoe8JtUD3t3zE6d6J^y(cGVBe%P2JZl2;HZb#!={51)Y3jx)LW1^6}iS_vVdO5)L^Y
zg<8b0&x&5Olg?MzLE`W`-t=Ye+G86I>M>*>6Xlh|(yOn}t7FOOH2~rw46%OC=k&Vb
z>w=z4O<49bsIr4Ds&!%Oj*>tx{plB7UQ%rryWQT}XA+c%uRm>n*ZRP5CK1CsGSqrX
z)3)X9)&e^cZ+}7aOUdyy^<)VQHSnr8-Mw7xQerQWtK#J{-2?{&
z>C|$UU#~#T(ZR_#zqBBPBFgD(LqNFuJl&yZIzCgkU)^ERv|&tT%Ll(uq!3d>{LPI8
zB7a1Og1)VO69Ob@cL)G&786N8ss)?!OguS>dL9gIc3WYj~$0q7vbD?
z!jhGu5i)E{|D@Q08>g+fCMfs}S7Phl#na^Rg=^er$v^bQ;MJA&B$7$^3As(g_}+_w
zDbDh3LXJp4D~Xjpb)%%^E8ms`r$q~t#-PKOdZ80RN+IY4EIfzsG2Ff2l1xA8O2fc}
z3*PamMv%G~&oJ>=2i$1+Zycq%CGnKi_&bucDs91sj!Gx^K#3i$@iEX$I3+tE
z2;F-7BDeh}FBP)~s5UiSCGxBm!8F}eeo6LR&B-pSTk$&)IIyVG33pADz@wB3(v6Se
zWnLfI&~0i|^a~Jkkd8i5@wC#P^_1d?_+a=LNMJe_wC
zY(g>lzS5w3)+heSE_u=h_in_@)rHvNiv>lI^*)EuwFk6|VDrcCUv$&M42|-AmhDtY
zV*0a$CV8o(r`Q+hA#(H(>)X!^#vS)c*XG5Vc+NP)m%Z~LCLg@LtKaOKF3Ia`oHJK+
z)?5r{&|$VrC8zD44gK|L{N2Nb?cxE>SmNX?l(WxMR!ciZt8FAzjoIN(o@j|#E`@ebgkloe>R=7X0Ksh4ATY#x)xnrOI0HY)-{(jZEbT}+UchDH6l04P#8P`}!
zH}8`zo@~<@u5qIMcB%~(`Hcq_iJyKg=FeN@XB~f*5IBiF)chM4o)?|QttiCOX!soz
zF0u!Rwfd}Q1Iw!&^Kp+e(pAZb?uk#C7sO{*{DlfnL%jmnW|byas2R(YaNSFqVtayz
z)E+nTm)uO*Q6g6uFjrzq{81`r4KZ}VktKVLR%qkNF=U6(qT&FGS`1@%A?ni>D{DM+
z!O%UDjq;S=pMtaM`(8Lxd2@T-1%Wh$;7RV$RkZ3Mj7rEc{zvjQKf>@jeboc2hYo@V
z?^{!=364c`U@--qv>gT~rB*%#dFL4ZqIIy9$$&GGqaodZKE-DzRawMQs++9$XLIP=
z%?CZ*@H6Z>pmSbAFBW8;!t5`epALf*r?*cRt7!Yj5_y_&vDm|%_MPh#mrk#-knk@1i^p$6ZU3BYLP~;^h_q_lVwCDyDd=2Oahyc
z*Wjgpvc~gu`lz+M9@VFPd3vrkfO$YRT4?wFtjlGI42oAL;$y$D--7*l&KY7@zLI10jol9XHArw1zQXMQmA4rNW7*G9PS1W&
z-PvO6)@QQajP@^Yd2W7t{jI%vR1aG>Uz61&y@Q1-0JJ4PKW;imq@yVEyoqS!t(3(p
zhz)uljq-#>_n7vm&&l|KVICXqe#qf-V(^?n5|}Ek{=VbWk4E?#FS>8~Jl9vxg3X5C
zFuKr<6C!I>wrX&Lm@76<6{h6c;hvPooYU~@EB?64OhSnD3>xK*U@TD00xx`*hg;rx
z3h_c<{^W%T$S1EM8B=Hg>vsN5EKX>vED!A?7@hyI%@r0TJz)LJ9zU*=UcP*dyXe1@
zAis5?N7YyfM^CJx9NF!0}O#F0b3|90?boH`q=e^*5v40S6JeTKH-)QG5Zjtvcdwx
z?5Q6cZ)B)>a8GSU7DSR$Lw&>T9Z(3=PAl}M?W+%QhA1O{e7dCOL1LMLv>%Um4%Am6
zXC6RBOFPkuO})ODvHRlVf3}MF54<@lN61j_HL`lHw)l!;fL1a
zsKTdI!MA8R@DFt?V1mP+wqKBy&tB723X*3fiD@1C`;;=z-kHfuRYj#Abn7KjJg4AN
z5U`uOV7d@IEgmgB;=ycdT4HQDL)A+)yrwLC3)fhEzdm>VIE+m0W5KSgSqeil!-FI1
zEb_|Ms+O9l!kyz8^{KgR(K?eGnbJ&6zkQi(PzMr=vj*Lj-;9~^I;S{#Nh*4kMD~oB
zM30+>I_y7YA-zh84g3f`S?>Fgqk}!o55dz3
zJ6H?TCYa1&>XT?u@$4KRO}iRq;{r1^+f$q9%zwWCz+y5x8HK-jDt*>0NC3Eyq1=Lx
zi-M$KGebvTiB7xqumg2A+xY;}=U>vD|I|+%3-Gf@e-14YZfw4*P-}I%$ifSwp`g|>
z@-#ETUVw-Q4lc+jk1*VzyKh3p
zzH9?bc#YYW9ti+wpvTl-dL+WAVc7~os7jSVSb!jmzwhe?a~ibFSLu`Q*0uvIZVX_g
z@KF-$>KfH%jnmjq=q&oL8gDMVBo|J3?4upyRddL
z++X6UY>pjo=LL$H`g`QqeI8{Pvu_ttp4zGXICk9x;z6CC_vIXLVh-w)+gw-#ix@)C?XckqXb)Z8Y;JT;2Jy-hcL
z6z)VDgMJ%LTPE
z>X^RmTJ|pAnh7|>Qd3)IY?kD=t?JihmP_xKZ@3j9BDsHY+OpNxw^a2-?Viy8SvckX
zKLKw>gQI^%`%>(F>+(M~y?03GPVn^gC*;>ZIQ8k>E1~(5TbDdAiAbw2{PX=MPv7RK
z+NY^ADzlZ1cg$ZkFoU9ly0$It!p5~S$4qy9nDMe(@1Wz1=MK!N
zQWK-aFLunl{8`}03#$^AXT49(_?dlh;*wT>%hJ3->w1aK$qfvahVJ|hP0}{Z+@-bW
z9^PordAxhWDslJxvS$-Flp4&s9Qk5iO#iu49v8mp)c93R&5&5iIDK78)r=Re52d#7
zoKDi=cpQ8#F*iytxq#Db2}{oWISTGC7dmuA?O}Use`J}^w%&&yZW)BXWLQyfX7;J4
zTIZY(S(L21m|~*tc*W7;u~z!Ey*qDQnV#+zt>X2Jx8uFrj(cz4-JLD){IKZvIc;H8
zr#(FKc7{aT-sdYOJ_cFfqM~zoPz~erx&iGp_d*ha9RjsS9ajk~gjX
zpBD4L#&MH!4Cj0m_P%dNI$uRCOnLQv=L<(gL4$Pm`HkNnR}1UgwTFK-xIH6y(v#0c
zS`72=YE4;DQTr%YzsBFMY>RyM|GPVV%}s@cEY|~D#4HCi`3{*xSm!zD$5sn&etfBM
z|1VX(>C2>l#NGYGvQ0kC(46JrO_tm5FW!7HIpc$8GRu~&anqwegs;nKTbi(Y$&BC3
z(q-qi&75-k+mAOTf1G_;cL{v%|6zGN#Vz}-E?q>qG87aPnw+epIusN%&Kv!R2>!$w^kv6$%RFO%MeK8tQ8%;hPM=T2t3eS4mO8%+a3B#N5%;
zg3Zg`=}j66O2|v#jkLFLGokddw{vh6@Dir}TSDNC{)^2{P5HNoo2@Xlu97OHgrkcE
zB{v%v8<1KAnUa!H$i>`JKwVP$-|)95Vd{@=ZcYO1?4F*UY@VEKjxJX0Abx&+b|42k
z2M6n$1gopJgPVyLtAi`ezdHG^ek3hi&0MUV+^iiPDF5o$#MIH>@4gp
z9Nb*raG?KH-CJz`8~Fb)(#yo@U&{Ut;=giPx~0sb5EPu_pZ>;8`#5#ImO@lWP|0#sbA-#j(>%PtYnzZLwG
z_n-25|C@q;GXDYiEA#@Y)?OBNx{}s!0sY$x4qk2{_W!lzKamoSc8)F@P9|m+e_8f7
zS?f-aqtk@&8lLKU)5QG&d7)bvL!KFmwCIc)g9<-?Lxb#EShNY$5jlRa)q6
zE(j<&np<0XOPaV@h;RTofC4~10U$Rei0dx`^fqq)A@dIl{%VnMu`qFSbkTHlv=jN;
z4g0?yDLL8RJowM{e?x`X|H`9(tE8cBAL0=tpxrh`()ZCbi%S?_zKF$B*6cYVq&{}cxpdJVUVZsYor~B^m218o`sG{$
z4i|a@ksoe!Fke19zCryYis|1}ekOsDr*kMh6p<3cx{Q8z8h=w<%U7o=1WYvt^vll7X9W
z!4f<23yaFONmB)5ILQR;eLUmi?W!Pu3}(>Bg+_t?o~|o%z8D&K=A@4
zRG?(&J<4!_LcR;iY$}xJu4;-RqMQ;3-S-HAB~LomqheC!X$g6J=wwCtMr&7JATnhz
z)97Bjl-lETRQS(_ueMZ2t1gDR&8aN~^|G>!Lf*0#*QCJxE~V`2Dj)w&G?5^~C!U9`7uf5cFwx*6yC>X}
zM|rw|Wf!t`NBAOEG1cV)CukM2>@3-@n432DKbhPk$BcaOHe~Qi3m(Ny?j|h_n
zA9-SF80?Kwa=EgT`U^W@t%&z_i+;@sOc=C;J+E5
zjS)+rUR3{Kq|j}7`c{rFoSE9fl1<4MY~2uc3KRJ3qLd}axv5X(an3jY5z*piYfzg9
z@8C)s^+%nYNyH9$l4>Sm^8EcNe)F`?ywN=uY5SN$-A6y!b9;J*N+L-YMD?NiievM=
z^H7gk{rWCwI5mX)FQe|V3Y$egfbe@y%%+HKjtN>HxYFPh&K8|kIvUAU(-2F|)zi)r
zQrq$mEGG_gpQkE8M`3)J)xACb*XoHvZN=nwaY==)q-PWt$|J57CwstCCIC$}2MpWJ
z#RhhwUICC1^S-c%3+wXSr0B7|W50}La{L|`PLJM_vN??Q8Rfgub;a%N_53`bozFq0
z`J$lWfp;ZQ)%$pFcJH+Qxfm5?#MAN1Xi}cQ=pxzp_C|%d`m_DwKGMhMOs+zMPFFM1
z1f+y!OGfSpOK*QOb)x}_rWgE#$!cEutw*_GNb70HTMTpqE`FCrLBi;B6TP0r4KIh7
z({cT99^1g^(^IhVsc^w}gN#cNfT^D>j*be%WxEDS9@N7g1Uh2k)eiE6>g95l^o4>}
z(pa>kdV>}<^`$=&(H2afDi`9A+U)tWdEkQq^_8w~k{iJf%*i53G>1PsEv_l8peJK2
z&mtL{-9?v^69^XOMyF87=&?_zt*W?26jYPfAh#OiKJp_+t{gtOu8$7ug>
z{|Nst{-eicr>?Zu;b%P3)tCD$5ctOQ%C0G8|(&jCIFb-wFJv91*9G4u~y-7!!zJu!r^+NQO?~5NW
zGQczLzTQPB4mh
zt#W2Z==vje+fD`IQ%d4HvK@CV5~;lu+CET)>O4^N@Qs0=co6qYvymVR7%-`nh|xx@
z=spSWp;nS8hjFMBz0A#lH{f?5?2oozw(4ODF@qJ_n5cWX(2`{Dm@X$;!5u-d~&d#<(3sKHoInADOTf-yD
zV~UO<7Y>lXE|(ILVjT{3#sg4E2(1oYq+Zd{K|2cus>X0h=1M1EhC})##3kIP!$Hbr
z;a%yXc8P_=&O$|Wz9tO18(!(FAR3lf_6XxC7Ic;SUfWY4ZFwp8(TXA%=N{o)C0v7a;n0ZMq?dezXg5SE8F3bR-*a@nfgNiGSMvZH`D$NziXw
zN%5!7RV#y7!^>egSY&nZoj$tiwThT
zQZjQ*3jb*Jp|I6pcikx$%kc&d-mztjl;~H3g4R9Sa8ruZIOR<u2fnM}jyCqw(d<
z_~d32pKKm>aV~OAVmxlCwyJvf=W$GgqOhplP5PHY0?WtMNs)&igPLuwU$4E#&#NkS
zM?$h(8SH2w+P#EO&nG#wX=C1#ezv>~ahS9e@?uF2@H)w(n;zJtWKzaUD8R;mW=@Mj
zGOM-6SLN&9ZjQ*o86)Kt=EljMd@m0@;K!Z!JJNGhNalcuUH~L!yI*9uQ};*FUrK&I
zK%~D(9^|zXsGZcYdxV61{NwHI-|MA+yb_z#6^gi2fdla<#1J#$l%|UdWc}h-zg}Ry
z`}y-_wI<3F<&!BRf#bV2$?UIWzwISGEHk$Bsbi0S6GqYMp?%*UuS7DdcNQ*1@tg-M
z`Px`?0Dook#INi6C{UcfGY>*kk^JZ&5Ms18iY&~Vx%4z^
zCupnX;Jl#ZYmR@cf82VzIvcGD-LJC`K?Hj_0XkMJ$63~j=*qsteG{{Da|hEX4L6d(
zLTJ=W9&jIgno0TA%<+Xbd?tmc-Wf?}-ucXybH=
z@mhKkZ9cUBigLogwDNr+lzYzKzIb4bOOSP_bs~MVlAv4f`+!C!xa`uAkw$^~(boX8
z2tpV49u`<2*a^*!ItZ1F@Re5C3@9Yc<=|O(MhMd_GSsQV!k!mHmC0YB6Nf~RoV9;D
z&X_LB1F1_gvkW@7Xu>
zjo5Y&-i_VtEeG;bmNCZRayavccR;_=!I#W+rkIIgGiFL&^VW(o_CIxxPaIm|gfDJm
znVn*og)o59oxHqqrK#+D6C$YegknzE4t&BEV$1}8D*yVOqB&B*JFjt1%mH5cs(hOm
zdty#1a1~cYX%AU&rfv*U
zK_PW`RW`%!pQKSS_4wGRM{7}s(*nUCBoDsjj5L3G23N+LFR^vxJ&>qL#UO6rBTVv)
zbWtTei>_-~P|K|N0={(NMxL2GL_s!ZUzZ-*G)a=V5!CCDkNX|QT={ioSPtSTLZ-^^
zdL0{DR1I4-tzJ^ryu@I(4KRw|Khu~qqv)7>W*L>*r+7Ba)0~-hU@e?2uov2+pQmn?
zpQGga8Jm#Wgm|JNUp(y=Nk1N7oQ(VB`w=XMkbY#^YjPg!VfN8HoqM*N(4&>
zISbCW;t<;W0drS0Vu_cAMfIZK(dk~=*1Rif$-^}sLq^}J?1pnMz&8=
zNkY+@DW_%~mF5>kv|r%4<2YqGAJ{2qcdJbhh`u~h89_p>xLL5S`ciFoH;f&$ur^_D22p`~9B!2Y8n
z8W=j}rC(S}G@j{4Q3@JyvN4$_&A7X_&xRd2p{F^$JK#)5F%Ej=y?dr6)AX3pxL*Oa
zOo8q7N|sE43$tZHr@vF&Gshb~;KlP3Oo
zW(w*OL#LqeeJY_uoQP;4Z@t4NJR8(PFgK1QHYdXMc5v4cJI^49Ydes%I5Ei#Q*M2i
zLvPYh^q^SQYn0aJ4s*N>qpcvOyM&x$GE@uijZC!X+4G|N?QH|Es}iKjWQ>?4N(V5B
zH5$Q%zMqH|7sq>%rnA#n7ZW)ZkC&X;5^H;HFULNw&rt
zC4P)7Up9CYt!(#U#=8AT>7{qRsL_oCn`kznc$U9DyCgD3J8s!Q7B)P~)v_V79Uc@$
z6;ehbqAAjg{;chWc(TTL99M!4v64IYG?CO!7d+`)@dviKUqZiHhzZd^#t89}PNvZ7
zff_ByySv(aI!8jwn-2rhlF}s>w1@#1g;?}RKr`a%fkrEeOC~_k+|wq!wCG`_27I_u
zH62dp3|nvgbv1u;B$15EpXbteIFTUd@jG#@ET^F<=|@s;Az8|s+L#M<79no3GHAlf
zSqhuD+s3^WdrZJrb{c|X`xPAK$Ms4t^t*5{&)Qf7kfRR9|~n)r|`SloBmGi3+>olpuN
zxM;79?*TCMF`MYM2tahEsJOS9C1e{lDFe;dPE1av^^7$-uuH+=7`@;+Z2E`uIaDhj
zaLb?hR@39~e5^V*?YwG+A8(2uJD^yvGnf2N)<&`V8Nh{LraE=6u{z9x0;vEmRdr)qS{aB+%qRY1%-3`Y^+FhDR*N?JvO)9ZznH6Wk%pe|h#8Z_v6`o<@Mc{lliNs2H
z2Jwy-1=^;kB1Q(!-H#8pSqeM65~w}}B#XV>uVv=bLGV(ht&x8o`$C?_U(VVhTheC9
z300bcC|y|F2l>5_*TrG>HqJkOCdBY$uw!=9bJ;|d+{B;3)VGPNHtmG*^i^N!+|N3Dz$_vxbdY9y|BgB|TVD
zjk)7F*hP7o70ZL+OZ0Cath_wW{<$H3VD#oIXAU3JoC4*+VK4P
zDNUvxot$rL0_>qnsZK^x)-4S>xlkTU{R8Yej<}=1gUrFQKw&@|^2^
z&Kk7F9yT^#%n414p~VsBz%XK$w{sXM1w|qCxH<|4ZHlpkcakMg9BjE2KRCmRB8)`T
z=SI?IiCa01+!`b+lFBZv4K!J%8=mg7d1xlz=%5F2KVgQ(ez$|yqBGxuLuFto;$Kn^
z&h2ycsMY%TzJ(kcZAVqvP=1scK&Ic;g;ixbhSvN3x47XJ39NPGVerA`bDFa*n;TVr
zWVMX>F|c`V?G(2G!`Y@+uN35)I|!Vb7V!E+2$zO2(j7~Z#xz?|6MSpQTQf&+_BM4q
zxN62dN$9toJwPSHRvCtwQVFr~CT&^tZ8
zND0e@>)BjC4Ftr{T20G}Ae?!PJ6SBi?Oq&~ox38llPx
zM)eu%!z}BR4&F*`ng0l&i~~DGe+V0KQK0f>70bp{POwv;O4r1SLdqkqM{_kS9sJ2N
zfD3D=_S_tp(+gwvRAVmd=n32QJ@~JB!J>=~g~Wb(_#@RfxR39$_%ZHx*gUc`PCU``
zwFp&h!RWA0fHB4Gfg0wY?jy<1X|a7(@Kf_nGwxV=Jp3?7v}o#b>F$u0;!A!^1=a+(
zJqhk%k3Rq;<(dL6?#@;Nd~mD200boQNY^Q4!(h)H_DD`d!
zKETtr*L+3iZNO|QMUxfvcczX>q)x5$EeR$kIog_O&bPG*eq5m-;L*o-#PCIV#uB$ui_
zg9&%46pAZu{blRSgYk!tLBU`{NFxQf~>nwSL9Hh66zHr3_AusPU$_ejahZ
zxdiD?4?#)MT{J!P?L6k+4D(KTwW-o8uvRm&;E41wpaTb(k6ze*NKG>!!S}N;$0Ca5niP%&U!yx{EP
zSpMFIVZC+Y$QW9_(l%l7EoW~EBgP8Jtfm=*y=wFp?q?zz*wE6dK2s}A$4rQ~K05~;
zoXxyQNaGAm9WlT(C+|e4gt-d?=4y|Fgb!L}C2|2^i3TOWLMke@FH$Gtt=pb{Yr0mpUu7zs&It!z!dou#6vHJbZA
zx`_eGA40}fq%thNZci|p0NQ)Vicg1IM8=*hNY9xA8{Ro+&2KD}JW3NK#m7RJ2`ShPfOx(m*(ny>552aY;9tLM$@<
z)PSL7pL&$2FD-n
zRYB2x54gK`8`^piiIJ31S;gfIwY@PW|DzrJ@OsWlmlbqhT;jO8L*8a{pVB2|5Hy*e
zAQ$u5IWDW)`1ioq5V?Y3yDKBeT`j2kL4V5aSU|dF_GmU
zD|4!lW;g^CxkQ}9hauj2|A(2@5S#w=*yB|-LTe8}^TQY=IU2uCs4Y^(
z=Fwg86Ms7>(!yvPx0X@DhJX3FHNVXA2i2g^v72X7_DZC4A#As_sNaVc4o
zC#nHe?tI+d-4&V3u_R^WO4T~^j2inzX`_LvvIr|)NDeC2WMTN|C>5uPz*2Wf{I>jb#%t?ih
zD`vVa4u8_=3Xq%07P6iW8_8gUnGX7Xl1Ok{3CYImt&Eb|DEi(H?C}j^AerVHiKQq7
zCBZ0`?wOHgu>?YkR?^ViaLr@JIw9M(U{m^t|T*7LpoEl)=#nM3_5
z-|w!ttjpfj#d4l*6Tc2i2i_Lf7xihw?=e{uZBA41fHMWt^%a=e0l3=5sfkd7nF_?R
zAdOU^Tds2GY_Pp)sQB`vLt8%ka6?;&oAt$naUs8{863{jT+$;nkx_pYgovANZQv7r
znw0peaR0fv_w9I6c%^&%##~tN1Eyo|%j9#Xo0aWV>|4d~)7Ti%se=LBlh&?DR=9g4
zKfz!HP?WJih5zIhZ4B`o-4nz}jm{XNj(}v2o?tNJ+jr^XYyQoB68DIx=I)&xrRJzd
z-#gNoq>Py-jN0JKHQlpC~
z<$|clqsMHask@ymp!)eMOVp|=CWCHUuTSz+lo+xUzh<4fXDUyM2UXEbQaG6DLdc2G
zy{b~%pd2*Yc!N39F--ERlhZbCmIy4;NRl{i-`6smfer5Vgk|*s`aTg82IzsMl$E)!
zhH?6`Y(t={ngXIJmmWvDls2!=4#vhgm84;~(!9V9hc)o8rSqb+PZ}IY<|levcP-74
z{DwY=L~F?yxJyM?Z@beH}J2Jc~D%ErZ^!3O)Z4Z8A%Ky9II8GD%$OMld4{B5^frN2VY2_tw_EGr6ja
z^?0G(0c~%)lJHsbmkuyM4qYi!r&_oz-l7DV>u0=uZF{r+W(geI#u1ZYH
z63JPh;~O8msLR)2I3%o}ssWe9$?}8;)q@Eu#2qmcxjiM(wk2gu6~EQvZTI+fDY`Gg
zHg4H9X(x3trtg+5v3P<~^K#qL61P^7rOu~ns)fSmpotiN98TSRDH_zRG8lvyAW&ba
zoACjgTS>K$aMEprn9%4NI@;`DG=tN$KcDcs){#bc?{|Wko(mgH%P0U~pXi6CQYkc!
zV}kPx*lcx$DjUo*&i)j__qT0ZqZXiS2uWJMmh9H6!@WMsQjJqhP?TKl|3#_j?6c2NBoC*<6{8)5OU*Xy!B7A!|)zOHdeIpIg
zsI8ahCVHMyAdRPB~33|V>P`TSkP(SPL-a9$>z20VQipb#(^y>oh2t>&y)=(VsLVR
z8r67W+&~r~sWkX1am{s%8Qr+h4)ov-f7IafPLMXoj(qIr(a^;nwOhJeL~o#YfpIV<
z&TdoKyRrGBzH+fPqi`nIcI6$__8=Q9)Ws9HG~gV5b#5bv*~agc-CTxUOCHVf?gUGt
z@=DVz4m!H9j~|#0PLj^g8zhe?A1BD{|58r$NBg{^cz$ZYpGokf`KD5p0tTV&`00scGw&e2&l4vFz)jV
zaH8gn%9F4+HPcRVg5k6gKcCEqP}k}TEy_A2L_sG3EoVw9)!1fyt1j&xhcJ4|<$>|;
zoYxVjP_OlLUM^s*ahsj;x_IVPaO=LTTe*57>
zP;r8VrH@`v;OW70V4sw1f}0A$u(fPKZVhZ})7;6H>8>)vBM!XiH6R;|{v`<-)WamM
ztqljHJ^>w!n@{D&j^QWX)y9w&m`{UNT|^?!O{-+@m*WckT=h^*eH{8IW15?eYVt0t
zRgp_BHw5PPhgg$HMqMZ}%bxM^)t@k#lsgv?f4D3eJtiuJpCwOj>|rP^&@2Rdqt)9J
zLCTAKu@>RXP83cw24xLxc#6-Z>Ru`s(;H&dN@8=FQ$bh;9D#|e4Q?1PR%~WGz}bwx
zZiBUM!`PMtxdk)3DlvjXpKtm1wt&sDKK(BJR($C4)C)V6bUu6s+asU1i!iO^I~6*{
z=ZhPZM7Q$hH#X|&PfTovwYB*DmGyybFnSjP$%^f@BTwvrI5SzqU)bU;O{Opg_1N<3
zAWKMFTnECbsoJ)^?HZ`z)`R+>9J)4EmDn>eSra{ND6{ylaZO
z6`ELglIjd5QPjCAfll!Fb@1&QEnsXMFP+Va9)SC5tp+C#4Xx!WpNDr#gc}GWCN@$C
zMGSTXV==sYbMXI-?3;AAIxHp{3m1%(KMnM}+u|w)UB|qK{
zfLJoT?VVXIAAM|X(-Y+AYv*PnQJ`rPl^Y2bw#hX0*rsZt72~9$u_N)Na(St8dEQ!h
z82dV#J?SfEX7B>@rQTwJqZG#7Knn#Y0ZtYdfG)_^r+&M~k|;RKe84?kc{aC%38pAmteUf1{mVz5KLQKkfP^+n$X?abnhM=s^Cx1zr$Ncy
z9v3;|vu)yU0~#5>{wQkB9L68xu;Q@kx${o}+)GQ^2!5mI)89pW(F}!6u(L~0xDA@L
z{N{7`Ctbi-`rX%tPf}2XT%(XyIys))$%l4~UU>tm-Y
z4^p|(oqk4>6UOluz;amV%9dCB81FWb_|TKf@6L~dQFks@Kq?%&i5c4q%}a=45lxDj
zBr9evyTPFc8hvR0Dv6&esu%0R1Rh6yU01U
zz-6dJw595MtsyY^j10U5Ru#XyBvf$K>Y|O8W0bAj_Jz8=ej|l#(gH92?kV2A!{|=f
z9V-GIRk|P@1I=#)Kn%J{8wLXEAn3djX*4ars^IUE3@QHxpiC%iEJT7@qa3yyagvi1
zCEnz6x?|#LCm|b+GGT^Wscr{x+Z~29Cf=@Fzj1Mzv=6YvS2Ht1AW7`3{0(s}m!G
zQqQBC&PA$f68xmE-QS*QX90`mo6&B||eY
zkBtv%OUI=JNdxLEk>8mj5hufH+1`
zB8F0nY|IwG!&@8`);v4-s%PtE#nHt@Yw<1q9vC$j5>RA=z&5eN%Wmkd?C^_Kp^;)I
z3||IRrUx<&p*5!}h36WED?j%~gVI&Wl8`a3>(0yKPtNAK6vzt6eIo)TFTRqcu#ZOt
zrSW-wT>Ec3m#7&kH2OeR?c%h4$W^M6=>~kYYC^UKP?Ojitda4Q%
znA#o&sh`p!G@8p)baHuLA^6i=9Ces@?^{*@L<73CCtz%`FSe1W9w+M3#^8vsc$<1f
z`a5;;(1x9ao)BeQCacO4b$AQqEi0`_+8r=)Cp*WW7!oN~i4#|-ET=~kY`0oornY{I
zH^0-UN!h^pa;jpHr^3v_j7Of%`p(;5KHPi^zF~BF&?ecHdt?AHS
zKu_;`rVfpx7z@m5%X78hn$ftD62ip$+dFHDRfMuUc65k~6Hc*HdQNQWQUAGF(XDZ+k`Gm6=oN9+z{QqhIZ)oW6ZF9E
zjG*|6;SO*Al&Et29!>G!>hVFD+7iwmcgR9ki;|w&ge>($j&7mKd)uLq8zijv@0in>FnpMmX49rCaf
zq6pvjgx2GN)Oa!7Z-*$fP_3wVV4btttYpA|@xh-f*(M(7Q8^f_Q5n3o8ChWqA49!7
zuoEVb7Qe6sVp3O&p0a4tp!Y03GD+TyU!npw@9aXYqZ+?}V8O&Sl`Nzi`cr$kCRW8?u9gUdCFmv&
zHa!!z=-V{vu;GT3RY+*;1-V!-LJXnn5LWwZ-sN2w@v=~Ev{IeR0op`f{~pt-VSS&Td|M~
zt22y4o>}cE+mwqTz4{s2aLcHX|>
z%v#&qu-Yew#dL>$;hzI1EXrD6?`jrIa$lhA-L{aQ^f;G8Usxz(!2=mEg0YF2x+gmO
zlDj&GIRk82xWef*iR!dzXe7b)KZ80CB!iz1v-FoR*t-XQ+xmzgyS=W1h1F?a+^r3QH@&r%ZHgWIW>34t37{4_YADrdTrG0G&=*pblf
zwdMn$Ww)38aYqyFg3o3=D547?prI{F*;1+y5l{QafqYRx4S3fZ+~&;1Ze1U>q?Av!;_?0%bw-B;qP
zagDnAX+j)3SCC^t9k$@u(UWfXAct=6?GD{eoqP7^xr}?*LXmBnGXt+uj2Og~oUsmN
z@@aJL_8KXCSDkDls}iN_#v6m?JTycCrg$7u<>8y>8SLjR9l8+U_Vy*Jj&
zsLVLsdW5ckTzsvxP)>qgZOXiGA!1GtnJuCwc9S^F61=z*cEpRWM{Wn9@t*_#U)sL}
zi05o-qZVIPfrej#t&9_M!d-$M3sEGNDD%Oe}mK(M(ABRCNRy5`
zWkPF|DME+{HX{yj#V^NXuT~jpd)xd`VwZ4j3uSM}mFAqw5#K-KT*^;59hG=e0X@0R7-lh(y@DWAd;WlwK`0f%d3ax_Q$_Fz|Oji8Ep
z3M01_`*_AWna%g~CXpTu8v#%>0r2b7OURQ489Qf{NZ!5*FamxBr;uh}MCnJp%vAro*V^+5=ggGs^~X^zAb--}_LfC-0?3BFQ1>(Oj;C$m;1ko~rE5
zMq1+AWAs=wc{jJPw(lqFGYx{=7PNqhWfhM;v{Q8?qy)BKEKN3AYBf1hDs*-P)v8|Q
zBA;A*@qT#_kPXiR0I2fNs=hbcb#fASkzVn5S}8A--^USY9Sb5CnQQDh$<3E#`$rnc
zSN6l%jY;yMmoLP2YiP?rXtZvh(Us|H*54P+(HO{W0CaZD
zPaC1$B2SY}*(z*(6XmtH^f@L3;o~AICAV1iUEXC02R75v!lSniRk=!hdXsu=V6-3K
zJC?F<$rGqxVItEM`uE88L(03m3g`_2sjm3PWFAFW&L?^YxBOD@etM=VB4+5-;_C6U
z2O;HjeYWbW4CZ?~d=*}pNUu~T22VZ#XY1I?$r6oo-SFoJL|YkT(41bsu6VYFuK^O7
zPAOKystlTo^4Qc3C<2e59bnUN5E#+i;3<6Gi-eKcVa+n|dRDH?c*)T@sE4jR&Wp%P
zJKQUCuh@6FXWwuxQQHYb&>)XYZ|;|HSnUZvbl6Xx^kf_j7expP6R}q+5XYj@tGD1y
zz#`G07g1Q2phH0M@sX#`CBUsnXA&;?^NAkgV{Ok2|7ON6vN^plwGM;zpoyJt7pG~O
zCz;afuMUZFwy>-Ft!$H+=N80N2=cM{%ck&#w1x;PH(KP(s
zpu7(mAH<&&HT=HstO*Ci$S&Udm=tIe;1f1F&@K=)npf54^=L^E`fj3SYwY9k`b4iV
z-si#!O`-XWh-UR3U0ypV_+Uyh3eD{^e_U|!sljjn-Z<`4x=gaBa$Bm8h
zZeu6prTIyG4K5LW8Z0OORi^O!ID0PYFm
z^9b>FmXQ#YIFJU374i}aO)}L35%;%x^>?&DE7{f;{nj;3#3a&mOli)-%h-C+qrhC@
zJMc9;l=Tx2mS+OR<(N;`Q(m~?OSk@mwr3GC5s8}GoLN=`?n221apkCQz`<4i?~
zyJhe`9=yk#2_dcwCLKjp|F@Ju?
zFu&t9=%F$V+e!+3A3wX7de(^&r<-O|1MleIaeWi6YZ;(Htd|qSoV?Wa3Y9)4OFAL`
zJ#56!G8*~ou)!AlbOpBFCJ%pg^OZTl7hdFVgTkx!JummNASF9
zE1x~ebFlvwGE2|_CUgrz;_m<_1x1I!245?aa+nEO%e0Q1Ug-IyZ4p3+tp!_LrRqpp
z`nVBcTX&o%-K=HrQ56e4Ws#F5R|n5TCPO6f!-3Q)?8xdxz25y87Y?UPNE;VzpgZf!
zuQ0I_owP33$k&gZFGOPfHMco_238#Tf)rmIZ*AZ#T9WNxsVR7Hx~7q4$nEYZg)Iv{
z1U&=BaHf+XOmkQOMUj|rJu9N{5D8vIm&wBmq4|?1R#{XfZW**1BgEU)*900I4-UH1
z4s!Sf17xJY?9>~t3eJady)?7cYt6+^JMjiFJ@w{~BR84KuVQ^S(7W)D+qhBmG2-{U
zICyI@L<0^HUr56|k53%nN}T1p>TB%JGf3h`R5irOjA1R~yGSBJ(oppkwy0D&Dtnyc{7yk69wusrQ=c<^nBZlFV#cLqdEV2#a-q$0WE->CqL#~r!9@!wQ@#d1QfVr9m!&!RWyM*z*tK!=dsk^F<8jp|dw3(M+mwJd4A7
z2<+FV*Q*og$4?gv!vc!O^#}=S4x6M2zLY$oQMh55N5|S}lV-P_jnsm%MgE`FniNIs
z*rUw0Y`il^dz&NAS=_KFg3526mvI4{-$-`TIus0=&HHoK)FR$h#ofDUbc`?^~
z?AHUOc69QxS-_d-oF!`Ik1r=X`}Ye}@6M#pz@u&X0#Uu
zWd=($oqzHzWml&yR@$$ROk3z#&8GRCOe8_hnRR1-a2E=|auNe74^;jf>@A|TjJA1U
zKKU9x_xyT&&X+PO`@@6~pvQ+B6poMf4)f1+9b1i#%)#X^+s}L4x?UROQYD$GTX^@gx8Ymg%ee##rWKwHNY4rP+!2ImB~;gf1{J9H
zXwRuq`UeFoaGM^d{fp@O3G;lA^KkpiV;&>%Lv=DC5X$Qau#6K;miKD_5no@WoGMTjyVnFms`0tHHo7x^ygVO
z`1$rkN73WA9a(%=RxsS<4hDAU&-SW5svo>9wC`@gJauJ#pr94TEGiuB@oyLOwYu{+
zC)n4cTDO(hrcJI#-$Zl3htHg)7oYxAp@W^$p}4DYP(ghG*Y}R|KbTLzc3GLC{iHR2
zzNAs^=a$_L>+ZX=w|3cLG5CyxTsr;a-r5_M{Q2i-Pv6@Z94ypIX{r5w6i;N{8QO75
zr-pDEDzTC6;;8$b52c&|C#BVKCX&OOKbH)h@Sx^wt(0Qd9c
zyeYG%JSz21pP2Mfb;6_B9(lEYoQy+s)I749e%-RutiHPP_vda0&k3B04=*Gif7Y^j
zxxH_KW~)fpTyEvy>KkVmzIizw*nV5@iThuc$jkOeHu1%*d%$(S!m=+_?wHlRLvNl0
zPhWpRetpNumaOv7?(Zj^78OXj8t=FG_q>9?Z}Y91RMRsB+a}KZ?tk^f>W-BUvue9P
zx+||ReZ2i_=M6{EO!gB+yqk7hzUr;4o2!`j(KPRQ^zReBF?K1sCtA2`&Ne1aU$RYN
z6@NHK$>!4+_LVXm%f7X=uKC*&uBNR9F~IR7lXIr0_o)g-eP1*`w%OsG*QU3>HrH3E
z`QN=0mMLfcGr;80(ZmCbttU!eeKAj_rBc?U$xP|i8zn2V;x%$j9C7Uj58BL|^YN75
z{fUS8ymuc~SaZ%y_H?$6LmzPC>;w~z?+2W2Gd^GQ#(CP0*oeEm`IUShCT^H(pmjC!
zg;s1oY;
zEtzuBu_MZs?XBmLWkTB~J^UbMSpJ4#Mg5uN(@WjYISW~qtUH;qNImn4W5?sH@@rdn
z9=I_*y)9aG^E1|t_iinWH)7A4EAn+}>s$5i{BmjHk~>AWx9z$)P2XFsErl!QuHX4f
zVG>uiD}3H>dh_DjnBV)_#gldh?|5Tu`}mfA{=ta3kxWl+?VES&)~D^wbGKiAxAuo!
zqp6tH%p3D(@p~jCx-W8X-p2jvqYAIywA7&d2-_=lN$lG#BP^}wb?1Ms`g5*2fscQc
zON_>xIPSRlzfV65?b>yseM+1~zJ|EzqUP3cCbVXsf5{w&ldDCz@4EtzJpdlG@xlZ&YuFZ`4LZ|9X+g@OzYf6D
zIzBZuO!ACNxZ(v;bJFEE=pc|MtibuhJqK1y1s&Tlsq-61_X*IPV`XEYb|6r9tm=iyC
    
zXt>7A40)gn8utL_f+vYfY!w0;4m?D`4s_;6C2)pOMc*Jx6?7g+%A(p)2U0r(AN*(D
X{nT9-*dJL4I-tta)z4*}Q$iB}z?3lk


From e5fb9af0eaffde683fa0af3987085f86cf0d2640 Mon Sep 17 00:00:00 2001
From: Tom Christie 
Date: Thu, 26 May 2022 11:19:09 +0100
Subject: [PATCH 233/303] Add FEZTO as a premium sponsor

---
 docs/index.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/docs/index.md b/docs/index.md
index e58f24df8..a96f06a30 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -68,16 +68,15 @@ continued development by **[signing up for a paid plan][funding]**.
 
    
 
    
 
-*Many thanks to all our [wonderful sponsors][sponsors], and in particular to our premium backers, [Sentry](https://getsentry.com/welcome/), [Stream](https://getstream.io/?utm_source=DjangoRESTFramework&utm_medium=Webpage_Logo_Ad&utm_content=Developer&utm_campaign=DjangoRESTFramework_Jan2022_HomePage), [ESG](https://software.esg-usa.com/), [Rollbar](https://rollbar.com/?utm_source=django&utm_medium=sponsorship&utm_campaign=freetrial), [Cadre](https://cadre.com), [Kloudless](https://hubs.ly/H0f30Lf0), [Lights On Software](https://lightsonsoftware.com), [Retool](https://retool.com/?utm_source=djangorest&utm_medium=sponsorship), [bit.io](https://bit.io/jobs?utm_source=DRF&utm_medium=sponsor&utm_campaign=DRF_sponsorship), [PostHog](https://posthog.com?utm_source=DRF&utm_medium=sponsor&utm_campaign=DRF_sponsorship), and [CryptAPI](https://cryptapi.io).*
+*Many thanks to all our [wonderful sponsors][sponsors], and in particular to our premium backers, [Sentry](https://getsentry.com/welcome/), [Stream](https://getstream.io/?utm_source=DjangoRESTFramework&utm_medium=Webpage_Logo_Ad&utm_content=Developer&utm_campaign=DjangoRESTFramework_Jan2022_HomePage), [Cadre](https://cadre.com), [Kloudless](https://hubs.ly/H0f30Lf0), [Lights On Software](https://lightsonsoftware.com), [Retool](https://retool.com/?utm_source=djangorest&utm_medium=sponsorship), [bit.io](https://bit.io/jobs?utm_source=DRF&utm_medium=sponsor&utm_campaign=DRF_sponsorship), [PostHog](https://posthog.com?utm_source=DRF&utm_medium=sponsor&utm_campaign=DRF_sponsorship), [CryptAPI](https://cryptapi.io), and [FEZTO](https://www.fezto.xyz/?utm_source=DjangoRESTFramework).*
 
 ---
 

From ce21454a431e0feb057ff9069a8295e2b071d79e Mon Sep 17 00:00:00 2001
From: Tom Christie 
Date: Mon, 6 Jun 2022 11:00:01 +0100
Subject: [PATCH 234/303] Update homepage sponsors

---
 docs/index.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/index.md b/docs/index.md
index a96f06a30..aa502a621 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -68,6 +68,7 @@ continued development by **[signing up for a paid plan][funding]**.
 
 
    
 
-*Many thanks to all our [wonderful sponsors][sponsors], and in particular to our premium backers, [Sentry](https://getsentry.com/welcome/), [Stream](https://getstream.io/?utm_source=DjangoRESTFramework&utm_medium=Webpage_Logo_Ad&utm_content=Developer&utm_campaign=DjangoRESTFramework_Jan2022_HomePage), [Cadre](https://cadre.com), [Kloudless](https://hubs.ly/H0f30Lf0), [Lights On Software](https://lightsonsoftware.com), [Retool](https://retool.com/?utm_source=djangorest&utm_medium=sponsorship), [bit.io](https://bit.io/jobs?utm_source=DRF&utm_medium=sponsor&utm_campaign=DRF_sponsorship), [PostHog](https://posthog.com?utm_source=DRF&utm_medium=sponsor&utm_campaign=DRF_sponsorship), [CryptAPI](https://cryptapi.io), and [FEZTO](https://www.fezto.xyz/?utm_source=DjangoRESTFramework).*
+*Many thanks to all our [wonderful sponsors][sponsors], and in particular to our premium backers, [Sentry](https://getsentry.com/welcome/), [Stream](https://getstream.io/?utm_source=DjangoRESTFramework&utm_medium=Webpage_Logo_Ad&utm_content=Developer&utm_campaign=DjangoRESTFramework_Jan2022_HomePage), [Spacinov](https://www.spacinov.com/), [Retool](https://retool.com/?utm_source=djangorest&utm_medium=sponsorship), [bit.io](https://bit.io/jobs?utm_source=DRF&utm_medium=sponsor&utm_campaign=DRF_sponsorship), [PostHog](https://posthog.com?utm_source=DRF&utm_medium=sponsor&utm_campaign=DRF_sponsorship), [CryptAPI](https://cryptapi.io), and [FEZTO](https://www.fezto.xyz/?utm_source=DjangoRESTFramework).*
 
 ---
 

From 7069083b0f3c67f030dad1b9f5c6c079f30a84d2 Mon Sep 17 00:00:00 2001
From: Tom Christie 
Date: Mon, 6 Jun 2022 11:07:25 +0100
Subject: [PATCH 235/303] Promote Spacinov to premium sponsorship

---
 README.md                            |   5 ++++-
 docs/img/premium/spacinov-readme.png | Bin 0 -> 56997 bytes
 2 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 docs/img/premium/spacinov-readme.png

diff --git a/README.md b/README.md
index 9476e92d2..3fbd2f83a 100644
--- a/README.md
+++ b/README.md
@@ -21,13 +21,14 @@ The initial aim is to provide a single full-time position on REST framework.
 
 [![][sentry-img]][sentry-url]
 [![][stream-img]][stream-url]
+[![][spacinov-img]][spacinov-url]
 [![][retool-img]][retool-url]
 [![][bitio-img]][bitio-url]
 [![][posthog-img]][posthog-url]
 [![][cryptapi-img]][cryptapi-url]
 [![][fezto-img]][fezto-url]
 
-Many thanks to all our [wonderful sponsors][sponsors], and in particular to our premium backers, [Sentry][sentry-url], [Stream][stream-url], [Retool][retool-url], [bit.io][bitio-url], [PostHog][posthog-url], [CryptAPI][cryptapi-url], and [FEZTO][fezto-url].
+Many thanks to all our [wonderful sponsors][sponsors], and in particular to our premium backers, [Sentry][sentry-url], [Stream][stream-url], [Spacinov][spacinov-url], [Retool][retool-url], [bit.io][bitio-url], [PostHog][posthog-url], [CryptAPI][cryptapi-url], and [FEZTO][fezto-url].
 
 ---
 
@@ -193,6 +194,7 @@ Please see the [security policy][security-policy].
 
 [sentry-img]: https://raw.githubusercontent.com/encode/django-rest-framework/master/docs/img/premium/sentry-readme.png
 [stream-img]: https://raw.githubusercontent.com/encode/django-rest-framework/master/docs/img/premium/stream-readme.png
+[spacinov-img]: https://raw.githubusercontent.com/encode/django-rest-framework/master/docs/img/premium/spacinov-readme.png
 [retool-img]: https://raw.githubusercontent.com/encode/django-rest-framework/master/docs/img/premium/retool-readme.png
 [bitio-img]: https://raw.githubusercontent.com/encode/django-rest-framework/master/docs/img/premium/bitio-readme.png
 [posthog-img]: https://raw.githubusercontent.com/encode/django-rest-framework/master/docs/img/premium/posthog-readme.png
@@ -201,6 +203,7 @@ Please see the [security policy][security-policy].
 
 [sentry-url]: https://getsentry.com/welcome/
 [stream-url]: https://getstream.io/?utm_source=DjangoRESTFramework&utm_medium=Webpage_Logo_Ad&utm_content=Developer&utm_campaign=DjangoRESTFramework_Jan2022_HomePage
+[spacinov-url]: https://www.spacinov.com/
 [retool-url]: https://retool.com/?utm_source=djangorest&utm_medium=sponsorship
 [bitio-url]: https://bit.io/jobs?utm_source=DRF&utm_medium=sponsor&utm_campaign=DRF_sponsorship
 [posthog-url]: https://posthog.com?utm_source=drf&utm_medium=sponsorship&utm_campaign=open-source-sponsorship
diff --git a/docs/img/premium/spacinov-readme.png b/docs/img/premium/spacinov-readme.png
new file mode 100644
index 0000000000000000000000000000000000000000..20e925211aecab7d5be832d9c4cd96478fb2e909
GIT binary patch
literal 56997
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
z
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

literal 0
HcmV?d00001


From 333f1ffb943370816f2e0b0137f0e7cb786a1d51 Mon Sep 17 00:00:00 2001
From: Mariusz Felisiak 
Date: Mon, 6 Jun 2022 13:39:06 +0200
Subject: [PATCH 236/303] Confirmed support for Django 4.1. (#8498)

---
 README.md                      |  2 +-
 docs/index.md                  |  2 +-
 rest_framework/fields.py       |  3 +--
 setup.py                       |  1 +
 tests/test_encoders.py         |  5 +++--
 tests/test_fields.py           |  4 +++-
 tests/test_model_serializer.py | 10 +++++++---
 tox.ini                        |  6 ++++--
 8 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 3fbd2f83a..e6e43047e 100644
--- a/README.md
+++ b/README.md
@@ -55,7 +55,7 @@ There is a live example API for testing purposes, [available here][sandbox].
 # Requirements
 
 * Python (3.6, 3.7, 3.8, 3.9, 3.10)
-* Django (2.2, 3.0, 3.1, 3.2, 4.0)
+* Django (2.2, 3.0, 3.1, 3.2, 4.0, 4.1)
 
 We **highly recommend** and only officially support the latest patch release of
 each Python and Django series.
diff --git a/docs/index.md b/docs/index.md
index aa502a621..2f44fae9a 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -86,7 +86,7 @@ continued development by **[signing up for a paid plan][funding]**.
 REST framework requires the following:
 
 * Python (3.6, 3.7, 3.8, 3.9, 3.10)
-* Django (2.2, 3.0, 3.1, 3.2, 4.0)
+* Django (2.2, 3.0, 3.1, 3.2, 4.0, 4.1)
 
 We **highly recommend** and only officially support the latest patch release of
 each Python and Django series.
diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index d7e7816ce..8d02b3206 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -27,7 +27,6 @@ from django.utils.duration import duration_string
 from django.utils.encoding import is_protected_type, smart_str
 from django.utils.formats import localize_input, sanitize_separators
 from django.utils.ipv6 import clean_ipv6_address
-from django.utils.timezone import utc
 from django.utils.translation import gettext_lazy as _
 from pytz.exceptions import InvalidTimeError
 
@@ -1190,7 +1189,7 @@ class DateTimeField(Field):
             except InvalidTimeError:
                 self.fail('make_aware', timezone=field_timezone)
         elif (field_timezone is None) and timezone.is_aware(value):
-            return timezone.make_naive(value, utc)
+            return timezone.make_naive(value, datetime.timezone.utc)
         return value
 
     def default_timezone(self):
diff --git a/setup.py b/setup.py
index 3c3761c86..cb6708c6e 100755
--- a/setup.py
+++ b/setup.py
@@ -94,6 +94,7 @@ setup(
         'Framework :: Django :: 3.1',
         'Framework :: Django :: 3.2',
         'Framework :: Django :: 4.0',
+        'Framework :: Django :: 4.1',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: BSD License',
         'Operating System :: OS Independent',
diff --git a/tests/test_encoders.py b/tests/test_encoders.py
index c104dd5a5..953e5564b 100644
--- a/tests/test_encoders.py
+++ b/tests/test_encoders.py
@@ -1,15 +1,16 @@
-from datetime import date, datetime, timedelta
+from datetime import date, datetime, timedelta, timezone
 from decimal import Decimal
 from uuid import uuid4
 
 import pytest
 from django.test import TestCase
-from django.utils.timezone import utc
 
 from rest_framework.compat import coreapi
 from rest_framework.utils.encoders import JSONEncoder
 from rest_framework.utils.serializer_helpers import ReturnList
 
+utc = timezone.utc
+
 
 class MockList:
     def tolist(self):
diff --git a/tests/test_fields.py b/tests/test_fields.py
index 7a5304a82..ec121c822 100644
--- a/tests/test_fields.py
+++ b/tests/test_fields.py
@@ -9,7 +9,7 @@ import pytz
 from django.core.exceptions import ValidationError as DjangoValidationError
 from django.http import QueryDict
 from django.test import TestCase, override_settings
-from django.utils.timezone import activate, deactivate, override, utc
+from django.utils.timezone import activate, deactivate, override
 
 import rest_framework
 from rest_framework import exceptions, serializers
@@ -17,6 +17,8 @@ from rest_framework.fields import (
     BuiltinSignatureError, DjangoImageField, is_simple_callable
 )
 
+utc = datetime.timezone.utc
+
 # Tests for helper functions.
 # ---------------------------
 
diff --git a/tests/test_model_serializer.py b/tests/test_model_serializer.py
index 7da1b41ae..abb4830d1 100644
--- a/tests/test_model_serializer.py
+++ b/tests/test_model_serializer.py
@@ -12,6 +12,7 @@ import sys
 import tempfile
 from collections import OrderedDict
 
+import django
 import pytest
 from django.core.exceptions import ImproperlyConfigured
 from django.core.serializers.json import DjangoJSONEncoder
@@ -452,11 +453,14 @@ class TestPosgresFieldsMapping(TestCase):
                 model = ArrayFieldModel
                 fields = ['array_field', 'array_field_with_blank']
 
+        validators = ""
+        if django.VERSION < (4, 1):
+            validators = ", validators=[]"
         expected = dedent("""
             TestSerializer():
-                array_field = ListField(allow_empty=False, child=CharField(label='Array field', validators=[]))
-                array_field_with_blank = ListField(child=CharField(label='Array field with blank', validators=[]), required=False)
-        """)
+                array_field = ListField(allow_empty=False, child=CharField(label='Array field'%s))
+                array_field_with_blank = ListField(child=CharField(label='Array field with blank'%s), required=False)
+        """ % (validators, validators))
         self.assertEqual(repr(TestSerializer()), expected)
 
     @pytest.mark.skipif(hasattr(models, 'JSONField'), reason='has models.JSONField')
diff --git a/tox.ini b/tox.ini
index a41176d72..c275a0abe 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,7 +3,7 @@ envlist =
        {py36,py37,py38,py39}-django22,
        {py36,py37,py38,py39}-django31,
        {py36,py37,py38,py39,py310}-django32,
-       {py38,py39,py310}-{django40,djangomain},
+       {py38,py39,py310}-{django40,django41,djangomain},
        base,dist,docs,
 
 [travis:env]
@@ -12,6 +12,7 @@ DJANGO =
     3.1: django31
     3.2: django32
     4.0: django40
+    4.1: django41
     main: djangomain
 
 [testenv]
@@ -24,7 +25,8 @@ deps =
         django22: Django>=2.2,<3.0
         django31: Django>=3.1,<3.2
         django32: Django>=3.2,<4.0
-        django40: Django>=4.0,<5.0
+        django40: Django>=4.0,<4.1
+        django41: Django>=4.1a1,<4.2
         djangomain: https://github.com/django/django/archive/main.tar.gz
         -rrequirements/requirements-testing.txt
         -rrequirements/requirements-optionals.txt

From 5471f8a1d9f54e298b3826a4d910d56ad3c6206c Mon Sep 17 00:00:00 2001
From: Leonardo Gregianin 
Date: Mon, 6 Jun 2022 07:39:36 -0400
Subject: [PATCH 237/303] Added django-requestlogs in third party packages
 (#8497)

---
 docs/community/third-party-packages.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/community/third-party-packages.md b/docs/community/third-party-packages.md
index e25421f50..d4e590952 100644
--- a/docs/community/third-party-packages.md
+++ b/docs/community/third-party-packages.md
@@ -148,6 +148,7 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque
 * [django-elasticsearch-dsl-drf][django-elasticsearch-dsl-drf] - Integrate Elasticsearch DSL with Django REST framework. Package provides views, serializers, filter backends, pagination and other handy add-ons.
 * [django-api-client][django-api-client] - DRF client that groups the Endpoint response, for use in CBVs and FBV as if you were working with Django's Native Models..
 * [fast-drf] - A model based library for making API development faster and easier.
+* [django-requestlogs] - Providing middleware and other helpers for audit logging for REST framework.
 
 [cite]: http://www.software-ecosystems.com/Software_Ecosystems/Ecosystems.html
 [cookiecutter]: https://github.com/jpadilla/cookiecutter-django-rest-framework
@@ -237,3 +238,4 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque
 [graphwrap]: https://github.com/PaulGilmartin/graph_wrap
 [rest-framework-actions]: https://github.com/AlexisMunera98/rest-framework-actions
 [fast-drf]: https://github.com/iashraful/fast-drf
+[django-requestlogs]: https://github.com/Raekkeri/django-requestlogs

From 292ead1fe0f779254590a47a352d545d57132266 Mon Sep 17 00:00:00 2001
From: ghazi-git 
Date: Mon, 6 Jun 2022 12:46:11 +0100
Subject: [PATCH 238/303] add drf-standardized-errors to third party packages
 (#8487)

Co-authored-by: Tom Christie 
---
 docs/api-guide/exceptions.md           | 9 +++++++++
 docs/community/third-party-packages.md | 2 ++
 2 files changed, 11 insertions(+)

diff --git a/docs/api-guide/exceptions.md b/docs/api-guide/exceptions.md
index e62a7e4f9..347541d56 100644
--- a/docs/api-guide/exceptions.md
+++ b/docs/api-guide/exceptions.md
@@ -260,6 +260,15 @@ Set as `handler400`:
 
     handler400 = 'rest_framework.exceptions.bad_request'
 
+# Third party packages
+
+The following third-party packages are also available.
+
+## DRF Standardized Errors
+
+The [drf-standardized-errors][drf-standardized-errors] package provides an exception handler that generates the same format for all 4xx and 5xx responses. It is a drop-in replacement for the default exception handler and allows customizing the error response format without rewriting the whole exception handler. The standardized error response format is easier to document and easier to handle by API consumers.
+
 [cite]: https://doughellmann.com/blog/2009/06/19/python-exception-handling-techniques/
 [authentication]: authentication.md
 [django-custom-error-views]: https://docs.djangoproject.com/en/dev/topics/http/views/#customizing-error-views
+[drf-standardized-errors]: https://github.com/ghazi-git/drf-standardized-errors
diff --git a/docs/community/third-party-packages.md b/docs/community/third-party-packages.md
index d4e590952..9513b13d1 100644
--- a/docs/community/third-party-packages.md
+++ b/docs/community/third-party-packages.md
@@ -149,6 +149,7 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque
 * [django-api-client][django-api-client] - DRF client that groups the Endpoint response, for use in CBVs and FBV as if you were working with Django's Native Models..
 * [fast-drf] - A model based library for making API development faster and easier.
 * [django-requestlogs] - Providing middleware and other helpers for audit logging for REST framework.
+* [drf-standardized-errors][drf-standardized-errors] - DRF exception handler to standardize error responses for all API endpoints.
 
 [cite]: http://www.software-ecosystems.com/Software_Ecosystems/Ecosystems.html
 [cookiecutter]: https://github.com/jpadilla/cookiecutter-django-rest-framework
@@ -239,3 +240,4 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque
 [rest-framework-actions]: https://github.com/AlexisMunera98/rest-framework-actions
 [fast-drf]: https://github.com/iashraful/fast-drf
 [django-requestlogs]: https://github.com/Raekkeri/django-requestlogs
+[drf-standardized-errors]: https://github.com/ghazi-git/drf-standardized-errors

From 281fc074ba255ed9c5724cc971fa86c78d4dca38 Mon Sep 17 00:00:00 2001
From: Krukov D 
Date: Mon, 6 Jun 2022 14:54:57 +0300
Subject: [PATCH 239/303] improve performance for noncallble attributes (#8502)

Co-authored-by: Dima Kryukov 
---
 rest_framework/fields.py | 3 +++
 tests/test_fields.py     | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index 8d02b3206..31e5b994c 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -62,6 +62,9 @@ def is_simple_callable(obj):
     """
     True if the object is a callable that takes no arguments.
     """
+    if not callable(obj):
+        return False
+
     # Bail early since we cannot inspect built-in function signatures.
     if inspect.isbuiltin(obj):
         raise BuiltinSignatureError(
diff --git a/tests/test_fields.py b/tests/test_fields.py
index ec121c822..19f734513 100644
--- a/tests/test_fields.py
+++ b/tests/test_fields.py
@@ -75,6 +75,10 @@ class TestIsSimpleCallable:
         assert is_simple_callable(valid_vargs_kwargs)
         assert not is_simple_callable(invalid)
 
+    @pytest.mark.parametrize('obj', (True, None, "str", b'bytes', 123, 1.23))
+    def test_not_callable(self, obj):
+        assert not is_simple_callable(obj)
+
     def test_4602_regression(self):
         from django.db import models
 

From bb7dcef19bceae1dd43c19d5a9d9dddc75868c83 Mon Sep 17 00:00:00 2001
From: Daniel Gilge <33256939+dgilge@users.noreply.github.com>
Date: Mon, 6 Jun 2022 14:31:00 +0200
Subject: [PATCH 240/303] Update get_schema in docs (#7402)

---
 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 b9de6745f..5bdf5ee54 100644
--- a/docs/api-guide/schemas.md
+++ b/docs/api-guide/schemas.md
@@ -165,7 +165,7 @@ In order to customize the top-level schema, subclass
 as an argument to the `generateschema` command or `get_schema_view()` helper
 function.
 
-### get_schema(self, request)
+### get_schema(self, request=None, public=False)
 
 Returns a dictionary that represents the OpenAPI schema:
 

From 563a20a04098937db1e2c353b2ee6a3059e92ebf Mon Sep 17 00:00:00 2001
From: Alan Crosswell 
Date: Mon, 6 Jun 2022 08:44:02 -0400
Subject: [PATCH 241/303] make get_reference public (#7515)

---
 docs/api-guide/schemas.md         |  5 +++++
 rest_framework/schemas/openapi.py | 14 +++++++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/docs/api-guide/schemas.md b/docs/api-guide/schemas.md
index 5bdf5ee54..004e2d3ce 100644
--- a/docs/api-guide/schemas.md
+++ b/docs/api-guide/schemas.md
@@ -313,6 +313,11 @@ Computes the component's name from the serializer.
 
 You may see warnings if your API has duplicate component names. If so you can override `get_component_name()` or pass the `component_name` `__init__()` kwarg (see below) to provide different names.
 
+#### `get_reference()`
+
+Returns a reference to the serializer component. This may be useful if you override `get_schema()`.
+
+
 #### `map_serializer()`
 
 Maps serializers to their OpenAPI representations.
diff --git a/rest_framework/schemas/openapi.py b/rest_framework/schemas/openapi.py
index 5e9d59f8b..122846376 100644
--- a/rest_framework/schemas/openapi.py
+++ b/rest_framework/schemas/openapi.py
@@ -636,7 +636,7 @@ class AutoSchema(ViewInspector):
         """
         return self.get_serializer(path, method)
 
-    def _get_reference(self, serializer):
+    def get_reference(self, serializer):
         return {'$ref': '#/components/schemas/{}'.format(self.get_component_name(serializer))}
 
     def get_request_body(self, path, method):
@@ -650,7 +650,7 @@ class AutoSchema(ViewInspector):
         if not isinstance(serializer, serializers.Serializer):
             item_schema = {}
         else:
-            item_schema = self._get_reference(serializer)
+            item_schema = self.get_reference(serializer)
 
         return {
             'content': {
@@ -674,7 +674,7 @@ class AutoSchema(ViewInspector):
         if not isinstance(serializer, serializers.Serializer):
             item_schema = {}
         else:
-            item_schema = self._get_reference(serializer)
+            item_schema = self.get_reference(serializer)
 
         if is_list_view(path, method, self.view):
             response_schema = {
@@ -808,3 +808,11 @@ class AutoSchema(ViewInspector):
             RemovedInDRF314Warning, stacklevel=2
         )
         return self.allows_filters(path, method)
+
+    def _get_reference(self, serializer):
+        warnings.warn(
+            "Method `_get_reference()` has been renamed to `get_reference()`. "
+            "The old name will be removed in DRF v3.14.",
+            RemovedInDRF314Warning, stacklevel=2
+        )
+        return self.get_reference(serializer)

From 1396f6886a39acb7fe52729c7b99fe2d7d245dac Mon Sep 17 00:00:00 2001
From: Grigory 
Date: Mon, 6 Jun 2022 15:53:42 +0300
Subject: [PATCH 242/303] Respect model error_messages for relation (#7599)

---
 rest_framework/utils/field_mapping.py | 22 ++++++++++++++--------
 tests/test_validators.py              | 13 +++++++++++++
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/rest_framework/utils/field_mapping.py b/rest_framework/utils/field_mapping.py
index 4f8a4f192..673821b5e 100644
--- a/rest_framework/utils/field_mapping.py
+++ b/rest_framework/utils/field_mapping.py
@@ -217,15 +217,9 @@ def get_field_kwargs(field_name, model_field):
         ]
 
     if getattr(model_field, 'unique', False):
-        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.verbose_name,
-                'field_label': model_field.verbose_name
-            }
         validator = UniqueValidator(
             queryset=model_field.model._default_manager,
-            message=unique_error_message)
+            message=get_unique_error_message(model_field))
         validator_kwarg.append(validator)
 
     if validator_kwarg:
@@ -281,7 +275,9 @@ def get_relation_kwargs(field_name, relation_info):
         if model_field.validators:
             kwargs['validators'] = model_field.validators
         if getattr(model_field, 'unique', False):
-            validator = UniqueValidator(queryset=model_field.model._default_manager)
+            validator = UniqueValidator(
+                queryset=model_field.model._default_manager,
+                message=get_unique_error_message(model_field))
             kwargs['validators'] = kwargs.get('validators', []) + [validator]
         if to_many and not model_field.blank:
             kwargs['allow_empty'] = False
@@ -300,3 +296,13 @@ def get_url_kwargs(model_field):
     return {
         'view_name': get_detail_view_name(model_field)
     }
+
+
+def get_unique_error_message(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.verbose_name,
+            'field_label': model_field.verbose_name
+        }
+    return unique_error_message
diff --git a/tests/test_validators.py b/tests/test_validators.py
index bccbe1514..39490ac86 100644
--- a/tests/test_validators.py
+++ b/tests/test_validators.py
@@ -42,6 +42,12 @@ class RelatedModelSerializer(serializers.ModelSerializer):
         fields = ('username', 'email')
 
 
+class RelatedModelUserSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = RelatedModel
+        fields = ('user',)
+
+
 class AnotherUniquenessModel(models.Model):
     code = models.IntegerField(unique=True)
 
@@ -83,6 +89,13 @@ class TestUniquenessValidation(TestCase):
         assert not serializer.is_valid()
         assert serializer.errors == {'username': ['uniqueness model with this username already exists.']}
 
+    def test_relation_is_not_unique(self):
+        RelatedModel.objects.create(user=self.instance)
+        data = {'user': self.instance.pk}
+        serializer = RelatedModelUserSerializer(data=data)
+        assert not serializer.is_valid()
+        assert serializer.errors == {'user': ['related model with this user already exists.']}
+
     def test_is_unique(self):
         data = {'username': 'other'}
         serializer = UniquenessSerializer(data=data)

From f8a03b096be27b4caac25dc119ccda81ad678d4f Mon Sep 17 00:00:00 2001
From: Patrick Daley 
Date: Tue, 7 Jun 2022 23:35:01 +1200
Subject: [PATCH 243/303] Remove pluralisation from basenames (#8517)

HyperlinkIdentityFields in serializers reference 'snippet-highlight' and 'snippet-detail', router basenames updated to match.
---
 docs/tutorial/6-viewsets-and-routers.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/tutorial/6-viewsets-and-routers.md b/docs/tutorial/6-viewsets-and-routers.md
index 18066f056..e12becbd0 100644
--- a/docs/tutorial/6-viewsets-and-routers.md
+++ b/docs/tutorial/6-viewsets-and-routers.md
@@ -112,8 +112,8 @@ Here's our re-wired `snippets/urls.py` file.
 
     # Create a router and register our viewsets with it.
     router = DefaultRouter()
-    router.register(r'snippets', views.SnippetViewSet,basename="snippets")
-    router.register(r'users', views.UserViewSet,basename="users")
+    router.register(r'snippets', views.SnippetViewSet,basename="snippet")
+    router.register(r'users', views.UserViewSet,basename="user")
 
     # The API URLs are now determined automatically by the router.
     urlpatterns = [

From e7af8d662bf837e4fee844b28606cda63c0d30a9 Mon Sep 17 00:00:00 2001
From: itsdkey 
Date: Wed, 8 Jun 2022 14:41:26 +0200
Subject: [PATCH 244/303] tests for #5127 (#7715)

* tests for #5127

* Resolves #5127
---
 tests/browsable_api/no_auth_urls.py       |  3 ++-
 tests/browsable_api/serializers.py        |  8 +++++++
 tests/browsable_api/test_browsable_api.py | 27 +++++++++++++++++++++++
 tests/browsable_api/views.py              | 22 ++++++++++++++++++
 tests/models.py                           |  5 +++++
 5 files changed, 64 insertions(+), 1 deletion(-)
 create mode 100644 tests/browsable_api/serializers.py

diff --git a/tests/browsable_api/no_auth_urls.py b/tests/browsable_api/no_auth_urls.py
index 65701c065..33491ad92 100644
--- a/tests/browsable_api/no_auth_urls.py
+++ b/tests/browsable_api/no_auth_urls.py
@@ -1,7 +1,8 @@
 from django.urls import path
 
-from .views import MockView
+from .views import BasicModelWithUsersViewSet, MockView
 
 urlpatterns = [
     path('', MockView.as_view()),
+    path('basicviewset', BasicModelWithUsersViewSet.as_view({'get': 'list'})),
 ]
diff --git a/tests/browsable_api/serializers.py b/tests/browsable_api/serializers.py
new file mode 100644
index 000000000..e8a1cdef8
--- /dev/null
+++ b/tests/browsable_api/serializers.py
@@ -0,0 +1,8 @@
+from rest_framework.serializers import ModelSerializer
+from tests.models import BasicModelWithUsers
+
+
+class BasicSerializer(ModelSerializer):
+    class Meta:
+        model = BasicModelWithUsers
+        fields = '__all__'
diff --git a/tests/browsable_api/test_browsable_api.py b/tests/browsable_api/test_browsable_api.py
index 17644c2ac..a76d11fe3 100644
--- a/tests/browsable_api/test_browsable_api.py
+++ b/tests/browsable_api/test_browsable_api.py
@@ -1,8 +1,35 @@
 from django.contrib.auth.models import User
 from django.test import TestCase, override_settings
 
+from rest_framework.permissions import IsAuthenticated
 from rest_framework.test import APIClient
 
+from .views import BasicModelWithUsersViewSet, OrganizationPermissions
+
+
+@override_settings(ROOT_URLCONF='tests.browsable_api.no_auth_urls')
+class AnonymousUserTests(TestCase):
+    """Tests correct handling of anonymous user request on endpoints with IsAuthenticated permission class."""
+
+    def setUp(self):
+        self.client = APIClient(enforce_csrf_checks=True)
+
+    def tearDown(self):
+        self.client.logout()
+
+    def test_get_raises_typeerror_when_anonymous_user_in_queryset_filter(self):
+        with self.assertRaises(TypeError):
+            self.client.get('/basicviewset')
+
+    def test_get_returns_http_forbidden_when_anonymous_user(self):
+        old_permissions = BasicModelWithUsersViewSet.permission_classes
+        BasicModelWithUsersViewSet.permission_classes = [IsAuthenticated, OrganizationPermissions]
+
+        response = self.client.get('/basicviewset')
+
+        BasicModelWithUsersViewSet.permission_classes = old_permissions
+        self.assertEqual(response.status_code, 403)
+
 
 @override_settings(ROOT_URLCONF='tests.browsable_api.auth_urls')
 class DropdownWithAuthTests(TestCase):
diff --git a/tests/browsable_api/views.py b/tests/browsable_api/views.py
index e1cf13a1e..e73967bf8 100644
--- a/tests/browsable_api/views.py
+++ b/tests/browsable_api/views.py
@@ -1,6 +1,16 @@
 from rest_framework import authentication, renderers
+from rest_framework.permissions import BasePermission
 from rest_framework.response import Response
 from rest_framework.views import APIView
+from rest_framework.viewsets import ModelViewSet
+
+from ..models import BasicModelWithUsers
+from .serializers import BasicSerializer
+
+
+class OrganizationPermissions(BasePermission):
+    def has_object_permission(self, request, view, obj):
+        return request.user.is_staff or (request.user == obj.owner.organization_user.user)
 
 
 class MockView(APIView):
@@ -9,3 +19,15 @@ class MockView(APIView):
 
     def get(self, request):
         return Response({'a': 1, 'b': 2, 'c': 3})
+
+
+class BasicModelWithUsersViewSet(ModelViewSet):
+    queryset = BasicModelWithUsers.objects.all()
+    serializer_class = BasicSerializer
+    permission_classes = [OrganizationPermissions]
+    # permission_classes = [IsAuthenticated, OrganizationPermissions]
+    renderer_classes = (renderers.BrowsableAPIRenderer, renderers.JSONRenderer)
+
+    def get_queryset(self):
+        qs = super().get_queryset().filter(users=self.request.user)
+        return qs
diff --git a/tests/models.py b/tests/models.py
index afe649760..666e9f003 100644
--- a/tests/models.py
+++ b/tests/models.py
@@ -1,5 +1,6 @@
 import uuid
 
+from django.contrib.auth.models import User
 from django.db import models
 from django.utils.translation import gettext_lazy as _
 
@@ -33,6 +34,10 @@ class ManyToManySource(RESTFrameworkModel):
     targets = models.ManyToManyField(ManyToManyTarget, related_name='sources')
 
 
+class BasicModelWithUsers(RESTFrameworkModel):
+    users = models.ManyToManyField(User)
+
+
 # ForeignKey
 class ForeignKeyTarget(RESTFrameworkModel):
     name = models.CharField(max_length=100)

From 26830c3d2d45a60385d1166c37a031e2e75cf858 Mon Sep 17 00:00:00 2001
From: Marti Raudsepp 
Date: Wed, 8 Jun 2022 16:37:46 +0300
Subject: [PATCH 245/303] Fix QueryDict type error in test (#8475)

QueryDict takes a `str` argument. Discovered while working on
djangorestframework-stubs.
---
 tests/test_fields.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/test_fields.py b/tests/test_fields.py
index 19f734513..cbec79119 100644
--- a/tests/test_fields.py
+++ b/tests/test_fields.py
@@ -1865,9 +1865,9 @@ class TestMultipleChoiceField(FieldValues):
     def test_against_partial_and_full_updates(self):
         field = serializers.MultipleChoiceField(choices=(('a', 'a'), ('b', 'b')))
         field.partial = False
-        assert field.get_value(QueryDict({})) == []
+        assert field.get_value(QueryDict('')) == []
         field.partial = True
-        assert field.get_value(QueryDict({})) == rest_framework.fields.empty
+        assert field.get_value(QueryDict('')) == rest_framework.fields.empty
 
 
 class TestEmptyMultipleChoiceField(FieldValues):

From 5185cc934862a5ab13316c85402c12a6d744f94c Mon Sep 17 00:00:00 2001
From: Stephen Finucane 
Date: Wed, 8 Jun 2022 15:46:19 +0200
Subject: [PATCH 246/303] Handle unset fields with 'many=True' (#7574)

* Handle unset fields with 'many=True'

The docs note:

  When serializing fields with dotted notation, it may be necessary to
  provide a `default` value if any object is not present or is empty
  during attribute traversal.

However, this doesn't work for fields with 'many=True'. When using
these, the default is simply ignored.

The solution is simple: do in 'ManyRelatedField' what we were already
doing for 'Field', namely, catch possible 'AttributeError' and
'KeyError' exceptions and return the default if there is one set.

Signed-off-by: Stephen Finucane 
Closes: #7550

* Add test cases for #7550

Signed-off-by: Stephen Finucane 
---
 rest_framework/relations.py    | 27 +++++++++++++-
 tests/test_model_serializer.py | 67 ++++++++++++++++++++++++++++++++++
 2 files changed, 92 insertions(+), 2 deletions(-)

diff --git a/rest_framework/relations.py b/rest_framework/relations.py
index c98700784..bdedd43b8 100644
--- a/rest_framework/relations.py
+++ b/rest_framework/relations.py
@@ -10,7 +10,7 @@ from django.utils.encoding import smart_str, uri_to_iri
 from django.utils.translation import gettext_lazy as _
 
 from rest_framework.fields import (
-    Field, empty, get_attribute, is_simple_callable, iter_options
+    Field, SkipField, empty, get_attribute, is_simple_callable, iter_options
 )
 from rest_framework.reverse import reverse
 from rest_framework.settings import api_settings
@@ -535,7 +535,30 @@ class ManyRelatedField(Field):
         if hasattr(instance, 'pk') and instance.pk is None:
             return []
 
-        relationship = get_attribute(instance, self.source_attrs)
+        try:
+            relationship = get_attribute(instance, self.source_attrs)
+        except (KeyError, AttributeError) as exc:
+            if self.default is not empty:
+                return self.get_default()
+            if self.allow_null:
+                return None
+            if not self.required:
+                raise SkipField()
+            msg = (
+                'Got {exc_type} when attempting to get a value for field '
+                '`{field}` on serializer `{serializer}`.\nThe serializer '
+                'field might be named incorrectly and not match '
+                'any attribute or key on the `{instance}` instance.\n'
+                'Original exception text was: {exc}.'.format(
+                    exc_type=type(exc).__name__,
+                    field=self.field_name,
+                    serializer=self.parent.__class__.__name__,
+                    instance=instance.__class__.__name__,
+                    exc=exc
+                )
+            )
+            raise type(exc)(msg)
+
         return relationship.all() if hasattr(relationship, 'all') else relationship
 
     def to_representation(self, iterable):
diff --git a/tests/test_model_serializer.py b/tests/test_model_serializer.py
index abb4830d1..419eae632 100644
--- a/tests/test_model_serializer.py
+++ b/tests/test_model_serializer.py
@@ -1025,6 +1025,73 @@ class Issue2704TestCase(TestCase):
         assert serializer.data == expected
 
 
+class Issue7550FooModel(models.Model):
+    text = models.CharField(max_length=100)
+    bar = models.ForeignKey(
+        'Issue7550BarModel', null=True, blank=True, on_delete=models.SET_NULL,
+        related_name='foos', related_query_name='foo')
+
+
+class Issue7550BarModel(models.Model):
+    pass
+
+
+class Issue7550TestCase(TestCase):
+
+    def test_dotted_source(self):
+
+        class _FooSerializer(serializers.ModelSerializer):
+            class Meta:
+                model = Issue7550FooModel
+                fields = ('id', 'text')
+
+        class FooSerializer(serializers.ModelSerializer):
+            other_foos = _FooSerializer(source='bar.foos', many=True)
+
+            class Meta:
+                model = Issue7550BarModel
+                fields = ('id', 'other_foos')
+
+        bar = Issue7550BarModel.objects.create()
+        foo_a = Issue7550FooModel.objects.create(bar=bar, text='abc')
+        foo_b = Issue7550FooModel.objects.create(bar=bar, text='123')
+
+        assert FooSerializer(foo_a).data == {
+            'id': foo_a.id,
+            'other_foos': [
+                {
+                    'id': foo_a.id,
+                    'text': foo_a.text,
+                },
+                {
+                    'id': foo_b.id,
+                    'text': foo_b.text,
+                },
+            ],
+        }
+
+    def test_dotted_source_with_default(self):
+
+        class _FooSerializer(serializers.ModelSerializer):
+            class Meta:
+                model = Issue7550FooModel
+                fields = ('id', 'text')
+
+        class FooSerializer(serializers.ModelSerializer):
+            other_foos = _FooSerializer(source='bar.foos', default=[], many=True)
+
+            class Meta:
+                model = Issue7550FooModel
+                fields = ('id', 'other_foos')
+
+        foo = Issue7550FooModel.objects.create(bar=None, text='abc')
+
+        assert FooSerializer(foo).data == {
+            'id': foo.id,
+            'other_foos': [],
+        }
+
+
 class DecimalFieldModel(models.Model):
     decimal_field = models.DecimalField(
         max_digits=3,

From 82475c232b531e075fe7666d808f9e68d052d35b Mon Sep 17 00:00:00 2001
From: Alessandro <9991341+alessandrosp@users.noreply.github.com>
Date: Wed, 8 Jun 2022 23:03:00 +0900
Subject: [PATCH 247/303] Made relative URLs clickable as well. (#8464)

---
 rest_framework/templatetags/rest_framework.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rest_framework/templatetags/rest_framework.py b/rest_framework/templatetags/rest_framework.py
index db0e9c95c..ccd9430b4 100644
--- a/rest_framework/templatetags/rest_framework.py
+++ b/rest_framework/templatetags/rest_framework.py
@@ -218,7 +218,7 @@ def format_value(value):
         return template.render(context)
     elif isinstance(value, str):
         if (
-            (value.startswith('http:') or value.startswith('https:')) and not
+            (value.startswith('http:') or value.startswith('https:') or value.startswith('/')) and not
             re.search(r'\s', value)
         ):
             return mark_safe('{value}'.format(value=escape(value)))

From 2506d0b4f2ac8bdbf35d33b3dd8a56f3e8d0da75 Mon Sep 17 00:00:00 2001
From: Burak Kadir Er 
Date: Thu, 9 Jun 2022 17:30:47 +0300
Subject: [PATCH 248/303] Update include and namespace URLs (#8520)

---
 docs/api-guide/routers.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/api-guide/routers.md b/docs/api-guide/routers.md
index 8d8594eee..70c05fdde 100644
--- a/docs/api-guide/routers.md
+++ b/docs/api-guide/routers.md
@@ -338,5 +338,5 @@ The [`DRF-extensions` package][drf-extensions] provides [routers][drf-extensions
 [drf-extensions-nested-viewsets]: https://chibisov.github.io/drf-extensions/docs/#nested-routes
 [drf-extensions-collection-level-controllers]: https://chibisov.github.io/drf-extensions/docs/#collection-level-controllers
 [drf-extensions-customizable-endpoint-names]: https://chibisov.github.io/drf-extensions/docs/#controller-endpoint-name
-[url-namespace-docs]: https://docs.djangoproject.com/en/1.11/topics/http/urls/#url-namespaces
-[include-api-reference]: https://docs.djangoproject.com/en/2.0/ref/urls/#include
+[url-namespace-docs]: https://docs.djangoproject.com/en/4.0/topics/http/urls/#url-namespaces
+[include-api-reference]: https://docs.djangoproject.com/en/4.0/ref/urls/#include

From fa9d516ee24b2447a351af92e139d386b4f0d2b4 Mon Sep 17 00:00:00 2001
From: Tom Christie 
Date: Mon, 20 Jun 2022 10:44:27 +0100
Subject: [PATCH 249/303] Update docstring test for more recent pygments
 version (#8530)

* Update docstring test for more recent pygments version

* Drop unused import
---
 requirements/requirements-optionals.txt |  5 ++--
 tests/test_description.py               | 31 ++++---------------------
 2 files changed, 6 insertions(+), 30 deletions(-)

diff --git a/requirements/requirements-optionals.txt b/requirements/requirements-optionals.txt
index 75b9ab4d6..f3bb9b709 100644
--- a/requirements/requirements-optionals.txt
+++ b/requirements/requirements-optionals.txt
@@ -3,8 +3,7 @@ coreapi==2.3.1
 coreschema==0.0.4
 django-filter>=2.4.0,<3.0
 django-guardian>=2.4.0,<2.5
-markdown==3.3;python_version>="3.6"
-markdown==3.2.2;python_version=="3.5"
+markdown==3.3
 psycopg2-binary>=2.8.5,<2.9
-pygments>=2.7.1,<2.8
+pygments==2.12
 pyyaml>=5.3.1,<5.4
diff --git a/tests/test_description.py b/tests/test_description.py
index 363ad6513..ecc6b9776 100644
--- a/tests/test_description.py
+++ b/tests/test_description.py
@@ -1,5 +1,3 @@
-import sys
-
 import pytest
 from django.test import TestCase
 
@@ -33,7 +31,7 @@ indented
 
 # If markdown is installed we also test it's working
 # (and that our wrapped forces '=' to h2 and '-' to h3)
-MARKDOWN_BASE = """
    an example docstring
    
+MARKDOWN_DOCSTRING = """
    an example docstring