          "Returns the value of this field in the given model instance."
          return getattr(obj, self.attname)
  
  class AutoField(Field):
      """Integer"""
      
      empty_strings_allowed = False
  
      def __init__(self, *args, **kwargs):
          assert kwargs.get('primary_key', False) is True, "%ss must have primary_key=True." % self.__class__.__name__
          kwargs['blank'] = True
 
</s> remove     """Returns the first line of a doc string for a given field type, if it 
    exists.  Fields' docstrings can contain format strings, which will be 
    interpolated against the values of Field.__dict__ before being output.  
    If no docstring is given, a sensible value will be auto-generated from 
    the field's class name."""

    if field.__doc__:
        doc = field.__doc__.split('\n')[0]
        return _(doc) % field.__dict__
    else:
        return _(u'Field of type: %(field_type)s') % {
            'field_type': field.__class__.__name__
        } 
 </s> add     """Returns the description for a given field type, if it exists,
    Fields' descriptions can contain format strings, which will be interpolated
    against the values of field.__dict__ before being output."""

    return field.description % field.__dict__ </s> remove     """Boolean (Either True or False)"""

 </s> add  </s> remove 
 </s> add     description = ugettext_lazy("Boolean (Either True or False)") </s> remove 
 </s> add     description = ugettext_lazy("Boolean (Either True, False or None)") </s> remove     """Boolean (Either True, False or None)"""

 </s> add 
    description = ugettext_lazy("Integer")
          "Returns the value of this field in the given model instance."
          return getattr(obj, self.attname)
  
  class AutoField(Field):
    description = ugettext_lazy("Integer")
    description = ugettext_lazy("Integer")
      empty_strings_allowed = False
  
      def __init__(self, *args, **kwargs):
          assert kwargs.get('primary_key', False) is True, "%ss must have primary_key=True." % self.__class__.__name__
          kwargs['blank'] = True
keep keep keep keep replace replace keep keep keep keep keep
 Fixed #12385: Made built-in field type descriptions in admindocs translatable again.  Many thanks to Ramiro for the problem report and patch.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@11878 bcc190cf-cafb-0310-a4f2-bffc1f526a37 
django/db/models/fields/__init__.py