← Back to branch summary

~ubuntu-branches/debian/squeeze/python-django/squeeze

« back to all changes in this revision

Viewing changes to django/forms/fields.py

  • Committer: Bazaar Package Importer
  • Author(s): Chris Lamb
  • Date: 2010-05-24 22:44:32 UTC
  • mfrom: (1.2.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20100524224432-dsvb0sbgsfmyql90
Tags: 1.2.1-1
New upstream bugfix release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
django/forms/fields.py
105
105
 
106
106
        # Trigger the localization machinery if needed.
107
107
        self.localize = localize
 
108
        if self.localize:
 
109
            widget.is_localized = True
108
110
 
109
111
        # Hook into self.widget_attrs() for any Field-specific HTML attributes.
110
112
        extra_attrs = self.widget_attrs(widget)
125
127
 
126
128
        self.validators = self.default_validators + validators
127
129
 
128
 
    def localize_value(self, value):
129
 
        return formats.localize_input(value)
130
 
 
131
130
    def to_python(self, value):
132
131
        return value
133
132
 
843
842
        errors = self.default_error_messages.copy()
844
843
        if 'error_messages' in kwargs:
845
844
            errors.update(kwargs['error_messages'])
 
845
        localize = kwargs.get('localize', False)
846
846
        fields = (
847
 
            DateField(input_formats=input_date_formats, error_messages={'invalid': errors['invalid_date']}),
848
 
            TimeField(input_formats=input_time_formats, error_messages={'invalid': errors['invalid_time']}),
 
847
            DateField(input_formats=input_date_formats,
 
848
                      error_messages={'invalid': errors['invalid_date']},
 
849
                      localize=localize),
 
850
            TimeField(input_formats=input_time_formats,
 
851
                      error_messages={'invalid': errors['invalid_time']},
 
852
                      localize=localize),
849
853
        )
850
854
        super(SplitDateTimeField, self).__init__(fields, *args, **kwargs)
851
855