Ticket #2204: options.py.diff

options.py

@@ -41 +41 @@
         self.object_name = cls.__name__
         self.module_name = self.object_name.lower()
         self.verbose_name = get_verbose_name(self.object_name)
+        vowels = "aeiou"
+        consonants = "bcdfghjklmnpqrstvwxyz"
+        # If the word ends in a 'y' and is preceded by a vowel, add 'ies'.
+        if self.verbose_name.endswith('y') and self.verbose_name[-2] in consonants:
+            verbose_name_plural = self.verbose_name[:-1] + 'ies'
+        elif self.verbose_name.endswith('is'):
+            verbose_name_plural = self.verbose_name[:-2] + 'es'
+        elif self.verbose_name.endswith('us'):
+            verbose_name_plural = self.verbose_name[:-2] + 'i'
+        elif self.verbose_name.endswith('o') and self.verbose_name[-2] in consonants:
+            verbose_name_plural = self.verbose_name + 'es'
+        elif self.verbose_name[-2:] in ('ch', 'sh') or self.verbose_name[-1] in ('s', 'x', 'z'):
+            verbose_name_plural = self.verbose_name + 'es'
+        else:
+            verbose_name_plural = self.verbose_name + 's'
         # Next, apply any overridden values from 'class Meta'.
         if self.meta:
             meta_attrs = self.meta.__dict__
@@ -50 +65 @@
                 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'))
+            setattr(self, 'verbose_name_plural', meta_attrs.pop('verbose_name_plural', verbose_name_plural))
             # Any leftover attributes must be invalid.
             if meta_attrs != {}:
                 raise TypeError, "'class Meta' got invalid attribute(s): %s" % ','.join(meta_attrs.keys())
         else:
-            self.verbose_name_plural = self.verbose_name + 's'
+            self.verbose_name_plural = verbose_name_plural
         del self.meta
 
     def _prepare(self, model):