Commit 44e407b7 authored by Malcolm Tredinnick's avatar Malcolm Tredinnick
Browse files

Fixed #7575 -- Peru now has regions, not departments (changed at some pointi n 

the last year or so). Thanks andresj and programmerq.

This is backwards incompatible if you're using the Peruvian localflavor.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8230 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 567b9f2e

django/contrib/localflavor/pe/forms.py

+4 −4
Original line number Diff line number Diff line
@@ -7,13 +7,13 @@ from django.forms import ValidationError 
from django.forms.fields import RegexField, CharField, Select, EMPTY_VALUES

from django.utils.translation import ugettext_lazy as _



class PEDepartmentSelect(Select):

class PERegionSelect(Select):

    """

    A Select widget that uses a list of Peruvian Departments as its choices.

    A Select widget that uses a list of Peruvian Regions as its choices.

    """

    def __init__(self, attrs=None):

        from pe_department import DEPARTMENT_CHOICES

        super(PEDepartmentSelect, self).__init__(attrs, choices=DEPARTMENT_CHOICES)

        from pe_region import REGION_CHOICES

        super(PERegionSelect, self).__init__(attrs, choices=REGION_CHOICES)



class PEDNIField(CharField):

    """

django/contrib/localflavor/pe/pe_department.py→django/contrib/localflavor/pe/pe_region.py

+3 −3
Original line number Diff line number Diff line 
# -*- coding: utf-8 -*-

"""

A list of Peru departaments as `choices` in a

formfield.

A list of Peru regions as `choices` in a formfield.



This exists in this standalone file so that it's only imported into memory

when explicitly needed.

"""



DEPARTMENT_CHOICES = (

REGION_CHOICES = (

    ('AMA', u'Amazonas'),

    ('ANC', u'Ancash'),

    ('APU', u'Apurímac'),

    ('ARE', u'Arequipa'),

    ('AYA', u'Ayacucho'),

    ('CAJ', u'Cajamarca'),

    ('CAL', u'Callao'),

    ('CUS', u'Cusco'),

    ('HUV', u'Huancavelica'),

    ('HUC', u'Huánuco'),