Changeset 284 for trunk

Timestamp:

12/19/09 15:19:12 (14 years ago)

Author:

nanardon

Message:

• translate 'includes' template

Location:

trunk

Files:

• lib/Epoll/I18N/fr.po (modified) (12 diffs)
• lib/Epoll/I18N/messages.pot (modified) (11 diffs)
• root/templates/includes/admin_menu.tt (modified) (1 diff)
• root/templates/includes/ballot_form.tt (modified) (3 diffs)
• root/templates/includes/header.tt (modified) (1 diff)
• root/templates/includes/poll.tt (modified) (2 diffs)
• root/templates/includes/poll_results.tt (modified) (6 diffs)
• root/templates/includes/poll_running.tt (modified) (1 diff)
• root/templates/includes/signing_list.tt (modified) (2 diffs)

trunk/lib/Epoll/I18N/fr.po

@@ -73 +73 @@
 msgstr "Août"
 
+#: root/templates/includes/admin_menu.tt:7
+msgid "Ballot"
+msgstr "Bulletins"
+
 #: root/templates/admin/denied.tt:4
 msgid "Cannot modify a started or finish poll"
@@ -85 +89 @@
 msgstr "Confirmez votre vote"
 
+#: root/templates/includes/header.tt:40
+msgid "Create a new poll"
+msgstr "Créer un nouveau vote"
+
 #: root/templates/admin/date.tt:112
 msgid "Date format is"
 msgstr "Le format des dates est"
 
+#: root/templates/includes/admin_menu.tt:11
+msgid "Dates"
+msgstr "Date:"
+
 #: root/templates/admin/date.tt:42
 msgid "Dec"
@@ -100 +112 @@
 msgid "Decrypt ballots"
 msgstr "Déchiffrer les bulletins"
+
+#: root/templates/includes/admin_menu.tt:17
+msgid "Delete"
+msgstr "Effacer"
 
 #: root/templates/admin/delete.tt:8
@@ -170 +186 @@
 "paraticiapte to this poll"
 msgstr ""
-"Login/mot de passe invalide, êtes vous autoriser\nà participer à ce vote"
+"Login/mot de passe invalide, êtes vous autoriser\n"
+"à participer à ce vote"
 
 #: root/templates/admin/date.tt:112
@@ -257 +274 @@
 msgstr "Novembre"
 
+#: root/templates/includes/signing_list.tt:13
+msgid "Number"
+msgstr "Nombre"
+
 #: root/templates/admin/ballot.tt:15
 msgid "Number of elected people"
@@ -302 +323 @@
 msgid "Poll end:"
 msgstr "Fin du vote:"
+
+#: root/templates/includes/poll_running.tt:3
+msgid "Poll is currently running"
+msgstr "Le vote est en cours"
 
 #: root/templates/admin/date.tt:115
@@ -387 +412 @@
 msgstr "valide"
 
+#: root/templates/includes/admin_menu.tt:14
+msgid "Validate"
+msgstr "Valider"
+
+#: root/templates/includes/admin_menu.tt:9
+msgid "Voting"
+msgstr "Votant"
+
+#: root/templates/includes/signing_list.tt:11
+msgid "Voting list"
+msgstr "Liste des votants"
+
 #: root/templates/includes/header.tt:28
 msgid "Web voting system"
 msgstr "SystÚme de vote en ligne"
+
+#: root/templates/includes/header.tt:39
+msgid "Welcome"
+msgstr "Acceuil"
 
 #: root/templates/admin/date.tt:47
@@ -408 +449 @@
 "(indépendement du bulletin)"
 
+#: root/templates/includes/poll_running.tt:4
+msgid "You can"
+msgstr "Vous pouvez"
+
 #: root/templates/admin/includes/poll_settings.tt:47
 msgid "You can choose a passphrase to protect the key:"
@@ -416 +461 @@
 msgstr "Vous venez de soumettre votre bulletin"
 
+#: root/templates/includes/header.tt:43
+msgid "Your poll:"
+msgstr "Votre vote:"
+
 #: root/templates/ballot/default.tt:42
 msgid "Your vote will be definitive after validation"
@@ -455 +504 @@
 msgid "format:"
 msgstr "format:"
+
+#: root/templates/includes/signing_list.tt:23
+msgid "has vote"
+msgstr "a voté"
 
 #: root/templates/ballot/closed.tt:11 root/templates/ballot/done.tt:17
