          return super(CharField, self).formfield(**defaults)
  
  # TODO: Maybe move this into contrib, because it's specialized.
  class CommaSeparatedIntegerField(CharField):
      """Comma-separated integers"""
      
      def formfield(self, **kwargs):
          defaults = {
              'form_class': forms.RegexField,
              'regex': '^[\d,]+$',
              'max_length': self.max_length,
 
</s> remove     """Integer"""

 </s> add     description = ugettext_lazy("Integer") </s> remove     """Integer"""
    
 </s> add     description = ugettext_lazy("Integer") </s> remove     """Text"""
    
 </s> add     description = ugettext_lazy("Text") </s> remove     """String (up to %(max_length)s)"""

 </s> add     description = ugettext_lazy("String (up to %(max_length)s)") </s> remove     """E-mail address"""
    
 </s> add     description = ugettext_lazy("E-mail address")
    description = ugettext_lazy("Comma-separated integers")
          return super(CharField, self).formfield(**defaults)
  
  # TODO: Maybe move this into contrib, because it's specialized.
  class CommaSeparatedIntegerField(CharField):
    description = ugettext_lazy("Comma-separated integers")
    description = ugettext_lazy("Comma-separated integers")
      def formfield(self, **kwargs):
          defaults = {
              'form_class': forms.RegexField,
              'regex': '^[\d,]+$',
              'max_length': self.max_length,
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