diff options
| author | Duncan Parkes <duncan@mysociety.org> | 2014-08-27 15:29:49 +0100 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2014-09-02 13:34:52 -0400 |
| commit | b3752d410ab15bafbb09e477c5f8696bb2d4c871 (patch) | |
| tree | 6c4bc75185f006561610c78e00fc736eb33e7dee | |
| parent | 4a303341fcec8e01cbd47d98bbe5520eabaa7d9e (diff) | |
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.
| -rw-r--r-- | django/conf/locale/en_AU/formats.py | 6 | ||||
| -rw-r--r-- | django/conf/locale/en_GB/formats.py | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/django/conf/locale/en_AU/formats.py b/django/conf/locale/en_AU/formats.py index c2edd23bcd..5dd55743b6 100644 --- a/django/conf/locale/en_AU/formats.py +++ b/django/conf/locale/en_AU/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 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, diff --git a/django/conf/locale/en_GB/formats.py b/django/conf/locale/en_GB/formats.py index 3ef4d4500f..b2f24c0714 100644 --- a/django/conf/locale/en_GB/formats.py +++ b/django/conf/locale/en_GB/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 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, |