summaryrefslogtreecommitdiff
path: root/django/forms
diff options
context:
space:
mode:
authorHonza Král <honza.kral@gmail.com>2009-06-03 14:03:10 +0000
committerHonza Král <honza.kral@gmail.com>2009-06-03 14:03:10 +0000
commit7b14625d0d9c8dc4df87c5354c856e6f5ed3ef60 (patch)
tree0b0e31013a52641047c5526994173db080795498 /django/forms
parent85e0c469aa5298b54d8d173bf1881b72b3f0c445 (diff)
[soc2009/model-valition] Merged to trunk at r10914
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/model-validation@10916 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/forms')
-rw-r--r--django/forms/models.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/forms/models.py b/django/forms/models.py
index f2ce48d277..d48f33a606 100644
--- a/django/forms/models.py
+++ b/django/forms/models.py
@@ -451,7 +451,7 @@ class BaseModelFormSet(BaseFormSet):
else:
return ugettext("Please correct the duplicate data for %(field)s, "
"which must be unique.") % {
- "field": get_text_list(unique_check, _("and")),
+ "field": get_text_list(unique_check, unicode(_("and"))),
}
def get_date_error_message(self, date_check):