@@ -513 +566 @@
 msgstr "envoyer les mots de passe"
 
+#: root/templates/includes/signing_list.tt:14
+msgid "sign"
+msgstr "émargement"
+
 #: root/templates/admin/date.tt:122 root/templates/admin/date.tt:131
 msgid "time:"
@@ -521 +578 @@
 msgstr "valide"
 
+#: root/templates/includes/poll_running.tt:5
+msgid "vote here"
+msgstr "voter ici"
+
+#: root/templates/includes/signing_list.tt:13
+msgid "voting"
+msgstr "votant"
+
 #: root/templates/ballot/done.tt:9
 msgid "your ballot id is:"

trunk/lib/Epoll/I18N/messages.pot

@@ -72 +72 @@
 msgstr ""
 
+#: root/templates/includes/admin_menu.tt:7
+msgid "Ballot"
+msgstr ""
+
 #: root/templates/admin/denied.tt:4
 msgid "Cannot modify a started or finish poll"
@@ -84 +88 @@
 msgstr ""
 
+#: root/templates/includes/header.tt:40
+msgid "Create a new poll"
+msgstr ""
+
 #: root/templates/admin/date.tt:112
 msgid "Date format is"
 msgstr ""
 
+#: root/templates/includes/admin_menu.tt:11
+msgid "Dates"
+msgstr ""
+
 #: root/templates/admin/date.tt:42
 msgid "Dec"
@@ -98 +110 @@
 #: root/templates/admin/includes/ballot_decrypt.tt:11
 msgid "Decrypt ballots"
+msgstr ""
+
+#: root/templates/includes/admin_menu.tt:17
+msgid "Delete"
 msgstr ""
 
@@ -254 +270 @@
 msgstr ""
 
+#: root/templates/includes/signing_list.tt:13
+msgid "Number"
+msgstr ""
+
 #: root/templates/admin/ballot.tt:15
 msgid "Number of elected people"
@@ -298 +318 @@
 #: root/templates/admin/date.tt:124
 msgid "Poll end:"
+msgstr ""
+
+#: root/templates/includes/poll_running.tt:3
+msgid "Poll is currently running"
 msgstr ""
 
@@ -376 +400 @@
 msgstr ""
 
+#: root/templates/includes/admin_menu.tt:14
+msgid "Validate"
+msgstr ""
+
+#: root/templates/includes/admin_menu.tt:9
+msgid "Voting"
+msgstr ""
+
+#: root/templates/includes/signing_list.tt:11
+msgid "Voting list"
+msgstr ""
+
 #: root/templates/includes/header.tt:28
 msgid "Web voting system"
+msgstr ""
+
+#: root/templates/includes/header.tt:39
+msgid "Welcome"
 msgstr ""
 
@@ -395 +435 @@
 msgstr ""
 
+#: root/templates/includes/poll_running.tt:4
+msgid "You can"
+msgstr ""
+
 #: root/templates/admin/includes/poll_settings.tt:47
 msgid "You can choose a passphrase to protect the key:"
@@ -403 +447 @@
 msgstr ""
 
+#: root/templates/includes/header.tt:43
+msgid "Your poll:"
+msgstr ""
+
 #: root/templates/ballot/default.tt:42
 msgid "Your vote will be definitive after validation"
@@ -443 +491 @@
 msgstr ""
 
+#: root/templates/includes/signing_list.tt:23
+msgid "has vote"
+msgstr ""
+
 #: root/templates/ballot/closed.tt:11 root/templates/ballot/done.tt:17 root/templates/ballot/signed.tt:7
 msgid "here"
@@ -499 +551 @@
 msgstr ""
 
+#: root/templates/includes/signing_list.tt:14
+msgid "sign"
+msgstr ""
+
 #: root/templates/admin/date.tt:122 root/templates/admin/date.tt:131
 msgid "time:"
@@ -507 +563 @@
 msgstr ""
 
+#: root/templates/includes/poll_running.tt:5
+msgid "vote here"
+msgstr ""
+
+#: root/templates/includes/signing_list.tt:13
+msgid "voting"
+msgstr ""
+
 #: root/templates/ballot/done.tt:9
 msgid "your ballot id is:"

trunk/root/templates/includes/admin_menu.tt

@@ -5 +5 @@
 <a href="[% c.uri_for('/admin', poll.uid) %]">[% poll.info.label | html %]</a>
 [% IF poll.status == 'BEFORE' %]
