diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 000000000..0ba2c5d9d --- /dev/null +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1,7 @@ +blank_issues_enabled: false +contact_links: +- name: Discussions + url: https://github.com/encode/django-rest-framework/discussions + about: > + The "Discussions" forum is where you want to start. 💖 + Please note that at this point in its lifespan, we consider Django REST framework to be feature-complete. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 644a719c8..af7d55f13 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -2,4 +2,6 @@ At this point in its 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 open a 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/api-guide/fields.md b/docs/api-guide/fields.md index d2e6b67e8..888996eec 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`. 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`. +Defaults to `True`. If you're using [Model Serializer](https://www.django-rest-framework.org/api-guide/serializers/#modelserializer), the default value will be `False` when you have specified a `default`, or when the corresponding `Model` field has `blank=True` or `null=True` and is not part of a unique constraint at the same time. (Note that without a `default` value, [unique constraints will cause the field to be required](https://www.django-rest-framework.org/api-guide/validators/#optional-fields).) ### `default` diff --git a/docs/api-guide/permissions.md b/docs/api-guide/permissions.md index 775888fb6..c6d9f9338 100644 --- a/docs/api-guide/permissions.md +++ b/docs/api-guide/permissions.md @@ -201,7 +201,7 @@ As with `DjangoModelPermissions` you can use custom model permissions by overrid --- -**Note**: If you need object level `view` permissions for `GET`, `HEAD` and `OPTIONS` requests and are using django-guardian for your object-level permissions backend, you'll want to consider using the `DjangoObjectPermissionsFilter` class provided by the [`djangorestframework-guardian2` package][django-rest-framework-guardian2]. It ensures that list endpoints only return results including objects for which the user has appropriate view permissions. +**Note**: If you need object level `view` permissions for `GET`, `HEAD` and `OPTIONS` requests and are using django-guardian for your object-level permissions backend, you'll want to consider using the `DjangoObjectPermissionsFilter` class provided by the [`djangorestframework-guardian` package][django-rest-framework-guardian]. It ensures that list endpoints only return results including objects for which the user has appropriate view permissions. --- @@ -356,6 +356,6 @@ The [Django Rest Framework PSQ][drf-psq] package is an extension that gives supp [rest-framework-roles]: https://github.com/Pithikos/rest-framework-roles [djangorestframework-api-key]: https://florimondmanca.github.io/djangorestframework-api-key/ [django-rest-framework-role-filters]: https://github.com/allisson/django-rest-framework-role-filters -[django-rest-framework-guardian2]: https://github.com/johnthagen/django-rest-framework-guardian2 +[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/api-guide/throttling.md b/docs/api-guide/throttling.md index e6d7774a6..0ea8b4158 100644 --- a/docs/api-guide/throttling.md +++ b/docs/api-guide/throttling.md @@ -110,7 +110,7 @@ You'll need to remember to also set your custom throttle class in the `'DEFAULT_ 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. +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. --- @@ -220,4 +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 diff --git a/docs/api-guide/validators.md b/docs/api-guide/validators.md index 57bcb8628..e3407e8a3 100644 --- a/docs/api-guide/validators.md +++ b/docs/api-guide/validators.md @@ -13,7 +13,7 @@ Most of the time you're dealing with validation in REST framework you'll simply However, sometimes you'll want to place your validation logic into reusable components, so that it can easily be reused throughout your codebase. This can be achieved by using validator functions and validator classes. -## Validation in REST framework +## Validation in REST framework Validation in Django REST framework serializers is handled a little differently to how validation works in Django's `ModelForm` class. @@ -75,7 +75,7 @@ This validator should be applied to *serializer fields*, like so: validators=[UniqueValidator(queryset=BlogPost.objects.all())] ) -## UniqueTogetherValidator +## UniqueTogetherValidator This validator can be used to enforce `unique_together` constraints on model instances. It has two required arguments, and a single optional `messages` argument: @@ -92,7 +92,7 @@ The validator should be applied to *serializer classes*, like so: # ... class Meta: # ToDo items belong to a parent list, and have an ordering defined - # by the 'position' field. No two items in a given list may share + # by the 'position' field. No two items in a given list may share # the same position. validators = [ UniqueTogetherValidator( @@ -166,7 +166,7 @@ If you want the date field to be entirely hidden from the user, then use `Hidden --- -**Note:** `HiddenField()` does not appear in `partial=True` serializer (when making `PATCH` request). +**Note:** `HiddenField()` does not appear in `partial=True` serializer (when making `PATCH` request). --- diff --git a/docs/community/contributing.md b/docs/community/contributing.md index 5a9188943..b47059f29 100644 --- a/docs/community/contributing.md +++ b/docs/community/contributing.md @@ -4,6 +4,8 @@ > > — [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. + !!! note At this point in its lifespan we consider Django REST framework to be feature-complete. We focus on pull requests that track the continued development of Django versions, and generally do not accept new features or code formatting changes. @@ -28,9 +30,22 @@ The [Django code of conduct][code-of-conduct] gives a fuller set of guidelines f # Issues +Our contribution process is that the [GitHub discussions page](https://github.com/encode/django-rest-framework/discussions) should generally be your starting point. Some tips on good potential issue reporting: + * Django REST framework is considered feature-complete. Please do not file requests to change behavior, unless it is required for security reasons or to maintain compatibility with upcoming Django or Python versions. +* 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 typically be closed with a recommendation that they be implemented outside the core REST framework library (e.g. as third-party libraries). This approach allows us to keep down the maintenance overhead of REST framework, so that the focus can be on continued stability and great documentation. +## 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, could the feature request instead be implemented as a third party package? +* If a ticket hasn't had much activity and 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, first create a Fork from the diff --git a/docs/community/project-management.md b/docs/community/project-management.md index daf2cda8d..4f203e13b 100644 --- a/docs/community/project-management.md +++ b/docs/community/project-management.md @@ -34,6 +34,7 @@ Further notes for maintainers: * Code changes should come in the form of a pull request - do not push directly to master. * Maintainers should typically not merge their own pull requests. * Each issue/pull request should have exactly one label once triaged. +* Search for un-triaged issues with [is:open no:label][un-triaged]. --- @@ -156,6 +157,7 @@ The following issues still need to be addressed: * Document ownership and management of the security mailing list. [bus-factor]: https://en.wikipedia.org/wiki/Bus_factor +[un-triaged]: https://github.com/encode/django-rest-framework/issues?q=is%3Aopen+no%3Alabel [transifex-project]: https://www.transifex.com/projects/p/django-rest-framework/ [transifex-client]: https://pypi.org/project/transifex-client/ [translation-memory]: http://docs.transifex.com/guides/tm#let-tm-automatically-populate-translations diff --git a/docs/community/release-notes.md b/docs/community/release-notes.md index c7b82e985..ae59ae000 100644 --- a/docs/community/release-notes.md +++ b/docs/community/release-notes.md @@ -38,20 +38,83 @@ You can determine your currently installed version using `pip show`: ## 3.16.x series +### 3.16.1 + +**Date**: 6th August 2025 + +This release fixes a few bugs, clean-up some old code paths for unsupported Python versions and improve translations. + +#### Minor changes + +* Cleanup optional `backports.zoneinfo` dependency and conditions on unsupported Python 3.8 and lower in [#9681](https://github.com/encode/django-rest-framework/pull/9681). Python versions prior to 3.9 were already unsupported so this shouldn't be a breaking change. + +#### Bug fixes + +* Fix regression in `unique_together` validation with `SerializerMethodField` in [#9712](https://github.com/encode/django-rest-framework/pull/9712) +* Fix `UniqueTogetherValidator` to handle fields with `source` attribute in [#9688](https://github.com/encode/django-rest-framework/pull/9688) +* Drop HTML line breaks on long headers in browsable API in [#9438](https://github.com/encode/django-rest-framework/pull/9438) + +#### Translations + +* Add Kazakh locale support in [#9713](https://github.com/encode/django-rest-framework/pull/9713) +* Update translations for Korean translations in [#9571](https://github.com/encode/django-rest-framework/pull/9571) +* Update German translations in [#9676](https://github.com/encode/django-rest-framework/pull/9676) +* Update Chinese translations in [#9675](https://github.com/encode/django-rest-framework/pull/9675) +* Update Arabic translations-sal in [#9595](https://github.com/encode/django-rest-framework/pull/9595) +* Update Persian translations in [#9576](https://github.com/encode/django-rest-framework/pull/9576) +* Update Spanish translations in [#9701](https://github.com/encode/django-rest-framework/pull/9701) +* Update Turkish Translations in [#9749](https://github.com/encode/django-rest-framework/pull/9749) +* Fix some typos in Brazilian Portuguese translations in [#9673](https://github.com/encode/django-rest-framework/pull/9673) + +#### Documentation + +* Removed reference to GitHub Issues and Discussions in [#9660](https://github.com/encode/django-rest-framework/pull/9660) +* Add `drf-restwind` and update outdated images in `browsable-api.md` in [#9680](https://github.com/encode/django-rest-framework/pull/9680) +* Updated funding page to represent current scope in [#9686](https://github.com/encode/django-rest-framework/pull/9686) +* Fix broken Heroku JSON Schema link in [#9693](https://github.com/encode/django-rest-framework/pull/9693) +* Update Django documentation links to use stable version in [#9698](https://github.com/encode/django-rest-framework/pull/9698) +* Expand docs on unique constraints cause 'required=True' in [#9725](https://github.com/encode/django-rest-framework/pull/9725) +* Revert extension back from `djangorestframework-guardian2` to `djangorestframework-guardian` in [#9734](https://github.com/encode/django-rest-framework/pull/9734) +* Add note to tutorial about required `request` in serializer context when using `HyperlinkedModelSerializer` in [#9732](https://github.com/encode/django-rest-framework/pull/9732) + +#### Internal changes + +* Update GitHub Actions to use Ubuntu 24.04 for testing in [#9677](https://github.com/encode/django-rest-framework/pull/9677) +* Update test matrix to use Django 5.2 stable version in [#9679](https://github.com/encode/django-rest-framework/pull/9679) +* Add `pyupgrade` to `pre-commit` hooks in [#9682](https://github.com/encode/django-rest-framework/pull/9682) +* Fix test with Django 5 when `pytz` is available in [#9715](https://github.com/encode/django-rest-framework/pull/9715) + +#### New Contributors + +* [`@araggohnxd`](https://github.com/araggohnxd) made their first contribution in [#9673](https://github.com/encode/django-rest-framework/pull/9673) +* [`@mbeijen`](https://github.com/mbeijen) made their first contribution in [#9660](https://github.com/encode/django-rest-framework/pull/9660) +* [`@stefan6419846`](https://github.com/stefan6419846) made their first contribution in [#9676](https://github.com/encode/django-rest-framework/pull/9676) +* [`@ren000thomas`](https://github.com/ren000thomas) made their first contribution in [#9675](https://github.com/encode/django-rest-framework/pull/9675) +* [`@ulgens`](https://github.com/ulgens) made their first contribution in [#9682](https://github.com/encode/django-rest-framework/pull/9682) +* [`@bukh-sal`](https://github.com/bukh-sal) made their first contribution in [#9595](https://github.com/encode/django-rest-framework/pull/9595) +* [`@rezatn0934`](https://github.com/rezatn0934) made their first contribution in [#9576](https://github.com/encode/django-rest-framework/pull/9576) +* [`@Rohit10jr`](https://github.com/Rohit10jr) made their first contribution in [#9693](https://github.com/encode/django-rest-framework/pull/9693) +* [`@kushibayev`](https://github.com/kushibayev) made their first contribution in [#9713](https://github.com/encode/django-rest-framework/pull/9713) +* [`@alihassancods`](https://github.com/alihassancods) made their first contribution in [#9732](https://github.com/encode/django-rest-framework/pull/9732) +* [`@kulikjak`](https://github.com/kulikjak) made their first contribution in [#9715](https://github.com/encode/django-rest-framework/pull/9715) +* [`@Natgho`](https://github.com/Natgho) made their first contribution in [#9749](https://github.com/encode/django-rest-framework/pull/9749) + +**Full Changelog**: https://github.com/encode/django-rest-framework/compare/3.16.0...3.16.1 + ### 3.16.0 **Date**: 28th March 2025 This release is considered a significant release to improve upstream support with Django and Python. Some of these may change the behaviour of existing features and pre-existing behaviour. Specifically, some fixes were added to around the support of `UniqueConstraint` with nullable fields which will improve built-in serializer validation. -## Features +#### Features * Add official support for Django 5.1 and its new `LoginRequiredMiddleware` in [#9514](https://github.com/encode/django-rest-framework/pull/9514) and [#9657](https://github.com/encode/django-rest-framework/pull/9657) * Add official Django 5.2a1 support in [#9634](https://github.com/encode/django-rest-framework/pull/9634) * Add support for Python 3.13 in [#9527](https://github.com/encode/django-rest-framework/pull/9527) and [#9556](https://github.com/encode/django-rest-framework/pull/9556) * Support Django 2.1+ test client JSON data automatically serialized in [#6511](https://github.com/encode/django-rest-framework/pull/6511) and fix a regression in [#9615](https://github.com/encode/django-rest-framework/pull/9615) -## Bug fixes +#### Bug fixes * Fix unique together validator to respect condition's fields from `UniqueConstraint` in [#9360](https://github.com/encode/django-rest-framework/pull/9360) * Fix raising on nullable fields part of `UniqueConstraint` in [#9531](https://github.com/encode/django-rest-framework/pull/9531) @@ -62,19 +125,19 @@ This release is considered a significant release to improve upstream support wit * Fix noisy warning and accept integers as min/max values of `DecimalField` in [#9515](https://github.com/encode/django-rest-framework/pull/9515) * Fix usages of `open()` in `setup.py` in [#9661](https://github.com/encode/django-rest-framework/pull/9661) -## Translations +#### Translations * Add some missing Chinese translations in [#9505](https://github.com/encode/django-rest-framework/pull/9505) * Fix spelling mistakes in Farsi language were corrected in [#9521](https://github.com/encode/django-rest-framework/pull/9521) * Fixing and adding missing Brazilian Portuguese translations in [#9535](https://github.com/encode/django-rest-framework/pull/9535) -## Removals +#### Removals * Remove support for Python 3.8 in [#9670](https://github.com/encode/django-rest-framework/pull/9670) * Remove long deprecated code from request wrapper in [#9441](https://github.com/encode/django-rest-framework/pull/9441) * Remove deprecated `AutoSchema._get_reference` method in [#9525](https://github.com/encode/django-rest-framework/pull/9525) -## Documentation and internal changes +#### Documentation and internal changes * Provide tests for hashing of `OperandHolder` in [#9437](https://github.com/encode/django-rest-framework/pull/9437) * Update documentation: Add `adrf` third party package in [#9198](https://github.com/encode/django-rest-framework/pull/9198) @@ -94,7 +157,7 @@ This release is considered a significant release to improve upstream support wit * Fix a number of typos in the test suite in the docs in [#9662](https://github.com/encode/django-rest-framework/pull/9662) * Add `django-pyoidc` as a third party authentication library in [#9667](https://github.com/encode/django-rest-framework/pull/9667) -## New Contributors +#### New Contributors * [`@maerteijn`](https://github.com/maerteijn) made their first contribution in [#9198](https://github.com/encode/django-rest-framework/pull/9198) * [`@FraCata00`](https://github.com/FraCata00) made their first contribution in [#9444](https://github.com/encode/django-rest-framework/pull/9444) diff --git a/docs/community/third-party-packages.md b/docs/community/third-party-packages.md index d213cac3d..a48cbd606 100644 --- a/docs/community/third-party-packages.md +++ b/docs/community/third-party-packages.md @@ -126,7 +126,7 @@ To submit new content, [create a pull request][drf-create-pr]. * [djangorestframework-chain][djangorestframework-chain] - Allows arbitrary chaining of both relations and lookup filters. * [django-url-filter][django-url-filter] - Allows a safe way to filter data via human-friendly URLs. It is a generic library which is not tied to DRF but it provides easy integration with DRF. * [drf-url-filter][drf-url-filter] is a simple Django app to apply filters on drf `ModelViewSet`'s `Queryset` in a clean, simple and configurable way. It also supports validations on incoming query params and their values. -* [django-rest-framework-guardian2][django-rest-framework-guardian2] - Provides integration with django-guardian, including the `DjangoObjectPermissionsFilter` previously found in DRF. +* [django-rest-framework-guardian][django-rest-framework-guardian] - Provides integration with django-guardian, including the `DjangoObjectPermissionsFilter` previously found in DRF. ### Misc @@ -242,7 +242,7 @@ To submit new content, [create a pull request][drf-create-pr]. [djangorestframework-dataclasses]: https://github.com/oxan/djangorestframework-dataclasses [django-restql]: https://github.com/yezyilomo/django-restql [djangorestframework-mvt]: https://github.com/corteva/djangorestframework-mvt -[django-rest-framework-guardian2]: https://github.com/johnthagen/django-rest-framework-guardian2 +[django-rest-framework-guardian]: https://github.com/rpkilby/django-rest-framework-guardian [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 diff --git a/docs/tutorial/5-relationships-and-hyperlinked-apis.md b/docs/tutorial/5-relationships-and-hyperlinked-apis.md index f999fdf50..f5aaee2bb 100644 --- a/docs/tutorial/5-relationships-and-hyperlinked-apis.md +++ b/docs/tutorial/5-relationships-and-hyperlinked-apis.md @@ -94,6 +94,22 @@ Notice that we've also added a new `'highlight'` field. This field is of the sa Because we've included format suffixed URLs such as `'.json'`, we also need to indicate on the `highlight` field that any format suffixed hyperlinks it returns should use the `'.html'` suffix. +--- + +**Note:** + +When you are manually instantiating these serializers inside your views (e.g., in `SnippetDetail` or `SnippetList`), you **must** pass `context={'request': request}` so the serializer knows how to build absolute URLs. For example, instead of: + + serializer = SnippetSerializer(snippet) + +You must write: + + serializer = SnippetSerializer(snippet, context={'request': request}) + +If your view is a subclass of `GenericAPIView`, you may use the `get_serializer_context()` as a convenience method. + +--- + ## Making sure our URL patterns are named If we're going to have a hyperlinked API, we need to make sure we name our URL patterns. Let's take a look at which URL patterns we need to name. diff --git a/requirements/requirements-testing.txt b/requirements/requirements-testing.txt index 2b39316a0..b1e3c82ec 100644 --- a/requirements/requirements-testing.txt +++ b/requirements/requirements-testing.txt @@ -5,3 +5,4 @@ pytest-django>=4.5.2,<5.0 importlib-metadata<5.0 # temporary pin of attrs attrs==22.1.0 +pytz # Remove when dropping support for Django<5.0 diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py index 692ce9cb1..9b9bb6eda 100644 --- a/rest_framework/__init__.py +++ b/rest_framework/__init__.py @@ -8,7 +8,7 @@ ______ _____ _____ _____ __ """ __title__ = 'Django REST framework' -__version__ = '3.16.0' +__version__ = '3.16.1' __author__ = 'Tom Christie' __license__ = 'BSD 3-Clause' __copyright__ = 'Copyright 2011-2023 Encode OSS Ltd' diff --git a/rest_framework/locale/kk/LC_MESSAGES/django.mo b/rest_framework/locale/kk/LC_MESSAGES/django.mo new file mode 100644 index 000000000..069aa2065 Binary files /dev/null and b/rest_framework/locale/kk/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/kk/LC_MESSAGES/django.po b/rest_framework/locale/kk/LC_MESSAGES/django.po new file mode 100644 index 000000000..e781e06ec --- /dev/null +++ b/rest_framework/locale/kk/LC_MESSAGES/django.po @@ -0,0 +1,578 @@ +# This file is distributed under the same license as the Django REST framework package. +# Translators: +# Dulat Kushibayev , 2025 +# +msgid "" +msgstr "" +"Project-Id-Version: Django REST framework\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2025-06-01 23:03+0300\n" +"PO-Revision-Date: 2025-06-01 20:03+0000\n" +"Last-Translator: Dulat Kushibayev \n" +"Language-Team: \n" +"Language: kk\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\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:84 +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/admin.py:28 authtoken/serializers.py:9 +msgid "Username" +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/models.py:54 authtoken/serializers.py:19 +msgid "Token" +msgstr "Токен" + +#: authtoken/models.py:28 authtoken/models.py:55 +msgid "Tokens" +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:105 +msgid "A server error occurred." +msgstr "Серверде қате орын алды." + +#: exceptions.py:145 +msgid "Invalid input." +msgstr "Қате енгізу деректері." + +#: exceptions.py:166 +msgid "Malformed request." +msgstr "Сұраныс дұрыс құрылмаған." + +#: exceptions.py:172 +msgid "Incorrect authentication credentials." +msgstr "Аутентификация деректері қате." + +#: exceptions.py:178 +msgid "Authentication credentials were not provided." +msgstr "Аутентификация деректері берілмеген." + +#: exceptions.py:184 +msgid "You do not have permission to perform this action." +msgstr "Бұл әрекетті орындауға рұқсатыңыз жоқ." + +#: exceptions.py:190 +msgid "Not found." +msgstr "Табылмады." + +#: exceptions.py:196 +#, python-brace-format +msgid "Method \"{method}\" not allowed." +msgstr "\"{method}\" әдісіне рұқсат етілмейді." + +#: exceptions.py:207 +msgid "Could not satisfy the request Accept header." +msgstr "Сұраныстағы Accept тақырыбын қанағаттандыру мүмкін емес." + +#: exceptions.py:217 +#, python-brace-format +msgid "Unsupported media type \"{media_type}\" in request." +msgstr "Сұраныстағы \"{media_type}\" медиа түрі қолдау көрсетілмейді." + +#: exceptions.py:228 +msgid "Request was throttled." +msgstr "Сұраныс жиілігі шектелді." + +#: exceptions.py:229 +#, python-brace-format +msgid "Expected available in {wait} second." +msgstr "{wait} секундтан кейін қайта қолжетімді болады." + +#: exceptions.py:230 +#, python-brace-format +msgid "Expected available in {wait} seconds." +msgstr "{wait} секундтан кейін қайта қолжетімді болады." + +#: fields.py:292 relations.py:240 relations.py:276 validators.py:112 +#: validators.py:238 +msgid "This field is required." +msgstr "Бұл мән міндетті." + +#: fields.py:293 +msgid "This field may not be null." +msgstr "Бұл мән null болмауы керек." + +#: fields.py:661 +msgid "Must be a valid boolean." +msgstr "Дұрыс логикалық мән болуы керек." + +#: fields.py:724 +msgid "Not a valid string." +msgstr "Мәтін дұрыс емес." + +#: fields.py:725 +msgid "This field may not be blank." +msgstr "Бұл мән бос болмауы керек." + +#: fields.py:726 fields.py:1881 +#, python-brace-format +msgid "Ensure this field has no more than {max_length} characters." +msgstr "Бұл мән ең көбі {max_length} таңбадан аспауы керек." + +#: fields.py:727 +#, python-brace-format +msgid "Ensure this field has at least {min_length} characters." +msgstr "Бұл мән кемінде {min_length} таңба болуы керек." + +#: fields.py:774 +msgid "Enter a valid email address." +msgstr "Дұрыс электрондық пошта енгізіңіз." + +#: fields.py:785 +msgid "This value does not match the required pattern." +msgstr "Бұл мән қажетті үлгіге сәйкес келмейді." + +#: fields.py:796 +msgid "" +"Enter a valid \"slug\" consisting of letters, numbers, underscores or " +"hyphens." +msgstr "Әріптерден, сандардан, астын сызу және сызықшалардан тұратын дұрыс \"slug\" енгізіңіз." + +#: fields.py:797 +msgid "" +"Enter a valid \"slug\" consisting of Unicode letters, numbers, underscores, " +"or hyphens." +msgstr "Юникод әріптері, сандар, астын сызу және сызықшалардан тұратын дұрыс \"slug\" енгізіңіз." + +#: fields.py:812 +msgid "Enter a valid URL." +msgstr "Дұрыс URL енгізіңіз." + +#: fields.py:825 +msgid "Must be a valid UUID." +msgstr "Дұрыс UUID болуы керек." + +#: fields.py:861 +msgid "Enter a valid IPv4 or IPv6 address." +msgstr "Дұрыс IPv4 немесе IPv6 адрес енгізіңіз." + +#: fields.py:889 +msgid "A valid integer is required." +msgstr "Дұрыс бүтін сан енгізілуі қажет." + +#: fields.py:890 fields.py:927 fields.py:966 fields.py:1349 +#, python-brace-format +msgid "Ensure this value is less than or equal to {max_value}." +msgstr "Бұл мән {max_value} немесе одан аз болуы керек." + +#: fields.py:891 fields.py:928 fields.py:967 fields.py:1350 +#, python-brace-format +msgid "Ensure this value is greater than or equal to {min_value}." +msgstr "Бұл мән кемінде {min_value} болуы керек." + +#: fields.py:892 fields.py:929 fields.py:971 +msgid "String value too large." +msgstr "Жолдың мәні тым үлкен." + +#: fields.py:926 fields.py:965 +msgid "A valid number is required." +msgstr "Дұрыс сан енгізілуі керек." + +#: fields.py:930 +msgid "Integer value too large to convert to float" +msgstr "Бүтін сан тым үлкен - қалқымалы санға айналдыру мүмкін емес." + +#: fields.py:968 +#, python-brace-format +msgid "Ensure that there are no more than {max_digits} digits in total." +msgstr "Барлығы {max_digits} саннан аспауы керек." + +#: fields.py:969 +#, python-brace-format +msgid "Ensure that there are no more than {max_decimal_places} decimal places." +msgstr "Ондық бөлшектер саны ең көбі {max_decimal_places} болуы керек." + +#: fields.py:970 +#, 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:1129 +#, python-brace-format +msgid "Datetime has wrong format. Use one of these formats instead: {format}." +msgstr "Datetime пішімі дұрыс емес. Осы пішімдердің бірін пайдаланыңыз: {format}." + +#: fields.py:1130 +msgid "Expected a datetime but got a date." +msgstr "Күтілгені - datetime, берілгені - date." + +#: fields.py:1131 +#, python-brace-format +msgid "Invalid datetime for the timezone \"{timezone}\"." +msgstr "\"{timezone}\" уақыт белдеуі үшін күн мен уақыт дұрыс емес." + +#: fields.py:1132 +msgid "Datetime value out of range." +msgstr "Datetime мәні рұқсат етілген ауқымнан тыс." + +#: fields.py:1219 +#, python-brace-format +msgid "Date has wrong format. Use one of these formats instead: {format}." +msgstr "Date пішімі дұрыс емес. Осы пішімдердің бірін пайдаланыңыз: {format}." + +#: fields.py:1220 +msgid "Expected a date but got a datetime." +msgstr "Күтілгені - date, берілгені - datetime." + +#: fields.py:1286 +#, python-brace-format +msgid "Time has wrong format. Use one of these formats instead: {format}." +msgstr "Уақыт пішімі дұрыс емес. Осы пішімдердің бірін пайдаланыңыз: {format}." + +#: fields.py:1348 +#, python-brace-format +msgid "Duration has wrong format. Use one of these formats instead: {format}." +msgstr "Ұзақтық пішімі дұрыс емес. Осы пішімдердің бірін пайдаланыңыз: {format}." + +#: fields.py:1351 +#, python-brace-format +msgid "The number of days must be between {min_days} and {max_days}." +msgstr "Күндер саны {min_days} бен {max_days} аралығында болуы керек." + +#: fields.py:1386 fields.py:1446 +#, python-brace-format +msgid "\"{input}\" is not a valid choice." +msgstr "\"{input}\" - дұрыс таңдау емес." + +#: fields.py:1389 +#, python-brace-format +msgid "More than {count} items..." +msgstr "{count} элементтен артық..." + +#: fields.py:1447 fields.py:1596 relations.py:486 serializers.py:595 +#, python-brace-format +msgid "Expected a list of items but got type \"{input_type}\"." +msgstr "Элементтер тізімі күтілді, бірақ \"{input_type}\" түрі берілген." + +#: fields.py:1448 +msgid "This selection may not be empty." +msgstr "Бұл таңдау бос болмауы керек." + +#: fields.py:1487 +#, python-brace-format +msgid "\"{input}\" is not a valid path choice." +msgstr "\"{input}\" - дұрыс жол таңдауы емес." + +#: fields.py:1507 +msgid "No file was submitted." +msgstr "Файл жіберілмеді." + +#: fields.py:1508 +msgid "The submitted data was not a file. Check the encoding type on the form." +msgstr "Жіберілген деректер файл емес. Формадағы кодтау түрін тексеріңіз." + +#: fields.py:1509 +msgid "No filename could be determined." +msgstr "Файл атауы анықталмады." + +#: fields.py:1510 +msgid "The submitted file is empty." +msgstr "Жіберілген файл бос." + +#: fields.py:1511 +#, python-brace-format +msgid "" +"Ensure this filename has at most {max_length} characters (it has {length})." +msgstr "Файл атауы {max_length} таңбадан аспауы керек (қазір - {length})." + +#: fields.py:1559 +msgid "" +"Upload a valid image. The file you uploaded was either not an image or a " +"corrupted image." +msgstr "Дұрыс кескін жүктеңіз. Жүктелген файл кескін емес немесе бүлінген." + +#: fields.py:1597 relations.py:487 serializers.py:596 +msgid "This list may not be empty." +msgstr "Бұл тізім бос болмауы керек." + +#: fields.py:1598 serializers.py:598 +#, python-brace-format +msgid "Ensure this field has at least {min_length} elements." +msgstr "Бұл мәнде кемінде {min_length} элемент болуы керек." + +#: fields.py:1599 serializers.py:597 +#, python-brace-format +msgid "Ensure this field has no more than {max_length} elements." +msgstr "Бұл мәнде {max_length} элементтен көп болмауы керек." + +#: fields.py:1677 +#, python-brace-format +msgid "Expected a dictionary of items but got type \"{input_type}\"." +msgstr "Элементтер жиыны ретінде сөздік күтілді, бірақ \"{input_type}\" түрі берілген." + +#: fields.py:1678 +msgid "This dictionary may not be empty." +msgstr "Бұл сөздік бос болмауы керек." + +#: fields.py:1750 +msgid "Value must be valid JSON." +msgstr "Мән дұрыс JSON пішімінде болуы керек." + +#: filters.py:72 templates/rest_framework/filters/search.html:2 +#: templates/rest_framework/filters/search.html:8 +msgid "Search" +msgstr "Іздеу" + +#: filters.py:73 +msgid "A search term." +msgstr "Іздеу сөзі." + +#: filters.py:224 templates/rest_framework/filters/ordering.html:3 +msgid "Ordering" +msgstr "Реттеу" + +#: filters.py:225 +msgid "Which field to use when ordering the results." +msgstr "Нәтижелерді реттеу үшін қай мән пайдалану керектігін көрсетеді." + +#: filters.py:341 +msgid "ascending" +msgstr "өсу ретімен" + +#: filters.py:342 +msgid "descending" +msgstr "кему ретімен" + +#: pagination.py:180 +msgid "A page number within the paginated result set." +msgstr "Беттелген нәтиже жиынындағы бет нөмірі." + +#: pagination.py:185 pagination.py:382 pagination.py:599 +msgid "Number of results to return per page." +msgstr "Әр бетте қайтарылатын нәтиже саны." + +#: pagination.py:195 +msgid "Invalid page." +msgstr "Қате бет нөмірі." + +#: pagination.py:384 +msgid "The initial index from which to return the results." +msgstr "Нәтижелер қайтарылатын бастапқы индекс." + +#: pagination.py:590 +msgid "The pagination cursor value." +msgstr "Нәтижелерді беттеуге арналған курсор мәні." + +#: pagination.py:592 +msgid "Invalid cursor" +msgstr "Қате курсор" + +#: relations.py:241 +#, python-brace-format +msgid "Invalid pk \"{pk_value}\" - object does not exist." +msgstr "Қате pk \"{pk_value}\" - нысан табылмады." + +#: relations.py:242 +#, python-brace-format +msgid "Incorrect type. Expected pk value, received {data_type}." +msgstr "Дерек түрі дұрыс емес. Күтілгені - pk мәні, берілгені - {data_type}." + +#: relations.py:277 +msgid "Invalid hyperlink - No URL match." +msgstr "Қате гиперсілтеме - URL сәйкестігі жоқ." + +#: relations.py:278 +msgid "Invalid hyperlink - Incorrect URL match." +msgstr "Қате гиперсілтеме - URL сәйкестігі дұрыс емес." + +#: relations.py:279 +msgid "Invalid hyperlink - Object does not exist." +msgstr "Қате гиперсілтеме - нысан табылмады." + +#: relations.py:280 +#, python-brace-format +msgid "Incorrect type. Expected URL string, received {data_type}." +msgstr "Дерек түрі дұрыс емес. Күтілгені - URL жолы, берілгені - {data_type}" + +#: relations.py:445 +#, python-brace-format +msgid "Object with {slug_name}={value} does not exist." +msgstr "{slug_name}={value} параметрі бар нысан табылмады." + +#: relations.py:446 +msgid "Invalid value." +msgstr "Қате мән." + +#: schemas/utils.py:32 +msgid "unique integer value" +msgstr "бірегей бүтін сан мәні" + +#: schemas/utils.py:34 +msgid "UUID string" +msgstr "UUID жолы" + +#: schemas/utils.py:36 +msgid "unique value" +msgstr "бірегей мән" + +#: schemas/utils.py:38 +#, python-brace-format +msgid "A {value_type} identifying this {name}." +msgstr "{name} нысанын анықтайтын {value_type}." + +#: serializers.py:342 +#, 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:52 +msgid "This field must be unique." +msgstr "Бұл енгізу жолы бірегей болуы керек." + +#: validators.py:111 +#, python-brace-format +msgid "The fields {field_names} must make a unique set." +msgstr "{field_names} енгізу жолдары бірегей жинақ құрауы тиіс." + +#: validators.py:219 +#, python-brace-format +msgid "Surrogate characters are not allowed: U+{code_point:X}." +msgstr "Суррогат таңбалар рұқсат етілмейді: U+{code_point:X}." + +#: validators.py:309 +#, python-brace-format +msgid "This field must be unique for the \"{date_field}\" date." +msgstr "\"{date_field}\" күніне бұл енгізу жолы бірегей болуы керек." + +#: validators.py:324 +#, python-brace-format +msgid "This field must be unique for the \"{date_field}\" month." +msgstr "\"{date_field}\" айына бұл енгізу жолы бірегей болуы керек." + +#: validators.py:337 +#, 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 "URL жолында нұсқа қате көрсетілген." + +#: versioning.py:118 +msgid "Invalid version in URL path. Does not match any version namespace." +msgstr "URL жолында нұсқа дұрыс көрсетілмеген. Ешбір нұсқа кеңістігімен сәйкес келмейді." + +#: versioning.py:150 +msgid "Invalid version in hostname." +msgstr "Хост атауында нұсқа қате көрсетілген." + +#: versioning.py:172 +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 6386aab52..10233c890 100644 Binary files a/rest_framework/locale/tr/LC_MESSAGES/django.mo and b/rest_framework/locale/tr/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/tr/LC_MESSAGES/django.po b/rest_framework/locale/tr/LC_MESSAGES/django.po index 106fe7177..fcb45b5c8 100644 --- a/rest_framework/locale/tr/LC_MESSAGES/django.po +++ b/rest_framework/locale/tr/LC_MESSAGES/django.po @@ -11,6 +11,7 @@ # Murat Çorlu , 2015 # Recep KIRMIZI , 2015 # Ülgen Sarıkavak , 2015 +# Sezer BOZKIR , 2025 msgid "" msgstr "" "Project-Id-Version: Django REST framework\n" @@ -108,7 +109,7 @@ msgstr "Sunucu hatası oluştu." #: exceptions.py:142 msgid "Invalid input." -msgstr "" +msgstr "Geçersiz girdi." #: exceptions.py:161 msgid "Malformed request." @@ -151,12 +152,12 @@ msgstr "Üst üste çok fazla istek yapıldı." #: exceptions.py:224 #, python-brace-format msgid "Expected available in {wait} second." -msgstr "" +msgstr "{wait} saniye içinde erişilebilir olması bekleniyor." #: exceptions.py:225 #, python-brace-format msgid "Expected available in {wait} seconds." -msgstr "" +msgstr "{wait} saniye içinde erişilebilir olması bekleniyor." #: fields.py:316 relations.py:245 relations.py:279 validators.py:90 #: validators.py:183 @@ -169,11 +170,11 @@ msgstr "Bu alan boş bırakılmamalı." #: fields.py:701 msgid "Must be a valid boolean." -msgstr "" +msgstr "Geçerli bir boolean olmalı." #: fields.py:766 msgid "Not a valid string." -msgstr "" +msgstr "Geçerli bir string değil." #: fields.py:767 msgid "This field may not be blank." @@ -215,7 +216,7 @@ msgstr "Geçerli bir URL girin." #: fields.py:867 msgid "Must be a valid UUID." -msgstr "" +msgstr "Geçerli bir UUID olmalı." #: fields.py:903 msgid "Enter a valid IPv4 or IPv6 address." @@ -273,11 +274,11 @@ msgstr "Datetime değeri bekleniyor, ama date değeri geldi." #: fields.py:1150 #, python-brace-format msgid "Invalid datetime for the timezone \"{timezone}\"." -msgstr "" +msgstr "\"{timezone}\" zaman dilimi için geçersiz datetime." #: fields.py:1151 msgid "Datetime value out of range." -msgstr "" +msgstr "Datetime değeri aralığın dışında." #: fields.py:1236 #, python-brace-format @@ -358,12 +359,12 @@ msgstr "Bu liste boş olmamalı." #: fields.py:1605 #, python-brace-format msgid "Ensure this field has at least {min_length} elements." -msgstr "" +msgstr "Bu alanın en az {min_length} eleman içerdiğinden emin olun." #: fields.py:1606 #, python-brace-format msgid "Ensure this field has no more than {max_length} elements." -msgstr "" +msgstr "Bu alanın en fazla {max_length} eleman içerdiğinden emin olun." #: fields.py:1682 #, python-brace-format @@ -372,7 +373,7 @@ msgstr "Sözlük tipi bir değişken beklenirken \"{input_type}\" tipi bir deği #: fields.py:1683 msgid "This dictionary may not be empty." -msgstr "" +msgstr "Bu sözlük boş olmamalı." #: fields.py:1755 msgid "Value must be valid JSON." @@ -384,7 +385,7 @@ msgstr "Arama" #: filters.py:50 msgid "A search term." -msgstr "" +msgstr "Bir arama terimi." #: filters.py:180 templates/rest_framework/filters/ordering.html:3 msgid "Ordering" @@ -392,23 +393,23 @@ msgstr "Sıralama" #: filters.py:181 msgid "Which field to use when ordering the results." -msgstr "" +msgstr "Sonuçların sıralanmasında kullanılacak alan." #: filters.py:287 msgid "ascending" -msgstr "" +msgstr "artan" #: filters.py:288 msgid "descending" -msgstr "" +msgstr "azalan" #: pagination.py:174 msgid "A page number within the paginated result set." -msgstr "" +msgstr "Sayfalanmış sonuç kümesinde bir sayfa numarası." #: pagination.py:179 pagination.py:372 pagination.py:590 msgid "Number of results to return per page." -msgstr "" +msgstr "Her sayfada döndürülecek sonuç sayısı." #: pagination.py:189 msgid "Invalid page." @@ -416,11 +417,11 @@ msgstr "Geçersiz sayfa." #: pagination.py:374 msgid "The initial index from which to return the results." -msgstr "" +msgstr "Döndürülecek sonuçların başlangıç indeksi." #: pagination.py:581 msgid "The pagination cursor value." -msgstr "" +msgstr "Sayfalandırma imleci değeri." #: pagination.py:583 msgid "Invalid cursor" @@ -464,20 +465,20 @@ msgstr "Geçersiz değer." #: schemas/utils.py:32 msgid "unique integer value" -msgstr "" +msgstr "benzersiz tamsayı değeri" #: schemas/utils.py:34 msgid "UUID string" -msgstr "" +msgstr "UUID metni" #: schemas/utils.py:36 msgid "unique value" -msgstr "" +msgstr "benzersiz değer" #: schemas/utils.py:38 #, python-brace-format msgid "A {value_type} identifying this {name}." -msgstr "" +msgstr "Bir {name} öğesini tanımlayan {value_type}." #: serializers.py:337 #, python-brace-format @@ -487,7 +488,7 @@ msgstr "Geçersiz veri. Sözlük bekleniyordu fakat {datatype} geldi. " #: templates/rest_framework/admin.html:116 #: templates/rest_framework/base.html:136 msgid "Extra Actions" -msgstr "" +msgstr "Ekstra Eylemler" #: templates/rest_framework/admin.html:130 #: templates/rest_framework/base.html:150 @@ -496,27 +497,27 @@ msgstr "Filtreler" #: templates/rest_framework/base.html:37 msgid "navbar" -msgstr "" +msgstr "navigasyon çubuğu" #: templates/rest_framework/base.html:75 msgid "content" -msgstr "" +msgstr "içerik" #: templates/rest_framework/base.html:78 msgid "request form" -msgstr "" +msgstr "istek formu" #: templates/rest_framework/base.html:157 msgid "main content" -msgstr "" +msgstr "ana içerik" #: templates/rest_framework/base.html:173 msgid "request info" -msgstr "" +msgstr "istek bilgisi" #: templates/rest_framework/base.html:177 msgid "response info" -msgstr "" +msgstr "cevap bilgisi" #: templates/rest_framework/horizontal/radio.html:4 #: templates/rest_framework/inline/radio.html:3 @@ -542,7 +543,7 @@ msgstr "{field_names} hep birlikte eşsiz bir küme oluşturmalılar." #: validators.py:171 #, python-brace-format msgid "Surrogate characters are not allowed: U+{code_point:X}." -msgstr "" +msgstr "Yerine konulmuş karakterlere izin verilmiyor: U+{code_point:X}." #: validators.py:243 #, python-brace-format @@ -569,7 +570,7 @@ msgstr "URL dizininde geçersiz versiyon." #: versioning.py:116 msgid "Invalid version in URL path. Does not match any version namespace." -msgstr "" +msgstr "Geçersiz versiyon URL dizininde. Hiçbir versiyon ad alanı ile eşleşmiyor." #: versioning.py:148 msgid "Invalid version in hostname." diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 0b87aa8fc..8fe284bc8 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -1469,12 +1469,13 @@ class ModelSerializer(Serializer): model_field.unique_for_year} unique_constraint_names -= {None} + model_fields_names = set(model_fields.keys()) # Include each of the `unique_together` and `UniqueConstraint` field names, # so long as all the field names are included on the serializer. for unique_together_list, queryset, condition_fields, condition in self.get_unique_together_constraints(model): unique_together_list_and_condition_fields = set(unique_together_list) | set(condition_fields) - if set(field_names).issuperset(unique_together_list_and_condition_fields): + if model_fields_names.issuperset(unique_together_list_and_condition_fields): unique_constraint_names |= unique_together_list_and_condition_fields # Now we have all the field names that have uniqueness constraints diff --git a/tests/test_fields.py b/tests/test_fields.py index d574b07eb..56693ed7a 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -9,13 +9,9 @@ from enum import auto from unittest.mock import patch from zoneinfo import ZoneInfo +import django import pytest - -try: - import pytz -except ImportError: - pytz = None - +import pytz from django.core.exceptions import ValidationError as DjangoValidationError from django.db.models import IntegerChoices, TextChoices from django.http import QueryDict @@ -1624,7 +1620,10 @@ class TestCustomTimezoneForDateTimeField(TestCase): assert rendered_date == rendered_date_in_timezone -@pytest.mark.skipif(pytz is None, reason="Django 5.0 has removed pytz; this test should eventually be able to get removed.") +@pytest.mark.skipif( + condition=django.VERSION >= (5,), + reason="Django 5.0 has removed pytz; this test should eventually be able to get removed.", +) class TestPytzNaiveDayLightSavingTimeTimeZoneDateTimeField(FieldValues): """ Invalid values for `DateTimeField` with datetime in DST shift (non-existing or ambiguous) and timezone with DST. @@ -1638,16 +1637,15 @@ class TestPytzNaiveDayLightSavingTimeTimeZoneDateTimeField(FieldValues): } outputs = {} - if pytz: - class MockTimezone(pytz.BaseTzInfo): - @staticmethod - def localize(value, is_dst): - raise pytz.InvalidTimeError() + class MockTimezone(pytz.BaseTzInfo): + @staticmethod + def localize(value, is_dst): + raise pytz.InvalidTimeError() - def __str__(self): - return 'America/New_York' + def __str__(self): + return 'America/New_York' - field = serializers.DateTimeField(default_timezone=MockTimezone()) + field = serializers.DateTimeField(default_timezone=MockTimezone()) @patch('rest_framework.utils.timezone.datetime_ambiguous', return_value=True) diff --git a/tests/test_validators.py b/tests/test_validators.py index d19734d98..c594eecbe 100644 --- a/tests/test_validators.py +++ b/tests/test_validators.py @@ -516,6 +516,43 @@ class TestUniquenessTogetherValidation(TestCase): validator.filter_queryset(attrs=data, queryset=queryset, serializer=serializer) assert queryset.called_with == {'race_name': 'bar', 'position': 1} + def test_uniq_together_validation_uses_model_fields_method_field(self): + class TestSerializer(serializers.ModelSerializer): + position = serializers.SerializerMethodField() + + def get_position(self, obj): + return obj.position or 0 + + class Meta: + model = NullUniquenessTogetherModel + fields = ['race_name', 'position'] + + serializer = TestSerializer() + expected = dedent(""" + TestSerializer(): + race_name = CharField(max_length=100) + position = SerializerMethodField() + """) + assert repr(serializer) == expected + + def test_uniq_together_validation_uses_model_fields_with_source_field(self): + class TestSerializer(serializers.ModelSerializer): + pos = serializers.IntegerField(source='position') + + class Meta: + model = NullUniquenessTogetherModel + fields = ['race_name', 'pos'] + + serializer = TestSerializer() + expected = dedent(""" + TestSerializer(): + race_name = CharField(max_length=100, required=True) + pos = IntegerField(source='position') + class Meta: + validators = [] + """) + assert repr(serializer) == expected + class UniqueConstraintModel(models.Model): race_name = models.CharField(max_length=100)