From 9b3fccfe03de476f7785c2a1db9d8e0dcec2c489 Mon Sep 17 00:00:00 2001 From: Juanjo Menent <jmenent@2byte.es> Date: Tue, 11 Jan 2011 17:20:53 +0000 Subject: [PATCH] Withdrawals: Refused message translation --- .../prelevement/class/rejet-prelevement.class.php | 14 ++++++++------ htdocs/langs/ca_ES/withdrawals.lang | 2 ++ htdocs/langs/en_US/withdrawals.lang | 2 ++ htdocs/langs/es_AR/withdrawals.lang | 2 ++ htdocs/langs/es_ES/withdrawals.lang | 2 ++ htdocs/langs/fr_FR/withdrawals.lang | 2 ++ 6 files changed, 18 insertions(+), 6 deletions(-) diff --git a/htdocs/compta/prelevement/class/rejet-prelevement.class.php b/htdocs/compta/prelevement/class/rejet-prelevement.class.php index 87a00dc23f1..9fed2471a2f 100644 --- a/htdocs/compta/prelevement/class/rejet-prelevement.class.php +++ b/htdocs/compta/prelevement/class/rejet-prelevement.class.php @@ -214,7 +214,7 @@ class RejetPrelevement require_once(DOL_DOCUMENT_ROOT."/lib/CMailFile.class.php"); - $subject = "Prelevement rejete"; + $subject = $langs->trans("InfoRejectSubject"); $sendto = $emuser->getFullName($langs)." <".$emuser->email.">"; $from = $this->user->getFullName($langs)." <".$this->user->email.">"; $msgishtml=0; @@ -222,11 +222,13 @@ class RejetPrelevement $arr_file = array(); $arr_mime = array(); $arr_name = array(); - - $message = "Bonjour,\n"; - $message .= "\nLe prelevement de la facture ".$fac->ref." pour le compte de la societe ".$soc->nom." d'un montant de ".price($fac->total_ttc)." a ete rejete par la banque."; - $message .= "\n\n--\n".$this->user->getFullName($langs); - + $facref = $fac->ref; + $socname = $soc->nom; + $amount = price($fac->total_ttc); + $userinfo = $this->user->getFullName($langs); + + $message = $langs->trans("InfoRejectMessage",$facref,$socname, $amount, $userinfo); + $mailfile = new CMailFile($subject,$sendto,$from,$message, $arr_file,$arr_mime,$arr_name, '', '', 0, $msgishtml,$this->user->email); diff --git a/htdocs/langs/ca_ES/withdrawals.lang b/htdocs/langs/ca_ES/withdrawals.lang index 00bddf2f1b7..1cef93d8acd 100644 --- a/htdocs/langs/ca_ES/withdrawals.lang +++ b/htdocs/langs/ca_ES/withdrawals.lang @@ -86,4 +86,6 @@ InfoTransSubject=Enviament de domiciliació %s al banc InfoTransMessage=L'ordre de domiciliació %s ha estat enviada al banc per %s %s.<br><br> InfoTransData=Import: %s<br>Mètode: %s<br>Data: %s InfoFoot=Aquest és un missatge automàtic enviat per Dolibarr +InfoRejectSubject=Domiciliació tornada +InfoRejectMessage=Bon dia,<br><br>la domiciliació de la factura %s per compte de l'empresa %s, amb un import de %s ha estat retornada pel banc.<br><br>--<br>%$ ModeWarning=No s'ha establert l'opció de treball en real, ens aturarem després d'aquesta simulació \ No newline at end of file diff --git a/htdocs/langs/en_US/withdrawals.lang b/htdocs/langs/en_US/withdrawals.lang index 2a54741a421..bb640f4c5a6 100755 --- a/htdocs/langs/en_US/withdrawals.lang +++ b/htdocs/langs/en_US/withdrawals.lang @@ -86,4 +86,6 @@ InfoTransSubject=Transmission of standing order %s to bank InfoTransMessage=The standing order %s has been transmited to bank by %s %s.<br><br> InfoTransData=Amount: %s<br>Metode: %s<br>Date: %s InfoFoot=This is an automated message sent by Dolibarr +InfoRejectSubject=Standing order refused +InfoRejectMessage=Hello,<br><br>the standig order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%$ ModeWarning=Option for real mode was not set, we stop after this simulation \ No newline at end of file diff --git a/htdocs/langs/es_AR/withdrawals.lang b/htdocs/langs/es_AR/withdrawals.lang index 7aefd20ea54..433315abf95 100755 --- a/htdocs/langs/es_AR/withdrawals.lang +++ b/htdocs/langs/es_AR/withdrawals.lang @@ -86,4 +86,6 @@ InfoTransSubject=Envío de domiciliación %s al banco InfoTransMessage=La orden de domiciliación %s ha sido enviada al banco por %s %s.<br><br> InfoTransData=Importe: %s<br>Método: %s<br>Fecha: %s InfoFoot=Este es un mensaje automático enviado por Dolibarr +InfoRejectSubject=Domiciliación devuelta +InfoRejectMessage=Buenos días,<br><br>la domiciliación de la factura %s por cuenta de la empresa %s, con un importe de %s ha sido devuelta por el banco.<br><br>--<br>%$ ModeWarning=No se ha establecido la opción de modo real, nos detendremos después de esta simulación \ No newline at end of file diff --git a/htdocs/langs/es_ES/withdrawals.lang b/htdocs/langs/es_ES/withdrawals.lang index e14a35b7529..c0bb89fb341 100644 --- a/htdocs/langs/es_ES/withdrawals.lang +++ b/htdocs/langs/es_ES/withdrawals.lang @@ -86,4 +86,6 @@ InfoTransSubject=Envío de domiciliación %s al banco InfoTransMessage=La orden de domiciliación %s ha sido enviada al banco por %s %s.<br><br> InfoTransData=Importe: %s<br>Método: %s<br>Fecha: %s InfoFoot=Este es un mensaje automático enviado por Dolibarr +InfoRejectSubject=Domiciliación devuelta +InfoRejectMessage=Buenos días,<br><br>la domiciliación de la factura %s por cuenta de la empresa %s, con un importe de %s ha sido devuelta por el banco.<br><br>--<br>%$ ModeWarning=No se ha establecido la opción de modo real, nos detendremos después de esta simulación \ No newline at end of file diff --git a/htdocs/langs/fr_FR/withdrawals.lang b/htdocs/langs/fr_FR/withdrawals.lang index 29636bdeec0..b434b7f6f96 100755 --- a/htdocs/langs/fr_FR/withdrawals.lang +++ b/htdocs/langs/fr_FR/withdrawals.lang @@ -86,4 +86,6 @@ InfoTransSubject=Transmission du prélèvement %s a la banque InfoTransMessage=Le bon de prélèvement %s a eté transmis a la banque par %s %s.<br><br> InfoTransData=Montant: %s<br>Methode: %s<br>Date: %s InfoFoot=Ceci est un message automatique envoye par Dolibarr +InfoRejectSubject=Prélèvement rejeté +InfoRejectMessage=Bonjour,<br><br>Le prelevement de la facture %s pour le compte de la societé %s, d'un montant de %s a été rejeté par la banque.<br><br>--<br>%$ ModeWarning=Option mode réel non établi, nous allons arrêter après cette simulation \ No newline at end of file -- GitLab