diff --git a/django/db/models/fields/__init__.py b/django/db/models/fields/__init__.py index 42b727d755..22546c27de 100644 --- a/django/db/models/fields/__init__.py +++ b/django/db/models/fields/__init__.py @@ -509,6 +509,7 @@ class AutoField(Field): 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 @@ class BooleanField(Field): '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 @@ class NullBooleanField(Field): 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 @@ class PositiveIntegerField(IntegerField): 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 @@ class PositiveSmallIntegerField(IntegerField): 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 @@ class SlugField(CharField): return super(SlugField, self).formfield(**defaults) class SmallIntegerField(IntegerField): - description = _("Integer") + description = _("Small integer") def get_internal_type(self): return "SmallIntegerField" diff --git a/django/db/models/fields/files.py b/django/db/models/fields/files.py index d4b1743f97..6f1f183d4f 100644 --- a/django/db/models/fields/files.py +++ b/django/db/models/fields/files.py @@ -211,7 +211,7 @@ class FileField(Field): # 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 ImageFieldFile(ImageFile, FieldFile): 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):