Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixes #2965 -- Added i18n for joiner used in validation error message…

…s. Thanks, ramiro.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@3949 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 5ec32a1c2d863760aff4c30befc18faf849af34f 1 parent cb93c0d
@freakboy3742 freakboy3742 authored
Showing with 1 addition and 1 deletion.
  1. +1 −1  django/db/models/manipulators.py
View
2  django/db/models/manipulators.py
@@ -303,7 +303,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([f.verbose_name for f in field_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

0 comments on commit 5ec32a1

Please sign in to comment.
Something went wrong with that request. Please try again.