Commit b3752d41 authored by Duncan Parkes's avatar Duncan Parkes Committed by Tim Graham
Browse files

Fixed comments in en_GB and en_AU formats.py files. 

Changed comments in en_GB and en_AU formats files replacing 'pm' with
'p.m.' to match what is actually output.
parent 4a303341

django/conf/locale/en_AU/formats.py

+3 −3
Original line number Diff line number Diff line
@@ -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 M Y'                   # '25 Oct 2006'

TIME_FORMAT = 'P'                       # '2:30 pm'

DATETIME_FORMAT = 'j M Y, P'            # '25 Oct 2006, 2:30 pm'

TIME_FORMAT = 'P'                       # '2:30 p.m.'

DATETIME_FORMAT = 'j M Y, P'            # '25 Oct 2006, 2:30 p.m.'

YEAR_MONTH_FORMAT = 'F Y'               # 'October 2006'

MONTH_DAY_FORMAT = 'j F'                # '25 October'

SHORT_DATE_FORMAT = 'd/m/Y'             # '25/10/2006'

SHORT_DATETIME_FORMAT = 'd/m/Y P'       # '25/10/2006 2:30 pm'

SHORT_DATETIME_FORMAT = 'd/m/Y P'       # '25/10/2006 2:30 p.m.'

FIRST_DAY_OF_WEEK = 0                   # Sunday



# The *_INPUT_FORMATS strings use the Python strftime format syntax,

django/conf/locale/en_GB/formats.py

+3 −3
Original line number Diff line number Diff line
@@ -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 M Y'                   # '25 Oct 2006'

TIME_FORMAT = 'P'                       # '2:30 pm'

DATETIME_FORMAT = 'j M Y, P'            # '25 Oct 2006, 2:30 pm'

TIME_FORMAT = 'P'                       # '2:30 p.m.'

DATETIME_FORMAT = 'j M Y, P'            # '25 Oct 2006, 2:30 p.m.'

YEAR_MONTH_FORMAT = 'F Y'               # 'October 2006'

MONTH_DAY_FORMAT = 'j F'                # '25 October'

SHORT_DATE_FORMAT = 'd/m/Y'             # '25/10/2006'

SHORT_DATETIME_FORMAT = 'd/m/Y P'       # '25/10/2006 2:30 pm'

SHORT_DATETIME_FORMAT = 'd/m/Y P'       # '25/10/2006 2:30 p.m.'

FIRST_DAY_OF_WEEK = 1                   # Monday



# The *_INPUT_FORMATS strings use the Python strftime format syntax,