Ticket #1552: options_fix_r2592.diff

django/db/models/options.py

@@ -10 +10 @@
 # Calculate the verbose_name by converting from InitialCaps to "lowercase with spaces".
 get_verbose_name = lambda class_name: re.sub('([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')
 
@@ -39 +39 @@
         self.object_name = cls.__name__
         self.module_name = self.object_name.lower()
         self.verbose_name = get_verbose_name(self.object_name)
+        self.verbose_name_plural = self.verbose_name + 's'
         # Next, apply any overridden values from 'class Meta'.
         if self.meta:
             meta_attrs = self.meta.__dict__
             del meta_attrs['__module__']
             del meta_attrs['__doc__']
+            if 'verbose_name' in meta_attrs and 'verbose_name_plural' not in meta_attrs:
+                meta_attrs['verbose_name_plural'] = meta_attrs['verbose_name'] + 's'
             for attr_name in DEFAULT_NAMES:
                 setattr(self, attr_name, meta_attrs.pop(attr_name, getattr(self, attr_name)))
-            # verbose_name_plural is a special case because it uses a 's'
-            # by default.
-            setattr(self, 'verbose_name_plural', meta_attrs.pop('verbose_name_plural', self.verbose_name + 's'))
             # Any leftover attributes must be invalid.
             if meta_attrs != {}:
                 raise TypeError, "'class Meta' got invalid attribute(s): %s" % ','.join(meta_attrs.keys())