Ticket #13621: ticket13621-alternative2.diff

django/forms/fields.py

@@ -337 +337 @@
             return value.date()
         if isinstance(value, datetime.date):
             return value
-        for format in self.input_formats or formats.get_format('DATE_INPUT_FORMATS'):
+        for format in self.input_formats or formats.get_format('DATE_INPUT_FORMATS', self.localize):
             try:
                 return datetime.date(*time.strptime(value, format)[:3])
             except ValueError:
@@ -363 +363 @@
             return None
         if isinstance(value, datetime.time):
             return value
-        for format in self.input_formats or formats.get_format('TIME_INPUT_FORMATS'):
+        for format in self.input_formats or formats.get_format('TIME_INPUT_FORMATS', self.localize):
             try:
                 return datetime.time(*time.strptime(value, format)[3:6])
             except ValueError:
@@ -397 +397 @@
             if len(value) != 2:
                 raise ValidationError(self.error_messages['invalid'])
             value = '%s %s' % tuple(value)
-        for format in self.input_formats or formats.get_format('DATETIME_INPUT_FORMATS'):
+        for format in self.input_formats or formats.get_format('DATETIME_INPUT_FORMATS', self.localize):
             try:
                 return datetime.datetime(*time.strptime(value, format)[:6])
             except ValueError:

django/utils/formats.py

@@ -34 +34 @@
         modules.reverse()
     return modules
 
-def get_format(format_type):
+def get_format(format_type, L10N=True):
     """
     For a specific format type, returns the format for the current
     language (locale), defaults to the format in the settings.
     format_type is the name of the format, e.g. 'DATE_FORMAT'
     """
     format_type = smart_str(format_type)
-    if settings.USE_L10N:
+    if settings.USE_L10N and L10N:
         for module in get_format_modules():
             try:
                 return getattr(module, format_type)