          defaults.update(kwargs)
          return super(BooleanField, self).formfield(**defaults)
  
  class CharField(Field):
      """String (up to %(max_length)s)"""
      
      def get_internal_type(self):
          return "CharField"
  
      def to_python(self, value):
          if isinstance(value, basestring):
 
</s> remove     """String (up to %(max_length)s)"""

 </s> add     description = ugettext_lazy("String (up to %(max_length)s)") </s> remove     """Date (with time)"""
    
 </s> add     description = ugettext_lazy("Date (with time)") </s> remove     """Integer"""
    
 </s> add  </s> remove     """Floating point number"""
    
 </s> add  </s> remove     """Integer"""
    
 </s> add     description = ugettext_lazy("Integer")
    description = ugettext_lazy("String (up to %(max_length)s)")
          defaults.update(kwargs)
          return super(BooleanField, self).formfield(**defaults)
  
  class CharField(Field):
    description = ugettext_lazy("String (up to %(max_length)s)")
    description = ugettext_lazy("String (up to %(max_length)s)")
      def get_internal_type(self):
          return "CharField"
  
      def to_python(self, value):
          if isinstance(value, basestring):
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