Remove all mentions of vote

This commit is contained in:
Frédéric Péters 2011-04-30 13:37:52 +02:00
parent 7af13d9193
commit ad3fd47eb9
4 changed files with 21 additions and 21 deletions

View File

@ -97,23 +97,23 @@ def get_verification_codes(formdef):
TextsDirectory.register('asec-recorded-vote',
N_('Message when a ballot has been recorded.'),
N_('Message when a response has been recorded.'),
hint=N_('Available variable: verification_code'),
default=N_('''<p>
Your ballot has been recorded. Its verification code is
Your response has been recorded. Its verification code is
<strong>[verification_code]</strong>.
</p>
<p>
This verification code is a unique identifier which will allow you to
verify after the election that your ballot was counted correctly. To ensure
verify after the election that your response was counted correctly. To ensure
anonymity, no link is kept between this code and your identifiers,
so please keep this code safe.
</p>
<p>
Nobody except you knows that this code is associated with you and only you
will be able to verify your vote. It is not possible to request this anonymous
will be able to verify your response. It is not possible to request this anonymous
code later.
</p>
'''))

View File

@ -905,15 +905,15 @@ class DiffusionDirectory(Directory):
'</div>'
EmailsDirectory.register('asec-voting-instructions',
N_('Voting instructions and access codes'),
N_('Instructions and access codes'),
N_('Available variables: user_name, user_email, access_code, questionnaire_name, questionnaire_url'),
default_subject=N_('[questionnaire_name] - voting instructions'),
default_subject=N_('[questionnaire_name] - instructions'),
default_body=N_('''\
Dear [user_name]
[questionnaire_name] is now open.
To vote, please go to [questionnaire_url]
To give your answer, please go to [questionnaire_url]
and follow the instructions there.
When instructed to do so, enter the following details:
@ -921,7 +921,7 @@ When instructed to do so, enter the following details:
E-Mail: [user_email]
Access Code: [access_code]
The election has 4 steps:
The process has 4 steps:
First, you must identify yourself using the access code above.
@ -931,12 +931,12 @@ A third step will show you your choice, and ask you to confirm or return
to the previous step.
Finally, after confirming your choice, a unique identifier will be given
to you which will allow you to verify after the election that your vote
to you which will allow you to verify that your response
was counted correctly. To ensure anonymity, no link will be kept between
this token and your identifiers, so please keep this token safe. Once you
have voted, you will not be able to vote again.
have given a response, you will not be able to do it again.
Thank you for your vote!
Thank you for your participation!
Regards,
'''))

View File

@ -123,17 +123,17 @@ class FormResultDirectory(FormPage):
nb_users += 1
'<ul>'
' <li>%s</li>' % _('Registered Voters: %s') % nb_users
' <li>%s</li>' % _('Registered Participants: %s') % nb_users
voters = anonymity.get_voters(self.formdef)
' <li>%s</li>' % _('Registered Ballots: %s') % len(voters)
' <li>%s</li>' % _('Registered Responses: %s') % len(voters)
if nb_users:
' <li>%s</li>' % _('Abstention: %.2f%%') % (100*(1.0-(1.0*len(voters)/nb_users)))
else:
' <li>%s</li>' % _('Abstention: n/a')
'</ul>'
'<h3>%s</h3>' % _('List of voters')
'<h3>%s</h3>' % _('List of participants')
'<ul>'
for v in sorted(voters):

View File

@ -290,7 +290,7 @@ class FormPage(wcs.forms.root.FormPage):
data = {
'user_name': user.display_name,
'user_email': user.email,
'vote_token': token,
'access_code': token,
'questionnaire_name': self.formdef.name,
'questionnaire_url': self.formdef.get_url(),
}
@ -308,9 +308,9 @@ class FormPage(wcs.forms.root.FormPage):
TextsDirectory.register('asec-already-voted',
N_('Message when a ballot was already recorded for the user.'),
N_('Message when a response was already recorded for the user.'),
default=N_('''<p>
It appears you already recorded a ballot.
It appears you already recorded a response.
</p>'''))
TextsDirectory.register('asec-please-identify',
@ -327,7 +327,7 @@ This questionnaire will soon be available.
EmailsDirectory.register('asec-new-access-code',
N_('Request for a new access code'),
N_('Available variables: user_name, user_email, vote_token, questionnaire_name, questionnaire_url'),
N_('Available variables: user_name, user_email, access_code, questionnaire_name, questionnaire_url'),
default_subject=N_('Access code for [questionnaire_name]'),
default_body=N_('''\
Dear [user_name]
@ -335,11 +335,11 @@ Dear [user_name]
You requested a new access code for [questionnaire_name]
E-Mail: [user_email]
Vote token: [vote_token]
Access Code: [access_code]
You can now go back to [questionnaire_url] and vote.
You can now go back to [questionnaire_url] and give your answer.
Thank you for your vote!
Thank you for your participation!
Regards,
'''))