Author: jezdez
Date: 2012-02-09 10:57:54 -0800 (Thu, 09 Feb 2012)
New Revision: 17476
Modified:
django/trunk/django/db/models/fields/__init__.py
django/trunk/django/db/models/fields/files.py
Log:
Fixed #17219 -- Updated model field descriptions to be more precise. Thanks,
charettes.
Modified: django/trunk/django/db/models/fields/__init__.py
===================================================================
--- django/trunk/django/db/models/fields/__init__.py 2012-02-09 18:57:47 UTC
(rev 17475)
+++ django/trunk/django/db/models/fields/__init__.py 2012-02-09 18:57:54 UTC
(rev 17476)
@@ -509,6 +509,7 @@
default_error_messages = {
'invalid': _(u"'%s' value must be an integer."),
}
+
def __init__(self, *args, **kwargs):
assert kwargs.get('primary_key', False) is True, \
"%ss must have primary_key=True." % self.__class__.__name__
@@ -551,6 +552,7 @@
'invalid': _(u"'%s' value must be either True or False."),
}
description = _("Boolean (Either True or False)")
+
def __init__(self, *args, **kwargs):
kwargs['blank'] = True
if 'default' not in kwargs and not kwargs.get('null'):
@@ -1111,7 +1113,7 @@
return super(NullBooleanField, self).formfield(**defaults)
class PositiveIntegerField(IntegerField):
- description = _("Integer")
+ description = _("Positive integer")
def get_internal_type(self):
return "PositiveIntegerField"
@@ -1122,7 +1124,8 @@
return super(PositiveIntegerField, self).formfield(**defaults)
class PositiveSmallIntegerField(IntegerField):
- description = _("Integer")
+ description = _("Positive small integer")
+
def get_internal_type(self):
return "PositiveSmallIntegerField"
@@ -1132,7 +1135,8 @@
return super(PositiveSmallIntegerField, self).formfield(**defaults)
class SlugField(CharField):
- description = _("String (up to %(max_length)s)")
+ description = _("Slug (up to %(max_length)s)")
+
def __init__(self, *args, **kwargs):
kwargs['max_length'] = kwargs.get('max_length', 50)
# Set db_index=True unless it's been set manually.
@@ -1149,7 +1153,7 @@
return super(SlugField, self).formfield(**defaults)
class SmallIntegerField(IntegerField):
- description = _("Integer")
+ description = _("Small integer")
def get_internal_type(self):
return "SmallIntegerField"
Modified: django/trunk/django/db/models/fields/files.py
===================================================================
--- django/trunk/django/db/models/fields/files.py 2012-02-09 18:57:47 UTC
(rev 17475)
+++ django/trunk/django/db/models/fields/files.py 2012-02-09 18:57:54 UTC
(rev 17476)
@@ -211,7 +211,7 @@
# The descriptor to use for accessing the attribute off of the class.
descriptor_class = FileDescriptor
- description = _("File path")
+ description = _("File")
def __init__(self, verbose_name=None, name=None, upload_to='',
storage=None, **kwargs):
for arg in ('primary_key', 'unique'):
@@ -318,7 +318,7 @@
class ImageField(FileField):
attr_class = ImageFieldFile
descriptor_class = ImageFileDescriptor
- description = _("File path")
+ description = _("Image")
def __init__(self, verbose_name=None, name=None, width_field=None,
height_field=None, **kwargs):
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
