summaryrefslogtreecommitdiff
path: root/django/forms
diff options
context:
space:
mode:
authorShubham Bhagat <shubhambhagat111@yahoo.com>2019-06-21 01:16:58 +0530
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2019-06-26 11:07:11 +0200
commit26d16c07fdc4a297daca554afa6375c70d6d82a9 (patch)
tree2fe2d8d4fb09c5b1538c38570af63f6ce085445e /django/forms
parenta289e7967907f47e8aba2b25e5f397af6ac7dac9 (diff)
Fixed #30578 - Made SelectDateWidget respect a custom date format when USE_L10N is disabled.
Diffstat (limited to 'django/forms')
-rw-r--r--django/forms/widgets.py21
1 files changed, 9 insertions, 12 deletions
diff --git a/django/forms/widgets.py b/django/forms/widgets.py
index c8ec3c35d5..f9627f2918 100644
--- a/django/forms/widgets.py
+++ b/django/forms/widgets.py
@@ -1070,18 +1070,15 @@ class SelectDateWidget(Widget):
if y == m == d == '':
return None
if y is not None and m is not None and d is not None:
- if settings.USE_L10N:
- input_format = get_format('DATE_INPUT_FORMATS')[0]
- try:
- date_value = datetime.date(int(y), int(m), int(d))
- except ValueError:
- pass
- else:
- date_value = datetime_safe.new_date(date_value)
- return date_value.strftime(input_format)
- # Return pseudo-ISO dates with zeros for any unselected values,
- # e.g. '2017-0-23'.
- return '%s-%s-%s' % (y or 0, m or 0, d or 0)
+ input_format = get_format('DATE_INPUT_FORMATS')[0]
+ try:
+ date_value = datetime.date(int(y), int(m), int(d))
+ except ValueError:
+ # Return pseudo-ISO dates with zeros for any unselected values,
+ # e.g. '2017-0-23'.
+ return '%s-%s-%s' % (y or 0, m or 0, d or 0)
+ date_value = datetime_safe.new_date(date_value)
+ return date_value.strftime(input_format)
return data.get(name)
def value_omitted_from_data(self, data, files, name):