Changeset 364

Timestamp:

10/06/10 03:41:56 (14 years ago)

Author:

misc

Message:

• add some more strings to translations ( mainly web page titles, and email subjects )

Location:

trunk/lib/Epoll/Controller

Files:

• Admin.pm (modified) (8 diffs)
• Ajax.pm (modified) (1 diff)
• Ballot.pm (modified) (5 diffs)
• Newpoll.pm (modified) (3 diffs)
• Root.pm (modified) (1 diff)

trunk/lib/Epoll/Controller/Admin.pm

@@ -60 +60 @@
                 if ($poll->check_date_max($c->req->param('start'))) {
                     if (! $poll->check_date_max($c->req->param('end'), $c->req->param('start'))) {
-                        $c->stash->{dateerror} = "Le vote se termine avant de commencer";
+                        $c->stash->{dateerror} = $c->l('The vote finish before starting');
                         next;
                     }
                 } else {
-                    $c->stash->{dateerror} = "Le debut du vote doit être dans le futur";
+                    $c->stash->{dateerror} = $c->('The start of the vote must be in the future');
                     next;
                 }
             } elsif ($c->req->param('end') || $c->req->param('start')) {
-                $c->stash->{dateerror} = "Vous devez définir un debut et une fin";
+                $c->stash->{dateerror} =  $c->l('You must define a start and a end date');
                 next;
             }
@@ -161 +161 @@
     if (!$poll->auth_poll($password)) {
         $c->stash->{page}{title} = $poll->info('label') .
-            ': Login d\'administration';
+            $c->l(': Administrator login');
         $c->session->{'vpass' . $c->stash->{voteid}} = undef;
         $c->stash->{template} = 'admin/login.tt';
@@ -184 +184 @@
     $c->forward('auth') or return;
     $c->forward('modify_poll');
-    $c->stash->{page}{title} = $poll->info('label') . ': Administration';
+    $c->stash->{page}{title} = $poll->info('label') . ': ' . $c->l('Administration');
 }
 
@@ -218 +218 @@
                             From => $poll->info->{owner},
                             To => $voting->info->{mail},
-                            Subject => "Invitation à voter",
+                            Subject => $c->l("Voting invitation"),
                             mail => {
                                 voteid => $id,
@@ -231 +231 @@
     }
 
-    $c->stash->{page}{title} = $poll->info('label') . ': Administration, liste des electeurs';
+    $c->stash->{page}{title} = $poll->info('label') . ': ' . $c->l('Administration') . ', ' . $c->l('voters list');
 }
 
@@ -281 +281 @@
     $c->forward('auth') or return;
     $c->forward('modify_poll');
-    $c->stash->{page}{title} = $poll->info('label') . ': Administration, bulletin';
+    $c->stash->{page}{title} = $poll->info('label') . ': ' . $c->l('Administration') . ', '. $->l('ballots');
 }
 
@@ -296 +296 @@
     $c->forward('auth') or return;
     $c->forward('modify_poll');
-    $c->stash->{page}{title} = $poll->info('label') . ': Administration, Date';
+    $c->stash->{page}{title} = $poll->info('label') . ': ' . $c->l('Administration') . ', '. $c->l('Date');
 }
 
@@ -323 +323 @@
     $c->forward('auth') or return;
     $c->forward('modify_poll');
-    $c->stash->{page}{title} = $poll->info('label') . ': Administration: Validation';
+    $c->stash->{page}{title} = $poll->info('label') . ': ' . $c->l('Administration') . ', ' . $c->l('Validation');
 
     $c->forward('ballotfilter');

trunk/lib/Epoll/Controller/Ajax.pm

