summaryrefslogtreecommitdiff
path: root/tests/regressiontests
diff options
context:
space:
mode:
authorJannis Leidel <jannis@leidel.info>2010-03-27 16:43:27 +0000
committerJannis Leidel <jannis@leidel.info>2010-03-27 16:43:27 +0000
commitca4c6f65ea81109cf6fbdba74da7f5027eb0c4db (patch)
tree518379a21d25de1802f68899af42e00d941f05d9 /tests/regressiontests
parentad5afd6ed220ed50a2b48d7ccf9786ac0e52f807 (diff)
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
Diffstat (limited to 'tests/regressiontests')
-rw-r--r--tests/regressiontests/i18n/forms.py15
-rw-r--r--tests/regressiontests/i18n/tests.py3
2 files changed, 11 insertions, 7 deletions
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()