Author: adrian
Date: 2007-02-14 23:53:44 -0600 (Wed, 14 Feb 2007)
New Revision: 4524

Added:
   django/trunk/django/contrib/localflavor/
   django/trunk/django/contrib/localflavor/__init__.py
   django/trunk/django/contrib/localflavor/usa/
   django/trunk/django/contrib/localflavor/usa/__init__.py
   django/trunk/django/contrib/localflavor/usa/forms.py
Removed:
   django/trunk/django/newforms/extras/usa.py
Modified:
   django/trunk/docs/add_ons.txt
   django/trunk/tests/regressiontests/forms/tests.py
Log:
Created django.contrib.localflavor, for country- and culture-specific 
functionality. Moved django/newforms/extras/usa.py into there

Added: django/trunk/django/contrib/localflavor/__init__.py
===================================================================

Added: django/trunk/django/contrib/localflavor/usa/__init__.py
===================================================================

Copied: django/trunk/django/contrib/localflavor/usa/forms.py (from rev 4522, 
django/trunk/django/newforms/extras/usa.py)
===================================================================
--- django/trunk/django/contrib/localflavor/usa/forms.py                        
        (rev 0)
+++ django/trunk/django/contrib/localflavor/usa/forms.py        2007-02-15 
05:53:44 UTC (rev 4524)
@@ -0,0 +1,13 @@
+"""
+USA-specific Form helpers
+"""
+
+from django.newforms.fields import RegexField
+from django.utils.translation import gettext
+
+class USZipCodeField(RegexField):
+    def __init__(self, *args, **kwargs):
+        super(USZipCodeField, self).__init__(r'^\d{5}(?:-\d{4})?$',
+            max_length=None, min_length=None,
+            error_message=gettext(u'Enter a zip code in the format XXXXX or 
XXXXX-XXXX.'),
+            *args, **kwargs)

Deleted: django/trunk/django/newforms/extras/usa.py
===================================================================
--- django/trunk/django/newforms/extras/usa.py  2007-02-15 05:05:43 UTC (rev 
4523)
+++ django/trunk/django/newforms/extras/usa.py  2007-02-15 05:53:44 UTC (rev 
4524)
@@ -1,13 +0,0 @@
-"""
-USA-specific Form helpers
-"""
-
-from django.newforms.fields import RegexField
-from django.utils.translation import gettext
-
-class USZipCodeField(RegexField):
-    def __init__(self, *args, **kwargs):
-        super(USZipCodeField, self).__init__(r'^\d{5}(?:-\d{4})?$',
-            max_length=None, min_length=None,
-            error_message=gettext(u'Enter a zip code in the format XXXXX or 
XXXXX-XXXX.'),
-            *args, **kwargs)

Modified: django/trunk/docs/add_ons.txt
===================================================================
--- django/trunk/docs/add_ons.txt       2007-02-15 05:05:43 UTC (rev 4523)
+++ django/trunk/docs/add_ons.txt       2007-02-15 05:53:44 UTC (rev 4524)
@@ -139,6 +139,15 @@
 
 .. _flatpages documentation: ../flatpages/
 
+localflavor
+===========
+
+**New in Django development version**
+
+A collection of various Django snippets that are useful only for a particular
+country or culture. For example, ``django.contrib.localflavor.usa.forms``
+contains a ``USZipCodeField`` that you can use to validate U.S. zip codes.
+
 markup
 ======
 

Modified: django/trunk/tests/regressiontests/forms/tests.py
===================================================================
--- django/trunk/tests/regressiontests/forms/tests.py   2007-02-15 05:05:43 UTC 
(rev 4523)
+++ django/trunk/tests/regressiontests/forms/tests.py   2007-02-15 05:53:44 UTC 
(rev 4524)
@@ -3225,7 +3225,7 @@
 
 USZipCodeField validates that the data is either a five-digit U.S. zip code or
 a zip+4.
->>> from django.newforms.extras.usa import USZipCodeField
+>>> from django.contrib.localflavor.usa.forms import USZipCodeField
 >>> f = USZipCodeField()
 >>> f.clean('60606')
 u'60606'


--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---

Reply via email to