diff options
| author | Adrian Holovaty <adrian@holovaty.com> | 2006-05-15 18:50:54 +0000 |
|---|---|---|
| committer | Adrian Holovaty <adrian@holovaty.com> | 2006-05-15 18:50:54 +0000 |
| commit | 3cef18cb51204c75bb4eefa4d309c7d6ec065f74 (patch) | |
| tree | 086b66a4d6652f2821f027e838b7a6cbb50c71c4 | |
| parent | 34b798cb42263ca57a1e773441fa1f09716d50bc (diff) | |
Fixed #1884 -- Made django.db.models.options.get_verbose_name smarter. Thanks, Alex Dedul
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2909 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | django/db/models/options.py | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -51,6 +51,7 @@ answer newbie questions, and generally made Django that much better: Matt Croydon <http://www.postneo.com/> Jonathan Daugherty (cygnus) <http://www.cprogrammer.org/> Jason Davies (Esaj) <http://www.jasondavies.com/> + Alex Dedul deric@monowerks.com Jeremy Dunck <http://dunck.us/> Clint Ecker diff --git a/django/db/models/options.py b/django/db/models/options.py index 196ccd952d..1023689a86 100644 --- a/django/db/models/options.py +++ b/django/db/models/options.py @@ -9,7 +9,7 @@ from bisect import bisect import re # 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() +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', 'unique_together', 'permissions', 'get_latest_by', |