-:: <a href="[% c.uri_for('/admin', poll.uid, 'ballot') %]">Bulletins</a>
+:: <a href="[% c.uri_for('/admin', poll.uid, 'ballot') %]">[% l('Ballot') %]</a>
 [% END %]
-:: <a href="[% c.uri_for('/admin', poll.uid, 'voting') %]">Electeurs</a>
+:: <a href="[% c.uri_for('/admin', poll.uid, 'voting') %]">[% l('Voting') %]</a>
 [% IF poll.status == 'BEFORE' %]
-:: <a href="[% c.uri_for('/admin', poll.uid, 'date') %]">Dates</a>
+:: <a href="[% c.uri_for('/admin', poll.uid, 'date') %]">[% l('Dates') %]</a>
 [% END %]
 [% IF poll.status == 'AFTER' %]
-:: <a href="[% c.uri_for('/admin', poll.uid, 'validate') %]">Validation</a>
+:: <a href="[% c.uri_for('/admin', poll.uid, 'validate') %]">[% l('Validate') %]</a>
 [% END %]
 [% IF poll.status != 'RUNNING' %]
-:: <a href="[% c.uri_for('/admin', poll.uid, 'delete') %]">Effacer</a>
+:: <a href="[% c.uri_for('/admin', poll.uid, 'delete') %]">[% l('Delete') %]</a>
 [% END %]
 </div>

trunk/root/templates/includes/ballot_form.tt

@@ -23 +23 @@
 
 [% count = 0 %]
-[% "<p>Depuis la liste électorale:</p>" IF count == 0 %]
+[% "<p>[% l('From voting list') %]</p>" IF count == 0 %]
 [% IF poll.voting_keys.size %]
 [% WHILE count < (poll.info('elected_choice') || 0) %]
@@ -38 +38 @@
 [% END %]
 [% ELSE %]
-<p>Pas de votant à afficher</p>
+<p>[% l('No voting to show') %]</p>
 [% END %]
 
@@ -44 +44 @@
 [% count = 0 %]
 [% WHILE count < poll.info('free_choice') %]
-[% "<p>Choi(x) libre(s):</p>" IF count == 0 %]
+[% "<p>[% l('Free choice') %]</p>" IF count == 0 %]
 <input type="text" name="fsbal" value="[% fsbal.$count %]"><br>
 [% count = count + 1 %]
 [% END %]
 <br>
-<input type="submit" name="ballot" value="Voter &gt;&gt;">
+<input type="submit" name="ballot" value="[% l('Voter') _ ' ' %] &gt;&gt;">
 </form>
 <hr>
 <form action="[% b_form_url %]" method="POST">
-<input type="submit" name="ballot" value="Voter blanc &gt;&gt;">
+<input type="submit" name="ballot" value="[% l('Empty ballot') _ ' ' %] &gt;&gt;">
 </form>

trunk/root/templates/includes/header.tt

@@ -32 +32 @@
             <option>C</option>
             [% FOREACH lang = [ 'fr' ] %]
-            <option[% " selected" IF locale == l %]>[% lang | html %]</option>
+            <option[% " selected" IF locale == lang %]>[% lang | html %]</option>
             [% END %]
         </select><input type="submit">
         </form>
     <p id="menu" style="clear: both;">
-    <a href="[% c.uri_for('/') %]">Acceuil</a> ::
-    <a href="[% c.uri_for('/newpoll') %]">Créer un nouveau vote</a>
+    <a href="[% c.uri_for('/') %]">[% l('Welcome') %]</a> ::
+    <a href="[% c.uri_for('/newpoll') %]">[% l('Create a new poll') %]</a>
     [% IF voteid %]
     :: <a href="[% c.uri_for('/vote', c.model('Vote').poll(voteid).uid) %]">
-        Votre vote: [% c.model('Vote').poll(voteid).info('label') | truncate(40) | html %]
+        [% l('Your poll:') _ ' ' %][% c.model('Vote').poll(voteid).info('label') | truncate(40) | html %]
     </a>
     [% END %]

trunk/root/templates/includes/poll.tt

@@ -11 +11 @@
 <p>[% poll.info('procedure') | html | html_line_break %]</p>
 [% END %]
