Updated email tempaltes

rbolliger · Jun 23, 2012 · 8664cf5 · 8664cf5
1 parent 9662e41
commit 8664cf5
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 11 deletions.
diff --git a/i18n/apostrophe.fr.xml b/i18n/apostrophe.fr.xml
@@ -194,6 +194,30 @@
                 <source>Answers count</source>
                 <target>N. réponses</target>
             </trans-unit>
+            <trans-unit>
+                <source>Poll "%name%": new user submission</source>
+                <target>Sondage "%name%": nouvelle soumission</target>
+            </trans-unit>
+            <trans-unit>
+                <source>To administer the poll, click %url%</source>
+                <target>Pour gérer le sondage, cliquez %url%</target>
+            </trans-unit>
+            <trans-unit>
+                <source>To see the answer, click %url%</source>
+                <target>Pour consulter la réponse, cliquez %url%</target>
+            </trans-unit>
+            <trans-unit>
+                <source>New Poll submission</source>
+                <target>Nouvelle soumission pour le sondage</target>
+            </trans-unit>
+            <trans-unit>
+                <source>Poll "%name%" has a new submission from IP address %ip% at %date%</source>
+                <target>Le sondage "%name%" a été soumis depuis l'adresse IP %ip% le %date%</target>
+            </trans-unit>
+            <trans-unit>
+                <source>here</source>
+                <target>ici</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
diff --git a/modules/aPollSlot/templates/_email_body.php b/modules/aPollSlot/templates/_email_body.php
@@ -1,23 +1,20 @@
-<?php use_helper('a'); ?>
+<?php use_helper('a','Date'); ?>
 
 <h1><?php echo a_('New Poll submission'); ?></h1>
 
 <p>
 <?php
 
-echo a_('Poll "name" has a new submission from IP address ip at date', array(
-    'name' => $poll->getTitle(),
-    'ip' => $answer->getRemoteAddress(),
-    'date' => $answer->getCreatedAt(),
+echo a_('Poll "%name%" has a new submission from IP address %ip% at %date%', array(
+    '%name%' => $poll->getTitle(),
+    '%ip%' => $answer->getRemoteAddress(),
+    '%date%' => format_date($answer->getCreatedAt()),
 ));
 ?>
 </p>
 
+<p><?php echo a_('To administer the poll, click %url%', array('%url%' => link_to(a_('here'),url_for('@a_poll_poll_admin',array('absolute' => true))))); ?></p>
 
-<p><?php echo a_('To have a look at the submitted values, click here.'); ?></p>
-
-<p><?php echo a_('To administer the poll, click url', array('url' => link_to('here',url_for('@a_poll_poll_admin',array('absolute' => true))))); ?></p>
-
-<p><?php echo a_('To see the answer, click url', array('url' => link_to('here',url_for('@a_poll_answer_admin_show?id='.$answer->getId(),array('absolute' => true))))); ?></p>
+<p><?php echo a_('To see the answer, click %url%', array('%url%' => link_to(a_('here'),url_for('@a_poll_answer_admin_show?id='.$answer->getId(),array('absolute' => true))))); ?></p>
 
 
diff --git a/modules/aPollSlot/templates/_email_title.php b/modules/aPollSlot/templates/_email_title.php
@@ -1,3 +1,3 @@
 <?php use_helper('a'); ?>
 
-<?php echo a_('Poll "name": new user submission',array('name' => $poll->getTitle())); ?>
+<?php echo a_('Poll "%name%": new user submission',array('%name%' => $poll->getTitle())); ?>