diff --git a/AUTHORS b/AUTHORS index fe2b83ac9fe..225335abfde 100644 --- a/AUTHORS +++ b/AUTHORS @@ -64,6 +64,7 @@ answer newbie questions, and generally made Django that much better: Ian Clelland crankycoder@gmail.com Matt Croydon + dackze+django@gmail.com Jonathan Daugherty (cygnus) Jason Davies (Esaj) Alex Dedul diff --git a/django/db/models/manipulators.py b/django/db/models/manipulators.py index faf453b86b4..c33e703da11 100644 --- a/django/db/models/manipulators.py +++ b/django/db/models/manipulators.py @@ -300,7 +300,7 @@ def manipulator_validator_unique_together(field_name_list, opts, self, field_dat pass else: raise validators.ValidationError, _("%(object)s with this %(type)s already exists for the given %(field)s.") % \ - {'object': capfirst(opts.verbose_name), 'type': field_list[0].verbose_name, 'field': get_text_list(field_name_list[1:], 'and')} + {'object': capfirst(opts.verbose_name), 'type': field_list[0].verbose_name, 'field': get_text_list([f.verbose_name for f in field_list[1:]], 'and')} def manipulator_validator_unique_for_date(from_field, date_field, opts, lookup_type, self, field_data, all_data): from django.db.models.fields.related import ManyToOneRel