entrouvert/wcs
entrouvert
/
wcs
14
1
Fork 0
Code Issues Pull Requests 34 Releases Activity

misc: use django template and modern variable names in form messages (#26070)

This commit is contained in:
Frédéric Péters 2018-09-22 12:46:52 +02:00
parent 42c6c877a2
commit 3464f6937e
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wcs/forms/common.py
View File

@ -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()

9
wcs/forms/root.py
View File

@ -1588,15 +1588,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'),
@ -1614,12 +1612,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 }}.
'''))