[1.2.X] Reverted r14196, restoring the 1.2 test suite to a passing state. Refs #14455.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14410 bcc190cf-cafb-0310-a4f2-bffc1f526a37

django/contrib/localflavor/id/id_choices.py

@@ -6,7 +6,6 @@ from django.utils.translation import ugettext_lazy as _
 # I decided to use unambiguous and consistent (some are common) 3-letter codes.
 
 PROVINCE_CHOICES = (
-    ('ACE', _('Aceh')),
     ('BLI', _('Bali')),
     ('BTN', _('Banten')),
     ('BKL', _('Bengkulu')),
@@ -26,6 +25,7 @@ PROVINCE_CHOICES = (
     ('LPG', _('Lampung')),
     ('MLK', _('Maluku')),
     ('MUT', _('Maluku Utara')),
+    ('NAD', _('Nanggroe Aceh Darussalam')),
     ('NTB', _('Nusa Tenggara Barat')),
     ('NTT', _('Nusa Tenggara Timur')),
     ('PPA', _('Papua')),