-<p>[% poll.info('choice_count') %] choix est/sont à faire
+<p>[% l('[_1] choice have to be done', poll.info('choice_count') %]
 [%- IF poll.info('choice_count') != poll.info('elected_count') -%]
-pour [% poll.info('elected_count') %] élu(s)[%- END -%].</p>
+[% l('for [_1] elected', poll.info('elected_count')) %][%- END -%].</p>
 [% IF poll.info('dstart') && poll.info('dend') %]
-<p>Scrutin ouvert du <b>[% poll.info('dstart') _ ' ' _ poll.info('hstart') | html %]</b> au
-<b>[% poll.info('dend') _ ' ' _ poll.info('hend') | html %]</b></p>
+<p>[% l('Poll open from <b>[_1] [_2]</b> to <b>[_3] [_4]</b>',
+poll.info('dstart'), poll.info('hstart'),
+poll.info('dend'), poll.info('hend') %]</p>
 [% END %]
-Ont voté: [% poll.signing_count %] / [% poll.voting_count %]<br>
-Bulletins: [% poll.ballot_count %]
+[% l('Participated') _ ' ' %] [% poll.signing_count %] / [% poll.voting_count %]<br>
+[% l('Ballot:') _ ' ' %] [% poll.ballot_count %]
 [% IF poll.signing_count != poll.ballot_count %]
-<p class="alert">Le nombre de bulletins et le nombre de personnes ayant voté divergent,
-suspicion de tricherie</p>
+<p class="alert">
+[% l('The number of ballot and people having voted differ') %]
+</p>
 [% END %]
 </div>
@@ -28 +30 @@
 [% IF loop.first %]
 <div style="float: right; width: 20%; top: 0px;" class="box">
-<p>Bulletin:</p>
+<p>[% l('Ballot:') %]</p>
 <ol style="padding-left:15px; margin:5px;">
 [% END %]

trunk/root/templates/includes/poll_results.tt

@@ -10 +10 @@
 </div>
 [% IF poll.list_ballot_needvalid.size %]
-<p>Resultats provisoires:</p>
-<p class="alert">Le gestionnaire doit vérifier la validité de certains bulletins</p>
+<p>[% l('Temporary results') %]</p>
+<p class="alert">[% l('Poll administrator must validate some ballot') %]</p>
 [% ELSE %]
-<p>Resultats:</p>
+<p>[% l('Results:') %]</p>
 [% END %]
-<p>Nombre de choix à retenir: [% poll.info('choice_count') %]</p>
+<p>[% l('Number of choice to retain:') _ ' ' %][% poll.info('choice_count') %]</p>
 
 <table border="1">
-<tr><td>Participation</td><td>[% poll.signing_count %]</td><td>[% poll.signing_count / poll.voting_count * 100 | format('%.2f %%') IF poll.voting_count %]</td></tr>
-<tr><td>Nombre de bulltetins</td><td>[% poll.ballot_count %]</td><td></td></tr>
-<tr><td>Nombre de bulltetins blanc</td><td>[% poll.empty_ballot_count %]</td><td>[% poll.empty_ballot_count / poll.ballot_count * 100 | format('%.2f %%') IF poll.ballot_count %]</td></tr>
-<tr><td>Nombre de bulltetins nuls</td><td>[% poll.invalid_ballot_count %]</td><td>[% poll.invalid_ballot_count / poll.ballot_count * 100 | format('%.2f %%') IF poll.ballot_count %]</td></tr>
-<tr><td>Nombre de voix exprimées</td><td>[% poll.voices_ballot_count %]</td><td>[% poll.voices_ballot_count / poll.ballot_count * 100 | format('%.2f %%') IF poll.ballot_count %]</td></tr>
+<tr><td>[% l('Participation' %]</td><td>[% poll.signing_count %]</td><td>[% poll.signing_count / poll.voting_count * 100 | format('%.2f %%') IF poll.voting_count %]</td></tr>
+<tr><td>[% l('Ballot Number') %]</td><td>[% poll.ballot_count %]</td><td></td></tr>
+<tr><td>[% l('Number of empty ballot') %]</td><td>[% poll.empty_ballot_count %]</td><td>[% poll.empty_ballot_count / poll.ballot_count * 100 | format('%.2f %%') IF poll.ballot_count %]</td></tr>
+<tr><td>[% l('Number of nul ballot') %]</td><td>[% poll.invalid_ballot_count %]</td><td>[% poll.invalid_ballot_count / poll.ballot_count * 100 | format('%.2f %%') IF poll.ballot_count %]</td></tr>
+<tr><td>[% l('Number of voices') %]</td><td>[% poll.voices_ballot_count %]</td><td>[% poll.voices_ballot_count / poll.ballot_count * 100 | format('%.2f %%') IF poll.ballot_count %]</td></tr>
 </table>
 
@@ -28 +28 @@
 [% FOREACH res = poll.results %]
 [% IF loop.first %]
-<p>Score:</p>
+<p>[% l('Score:') %]</p>
 <table border="1"><tr>
-<th>Légende:</th>
-<td class="majabs">Majorité Absolue</td>
-<td class="selected">Elus</td>
-<td class="notselected">Non élu</td>
+<th>[% l('Legend:') %]</th>
+<td class="majabs">[% l('Absolute Majority') %]</td>
+<td class="selected">[% l('Elected') %]</td>
+<td class="notselected">l('Not elected') %]</td>
 </tr></table><br>
 <table border="1">
-<tr><th>Score</th><th>Ligne N°</th><th>choix</th><th>Nb voix</th><th>%</th><th></th></tr>
+<tr><th>Score</th><th>[% l('Line n°') %]</th><th>[% l('choice') %]</th><th>[%
+l('Number of voice') %]</th><th>[% l('%') %]</th><th></th></tr>
 [% END %]
 
@@ -63 +64 @@
 [% END %]
 [% ELSE %]
-<p class="alert">Aucun suffrage exprimé.</p>
+<p class="alert">[% l('No results') %]</p>
 [% END %]
 </div>
@@ -70 +71 @@
 [% IF loop.first %]
 <div id="ballot_list" class="box">
-<p>Liste des bulletins:</p>
+<p>[% l('Ballot list:') %]</p>
 <table border="1">
-<tr><th>numéro</th><th>Id</th>
-<th>contenu (=> corrigé en)
+<tr><th>[% l('number') %]</th><th>[% l('Id') %]</th>
+<th>[% l('date (=> view as)') | html %]
 [% IF poll.info('free_choice') %]
-<br>(*: hors liste)
+<br>(*: [% l('not from list') %])
 [% END %]
-</th><th>remarque</th></tr>
+</th><th>[% l('comment') %]</th></tr>
 [% END %]
 <tr>
@@ -99 +100 @@
 [% invalid = '#' _ poll.ballot(id).info.invalid %]
 [% IF invalid == '#1' %]
-<span class="alert">Invalidé</span>
+<span class="alert">[% l('invalided') %]</span>
 [% ELSIF invalid  == '#' %]
-<i>doit être validé</i>
+<i>[% l('must be validated') %]</i>
 [% END %]
 </td>
@@ -113 +114 @@
 [% ELSE %][% # can show result %]
 <div class="page_box">
-<p>Les résultats ne sont pas encore publiés<p>
+<p>[% l('Results are not yet published') %]<p>
 </div>
 [% END %]

trunk/root/templates/includes/poll_running.tt

@@ -1 +1 @@
 <!-- $Id$ -->
 <div id="poll_running">
-<p>Le vote est actuellement en cours</p>
-<p>Vous pouvez: <a href="[% c.uri_for('/ballot', c.model('Vote').poll(voteid).uid) %]">Voter ici</a></li></p>
+<p>[% l('Poll is currently running') %]</p>
+<p>[% l('You can') _ ' ' %]<a href="[% c.uri_for('/ballot',
+c.model('Vote').poll(voteid).uid) %]">[% l('vote here') %]</a></li></p>
 </div>

trunk/root/templates/includes/signing_list.tt

@@ -9 +9 @@
 [% IF loop.first %]
 <div id="voting_list" class="box">
-<p>Liste des votants:</p>
+<p>[% l('Voting list') %]</p>
 <table border="1">
-<tr><th>Numéro</th><th>Electeur</th>
-[% IF poll_status != 'RUNNING' %]<th>Emargement</th>[% END %]
+<tr><th>[% l('Number') %]</th><th>[% l('voting') %]</th>
+[% IF poll_status != 'RUNNING' %]<th>[% l('sign') %]</th>[% END %]
 </tr>
 [% END %]
@@ -21 +21 @@
     [% "&lt;" IF voting.label %][% voting.mail | mail | html %][% "&gt;" IF voting.label %]
 </td>
-[% IF poll_status != 'RUNNING' %]<td>[% "A voté" IF voting.date %]</td>[% END %]
+[% IF poll_status != 'RUNNING' %]<td>[% l('has vote') IF voting.date %]</td>[% END %]
 </tr>
 [% IF loop.last %]