  import unittest
  from django.contrib.admindocs import views
  import fields
  
  from django.db.models import fields as builtin_fields
  
  class TestFieldType(unittest.TestCase):
      def setUp(self):
          pass
 
</s> remove from django.contrib.admindocs import views
 </s> add  </s> remove     """U.S. state (two uppercase letters)"""
 </s> add     description = _("U.S. state (two uppercase letters)")
 </s> remove     """A custom field type"""
    
class ManyLineDocstringField(models.Field):
    """Many-line custom field
    
    This docstring has many lines.  Lorum ipsem etc. etc.  Four score 
    and seven years ago, and so on and so forth."""
 </s> add     description = "A custom field type" </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__
from django.contrib.admindocs import views
  import unittest
  from django.contrib.admindocs import views
  import fields
from django.contrib.admindocs import views
  from django.db.models import fields as builtin_fields
  
  class TestFieldType(unittest.TestCase):
      def setUp(self):
          pass
keep keep keep 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/contrib/admindocs/tests/__init__.py