diff options
| -rw-r--r-- | django/conf/global_settings.py | 1 | ||||
| -rw-r--r-- | django/conf/locale/__init__.py | 6 | ||||
| -rw-r--r-- | django/conf/locale/en_AU/__init__.py | 0 | ||||
| -rw-r--r-- | django/conf/locale/en_AU/formats.py | 42 |
4 files changed, 49 insertions, 0 deletions
diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py index 745f55edd0..5e4a42370d 100644 --- a/django/conf/global_settings.py +++ b/django/conf/global_settings.py @@ -63,6 +63,7 @@ LANGUAGES = ( ('de', gettext_noop('German')), ('el', gettext_noop('Greek')), ('en', gettext_noop('English')), + ('en-au', gettext_noop('Australian English')), ('en-gb', gettext_noop('British English')), ('eo', gettext_noop('Esperanto')), ('es', gettext_noop('Spanish')), diff --git a/django/conf/locale/__init__.py b/django/conf/locale/__init__.py index a7a9baef53..77f8e95ffb 100644 --- a/django/conf/locale/__init__.py +++ b/django/conf/locale/__init__.py @@ -95,6 +95,12 @@ LANG_INFO = { 'name': 'English', 'name_local': 'English', }, + 'en-au': { + 'bidi': False, + 'code': 'en-au', + 'name': 'Australian English', + 'name_local': 'Australian English', + }, 'en-gb': { 'bidi': False, 'code': 'en-gb', diff --git a/django/conf/locale/en_AU/__init__.py b/django/conf/locale/en_AU/__init__.py new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/django/conf/locale/en_AU/__init__.py diff --git a/django/conf/locale/en_AU/formats.py b/django/conf/locale/en_AU/formats.py new file mode 100644 index 0000000000..3ef4d4500f --- /dev/null +++ b/django/conf/locale/en_AU/formats.py @@ -0,0 +1,42 @@ +# -*- encoding: utf-8 -*- +# This file is distributed under the same license as the Django package. +# +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' +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' +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/2006', '25/10/06' + # '%b %d %Y', '%b %d, %Y', # 'Oct 25 2006', 'Oct 25, 2006' + # '%d %b %Y', '%d %b, %Y', # '25 Oct 2006', '25 Oct, 2006' + # '%B %d %Y', '%B %d, %Y', # 'October 25 2006', 'October 25, 2006' + # '%d %B %Y', '%d %B, %Y', # '25 October 2006', '25 October, 2006' +) +DATETIME_INPUT_FORMATS = ( + '%Y-%m-%d %H:%M:%S', # '2006-10-25 14:30:59' + '%Y-%m-%d %H:%M:%S.%f', # '2006-10-25 14:30:59.000200' + '%Y-%m-%d %H:%M', # '2006-10-25 14:30' + '%Y-%m-%d', # '2006-10-25' + '%d/%m/%Y %H:%M:%S', # '25/10/2006 14:30:59' + '%d/%m/%Y %H:%M:%S.%f', # '25/10/2006 14:30:59.000200' + '%d/%m/%Y %H:%M', # '25/10/2006 14:30' + '%d/%m/%Y', # '25/10/2006' + '%d/%m/%y %H:%M:%S', # '25/10/06 14:30:59' + '%d/%m/%y %H:%M:%S.%f', # '25/10/06 14:30:59.000200' + '%d/%m/%y %H:%M', # '25/10/06 14:30' + '%d/%m/%y', # '25/10/06' +) +DECIMAL_SEPARATOR = '.' +THOUSAND_SEPARATOR = ',' +NUMBER_GROUPING = 3 |