diff options
| author | Kevin Kubasik <kevin@kubasik.net> | 2009-06-02 14:53:25 +0000 |
|---|---|---|
| committer | Kevin Kubasik <kevin@kubasik.net> | 2009-06-02 14:53:25 +0000 |
| commit | f0489dffb93f82ca21251a67d85124df615f652d (patch) | |
| tree | 995a38edca8c683f8bad4ba179814ce19de76386 /django/forms | |
| parent | 295beee70b5144983f120f7376cfbf4504a771a5 (diff) | |
Merge branch 'master' into local/gsoc
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/test-improvements@10890 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/forms')
| -rw-r--r-- | django/forms/models.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/django/forms/models.py b/django/forms/models.py index a0b217860d..8e9c0de0e7 100644 --- a/django/forms/models.py +++ b/django/forms/models.py @@ -584,7 +584,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): |