test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[1.7.x] Fixed #22887 -- Added comment for translators on unique_for_date error message 

Backport of 6eed751162 from master.
This commit is contained in:
Federico Frenguelli 2014-07-26 12:06:19 +02:00 committed by Claude Paroz
parent 08e8e2137d
commit bc3d401b9f
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
django/conf/locale/en/LC_MESSAGES/django.po
View File

@ -4,7 +4,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Django\n" "Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-06-20 22:48+0200\n" "POT-Creation-Date: 2014-07-26 13:48+0200\n"
"PO-Revision-Date: 2010-05-13 15:35+0200\n" "PO-Revision-Date: 2010-05-13 15:35+0200\n"
"Last-Translator: Django team\n" "Last-Translator: Django team\n"
"Language-Team: English <en@li.org>\n" "Language-Team: English <en@li.org>\n"
@ -454,7 +454,9 @@ msgstr ""
msgid "%(model_name)s with this %(field_label)s already exists." msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "" msgstr ""
#: db/models/fields/__init__.py:109 #. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
#. Eg: "Title must be unique for pub_date year"
#: db/models/fields/__init__.py:111
#, python-format #, python-format
msgid "" msgid ""
"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s." "%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."

2
django/db/models/fields/__init__.py
View File

@ -106,6 +106,8 @@ class Field(RegisterLookupMixin):
'blank': _('This field cannot be blank.'), 'blank': _('This field cannot be blank.'),
'unique': _('%(model_name)s with this %(field_label)s ' 'unique': _('%(model_name)s with this %(field_label)s '
'already exists.'), 'already exists.'),
# Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
# Eg: "Title must be unique for pub_date year"
'unique_for_date': _("%(field_label)s must be unique for " 'unique_for_date': _("%(field_label)s must be unique for "
"%(date_field_label)s %(lookup_type)s."), "%(date_field_label)s %(lookup_type)s."),
} }