Changeset 301 for trunk

Timestamp:

04/07/10 08:48:52 (14 years ago)

Author:

nanardon

Message:

• fix english word in URL (voters)

Location:

trunk

Files:

• MANIFEST (modified) (2 diffs)
• lib/Epoll/Controller/Admin.pm (modified) (1 diff)
• lib/Epoll/I18N/fr.po (modified) (12 diffs)
• lib/Epoll/I18N/messages.pot (modified) (12 diffs)
• root/latex/includes/voters.tt (moved) (moved from trunk/root/latex/includes/voting.tt)
• root/latex/poll_report.tt (modified) (1 diff)
• root/templates/admin/voters.tt (moved) (moved from trunk/root/templates/admin/voting.tt)
• root/templates/includes/admin_menu.tt (modified) (1 diff)

trunk/MANIFEST

@@ -34 +34 @@
 root/latex/includes/header.tt
 root/latex/includes/info.tt
-root/latex/includes/voting.tt
+root/latex/includes/voters.tt
 root/latex/poll_report.tt
 root/latex/poll_results.tt
@@ -136 +136 @@
 root/templates/admin/login.tt
 root/templates/admin/validate.tt
-root/templates/admin/voting.tt
+root/templates/admin/voters.tt
 root/templates/ballot/closed.tt
 root/templates/ballot/default.tt

trunk/lib/Epoll/Controller/Admin.pm

@@ -221 +221 @@
 }
 
