Changeset 323 for trunk/root/templates


Ignore:
Timestamp:
10/03/10 22:53:33 (14 years ago)
Author:
nanardon
Message:
  • proof reading from Ahmad Samir
Location:
trunk/root/templates
Files:
26 edited

Legend:

Unmodified
Added
Removed

  • trunk/root/templates/admin/ballot.tt

    r319 r323  
    99 
    1010[% IF ! poll.choices_keys.size %] 
    11 <p class="alert">[% l('No choice are configured') %]</p> 
     11<p class="alert">[% l('No choices are configured') %]</p> 
    1212[% ELSE %] 
    1313[% FOREACH choicek = poll.choices_keys %] 

  • trunk/root/templates/admin/delete.tt

    r296 r323  
    88<p>[% l('Delete ballots') %]</p> 
    99 
    10 <p>[% l('This will delete sensible data from database, results will be computed 
    11 definitively. Notice voting people will not be able to check ballots anymore') 
     10<p>[% l('This will delete sensitive data from database and results will be finally 
     11computed. Note that voters won\'t be able to check their ballots anymore') 
    1212%]</p> 
    1313 
    … …  
    2222<p>[% l('Delete this poll') %]</p> 
    2323 
    24 <p>[% l('This will definitely delete all data about this poll (configuration, 
    25 voting list, ballots.') %]</p> 
     24<p>[% l('This will completely delete all data about this poll (configuration, 
     25list of voters, ballots.') %]</p> 
    2626 
    2727<form action="[% c.uri_for(poll.uid, 'delete') %]" method="post"> 

  • trunk/root/templates/admin/delete_poll_confirm.tt

    r282 r323  
    99 
    1010<form action="[% c.uri_for(poll.uid, 'delete') %]" method="post"> 
    11 <input type="submit" value="[% l('Yes, destroy this poll') %]" name="delete_poll_confirm"> 
     11<input type="submit" value="[% l('Yes, delete this poll') %]" name="delete_poll_confirm"> 
    1212</form> 

  • trunk/root/templates/admin/denied.tt

    r282 r323  
    22 
    33<div class="alert"> 
    4 <p>[% l('Cannot modify a started or finish poll') %]</p> 
     4<p>[% l('Cannot modify a running or a finished poll') %]</p> 
    55</div> 

  • trunk/root/templates/admin/includes/poll_extra_settings.tt

    r282 r323  
    22 
    33<ul> 
    4   <li>[% l('Do not send receipt by mail') %] 
     4  <li>[% l('Don\'t send receipt by email') %] 
    55    <span style="float:right"><input type="checkbox" name="no_mail_confirm_vote" 
    66[% "checked" IF pollsettings.no_mail_confirm_vote %]></span> 
    77[% IF NOT pollsettings.no_mail_confirm_vote %] 
    88  <ul> 
    9     <li style="clear: both">[% l('Mail include ballot id') %] 
     9    <li style="clear: both">[% l('Email includes ballot id') %] 
    1010      <span style="float:right"><input type="checkbox" name="no_mail_ballot_id" 
    1111[% "checked" IF pollsettings.no_mail_ballot_id %]></span> 
    … …  
    1414[% END %] 
    1515  </li> 
    16   <li style="clear: both">[% l('Do not give ballot id after poll') %] 
     16  <li style="clear: both">[% l('Don\'t show ballot id after poll') %] 
    1717    <span style="float:right"><input type="checkbox" name="no_ballot_id_voting" 
    1818[% "checked" IF pollsettings.no_ballot_id_voting %]></span> 

  • trunk/root/templates/admin/includes/poll_settings.tt

    r296 r323  
    4141<hr> 
    4242<form action="[% c.uri_for(poll.uid) %]" method="POST"> 
    43 <input type="submit" name="notcrypted" value="[% l('Do not crypt ballot') %]"> 
     43<input type="submit" name="notcrypted" value="[% l('Don\'t encrypt ballot') %]"> 
    4444</form> 
    4545[% ELSE %] 
    … …  
    4747[% l('You can choose a passphrase to protect the key:') %]<br> 
    4848<input type="password" name="passphrase"><br> 
    49 <input type="submit" name="encrypted" value="[% l('crypt the poll') %]"> 
     49<input type="submit" name="encrypted" value="[% l('encrypt the poll') %]"> 
    5050</form> 
    5151[% END %] 

  • trunk/root/templates/admin/validate.tt

    r319 r323  
    1010<select name="ballotvalue"> 
    1111<option value="s:needvalid"[% " selected" IF c.req.param('ballotvalue') == 
    12 's:needvalid' %]>[% l('needing validation') %]</option> 
     12's:needvalid' %]>[% l('need validation') %]</option> 
    1313<option value="s:invalid"[% " selected" IF c.req.param('ballotvalue') == 
    1414's:invalid' %]>[% l('invalid') %]</option> 
    … …  
    5454'0' %]>[% l('is valid') %]<br> 
    5555<input type="radio" name="[% bid %]" value="invalid"[% " checked" IF invalid == 
    56 '1' %]>[% l('is not valid') %]<br> 
     56'1' %]>[% l('isn\'t valid') %]<br> 
    5757</td> 
    5858</tr> 
    … …  
    8080<p>[% l('map ballot value') %]</p> 
    8181<table border="1"> 
    82 <tr><th>[% l('input value') %]</th><th>[% l('must be see as') %]</th></tr> 
     82<tr><th>[% l('input value') %]</th><th>[% l('must be seen as') %]</th></tr> 
    8383[% END %] 
    8484<tr> 

  • trunk/root/templates/admin/voters.tt

    r321 r323  
    66[% IF poll.status() != 'AFTER' %] 
    77<div style="float: left; width: 30%;" class="box"> 
    8 <p>[% l('add a voting') %]</p> 
     8<p>[% l('add a vote') %]</p> 
    99<form action="[% c.uri_for(poll.uid, 'voters') %]" method="POST"> 
    1010[% l('Name:') _ ' ' %]<input type="text" name="id"><br> 
    11 [% l('Mail:') _ ' ' %]<input type="text" name="mail"><br> 
     11[% l('Email address:') _ ' ' %]<input type="text" name="mail"><br> 
    1212<input type="submit" value="[% l('Add') %]"> 
    1313</form> 
    … …  
    2121 
    2222[% IF poll.status == 'BEFORE' %] 
    23 <input type="checkbox" name="delete">[% l('delete voters list') %]<br> 
     23<input type="checkbox" name="delete">[% l('delete the list of voters') %]<br> 
    2424[% END %] 
    2525<input type="submit" value="[% l('Add') %]"> 
    … …  
    2828<p>[% l('Send password to voters') %]</p> 
    2929<form action="[% c.uri_for(poll.uid, 'voters') %]" method="POST"> 
    30 [% l('Mail language') %]: [% INCLUDE 'includes/locale_select.tt' %]<br> 
     30[% l('Email language') %]: [% INCLUDE 'includes/locale_select.tt' %]<br> 
    3131<input type="submit" name="mailpasswd" value="[% l('send password') %]"> 
    3232</form> 
    … …  
    3838 
    3939[% IF NOT poll.voting_count %] 
    40 <p class="alert">[% l('No subscribed voter') %]</p> 
     40<p class="alert">[% l('No subscribed voters') %]</p> 
    4141[% ELSE %] 
    4242 

  • trunk/root/templates/admin/votersimport.tt

    r319 r323  
    4646[% IF import_handle.can_authenticate %] 
    4747[% l('Use external authentication') %]<input type="checkbox" name="ext_auth"><br> 
    48 [% l('Enter here a comment to explain the password to use') %]<br> 
     48[% l('Enter a hint for the password here') %]<br> 
    4949<textarea rows="3" cols="50" name="desc"></textarea><br> 
    5050[% END %] 

  • trunk/root/templates/ballot/closed.tt

    r296 r323  
    88Ce Vote n'est pas encore ouvert 
    99[% ELSIF poll.status == 'AFTER' %] 
    10 [% l('This poll is over, results are available') %] 
     10[% l('This poll is over, results are now available') %] 
    1111<a href="[% c.uri_for('/vote', poll.uid) %]">[% l('here') %]</a>. 
    1212[% END %] 

  • trunk/root/templates/ballot/default.tt

    r283 r323  
    4040<hr> 
    4141 
    42 <p class="warning">[% l('Your vote will be definitive after validation') %]</p> 
     42<p class="warning">[% l('Your vote will be final after validation') %]</p> 
    4343<p><input type="submit" name="confirm" value="[% l('Valid') %]"> 
    4444<input type="submit" name="Modify" value="[% l('modify my vote') %]"></p> 
    … …  
    5353[% INCLUDE infoip %] 
    5454 
    55 <p>[% l('Your vote will be registered only after confirm') %]</p> 
     55<p>[% l('Your vote will be registered only after validation') %]</p> 
    5656[% END %] 
    5757</div> 

  • trunk/root/templates/ballot/done.tt

    r296 r323  
    55 
    66<div id="ballot" class="page_box"> 
    7 <p>[% l('You just submitted your ballot') %] 
     7<p>[% l('You\'ve just submitted your ballot') %] 
    88[% IF NOT poll.info.no_ballot_id_voting %] 
    99, [% l('your ballot id is:') _ ' ' %]<b>[% ballotid %]</b> 

  • trunk/root/templates/ballot/index.tt

    r227 r323  
    1313 
    1414[% ELSE %] 
    15 Pas de vote en cours 
     15[% l('No polls currently running') %] 
    1616[% END %] 

  • trunk/root/templates/ballot/signed.tt

    r296 r323  
    33 
    44<div id="vote_done"> 
    5 <p>[% mail | html %][% l('already participated to this poll the [_1]', signed_date) | html %]</p> 
     5<p>[% mail | html %][% l('already participated in this poll the [_1]', signed_date) | html %]</p> 
    66<p>[% l('Results will be available') _ ' ' %] 
    77<a href="[% c.uri_for('/vote', c.model('Vote').poll(voteid).uid) %]">[% l('here') %]</a>.</p> 

  • trunk/root/templates/default.tt

    r285 r323  
    55<form action="[% c.uri_for %]" method="POST"> 
    66[% IF novoting %] 
    7 <p class="warning">[% l('You own no poll') %] [% novoting | html %].</p> 
     7<p class="warning">[% l('You don\'t own any polls') %] [% novoting | html %].</p> 
    88[% END %] 
    99[% IF sendvoting %] 
    10 [% l('A mail has been sent to [_1]', sendvoting) %] 
     10[% l('An email has been sent to [_1]', sendvoting) %] 
    1111[% END %] 
    1212 

  • trunk/root/templates/importv/ldap.tt

    r318 r323  
    55[% l('UID attributes:') | html %] 
    66<input type="text" name="uid" value="[% c.req.param('uid') | html %]"><br> 
    7 [% l('Mail attributes:') | html %] 
     7[% l('Email attributes:') | html %] 
    88<input type="text" name="mail" value="[% c.req.param('mail') | html %]"><br> 
    99[% l('Display Name attributes:') | html %] 

  • trunk/root/templates/includes/poll.tt

    r291 r323  
    2020[% END %] 
    2121[% l('Participated') _ ' ' %] [% poll.signing_count %] / [% poll.voting_count %]<br> 
    22 [% l('Ballot:') _ ' ' %] [% poll.ballot_count %] 
     22[% l('Ballots:') _ ' ' %] [% poll.ballot_count %] 
    2323[% IF poll.signing_count != poll.ballot_count %] 
    2424<p class="alert"> 
    25 [% l('The number of ballot and people having voted differ') %] 
     25[% l('The number of ballots doesn\'t match the number of voters') %] 
    2626</p> 
    2727[% END %] 
    … …  
    3030[% IF loop.first %] 
    3131<div style="float: right; width: 20%; top: 0px;" class="box"> 
    32 <p>[% l('Ballot:') %]</p> 
     32<p>[% l('Ballots:') %]</p> 
    3333<ol style="padding-left:15px; margin:5px;"> 
    3434[% END %] 

  • trunk/root/templates/includes/poll_results.tt

    r319 r323  
    66<div id="results" class="box"> 
    77<div style="float: right"> 
    8 <p><a href="[% c.uri_for('/vote', poll.uid, 'results.pdf') %]">Résultat en PDF</a></p> 
    9 <p><a href="[% c.uri_for('/vote', poll.uid, 'report.pdf') %]">Rapport en PDF</a></p> 
     8<p><a href="[% c.uri_for('/vote', poll.uid, 'results.pdf') %]">Result in PDF</a></p> 
     9<p><a href="[% c.uri_for('/vote', poll.uid, 'report.pdf') %]">Report in PDF</a></p> 
    1010</div> 
    1111[% IF poll.list_ballot_needvalid.size %] 
    1212<p>[% l('Temporary results') %]</p> 
    13 <p class="alert">[% l('Poll administrator must validate some ballot') %]</p> 
     13<p class="alert">[% l('Poll administrator must validate some ballots') %]</p> 
    1414[% ELSE %] 
    1515<p>[% l('Results:') %]</p> 
    1616[% END %] 
    17 <p>[% l('Number of choice to retain:') _ ' ' %][% poll.info('choice_count') %]</p> 
     17<p>[% l('Number of choices to retain:') _ ' ' %][% poll.info('choice_count') %]</p> 
    1818 
    1919<table border="1"> 
    … …  
    2828    <td></td></tr> 
    2929<tr> 
    30     <td>[% l('Number of empty ballot') %]</td> 
     30    <td>[% l('Number of empty ballots') %]</td> 
    3131    <td>[% poll.empty_ballot_count %]</td> 
    3232    <td>[% poll.empty_ballot_count / poll.ballot_count * 100 | format('%.2f %%') IF poll.ballot_count %]</td> 
    3333</tr> 
    3434<tr> 
    35     <td>[% l('Number of nul ballot') %]</td> 
     35    <td>[% l('Number of null ballots') %]</td> 
    3636    <td>[% poll.invalid_ballot_count %]</td> 
    3737    <td>[% poll.invalid_ballot_count / poll.ballots_count * 100 | format('%.2f %%') IF poll.ballots_count %]</td> 
    … …  
    4545[% IF loop.first %] 
    4646<div id="ballot_list" class="box"> 
    47 <p>[% l('Ballot list:') %]</p> 
     47<p>[% l('Ballots list:') %]</p> 
    4848<table border="1"> 
    4949<tr><th>[% l('number') %]</th><th>[% l('Id') %]</th> 
    … …  
    7474[% invalid = '#' _ poll.ballot(id).info.invalid %] 
    7575[% IF invalid == '#1' %] 
    76 <span class="alert">[% l('invalided') %]</span> 
     76<span class="alert">[% l('invalid') %]</span> 
    7777[% ELSIF invalid  == '#' %] 
    7878<i>[% l('must be validated') %]</i> 
    … …  
    8888[% ELSE %][% # can show result %] 
    8989<div class="page_box"> 
    90 <p>[% l('Results are not yet published') %]<p> 
     90<p>[% l('Results haven\'t been published yet') %]<p> 
    9191</div> 
    9292[% END %] 

  • trunk/root/templates/includes/signing_list.tt

    r284 r323  
    99[% IF loop.first %] 
    1010<div id="voting_list" class="box"> 
    11 <p>[% l('Voting list') %]</p> 
     11<p>[% l('List of voters') %]</p> 
    1212<table border="1"> 
    1313<tr><th>[% l('Number') %]</th><th>[% l('voting') %]</th> 

  • trunk/root/templates/newpoll/index.tt

    r307 r323  
    77<table border="0"> 
    88<tbody align="center"> 
    9 <tr><th>[% l('Your mail:') %]</th><td> 
     9<tr><th>[% l('Your email address:') %]</th><td> 
    1010  <input type="text" name="mail" value="[% c.req.param('mail') | html %]" tabindex="1" size="45" maxlength="150"> 
    1111</td></tr> 

  • trunk/root/templates/newpoll/norequest.tt

    r285 r323  
    44<p class="alert">[% l('No such request found') %]</p> 
    55 
    6 [% l('Enter the request ID received by mail') %] 
     6[% l('Enter the request ID you received by email') %] 
    77<form action="[% c.uri_for('/newpoll', 'confirm') %]" method="POST"> 
    88<input type="text" name="id"><br> 

  • trunk/root/templates/newpoll/request.tt

    r285 r323  
    22<div id="poll_request" class="box"> 
    33<p> 
    4 [% l('A mail has been sent to [_1], follow the procedure to complete poll 
     4[% l('An email has been sent to [_1], follow the instructions to complete poll 
    55creation', c.req.param('mail')) %]</p> 
    66 

  • trunk/root/templates/pollinc/binary/ballot.tt

    r319 r323  
    77 
    88[% FOREACH key = poll.choices() %] 
    9 [% "<p>Candidats:</p>" IF loop.first %] 
     9[% "<p>Candidates:</p>" IF loop.first %] 
    1010[% choice = poll.choice(key) %] 
    1111<input type="checkbox" name="sbal" value="[% key %]"[% " checked" IF sbal.$key %]> 
    … …  
    1717[% WHILE count < (poll.info('elected_choice') || 0) %] 
    1818[% IF count == 0 %] 
    19 <p>[% l('From voting list') %]</p> 
     19<p>[% l('From the list of voters') %]</p> 
    2020[% END %] 
    2121[% FOREACH vkey = poll.voting_keys %] 
    … …  
    3131[% END %] 
    3232[% ELSE %] 
    33 <p>[% l('No voter to show') %]</p> 
     33<p>[% l('No voters to show') %]</p> 
    3434[% END %] 
    3535 

  • trunk/root/templates/pollinc/binary/ballot_settings.tt

    r319 r323  
    44<table border=1> 
    55<tr> 
    6 <td>[% l('Number of possible choice:') %]</td> 
     6<td>[% l('Number of possible choices:') %]</td> 
    77<td><input type="text" size="3" name="choice_count" value="[% c.req.param('choice_count') || poll.info('choice_count') | html %]"></td> 
    88</tr> 
    99 
    1010<tr> 
    11 <td>[% l('Number of people to elect') %]<br> 
    12     ([% l('if different of number of choice') %]) 
     11<td>[% l('Possible number of people to elect') %]<br> 
     12    ([% l('if you want to vote for more than one person') %]) 
    1313</td> 
    1414<td><input type="text" size="3" name="elected_count" value="[% c.req.param('elected_count') || poll.raw_info('elected_count') | html %]"></td> 
    … …  
    2121 
    2222<tr> 
    23 <td>[% l('Number of people to elect, taken from voting list') %]</td> 
     23<td>[% l('Number of people to elect, taken from the list of voters') %]</td> 
    2424<td><input type="text" size="3" name="elected_choice" value="[% c.req.param('elected_choice') || poll.info('elected_choice') || 0 | html %]"></td> 
    2525</tr> 

  • trunk/root/templates/pollinc/binary/results.tt

    r319 r323  
    1414<table border="1"> 
    1515<tr><th>Score</th><th>[% l('Line n°') %]</th><th>[% l('choice') %]</th><th>[% 
    16 l('Number of voice') %]</th><th>[% l('%') %]</th><th></th></tr> 
     16l('Number of votes') %]</th><th>[% l('%') %]</th><th></th></tr> 
    1717[% END %] 
    1818 

  • trunk/root/templates/vote/default.tt

    r321 r323  
    1414[% CASE 'BEFORE' %] 
    1515<div class="page_box"> 
    16 <p>[% l('This poll is not opened yet') %]</p> 
     16<p>[% l('This poll is not open for voting yet') %]</p> 
    1717</div> 
    1818[% INCLUDE 'includes/signing_list.tt' %] 
Note: See TracChangeset for help on using the changeset viewer.