diff options
| author | Florian Apolloner <florian@apolloner.eu> | 2013-09-21 22:54:00 +0200 |
|---|---|---|
| committer | Florian Apolloner <florian@apolloner.eu> | 2013-09-21 22:58:18 +0200 |
| commit | ece8d6521771635fb5e15d1093524b4f848608fa (patch) | |
| tree | 8ae93a19b2b8b8794b1cf4e0b590f284c0a035eb | |
| parent | e94efee946bb440a4ea9fbe89dcb58972a87e8b3 (diff) | |
[1.6.x] Ensured that BoundField.as_widget always returns properly localized fields.
This is a follow-up to #18777 which improperly converted to strings in
prepare_value and as such caused regressions like #21074.
Refs #18777, #21074
Backport of 56743cf9e337826e4c615909570bb057142a6a7b from master.
| -rw-r--r-- | django/forms/fields.py | 3 | ||||
| -rw-r--r-- | django/forms/forms.py | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/django/forms/fields.py b/django/forms/fields.py index d9243f142a..c94a5641c4 100644 --- a/django/forms/fields.py +++ b/django/forms/fields.py @@ -115,8 +115,6 @@ class Field(object): super(Field, self).__init__() def prepare_value(self, value): - if self.widget.is_localized: - value = formats.localize_input(value) return value def to_python(self, value): @@ -459,7 +457,6 @@ class DateTimeField(BaseTemporalField): } def prepare_value(self, value): - value = super(DateTimeField, self).prepare_value(value) if isinstance(value, datetime.datetime): value = to_current_timezone(value) return value diff --git a/django/forms/forms.py b/django/forms/forms.py index 0dfcdebbf0..325de1c87a 100644 --- a/django/forms/forms.py +++ b/django/forms/forms.py @@ -457,6 +457,9 @@ class BoundField(object): if not widget: widget = self.field.widget + if self.field.localize: + widget.is_localized = True + attrs = attrs or {} auto_id = self.auto_id if auto_id and 'id' not in attrs and 'id' not in widget.attrs: |