From 5ec32a1c2d863760aff4c30befc18faf849af34f Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon, 30 Oct 2006 13:54:28 +0000
Subject: [PATCH] Fixes #2965 -- Added i18n for joiner used in validation error
messages. Thanks, ramiro.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3949 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
django/db/models/manipulators.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/django/db/models/manipulators.py b/django/db/models/manipulators.py
index 83ddda844e..9a898e217f 100644
--- a/django/db/models/manipulators.py
+++ b/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