Ticket #12986: 12986.diff

django/forms/extras/widgets.py

@@ -43 +43 @@
         except AttributeError:
             year_val = month_val = day_val = None
             if isinstance(value, basestring):
-                match = RE_DATE.match(value)
-                if match:
-                    year_val, month_val, day_val = [int(v) for v in match.groups()]
-
+                if settings.USE_L10N:
+                    input_format = get_format('DATE_INPUT_FORMATS')[0]
+                    try:
+                        val = datetime.datetime.strptime(value, input_format)
+                        year_val, month_val, day_val = val.year, val.month, val.day
+                    except ValueError:
+                        pass                    
+                else:
+                    match = RE_DATE.match(value)
+                    if match:
+                        year_val, month_val, day_val = [int(v) for v in match.groups()]
         choices = [(i, i) for i in self.years]
         year_html = self.create_select(name, self.year_field, value, year_val, choices)
         choices = MONTHS.items()