diff options
| author | Serafeim Papastefanos <spapas@gmail.com> | 2015-01-10 00:05:58 +0200 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-01-10 11:11:57 -0500 |
| commit | 1a352fe1751cb1ec1dc2977e72cac9dc9b770bc1 (patch) | |
| tree | 112461bfe10f432a4058ac9a7f28e3d5026c27db | |
| parent | 7e65876b7c34d0c43c94ba01543a0050270a34fe (diff) | |
[1.7.x] Fixed #23967 -- Added formats for Greek
Backport of 74f02557e0183812d6d60e2548985c5c40b3d27b from master
| -rw-r--r-- | django/conf/locale/el/formats.py | 36 | ||||
| -rw-r--r-- | docs/releases/1.7.3.txt | 2 |
2 files changed, 27 insertions, 11 deletions
diff --git a/django/conf/locale/el/formats.py b/django/conf/locale/el/formats.py index 817f71d3c8..429db4b508 100644 --- a/django/conf/locale/el/formats.py +++ b/django/conf/locale/el/formats.py @@ -5,20 +5,34 @@ 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 = 'd E Y' -TIME_FORMAT = 'g:i:s A' -# DATETIME_FORMAT = +DATE_FORMAT = 'd/m/Y' +TIME_FORMAT = 'P' +DATETIME_FORMAT = 'd/m/Y P' YEAR_MONTH_FORMAT = 'F Y' MONTH_DAY_FORMAT = 'j F' -SHORT_DATE_FORMAT = 'd M Y' -# SHORT_DATETIME_FORMAT = -# FIRST_DAY_OF_WEEK = +SHORT_DATE_FORMAT = 'd/m/Y' +SHORT_DATETIME_FORMAT = 'd/m/Y P' +FIRST_DAY_OF_WEEK = 0 # Sunday # The *_INPUT_FORMATS strings use the Python strftime format syntax, # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior -# DATE_INPUT_FORMATS = -# TIME_INPUT_FORMATS = -# DATETIME_INPUT_FORMATS = +DATE_INPUT_FORMATS = ( + '%d/%m/%Y', '%d/%m/%y', '%Y-%m-%d', # '25/10/2006', '25/10/06', '2006-10-25', +) +DATETIME_INPUT_FORMATS = ( + '%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' + '%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' +) DECIMAL_SEPARATOR = ',' -THOUSAND_SEPARATOR = '.' -# NUMBER_GROUPING = +THOUSAND_SEPARATOR = '\xa0' # non-breaking space +NUMBER_GROUPING = 3 diff --git a/docs/releases/1.7.3.txt b/docs/releases/1.7.3.txt index cd0c1efdf7..3a651f0bd9 100644 --- a/docs/releases/1.7.3.txt +++ b/docs/releases/1.7.3.txt @@ -24,3 +24,5 @@ Bugfixes * Fixed a crash in the ``django.contrib.auth.redirect_to_login`` view when passing a :func:`~django.core.urlresolvers.reverse_lazy` result on Python 3 (:ticket:`24097`). + +* Added correct formats for Greek (``el``) (:ticket:`23967`). |