From ca4c6f65ea81109cf6fbdba74da7f5027eb0c4db Mon Sep 17 00:00:00 2001
From: Jannis Leidel <jannis@leidel.info>
Date: Sat, 27 Mar 2010 16:43:27 +0000
Subject: Fixed #13032  - Added localize parameter to form fields to be able to
 selectively enable localization.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12867 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 tests/regressiontests/i18n/forms.py | 15 +++++++++------
 tests/regressiontests/i18n/tests.py |  3 ++-
 2 files changed, 11 insertions(+), 7 deletions(-)

(limited to 'tests')

diff --git a/tests/regressiontests/i18n/forms.py b/tests/regressiontests/i18n/forms.py
index 8ed834c9d0..216d1fec01 100644
--- a/tests/regressiontests/i18n/forms.py
+++ b/tests/regressiontests/i18n/forms.py
@@ -3,16 +3,19 @@ from django.forms.extras import SelectDateWidget
 from models import Company
 
 class I18nForm(forms.Form):
-    decimal_field = forms.DecimalField()
-    float_field = forms.FloatField()
-    date_field = forms.DateField()
-    datetime_field = forms.DateTimeField()
-    time_field = forms.TimeField()
-    integer_field = forms.IntegerField()
+    decimal_field = forms.DecimalField(localize=True)
+    float_field = forms.FloatField(localize=True)
+    date_field = forms.DateField(localize=True)
+    datetime_field = forms.DateTimeField(localize=True)
+    time_field = forms.TimeField(localize=True)
+    integer_field = forms.IntegerField(localize=True)
 
 class SelectDateForm(forms.Form):
     date_field = forms.DateField(widget=SelectDateWidget)
 
 class CompanyForm(forms.ModelForm):
+    cents_payed = forms.DecimalField(max_digits=4, decimal_places=2, localize=True)
+    products_delivered = forms.IntegerField(localize=True)
+
     class Meta:
         model = Company
diff --git a/tests/regressiontests/i18n/tests.py b/tests/regressiontests/i18n/tests.py
index 941f66f3eb..17e53dfa29 100644
--- a/tests/regressiontests/i18n/tests.py
+++ b/tests/regressiontests/i18n/tests.py
@@ -409,7 +409,8 @@ class FormattingTests(TestCase):
             self.assertEqual(localize_input(datetime.datetime(2009, 12, 31, 6, 0, 0)), '31.12.2009 06:00:00')
             self.assertEqual(datetime.datetime(2009, 12, 31, 6, 0, 0), form6.cleaned_data['date_added'])
             settings.USE_THOUSAND_SEPARATOR = True
-            self.assert_(u'12.000' in form6.as_ul())
+            # Checking for the localized "products_delivered" field
+            self.assert_(u'<input type="text" name="products_delivered" value="12.000" id="id_products_delivered" />' in form6.as_ul())
         finally:
             deactivate()
 
-- 
cgit v1.3