mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-05 00:00:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixed #11369 -- Corrected verbose_name_plural model Meta option to be consistent with verbose_name when using abstract model inheritance. Thanks Beetle_B for the report.

Browse source 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14588 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Ramiro Morales 2010-11-17 12:09:21 +00:00
parent 4276b5197b
commit 5666bca678
3 changed files with 29 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
django/db/models/options.py
View file

@ -19,7 +19,7 @@ except NameError:
# Calculate the verbose_name by converting from InitialCaps to "lowercase with spaces".
get_verbose_name = lambda class_name: re.sub('(((?<=[a-z])[A-Z])|([A-Z](?![A-Z]|$)))', ' \\1', class_name).lower().strip()
DEFAULT_NAMES = ('verbose_name', 'db_table', 'ordering',
DEFAULT_NAMES = ('verbose_name', 'verbose_name_plural', 'db_table', 'ordering',
'unique_together', 'permissions', 'get_latest_by',
'order_with_respect_to', 'app_label', 'db_tablespace',
'abstract', 'managed', 'proxy', 'auto_created')
@ -91,7 +91,8 @@ class Options(object):
# verbose_name_plural is a special case because it uses a 's'
# by default.
self.verbose_name_plural = meta_attrs.pop('verbose_name_plural', string_concat(self.verbose_name, 's'))
if self.verbose_name_plural is None:
self.verbose_name_plural = string_concat(self.verbose_name, 's')
# Any leftover attributes must be invalid.
if meta_attrs != {}: