summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorMalte Beckmann <maltebeckmann@me.com>2014-09-11 14:43:49 +0200
committerTim Graham <timograham@gmail.com>2014-09-13 13:00:42 -0400
commit22bfc451467ec6e13044a87a97cf00e9f8a845e4 (patch)
tree13b2678945298e7eba4155c22a33c06f298af4d0 /tests
parent5472d18e3193050f5b9a25b71852ca7b77f852a5 (diff)
Fixed #23466 -- Removed seconds from all locale time output formats.
Diffstat (limited to 'tests')
-rw-r--r--tests/i18n/tests.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/i18n/tests.py b/tests/i18n/tests.py
index d9d4ecd176..321f3b17e2 100644
--- a/tests/i18n/tests.py
+++ b/tests/i18n/tests.py
@@ -577,7 +577,7 @@ class FormattingTests(TestCase):
self.assertEqual('j \d\e F \d\e Y', get_format('DATE_FORMAT'))
self.assertEqual(1, get_format('FIRST_DAY_OF_WEEK'))
self.assertEqual(',', get_format('DECIMAL_SEPARATOR'))
- self.assertEqual('10:15:48', time_format(self.t))
+ self.assertEqual('10:15', time_format(self.t))
self.assertEqual('31 de desembre de 2009', date_format(self.d))
self.assertEqual('desembre del 2009', date_format(self.d, 'YEAR_MONTH_FORMAT'))
self.assertEqual('31/12/2009 20:50', date_format(self.dt, 'SHORT_DATETIME_FORMAT'))
@@ -625,7 +625,7 @@ class FormattingTests(TestCase):
self.assertEqual('31 de desembre de 2009 a les 20:50', Template('{{ dt }}').render(self.ctxt))
self.assertEqual('66666,67', Template('{{ n|floatformat:2 }}').render(self.ctxt))
self.assertEqual('100000,0', Template('{{ f|floatformat }}').render(self.ctxt))
- self.assertEqual('10:15:48', Template('{{ t|time:"TIME_FORMAT" }}').render(self.ctxt))
+ self.assertEqual('10:15', Template('{{ t|time:"TIME_FORMAT" }}').render(self.ctxt))
self.assertEqual('31/12/2009', Template('{{ d|date:"SHORT_DATE_FORMAT" }}').render(self.ctxt))
self.assertEqual('31/12/2009 20:50', Template('{{ dt|date:"SHORT_DATETIME_FORMAT" }}').render(self.ctxt))
self.assertEqual(date_format(datetime.datetime.now(), "DATE_FORMAT"),