Projet

Général

Profil

0001-misc-use-django-template-and-modern-variable-names-i.patch

Frédéric Péters, 22 septembre 2018 12:47

Télécharger (2,73 ko)

Voir les différences:

Subject: [PATCH 1/2] misc: use django template and modern variable names in
 form messages (#26070)

 wcs/forms/common.py | 5 ++---
 wcs/forms/root.py   | 9 +++------
 2 files changed, 5 insertions(+), 9 deletions(-)
wcs/forms/common.py
201 201
            tm = '???'
202 202

  
203 203
        if self.formdef.only_allow_one:
204
            r += TextsDirectory.get_html_text('form-recorded-allow-one', vars={'date': tm})
204
            r += TextsDirectory.get_html_text('form-recorded-allow-one')
205 205
        else:
206
            r += TextsDirectory.get_html_text('form-recorded',
207
                    vars={'date': tm, 'number': self.filled.get_display_id()})
206
            r += TextsDirectory.get_html_text('form-recorded')
208 207

  
209 208
        return r.getvalue()
210 209

  
wcs/forms/root.py
1584 1584

  
1585 1585
TextsDirectory.register('form-recorded',
1586 1586
        N_('Message when a form has been recorded'),
1587
        hint = N_('Available variables: date, number'),
1588 1587
        category = N_('Forms'),
1589
        default = N_('The form has been recorded on [date] with the number [number].'))
1588
        default = N_('The form has been recorded on {{ form_receipt_datetime }} with the number {{ form_number }}.'))
1590 1589

  
1591 1590
TextsDirectory.register('form-recorded-allow-one',
1592 1591
        N_('Message when a form has been recorded, and the form is set to only allow one per user'),
1593
        hint = N_('Available variable: date'),
1594 1592
        category = N_('Forms'),
1595
        default = N_('The form has been recorded on [date].'))
1593
        default = N_('The form has been recorded on {{ form_receipt_datetime }}.'))
1596 1594

  
1597 1595
TextsDirectory.register('check-before-submit',
1598 1596
        N_('Message when a form is displayed before validation'),
......
1610 1608

  
1611 1609
EmailsDirectory.register('tracking-code-reminder',
1612 1610
        N_('Tracking Code'),
1613
        N_('Available variables: email, form_name, form_tracking_code'),
1614 1611
        category = N_('Miscellaneous'),
1615 1612
        default_subject = N_('Tracking Code reminder'),
1616 1613
        default_body = N_('''\
1617 1614
Hello,
1618 1615

  
1619
As a reminder your tracking code for [form_name] is [form_tracking_code].
1616
As a reminder your tracking code for {{ form_name }} is {{ form_tracking_code }}.
1620 1617

  
1621 1618
'''))
1622
-