  from django.db.models.fields import Field, CharField
  from django.contrib.localflavor.us.us_states import STATE_CHOICES
    
  class USStateField(CharField):
      """U.S. state (two uppercase letters)"""
      def __init__(self, *args, **kwargs):
          kwargs['choices'] = STATE_CHOICES
          kwargs['max_length'] = 2
          super(USStateField, self).__init__(*args, **kwargs)
    
 
</s> remove 
 </s> add from django.contrib.admindocs import views </s> remove     """Phone number"""
 </s> add     description = _("Phone number")
 </s> remove from django.contrib.admindocs import views
 </s> add  </s> remove 
 </s> add     description = ugettext_lazy("IP address")
    description = _("U.S. state (two uppercase letters)")

  from django.db.models.fields import Field, CharField
  from django.contrib.localflavor.us.us_states import STATE_CHOICES
    
  class USStateField(CharField):
    description = _("U.S. state (two uppercase letters)")

      def __init__(self, *args, **kwargs):
          kwargs['choices'] = STATE_CHOICES
          kwargs['max_length'] = 2
          super(USStateField, self).__init__(*args, **kwargs)
    
keep 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/localflavor/us/models.py