Author: jezdez
Date: 2011-06-28 03:17:23 -0700 (Tue, 28 Jun 2011)
New Revision: 16477
Added:
django/trunk/django/contrib/localflavor/py/
django/trunk/django/contrib/localflavor/py/__init__.py
django/trunk/django/contrib/localflavor/py/forms.py
django/trunk/django/contrib/localflavor/py/py_department.py
django/trunk/tests/regressiontests/forms/localflavor/py.py
Modified:
django/trunk/docs/ref/contrib/localflavor.txt
django/trunk/tests/regressiontests/forms/localflavortests.py
django/trunk/tests/regressiontests/forms/tests/__init__.py
Log:
Fixed #12761 -- Added Paraguayan local flavor. Thanks, dschulz and BernhardEssl.
Added: django/trunk/django/contrib/localflavor/py/__init__.py
===================================================================
Added: django/trunk/django/contrib/localflavor/py/forms.py
===================================================================
--- django/trunk/django/contrib/localflavor/py/forms.py
(rev 0)
+++ django/trunk/django/contrib/localflavor/py/forms.py 2011-06-28 10:17:23 UTC
(rev 16477)
@@ -0,0 +1,21 @@
+"""
+PY-specific Form helpers.
+"""
+from django.forms.fields import Select
+
+class PyDepartmentSelect(Select):
+ """
+ A Select widget with a list of Paraguayan departments as choices.
+ """
+ def __init__(self, attrs=None):
+ from py_department import DEPARTMENT_CHOICES
+ super(PyDepartmentSelect, self).__init__(attrs,
choices=DEPARTMENT_CHOICES)
+
+
+class PyNumberedDepartmentSelect(Select):
+ """
+ A Select widget with a roman numbered list of Paraguayan departments as
choices.
+ """
+ def __init__(self, attrs=None):
+ from py_department import DEPARTMENT_ROMAN_CHOICES
+ super(PyNumberedDepartmentSelect, self).__init__(attrs,
choices=DEPARTMENT_ROMAN_CHOICES)
Added: django/trunk/django/contrib/localflavor/py/py_department.py
===================================================================
--- django/trunk/django/contrib/localflavor/py/py_department.py
(rev 0)
+++ django/trunk/django/contrib/localflavor/py/py_department.py 2011-06-28
10:17:23 UTC (rev 16477)
@@ -0,0 +1,45 @@
+# -*- coding: utf-8 -*-
+
+# http://www.statoids.com/upy.html
+
+DEPARTMENT_CHOICES = (
+ ('AG', u'Alto Paraguay'),
+ ('AA', u'Alto Paraná'),
+ ('AM', u'Amambay'),
+ ('AS', u'Asunción'),
+ ('BQ', u'Boquerón'),
+ ('CG', u'Caaguazú'),
+ ('CZ', u'Caazapá'),
+ ('CY', u'Canindeyú'),
+ ('CE', u'Central'),
+ ('CN', u'Concepción'),
+ ('CR', u'Cordillera'),
+ ('GU', u'Guairá'),
+ ('IT', u'Itapúa'),
+ ('MI', u'Misiones'),
+ ('NE', u'Ñeembucú'),
+ ('PG', u'Paraguarí'),
+ ('PH', u'Pdte. Hayes'),
+ ('SP', u'San Pedro'),
+)
+
+DEPARTMENT_ROMAN_CHOICES = (
+ ('CN', u'I Concepción'),
+ ('SP', u'II San Pedro'),
+ ('CR', u'III Cordillera'),
+ ('GU', u'IV Guairá'),
+ ('CG', u'V Caaguazú'),
+ ('CZ', u'VI Caazapá'),
+ ('IT', u'VII Itapúa'),
+ ('MI', u'VIII Misiones'),
+ ('PG', u'IX Paraguarí'),
+ ('AA', u'X Alto Paraná'),
+ ('CE', u'XI Central'),
+ ('NE', u'XII Ñeembucú'),
+ ('AM', u'XIII Amambay'),
+ ('CY', u'XIV Canindeyú'),
+ ('PH', u'XV Pdte. Hayes'),
+ ('AG', u'XVI Alto Paraguay'),
+ ('BQ', u'XVII Boquerón'),
+ ('AS', u'XVIII Asunción'),
+)
Modified: django/trunk/docs/ref/contrib/localflavor.txt
===================================================================
--- django/trunk/docs/ref/contrib/localflavor.txt 2011-06-28 10:17:01 UTC
(rev 16476)
+++ django/trunk/docs/ref/contrib/localflavor.txt 2011-06-28 10:17:23 UTC
(rev 16477)
@@ -64,6 +64,7 @@
* Peru_
* Poland_
* Portugal_
+ * Paraguay_
* Romania_
* Russia_
* Slovakia_
@@ -114,6 +115,7 @@
.. _Macedonia: `Macedonia (mk)`_
.. _Mexico: `Mexico (mx)`_
.. _Norway: `Norway (no)`_
+.. _Paraguay: `Paraguay (py)`_
.. _Peru: `Peru (pe)`_
.. _Poland: `Poland (pl)`_
.. _Portugal: `Portugal (pt)`_
@@ -784,6 +786,19 @@
A ``Select`` widget that uses a list of Norwegian municipalities (fylker)
as
its choices.
+Paraguay (``py``)
+=================
+
+.. versionadded:: 1.4
+
+.. class:: py.forms.PyDepartmentSelect
+
+ A ``Select`` widget with a list of Paraguayan departments as choices.
+
+.. class:: py.forms.PyNumberedDepartmentSelect
+
+ A ``Select`` widget with a roman numbered list of Paraguayan departments
as choices.
+
Peru (``pe``)
=============
Added: django/trunk/tests/regressiontests/forms/localflavor/py.py
===================================================================
--- django/trunk/tests/regressiontests/forms/localflavor/py.py
(rev 0)
+++ django/trunk/tests/regressiontests/forms/localflavor/py.py 2011-06-28
10:17:23 UTC (rev 16477)
@@ -0,0 +1,53 @@
+from django.contrib.localflavor.py.forms import (PyDepartmentSelect,
+ PyNumberedDepartmentSelect)
+
+from utils import LocalFlavorTestCase
+
+class PYLocalFlavorTests(LocalFlavorTestCase):
+ def test_PyDepartmentSelect(self):
+ py = PyDepartmentSelect()
+ out = u'''<select name="department">
+<option value="AG">Alto Paraguay</option>
+<option value="AA">Alto Paran\xe1</option>
+<option value="AM">Amambay</option>
+<option value="AS">Asunci\xf3n</option>
+<option value="BQ">Boquer\xf3n</option>
+<option value="CG">Caaguaz\xfa</option>
+<option value="CZ">Caazap\xe1</option>
+<option value="CY">Canindey\xfa</option>
+<option value="CE">Central</option>
+<option value="CN">Concepci\xf3n</option>
+<option value="CR">Cordillera</option>
+<option value="GU">Guair\xe1</option>
+<option value="IT">Itap\xfaa</option>
+<option value="MI">Misiones</option>
+<option value="NE">\xd1eembuc\xfa</option>
+<option value="PG">Paraguar\xed</option>
+<option value="PH">Pdte. Hayes</option>
+<option value="SP">San Pedro</option>
+</select>'''
+ self.assertEqual(py.render('department', 'M'), out)
+
+ def test_PyNumberedDepartmentSelect(self):
+ py = PyNumberedDepartmentSelect()
+ out = u'''<select name="department">
+<option value="CN">I Concepci\xf3n</option>
+<option value="SP">II San Pedro</option>
+<option value="CR">III Cordillera</option>
+<option value="GU">IV Guair\xe1</option>
+<option value="CG">V Caaguaz\xfa</option>
+<option value="CZ">VI Caazap\xe1</option>
+<option value="IT">VII Itap\xfaa</option>
+<option value="MI">VIII Misiones</option>
+<option value="PG">IX Paraguar\xed</option>
+<option value="AA">X Alto Paran\xe1</option>
+<option value="CE">XI Central</option>
+<option value="NE">XII \xd1eembuc\xfa</option>
+<option value="AM" selected="selected">XIII Amambay</option>
+<option value="CY">XIV Canindey\xfa</option>
+<option value="PH">XV Pdte. Hayes</option>
+<option value="AG">XVI Alto Paraguay</option>
+<option value="BQ">XVII Boquer\xf3n</option>
+<option value="AS">XVIII Asunci\xf3n</option>
+</select>'''
+ self.assertEqual(py.render('department', 'AM'), out)
Modified: django/trunk/tests/regressiontests/forms/localflavortests.py
===================================================================
--- django/trunk/tests/regressiontests/forms/localflavortests.py
2011-06-28 10:17:01 UTC (rev 16476)
+++ django/trunk/tests/regressiontests/forms/localflavortests.py
2011-06-28 10:17:23 UTC (rev 16477)
@@ -27,6 +27,7 @@
from localflavor.nl import NLLocalFlavorTests
from localflavor.pl import PLLocalFlavorTests
from localflavor.pt import PTLocalFlavorTests
+from localflavor.py import PYLocalFlavorTests
from localflavor.ro import ROLocalFlavorTests
from localflavor.ru import RULocalFlavorTests
from localflavor.se import SELocalFlavorTests
Modified: django/trunk/tests/regressiontests/forms/tests/__init__.py
===================================================================
--- django/trunk/tests/regressiontests/forms/tests/__init__.py 2011-06-28
10:17:01 UTC (rev 16476)
+++ django/trunk/tests/regressiontests/forms/tests/__init__.py 2011-06-28
10:17:23 UTC (rev 16477)
@@ -40,6 +40,7 @@
NLLocalFlavorTests,
PLLocalFlavorTests,
PTLocalFlavorTests,
+ PYLocalFlavorTests,
ROLocalFlavorTests,
RULocalFlavorTests,
SELocalFlavorTests,
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com.
To unsubscribe from this group, send email to
django-updates+unsubscr...@googlegroups.com.
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
