diff options
| author | Jannis Leidel <jannis@leidel.info> | 2012-02-04 18:44:42 +0000 |
|---|---|---|
| committer | Jannis Leidel <jannis@leidel.info> | 2012-02-04 18:44:42 +0000 |
| commit | 3db80c4c05734f2f1c7b6f12e44146b31334bbe1 (patch) | |
| tree | d0aae36f800c90e7b5419da2efe6c47138a85f58 | |
| parent | ef4d84d11ab9357d9c6e35b2a3a0a9d4fb310075 (diff) | |
Fixed #17017 -- Updated British English date formats to follow common standards. Thanks, sebastian.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17444 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/conf/locale/en_GB/formats.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/django/conf/locale/en_GB/formats.py b/django/conf/locale/en_GB/formats.py index ffffdebe3e..ea9a3f6303 100644 --- a/django/conf/locale/en_GB/formats.py +++ b/django/conf/locale/en_GB/formats.py @@ -4,11 +4,11 @@ # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date -DATE_FORMAT = 'N j, Y' # 'Oct. 25, 2006' +DATE_FORMAT = 'j M Y' # '25 Oct 2006' TIME_FORMAT = 'P' # '2:30 pm' -DATETIME_FORMAT = 'N j, Y, P' # 'Oct. 25, 2006, 2:30 pm' +DATETIME_FORMAT = 'j M Y, P' # '25 Oct 2006, 2:30 pm' YEAR_MONTH_FORMAT = 'F Y' # 'October 2006' -MONTH_DAY_FORMAT = 'F j' # 'October 25' +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' FIRST_DAY_OF_WEEK = 0 # Sunday |