-sub voting: LocalRegex('^(\w+)/voting$') {
+sub voters: LocalRegex('^(\w+)/voters$') {
     my ($self, $c) = @_;
     ($c->stash->{voteid}) = @{ $c->req->snippets || [] };

trunk/lib/Epoll/I18N/fr.po

@@ -52 +52 @@
 msgstr "Accéder à l'administration du vote:"
 
-#: root/templates/admin/ballot.tt:53 root/templates/admin/voting.tt:12
-#: root/templates/admin/voting.tt:22
+#: root/templates/admin/ballot.tt:53 root/templates/admin/voters.tt:12
+#: root/templates/admin/voters.tt:22
 msgid "Add"
 msgstr "Ajouter"
@@ -205 +205 @@
 msgstr "Vendredi"
 
-#: root/templates/admin/voting.tt:15
+#: root/templates/admin/voters.tt:15
 msgid "From a csv file"
 msgstr "Depuis un fichier CSV"
@@ -249 +249 @@
 msgstr "Le mail inclus l'id des bulletins"
 
-#: root/templates/admin/voting.tt:11 root/templates/ballot/login.tt:13
+#: root/templates/admin/voters.tt:11 root/templates/ballot/login.tt:13
 msgid "Mail:"
 msgstr "Mail:"
@@ -278 +278 @@
 
 #: root/templates/admin/includes/poll_settings.tt:8
-#: root/templates/admin/voting.tt:10
+#: root/templates/admin/voters.tt:10
 msgid "Name:"
 msgstr "Nom:"
@@ -286 +286 @@
 msgstr "Aucun choix n'est configuré"
 
-#: root/templates/admin/voting.tt:36
+#: root/templates/admin/voters.tt:36
 msgid "No subscribed voter"
 msgstr "Pas de votants inscrits"
@@ -397 +397 @@
 msgstr "Samedi"
 
-#: root/templates/admin/voting.tt:25
+#: root/templates/admin/voters.tt:25
 msgid "Send password to voting people"
 msgstr "Envoyer les mots de passe aux votants"
@@ -483 +483 @@
 
 #: root/templates/includes/admin_menu.tt:9
-msgid "Voter"
+#, fuzzy
+msgid "Voters"
 msgstr "Votant"
 
@@ -555 +556 @@
 msgstr "Votre vote sera enregistré seulement aprÚs confirmation"
 
-#: root/templates/admin/voting.tt:8
+#: root/templates/admin/voters.tt:8
 msgid "add a voting"
 msgstr "ajouter un votant"
@@ -580 +581 @@
 msgstr "date:"
 
-#: root/templates/admin/ballot.tt:45 root/templates/admin/voting.tt:61
+#: root/templates/admin/ballot.tt:45 root/templates/admin/voters.tt:61
 msgid "delete"
 msgstr "effacer"
 
-#: root/templates/admin/voting.tt:20
+#: root/templates/admin/voters.tt:20
 msgid "delete voting list"
 msgstr "SystÚme de vote en ligne"
@@ -593 +594 @@
 msgstr "pour %1 à élire"
 
-#: root/templates/admin/voting.tt:16
+#: root/templates/admin/voters.tt:16
 msgid "format:"
 msgstr "format:"
@@ -646 +647 @@
 msgstr "necessitant une validation"
 
-#: root/templates/admin/voting.tt:56
+#: root/templates/admin/voters.tt:56
 msgid "password sent"
 msgstr "mot de passe envoyé"
@@ -654 +655 @@
 msgstr "enregistrer"
 
-#: root/templates/admin/voting.tt:27
+#: root/templates/admin/voters.tt:27
 msgid "send password"
 msgstr "envoyer les mots de passe"

trunk/lib/Epoll/I18N/messages.pot

@@ -51 +51 @@
 msgstr ""
 
-#: root/templates/admin/ballot.tt:53 root/templates/admin/voting.tt:12 root/templates/admin/voting.tt:22
+#: root/templates/admin/ballot.tt:53 root/templates/admin/voters.tt:12 root/templates/admin/voters.tt:22
 msgid "Add"
 msgstr ""
@@ -203 +203 @@
 msgstr ""
 
-#: root/templates/admin/voting.tt:15
+#: root/templates/admin/voters.tt:15
 msgid "From a csv file"
 msgstr ""
@@ -245 +245 @@
 msgstr ""
 
-#: root/templates/admin/voting.tt:11 root/templates/ballot/login.tt:13
+#: root/templates/admin/voters.tt:11 root/templates/ballot/login.tt:13
 msgid "Mail:"
 msgstr ""
@@ -273 +273 @@
 msgstr ""
 
-#: root/templates/admin/includes/poll_settings.tt:8 root/templates/admin/voting.tt:10
+#: root/templates/admin/includes/poll_settings.tt:8 root/templates/admin/voters.tt:10
 msgid "Name:"
 msgstr ""
@@ -281 +281 @@
 msgstr ""
 
-#: root/templates/admin/voting.tt:36
+#: root/templates/admin/voters.tt:36
 msgid "No subscribed voter"
 msgstr ""
@@ -392 +392 @@
 msgstr ""
 
-#: root/templates/admin/voting.tt:25
+#: root/templates/admin/voters.tt:25
 msgid "Send password to voting people"
 msgstr ""
@@ -469 +469 @@
 
 #: root/templates/includes/admin_menu.tt:9
-msgid "Voter"
+msgid "Voters"
 msgstr ""
 
@@ -539 +539 @@
 msgstr ""
 
-#: root/templates/admin/voting.tt:8
+#: root/templates/admin/voters.tt:8
 msgid "add a voting"
 msgstr ""
@@ -564 +564 @@
 msgstr ""
 
-#: root/templates/admin/ballot.tt:45 root/templates/admin/voting.tt:61
+#: root/templates/admin/ballot.tt:45 root/templates/admin/voters.tt:61
 msgid "delete"
 msgstr ""
 
-#: root/templates/admin/voting.tt:20
+#: root/templates/admin/voters.tt:20
 msgid "delete voting list"
 msgstr ""
@@ -577 +577 @@
 msgstr ""
 
-#: root/templates/admin/voting.tt:16
+#: root/templates/admin/voters.tt:16
 msgid "format:"
 msgstr ""
@@ -629 +629 @@
 msgstr ""
 
-#: root/templates/admin/voting.tt:56
+#: root/templates/admin/voters.tt:56
 msgid "password sent"
 msgstr ""
@@ -637 +637 @@
 msgstr ""
 
-#: root/templates/admin/voting.tt:27
+#: root/templates/admin/voters.tt:27
 msgid "send password"
 msgstr ""

trunk/root/latex/poll_report.tt

@@ -11 +11 @@
 \section{Données du vote}
 
-[% INCLUDE 'includes/voting.tt' %]
+[% INCLUDE 'includes/voters.tt' %]
 
 [% INCLUDE 'includes/ballot.tt' %]

trunk/root/templates/includes/admin_menu.tt

@@ -7 +7 @@
 :: <a href="[% c.uri_for('/admin', poll.uid, 'ballot') %]">[% l('Ballot') %]</a>
 [% END %]
-:: <a href="[% c.uri_for('/admin', poll.uid, 'voting') %]">[% l('Voter') %]</a>
+:: <a href="[% c.uri_for('/admin', poll.uid, 'voters') %]">[% l('Voters') %]</a>
 [% IF poll.status == 'BEFORE' %]
 :: <a href="[% c.uri_for('/admin', poll.uid, 'date') %]">[% l('Dates') %]</a>