From 22bfc451467ec6e13044a87a97cf00e9f8a845e4 Mon Sep 17 00:00:00 2001 From: Malte Beckmann Date: Thu, 11 Sep 2014 14:43:49 +0200 Subject: [PATCH] Fixed #23466 -- Removed seconds from all locale time output formats. --- django/conf/locale/ar/formats.py | 2 +- django/conf/locale/bg/formats.py | 2 +- django/conf/locale/bn/formats.py | 2 +- django/conf/locale/ca/formats.py | 2 +- django/conf/locale/cs/formats.py | 6 +++--- django/conf/locale/de/formats.py | 6 +++--- django/conf/locale/de_CH/formats.py | 6 +++--- django/conf/locale/el/formats.py | 2 +- django/conf/locale/eo/formats.py | 6 +++--- django/conf/locale/es/formats.py | 2 +- django/conf/locale/es_AR/formats.py | 4 ++-- django/conf/locale/es_MX/formats.py | 2 +- django/conf/locale/es_NI/formats.py | 2 +- django/conf/locale/es_PR/formats.py | 2 +- django/conf/locale/et/formats.py | 2 +- django/conf/locale/eu/formats.py | 2 +- django/conf/locale/fa/formats.py | 6 +++--- django/conf/locale/fi/formats.py | 4 ++-- django/conf/locale/fr/formats.py | 6 +++--- django/conf/locale/ga/formats.py | 2 +- django/conf/locale/gl/formats.py | 2 +- django/conf/locale/he/formats.py | 6 +++--- django/conf/locale/hi/formats.py | 2 +- django/conf/locale/hr/formats.py | 2 +- django/conf/locale/hu/formats.py | 6 +++--- django/conf/locale/id/formats.py | 6 +++--- django/conf/locale/is/formats.py | 2 +- django/conf/locale/it/formats.py | 6 +++--- django/conf/locale/ja/formats.py | 6 +++--- django/conf/locale/ka/formats.py | 6 +++--- django/conf/locale/km/formats.py | 6 +++--- django/conf/locale/kn/formats.py | 2 +- django/conf/locale/ko/formats.py | 4 ++-- django/conf/locale/lt/formats.py | 4 ++-- django/conf/locale/lv/formats.py | 6 +++--- django/conf/locale/mk/formats.py | 2 +- django/conf/locale/mn/formats.py | 2 +- django/conf/locale/pl/formats.py | 6 +++--- django/conf/locale/pt/formats.py | 2 +- django/conf/locale/ro/formats.py | 6 +++--- django/conf/locale/ru/formats.py | 4 ++-- django/conf/locale/sk/formats.py | 6 +++--- django/conf/locale/sl/formats.py | 2 +- django/conf/locale/sq/formats.py | 2 +- django/conf/locale/ta/formats.py | 2 +- django/conf/locale/te/formats.py | 2 +- django/conf/locale/th/formats.py | 6 +++--- django/conf/locale/tr/formats.py | 6 +++--- django/conf/locale/uk/formats.py | 4 ++-- django/conf/locale/vi/formats.py | 6 +++--- docs/releases/1.8.txt | 3 +++ tests/i18n/tests.py | 4 ++-- 52 files changed, 101 insertions(+), 98 deletions(-) diff --git a/django/conf/locale/ar/formats.py b/django/conf/locale/ar/formats.py index 0df655333c..1cdba2d984 100644 --- a/django/conf/locale/ar/formats.py +++ b/django/conf/locale/ar/formats.py @@ -6,7 +6,7 @@ from __future__ import unicode_literals # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j F، Y' -TIME_FORMAT = 'g:i:s A' +TIME_FORMAT = 'g:i A' # DATETIME_FORMAT = YEAR_MONTH_FORMAT = 'F Y' MONTH_DAY_FORMAT = 'j F' diff --git a/django/conf/locale/bg/formats.py b/django/conf/locale/bg/formats.py index e1a8a820e3..98820e703f 100644 --- a/django/conf/locale/bg/formats.py +++ b/django/conf/locale/bg/formats.py @@ -6,7 +6,7 @@ from __future__ import unicode_literals # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'd F Y' -TIME_FORMAT = 'H:i:s' +TIME_FORMAT = 'H:i' # DATETIME_FORMAT = # YEAR_MONTH_FORMAT = MONTH_DAY_FORMAT = 'j F' diff --git a/django/conf/locale/bn/formats.py b/django/conf/locale/bn/formats.py index 3f0f1f7f43..2348c3afa3 100644 --- a/django/conf/locale/bn/formats.py +++ b/django/conf/locale/bn/formats.py @@ -6,7 +6,7 @@ from __future__ import unicode_literals # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j F, Y' -TIME_FORMAT = 'g:i:s A' +TIME_FORMAT = 'g:i A' # DATETIME_FORMAT = YEAR_MONTH_FORMAT = 'F Y' MONTH_DAY_FORMAT = 'j F' diff --git a/django/conf/locale/ca/formats.py b/django/conf/locale/ca/formats.py index 392eb48c1c..5acd742907 100644 --- a/django/conf/locale/ca/formats.py +++ b/django/conf/locale/ca/formats.py @@ -6,7 +6,7 @@ from __future__ import unicode_literals # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = r'j \d\e F \d\e Y' -TIME_FORMAT = 'G:i:s' +TIME_FORMAT = 'G:i' DATETIME_FORMAT = r'j \d\e F \d\e Y \a \l\e\s G:i' YEAR_MONTH_FORMAT = r'F \d\e\l Y' MONTH_DAY_FORMAT = r'j \d\e F' diff --git a/django/conf/locale/cs/formats.py b/django/conf/locale/cs/formats.py index fd445fac6a..45e2a898a3 100644 --- a/django/conf/locale/cs/formats.py +++ b/django/conf/locale/cs/formats.py @@ -6,12 +6,12 @@ from __future__ import unicode_literals # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j. E Y' -TIME_FORMAT = 'G:i:s' -DATETIME_FORMAT = 'j. E Y G:i:s' +TIME_FORMAT = 'G:i' +DATETIME_FORMAT = 'j. E Y G:i' YEAR_MONTH_FORMAT = 'F Y' MONTH_DAY_FORMAT = 'j. F' SHORT_DATE_FORMAT = 'd.m.Y' -SHORT_DATETIME_FORMAT = 'd.m.Y G:i:s' +SHORT_DATETIME_FORMAT = 'd.m.Y G:i' FIRST_DAY_OF_WEEK = 1 # Monday # The *_INPUT_FORMATS strings use the Python strftime format syntax, diff --git a/django/conf/locale/de/formats.py b/django/conf/locale/de/formats.py index b57f6213a5..03e1219b81 100644 --- a/django/conf/locale/de/formats.py +++ b/django/conf/locale/de/formats.py @@ -6,12 +6,12 @@ from __future__ import unicode_literals # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j. F Y' -TIME_FORMAT = 'H:i:s' -DATETIME_FORMAT = 'j. F Y H:i:s' +TIME_FORMAT = 'H:i' +DATETIME_FORMAT = 'j. F Y H:i' YEAR_MONTH_FORMAT = 'F Y' MONTH_DAY_FORMAT = 'j. F' SHORT_DATE_FORMAT = 'd.m.Y' -SHORT_DATETIME_FORMAT = 'd.m.Y H:i:s' +SHORT_DATETIME_FORMAT = 'd.m.Y H:i' FIRST_DAY_OF_WEEK = 1 # Monday # The *_INPUT_FORMATS strings use the Python strftime format syntax, diff --git a/django/conf/locale/de_CH/formats.py b/django/conf/locale/de_CH/formats.py index 4b1678cffd..269a85b152 100644 --- a/django/conf/locale/de_CH/formats.py +++ b/django/conf/locale/de_CH/formats.py @@ -7,12 +7,12 @@ from __future__ import unicode_literals DATE_FORMAT = 'j. F Y' -TIME_FORMAT = 'H:i:s' -DATETIME_FORMAT = 'j. F Y H:i:s' +TIME_FORMAT = 'H:i' +DATETIME_FORMAT = 'j. F Y H:i' YEAR_MONTH_FORMAT = 'F Y' MONTH_DAY_FORMAT = 'j. F' SHORT_DATE_FORMAT = 'd.m.Y' -SHORT_DATETIME_FORMAT = 'd.m.Y H:i:s' +SHORT_DATETIME_FORMAT = 'd.m.Y H:i' FIRST_DAY_OF_WEEK = 1 # Monday # The *_INPUT_FORMATS strings use the Python strftime format syntax, diff --git a/django/conf/locale/el/formats.py b/django/conf/locale/el/formats.py index 817f71d3c8..d81a2f4f55 100644 --- a/django/conf/locale/el/formats.py +++ b/django/conf/locale/el/formats.py @@ -6,7 +6,7 @@ from __future__ import unicode_literals # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'd E Y' -TIME_FORMAT = 'g:i:s A' +TIME_FORMAT = 'g:i A' # DATETIME_FORMAT = YEAR_MONTH_FORMAT = 'F Y' MONTH_DAY_FORMAT = 'j F' diff --git a/django/conf/locale/eo/formats.py b/django/conf/locale/eo/formats.py index 5f0e3a09a0..7a92a628b7 100644 --- a/django/conf/locale/eo/formats.py +++ b/django/conf/locale/eo/formats.py @@ -6,12 +6,12 @@ from __future__ import unicode_literals # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = r'j\-\a \d\e F Y' # '26-a de julio 1887' -TIME_FORMAT = 'H:i:s' # '18:59:00' -DATETIME_FORMAT = r'j\-\a \d\e F Y\, \j\e H:i:s' # '26-a de julio 1887, je 18:59:00' +TIME_FORMAT = 'H:i' # '18:59' +DATETIME_FORMAT = r'j\-\a \d\e F Y\, \j\e H:i' # '26-a de julio 1887, je 18:59' YEAR_MONTH_FORMAT = r'F \d\e Y' # 'julio de 1887' MONTH_DAY_FORMAT = r'j\-\a \d\e F' # '26-a de julio' SHORT_DATE_FORMAT = 'Y-m-d' # '1887-07-26' -SHORT_DATETIME_FORMAT = 'Y-m-d H:i:s' # '1887-07-26 18:59:00' +SHORT_DATETIME_FORMAT = 'Y-m-d H:i' # '1887-07-26 18:59' FIRST_DAY_OF_WEEK = 1 # Monday (lundo) # The *_INPUT_FORMATS strings use the Python strftime format syntax, diff --git a/django/conf/locale/es/formats.py b/django/conf/locale/es/formats.py index dee0a889f6..a296bee243 100644 --- a/django/conf/locale/es/formats.py +++ b/django/conf/locale/es/formats.py @@ -6,7 +6,7 @@ from __future__ import unicode_literals # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = r'j \d\e F \d\e Y' -TIME_FORMAT = 'H:i:s' +TIME_FORMAT = 'H:i' DATETIME_FORMAT = r'j \d\e F \d\e Y \a \l\a\s H:i' YEAR_MONTH_FORMAT = r'F \d\e Y' MONTH_DAY_FORMAT = r'j \d\e F' diff --git a/django/conf/locale/es_AR/formats.py b/django/conf/locale/es_AR/formats.py index 37faa80b8a..6ad96e8dcd 100644 --- a/django/conf/locale/es_AR/formats.py +++ b/django/conf/locale/es_AR/formats.py @@ -6,8 +6,8 @@ from __future__ import unicode_literals # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = r'j N Y' -TIME_FORMAT = r'H:i:s' -DATETIME_FORMAT = r'j N Y H:i:s' +TIME_FORMAT = r'H:i' +DATETIME_FORMAT = r'j N Y H:i' YEAR_MONTH_FORMAT = r'F Y' MONTH_DAY_FORMAT = r'j \d\e F' SHORT_DATE_FORMAT = r'd/m/Y' diff --git a/django/conf/locale/es_MX/formats.py b/django/conf/locale/es_MX/formats.py index 729eee5370..3ea2b28797 100644 --- a/django/conf/locale/es_MX/formats.py +++ b/django/conf/locale/es_MX/formats.py @@ -4,7 +4,7 @@ from __future__ import unicode_literals DATE_FORMAT = r'j \d\e F \d\e Y' -TIME_FORMAT = 'H:i:s' +TIME_FORMAT = 'H:i' DATETIME_FORMAT = r'j \d\e F \d\e Y \a \l\a\s H:i' YEAR_MONTH_FORMAT = r'F \d\e Y' MONTH_DAY_FORMAT = r'j \d\e F' diff --git a/django/conf/locale/es_NI/formats.py b/django/conf/locale/es_NI/formats.py index 2f8d403d85..da524d9991 100644 --- a/django/conf/locale/es_NI/formats.py +++ b/django/conf/locale/es_NI/formats.py @@ -4,7 +4,7 @@ from __future__ import unicode_literals DATE_FORMAT = r'j \d\e F \d\e Y' -TIME_FORMAT = 'H:i:s' +TIME_FORMAT = 'H:i' DATETIME_FORMAT = r'j \d\e F \d\e Y \a \l\a\s H:i' YEAR_MONTH_FORMAT = r'F \d\e Y' MONTH_DAY_FORMAT = r'j \d\e F' diff --git a/django/conf/locale/es_PR/formats.py b/django/conf/locale/es_PR/formats.py index 8f5a25ea53..dc16323e7a 100644 --- a/django/conf/locale/es_PR/formats.py +++ b/django/conf/locale/es_PR/formats.py @@ -4,7 +4,7 @@ from __future__ import unicode_literals DATE_FORMAT = r'j \d\e F \d\e Y' -TIME_FORMAT = 'H:i:s' +TIME_FORMAT = 'H:i' DATETIME_FORMAT = r'j \d\e F \d\e Y \a \l\a\s H:i' YEAR_MONTH_FORMAT = r'F \d\e Y' MONTH_DAY_FORMAT = r'j \d\e F' diff --git a/django/conf/locale/et/formats.py b/django/conf/locale/et/formats.py index 5be8131ed6..06df111c82 100644 --- a/django/conf/locale/et/formats.py +++ b/django/conf/locale/et/formats.py @@ -6,7 +6,7 @@ from __future__ import unicode_literals # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j F Y' -TIME_FORMAT = 'G:i:s' +TIME_FORMAT = 'G:i' # DATETIME_FORMAT = # YEAR_MONTH_FORMAT = MONTH_DAY_FORMAT = 'j F' diff --git a/django/conf/locale/eu/formats.py b/django/conf/locale/eu/formats.py index 7b14262560..4ddf04ef5a 100644 --- a/django/conf/locale/eu/formats.py +++ b/django/conf/locale/eu/formats.py @@ -6,7 +6,7 @@ from __future__ import unicode_literals # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = r'Yeko M\re\n d\a' -TIME_FORMAT = 'H:i:s' +TIME_FORMAT = 'H:i' # DATETIME_FORMAT = # YEAR_MONTH_FORMAT = # MONTH_DAY_FORMAT = diff --git a/django/conf/locale/fa/formats.py b/django/conf/locale/fa/formats.py index 30ce9a5628..f70cb8387a 100644 --- a/django/conf/locale/fa/formats.py +++ b/django/conf/locale/fa/formats.py @@ -6,12 +6,12 @@ from __future__ import unicode_literals # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j F Y' -TIME_FORMAT = 'G:i:s' -DATETIME_FORMAT = 'j F Y، ساعت G:i:s' +TIME_FORMAT = 'G:i' +DATETIME_FORMAT = 'j F Y، ساعت G:i' YEAR_MONTH_FORMAT = 'F Y' MONTH_DAY_FORMAT = 'j F' SHORT_DATE_FORMAT = 'Y/n/j' -SHORT_DATETIME_FORMAT = 'Y/n/j،‏ G:i:s' +SHORT_DATETIME_FORMAT = 'Y/n/j،‏ G:i' # FIRST_DAY_OF_WEEK = # The *_INPUT_FORMATS strings use the Python strftime format syntax, diff --git a/django/conf/locale/fi/formats.py b/django/conf/locale/fi/formats.py index 1f1fbe37ac..5a0dc2d576 100644 --- a/django/conf/locale/fi/formats.py +++ b/django/conf/locale/fi/formats.py @@ -6,8 +6,8 @@ from __future__ import unicode_literals # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j. E Y' -TIME_FORMAT = 'G.i.s' -DATETIME_FORMAT = r'j. E Y \k\e\l\l\o G.i.s' +TIME_FORMAT = 'G.i' +DATETIME_FORMAT = r'j. E Y \k\e\l\l\o G.i' YEAR_MONTH_FORMAT = 'F Y' MONTH_DAY_FORMAT = 'j. F' SHORT_DATE_FORMAT = 'j.n.Y' diff --git a/django/conf/locale/fr/formats.py b/django/conf/locale/fr/formats.py index 7b85807404..4e2391fd72 100644 --- a/django/conf/locale/fr/formats.py +++ b/django/conf/locale/fr/formats.py @@ -6,12 +6,12 @@ from __future__ import unicode_literals # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j F Y' -TIME_FORMAT = 'H:i:s' -DATETIME_FORMAT = 'j F Y H:i:s' +TIME_FORMAT = 'H:i' +DATETIME_FORMAT = 'j F Y H:i' YEAR_MONTH_FORMAT = 'F Y' MONTH_DAY_FORMAT = 'j F' SHORT_DATE_FORMAT = 'j N Y' -SHORT_DATETIME_FORMAT = 'j N Y H:i:s' +SHORT_DATETIME_FORMAT = 'j N Y H:i' FIRST_DAY_OF_WEEK = 1 # Monday # The *_INPUT_FORMATS strings use the Python strftime format syntax, diff --git a/django/conf/locale/ga/formats.py b/django/conf/locale/ga/formats.py index d998a43a19..b3b1974076 100644 --- a/django/conf/locale/ga/formats.py +++ b/django/conf/locale/ga/formats.py @@ -6,7 +6,7 @@ from __future__ import unicode_literals # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j F Y' -TIME_FORMAT = 'H:i:s' +TIME_FORMAT = 'H:i' # DATETIME_FORMAT = # YEAR_MONTH_FORMAT = MONTH_DAY_FORMAT = 'j F' diff --git a/django/conf/locale/gl/formats.py b/django/conf/locale/gl/formats.py index 0facf691a9..996b8cd6b4 100644 --- a/django/conf/locale/gl/formats.py +++ b/django/conf/locale/gl/formats.py @@ -6,7 +6,7 @@ from __future__ import unicode_literals # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = r'j \d\e F \d\e Y' -TIME_FORMAT = 'H:i:s' +TIME_FORMAT = 'H:i' DATETIME_FORMAT = r'j \d\e F \d\e Y \á\s H:i' YEAR_MONTH_FORMAT = r'F \d\e Y' MONTH_DAY_FORMAT = r'j \d\e F' diff --git a/django/conf/locale/he/formats.py b/django/conf/locale/he/formats.py index 6c63e1b3ac..274996f3a0 100644 --- a/django/conf/locale/he/formats.py +++ b/django/conf/locale/he/formats.py @@ -6,12 +6,12 @@ from __future__ import unicode_literals # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j בF Y' -TIME_FORMAT = 'H:i:s' -DATETIME_FORMAT = 'j בF Y H:i:s' +TIME_FORMAT = 'H:i' +DATETIME_FORMAT = 'j בF Y H:i' YEAR_MONTH_FORMAT = 'F Y' MONTH_DAY_FORMAT = 'j בF' SHORT_DATE_FORMAT = 'd/m/Y' -SHORT_DATETIME_FORMAT = 'd/m/Y H:i:s' +SHORT_DATETIME_FORMAT = 'd/m/Y H:i' # FIRST_DAY_OF_WEEK = # The *_INPUT_FORMATS strings use the Python strftime format syntax, diff --git a/django/conf/locale/hi/formats.py b/django/conf/locale/hi/formats.py index 52e02040ec..a2ea2e0bf6 100644 --- a/django/conf/locale/hi/formats.py +++ b/django/conf/locale/hi/formats.py @@ -6,7 +6,7 @@ from __future__ import unicode_literals # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j F Y' -TIME_FORMAT = 'g:i:s A' +TIME_FORMAT = 'g:i A' # DATETIME_FORMAT = # YEAR_MONTH_FORMAT = MONTH_DAY_FORMAT = 'j F' diff --git a/django/conf/locale/hr/formats.py b/django/conf/locale/hr/formats.py index a38457a435..275978acbf 100644 --- a/django/conf/locale/hr/formats.py +++ b/django/conf/locale/hr/formats.py @@ -6,7 +6,7 @@ from __future__ import unicode_literals # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j. E Y.' -TIME_FORMAT = 'H:i:s' +TIME_FORMAT = 'H:i' DATETIME_FORMAT = 'j. E Y. H:i' YEAR_MONTH_FORMAT = 'F Y.' MONTH_DAY_FORMAT = 'j. F' diff --git a/django/conf/locale/hu/formats.py b/django/conf/locale/hu/formats.py index 7e499da4ee..a74b35b74c 100644 --- a/django/conf/locale/hu/formats.py +++ b/django/conf/locale/hu/formats.py @@ -6,12 +6,12 @@ from __future__ import unicode_literals # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'Y. F j.' -TIME_FORMAT = 'G.i.s' -DATETIME_FORMAT = 'Y. F j. G.i.s' +TIME_FORMAT = 'G.i' +DATETIME_FORMAT = 'Y. F j. G.i' YEAR_MONTH_FORMAT = 'Y. F' MONTH_DAY_FORMAT = 'F j.' SHORT_DATE_FORMAT = 'Y.m.d.' -SHORT_DATETIME_FORMAT = 'Y.m.d. G.i.s' +SHORT_DATETIME_FORMAT = 'Y.m.d. G.i' FIRST_DAY_OF_WEEK = 1 # Monday # The *_INPUT_FORMATS strings use the Python strftime format syntax, diff --git a/django/conf/locale/id/formats.py b/django/conf/locale/id/formats.py index aff32fb126..ed38b0270b 100644 --- a/django/conf/locale/id/formats.py +++ b/django/conf/locale/id/formats.py @@ -6,12 +6,12 @@ from __future__ import unicode_literals # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j N Y' -DATETIME_FORMAT = "j N Y, G.i.s" -TIME_FORMAT = 'G.i.s' +DATETIME_FORMAT = "j N Y, G.i" +TIME_FORMAT = 'G.i' YEAR_MONTH_FORMAT = 'F Y' MONTH_DAY_FORMAT = 'j F' SHORT_DATE_FORMAT = 'd-m-Y' -SHORT_DATETIME_FORMAT = 'd-m-Y G.i.s' +SHORT_DATETIME_FORMAT = 'd-m-Y G.i' FIRST_DAY_OF_WEEK = 1 # Monday # The *_INPUT_FORMATS strings use the Python strftime format syntax, diff --git a/django/conf/locale/is/formats.py b/django/conf/locale/is/formats.py index e5e99521ff..1f122ad6b0 100644 --- a/django/conf/locale/is/formats.py +++ b/django/conf/locale/is/formats.py @@ -6,7 +6,7 @@ from __future__ import unicode_literals # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j. F Y' -TIME_FORMAT = 'H:i:s' +TIME_FORMAT = 'H:i' # DATETIME_FORMAT = YEAR_MONTH_FORMAT = 'F Y' MONTH_DAY_FORMAT = 'j. F' diff --git a/django/conf/locale/it/formats.py b/django/conf/locale/it/formats.py index 368535d293..f8fbac2ee2 100644 --- a/django/conf/locale/it/formats.py +++ b/django/conf/locale/it/formats.py @@ -6,12 +6,12 @@ from __future__ import unicode_literals # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'd F Y' # 25 Ottobre 2006 -TIME_FORMAT = 'H:i:s' # 14:30:59 -DATETIME_FORMAT = 'l d F Y H:i:s' # Mercoledì 25 Ottobre 2006 14:30:59 +TIME_FORMAT = 'H:i' # 14:30 +DATETIME_FORMAT = 'l d F Y H:i' # Mercoledì 25 Ottobre 2006 14:30 YEAR_MONTH_FORMAT = 'F Y' # Ottobre 2006 MONTH_DAY_FORMAT = 'j/F' # 10/2006 SHORT_DATE_FORMAT = 'd/m/Y' # 25/12/2009 -SHORT_DATETIME_FORMAT = 'd/m/Y H:i:s' # 25/10/2009 14:30:59 +SHORT_DATETIME_FORMAT = 'd/m/Y H:i' # 25/10/2009 14:30 FIRST_DAY_OF_WEEK = 1 # Lunedì # The *_INPUT_FORMATS strings use the Python strftime format syntax, diff --git a/django/conf/locale/ja/formats.py b/django/conf/locale/ja/formats.py index 2f6d2b43cc..63f043872a 100644 --- a/django/conf/locale/ja/formats.py +++ b/django/conf/locale/ja/formats.py @@ -6,12 +6,12 @@ from __future__ import unicode_literals # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'Y年n月j日' -TIME_FORMAT = 'G:i:s' -DATETIME_FORMAT = 'Y年n月j日G:i:s' +TIME_FORMAT = 'G:i' +DATETIME_FORMAT = 'Y年n月j日G:i' YEAR_MONTH_FORMAT = 'Y年n月' MONTH_DAY_FORMAT = 'n月j日' SHORT_DATE_FORMAT = 'Y/m/d' -SHORT_DATETIME_FORMAT = 'Y/m/d G:i:s' +SHORT_DATETIME_FORMAT = 'Y/m/d G:i' # FIRST_DAY_OF_WEEK = # The *_INPUT_FORMATS strings use the Python strftime format syntax, diff --git a/django/conf/locale/ka/formats.py b/django/conf/locale/ka/formats.py index 1d2eb5f9cb..79a984a57c 100644 --- a/django/conf/locale/ka/formats.py +++ b/django/conf/locale/ka/formats.py @@ -6,12 +6,12 @@ from __future__ import unicode_literals # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'l, j F, Y' -TIME_FORMAT = 'h:i:s a' -DATETIME_FORMAT = 'j F, Y h:i:s a' +TIME_FORMAT = 'h:i a' +DATETIME_FORMAT = 'j F, Y h:i a' YEAR_MONTH_FORMAT = 'F, Y' MONTH_DAY_FORMAT = 'j F' SHORT_DATE_FORMAT = 'j.M.Y' -SHORT_DATETIME_FORMAT = 'j.M.Y H:i:s' +SHORT_DATETIME_FORMAT = 'j.M.Y H:i' FIRST_DAY_OF_WEEK = 1 # (Monday) # The *_INPUT_FORMATS strings use the Python strftime format syntax, diff --git a/django/conf/locale/km/formats.py b/django/conf/locale/km/formats.py index 13a43107f4..52ff4f95e8 100644 --- a/django/conf/locale/km/formats.py +++ b/django/conf/locale/km/formats.py @@ -6,12 +6,12 @@ from __future__ import unicode_literals # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j ខែ F ឆ្នាំ Y' -TIME_FORMAT = 'G:i:s' -DATETIME_FORMAT = 'j ខែ F ឆ្នាំ Y, G:i:s' +TIME_FORMAT = 'G:i' +DATETIME_FORMAT = 'j ខែ F ឆ្នាំ Y, G:i' # YEAR_MONTH_FORMAT = MONTH_DAY_FORMAT = 'j F' SHORT_DATE_FORMAT = 'j M Y' -SHORT_DATETIME_FORMAT = 'j M Y, G:i:s' +SHORT_DATETIME_FORMAT = 'j M Y, G:i' # FIRST_DAY_OF_WEEK = # The *_INPUT_FORMATS strings use the Python strftime format syntax, diff --git a/django/conf/locale/kn/formats.py b/django/conf/locale/kn/formats.py index 4924708650..4b8355165e 100644 --- a/django/conf/locale/kn/formats.py +++ b/django/conf/locale/kn/formats.py @@ -6,7 +6,7 @@ from __future__ import unicode_literals # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j F Y' -TIME_FORMAT = 'h:i:s A' +TIME_FORMAT = 'h:i A' # DATETIME_FORMAT = # YEAR_MONTH_FORMAT = MONTH_DAY_FORMAT = 'j F' diff --git a/django/conf/locale/ko/formats.py b/django/conf/locale/ko/formats.py index 29e57f136c..0bafa06ab1 100644 --- a/django/conf/locale/ko/formats.py +++ b/django/conf/locale/ko/formats.py @@ -6,8 +6,8 @@ from __future__ import unicode_literals # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'Y년 n월 j일' -TIME_FORMAT = 'A g:i:s' -DATETIME_FORMAT = 'Y년 n월 j일 g:i:s A' +TIME_FORMAT = 'A g:i' +DATETIME_FORMAT = 'Y년 n월 j일 g:i A' YEAR_MONTH_FORMAT = 'Y년 F월' MONTH_DAY_FORMAT = 'F월 j일' SHORT_DATE_FORMAT = 'Y-n-j.' diff --git a/django/conf/locale/lt/formats.py b/django/conf/locale/lt/formats.py index 41dab5f53b..6a34ab09fd 100644 --- a/django/conf/locale/lt/formats.py +++ b/django/conf/locale/lt/formats.py @@ -6,8 +6,8 @@ from __future__ import unicode_literals # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = r'Y \m. E j \d.' -TIME_FORMAT = 'H:i:s' -DATETIME_FORMAT = r'Y \m. E j \d., H:i:s' +TIME_FORMAT = 'H:i' +DATETIME_FORMAT = r'Y \m. E j \d., H:i' YEAR_MONTH_FORMAT = r'Y \m. F' MONTH_DAY_FORMAT = r'E j \d.' SHORT_DATE_FORMAT = 'Y-m-d' diff --git a/django/conf/locale/lv/formats.py b/django/conf/locale/lv/formats.py index 2b281d810f..28e4d6c3f4 100644 --- a/django/conf/locale/lv/formats.py +++ b/django/conf/locale/lv/formats.py @@ -6,12 +6,12 @@ from __future__ import unicode_literals # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = r'Y. \g\a\d\a j. F' -TIME_FORMAT = 'H:i:s' -DATETIME_FORMAT = r'Y. \g\a\d\a j. F, H:i:s' +TIME_FORMAT = 'H:i' +DATETIME_FORMAT = r'Y. \g\a\d\a j. F, H:i' YEAR_MONTH_FORMAT = r'Y. \g. F' MONTH_DAY_FORMAT = 'j. F' SHORT_DATE_FORMAT = r'j.m.Y' -SHORT_DATETIME_FORMAT = 'j.m.Y H:i:s' +SHORT_DATETIME_FORMAT = 'j.m.Y H:i' FIRST_DAY_OF_WEEK = 1 # Monday # The *_INPUT_FORMATS strings use the Python strftime format syntax, diff --git a/django/conf/locale/mk/formats.py b/django/conf/locale/mk/formats.py index fe33070786..3c8387cc36 100644 --- a/django/conf/locale/mk/formats.py +++ b/django/conf/locale/mk/formats.py @@ -6,7 +6,7 @@ from __future__ import unicode_literals # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'd F Y' -TIME_FORMAT = 'H:i:s' +TIME_FORMAT = 'H:i' DATETIME_FORMAT = 'j. F Y. H:i' YEAR_MONTH_FORMAT = 'F Y.' MONTH_DAY_FORMAT = 'j. F' diff --git a/django/conf/locale/mn/formats.py b/django/conf/locale/mn/formats.py index 50ab9f101c..f41d532ba9 100644 --- a/django/conf/locale/mn/formats.py +++ b/django/conf/locale/mn/formats.py @@ -6,7 +6,7 @@ from __future__ import unicode_literals # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'd F Y' -TIME_FORMAT = 'g:i:s A' +TIME_FORMAT = 'g:i A' # DATETIME_FORMAT = # YEAR_MONTH_FORMAT = # MONTH_DAY_FORMAT = diff --git a/django/conf/locale/pl/formats.py b/django/conf/locale/pl/formats.py index 5997839477..3e2c20f6d3 100644 --- a/django/conf/locale/pl/formats.py +++ b/django/conf/locale/pl/formats.py @@ -6,12 +6,12 @@ from __future__ import unicode_literals # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j E Y' -TIME_FORMAT = 'H:i:s' -DATETIME_FORMAT = 'j E Y H:i:s' +TIME_FORMAT = 'H:i' +DATETIME_FORMAT = 'j E Y H:i' YEAR_MONTH_FORMAT = 'F Y' MONTH_DAY_FORMAT = 'j F' SHORT_DATE_FORMAT = 'd-m-Y' -SHORT_DATETIME_FORMAT = 'd-m-Y H:i:s' +SHORT_DATETIME_FORMAT = 'd-m-Y H:i' FIRST_DAY_OF_WEEK = 1 # Monday # The *_INPUT_FORMATS strings use the Python strftime format syntax, diff --git a/django/conf/locale/pt/formats.py b/django/conf/locale/pt/formats.py index 6141176760..c9428ef4ea 100644 --- a/django/conf/locale/pt/formats.py +++ b/django/conf/locale/pt/formats.py @@ -6,7 +6,7 @@ from __future__ import unicode_literals # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = r'j \d\e F \d\e Y' -TIME_FORMAT = 'H:i:s' +TIME_FORMAT = 'H:i' DATETIME_FORMAT = r'j \d\e F \d\e Y à\s H:i' YEAR_MONTH_FORMAT = r'F \d\e Y' MONTH_DAY_FORMAT = r'j \d\e F' diff --git a/django/conf/locale/ro/formats.py b/django/conf/locale/ro/formats.py index 6d7d063d15..4ed143b745 100644 --- a/django/conf/locale/ro/formats.py +++ b/django/conf/locale/ro/formats.py @@ -6,12 +6,12 @@ from __future__ import unicode_literals # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j F Y' -TIME_FORMAT = 'H:i:s' -DATETIME_FORMAT = 'j F Y, H:i:s' +TIME_FORMAT = 'H:i' +DATETIME_FORMAT = 'j F Y, H:i' YEAR_MONTH_FORMAT = 'F Y' MONTH_DAY_FORMAT = 'j F' SHORT_DATE_FORMAT = 'd.m.Y' -SHORT_DATETIME_FORMAT = 'd.m.Y, H:i:s' +SHORT_DATETIME_FORMAT = 'd.m.Y, H:i' # FIRST_DAY_OF_WEEK = # The *_INPUT_FORMATS strings use the Python strftime format syntax, diff --git a/django/conf/locale/ru/formats.py b/django/conf/locale/ru/formats.py index 2cc5001c6a..727ee75b54 100644 --- a/django/conf/locale/ru/formats.py +++ b/django/conf/locale/ru/formats.py @@ -6,8 +6,8 @@ from __future__ import unicode_literals # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j E Y г.' -TIME_FORMAT = 'G:i:s' -DATETIME_FORMAT = 'j E Y г. G:i:s' +TIME_FORMAT = 'G:i' +DATETIME_FORMAT = 'j E Y г. G:i' YEAR_MONTH_FORMAT = 'F Y г.' MONTH_DAY_FORMAT = 'j F' SHORT_DATE_FORMAT = 'd.m.Y' diff --git a/django/conf/locale/sk/formats.py b/django/conf/locale/sk/formats.py index dfbd1a681f..f54a8a89e0 100644 --- a/django/conf/locale/sk/formats.py +++ b/django/conf/locale/sk/formats.py @@ -6,12 +6,12 @@ from __future__ import unicode_literals # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j. F Y' -TIME_FORMAT = 'G:i:s' -DATETIME_FORMAT = 'j. F Y G:i:s' +TIME_FORMAT = 'G:i' +DATETIME_FORMAT = 'j. F Y G:i' YEAR_MONTH_FORMAT = 'F Y' MONTH_DAY_FORMAT = 'j. F' SHORT_DATE_FORMAT = 'd.m.Y' -SHORT_DATETIME_FORMAT = 'd.m.Y G:i:s' +SHORT_DATETIME_FORMAT = 'd.m.Y G:i' FIRST_DAY_OF_WEEK = 1 # Monday # The *_INPUT_FORMATS strings use the Python strftime format syntax, diff --git a/django/conf/locale/sl/formats.py b/django/conf/locale/sl/formats.py index ada379f9e7..a2027166e0 100644 --- a/django/conf/locale/sl/formats.py +++ b/django/conf/locale/sl/formats.py @@ -6,7 +6,7 @@ from __future__ import unicode_literals # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'd. F Y' -TIME_FORMAT = 'H:i:s' +TIME_FORMAT = 'H:i' DATETIME_FORMAT = 'j. F Y. H:i' YEAR_MONTH_FORMAT = 'F Y' MONTH_DAY_FORMAT = 'j. F' diff --git a/django/conf/locale/sq/formats.py b/django/conf/locale/sq/formats.py index 7172826722..0fb21a6583 100644 --- a/django/conf/locale/sq/formats.py +++ b/django/conf/locale/sq/formats.py @@ -6,7 +6,7 @@ from __future__ import unicode_literals # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'd F Y' -TIME_FORMAT = 'g.i.s.A' +TIME_FORMAT = 'g.i.A' # DATETIME_FORMAT = YEAR_MONTH_FORMAT = 'F Y' MONTH_DAY_FORMAT = 'j F' diff --git a/django/conf/locale/ta/formats.py b/django/conf/locale/ta/formats.py index 4e206f4d8c..8928244709 100644 --- a/django/conf/locale/ta/formats.py +++ b/django/conf/locale/ta/formats.py @@ -6,7 +6,7 @@ from __future__ import unicode_literals # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j F, Y' -TIME_FORMAT = 'g:i:s A' +TIME_FORMAT = 'g:i A' # DATETIME_FORMAT = # YEAR_MONTH_FORMAT = MONTH_DAY_FORMAT = 'j F' diff --git a/django/conf/locale/te/formats.py b/django/conf/locale/te/formats.py index 275ab8dc8f..74420d0ea1 100644 --- a/django/conf/locale/te/formats.py +++ b/django/conf/locale/te/formats.py @@ -6,7 +6,7 @@ from __future__ import unicode_literals # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j F Y' -TIME_FORMAT = 'g:i:s A' +TIME_FORMAT = 'g:i A' # DATETIME_FORMAT = # YEAR_MONTH_FORMAT = MONTH_DAY_FORMAT = 'j F' diff --git a/django/conf/locale/th/formats.py b/django/conf/locale/th/formats.py index 714b2037df..1b0e2d4f91 100644 --- a/django/conf/locale/th/formats.py +++ b/django/conf/locale/th/formats.py @@ -6,12 +6,12 @@ from __future__ import unicode_literals # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j F Y' -TIME_FORMAT = 'G:i:s' -DATETIME_FORMAT = 'j F Y, G:i:s' +TIME_FORMAT = 'G:i' +DATETIME_FORMAT = 'j F Y, G:i' YEAR_MONTH_FORMAT = 'F Y' MONTH_DAY_FORMAT = 'j F' SHORT_DATE_FORMAT = 'j M Y' -SHORT_DATETIME_FORMAT = 'j M Y, G:i:s' +SHORT_DATETIME_FORMAT = 'j M Y, G:i' # FIRST_DAY_OF_WEEK = # The *_INPUT_FORMATS strings use the Python strftime format syntax, diff --git a/django/conf/locale/tr/formats.py b/django/conf/locale/tr/formats.py index 175def1956..c01c4a242a 100644 --- a/django/conf/locale/tr/formats.py +++ b/django/conf/locale/tr/formats.py @@ -6,12 +6,12 @@ from __future__ import unicode_literals # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'd F Y' -TIME_FORMAT = 'H:i:s' -DATETIME_FORMAT = 'd F Y H:i:s' +TIME_FORMAT = 'H:i' +DATETIME_FORMAT = 'd F Y H:i' YEAR_MONTH_FORMAT = 'F Y' MONTH_DAY_FORMAT = 'd F' SHORT_DATE_FORMAT = 'd M Y' -SHORT_DATETIME_FORMAT = 'd M Y H:i:s' +SHORT_DATETIME_FORMAT = 'd M Y H:i' FIRST_DAY_OF_WEEK = 1 # Pazartesi # The *_INPUT_FORMATS strings use the Python strftime format syntax, diff --git a/django/conf/locale/uk/formats.py b/django/conf/locale/uk/formats.py index e2a3363ca8..73f81e7aad 100644 --- a/django/conf/locale/uk/formats.py +++ b/django/conf/locale/uk/formats.py @@ -7,8 +7,8 @@ from __future__ import unicode_literals # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j E Y р.' -TIME_FORMAT = 'H:i:s' -DATETIME_FORMAT = 'j E Y р. H:i:s' +TIME_FORMAT = 'H:i' +DATETIME_FORMAT = 'j E Y р. H:i' YEAR_MONTH_FORMAT = 'F Y' MONTH_DAY_FORMAT = 'j F' SHORT_DATE_FORMAT = 'j M Y' diff --git a/django/conf/locale/vi/formats.py b/django/conf/locale/vi/formats.py index 93ede97b98..ee87e2f326 100644 --- a/django/conf/locale/vi/formats.py +++ b/django/conf/locale/vi/formats.py @@ -6,12 +6,12 @@ from __future__ import unicode_literals # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = r'\N\gà\y d \t\há\n\g n \nă\m Y' -TIME_FORMAT = 'H:i:s' -DATETIME_FORMAT = r'H:i:s \N\gà\y d \t\há\n\g n \nă\m Y' +TIME_FORMAT = 'H:i' +DATETIME_FORMAT = r'H:i \N\gà\y d \t\há\n\g n \nă\m Y' YEAR_MONTH_FORMAT = 'F Y' MONTH_DAY_FORMAT = 'j F' SHORT_DATE_FORMAT = 'd-m-Y' -SHORT_DATETIME_FORMAT = 'H:i:s d-m-Y' +SHORT_DATETIME_FORMAT = 'H:i d-m-Y' # FIRST_DAY_OF_WEEK = # The *_INPUT_FORMATS strings use the Python strftime format syntax, diff --git a/docs/releases/1.8.txt b/docs/releases/1.8.txt index a904f0fd13..51febddd9a 100644 --- a/docs/releases/1.8.txt +++ b/docs/releases/1.8.txt @@ -556,6 +556,9 @@ Miscellaneous * For consistency with other major vendors, the ``en_GB`` locale now has Monday as the first day of the week. +* Seconds have been removed from any locales that had them in ``TIME_FORMAT``, + ``DATETIME_FORMAT``, or ``SHORT_DATETIME_FORMAT``. + .. _deprecated-features-1.8: Features deprecated in 1.8 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"),