From 7edeeb74fe1e82c1b4a736670b13b0508b223a06 Mon Sep 17 00:00:00 2001 From: Jon Dufresne Date: Mon, 20 Mar 2017 10:12:55 -0700 Subject: [PATCH] Fixed #27957 -- Removed technical terms from InlineForeignKeyField/ModelMultipleChoiceField error messages. --- django/forms/models.py | 4 ++-- tests/forms_tests/tests/test_error_messages.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/django/forms/models.py b/django/forms/models.py index 895ebbd59d9..c8626f57b27 100644 --- a/django/forms/models.py +++ b/django/forms/models.py @@ -1059,7 +1059,7 @@ class InlineForeignKeyField(Field): """ widget = HiddenInput default_error_messages = { - 'invalid_choice': _('The inline foreign key did not match the parent instance primary key.'), + 'invalid_choice': _('The inline value did not match the parent instance.'), } def __init__(self, parent_instance, *args, pk_field=False, to_field=None, **kwargs): @@ -1229,7 +1229,7 @@ class ModelMultipleChoiceField(ModelChoiceField): 'list': _('Enter a list of values.'), 'invalid_choice': _('Select a valid choice. %(value)s is not one of the' ' available choices.'), - 'invalid_pk_value': _('"%(pk)s" is not a valid value for a primary key.') + 'invalid_pk_value': _('"%(pk)s" is not a valid value.') } def __init__(self, queryset, required=True, widget=None, label=None, diff --git a/tests/forms_tests/tests/test_error_messages.py b/tests/forms_tests/tests/test_error_messages.py index 40b085f55bf..aaee0bb5d39 100644 --- a/tests/forms_tests/tests/test_error_messages.py +++ b/tests/forms_tests/tests/test_error_messages.py @@ -276,8 +276,8 @@ class FormsErrorMessagesTestCase(SimpleTestCase, AssertFormErrorsMixin): self.assertHTMLEqual( t.render(Context({'form': f})), '' + '
  • "<script>" is not a valid value.
  • ' + '' )