aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/fields.py
diff options
context:
space:
mode:
authorCraig Blaszczyk2015-01-07 12:46:23 +0000
committerCraig Blaszczyk2015-01-07 12:46:23 +0000
commit91e316f7810157474d6246cd0024bd7f7cc31ff7 (patch)
tree1279d952e1bbc7cfb281cea90b7d215e15534ea1 /rest_framework/fields.py
parent9a4267049ba37883e3e0c21b5d453b9551343b8d (diff)
downloaddjango-rest-framework-91e316f7810157474d6246cd0024bd7f7cc31ff7.tar.bz2
prefer single quotes in source and double quotes in user visible strings; add some missing full stops to user visible strings
Diffstat (limited to 'rest_framework/fields.py')
-rw-r--r--rest_framework/fields.py82
1 files changed, 41 insertions, 41 deletions
diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index 27944608..76101608 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -149,8 +149,8 @@ class Field(object):
_creation_counter = 0
default_error_messages = {
- 'required': _("This field is required."),
- 'null': _("This field may not be null.")
+ 'required': _('This field is required.'),
+ 'null': _('This field may not be null.')
}
default_validators = []
default_empty_html = empty
@@ -477,7 +477,7 @@ class Field(object):
class BooleanField(Field):
default_error_messages = {
- 'invalid': _("`{input}` is not a valid boolean.")
+ 'invalid': _('`{input}` is not a valid boolean.')
}
default_empty_html = False
initial = False
@@ -505,7 +505,7 @@ class BooleanField(Field):
class NullBooleanField(Field):
default_error_messages = {
- 'invalid': _("`{input}` is not a valid boolean.")
+ 'invalid': _('`{input}` is not a valid boolean.')
}
initial = None
TRUE_VALUES = set(('t', 'T', 'true', 'True', 'TRUE', '1', 1, True))
@@ -540,9 +540,9 @@ class NullBooleanField(Field):
class CharField(Field):
default_error_messages = {
- 'blank': _("This field may not be blank."),
- 'max_length': _("Ensure this field has no more than {max_length} characters."),
- 'min_length': _("Ensure this field has at least {min_length} characters.")
+ 'blank': _('This field may not be blank.'),
+ 'max_length': _('Ensure this field has no more than {max_length} characters.'),
+ 'min_length': _('Ensure this field has at least {min_length} characters.')
}
initial = ''
coerce_blank_to_null = False
@@ -584,7 +584,7 @@ class CharField(Field):
class EmailField(CharField):
default_error_messages = {
- 'invalid': _("Enter a valid email address.")
+ 'invalid': _('Enter a valid email address.')
}
def __init__(self, **kwargs):
@@ -601,7 +601,7 @@ class EmailField(CharField):
class RegexField(CharField):
default_error_messages = {
- 'invalid': _("This value does not match the required pattern.")
+ 'invalid': _('This value does not match the required pattern.')
}
def __init__(self, regex, **kwargs):
@@ -612,7 +612,7 @@ class RegexField(CharField):
class SlugField(CharField):
default_error_messages = {
- 'invalid': _("Enter a valid \"slug\" consisting of letters, numbers, underscores or hyphens.")
+ 'invalid': _('Enter a valid "slug" consisting of letters, numbers, underscores or hyphens.')
}
def __init__(self, **kwargs):
@@ -624,7 +624,7 @@ class SlugField(CharField):
class URLField(CharField):
default_error_messages = {
- 'invalid': _("Enter a valid URL.")
+ 'invalid': _('Enter a valid URL.')
}
def __init__(self, **kwargs):
@@ -637,10 +637,10 @@ class URLField(CharField):
class IntegerField(Field):
default_error_messages = {
- 'invalid': _("A valid integer is required."),
- 'max_value': _("Ensure this value is less than or equal to {max_value}."),
- 'min_value': _("Ensure this value is greater than or equal to {min_value}."),
- 'max_string_length': _("String value too large.")
+ 'invalid': _('A valid integer is required.'),
+ 'max_value': _('Ensure this value is less than or equal to {max_value}.'),
+ 'min_value': _('Ensure this value is greater than or equal to {min_value}.'),
+ 'max_string_length': _('String value too large.')
}
MAX_STRING_LENGTH = 1000 # Guard against malicious string inputs.
@@ -671,10 +671,10 @@ class IntegerField(Field):
class FloatField(Field):
default_error_messages = {
- 'invalid': _("A valid number is required."),
- 'max_value': _("Ensure this value is less than or equal to {max_value}."),
- 'min_value': _("Ensure this value is greater than or equal to {min_value}."),
- 'max_string_length': _("String value too large.")
+ 'invalid': _('A valid number is required.'),
+ 'max_value': _('Ensure this value is less than or equal to {max_value}.'),
+ 'min_value': _('Ensure this value is greater than or equal to {min_value}.'),
+ 'max_string_length': _('String value too large.')
}
MAX_STRING_LENGTH = 1000 # Guard against malicious string inputs.
@@ -704,13 +704,13 @@ class FloatField(Field):
class DecimalField(Field):
default_error_messages = {
- 'invalid': _("A valid number is required."),
- 'max_value': _("Ensure this value is less than or equal to {max_value}."),
- 'min_value': _("Ensure this value is greater than or equal to {min_value}."),
- 'max_digits': _("Ensure that there are no more than {max_digits} digits in total."),
- 'max_decimal_places': _("Ensure that there are no more than {max_decimal_places} decimal places."),
- 'max_whole_digits': _("Ensure that there are no more than {max_whole_digits} digits before the decimal point."),
- 'max_string_length': _("String value too large.")
+ 'invalid': _('A valid number is required.'),
+ 'max_value': _('Ensure this value is less than or equal to {max_value}.'),
+ 'min_value': _('Ensure this value is greater than or equal to {min_value}.'),
+ 'max_digits': _('Ensure that there are no more than {max_digits} digits in total.'),
+ 'max_decimal_places': _('Ensure that there are no more than {max_decimal_places} decimal places.'),
+ 'max_whole_digits': _('Ensure that there are no more than {max_whole_digits} digits before the decimal point.'),
+ 'max_string_length': _('String value too large.')
}
MAX_STRING_LENGTH = 1000 # Guard against malicious string inputs.
@@ -793,8 +793,8 @@ class DecimalField(Field):
class DateTimeField(Field):
default_error_messages = {
- 'invalid': _("Datetime has wrong format. Use one of these formats instead: {format}."),
- 'date': _("Expected a datetime but got a date."),
+ 'invalid': _('Datetime has wrong format. Use one of these formats instead: {format}.'),
+ 'date': _('Expected a datetime but got a date.'),
}
format = api_settings.DATETIME_FORMAT
input_formats = api_settings.DATETIME_INPUT_FORMATS
@@ -858,8 +858,8 @@ class DateTimeField(Field):
class DateField(Field):
default_error_messages = {
- 'invalid': _("Date has wrong format. Use one of these formats instead: {format}."),
- 'datetime': _("Expected a date but got a datetime."),
+ 'invalid': _('Date has wrong format. Use one of these formats instead: {format}.'),
+ 'datetime': _('Expected a date but got a datetime.'),
}
format = api_settings.DATE_FORMAT
input_formats = api_settings.DATE_INPUT_FORMATS
@@ -916,7 +916,7 @@ class DateField(Field):
class TimeField(Field):
default_error_messages = {
- 'invalid': _("Time has wrong format. Use one of these formats instead: {format}."),
+ 'invalid': _('Time has wrong format. Use one of these formats instead: {format}.'),
}
format = api_settings.TIME_FORMAT
input_formats = api_settings.TIME_INPUT_FORMATS
@@ -972,7 +972,7 @@ class TimeField(Field):
class ChoiceField(Field):
default_error_messages = {
- 'invalid_choice': _("`{input}` is not a valid choice.")
+ 'invalid_choice': _('`{input}` is not a valid choice.')
}
def __init__(self, choices, **kwargs):
@@ -1016,8 +1016,8 @@ class ChoiceField(Field):
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}`.")
+ 'invalid_choice': _('`{input}` is not a valid choice.'),
+ 'not_a_list': _('Expected a list of items but got type `{input_type}`.')
}
default_empty_html = []
@@ -1047,11 +1047,11 @@ class MultipleChoiceField(ChoiceField):
class FileField(Field):
default_error_messages = {
- '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."),
- 'max_length': _("Ensure this filename has at most {max_length} characters (it has {length})."),
+ '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.'),
+ 'max_length': _('Ensure this filename has at most {max_length} characters (it has {length}).'),
}
use_url = api_settings.UPLOADED_FILES_USE_URL
@@ -1118,7 +1118,7 @@ class ListField(Field):
child = None
initial = []
default_error_messages = {
- 'not_a_list': _("Expected a list of items but got type `{input_type}`.")
+ 'not_a_list': _('Expected a list of items but got type `{input_type}`.')
}
def __init__(self, *args, **kwargs):
@@ -1249,7 +1249,7 @@ class ModelField(Field):
that do not have a serializer field to be mapped to.
"""
default_error_messages = {
- 'max_length': _("Ensure this field has no more than {max_length} characters."),
+ 'max_length': _('Ensure this field has no more than {max_length} characters.'),
}
def __init__(self, model_field, **kwargs):