diff --git a/rest_framework/fields.py b/rest_framework/fields.py index d2079d5d6..398bc8b61 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -40,7 +40,7 @@ from rest_framework.settings import api_settings from rest_framework.utils import html, humanize_datetime, representation -class empty: +class Empty: """ This class is used to represent no data being provided for a given input or output value. @@ -301,11 +301,11 @@ class Field(object): 'null': _('This field may not be null.') } default_validators = [] - default_empty_html = empty + default_empty_html = Empty initial = None def __init__(self, read_only=False, write_only=False, - required=None, default=empty, initial=empty, source=None, + required=None, default=Empty, initial=Empty, source=None, label=None, help_text=None, style=None, error_messages=None, validators=None, allow_null=False): self._creation_counter = Field._creation_counter @@ -313,12 +313,12 @@ class Field(object): # If `required` is unset, then use `True` unless a default is provided. if required is None: - required = default is empty and not read_only + required = default is Empty and not read_only # Some combinations of keyword arguments do not make sense. assert not (read_only and write_only), NOT_READ_ONLY_WRITE_ONLY assert not (read_only and required), NOT_READ_ONLY_REQUIRED - assert not (required and default is not empty), NOT_REQUIRED_DEFAULT + assert not (required and default is not Empty), NOT_REQUIRED_DEFAULT assert not (read_only and self.__class__ == Field), USE_READONLYFIELD self.read_only = read_only @@ -326,14 +326,14 @@ class Field(object): self.required = required self.default = default self.source = source - self.initial = self.initial if (initial is empty) else initial + self.initial = self.initial if (initial is Empty) else initial self.label = label self.help_text = help_text self.style = {} if style is None else style self.allow_null = allow_null - if self.default_empty_html is not empty: - if default is not empty: + if self.default_empty_html is not Empty: + if default is not Empty: self.default_empty_html = default if validators is not None: @@ -414,11 +414,11 @@ class Field(object): that should be validated and transformed to a native value. """ if html.is_html_input(dictionary): - # HTML forms will represent empty fields as '', and cannot + # HTML forms will represent Empty fields as '', and cannot # represent None or False values directly. if self.field_name not in dictionary: if getattr(self.root, 'partial', False): - return empty + return Empty return self.default_empty_html ret = dictionary[self.field_name] if ret == '' and self.allow_null: @@ -428,9 +428,9 @@ class Field(object): elif ret == '' and not self.required: # If the field is blank, and emptiness is valid then # determine if we should use emptiness instead. - return '' if getattr(self, 'allow_blank', False) else empty + return '' if getattr(self, 'allow_blank', False) else Empty return ret - return dictionary.get(self.field_name, empty) + return dictionary.get(self.field_name, Empty) def get_attribute(self, instance): """ @@ -440,7 +440,7 @@ class Field(object): try: return get_attribute(instance, self.source_attrs) except (KeyError, AttributeError) as exc: - if self.default is not empty: + if self.default is not Empty: return self.get_default() if not self.required: raise SkipField() @@ -468,7 +468,7 @@ class Field(object): raise `SkipField`, indicating that no value should be set in the validated data for this field. """ - if self.default is empty or getattr(self.root, 'partial', False): + if self.default is Empty or getattr(self.root, 'partial', False): # No default, or this is a partial update. raise SkipField() if callable(self.default): @@ -479,19 +479,19 @@ class Field(object): def validate_empty_values(self, data): """ - Validate empty values, and either: + Validate Empty values, and either: * Raise `ValidationError`, indicating invalid data. * Raise `SkipField`, indicating that the field should be ignored. - * Return (True, data), indicating an empty value that should be + * Return (True, data), indicating an Empty value that should be returned without any further validation being applied. - * Return (False, data), indicating a non-empty value, that should + * Return (False, data), indicating a non-Empty value, that should have validation applied as normal. """ if self.read_only: return (True, self.get_default()) - if data is empty: + if data is Empty: if getattr(self.root, 'partial', False): raise SkipField() if self.required: @@ -505,11 +505,11 @@ class Field(object): return (False, data) - def run_validation(self, data=empty): + def run_validation(self, data=Empty): """ Validate a simple representation and return the internal value. - The provided data may be `empty` if no representation was included + The provided data may be `Empty` if no representation was included in the input. May raise `SkipField` if the field should not be included in the @@ -757,8 +757,8 @@ class CharField(Field): message = self.error_messages['min_length'].format(min_length=self.min_length) self.validators.append(MinLengthValidator(self.min_length, message=message)) - def run_validation(self, data=empty): - # Test for the empty string here so that it does not get validated, + def run_validation(self, data=Empty): + # Test for the Empty string here so that it does not get validated, # and so that subclasses do not need to handle it explicitly # inside the `to_internal_value()` method. if data == '' or (self.trim_whitespace and six.text_type(data).strip() == ''): @@ -1109,8 +1109,8 @@ class DateTimeField(Field): } datetime_parser = datetime.datetime.strptime - def __init__(self, format=empty, input_formats=None, default_timezone=None, *args, **kwargs): - if format is not empty: + def __init__(self, format=Empty, input_formats=None, default_timezone=None, *args, **kwargs): + if format is not Empty: self.format = format if input_formats is not None: self.input_formats = input_formats @@ -1188,8 +1188,8 @@ class DateField(Field): } datetime_parser = datetime.datetime.strptime - def __init__(self, format=empty, input_formats=None, *args, **kwargs): - if format is not empty: + def __init__(self, format=Empty, input_formats=None, *args, **kwargs): + if format is not Empty: self.format = format if input_formats is not None: self.input_formats = input_formats @@ -1254,8 +1254,8 @@ class TimeField(Field): } datetime_parser = datetime.datetime.strptime - def __init__(self, format=empty, input_formats=None, *args, **kwargs): - if format is not empty: + def __init__(self, format=Empty, input_formats=None, *args, **kwargs): + if format is not Empty: self.format = format if input_formats is not None: self.input_formats = input_formats @@ -1382,7 +1382,7 @@ class MultipleChoiceField(ChoiceField): default_error_messages = { 'invalid_choice': _('"{input}" is not a valid choice.'), 'not_a_list': _('Expected a list of items but got type "{input_type}".'), - 'empty': _('This selection may not be empty.') + 'Empty': _('This selection may not be Empty.') } default_empty_html = [] @@ -1393,18 +1393,18 @@ class MultipleChoiceField(ChoiceField): def get_value(self, dictionary): if self.field_name not in dictionary: if getattr(self.root, 'partial', False): - return empty + return Empty # We override the default field access in order to support # lists in HTML forms. if html.is_html_input(dictionary): return dictionary.getlist(self.field_name) - return dictionary.get(self.field_name, empty) + return dictionary.get(self.field_name, Empty) def to_internal_value(self, data): if isinstance(data, type('')) or not hasattr(data, '__iter__'): self.fail('not_a_list', input_type=type(data).__name__) if not self.allow_empty and len(data) == 0: - self.fail('empty') + self.fail('Empty') return { super(MultipleChoiceField, self).to_internal_value(item) @@ -1441,7 +1441,7 @@ class FileField(Field): 'required': _('No file was submitted.'), 'invalid': _('The submitted data was not a file. Check the encoding type on the form.'), 'no_name': _('No filename could be determined.'), - 'empty': _('The submitted file is empty.'), + 'Empty': _('The submitted file is Empty.'), 'max_length': _('Ensure this filename has at most {max_length} characters (it has {length}).'), } @@ -1463,7 +1463,7 @@ class FileField(Field): if not file_name: self.fail('no_name') if not self.allow_empty_file and not file_size: - self.fail('empty') + self.fail('Empty') if self.max_length and len(file_name) > self.max_length: self.fail('max_length', max_length=self.max_length, length=len(file_name)) @@ -1529,7 +1529,7 @@ class ListField(Field): initial = [] default_error_messages = { 'not_a_list': _('Expected a list of items but got type "{input_type}".'), - 'empty': _('This list may not be empty.'), + 'Empty': _('This list may not be Empty.'), 'min_length': _('Ensure this field has at least {min_length} elements.'), 'max_length': _('Ensure this field has no more than {max_length} elements.') } @@ -1558,7 +1558,7 @@ class ListField(Field): def get_value(self, dictionary): if self.field_name not in dictionary: if getattr(self.root, 'partial', False): - return empty + return Empty # We override the default field access in order to support # lists in HTML forms. if html.is_html_input(dictionary): @@ -1567,7 +1567,7 @@ class ListField(Field): # Support QueryDict lists in HTML input. return val return html.parse_html_list(dictionary, prefix=self.field_name) - return dictionary.get(self.field_name, empty) + return dictionary.get(self.field_name, Empty) def to_internal_value(self, data): """ @@ -1578,7 +1578,7 @@ class ListField(Field): if isinstance(data, type('')) or isinstance(data, collections.Mapping) or not hasattr(data, '__iter__'): self.fail('not_a_list', input_type=type(data).__name__) if not self.allow_empty and len(data) == 0: - self.fail('empty') + self.fail('Empty') return [self.child.run_validation(item) for item in data] def to_representation(self, data): @@ -1612,7 +1612,7 @@ class DictField(Field): # dictionaries in HTML forms. if html.is_html_input(dictionary): return html.parse_html_dict(dictionary, prefix=self.field_name) - return dictionary.get(self.field_name, empty) + return dictionary.get(self.field_name, Empty) def to_internal_value(self, data): """ @@ -1656,7 +1656,7 @@ class JSONField(Field): ret.is_json_string = True return ret return JSONString(dictionary[self.field_name]) - return dictionary.get(self.field_name, empty) + return dictionary.get(self.field_name, Empty) def to_internal_value(self, data): try: @@ -1719,7 +1719,7 @@ class HiddenField(Field): def get_value(self, dictionary): # We always use the default value for `HiddenField`. # User input is never provided or accepted. - return empty + return Empty def to_internal_value(self, data): return data diff --git a/rest_framework/locale/ach/LC_MESSAGES/django.po b/rest_framework/locale/ach/LC_MESSAGES/django.po index a245f1510..9b60f80f2 100644 --- a/rest_framework/locale/ach/LC_MESSAGES/django.po +++ b/rest_framework/locale/ach/LC_MESSAGES/django.po @@ -261,7 +261,7 @@ msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" #: fields.py:1302 -msgid "This selection may not be empty." +msgid "This selection may not be Empty." msgstr "" #: fields.py:1339 @@ -282,7 +282,7 @@ msgid "No filename could be determined." msgstr "" #: fields.py:1361 -msgid "The submitted file is empty." +msgid "The submitted file is Empty." msgstr "" #: fields.py:1362 @@ -297,7 +297,7 @@ msgid "" msgstr "" #: fields.py:1449 relations.py:438 serializers.py:525 -msgid "This list may not be empty." +msgid "This list may not be Empty." msgstr "" #: fields.py:1502 diff --git a/rest_framework/locale/ar/LC_MESSAGES/django.mo b/rest_framework/locale/ar/LC_MESSAGES/django.mo index bda2ce995..8a32c5120 100644 Binary files a/rest_framework/locale/ar/LC_MESSAGES/django.mo and b/rest_framework/locale/ar/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/ar/LC_MESSAGES/django.po b/rest_framework/locale/ar/LC_MESSAGES/django.po index ea53a2905..9dd7fbb31 100644 --- a/rest_framework/locale/ar/LC_MESSAGES/django.po +++ b/rest_framework/locale/ar/LC_MESSAGES/django.po @@ -264,7 +264,7 @@ msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" #: fields.py:1302 -msgid "This selection may not be empty." +msgid "This selection may not be Empty." msgstr "" #: fields.py:1339 @@ -285,7 +285,7 @@ msgid "No filename could be determined." msgstr "" #: fields.py:1361 -msgid "The submitted file is empty." +msgid "The submitted file is Empty." msgstr "الملف الذي تم إرساله فارغ." #: fields.py:1362 @@ -300,7 +300,7 @@ msgid "" msgstr "" #: fields.py:1449 relations.py:438 serializers.py:525 -msgid "This list may not be empty." +msgid "This list may not be Empty." msgstr "" #: fields.py:1502 diff --git a/rest_framework/locale/be/LC_MESSAGES/django.po b/rest_framework/locale/be/LC_MESSAGES/django.po index 5aaa072ae..746c463d9 100644 --- a/rest_framework/locale/be/LC_MESSAGES/django.po +++ b/rest_framework/locale/be/LC_MESSAGES/django.po @@ -261,7 +261,7 @@ msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" #: fields.py:1302 -msgid "This selection may not be empty." +msgid "This selection may not be Empty." msgstr "" #: fields.py:1339 @@ -282,7 +282,7 @@ msgid "No filename could be determined." msgstr "" #: fields.py:1361 -msgid "The submitted file is empty." +msgid "The submitted file is Empty." msgstr "" #: fields.py:1362 @@ -297,7 +297,7 @@ msgid "" msgstr "" #: fields.py:1449 relations.py:438 serializers.py:525 -msgid "This list may not be empty." +msgid "This list may not be Empty." msgstr "" #: fields.py:1502 diff --git a/rest_framework/locale/ca/LC_MESSAGES/django.mo b/rest_framework/locale/ca/LC_MESSAGES/django.mo index 28faf17ff..4a25f76ec 100644 Binary files a/rest_framework/locale/ca/LC_MESSAGES/django.mo and b/rest_framework/locale/ca/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/ca/LC_MESSAGES/django.po b/rest_framework/locale/ca/LC_MESSAGES/django.po index f82de0068..7ca40bca4 100644 --- a/rest_framework/locale/ca/LC_MESSAGES/django.po +++ b/rest_framework/locale/ca/LC_MESSAGES/django.po @@ -261,7 +261,7 @@ 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 -msgid "This selection may not be empty." +msgid "This selection may not be Empty." msgstr "Aquesta selecció no pot estar buida." #: fields.py:1339 @@ -282,7 +282,7 @@ msgid "No filename could be determined." msgstr "No s'ha pogut determinar el nom del fitxer." #: fields.py:1361 -msgid "The submitted file is empty." +msgid "The submitted file is Empty." msgstr "El fitxer enviat està buit." #: fields.py:1362 @@ -297,7 +297,7 @@ msgid "" 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 -msgid "This list may not be empty." +msgid "This list may not be Empty." msgstr "Aquesta llista no pot estar buida." #: fields.py:1502 diff --git a/rest_framework/locale/ca_ES/LC_MESSAGES/django.po b/rest_framework/locale/ca_ES/LC_MESSAGES/django.po index c9ce5fd13..bbb4d9c71 100644 --- a/rest_framework/locale/ca_ES/LC_MESSAGES/django.po +++ b/rest_framework/locale/ca_ES/LC_MESSAGES/django.po @@ -261,7 +261,7 @@ msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" #: fields.py:1302 -msgid "This selection may not be empty." +msgid "This selection may not be Empty." msgstr "" #: fields.py:1339 @@ -282,7 +282,7 @@ msgid "No filename could be determined." msgstr "" #: fields.py:1361 -msgid "The submitted file is empty." +msgid "The submitted file is Empty." msgstr "" #: fields.py:1362 @@ -297,7 +297,7 @@ msgid "" msgstr "" #: fields.py:1449 relations.py:438 serializers.py:525 -msgid "This list may not be empty." +msgid "This list may not be Empty." msgstr "" #: fields.py:1502 diff --git a/rest_framework/locale/cs/LC_MESSAGES/django.mo b/rest_framework/locale/cs/LC_MESSAGES/django.mo index 4352fb091..b9f5ef2b1 100644 Binary files a/rest_framework/locale/cs/LC_MESSAGES/django.mo and b/rest_framework/locale/cs/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/cs/LC_MESSAGES/django.po b/rest_framework/locale/cs/LC_MESSAGES/django.po index b6ee1ea48..64af0fc5a 100644 --- a/rest_framework/locale/cs/LC_MESSAGES/django.po +++ b/rest_framework/locale/cs/LC_MESSAGES/django.po @@ -263,7 +263,7 @@ 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 -msgid "This selection may not be empty." +msgid "This selection may not be Empty." msgstr "" #: fields.py:1339 @@ -284,7 +284,7 @@ msgid "No filename could be determined." msgstr "Nebylo možné zjistit jméno souboru." #: fields.py:1361 -msgid "The submitted file is empty." +msgid "The submitted file is Empty." msgstr "Zaslaný soubor je prázdný." #: fields.py:1362 @@ -299,7 +299,7 @@ msgid "" msgstr "Nahrajte platný obrázek. Nahraný soubor buď není obrázkem nebo je poškozen." #: fields.py:1449 relations.py:438 serializers.py:525 -msgid "This list may not be empty." +msgid "This list may not be Empty." msgstr "" #: fields.py:1502 diff --git a/rest_framework/locale/da/LC_MESSAGES/django.mo b/rest_framework/locale/da/LC_MESSAGES/django.mo index 1983e068f..717f1e322 100644 Binary files a/rest_framework/locale/da/LC_MESSAGES/django.mo and b/rest_framework/locale/da/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/da/LC_MESSAGES/django.po b/rest_framework/locale/da/LC_MESSAGES/django.po index 900695649..5a5909c32 100644 --- a/rest_framework/locale/da/LC_MESSAGES/django.po +++ b/rest_framework/locale/da/LC_MESSAGES/django.po @@ -263,7 +263,7 @@ 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 -msgid "This selection may not be empty." +msgid "This selection may not be Empty." msgstr "Dette valg kan være tomt." #: fields.py:1339 @@ -284,7 +284,7 @@ msgid "No filename could be determined." msgstr "Filnavnet kunne ikke afgøres." #: fields.py:1361 -msgid "The submitted file is empty." +msgid "The submitted file is Empty." msgstr "Den medsendte fil er tom." #: fields.py:1362 @@ -299,7 +299,7 @@ msgid "" 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 -msgid "This list may not be empty." +msgid "This list may not be Empty." msgstr "Denne liste er muligvis ikke tom." #: fields.py:1502 diff --git a/rest_framework/locale/de/LC_MESSAGES/django.mo b/rest_framework/locale/de/LC_MESSAGES/django.mo index eb0ddf66d..95492f0d1 100644 Binary files a/rest_framework/locale/de/LC_MESSAGES/django.mo and b/rest_framework/locale/de/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/de/LC_MESSAGES/django.po b/rest_framework/locale/de/LC_MESSAGES/django.po index 725a0f757..33b4e9d49 100644 --- a/rest_framework/locale/de/LC_MESSAGES/django.po +++ b/rest_framework/locale/de/LC_MESSAGES/django.po @@ -269,7 +269,7 @@ 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 -msgid "This selection may not be empty." +msgid "This selection may not be Empty." msgstr "Diese Auswahl darf nicht leer sein" #: fields.py:1339 @@ -290,7 +290,7 @@ msgid "No filename could be determined." msgstr "Der Dateiname konnte nicht ermittelt werden." #: fields.py:1361 -msgid "The submitted file is empty." +msgid "The submitted file is Empty." msgstr "Die übermittelte Datei ist leer." #: fields.py:1362 @@ -305,7 +305,7 @@ msgid "" 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 -msgid "This list may not be empty." +msgid "This list may not be Empty." msgstr "Diese Liste darf nicht leer sein." #: fields.py:1502 diff --git a/rest_framework/locale/el/LC_MESSAGES/django.mo b/rest_framework/locale/el/LC_MESSAGES/django.mo index d275dba3b..ee18fefde 100644 Binary files a/rest_framework/locale/el/LC_MESSAGES/django.mo and b/rest_framework/locale/el/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/el/LC_MESSAGES/django.po b/rest_framework/locale/el/LC_MESSAGES/django.po index 18eb371c9..e3d0227c1 100644 --- a/rest_framework/locale/el/LC_MESSAGES/django.po +++ b/rest_framework/locale/el/LC_MESSAGES/django.po @@ -262,7 +262,7 @@ msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Αναμένεται μια λίστα αντικειμένον αλλά δόθηκε ο τύπος \"{input_type}\"" #: fields.py:1302 -msgid "This selection may not be empty." +msgid "This selection may not be Empty." msgstr "Η επιλογή δε μπορεί να είναι κενή." #: fields.py:1339 @@ -283,7 +283,7 @@ msgid "No filename could be determined." msgstr "Δε βρέθηκε όνομα αρχείου." #: fields.py:1361 -msgid "The submitted file is empty." +msgid "The submitted file is Empty." msgstr "Το αρχείο που υποβλήθηκε είναι κενό." #: fields.py:1362 @@ -298,7 +298,7 @@ msgid "" msgstr "Ανεβάστε μια έγκυρη εικόνα. Το αρχείο που ανεβάσατε είτε δεν είναι εικόνα είτε έχει καταστραφεί." #: fields.py:1449 relations.py:438 serializers.py:525 -msgid "This list may not be empty." +msgid "This list may not be Empty." msgstr "Η λίστα δε μπορεί να είναι κενή." #: fields.py:1502 diff --git a/rest_framework/locale/el_GR/LC_MESSAGES/django.po b/rest_framework/locale/el_GR/LC_MESSAGES/django.po index 051a88783..885428bc5 100644 --- a/rest_framework/locale/el_GR/LC_MESSAGES/django.po +++ b/rest_framework/locale/el_GR/LC_MESSAGES/django.po @@ -261,7 +261,7 @@ msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" #: fields.py:1302 -msgid "This selection may not be empty." +msgid "This selection may not be Empty." msgstr "" #: fields.py:1339 @@ -282,7 +282,7 @@ msgid "No filename could be determined." msgstr "" #: fields.py:1361 -msgid "The submitted file is empty." +msgid "The submitted file is Empty." msgstr "" #: fields.py:1362 @@ -297,7 +297,7 @@ msgid "" msgstr "" #: fields.py:1449 relations.py:438 serializers.py:525 -msgid "This list may not be empty." +msgid "This list may not be Empty." msgstr "" #: fields.py:1502 diff --git a/rest_framework/locale/en/LC_MESSAGES/django.mo b/rest_framework/locale/en/LC_MESSAGES/django.mo index 13760f707..dabf53705 100644 Binary files a/rest_framework/locale/en/LC_MESSAGES/django.mo and b/rest_framework/locale/en/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/en/LC_MESSAGES/django.po b/rest_framework/locale/en/LC_MESSAGES/django.po index ac7f4fa71..1fc8236b2 100644 --- a/rest_framework/locale/en/LC_MESSAGES/django.po +++ b/rest_framework/locale/en/LC_MESSAGES/django.po @@ -261,8 +261,8 @@ 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 -msgid "This selection may not be empty." -msgstr "This selection may not be empty." +msgid "This selection may not be Empty." +msgstr "This selection may not be Empty." #: fields.py:1339 msgid "\"{input}\" is not a valid path choice." @@ -282,8 +282,8 @@ msgid "No filename could be determined." msgstr "No filename could be determined." #: fields.py:1361 -msgid "The submitted file is empty." -msgstr "The submitted file is empty." +msgid "The submitted file is Empty." +msgstr "The submitted file is Empty." #: fields.py:1362 msgid "" @@ -297,8 +297,8 @@ msgid "" 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 -msgid "This list may not be empty." -msgstr "This list may not be empty." +msgid "This list may not be Empty." +msgstr "This list may not be Empty." #: fields.py:1502 msgid "Expected a dictionary of items but got type \"{input_type}\"." diff --git a/rest_framework/locale/en_AU/LC_MESSAGES/django.po b/rest_framework/locale/en_AU/LC_MESSAGES/django.po index 18c70fb96..0999862b1 100644 --- a/rest_framework/locale/en_AU/LC_MESSAGES/django.po +++ b/rest_framework/locale/en_AU/LC_MESSAGES/django.po @@ -261,7 +261,7 @@ msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" #: fields.py:1302 -msgid "This selection may not be empty." +msgid "This selection may not be Empty." msgstr "" #: fields.py:1339 @@ -282,7 +282,7 @@ msgid "No filename could be determined." msgstr "" #: fields.py:1361 -msgid "The submitted file is empty." +msgid "The submitted file is Empty." msgstr "" #: fields.py:1362 @@ -297,7 +297,7 @@ msgid "" msgstr "" #: fields.py:1449 relations.py:438 serializers.py:525 -msgid "This list may not be empty." +msgid "This list may not be Empty." msgstr "" #: fields.py:1502 diff --git a/rest_framework/locale/en_CA/LC_MESSAGES/django.po b/rest_framework/locale/en_CA/LC_MESSAGES/django.po index 144694345..95924f2b9 100644 --- a/rest_framework/locale/en_CA/LC_MESSAGES/django.po +++ b/rest_framework/locale/en_CA/LC_MESSAGES/django.po @@ -261,7 +261,7 @@ msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" #: fields.py:1302 -msgid "This selection may not be empty." +msgid "This selection may not be Empty." msgstr "" #: fields.py:1339 @@ -282,7 +282,7 @@ msgid "No filename could be determined." msgstr "" #: fields.py:1361 -msgid "The submitted file is empty." +msgid "The submitted file is Empty." msgstr "" #: fields.py:1362 @@ -297,7 +297,7 @@ msgid "" msgstr "" #: fields.py:1449 relations.py:438 serializers.py:525 -msgid "This list may not be empty." +msgid "This list may not be Empty." msgstr "" #: fields.py:1502 diff --git a/rest_framework/locale/en_US/LC_MESSAGES/django.po b/rest_framework/locale/en_US/LC_MESSAGES/django.po index 3733a1e33..9e534d181 100644 --- a/rest_framework/locale/en_US/LC_MESSAGES/django.po +++ b/rest_framework/locale/en_US/LC_MESSAGES/django.po @@ -260,7 +260,7 @@ msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" #: fields.py:1302 -msgid "This selection may not be empty." +msgid "This selection may not be Empty." msgstr "" #: fields.py:1339 @@ -280,7 +280,7 @@ msgid "No filename could be determined." msgstr "" #: fields.py:1361 -msgid "The submitted file is empty." +msgid "The submitted file is Empty." msgstr "" #: fields.py:1362 @@ -295,7 +295,7 @@ msgid "" msgstr "" #: fields.py:1449 relations.py:438 serializers.py:525 -msgid "This list may not be empty." +msgid "This list may not be Empty." msgstr "" #: fields.py:1502 diff --git a/rest_framework/locale/es/LC_MESSAGES/django.mo b/rest_framework/locale/es/LC_MESSAGES/django.mo index 372bf6bf6..c48b4df2c 100644 Binary files a/rest_framework/locale/es/LC_MESSAGES/django.mo and b/rest_framework/locale/es/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/es/LC_MESSAGES/django.po b/rest_framework/locale/es/LC_MESSAGES/django.po index c9b6e9455..705307c3b 100644 --- a/rest_framework/locale/es/LC_MESSAGES/django.po +++ b/rest_framework/locale/es/LC_MESSAGES/django.po @@ -267,7 +267,7 @@ 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 -msgid "This selection may not be empty." +msgid "This selection may not be Empty." msgstr "Esta selección no puede estar vacía." #: fields.py:1339 @@ -288,7 +288,7 @@ msgid "No filename could be determined." msgstr "No se pudo determinar un nombre de archivo." #: fields.py:1361 -msgid "The submitted file is empty." +msgid "The submitted file is Empty." msgstr "El archivo enviado está vació." #: fields.py:1362 @@ -303,7 +303,7 @@ msgid "" 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 -msgid "This list may not be empty." +msgid "This list may not be Empty." msgstr "Esta lista no puede estar vacía." #: fields.py:1502 diff --git a/rest_framework/locale/et/LC_MESSAGES/django.mo b/rest_framework/locale/et/LC_MESSAGES/django.mo index eaadf454b..a5f6f03f3 100644 Binary files a/rest_framework/locale/et/LC_MESSAGES/django.mo and b/rest_framework/locale/et/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/et/LC_MESSAGES/django.po b/rest_framework/locale/et/LC_MESSAGES/django.po index cc2c2e3f0..e19d0e5a0 100644 --- a/rest_framework/locale/et/LC_MESSAGES/django.po +++ b/rest_framework/locale/et/LC_MESSAGES/django.po @@ -262,7 +262,7 @@ 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 -msgid "This selection may not be empty." +msgid "This selection may not be Empty." msgstr "" #: fields.py:1339 @@ -283,7 +283,7 @@ msgid "No filename could be determined." msgstr "Ei suutnud tuvastada failinime." #: fields.py:1361 -msgid "The submitted file is empty." +msgid "The submitted file is Empty." msgstr "Esitatud fail oli tühi." #: fields.py:1362 @@ -298,7 +298,7 @@ msgid "" 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 -msgid "This list may not be empty." +msgid "This list may not be Empty." msgstr "" #: fields.py:1502 diff --git a/rest_framework/locale/fa/LC_MESSAGES/django.po b/rest_framework/locale/fa/LC_MESSAGES/django.po index 0aa9ae4c6..a274ba6d0 100644 --- a/rest_framework/locale/fa/LC_MESSAGES/django.po +++ b/rest_framework/locale/fa/LC_MESSAGES/django.po @@ -261,7 +261,7 @@ msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" #: fields.py:1302 -msgid "This selection may not be empty." +msgid "This selection may not be Empty." msgstr "" #: fields.py:1339 @@ -282,7 +282,7 @@ msgid "No filename could be determined." msgstr "" #: fields.py:1361 -msgid "The submitted file is empty." +msgid "The submitted file is Empty." msgstr "" #: fields.py:1362 @@ -297,7 +297,7 @@ msgid "" msgstr "" #: fields.py:1449 relations.py:438 serializers.py:525 -msgid "This list may not be empty." +msgid "This list may not be Empty." msgstr "" #: fields.py:1502 diff --git a/rest_framework/locale/fa_IR/LC_MESSAGES/django.po b/rest_framework/locale/fa_IR/LC_MESSAGES/django.po index 75b6fd156..8e788f1ba 100644 --- a/rest_framework/locale/fa_IR/LC_MESSAGES/django.po +++ b/rest_framework/locale/fa_IR/LC_MESSAGES/django.po @@ -261,7 +261,7 @@ msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" #: fields.py:1302 -msgid "This selection may not be empty." +msgid "This selection may not be Empty." msgstr "" #: fields.py:1339 @@ -282,7 +282,7 @@ msgid "No filename could be determined." msgstr "" #: fields.py:1361 -msgid "The submitted file is empty." +msgid "The submitted file is Empty." msgstr "" #: fields.py:1362 @@ -297,7 +297,7 @@ msgid "" msgstr "" #: fields.py:1449 relations.py:438 serializers.py:525 -msgid "This list may not be empty." +msgid "This list may not be Empty." msgstr "" #: fields.py:1502 diff --git a/rest_framework/locale/fi/LC_MESSAGES/django.mo b/rest_framework/locale/fi/LC_MESSAGES/django.mo index e0231cfb3..277c70719 100644 Binary files a/rest_framework/locale/fi/LC_MESSAGES/django.mo and b/rest_framework/locale/fi/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/fi/LC_MESSAGES/django.po b/rest_framework/locale/fi/LC_MESSAGES/django.po index 0791a3005..367e5664f 100644 --- a/rest_framework/locale/fi/LC_MESSAGES/django.po +++ b/rest_framework/locale/fi/LC_MESSAGES/django.po @@ -263,7 +263,7 @@ msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Odotettiin listaa, saatiin tyyppi {input_type}." #: fields.py:1302 -msgid "This selection may not be empty." +msgid "This selection may not be Empty." msgstr "Valinta ei saa olla tyhjä." #: fields.py:1339 @@ -284,7 +284,7 @@ msgid "No filename could be determined." msgstr "Tiedostonimeä ei voitu päätellä." #: fields.py:1361 -msgid "The submitted file is empty." +msgid "The submitted file is Empty." msgstr "Lähetetty tiedosto on tyhjä." #: fields.py:1362 @@ -299,7 +299,7 @@ msgid "" 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 -msgid "This list may not be empty." +msgid "This list may not be Empty." msgstr "Lista ei saa olla tyhjä." #: fields.py:1502 diff --git a/rest_framework/locale/fr/LC_MESSAGES/django.mo b/rest_framework/locale/fr/LC_MESSAGES/django.mo index e3ba4a2c5..63f59a332 100644 Binary files a/rest_framework/locale/fr/LC_MESSAGES/django.mo and b/rest_framework/locale/fr/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/fr/LC_MESSAGES/django.po b/rest_framework/locale/fr/LC_MESSAGES/django.po index 25b39e453..f26dbebcf 100644 --- a/rest_framework/locale/fr/LC_MESSAGES/django.po +++ b/rest_framework/locale/fr/LC_MESSAGES/django.po @@ -265,7 +265,7 @@ msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Attendait une liste d'éléments mais a reçu \"{input_type}\"." #: fields.py:1302 -msgid "This selection may not be empty." +msgid "This selection may not be Empty." msgstr "Cette sélection ne peut être vide." #: fields.py:1339 @@ -286,7 +286,7 @@ msgid "No filename could be determined." msgstr "Le nom de fichier n'a pu être déterminé." #: fields.py:1361 -msgid "The submitted file is empty." +msgid "The submitted file is Empty." msgstr "Le fichier soumis est vide." #: fields.py:1362 @@ -301,7 +301,7 @@ msgid "" 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 -msgid "This list may not be empty." +msgid "This list may not be Empty." msgstr "Cette liste ne peut pas être vide." #: fields.py:1502 diff --git a/rest_framework/locale/fr_CA/LC_MESSAGES/django.po b/rest_framework/locale/fr_CA/LC_MESSAGES/django.po index 84cbdf4cc..02ff02f9b 100644 --- a/rest_framework/locale/fr_CA/LC_MESSAGES/django.po +++ b/rest_framework/locale/fr_CA/LC_MESSAGES/django.po @@ -261,7 +261,7 @@ msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" #: fields.py:1302 -msgid "This selection may not be empty." +msgid "This selection may not be Empty." msgstr "" #: fields.py:1339 @@ -282,7 +282,7 @@ msgid "No filename could be determined." msgstr "" #: fields.py:1361 -msgid "The submitted file is empty." +msgid "The submitted file is Empty." msgstr "" #: fields.py:1362 @@ -297,7 +297,7 @@ msgid "" msgstr "" #: fields.py:1449 relations.py:438 serializers.py:525 -msgid "This list may not be empty." +msgid "This list may not be Empty." msgstr "" #: fields.py:1502 diff --git a/rest_framework/locale/gl/LC_MESSAGES/django.po b/rest_framework/locale/gl/LC_MESSAGES/django.po index 5ec55729e..fba9ddcbf 100644 --- a/rest_framework/locale/gl/LC_MESSAGES/django.po +++ b/rest_framework/locale/gl/LC_MESSAGES/django.po @@ -261,7 +261,7 @@ msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" #: fields.py:1302 -msgid "This selection may not be empty." +msgid "This selection may not be Empty." msgstr "" #: fields.py:1339 @@ -282,7 +282,7 @@ msgid "No filename could be determined." msgstr "" #: fields.py:1361 -msgid "The submitted file is empty." +msgid "The submitted file is Empty." msgstr "" #: fields.py:1362 @@ -297,7 +297,7 @@ msgid "" msgstr "" #: fields.py:1449 relations.py:438 serializers.py:525 -msgid "This list may not be empty." +msgid "This list may not be Empty." msgstr "" #: fields.py:1502 diff --git a/rest_framework/locale/gl_ES/LC_MESSAGES/django.po b/rest_framework/locale/gl_ES/LC_MESSAGES/django.po index 870c0916f..8c20bc46b 100644 --- a/rest_framework/locale/gl_ES/LC_MESSAGES/django.po +++ b/rest_framework/locale/gl_ES/LC_MESSAGES/django.po @@ -262,7 +262,7 @@ msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" #: fields.py:1302 -msgid "This selection may not be empty." +msgid "This selection may not be Empty." msgstr "" #: fields.py:1339 @@ -283,7 +283,7 @@ msgid "No filename could be determined." msgstr "" #: fields.py:1361 -msgid "The submitted file is empty." +msgid "The submitted file is Empty." msgstr "" #: fields.py:1362 @@ -298,7 +298,7 @@ msgid "" msgstr "" #: fields.py:1449 relations.py:438 serializers.py:525 -msgid "This list may not be empty." +msgid "This list may not be Empty." msgstr "" #: fields.py:1502 diff --git a/rest_framework/locale/he_IL/LC_MESSAGES/django.po b/rest_framework/locale/he_IL/LC_MESSAGES/django.po index 686ae6fa7..0fb9168db 100644 --- a/rest_framework/locale/he_IL/LC_MESSAGES/django.po +++ b/rest_framework/locale/he_IL/LC_MESSAGES/django.po @@ -261,7 +261,7 @@ msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" #: fields.py:1302 -msgid "This selection may not be empty." +msgid "This selection may not be Empty." msgstr "" #: fields.py:1339 @@ -282,7 +282,7 @@ msgid "No filename could be determined." msgstr "" #: fields.py:1361 -msgid "The submitted file is empty." +msgid "The submitted file is Empty." msgstr "" #: fields.py:1362 @@ -297,7 +297,7 @@ msgid "" msgstr "" #: fields.py:1449 relations.py:438 serializers.py:525 -msgid "This list may not be empty." +msgid "This list may not be Empty." msgstr "" #: fields.py:1502 diff --git a/rest_framework/locale/hu/LC_MESSAGES/django.mo b/rest_framework/locale/hu/LC_MESSAGES/django.mo index 8b884fbed..fcca455fa 100644 Binary files a/rest_framework/locale/hu/LC_MESSAGES/django.mo and b/rest_framework/locale/hu/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/hu/LC_MESSAGES/django.po b/rest_framework/locale/hu/LC_MESSAGES/django.po index 9002f8e61..0160e84e1 100644 --- a/rest_framework/locale/hu/LC_MESSAGES/django.po +++ b/rest_framework/locale/hu/LC_MESSAGES/django.po @@ -262,7 +262,7 @@ msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Elemek listája helyett \"{input_type}\" lett elküldve." #: fields.py:1302 -msgid "This selection may not be empty." +msgid "This selection may not be Empty." msgstr "" #: fields.py:1339 @@ -283,7 +283,7 @@ msgid "No filename could be determined." msgstr "A fájlnév nem megállapítható." #: fields.py:1361 -msgid "The submitted file is empty." +msgid "The submitted file is Empty." msgstr "A küldött fájl üres." #: fields.py:1362 @@ -298,7 +298,7 @@ msgid "" 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 -msgid "This list may not be empty." +msgid "This list may not be Empty." msgstr "" #: fields.py:1502 diff --git a/rest_framework/locale/id/LC_MESSAGES/django.po b/rest_framework/locale/id/LC_MESSAGES/django.po index c84add0a4..0ea89049d 100644 --- a/rest_framework/locale/id/LC_MESSAGES/django.po +++ b/rest_framework/locale/id/LC_MESSAGES/django.po @@ -261,7 +261,7 @@ msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" #: fields.py:1302 -msgid "This selection may not be empty." +msgid "This selection may not be Empty." msgstr "" #: fields.py:1339 @@ -282,7 +282,7 @@ msgid "No filename could be determined." msgstr "" #: fields.py:1361 -msgid "The submitted file is empty." +msgid "The submitted file is Empty." msgstr "" #: fields.py:1362 @@ -297,7 +297,7 @@ msgid "" msgstr "" #: fields.py:1449 relations.py:438 serializers.py:525 -msgid "This list may not be empty." +msgid "This list may not be Empty." msgstr "" #: fields.py:1502 diff --git a/rest_framework/locale/it/LC_MESSAGES/django.mo b/rest_framework/locale/it/LC_MESSAGES/django.mo index a9510eb89..52da56370 100644 Binary files a/rest_framework/locale/it/LC_MESSAGES/django.mo and b/rest_framework/locale/it/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/it/LC_MESSAGES/django.po b/rest_framework/locale/it/LC_MESSAGES/django.po index a48f8645d..bf30c3f5f 100644 --- a/rest_framework/locale/it/LC_MESSAGES/django.po +++ b/rest_framework/locale/it/LC_MESSAGES/django.po @@ -265,7 +265,7 @@ 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 -msgid "This selection may not be empty." +msgid "This selection may not be Empty." msgstr "Questa selezione potrebbe non essere vuota." #: fields.py:1339 @@ -286,7 +286,7 @@ msgid "No filename could be determined." msgstr "Il nome del file non può essere determinato." #: fields.py:1361 -msgid "The submitted file is empty." +msgid "The submitted file is Empty." msgstr "Il file inviato è vuoto." #: fields.py:1362 @@ -301,7 +301,7 @@ msgid "" 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 -msgid "This list may not be empty." +msgid "This list may not be Empty." msgstr "Questa lista potrebbe non essere vuota." #: fields.py:1502 diff --git a/rest_framework/locale/ja/LC_MESSAGES/django.mo b/rest_framework/locale/ja/LC_MESSAGES/django.mo index 9ce42cfb3..f031a8613 100644 Binary files a/rest_framework/locale/ja/LC_MESSAGES/django.mo and b/rest_framework/locale/ja/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/ja/LC_MESSAGES/django.po b/rest_framework/locale/ja/LC_MESSAGES/django.po index a5e72d9a1..c7fff36f7 100644 --- a/rest_framework/locale/ja/LC_MESSAGES/django.po +++ b/rest_framework/locale/ja/LC_MESSAGES/django.po @@ -263,7 +263,7 @@ msgid "Expected a list of items but got type \"{input_type}\"." msgstr "\"{input_type}\" 型のデータではなく項目のリストを入力してください。" #: fields.py:1302 -msgid "This selection may not be empty." +msgid "This selection may not be Empty." msgstr "空でない項目を選択してください。" #: fields.py:1339 @@ -284,7 +284,7 @@ msgid "No filename could be determined." msgstr "ファイル名が取得できませんでした。" #: fields.py:1361 -msgid "The submitted file is empty." +msgid "The submitted file is Empty." msgstr "添付ファイルの中身が空でした。" #: fields.py:1362 @@ -299,7 +299,7 @@ msgid "" msgstr "有効な画像をアップロードしてください。アップロードされたファイルは画像でないか壊れた画像です。" #: fields.py:1449 relations.py:438 serializers.py:525 -msgid "This list may not be empty." +msgid "This list may not be Empty." msgstr "リストは空ではいけません。" #: fields.py:1502 diff --git a/rest_framework/locale/ko_KR/LC_MESSAGES/django.mo b/rest_framework/locale/ko_KR/LC_MESSAGES/django.mo index f83b7ed71..c39c4fd2d 100644 Binary files a/rest_framework/locale/ko_KR/LC_MESSAGES/django.mo and b/rest_framework/locale/ko_KR/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/ko_KR/LC_MESSAGES/django.po b/rest_framework/locale/ko_KR/LC_MESSAGES/django.po index 152bc7b00..110c090d1 100644 --- a/rest_framework/locale/ko_KR/LC_MESSAGES/django.po +++ b/rest_framework/locale/ko_KR/LC_MESSAGES/django.po @@ -263,7 +263,7 @@ msgid "Expected a list of items but got type \"{input_type}\"." msgstr "아이템 리스트가 예상되었으나 \"{input_type}\"를 받았습니다." #: fields.py:1302 -msgid "This selection may not be empty." +msgid "This selection may not be Empty." msgstr "이 선택 항목은 비워 둘 수 없습니다." #: fields.py:1339 @@ -284,7 +284,7 @@ msgid "No filename could be determined." msgstr "파일명을 알 수 없습니다." #: fields.py:1361 -msgid "The submitted file is empty." +msgid "The submitted file is Empty." msgstr "제출된 파일이 비어있습니다." #: fields.py:1362 @@ -299,7 +299,7 @@ msgid "" msgstr "유효한 이미지 파일을 업로드 하십시오. 업로드 하신 파일은 이미지 파일이 아니거나 손상된 이미지 파일입니다." #: fields.py:1449 relations.py:438 serializers.py:525 -msgid "This list may not be empty." +msgid "This list may not be Empty." msgstr "이 리스트는 비워 둘 수 없습니다." #: fields.py:1502 diff --git a/rest_framework/locale/lv/LC_MESSAGES/django.mo b/rest_framework/locale/lv/LC_MESSAGES/django.mo index 2dc5956f3..77436d42e 100644 Binary files a/rest_framework/locale/lv/LC_MESSAGES/django.mo and b/rest_framework/locale/lv/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/lv/LC_MESSAGES/django.po b/rest_framework/locale/lv/LC_MESSAGES/django.po index 2bc978866..0700fb52b 100644 --- a/rest_framework/locale/lv/LC_MESSAGES/django.po +++ b/rest_framework/locale/lv/LC_MESSAGES/django.po @@ -262,7 +262,7 @@ 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 -msgid "This selection may not be empty." +msgid "This selection may not be Empty." msgstr "Šī daļa nevar būt tukša." #: fields.py:1339 @@ -283,7 +283,7 @@ msgid "No filename could be determined." msgstr "Faila nosaukums nevar tikt noteikts." #: fields.py:1361 -msgid "The submitted file is empty." +msgid "The submitted file is Empty." msgstr "Pievienotais fails ir tukšs." #: fields.py:1362 @@ -298,7 +298,7 @@ msgid "" 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 -msgid "This list may not be empty." +msgid "This list may not be Empty." msgstr "Šis saraksts nevar būt tukšs." #: fields.py:1502 diff --git a/rest_framework/locale/mk/LC_MESSAGES/django.mo b/rest_framework/locale/mk/LC_MESSAGES/django.mo index ae9956f25..37448a8c9 100644 Binary files a/rest_framework/locale/mk/LC_MESSAGES/django.mo and b/rest_framework/locale/mk/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/mk/LC_MESSAGES/django.po b/rest_framework/locale/mk/LC_MESSAGES/django.po index 0e59663d0..c79a15052 100644 --- a/rest_framework/locale/mk/LC_MESSAGES/django.po +++ b/rest_framework/locale/mk/LC_MESSAGES/django.po @@ -262,7 +262,7 @@ msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Очекувана беше листа од ставки, а внесено беше „{input_type}“." #: fields.py:1302 -msgid "This selection may not be empty." +msgid "This selection may not be Empty." msgstr "" #: fields.py:1339 @@ -283,7 +283,7 @@ msgid "No filename could be determined." msgstr "Не може да се открие име на фајлот." #: fields.py:1361 -msgid "The submitted file is empty." +msgid "The submitted file is Empty." msgstr "Качениот (upload-иран) фајл е празен." #: fields.py:1362 @@ -298,7 +298,7 @@ msgid "" msgstr "Качете (upload-ирајте) валидна слика. Фајлот што го качивте не е валидна слика или е расипан." #: fields.py:1449 relations.py:438 serializers.py:525 -msgid "This list may not be empty." +msgid "This list may not be Empty." msgstr "Оваа листа не смее да биде празна." #: fields.py:1502 diff --git a/rest_framework/locale/nb/LC_MESSAGES/django.mo b/rest_framework/locale/nb/LC_MESSAGES/django.mo index d942abc2c..6fe25ce47 100644 Binary files a/rest_framework/locale/nb/LC_MESSAGES/django.mo and b/rest_framework/locale/nb/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/nb/LC_MESSAGES/django.po b/rest_framework/locale/nb/LC_MESSAGES/django.po index f9ecada63..be9a2ee4e 100644 --- a/rest_framework/locale/nb/LC_MESSAGES/django.po +++ b/rest_framework/locale/nb/LC_MESSAGES/django.po @@ -262,7 +262,7 @@ 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 -msgid "This selection may not be empty." +msgid "This selection may not be Empty." msgstr "Dette valget kan ikke være tomt." #: fields.py:1339 @@ -283,7 +283,7 @@ msgid "No filename could be determined." msgstr "Kunne ikke finne filnavn." #: fields.py:1361 -msgid "The submitted file is empty." +msgid "The submitted file is Empty." msgstr "Den innsendte filen er tom." #: fields.py:1362 @@ -298,7 +298,7 @@ msgid "" 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 -msgid "This list may not be empty." +msgid "This list may not be Empty." msgstr "Denne listen kan ikke være tom." #: fields.py:1502 diff --git a/rest_framework/locale/nl/LC_MESSAGES/django.mo b/rest_framework/locale/nl/LC_MESSAGES/django.mo index 782bf1634..f3d57f0ff 100644 Binary files a/rest_framework/locale/nl/LC_MESSAGES/django.mo and b/rest_framework/locale/nl/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/nl/LC_MESSAGES/django.po b/rest_framework/locale/nl/LC_MESSAGES/django.po index 370f3aa41..2b9094ef2 100644 --- a/rest_framework/locale/nl/LC_MESSAGES/django.po +++ b/rest_framework/locale/nl/LC_MESSAGES/django.po @@ -266,7 +266,7 @@ 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 -msgid "This selection may not be empty." +msgid "This selection may not be Empty." msgstr "Deze selectie mag niet leeg zijn." #: fields.py:1339 @@ -287,7 +287,7 @@ msgid "No filename could be determined." msgstr "Bestandsnaam kon niet vastgesteld worden." #: fields.py:1361 -msgid "The submitted file is empty." +msgid "The submitted file is Empty." msgstr "Het verstuurde bestand is leeg." #: fields.py:1362 @@ -302,7 +302,7 @@ msgid "" 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 -msgid "This list may not be empty." +msgid "This list may not be Empty." msgstr "Deze lijst mag niet leeg zijn." #: fields.py:1502 diff --git a/rest_framework/locale/nn/LC_MESSAGES/django.po b/rest_framework/locale/nn/LC_MESSAGES/django.po index bd4d690d2..c09d7f033 100644 --- a/rest_framework/locale/nn/LC_MESSAGES/django.po +++ b/rest_framework/locale/nn/LC_MESSAGES/django.po @@ -261,7 +261,7 @@ msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" #: fields.py:1302 -msgid "This selection may not be empty." +msgid "This selection may not be Empty." msgstr "" #: fields.py:1339 @@ -282,7 +282,7 @@ msgid "No filename could be determined." msgstr "" #: fields.py:1361 -msgid "The submitted file is empty." +msgid "The submitted file is Empty." msgstr "" #: fields.py:1362 @@ -297,7 +297,7 @@ msgid "" msgstr "" #: fields.py:1449 relations.py:438 serializers.py:525 -msgid "This list may not be empty." +msgid "This list may not be Empty." msgstr "" #: fields.py:1502 diff --git a/rest_framework/locale/no/LC_MESSAGES/django.po b/rest_framework/locale/no/LC_MESSAGES/django.po index 1ddd6675f..6be6c3eab 100644 --- a/rest_framework/locale/no/LC_MESSAGES/django.po +++ b/rest_framework/locale/no/LC_MESSAGES/django.po @@ -261,7 +261,7 @@ msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" #: fields.py:1302 -msgid "This selection may not be empty." +msgid "This selection may not be Empty." msgstr "" #: fields.py:1339 @@ -282,7 +282,7 @@ msgid "No filename could be determined." msgstr "" #: fields.py:1361 -msgid "The submitted file is empty." +msgid "The submitted file is Empty." msgstr "" #: fields.py:1362 @@ -297,7 +297,7 @@ msgid "" msgstr "" #: fields.py:1449 relations.py:438 serializers.py:525 -msgid "This list may not be empty." +msgid "This list may not be Empty." msgstr "" #: fields.py:1502 diff --git a/rest_framework/locale/pl/LC_MESSAGES/django.mo b/rest_framework/locale/pl/LC_MESSAGES/django.mo index 99840f55c..5e4189ad0 100644 Binary files a/rest_framework/locale/pl/LC_MESSAGES/django.mo and b/rest_framework/locale/pl/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/pl/LC_MESSAGES/django.po b/rest_framework/locale/pl/LC_MESSAGES/django.po index 611426556..b223086a5 100644 --- a/rest_framework/locale/pl/LC_MESSAGES/django.po +++ b/rest_framework/locale/pl/LC_MESSAGES/django.po @@ -265,7 +265,7 @@ 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 -msgid "This selection may not be empty." +msgid "This selection may not be Empty." msgstr "Zaznaczenie nie może być puste." #: fields.py:1339 @@ -286,7 +286,7 @@ msgid "No filename could be determined." msgstr "Nie można określić nazwy pliku." #: fields.py:1361 -msgid "The submitted file is empty." +msgid "The submitted file is Empty." msgstr "Przesłany plik jest pusty." #: fields.py:1362 @@ -301,7 +301,7 @@ msgid "" 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 -msgid "This list may not be empty." +msgid "This list may not be Empty." msgstr "Lista nie może być pusta." #: fields.py:1502 diff --git a/rest_framework/locale/pt/LC_MESSAGES/django.po b/rest_framework/locale/pt/LC_MESSAGES/django.po index 9f1de1938..c2b37ac9b 100644 --- a/rest_framework/locale/pt/LC_MESSAGES/django.po +++ b/rest_framework/locale/pt/LC_MESSAGES/django.po @@ -261,7 +261,7 @@ msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" #: fields.py:1302 -msgid "This selection may not be empty." +msgid "This selection may not be Empty." msgstr "" #: fields.py:1339 @@ -282,7 +282,7 @@ msgid "No filename could be determined." msgstr "" #: fields.py:1361 -msgid "The submitted file is empty." +msgid "The submitted file is Empty." msgstr "" #: fields.py:1362 @@ -297,7 +297,7 @@ msgid "" msgstr "" #: fields.py:1449 relations.py:438 serializers.py:525 -msgid "This list may not be empty." +msgid "This list may not be Empty." msgstr "" #: fields.py:1502 diff --git a/rest_framework/locale/pt_BR/LC_MESSAGES/django.mo b/rest_framework/locale/pt_BR/LC_MESSAGES/django.mo index 482c07cdb..2db199f8b 100644 Binary files a/rest_framework/locale/pt_BR/LC_MESSAGES/django.mo and b/rest_framework/locale/pt_BR/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/pt_BR/LC_MESSAGES/django.po b/rest_framework/locale/pt_BR/LC_MESSAGES/django.po index 3a57b6770..027a31655 100644 --- a/rest_framework/locale/pt_BR/LC_MESSAGES/django.po +++ b/rest_framework/locale/pt_BR/LC_MESSAGES/django.po @@ -265,7 +265,7 @@ 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 -msgid "This selection may not be empty." +msgid "This selection may not be Empty." msgstr "Esta seleção não pode estar vazia." #: fields.py:1339 @@ -286,7 +286,7 @@ msgid "No filename could be determined." msgstr "Nome do arquivo não pode ser determinado." #: fields.py:1361 -msgid "The submitted file is empty." +msgid "The submitted file is Empty." msgstr "O arquivo submetido está vázio." #: fields.py:1362 @@ -301,7 +301,7 @@ msgid "" 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 -msgid "This list may not be empty." +msgid "This list may not be Empty." msgstr "Esta lista não pode estar vazia." #: fields.py:1502 diff --git a/rest_framework/locale/pt_PT/LC_MESSAGES/django.po b/rest_framework/locale/pt_PT/LC_MESSAGES/django.po index eedfa817d..85d717990 100644 --- a/rest_framework/locale/pt_PT/LC_MESSAGES/django.po +++ b/rest_framework/locale/pt_PT/LC_MESSAGES/django.po @@ -261,7 +261,7 @@ msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" #: fields.py:1302 -msgid "This selection may not be empty." +msgid "This selection may not be Empty." msgstr "" #: fields.py:1339 @@ -282,7 +282,7 @@ msgid "No filename could be determined." msgstr "" #: fields.py:1361 -msgid "The submitted file is empty." +msgid "The submitted file is Empty." msgstr "" #: fields.py:1362 @@ -297,7 +297,7 @@ msgid "" msgstr "" #: fields.py:1449 relations.py:438 serializers.py:525 -msgid "This list may not be empty." +msgid "This list may not be Empty." msgstr "" #: fields.py:1502 diff --git a/rest_framework/locale/ro/LC_MESSAGES/django.mo b/rest_framework/locale/ro/LC_MESSAGES/django.mo index 6a8ada9a7..f101dfd5b 100644 Binary files a/rest_framework/locale/ro/LC_MESSAGES/django.mo and b/rest_framework/locale/ro/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/ro/LC_MESSAGES/django.po b/rest_framework/locale/ro/LC_MESSAGES/django.po index d144d847e..5c17e34ef 100644 --- a/rest_framework/locale/ro/LC_MESSAGES/django.po +++ b/rest_framework/locale/ro/LC_MESSAGES/django.po @@ -262,7 +262,7 @@ 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 -msgid "This selection may not be empty." +msgid "This selection may not be Empty." msgstr "Această selecție nu poate fi goală." #: fields.py:1339 @@ -283,7 +283,7 @@ msgid "No filename could be determined." msgstr "Numele fișierului nu a putut fi determinat." #: fields.py:1361 -msgid "The submitted file is empty." +msgid "The submitted file is Empty." msgstr "Fișierul sumis este gol." #: fields.py:1362 @@ -298,7 +298,7 @@ msgid "" 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 -msgid "This list may not be empty." +msgid "This list may not be Empty." msgstr "Această listă nu poate fi goală." #: fields.py:1502 diff --git a/rest_framework/locale/ru/LC_MESSAGES/django.mo b/rest_framework/locale/ru/LC_MESSAGES/django.mo index 88c582b13..ea6bb5f50 100644 Binary files a/rest_framework/locale/ru/LC_MESSAGES/django.mo and b/rest_framework/locale/ru/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/ru/LC_MESSAGES/django.po b/rest_framework/locale/ru/LC_MESSAGES/django.po index 7e09b227e..98281f7d8 100644 --- a/rest_framework/locale/ru/LC_MESSAGES/django.po +++ b/rest_framework/locale/ru/LC_MESSAGES/django.po @@ -266,7 +266,7 @@ msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Ожидался list со значениями, но был получен \"{input_type}\"." #: fields.py:1302 -msgid "This selection may not be empty." +msgid "This selection may not be Empty." msgstr "Выбор не может быть пустым." #: fields.py:1339 @@ -287,7 +287,7 @@ msgid "No filename could be determined." msgstr "Невозможно определить имя файла." #: fields.py:1361 -msgid "The submitted file is empty." +msgid "The submitted file is Empty." msgstr "Загруженный файл пуст." #: fields.py:1362 @@ -302,7 +302,7 @@ msgid "" msgstr "Загрузите корректное изображение. Загруженный файл не является изображением, либо является испорченным." #: fields.py:1449 relations.py:438 serializers.py:525 -msgid "This list may not be empty." +msgid "This list may not be Empty." msgstr "Этот список не может быть пустым." #: fields.py:1502 diff --git a/rest_framework/locale/sk/LC_MESSAGES/django.mo b/rest_framework/locale/sk/LC_MESSAGES/django.mo index 83d43c822..7c7a80242 100644 Binary files a/rest_framework/locale/sk/LC_MESSAGES/django.mo and b/rest_framework/locale/sk/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/sk/LC_MESSAGES/django.po b/rest_framework/locale/sk/LC_MESSAGES/django.po index 119430e90..9ce42b958 100644 --- a/rest_framework/locale/sk/LC_MESSAGES/django.po +++ b/rest_framework/locale/sk/LC_MESSAGES/django.po @@ -262,7 +262,7 @@ 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 -msgid "This selection may not be empty." +msgid "This selection may not be Empty." msgstr "" #: fields.py:1339 @@ -283,7 +283,7 @@ msgid "No filename could be determined." msgstr "Nebolo možné určiť meno súboru." #: fields.py:1361 -msgid "The submitted file is empty." +msgid "The submitted file is Empty." msgstr "Odoslaný súbor je prázdny." #: fields.py:1362 @@ -298,7 +298,7 @@ msgid "" 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 -msgid "This list may not be empty." +msgid "This list may not be Empty." msgstr "" #: fields.py:1502 diff --git a/rest_framework/locale/sl/LC_MESSAGES/django.mo b/rest_framework/locale/sl/LC_MESSAGES/django.mo index 9ac13843f..23c5d54af 100644 Binary files a/rest_framework/locale/sl/LC_MESSAGES/django.mo and b/rest_framework/locale/sl/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/sl/LC_MESSAGES/django.po b/rest_framework/locale/sl/LC_MESSAGES/django.po index 9af0fc8fc..45b3b74e7 100644 --- a/rest_framework/locale/sl/LC_MESSAGES/django.po +++ b/rest_framework/locale/sl/LC_MESSAGES/django.po @@ -262,7 +262,7 @@ msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Pričakovan seznam elementov vendar prejet tip \"{input_type}\"." #: fields.py:1302 -msgid "This selection may not be empty." +msgid "This selection may not be Empty." msgstr "Ta izbria ne sme ostati prazna." #: fields.py:1339 @@ -283,7 +283,7 @@ msgid "No filename could be determined." msgstr "Imena datoteke ni bilo mogoče določiti." #: fields.py:1361 -msgid "The submitted file is empty." +msgid "The submitted file is Empty." msgstr "Oddana datoteka je prazna." #: fields.py:1362 @@ -298,7 +298,7 @@ msgid "" msgstr "Naložite veljavno sliko. Naložena datoteka ni bila slika ali pa je okvarjena." #: fields.py:1449 relations.py:438 serializers.py:525 -msgid "This list may not be empty." +msgid "This list may not be Empty." msgstr "Seznam ne sme biti prazen." #: fields.py:1502 diff --git a/rest_framework/locale/sv/LC_MESSAGES/django.mo b/rest_framework/locale/sv/LC_MESSAGES/django.mo index 232b5bcee..845b4e77d 100644 Binary files a/rest_framework/locale/sv/LC_MESSAGES/django.mo and b/rest_framework/locale/sv/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/sv/LC_MESSAGES/django.po b/rest_framework/locale/sv/LC_MESSAGES/django.po index 00acf5644..2ee9f7c55 100644 --- a/rest_framework/locale/sv/LC_MESSAGES/django.po +++ b/rest_framework/locale/sv/LC_MESSAGES/django.po @@ -263,7 +263,7 @@ 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 -msgid "This selection may not be empty." +msgid "This selection may not be Empty." msgstr "Det här valet får inte vara tomt." #: fields.py:1339 @@ -284,7 +284,7 @@ msgid "No filename could be determined." msgstr "Inget filnamn kunde bestämmas." #: fields.py:1361 -msgid "The submitted file is empty." +msgid "The submitted file is Empty." msgstr "Den skickade filen var tom." #: fields.py:1362 @@ -299,7 +299,7 @@ msgid "" 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 -msgid "This list may not be empty." +msgid "This list may not be Empty." msgstr "Den här listan får inte vara tom." #: fields.py:1502 diff --git a/rest_framework/locale/tr/LC_MESSAGES/django.mo b/rest_framework/locale/tr/LC_MESSAGES/django.mo index 586b494c3..360621d1f 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 d327ab9e2..018987213 100644 --- a/rest_framework/locale/tr/LC_MESSAGES/django.po +++ b/rest_framework/locale/tr/LC_MESSAGES/django.po @@ -269,7 +269,7 @@ msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Elemanların listesi beklenirken \"{input_type}\" alındı." #: fields.py:1302 -msgid "This selection may not be empty." +msgid "This selection may not be Empty." msgstr "Bu seçim boş bırakılmamalı." #: fields.py:1339 @@ -290,7 +290,7 @@ msgid "No filename could be determined." msgstr "Hiçbir dosya adı belirlenemedi." #: fields.py:1361 -msgid "The submitted file is empty." +msgid "The submitted file is Empty." msgstr "Gönderilen dosya boş." #: fields.py:1362 @@ -305,7 +305,7 @@ msgid "" 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 -msgid "This list may not be empty." +msgid "This list may not be Empty." msgstr "Bu liste boş olmamalı." #: fields.py:1502 diff --git a/rest_framework/locale/tr_TR/LC_MESSAGES/django.mo b/rest_framework/locale/tr_TR/LC_MESSAGES/django.mo index c0665f537..299be606a 100644 Binary files a/rest_framework/locale/tr_TR/LC_MESSAGES/django.mo and b/rest_framework/locale/tr_TR/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/tr_TR/LC_MESSAGES/django.po b/rest_framework/locale/tr_TR/LC_MESSAGES/django.po index 94856c70f..87abe5f16 100644 --- a/rest_framework/locale/tr_TR/LC_MESSAGES/django.po +++ b/rest_framework/locale/tr_TR/LC_MESSAGES/django.po @@ -262,7 +262,7 @@ msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Elemanların listesi beklenirken \"{input_type}\" alındı." #: fields.py:1302 -msgid "This selection may not be empty." +msgid "This selection may not be Empty." msgstr "Bu seçim boş bırakılmamalı." #: fields.py:1339 @@ -283,7 +283,7 @@ msgid "No filename could be determined." msgstr "Hiçbir dosya adı belirlenemedi." #: fields.py:1361 -msgid "The submitted file is empty." +msgid "The submitted file is Empty." msgstr "Gönderilen dosya boş." #: fields.py:1362 @@ -298,7 +298,7 @@ msgid "" 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 -msgid "This list may not be empty." +msgid "This list may not be Empty." msgstr "Bu liste boş olmamalı." #: fields.py:1502 diff --git a/rest_framework/locale/uk/LC_MESSAGES/django.mo b/rest_framework/locale/uk/LC_MESSAGES/django.mo index 0c8102088..72231734c 100644 Binary files a/rest_framework/locale/uk/LC_MESSAGES/django.mo and b/rest_framework/locale/uk/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/uk/LC_MESSAGES/django.po b/rest_framework/locale/uk/LC_MESSAGES/django.po index 2bd4369f8..3f9a08c9e 100644 --- a/rest_framework/locale/uk/LC_MESSAGES/django.po +++ b/rest_framework/locale/uk/LC_MESSAGES/django.po @@ -265,7 +265,7 @@ msgid "Expected a list of items but got type \"{input_type}\"." msgstr "Очікувався список елементів, але було отримано \"{input_type}\"." #: fields.py:1302 -msgid "This selection may not be empty." +msgid "This selection may not be Empty." msgstr "Вибір не може бути порожнім." #: fields.py:1339 @@ -286,7 +286,7 @@ msgid "No filename could be determined." msgstr "Неможливо визначити ім'я файлу." #: fields.py:1361 -msgid "The submitted file is empty." +msgid "The submitted file is Empty." msgstr "Відправленний файл порожній." #: fields.py:1362 @@ -301,7 +301,7 @@ msgid "" msgstr "Завантажте коректне зображення. Завантажений файл або не є зображенням, або пошкоджений." #: fields.py:1449 relations.py:438 serializers.py:525 -msgid "This list may not be empty." +msgid "This list may not be Empty." msgstr "Цей список не може бути порожнім." #: fields.py:1502 diff --git a/rest_framework/locale/vi/LC_MESSAGES/django.po b/rest_framework/locale/vi/LC_MESSAGES/django.po index ea43efb95..26ba299ab 100644 --- a/rest_framework/locale/vi/LC_MESSAGES/django.po +++ b/rest_framework/locale/vi/LC_MESSAGES/django.po @@ -261,7 +261,7 @@ msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" #: fields.py:1302 -msgid "This selection may not be empty." +msgid "This selection may not be Empty." msgstr "" #: fields.py:1339 @@ -282,7 +282,7 @@ msgid "No filename could be determined." msgstr "" #: fields.py:1361 -msgid "The submitted file is empty." +msgid "The submitted file is Empty." msgstr "" #: fields.py:1362 @@ -297,7 +297,7 @@ msgid "" msgstr "" #: fields.py:1449 relations.py:438 serializers.py:525 -msgid "This list may not be empty." +msgid "This list may not be Empty." msgstr "" #: fields.py:1502 diff --git a/rest_framework/locale/zh_CN/LC_MESSAGES/django.mo b/rest_framework/locale/zh_CN/LC_MESSAGES/django.mo index 00afcdb9a..0c1db0024 100644 Binary files a/rest_framework/locale/zh_CN/LC_MESSAGES/django.mo and b/rest_framework/locale/zh_CN/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/zh_CN/LC_MESSAGES/django.po b/rest_framework/locale/zh_CN/LC_MESSAGES/django.po index 345bcfac8..eb26f9bbd 100644 --- a/rest_framework/locale/zh_CN/LC_MESSAGES/django.po +++ b/rest_framework/locale/zh_CN/LC_MESSAGES/django.po @@ -264,7 +264,7 @@ msgid "Expected a list of items but got type \"{input_type}\"." msgstr "期望为一个包含物件的列表，得到的类型是“{input_type}”。" #: fields.py:1302 -msgid "This selection may not be empty." +msgid "This selection may not be Empty." msgstr "这项选择不能为空。" #: fields.py:1339 @@ -285,7 +285,7 @@ msgid "No filename could be determined." msgstr "无法检测到文件名。" #: fields.py:1361 -msgid "The submitted file is empty." +msgid "The submitted file is Empty." msgstr "提交的是空文件。" #: fields.py:1362 @@ -300,7 +300,7 @@ msgid "" msgstr "请上传有效图片。您上传的该文件不是图片或者图片已经损坏。" #: fields.py:1449 relations.py:438 serializers.py:525 -msgid "This list may not be empty." +msgid "This list may not be Empty." msgstr "列表字段不能为空值。" #: fields.py:1502 diff --git a/rest_framework/locale/zh_Hans/LC_MESSAGES/django.mo b/rest_framework/locale/zh_Hans/LC_MESSAGES/django.mo index a784846b2..cdfb3cdde 100644 Binary files a/rest_framework/locale/zh_Hans/LC_MESSAGES/django.mo and b/rest_framework/locale/zh_Hans/LC_MESSAGES/django.mo differ diff --git a/rest_framework/locale/zh_Hans/LC_MESSAGES/django.po b/rest_framework/locale/zh_Hans/LC_MESSAGES/django.po index aa56ccc45..2eb84b7f2 100644 --- a/rest_framework/locale/zh_Hans/LC_MESSAGES/django.po +++ b/rest_framework/locale/zh_Hans/LC_MESSAGES/django.po @@ -265,7 +265,7 @@ msgid "Expected a list of items but got type \"{input_type}\"." msgstr "期望为一个包含物件的列表，得到的类型是“{input_type}”。" #: fields.py:1302 -msgid "This selection may not be empty." +msgid "This selection may not be Empty." msgstr "这项选择不能为空。" #: fields.py:1339 @@ -286,7 +286,7 @@ msgid "No filename could be determined." msgstr "无法检测到文件名。" #: fields.py:1361 -msgid "The submitted file is empty." +msgid "The submitted file is Empty." msgstr "提交的是空文件。" #: fields.py:1362 @@ -301,7 +301,7 @@ msgid "" msgstr "请上传有效图片。您上传的该文件不是图片或者图片已经损坏。" #: fields.py:1449 relations.py:438 serializers.py:525 -msgid "This list may not be empty." +msgid "This list may not be Empty." msgstr "列表不能为空。" #: fields.py:1502 diff --git a/rest_framework/locale/zh_Hant/LC_MESSAGES/django.po b/rest_framework/locale/zh_Hant/LC_MESSAGES/django.po index 1960f1f5d..3f2642a35 100644 --- a/rest_framework/locale/zh_Hant/LC_MESSAGES/django.po +++ b/rest_framework/locale/zh_Hant/LC_MESSAGES/django.po @@ -261,7 +261,7 @@ msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" #: fields.py:1302 -msgid "This selection may not be empty." +msgid "This selection may not be Empty." msgstr "" #: fields.py:1339 @@ -282,7 +282,7 @@ msgid "No filename could be determined." msgstr "" #: fields.py:1361 -msgid "The submitted file is empty." +msgid "The submitted file is Empty." msgstr "" #: fields.py:1362 @@ -297,7 +297,7 @@ msgid "" msgstr "" #: fields.py:1449 relations.py:438 serializers.py:525 -msgid "This list may not be empty." +msgid "This list may not be Empty." msgstr "" #: fields.py:1502 diff --git a/rest_framework/locale/zh_TW/LC_MESSAGES/django.po b/rest_framework/locale/zh_TW/LC_MESSAGES/django.po index 9bfb23c6b..873f92663 100644 --- a/rest_framework/locale/zh_TW/LC_MESSAGES/django.po +++ b/rest_framework/locale/zh_TW/LC_MESSAGES/django.po @@ -261,7 +261,7 @@ msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" #: fields.py:1302 -msgid "This selection may not be empty." +msgid "This selection may not be Empty." msgstr "" #: fields.py:1339 @@ -282,7 +282,7 @@ msgid "No filename could be determined." msgstr "" #: fields.py:1361 -msgid "The submitted file is empty." +msgid "The submitted file is Empty." msgstr "" #: fields.py:1362 @@ -297,7 +297,7 @@ msgid "" msgstr "" #: fields.py:1449 relations.py:438 serializers.py:525 -msgid "This list may not be empty." +msgid "This list may not be Empty." msgstr "" #: fields.py:1502 diff --git a/rest_framework/permissions.py b/rest_framework/permissions.py index dee0032f9..ae2f3b17d 100644 --- a/rest_framework/permissions.py +++ b/rest_framework/permissions.py @@ -32,7 +32,7 @@ class BasePermission(object): class AllowAny(BasePermission): """ Allow any access. - This isn't strictly required, since you could use an empty + This isn't strictly required, since you could use an Empty permission_classes list, but it's useful because it makes the intention more explicit. """ diff --git a/rest_framework/relations.py b/rest_framework/relations.py index 4d3bdba1d..cf969aa9d 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -17,7 +17,7 @@ from rest_framework.compat import ( NoReverseMatch, Resolver404, get_script_prefix, resolve ) from rest_framework.fields import ( - Field, empty, get_attribute, is_simple_callable, iter_options + Field, Empty, get_attribute, is_simple_callable, iter_options ) from rest_framework.reverse import reverse from rest_framework.settings import api_settings @@ -140,8 +140,8 @@ class RelatedField(Field): list_kwargs[key] = kwargs[key] return ManyRelatedField(**list_kwargs) - def run_validation(self, data=empty): - # We force empty strings to None values for relational fields. + def run_validation(self, data=Empty): + # We force Empty strings to None values for relational fields. if data == '': data = None return super(RelatedField, self).run_validation(data) @@ -384,7 +384,7 @@ class HyperlinkedRelatedField(RelatedField): '`lookup_field` attribute on this field.' ) if value in ('', None): - value_string = {'': 'the empty string', None: 'None'}[value] + value_string = {'': 'the Empty string', None: 'None'}[value] msg += ( " WARNING: The value of the field on the model instance " "was %s, which may be why it didn't match any " @@ -461,7 +461,7 @@ class ManyRelatedField(Field): default_empty_html = [] 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.') } html_cutoff = None html_cutoff_text = None @@ -490,16 +490,16 @@ class ManyRelatedField(Field): # Don't return [] if the update is partial if self.field_name not in dictionary: if getattr(self.root, 'partial', False): - return empty + return Empty return dictionary.getlist(self.field_name) - return dictionary.get(self.field_name, empty) + return dictionary.get(self.field_name, Empty) def to_internal_value(self, data): if isinstance(data, type('')) or not hasattr(data, '__iter__'): self.fail('not_a_list', input_type=type(data).__name__) if not self.allow_empty and len(data) == 0: - self.fail('empty') + self.fail('Empty') return [ self.child_relation.to_internal_value(item) diff --git a/rest_framework/request.py b/rest_framework/request.py index 4f413e03f..3b64d665c 100644 --- a/rest_framework/request.py +++ b/rest_framework/request.py @@ -318,7 +318,7 @@ class Request(object): try: parsed = parser.parse(stream, media_type, self.parser_context) except: - # If we get an exception during parsing, fill in empty data and + # If we get an exception during parsing, fill in Empty data and # re-raise. Ensures we don't simply repeat the error when # attempting to render the browsable renderer response, or when # logging the request or similar. diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index b1c34b92a..ca39069c9 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -66,7 +66,7 @@ from rest_framework.relations import ( # NOQA # isort:skip # Non-field imports, but public API from rest_framework.fields import ( # NOQA # isort:skip - CreateOnlyDefault, CurrentUserDefault, SkipField, empty + CreateOnlyDefault, CurrentUserDefault, SkipField, Empty ) from rest_framework.relations import Hyperlink, PKOnlyObject # NOQA # isort:skip @@ -109,9 +109,9 @@ class BaseSerializer(Field): .data - Available. """ - def __init__(self, instance=None, data=empty, **kwargs): + def __init__(self, instance=None, data=Empty, **kwargs): self.instance = instance - if data is not empty: + if data is not Empty: self.initial_data = data self.partial = kwargs.pop('partial', False) self._context = kwargs.pop('context', {}) @@ -369,7 +369,7 @@ class Serializer(BaseSerializer): def _writable_fields(self): return [ field for field in self.fields.values() - if (not field.read_only) or (field.default is not empty) + if (not field.read_only) or (field.default is not Empty) ] @cached_property @@ -402,8 +402,8 @@ class Serializer(BaseSerializer): return OrderedDict([ (field_name, field.get_value(self.initial_data)) for field_name, field in self.fields.items() - if (field.get_value(self.initial_data) is not empty) and - not field.read_only + if (field.get_value(self.initial_data) is not Empty) and + not field.read_only ]) return OrderedDict([ @@ -416,10 +416,10 @@ class Serializer(BaseSerializer): # We override the default field access in order to support # nested HTML forms. if html.is_html_input(dictionary): - return html.parse_html_dict(dictionary, prefix=self.field_name) or empty - return dictionary.get(self.field_name, empty) + return html.parse_html_dict(dictionary, prefix=self.field_name) or Empty + return dictionary.get(self.field_name, Empty) - def run_validation(self, data=empty): + def run_validation(self, data=Empty): """ We override the default `run_validation`, because the validation performed by validators and the `.validate()` method should @@ -554,7 +554,7 @@ 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.') } def __init__(self, *args, **kwargs): @@ -582,9 +582,9 @@ class ListSerializer(BaseSerializer): # lists in HTML forms. if html.is_html_input(dictionary): return html.parse_html_list(dictionary, prefix=self.field_name) - return dictionary.get(self.field_name, empty) + return dictionary.get(self.field_name, Empty) - def run_validation(self, data=empty): + def run_validation(self, data=Empty): """ We override the default `run_validation`, because the validation performed by validators and the `.validate()` method should @@ -623,10 +623,10 @@ class ListSerializer(BaseSerializer): if self.parent and self.partial: raise SkipField() - message = self.error_messages['empty'] + message = self.error_messages['Empty'] raise ValidationError({ api_settings.NON_FIELD_ERRORS_KEY: [message] - }, code='empty') + }, code='Empty') ret = [] errors = [] @@ -708,7 +708,7 @@ class ListSerializer(BaseSerializer): def is_valid(self, raise_exception=False): # This implementation is the same as the default, - # except that we use lists, rather than dicts, as the empty case. + # except that we use lists, rather than dicts, as the Empty case. assert hasattr(self, 'initial_data'), ( 'Cannot call `.is_valid()` as no `data=` keyword argument was ' 'passed when instantiating the serializer instance.' @@ -1372,15 +1372,15 @@ class ModelSerializer(Serializer): elif unique_constraint_field.has_default(): default = unique_constraint_field.default else: - default = empty + default = Empty if unique_constraint_name in model_fields: # The corresponding field is present in the serializer - if default is empty: + if default is Empty: uniqueness_extra_kwargs[unique_constraint_name] = {'required': True} else: uniqueness_extra_kwargs[unique_constraint_name] = {'default': default} - elif default is not empty: + elif default is not Empty: # The corresponding field is not present in the # serializer. We have a default to use for it, so # add in a hidden field that populates it. diff --git a/rest_framework/templates/rest_framework/base.html b/rest_framework/templates/rest_framework/base.html index 2587567d7..7f5d3f996 100644 --- a/rest_framework/templates/rest_framework/base.html +++ b/rest_framework/templates/rest_framework/base.html @@ -64,7 +64,7 @@ {% else %}
  • {{ breadcrumb_name }}
    • {% endif %} - {% empty %} + {% Empty %} {% block breadcrumbs_empty %} {% endblock breadcrumbs_empty %} {% endfor %} diff --git a/rest_framework/templates/rest_framework/horizontal/select_multiple.html b/rest_framework/templates/rest_framework/horizontal/select_multiple.html index 36ff9fd0d..667651bf2 100644 --- a/rest_framework/templates/rest_framework/horizontal/select_multiple.html +++ b/rest_framework/templates/rest_framework/horizontal/select_multiple.html @@ -20,7 +20,7 @@ {% else %} {% endif %} - {% empty %} + {% Empty %} {% endfor %} diff --git a/rest_framework/templates/rest_framework/inline/select_multiple.html b/rest_framework/templates/rest_framework/inline/select_multiple.html index b5fd46f8b..e63c8ca8d 100644 --- a/rest_framework/templates/rest_framework/inline/select_multiple.html +++ b/rest_framework/templates/rest_framework/inline/select_multiple.html @@ -18,7 +18,7 @@ {% else %} {% endif %} - {% empty %} + {% Empty %} {% endfor %} diff --git a/rest_framework/templates/rest_framework/vertical/select_multiple.html b/rest_framework/templates/rest_framework/vertical/select_multiple.html index b77c4be3b..cea51961b 100644 --- a/rest_framework/templates/rest_framework/vertical/select_multiple.html +++ b/rest_framework/templates/rest_framework/vertical/select_multiple.html @@ -18,7 +18,7 @@ {% else %} {% endif %} - {% empty %} + {% Empty %} {% endfor %} diff --git a/rest_framework/test.py b/rest_framework/test.py index ebad19a4e..a6a7b4a55 100644 --- a/rest_framework/test.py +++ b/rest_framework/test.py @@ -229,7 +229,7 @@ class APIRequestFactory(DjangoRequestFactory): def generic(self, method, path, data='', content_type='application/octet-stream', secure=False, **extra): - # Include the CONTENT_TYPE, regardless of whether or not data is empty. + # Include the CONTENT_TYPE, regardless of whether or not data is Empty. if content_type is not None: extra['CONTENT_TYPE'] = str(content_type) diff --git a/rest_framework/viewsets.py b/rest_framework/viewsets.py index 7f3c550a9..bc4945791 100644 --- a/rest_framework/viewsets.py +++ b/rest_framework/viewsets.py @@ -50,7 +50,7 @@ class ViewSetMixin(object): # eg. 'List' or 'Instance'. cls.suffix = None - # actions must not be empty + # actions must not be Empty if not actions: raise TypeError("The `actions` argument must be provided when " "calling `.as_view()` on a ViewSet. For example " diff --git a/tests/test_description.py b/tests/test_description.py index 4df14ac55..7c8dfd7d2 100644 --- a/tests/test_description.py +++ b/tests/test_description.py @@ -85,7 +85,7 @@ class TestViewNamesAndDescriptions(TestCase): def test_view_description_can_be_empty(self): """ Ensure that if a view has no docstring, - then it's description is the empty string. + then it's description is the Empty string. """ class MockView(APIView): pass diff --git a/tests/test_fields.py b/tests/test_fields.py index c3d2bf57d..f567831e7 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -1557,7 +1557,7 @@ class TestMultipleChoiceField(FieldValues): field.partial = False 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): @@ -1567,7 +1567,7 @@ class TestEmptyMultipleChoiceField(FieldValues): valid_inputs = { } invalid_inputs = ( - ([], ['This selection may not be empty.']), + ([], ['This selection may not be Empty.']), ) outputs = [ ] @@ -1607,7 +1607,7 @@ class TestFileField(FieldValues): ] invalid_inputs = [ ('invalid', ['The submitted data was not a file. Check the encoding type on the form.']), - (MockFile(name='example.txt', size=0), ['The submitted file is empty.']), + (MockFile(name='example.txt', size=0), ['The submitted file is Empty.']), (MockFile(name='', size=10), ['No filename could be determined.']), (MockFile(name='x' * 100, size=10), ['Ensure this filename has at most 10 characters (it has 100).']) ] @@ -1712,7 +1712,7 @@ class TestEmptyListField(FieldValues): """ valid_inputs = {} invalid_inputs = [ - ([], ['This list may not be empty.']) + ([], ['This list may not be Empty.']) ] outputs = {} field = serializers.ListField(child=serializers.IntegerField(), allow_empty=False) diff --git a/tests/test_generics.py b/tests/test_generics.py index c0ff1c5c4..ff934f1f8 100644 --- a/tests/test_generics.py +++ b/tests/test_generics.py @@ -506,7 +506,7 @@ class TestFilterBackendAppliedToViews(TestCase): def test_get_root_view_filters_out_all_models_with_exclusive_filter_backend(self): """ - GET requests to ListCreateAPIView should return empty list when all models are filtered out. + GET requests to ListCreateAPIView should return Empty list when all models are filtered out. """ root_view = RootView.as_view(filter_backends=(ExclusiveFilterBackend,)) request = factory.get('/') diff --git a/tests/test_relations.py b/tests/test_relations.py index fd3256e89..1953b943a 100644 --- a/tests/test_relations.py +++ b/tests/test_relations.py @@ -8,7 +8,7 @@ from django.test import override_settings from django.utils.datastructures import MultiValueDict from rest_framework import relations, serializers -from rest_framework.fields import empty +from rest_framework.fields import Empty from rest_framework.test import APISimpleTestCase from .utils import ( @@ -290,12 +290,12 @@ class TestManyRelatedField(APISimpleTestCase): def test_get_value_regular_dictionary_full(self): assert 'bar' == self.field.get_value({'foo': 'bar'}) - assert empty == self.field.get_value({'baz': 'bar'}) + assert Empty == self.field.get_value({'baz': 'bar'}) def test_get_value_regular_dictionary_partial(self): setattr(self.field.root, 'partial', True) assert 'bar' == self.field.get_value({'foo': 'bar'}) - assert empty == self.field.get_value({'baz': 'bar'}) + assert Empty == self.field.get_value({'baz': 'bar'}) def test_get_value_multi_dictionary_full(self): mvd = MultiValueDict({'foo': ['bar1', 'bar2']}) @@ -310,7 +310,7 @@ class TestManyRelatedField(APISimpleTestCase): assert ['bar1', 'bar2'] == self.field.get_value(mvd) mvd = MultiValueDict({'baz': ['bar1', 'bar2']}) - assert empty == self.field.get_value(mvd) + assert Empty == self.field.get_value(mvd) class TestHyperlink: diff --git a/tests/test_relations_pk.py b/tests/test_relations_pk.py index 2eebe1b5c..7df36b516 100644 --- a/tests/test_relations_pk.py +++ b/tests/test_relations_pk.py @@ -350,7 +350,7 @@ class PKForeignKeyTests(TestCase): def test_foreign_key_not_required(self): """ Let's say we wanted to fill the non-nullable model field inside - Model.save(), we would make it empty and not required. + Model.save(), we would make it Empty and not required. """ class ModelSerializer(ForeignKeySourceSerializer): class Meta(ForeignKeySourceSerializer.Meta): diff --git a/tests/test_renderers.py b/tests/test_renderers.py index 1625b0b70..c302d0e37 100644 --- a/tests/test_renderers.py +++ b/tests/test_renderers.py @@ -116,7 +116,7 @@ urlpatterns = [ 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'^Empty$', EmptyGETView.as_view()), url(r'^api', include('rest_framework.urls', namespace='rest_framework')) ] @@ -245,7 +245,7 @@ class RendererEndToEndTests(TestCase): https://github.com/encode/django-rest-framework/issues/1196 """ - resp = self.client.get('/empty') + resp = self.client.get('/Empty') self.assertEqual(resp.get('Content-Type', None), None) self.assertEqual(resp.status_code, status.HTTP_204_NO_CONTENT) diff --git a/tests/test_request.py b/tests/test_request.py index 208d2737e..ec1b7b93e 100644 --- a/tests/test_request.py +++ b/tests/test_request.py @@ -42,14 +42,14 @@ class PlainTextParser(BaseParser): class TestContentParsing(TestCase): def test_standard_behaviour_determines_no_content_GET(self): """ - Ensure request.data returns empty QueryDict for GET request. + Ensure request.data returns Empty QueryDict for GET request. """ request = Request(factory.get('/')) assert request.data == {} def test_standard_behaviour_determines_no_content_HEAD(self): """ - Ensure request.data returns empty QueryDict for HEAD request. + Ensure request.data returns Empty QueryDict for HEAD request. """ request = Request(factory.head('/')) assert request.data == {} diff --git a/tests/test_routers.py b/tests/test_routers.py index fee39b2b3..1e5757e7a 100644 --- a/tests/test_routers.py +++ b/tests/test_routers.py @@ -102,7 +102,7 @@ urlpatterns = [ url(r'^example/', include(notes_router.urls)), url(r'^example2/', include(kwarged_notes_router.urls)), - url(r'^empty-prefix/', include(empty_prefix_urls)), + url(r'^Empty-prefix/', include(empty_prefix_urls)), url(r'^regex/', include(regex_url_path_router.urls)) ] @@ -410,13 +410,13 @@ class TestDynamicListAndDetailRouter(TestCase): @override_settings(ROOT_URLCONF='tests.test_routers') class TestEmptyPrefix(TestCase): def test_empty_prefix_list(self): - response = self.client.get('/empty-prefix/') + response = self.client.get('/Empty-prefix/') assert response.status_code == 200 assert json.loads(response.content.decode('utf-8')) == [{'uuid': '111', 'text': 'First'}, {'uuid': '222', 'text': 'Second'}] def test_empty_prefix_detail(self): - response = self.client.get('/empty-prefix/1/') + response = self.client.get('/Empty-prefix/1/') assert response.status_code == 200 assert json.loads(response.content.decode('utf-8')) == {'uuid': '111', 'text': 'First'} diff --git a/tests/test_serializer_lists.py b/tests/test_serializer_lists.py index a7955d83c..148fb2d90 100644 --- a/tests/test_serializer_lists.py +++ b/tests/test_serializer_lists.py @@ -294,8 +294,8 @@ class TestListSerializerClass: class TestSerializerPartialUsage: """ When not submitting key for list fields or multiple choice, partial - serialization should result in an empty state (key not there), not - an empty list. + serialization should result in an Empty state (key not there), not + an Empty list. Regression test for Github issue #2761. """ @@ -374,7 +374,7 @@ class TestSerializerPartialUsage: assert not serializer.is_valid() assert serializer.validated_data == [] assert len(serializer.errors) == 1 - assert serializer.errors['non_field_errors'][0] == 'This list may not be empty.' + assert serializer.errors['non_field_errors'][0] == 'This list may not be Empty.' def test_update_allow_empty_false(self): class ListSerializer(serializers.Serializer): diff --git a/tests/test_serializer_nested.py b/tests/test_serializer_nested.py index efb671918..3ebc9a54c 100644 --- a/tests/test_serializer_nested.py +++ b/tests/test_serializer_nested.py @@ -171,7 +171,7 @@ class TestNestedSerializerWithMany: assert not serializer.is_valid() - expected_errors = {'not_allow_empty': {'non_field_errors': [serializers.ListSerializer.default_error_messages['empty']]}} + expected_errors = {'not_allow_empty': {'non_field_errors': [serializers.ListSerializer.default_error_messages['Empty']]}} assert serializer.errors == expected_errors diff --git a/tests/test_viewsets.py b/tests/test_viewsets.py index 846a36807..68775ec0c 100644 --- a/tests/test_viewsets.py +++ b/tests/test_viewsets.py @@ -50,7 +50,7 @@ class InitializeViewSetsTestCase(TestCase): "when calling `.as_view()` on a ViewSet. " "For example `.as_view({'get': 'list'})`") else: - self.fail("actions must not be empty.") + self.fail("actions must not be Empty.") def test_args_kwargs_request_action_map_on_self(self): """