diff options
| author | Hasan Ramezani <hasan.r67@gmail.com> | 2018-05-14 02:27:28 +0430 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2018-05-13 17:57:28 -0400 |
| commit | 31ce1f74334add625a4ed82b531d769828237882 (patch) | |
| tree | 1446815e3054b2a0071738ece3628abd4cc8d9e5 | |
| parent | 2405833c53950394a296fbf96211fcd04faccefe (diff) | |
Refs #29131 -- Fixed space handling in ArrayField's item_invalid message.
| -rw-r--r-- | django/contrib/postgres/fields/array.py | 2 | ||||
| -rw-r--r-- | django/contrib/postgres/forms/array.py | 4 | ||||
| -rw-r--r-- | django/contrib/postgres/utils.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/django/contrib/postgres/fields/array.py b/django/contrib/postgres/fields/array.py index d2c1743861..ab667acd5b 100644 --- a/django/contrib/postgres/fields/array.py +++ b/django/contrib/postgres/fields/array.py @@ -19,7 +19,7 @@ __all__ = ['ArrayField'] class ArrayField(CheckFieldDefaultMixin, Field): empty_strings_allowed = False default_error_messages = { - 'item_invalid': _('Item %(nth)s in the array did not validate: '), + 'item_invalid': _('Item %(nth)s in the array did not validate:'), 'nested_array_mismatch': _('Nested arrays must have the same length.'), } _default_hint = ('list', '[]') diff --git a/django/contrib/postgres/forms/array.py b/django/contrib/postgres/forms/array.py index 6c18a37ebf..554a39d4f6 100644 --- a/django/contrib/postgres/forms/array.py +++ b/django/contrib/postgres/forms/array.py @@ -13,7 +13,7 @@ from ..utils import prefix_validation_error class SimpleArrayField(forms.CharField): default_error_messages = { - 'item_invalid': _('Item %(nth)s in the array did not validate: '), + 'item_invalid': _('Item %(nth)s in the array did not validate:'), } def __init__(self, base_field, *, delimiter=',', max_length=None, min_length=None, **kwargs): @@ -167,7 +167,7 @@ class SplitArrayWidget(forms.Widget): class SplitArrayField(forms.Field): default_error_messages = { - 'item_invalid': _('Item %(nth)s in the array did not validate: '), + 'item_invalid': _('Item %(nth)s in the array did not validate:'), } def __init__(self, base_field, size, *, remove_trailing_nulls=False, **kwargs): diff --git a/django/contrib/postgres/utils.py b/django/contrib/postgres/utils.py index 9f92f4059f..f3c022f474 100644 --- a/django/contrib/postgres/utils.py +++ b/django/contrib/postgres/utils.py @@ -17,7 +17,7 @@ def prefix_validation_error(error, prefix, code, params): # ngettext calls require a count parameter and are converted # to an empty string if they are missing it. message=format_lazy( - '{}{}', + '{} {}', SimpleLazyObject(lambda: prefix % params), SimpleLazyObject(lambda: error.message % error_params), ), |