summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorJannis Leidel <jannis@leidel.info>2010-02-05 00:44:35 +0000
committerJannis Leidel <jannis@leidel.info>2010-02-05 00:44:35 +0000
commita28bd76bb6d3fa93f31e7769559fae26df7733f6 (patch)
tree28ba3a7d880ef7a902ae3b471e97f18dccb37a3c /tests
parentdef34da85c22fecc03bf9d640c54664231a219f6 (diff)
Fixed #12777 - Localize decimal fields correctly. Thanks, Florian Apolloner
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12382 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'tests')
-rw-r--r--tests/regressiontests/i18n/models.py1
-rw-r--r--tests/regressiontests/i18n/tests.py3
2 files changed, 3 insertions, 1 deletions
diff --git a/tests/regressiontests/i18n/models.py b/tests/regressiontests/i18n/models.py
index 56f158578b..2ff5fc4bd1 100644
--- a/tests/regressiontests/i18n/models.py
+++ b/tests/regressiontests/i18n/models.py
@@ -8,6 +8,7 @@ class TestModel(models.Model):
class Company(models.Model):
name = models.CharField(max_length=50)
date_added = models.DateTimeField(default=datetime(1799,1,31,23,59,59,0))
+ cents_payed = models.DecimalField(max_digits=4, decimal_places=2)
__test__ = {'API_TESTS': '''
>>> tm = TestModel()
diff --git a/tests/regressiontests/i18n/tests.py b/tests/regressiontests/i18n/tests.py
index c2a39cd18a..212f952add 100644
--- a/tests/regressiontests/i18n/tests.py
+++ b/tests/regressiontests/i18n/tests.py
@@ -362,12 +362,13 @@ class FormattingTests(TestCase):
form6 = CompanyForm({
'name': u'acme',
'date_added': datetime.datetime(2009, 12, 31, 6, 0, 0),
+ 'cents_payed': decimal.Decimal('59.47'),
})
form6.save()
self.assertEqual(True, form6.is_valid())
self.assertEqual(
form6.as_ul(),
- u'<li><label for="id_name">Name:</label> <input id="id_name" type="text" name="name" value="acme" maxlength="50" /></li>\n<li><label for="id_date_added">Date added:</label> <input type="text" name="date_added" value="31.12.2009 06:00:00" id="id_date_added" /></li>'
+ u'<li><label for="id_name">Name:</label> <input id="id_name" type="text" name="name" value="acme" maxlength="50" /></li>\n<li><label for="id_date_added">Date added:</label> <input type="text" name="date_added" value="31.12.2009 06:00:00" id="id_date_added" /></li>\n<li><label for="id_cents_payed">Cents payed:</label> <input type="text" name="cents_payed" value="59,47" id="id_cents_payed" /></li>'
)
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'])