diff options
| author | Illia Volochii <illia.volochii@gmail.com> | 2016-12-29 14:31:32 +0200 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2016-12-29 07:31:32 -0500 |
| commit | d20e046bbd7417c043f40d5fb8ebab863595b3eb (patch) | |
| tree | 6aa556bcff9936e7737c97bf2d1211b8a6ba259a | |
| parent | 813805833aca60544f6b3d686c015039f6af5d1d (diff) | |
Fixed #27653 -- Added Ukrainian locale formats.
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | django/conf/locale/uk/formats.py | 36 |
2 files changed, 27 insertions, 10 deletions
@@ -318,6 +318,7 @@ answer newbie questions, and generally made Django that much better: Idan Gazit <idan@gazit.me> Ifedapo Olarewaju <ifedapoolarewaju@gmail.com> Igor Kolar <ike@email.si> + Illia Volochii <illia.volochii@gmail.com> Ilya Semenov <semenov@inetss.com> I.S. van Oostveen <v.oostveen@idca.nl> ivan.chelubeev@gmail.com diff --git a/django/conf/locale/uk/formats.py b/django/conf/locale/uk/formats.py index d835802be7..938a97d42a 100644 --- a/django/conf/locale/uk/formats.py +++ b/django/conf/locale/uk/formats.py @@ -6,20 +6,36 @@ 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 E Y р.' +DATE_FORMAT = 'd E Y р.' TIME_FORMAT = 'H:i' -DATETIME_FORMAT = 'j E Y р. H:i' +DATETIME_FORMAT = 'd E Y р. H:i' YEAR_MONTH_FORMAT = 'F Y' -MONTH_DAY_FORMAT = 'j F' -SHORT_DATE_FORMAT = 'j M Y' -# SHORT_DATETIME_FORMAT = +MONTH_DAY_FORMAT = 'd F' +SHORT_DATE_FORMAT = 'd.m.Y' +SHORT_DATETIME_FORMAT = 'd.m.Y H:i' 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 = -# TIME_INPUT_FORMATS = -# DATETIME_INPUT_FORMATS = +DATE_INPUT_FORMATS = [ + '%d.%m.%Y', # '25.10.2006' + '%d %B %Y', # '25 October 2006' +] +TIME_INPUT_FORMATS = [ + '%H:%M:%S', # '14:30:59' + '%H:%M:%S.%f', # '14:30:59.000200' + '%H:%M', # '14:30' +] +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 %B %Y %H:%M:%S', # '25 October 2006 14:30:59' + '%d %B %Y %H:%M:%S.%f', # '25 October 2006 14:30:59.000200' + '%d %B %Y %H:%M', # '25 October 2006 14:30' + '%d %B %Y', # '25 October 2006' +] DECIMAL_SEPARATOR = ',' -THOUSAND_SEPARATOR = ' ' -# NUMBER_GROUPING = +THOUSAND_SEPARATOR = '\xa0' # non-breaking space +NUMBER_GROUPING = 3 |