Projet

Général

Profil

0001-form-fix-handling-of-date-in-iso-format-in-French-co.patch

Frédéric Péters, 02 février 2015 09:47

Télécharger (1,88 ko)

Voir les différences:

Subject: [PATCH] form: fix handling of date in iso format in French-configured
 sites (#6390)

 tests/test_widgets.py | 9 +++++++--
 wcs/qommon/form.py    | 1 +
 2 files changed, 8 insertions(+), 2 deletions(-)
tests/test_widgets.py
242 242
    req.form = {}
243 243
    assert widget.parse() is None
244 244

  
245
    pub.cfg['language'] = {'language': 'en'}
245 246
    widget = DateWidget('test')
246 247
    mock_form_submission(req, widget, {'test': '2014-1-20'})
247 248
    assert not widget.has_error()
248
    assert widget.parse() == '2014-1-20'
249
    assert widget.parse() == '2014-01-20'
249 250

  
250 251
    pub.cfg['language'] = {'language': 'fr'}
251 252
    widget = DateWidget('test')
252 253
    mock_form_submission(req, widget, {'test': '20/1/2014'})
253 254
    assert not widget.has_error()
254
    assert widget.parse() == '20/1/2014'
255
    assert widget.parse() == '20/01/2014'
256

  
257
    mock_form_submission(req, widget, {'test': '2014-1-20'})
258
    assert not widget.has_error()
259
    assert widget.parse() == '20/01/2014'
255 260

  
256 261
    widget = DateWidget('test', minimum_date='1/1/2014')
257 262
    mock_form_submission(req, widget, {'test': '20/1/2014'})
wcs/qommon/form.py
803 803
                    value = time.strptime(self.value, format_string)
804 804
                except ValueError:
805 805
                    continue
806
                self.value = strftime(self.get_format_string(), value)
806 807
                break
807 808
            else:
808 809
                self.error = _('invalid date')
809
-