Author: brosner
Date: 2008-07-18 18:06:59 -0500 (Fri, 18 Jul 2008)
New Revision: 7963
Modified:
django/branches/newforms-admin/
django/branches/newforms-admin/docs/localflavor.txt
Log:
newforms-admin: Merged from trunk up to [7961].
Property changes on: django/branches/newforms-admin
___________________________________________________________________
Name: svnmerge-integrated
-
/django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-7959
+
/django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-7962
Modified: django/branches/newforms-admin/docs/localflavor.txt
===================================================================
--- django/branches/newforms-admin/docs/localflavor.txt 2008-07-18 23:02:33 UTC
(rev 7962)
+++ django/branches/newforms-admin/docs/localflavor.txt 2008-07-18 23:06:59 UTC
(rev 7963)
@@ -20,10 +20,10 @@
French telephone number::
from django import newforms as forms
- from django.contrib.localflavor import fr
+ from django.contrib.localflavor.fr.forms import FRPhoneNumberField
class MyForm(forms.Form):
- my_french_phone_no = fr.forms.FRPhoneNumberField()
+ my_french_phone_no = FRPhoneNumberField()
Supported countries
===================
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
