Using o80::i18n shortcut and cleaning

This commit is contained in:
Antonin 2016-05-02 11:53:47 +02:00
parent 69e9f656ce
commit fc235cefeb
3 changed files with 5 additions and 5 deletions

View File

@ -64,7 +64,7 @@ if (is_null($message)) {
$remainingTime = TIME_EDIT_LINK_EMAIL - (time() - $time);
if ($remainingTime > 0) {
$message = new Message('error', sprintf(__('EditLink', 'Please wait %d seconds before we can send an email to you then try again.'), $remainingTime));
$message = new Message('error', __f('EditLink', 'Please wait %d seconds before we can send an email to you then try again.', $remainingTime));
}
}
}
@ -78,7 +78,7 @@ if (is_null($message)) {
$smarty->assign('editedVoteUniqueId', $editedVoteUniqueId);
$body = $smarty->fetch('mail/remember_edit_link.tpl');
$subject = '[' . NOMAPPLICATION . ']['.__('EditLink', 'REMINDER').'] '.sprintf(__('EditLink', 'Edit link for poll "%s"'), $poll->title);
$subject = '[' . NOMAPPLICATION . ']['.__('EditLink', 'REMINDER').'] '.__f('EditLink', 'Edit link for poll "%s"', $poll->title);
//$mailService->send($email, $subject, $body);
$sessionService->remove("Common", SESSION_EDIT_LINK_TOKEN);
@ -92,7 +92,7 @@ if (is_null($message)) {
error_reporting(E_ALL & ~E_NOTICE);
$smarty->error_reporting = E_ALL & ~E_NOTICE;
$response = array('result' => $result, 'message' => $message, '$email'=> $email, '$subject'=>$subject, '$body'=>$body);
$response = array('result' => $result, 'message' => $message);
echo json_encode($response);

View File

@ -185,7 +185,7 @@
"The email address is not correct.": "Courriel incorrect.",
"REMINDER": "RAPPEL",
"Edit link for poll \"%s\"": "Lien d'édition du sondage \"%s\"",
"Please wait %d seconds before we can send an email to you then try again.": "Veuillez patienter encore %d seconds avant que nous puissions vous envoyer un email, puis réessayez.",
"Please wait %d seconds before we can send an email to you then try again.": "Veuillez patienter encore %d secondes avant que nous puissions vous envoyer un email, puis réessayez.",
"Here is the link for editing your vote:": "Voici le lien pour éditer votre vote :",
"Your reminder has been successfully sent!": "Votre rappel a été envoyé avec succès !"
},

View File

@ -1,6 +1,6 @@
<div class="well">
<form action="action/send_edit_link_by_email_action.php" method="POST" class="form-inline" id="send_edit_link_form">
<p>{__('EditLink', 'If you don't want to lose your personalized link, we can send it to your email.')}</p>
<p>{__('EditLink', "If you don't want to lose your personalized link, we can send it to your email.")}</p>
<input type="hidden" name="token" value="{$token}"/>
<input type="hidden" name="poll" value="{$poll_id}"/>
<input type="hidden" name="editedVoteUniqueId" value="{$editedVoteUniqueId}"/>