@@ -39 +39 @@
         if ($poll->check_date_max($start)) {
             if ($poll->check_date_max($end, $start)) {
-                $c->response->body('<input type="submit" name="polldate" value="Enregistrer">');
+                $c->response->body('<input type="submit" name="polldate" value="' . $c->l('Enregistrer') . '">');
             } else {
-                $c->response->body("Le vote se termine avant de commencer");
+
+                $c->response->body( $c->l('The vote finish before starting'));
             }
         } else {
-            $c->response->body("Le debut du vote doit être dans le futur");
+            $c->response->body( $c->('The start of the vote must be in the future'));
         }
     } else {
-        $c->response->body("Vous devez définir un debut et une fin");
+        $c->response->body( $c->l('You must define a start and a end date'));
     }
 }

trunk/lib/Epoll/Controller/Ballot.pm

@@ -49 +49 @@
 
     if (!$c->model('Vote')->poll($id)->auth_voting($mail, $password)) {
-        $c->stash->{page}{title} = $poll->info('label') . ': Login';
+        $c->stash->{page}{title} = $poll->info('label') . ': ' . $c->l('Login');
         $c->session->{$puid} = undef;
         $c->stash->{template} = 'ballot/login.tt';
@@ -64 +64 @@
     $c->session->{mypoll}{$puid} ||= 0;
 
-    $c->stash->{page}{title} = $poll->info('label') . ': Bulletin';
+    $c->stash->{page}{title} = $poll->info('label') . ': ' . $c->l('Bulletin');
 
     # login succeed, but those this user has already voted
@@ -101 +101 @@
     if (scalar(@ballot) > $poll->info('choice_count')) {
         $c->req->parameters->{'ballot'} = '';
-        $c->stash->{vote_error} = 'Seulement ' .
-            $poll->info('choice_count') . ' choix possible';
+        $c->stash->{vote_error} = $c->l('Only ') .
+            $poll->info('choice_count') . ' ' . $c->l('possible choices');
         return;
     }
@@ -114 +114 @@
         if (scalar(@twices)) {
             $c->req->parameters->{'ballot'} = '';
-            $c->stash->{vote_error} = 'Une ou plusieurs valeurs sont en double: ' .
+            $c->stash->{vote_error} = $c->l('One or more values are duplicated:') .
                 join(' ,', map { qq'"$_"' } @twices);
             return;
@@ -131 +131 @@
                 From => $mail,
                 To => $mail,
-                Subject => 'Confirmation de vote: ' . $poll->info('label'),
+                Subject => $c->l('Vote confirmation:') . $poll->info('label'),
                 mail => {
                     ballotid => $c->stash->{ballotid},

trunk/lib/Epoll/Controller/Newpoll.pm

@@ -31 +31 @@
     my ( $self, $c ) = @_;
 
-    $c->stash->{page}{title} = 'Créer un nouveau vote';
+    $c->stash->{page}{title} = $c->l('Create a new vote');
     if ($c->req->param('mail')) {
         if ($c->config->{newpollpasswd}) {
@@ -59 +59 @@
                 [ 'poll_request.tt', {
                     To => $c->req->param('mail'),
-                    Subject => "New poll request",
+                    Subject => $c->l("New poll request"),
                     mail => {
                         label => $c->req->param('label'),
@@ -79 +79 @@
 
     if (!$c->model('Vote')->poll_request_info($id)) {
-        $c->stash->{page}{title} = "Aucune requête de création de vote";
+        $c->stash->{page}{title} = $c->l("No vote creation request");
         $c->stash->{template} = 'newpoll/norequest.tt';
         return;
     }
 
-    $c->stash->{page}{title} = 'Confirmer la création d\'un nouveau vote';
+    $c->stash->{page}{title} = $c->l('Confirm new vote creation');
     if ($c->req->param('passwd')) {
         my $pid = $c->model('Vote')->poll_from_request($id, $c->req->param('passwd'));

trunk/lib/Epoll/Controller/Root.pm

@@ -48 +48 @@
                 [ 'poll_reminder_voting.tt', {
                     To => $c->req->param('mailvoting'),
-                    Subject => 'Poll request reminder',
+                    Subject => $c->l('Poll request reminder'),
                     mail => {
-                        label => 'Poll request reminder',
+                        label => $c->l('Poll request reminder'),
                         polls_owner => \@polls_owner,
                         polls_voting => \@polls_voting,