From 61c702f6b0ca4ac72839bf7f51556d7afcc20aee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Sat, 22 Sep 2018 12:46:52 +0200 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(-) diff --git a/wcs/forms/common.py b/wcs/forms/common.py index b7926dbc2..726c630ff 100644 --- a/wcs/forms/common.py +++ b/wcs/forms/common.py @@ -201,10 +201,9 @@ class FormStatusPage(Directory, FormTemplateMixin): tm = '???' if self.formdef.only_allow_one: - r += TextsDirectory.get_html_text('form-recorded-allow-one', vars={'date': tm}) + r += TextsDirectory.get_html_text('form-recorded-allow-one') else: - r += TextsDirectory.get_html_text('form-recorded', - vars={'date': tm, 'number': self.filled.get_display_id()}) + r += TextsDirectory.get_html_text('form-recorded') return r.getvalue() diff --git a/wcs/forms/root.py b/wcs/forms/root.py index ef2ae94b9..93ea3541a 100644 --- a/wcs/forms/root.py +++ b/wcs/forms/root.py @@ -1584,15 +1584,13 @@ In order to submit the form you need to complete this simple question. TextsDirectory.register('form-recorded', N_('Message when a form has been recorded'), - hint = N_('Available variables: date, number'), category = N_('Forms'), - default = N_('The form has been recorded on [date] with the number [number].')) + default = N_('The form has been recorded on {{ form_receipt_datetime }} with the number {{ form_number }}.')) TextsDirectory.register('form-recorded-allow-one', N_('Message when a form has been recorded, and the form is set to only allow one per user'), - hint = N_('Available variable: date'), category = N_('Forms'), - default = N_('The form has been recorded on [date].')) + default = N_('The form has been recorded on {{ form_receipt_datetime }}.')) TextsDirectory.register('check-before-submit', N_('Message when a form is displayed before validation'), @@ -1610,12 +1608,11 @@ TextsDirectory.register('tracking-code-short-text', EmailsDirectory.register('tracking-code-reminder', N_('Tracking Code'), - N_('Available variables: email, form_name, form_tracking_code'), category = N_('Miscellaneous'), default_subject = N_('Tracking Code reminder'), default_body = N_('''\ Hello, -As a reminder your tracking code for [form_name] is [form_tracking_code]. +As a reminder your tracking code for {{ form_name }} is {{ form_tracking_code }}. ''')) -- 2.19.0