From f93657218ccd5c39f0b5f8415dd2f041238ad825 Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Wed, 30 Dec 2009 22:12:37 +0000 Subject: [PATCH] Fixed Norwegian date and time input format strings. git-svn-id: http://code.djangoproject.com/svn/django/trunk@12031 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/conf/locale/no/formats.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/django/conf/locale/no/formats.py b/django/conf/locale/no/formats.py index 62ee886f11..0ebf629d9c 100644 --- a/django/conf/locale/no/formats.py +++ b/django/conf/locale/no/formats.py @@ -14,19 +14,19 @@ DATE_INPUT_FORMATS = ( '%j. %B %Y', '%j %B %Y', # '25. oktober 2006', '25 oktober 2006' ) TIME_INPUT_FORMATS = ( - '%H:%i:%S', # '14:30:59' - '%H:%i', # '14:30' + '%H:%M:%S', # '14:30:59' + '%H:%M', # '14:30' ) DATETIME_INPUT_FORMATS = ( - '%Y-%m-%d %H:%i:%S', # '2006-10-25 14:30:59' - '%Y-%m-%d %H:%i', # '2006-10-25 14:30' + '%Y-%m-%d %H:%M:%S', # '2006-10-25 14:30:59' + '%Y-%m-%d %H:%M', # '2006-10-25 14:30' '%Y-%m-%d', # '2006-10-25' '%Y-%m-%j', # '2006-10-25' - '%j.%m.%Y %H:%i:%S', # '25.10.2006 14:30:59' - '%j.%m.%Y %H:%i', # '25.10.2006 14:30' + '%j.%m.%Y %H:%M:%S', # '25.10.2006 14:30:59' + '%j.%m.%Y %H:%M', # '25.10.2006 14:30' '%j.%m.%Y', # '25.10.2006' - '%j.%m.%y %H:%i:%S', # '25.10.06 14:30:59' - '%j.%m.%y %H:%i', # '25.10.06 14:30' + '%j.%m.%y %H:%M:%S', # '25.10.06 14:30:59' + '%j.%m.%y %H:%M', # '25.10.06 14:30' '%j.%m.%y', # '25.10.06' ) DECIMAL_SEPARATOR = ','