mirror of
https://github.com/encode/django-rest-framework.git
synced 2024-11-10 19:56:59 +03:00
Fix lazy translation of ListField errors (#6708)
* Test init for fields w/ lazy translations * Fix lazy translations for ListField
This commit is contained in:
parent
0d0e7c3ae0
commit
19ca86d8d6
|
@ -1610,10 +1610,10 @@ class ListField(Field):
|
|||
super().__init__(*args, **kwargs)
|
||||
self.child.bind(field_name='', parent=self)
|
||||
if self.max_length is not None:
|
||||
message = self.error_messages['max_length'].format(max_length=self.max_length)
|
||||
message = lazy(self.error_messages['max_length'].format, str)(max_length=self.max_length)
|
||||
self.validators.append(MaxLengthValidator(self.max_length, message=message))
|
||||
if self.min_length is not None:
|
||||
message = self.error_messages['min_length'].format(min_length=self.min_length)
|
||||
message = lazy(self.error_messages['min_length'].format, str)(min_length=self.min_length)
|
||||
self.validators.append(MinLengthValidator(self.min_length, message=message))
|
||||
|
||||
def get_value(self, dictionary):
|
||||
|
|
|
@ -1 +1,16 @@
|
|||
from rest_framework import compat # noqa
|
||||
"""
|
||||
This test "app" exists to ensure that parts of Django REST Framework can be
|
||||
imported/invoked before Django itself has been fully initialized.
|
||||
"""
|
||||
|
||||
from rest_framework import compat, serializers # noqa
|
||||
|
||||
|
||||
# test initializing fields with lazy translations
|
||||
class ExampleSerializer(serializers.Serializer):
|
||||
charfield = serializers.CharField(min_length=1, max_length=2)
|
||||
integerfield = serializers.IntegerField(min_value=1, max_value=2)
|
||||
floatfield = serializers.FloatField(min_value=1, max_value=2)
|
||||
decimalfield = serializers.DecimalField(max_digits=10, decimal_places=1, min_value=1, max_value=2)
|
||||
durationfield = serializers.DurationField(min_value=1, max_value=2)
|
||||
listfield = serializers.ListField(min_length=1, max_length=2)
|
||||
|
|
|
@ -4,10 +4,21 @@ from tests import importable
|
|||
|
||||
|
||||
def test_installed():
|
||||
# ensure that apps can freely import rest_framework.compat
|
||||
# ensure the test app hasn't been removed from the test suite
|
||||
assert 'tests.importable' in settings.INSTALLED_APPS
|
||||
|
||||
|
||||
def test_imported():
|
||||
# ensure that the __init__ hasn't been mucked with
|
||||
def test_compat():
|
||||
assert hasattr(importable, 'compat')
|
||||
|
||||
|
||||
def test_serializer_fields_initialization():
|
||||
assert hasattr(importable, 'ExampleSerializer')
|
||||
|
||||
serializer = importable.ExampleSerializer()
|
||||
assert 'charfield' in serializer.fields
|
||||
assert 'integerfield' in serializer.fields
|
||||
assert 'floatfield' in serializer.fields
|
||||
assert 'decimalfield' in serializer.fields
|
||||
assert 'durationfield' in serializer.fields
|
||||
assert 'listfield' in serializer.fields
|
||||
|
|
Loading…
Reference in New Issue
Block a user