From 392963e8e4605ff6da770450623ceaef0892cab7 Mon Sep 17 00:00:00 2001 From: Bogdan Mateescu <detorkville@outlook.com> Date: Sun, 20 May 2018 18:12:13 +0300 Subject: [PATCH] Fixed #29421 -- Improved Romanian locale formats --- AUTHORS | 1 + django/conf/locale/ro/formats.py | 24 +++++++++++++++++++----- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/AUTHORS b/AUTHORS index 43729adca1..088bf04e8d 100644 --- a/AUTHORS +++ b/AUTHORS @@ -115,6 +115,7 @@ answer newbie questions, and generally made Django that much better: Bill Fenner <fenner@gmail.com> Bjørn Stabell <bjorn@exoweb.net> Bo Marchman <bo.marchman@gmail.com> + Bogdan Mateescu Bojan Mihelac <bmihelac@mihelac.org> Bouke Haarsma <bouke@haarsma.eu> Božidar Benko <bbenko@gmail.com> diff --git a/django/conf/locale/ro/formats.py b/django/conf/locale/ro/formats.py index ba3fd73b4a..11f4e2e9fc 100644 --- a/django/conf/locale/ro/formats.py +++ b/django/conf/locale/ro/formats.py @@ -9,13 +9,27 @@ YEAR_MONTH_FORMAT = 'F Y' MONTH_DAY_FORMAT = 'j F' SHORT_DATE_FORMAT = 'd.m.Y' SHORT_DATETIME_FORMAT = 'd.m.Y, H:i' -# FIRST_DAY_OF_WEEK = +FIRST_DAY_OF_WEEK = 1 # 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.%b.%Y', + '%d %B %Y', + '%A, %d %B %Y', +] +TIME_INPUT_FORMATS = [ + '%H:%M', + '%H:%M:%S', + '%H:%M:%S.%f', +] +DATETIME_INPUT_FORMATS = [ + '%d.%m.%Y, %H:%M', + '%d.%m.%Y, %H:%M:%S', + '%d.%B.%Y, %H:%M', + '%d.%B.%Y, %H:%M:%S', +] DECIMAL_SEPARATOR = ',' THOUSAND_SEPARATOR = '.' -# NUMBER_GROUPING = +NUMBER_GROUPING = 3