lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Internationalize invoice lines for new memberships

Browse Source
This commit is contained in:
Yoan Mollard 2022-06-27 00:27:00 +02:00
parent 3d00c065ae
commit 6053f3e5f8
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/langs/en_US/paypal.lang
View File

@ -34,3 +34,4 @@ ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions.
ValidationOfPaymentFailed=Validation of payment has failed ValidationOfPaymentFailed=Validation of payment has failed
CardOwner=Card holder CardOwner=Card holder
PayPalBalance=Paypal credit PayPalBalance=Paypal credit
OnlineSubscriptionPaymentLine=Online subscription recorded on %s<br>Paid via %s<br>Originating IP address: %s<br>Transaction ID: %s

9
htdocs/public/payment/paymentok.php
View File

@ -504,9 +504,13 @@ if ($ispaymentok) {
$datesubend = dol_time_plus_duree($datesubend, -1, 'd'); $datesubend = dol_time_plus_duree($datesubend, -1, 'd');
} }
// Set output language
$outputlangs = new Translate('', $conf);
$outputlangs->setDefaultLang(empty($object->thirdparty->default_lang) ? $mysoc->default_lang : $object->thirdparty->default_lang);
$paymentdate = $now; $paymentdate = $now;
$amount = $FinalPaymentAmt; $amount = $FinalPaymentAmt;
$label = 'Online subscription '.dol_print_date($now, 'standard').' using '.$paymentmethod.' from '.$ipaddress.' - Transaction ID = '.$TRANSACTIONID; $formatteddate = dol_print_date($paymentdate, 'dayhour', 'auto', $outputlangs);
$label = $langs->trans("OnlineSubscriptionPaymentLine", $formatteddate, $paymentmethod, $ipaddress, $TRANSACTIONID);
// Payment informations // Payment informations
$accountid = 0; $accountid = 0;
@ -693,9 +697,6 @@ if ($ispaymentok) {
// Send subscription email // Send subscription email
include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'; include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
$formmail = new FormMail($db); $formmail = new FormMail($db);
// Set output language
$outputlangs = new Translate('', $conf);
$outputlangs->setDefaultLang(empty($object->thirdparty->default_lang) ? $mysoc->default_lang : $object->thirdparty->default_lang);
// Load traductions files required by page // Load traductions files required by page
$outputlangs->loadLangs(array("main", "members")); $outputlangs->loadLangs(array("main", "members"));
// Get email content from template // Get email content from template