Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Fixed #16452 -- Clarified that the DATE/DATETIME/TIME_INPUT_FORMATS s…

…ettings have no effect when USE_L10N is True. Thanks Travis Brooks.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17554 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 7a7ec73efe494235807ade1318c8f3ccade9edc3 1 parent 0fe4218
Aymeric Augustin authored February 19, 2012

Showing 1 changed file with 20 additions and 14 deletions. Show diff stats Hide diff stats

  1. 34  docs/ref/settings.txt
34  docs/ref/settings.txt
@@ -697,11 +697,13 @@ Default::
697 697
     '%b %d, %Y', '%d %b %Y', '%d %b, %Y', '%B %d %Y',
698 698
     '%B %d, %Y', '%d %B %Y', '%d %B, %Y')
699 699
 
700  
-A tuple of formats that will be accepted when inputting data on a date
701  
-field. Formats will be tried in order, using the first valid.
702  
-Note that these format strings are specified in Python's datetime_ module
703  
-syntax, that is different from the one used by Django for formatting dates
704  
-to be displayed.
  700
+A tuple of formats that will be accepted when inputting data on a date field.
  701
+Formats will be tried in order, using the first valid. Note that these format
  702
+strings are specified in Python's datetime_ module syntax, that is different
  703
+from the one used by Django for formatting dates to be displayed.
  704
+
  705
+When :setting:`USE_L10N` is ``True``, the locale-dictated format has higher
  706
+precedence and will be applied instead.
705 707
 
706 708
 See also :setting:`DATETIME_INPUT_FORMATS` and :setting:`TIME_INPUT_FORMATS`.
707 709
 
@@ -738,10 +740,12 @@ Default::
738 740
     '%m/%d/%y %H:%M:%S', '%m/%d/%y %H:%M', '%m/%d/%y')
739 741
 
740 742
 A tuple of formats that will be accepted when inputting data on a datetime
741  
-field. Formats will be tried in order, using the first valid.
742  
-Note that these format strings are specified in Python's datetime_ module
743  
-syntax, that is different from the one used by Django for formatting dates
744  
-to be displayed.
  743
+field. Formats will be tried in order, using the first valid. Note that these
  744
+format strings are specified in Python's datetime_ module syntax, that is
  745
+different from the one used by Django for formatting dates to be displayed.
  746
+
  747
+When :setting:`USE_L10N` is ``True``, the locale-dictated format has higher
  748
+precedence and will be applied instead.
745 749
 
746 750
 See also :setting:`DATE_INPUT_FORMATS` and :setting:`TIME_INPUT_FORMATS`.
747 751
 
@@ -2038,11 +2042,13 @@ TIME_INPUT_FORMATS
2038 2042
 
2039 2043
 Default: ``('%H:%M:%S', '%H:%M')``
2040 2044
 
2041  
-A tuple of formats that will be accepted when inputting data on a time
2042  
-field. Formats will be tried in order, using the first valid.
2043  
-Note that these format strings are specified in Python's datetime_ module
2044  
-syntax, that is different from the one used by Django for formatting dates
2045  
-to be displayed.
  2045
+A tuple of formats that will be accepted when inputting data on a time field.
  2046
+Formats will be tried in order, using the first valid. Note that these format
  2047
+strings are specified in Python's datetime_ module syntax, that is different
  2048
+from the one used by Django for formatting dates to be displayed.
  2049
+
  2050
+When :setting:`USE_L10N` is ``True``, the locale-dictated format has higher
  2051
+precedence and will be applied instead.
2046 2052
 
2047 2053
 See also :setting:`DATE_INPUT_FORMATS` and :setting:`DATETIME_INPUT_FORMATS`.
2048 2054
 

0 notes on commit 7a7ec73

Please sign in to comment.
Something went wrong with that request. Please try again.