From f6d4e5b08a27dd6be4c4cbf0da79dfe2c2bdebac Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Sat, 12 Feb 2011 13:11:33 +0000 Subject: [PATCH] Fixed #13833 -- Corrected the Indonesian localization. Thanks to rodin for the report and patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@15494 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/conf/locale/id/formats.py | 34 ++++++++++++++++---------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/django/conf/locale/id/formats.py b/django/conf/locale/id/formats.py index 8e711155b9..d609762117 100644 --- a/django/conf/locale/id/formats.py +++ b/django/conf/locale/id/formats.py @@ -5,40 +5,40 @@ # 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.s" +TIME_FORMAT = 'G.i.s' 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.s' FIRST_DAY_OF_WEEK = 1 #Monday # The *_INPUT_FORMATS strings use the Python strftime format syntax, # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior DATE_INPUT_FORMATS = ( - '%d-%m-%y', '%d/%m/%y', # '25-10-09' , 25/10/09' - '%d-%m-%Y', '%d/%m/%Y', # '25-10-2009' , 25/10/2009' - # '%d %b %Y', '%d %b, %Y', # '25 Oct 2006', '25 Oct, 2006' - # '%d %B %Y', '%d %B, %Y', # '25 October 2006', '25 October, 2006' + '%d-%m-%y', '%d/%m/%y', # '25-10-09', 25/10/09' + '%d-%m-%Y', '%d/%m/%Y', # '25-10-2009', 25/10/2009' + '%d %b %Y', # '25 Oct 2006', + '%d %B %Y', # '25 October 2006' ) TIME_INPUT_FORMATS = ( - '%H:%M:%S', # '14:30:59' - '%H:%M', # '14:30' + '%H.%M.%S', # '14.30.59' + '%H.%M', # '14.30' ) DATETIME_INPUT_FORMATS = ( - '%d-%m-%Y %H:%M:%S', # '25-10-2009 14:30:59' - '%d-%m-%Y %H:%M', # '25-10-2009 14:30' + '%d-%m-%Y %H.%M.%S', # '25-10-2009 14.30.59' + '%d-%m-%Y %H.%M', # '25-10-2009 14.30' '%d-%m-%Y', # '25-10-2009' - '%d-%m-%y %H:%M:%S', # '25-10-09' 14:30:59' - '%d-%m-%y %H:%M', # '25-10-09' 14:30' + '%d-%m-%y %H.%M.%S', # '25-10-09' 14.30.59' + '%d-%m-%y %H.%M', # '25-10-09' 14.30' '%d-%m-%y', # '25-10-09'' - '%m/%d/%y %H:%M:%S', # '10/25/06 14:30:59' - '%m/%d/%y %H:%M', # '10/25/06 14:30' + '%m/%d/%y %H.%M.%S', # '10/25/06 14.30.59' + '%m/%d/%y %H.%M', # '10/25/06 14.30' '%m/%d/%y', # '10/25/06' - '%m/%d/%Y %H:%M:%S', # '25/10/2009 14:30:59' - '%m/%d/%Y %H:%M', # '25/10/2009 14:30' + '%m/%d/%Y %H.%M.%S', # '25/10/2009 14.30.59' + '%m/%d/%Y %H.%M', # '25/10/2009 14.30' '%m/%d/%Y', # '10/25/2009' )