From 2a5a0b8097a35e355b0742cb2c912913581d259a Mon Sep 17 00:00:00 2001 From: Aymeric Augustin Date: Sun, 19 Feb 2012 08:00:59 +0000 Subject: [PATCH] [1.3.X] Fixed #16452 -- Clarified that the DATE/DATETIME/TIME_INPUT_FORMATS settings have no effect when USE_L10N is True. Backport of r17554 from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.3.X@17555 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- docs/ref/settings.txt | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt index 18155f19fc..8dc5fdbe0d 100644 --- a/docs/ref/settings.txt +++ b/docs/ref/settings.txt @@ -619,11 +619,13 @@ Default:: '%b %d, %Y', '%d %b %Y', '%d %b, %Y', '%B %d %Y', '%B %d, %Y', '%d %B %Y', '%d %B, %Y') -A tuple of formats that will be accepted when inputting data on a date -field. Formats will be tried in order, using the first valid. -Note that these format strings are specified in Python's datetime_ module -syntax, that is different from the one used by Django for formatting dates -to be displayed. +A tuple of formats that will be accepted when inputting data on a date field. +Formats will be tried in order, using the first valid. Note that these format +strings are specified in Python's datetime_ module syntax, that is different +from the one used by Django for formatting dates to be displayed. + +When :setting:`USE_L10N` is ``True``, the locale-dictated format has higher +precedence and will be applied instead. See also :setting:`DATETIME_INPUT_FORMATS` and :setting:`TIME_INPUT_FORMATS`. @@ -660,10 +662,12 @@ Default:: '%m/%d/%y %H:%M:%S', '%m/%d/%y %H:%M', '%m/%d/%y') A tuple of formats that will be accepted when inputting data on a datetime -field. Formats will be tried in order, using the first valid. -Note that these format strings are specified in Python's datetime_ module -syntax, that is different from the one used by Django for formatting dates -to be displayed. +field. Formats will be tried in order, using the first valid. Note that these +format strings are specified in Python's datetime_ module syntax, that is +different from the one used by Django for formatting dates to be displayed. + +When :setting:`USE_L10N` is ``True``, the locale-dictated format has higher +precedence and will be applied instead. See also :setting:`DATE_INPUT_FORMATS` and :setting:`TIME_INPUT_FORMATS`. @@ -1836,11 +1840,13 @@ TIME_INPUT_FORMATS Default: ``('%H:%M:%S', '%H:%M')`` -A tuple of formats that will be accepted when inputting data on a time -field. Formats will be tried in order, using the first valid. -Note that these format strings are specified in Python's datetime_ module -syntax, that is different from the one used by Django for formatting dates -to be displayed. +A tuple of formats that will be accepted when inputting data on a time field. +Formats will be tried in order, using the first valid. Note that these format +strings are specified in Python's datetime_ module syntax, that is different +from the one used by Django for formatting dates to be displayed. + +When :setting:`USE_L10N` is ``True``, the locale-dictated format has higher +precedence and will be applied instead. See also :setting:`DATE_INPUT_FORMATS` and :setting:`DATETIME_INPUT_FORMATS`.