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

Fixed a ungettext() call to prevent spurious string extraction by xgettext. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10168 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Malcolm Tredinnick 2009-03-25 01:31:57 +00:00
parent 6485d9bb43
commit 7f63d0009f
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
django/contrib/admin/util.py
View File

@ -206,8 +206,8 @@ def model_format_dict(obj):
def model_ngettext(obj, n=None): def model_ngettext(obj, n=None):
""" """
Return the appropriate `verbose_name` or `verbose_name_plural` for `obj` Return the appropriate `verbose_name` or `verbose_name_plural` value for
depending on the count `n`. `obj` depending on the count `n`.
`obj` may be a `Model` instance, `Model` subclass, or `QuerySet` instance. `obj` may be a `Model` instance, `Model` subclass, or `QuerySet` instance.
If `obj` is a `QuerySet` instance, `n` is optional and the length of the If `obj` is a `QuerySet` instance, `n` is optional and the length of the
@ -219,4 +219,5 @@ def model_ngettext(obj, n=None):
n = obj.count() n = obj.count()
obj = obj.model obj = obj.model
d = model_format_dict(obj) d = model_format_dict(obj)
return ungettext(d['verbose_name'], d['verbose_name_plural'], n or 0) singular, plural = d["verbose_name"], d["verbose_name_plural"]
return ungettext(singular, plural, n or 0)