diff options
| author | Jannis Leidel <jannis@leidel.info> | 2012-02-09 18:57:54 +0000 |
|---|---|---|
| committer | Jannis Leidel <jannis@leidel.info> | 2012-02-09 18:57:54 +0000 |
| commit | 2aae05772755df50ae29eb3d699fad75ffded6a3 (patch) | |
| tree | e56ac309a858b557564ed9d2482f24702790fe36 /django/db/models/fields/__init__.py | |
| parent | 46f1369d92c1ac4e37e9b1efffc7c87d759508eb (diff) | |
Fixed #17219 -- Updated model field descriptions to be more precise. Thanks, charettes.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17476 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/db/models/fields/__init__.py')
| -rw-r--r-- | django/db/models/fields/__init__.py | 12 |
1 files changed, 8 insertions, 4 deletions
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" |
