summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell Keith-Magee <russell@keith-magee.com>2007-08-24 11:39:20 +0000
committerRussell Keith-Magee <russell@keith-magee.com>2007-08-24 11:39:20 +0000
commit4a2abd003dbd620020863e8758dac2eadc84e32c (patch)
tree3245941f0569a16e876cbf841d4be94a4089c9d1
parent88987ed0ac6c29b78e2321e6f6687cb1385510fc (diff)
newforms-admin: Fixed #5231 -- Corrected some entries in the admindocs views to point to new and changed datatypes. Thansk, Matthias Pronk <django@masida.nl>
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@5996 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--AUTHORS1
-rw-r--r--django/contrib/admindocs/views.py7
2 files changed, 5 insertions, 3 deletions
diff --git a/AUTHORS b/AUTHORS
index d640ebb2c9..eba4775fda 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -227,6 +227,7 @@ answer newbie questions, and generally made Django that much better:
plisk
Daniel Poelzleithner <http://poelzi.org/>
polpak@yahoo.com
+ Matthias Pronk <django@masida.nl>
Johann Queuniet <johann.queuniet@adh.naellia.eu>
J. Rademaker
Michael Radziej <mir@noris.de>
diff --git a/django/contrib/admindocs/views.py b/django/contrib/admindocs/views.py
index bbede4652f..3e3cd84cc0 100644
--- a/django/contrib/admindocs/views.py
+++ b/django/contrib/admindocs/views.py
@@ -291,14 +291,15 @@ def get_return_data_type(func_name):
DATA_TYPE_MAPPING = {
'AutoField' : _('Integer'),
'BooleanField' : _('Boolean (Either True or False)'),
- 'CharField' : _('String (up to %(maxlength)s)'),
+ 'CharField' : _('String (up to %(max_length)s)'),
'CommaSeparatedIntegerField': _('Comma-separated integers'),
'DateField' : _('Date (without time)'),
'DateTimeField' : _('Date (with time)'),
+ 'DecimalField' : _('Decimal number'),
'EmailField' : _('E-mail address'),
'FileField' : _('File path'),
'FilePathField' : _('File path'),
- 'FloatField' : _('Decimal number'),
+ 'FloatField' : _('Floating point number'),
'ForeignKey' : _('Integer'),
'ImageField' : _('File path'),
'IntegerField' : _('Integer'),
@@ -309,7 +310,7 @@ DATA_TYPE_MAPPING = {
'PhoneNumberField' : _('Phone number'),
'PositiveIntegerField' : _('Integer'),
'PositiveSmallIntegerField' : _('Integer'),
- 'SlugField' : _('String (up to %(maxlength)s)'),
+ 'SlugField' : _('String (up to %(max_length)s)'),
'SmallIntegerField' : _('Integer'),
'TextField' : _('Text'),
'TimeField' : _('Time'),