From 7f63d0009f762c6ce1c665df3674be2fcd3ef7fa Mon Sep 17 00:00:00 2001 From: Malcolm Tredinnick Date: Wed, 25 Mar 2009 01:31:57 +0000 Subject: [PATCH] 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 --- django/contrib/admin/util.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/django/contrib/admin/util.py b/django/contrib/admin/util.py index 38f86e3d583..4bdce45ebe2 100644 --- a/django/contrib/admin/util.py +++ b/django/contrib/admin/util.py @@ -206,8 +206,8 @@ def model_format_dict(obj): def model_ngettext(obj, n=None): """ - Return the appropriate `verbose_name` or `verbose_name_plural` for `obj` - depending on the count `n`. + Return the appropriate `verbose_name` or `verbose_name_plural` value for + `obj` depending on the count `n`. `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 @@ -219,4 +219,5 @@ def model_ngettext(obj, n=None): n = obj.count() obj = obj.model 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)