diff options
| author | Jannis Leidel <jannis@leidel.info> | 2010-05-21 14:07:54 +0000 |
|---|---|---|
| committer | Jannis Leidel <jannis@leidel.info> | 2010-05-21 14:07:54 +0000 |
| commit | b057a8b247d14328f058b8bc89da0519516ced82 (patch) | |
| tree | 800a8fbb2790d22c1c96b5570f81c847db197e52 /django/forms/fields.py | |
| parent | 8a6cb3d969b6fd18abb952b8d0e5ccd10488a742 (diff) | |
Fixed #13560 -- Fixed localization of widgets.
Particularly this fixes the SplitDateTimeField and the AdminDateWidget by localizating the widget's value in its render method instead of the form field. Thanks to David Danier for the report and Russell for help with the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13296 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/forms/fields.py')
| -rw-r--r-- | django/forms/fields.py | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/django/forms/fields.py b/django/forms/fields.py index 14152c81a0..0bae4ba157 100644 --- a/django/forms/fields.py +++ b/django/forms/fields.py @@ -105,6 +105,8 @@ class Field(object): # Trigger the localization machinery if needed. self.localize = localize + if self.localize: + widget.is_localized = True # Hook into self.widget_attrs() for any Field-specific HTML attributes. extra_attrs = self.widget_attrs(widget) @@ -125,9 +127,6 @@ class Field(object): self.validators = self.default_validators + validators - def localize_value(self, value): - return formats.localize_input(value) - def to_python(self, value): return value @@ -843,9 +842,14 @@ class SplitDateTimeField(MultiValueField): errors = self.default_error_messages.copy() if 'error_messages' in kwargs: errors.update(kwargs['error_messages']) + localize = kwargs.get('localize', False) fields = ( - DateField(input_formats=input_date_formats, error_messages={'invalid': errors['invalid_date']}), - TimeField(input_formats=input_time_formats, error_messages={'invalid': errors['invalid_time']}), + DateField(input_formats=input_date_formats, + error_messages={'invalid': errors['invalid_date']}, + localize=localize), + TimeField(input_formats=input_time_formats, + error_messages={'invalid': errors['invalid_time']}, + localize=localize), ) super(SplitDateTimeField, self).__init__(fields, *args, **kwargs) |