Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-08 18:04:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

Bug fixes

Browse Source
This commit is contained in:
Hillel Coren 2014-04-06 12:21:59 +03:00
parent 6710eba329
commit 7fd844de31
8 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/lang/de/texts.php
View File

@ -252,7 +252,6 @@ return array(
'confirmation_subject' => 'Invoice Ninja Konto Bestätigung', 'confirmation_subject' => 'Invoice Ninja Konto Bestätigung',
'confirmation_header' => 'Konto Bestätigung', 'confirmation_header' => 'Konto Bestätigung',
'confirmation_message' => 'Bitte klicke auf den folgenden Link um dein Konto zu bestätigen.', 'confirmation_message' => 'Bitte klicke auf den folgenden Link um dein Konto zu bestätigen.',
'invoice_subject' => 'Neue Rechnung :invoice',
'invoice_message' => 'Um Ihre Rechnung über :amount einzusehen, klicken Sie bitte auf den folgenden Link.', 'invoice_message' => 'Um Ihre Rechnung über :amount einzusehen, klicken Sie bitte auf den folgenden Link.',
'payment_subject' => 'Zahlungseingang :invoice', 'payment_subject' => 'Zahlungseingang :invoice',
'payment_message' => 'Vielen Dank für Ihre Zahlung von :amount.', 'payment_message' => 'Vielen Dank für Ihre Zahlung von :amount.',
@ -303,6 +302,8 @@ return array(
'success' => 'Success', 'success' => 'Success',
'success_message' => 'You have succesfully registered. Please visit the link in the account confirmation email to verify your email address.', 'success_message' => 'You have succesfully registered. Please visit the link in the account confirmation email to verify your email address.',
'erase_data' => 'This will permanently erase your data.', 'erase_data' => 'This will permanently erase your data.',
'password' => 'Password',
'invoice_subject' => 'New invoice from :account',
); );

4
app/lang/en/texts.php
View File

@ -252,7 +252,7 @@ return array(
'confirmation_subject' => 'Invoice Ninja Account Confirmation', 'confirmation_subject' => 'Invoice Ninja Account Confirmation',
'confirmation_header' => 'Account Confirmation', 'confirmation_header' => 'Account Confirmation',
'confirmation_message' => 'Please access the link below to confirm your account.', 'confirmation_message' => 'Please access the link below to confirm your account.',
'invoice_subject' => 'New invoice :invoice', 'invoice_subject' => 'New invoice from :account',
'invoice_message' => 'To view your invoice for :amount, click the link below.', 'invoice_message' => 'To view your invoice for :amount, click the link below.',
'payment_subject' => 'Payment Received :invoice', 'payment_subject' => 'Payment Received :invoice',
'payment_message' => 'Thank you for your payment of :amount.', 'payment_message' => 'Thank you for your payment of :amount.',
@ -303,7 +303,7 @@ return array(
'success' => 'Success', 'success' => 'Success',
'success_message' => 'You have succesfully registered. Please visit the link in the account confirmation email to verify your email address.', 'success_message' => 'You have succesfully registered. Please visit the link in the account confirmation email to verify your email address.',
'erase_data' => 'This will permanently erase your data.', 'erase_data' => 'This will permanently erase your data.',
'password' => 'Password',
); );

4
app/lang/es/texts.php
View File

@ -251,7 +251,7 @@ return array(
'confirmation_subject' => 'Invoice Ninja Account Confirmation', 'confirmation_subject' => 'Invoice Ninja Account Confirmation',
'confirmation_header' => 'Account Confirmation', 'confirmation_header' => 'Account Confirmation',
'confirmation_message' => 'Please access the link below to confirm your account.', 'confirmation_message' => 'Please access the link below to confirm your account.',
'invoice_subject' => 'New invoice :invoice', 'invoice_subject' => 'New invoice from :account',
'invoice_message' => 'To view your invoice for :amount, click the link below.', 'invoice_message' => 'To view your invoice for :amount, click the link below.',
'payment_subject' => 'Payment Received :invoice', 'payment_subject' => 'Payment Received :invoice',
'payment_message' => 'Thank you for your payment of :amount.', 'payment_message' => 'Thank you for your payment of :amount.',
@ -302,7 +302,7 @@ return array(
'success' => 'Success', 'success' => 'Success',
'success_message' => 'You have succesfully registered. Please visit the link in the account confirmation email to verify your email address.', 'success_message' => 'You have succesfully registered. Please visit the link in the account confirmation email to verify your email address.',
'erase_data' => 'This will permanently erase your data.', 'erase_data' => 'This will permanently erase your data.',
'password' => 'Password',
); );

4
app/lang/fr/texts.php
View File

@ -252,7 +252,7 @@ return array(
'confirmation_subject' => 'Invoice Ninja Account Confirmation', 'confirmation_subject' => 'Invoice Ninja Account Confirmation',
'confirmation_header' => 'Account Confirmation', 'confirmation_header' => 'Account Confirmation',
'confirmation_message' => 'Please access the link below to confirm your account.', 'confirmation_message' => 'Please access the link below to confirm your account.',
'invoice_subject' => 'New invoice :invoice', 'invoice_subject' => 'New invoice from :account',
'invoice_message' => 'To view your invoice for :amount, click the link below.', 'invoice_message' => 'To view your invoice for :amount, click the link below.',
'payment_subject' => 'Payment Received :invoice', 'payment_subject' => 'Payment Received :invoice',
'payment_message' => 'Thank you for your payment of :amount.', 'payment_message' => 'Thank you for your payment of :amount.',
@ -303,7 +303,7 @@ return array(
'success' => 'Success', 'success' => 'Success',
'success_message' => 'You have succesfully registered. Please visit the link in the account confirmation email to verify your email address.', 'success_message' => 'You have succesfully registered. Please visit the link in the account confirmation email to verify your email address.',
'erase_data' => 'This will permanently erase your data.', 'erase_data' => 'This will permanently erase your data.',
'password' => 'Password',
); );

4
app/lang/it/texts.php
View File

@ -252,7 +252,7 @@ return array(
'confirmation_subject' => 'Invoice Ninja Account Confirmation', 'confirmation_subject' => 'Invoice Ninja Account Confirmation',
'confirmation_header' => 'Account Confirmation', 'confirmation_header' => 'Account Confirmation',
'confirmation_message' => 'Please access the link below to confirm your account.', 'confirmation_message' => 'Please access the link below to confirm your account.',
'invoice_subject' => 'New invoice :invoice', 'invoice_subject' => 'New invoice from :account',
'invoice_message' => 'To view your invoice for :amount, click the link below.', 'invoice_message' => 'To view your invoice for :amount, click the link below.',
'payment_subject' => 'Payment Received :invoice', 'payment_subject' => 'Payment Received :invoice',
'payment_message' => 'Thank you for your payment of :amount.', 'payment_message' => 'Thank you for your payment of :amount.',
@ -303,7 +303,7 @@ return array(
'success' => 'Success', 'success' => 'Success',
'success_message' => 'You have succesfully registered. Please visit the link in the account confirmation email to verify your email address.', 'success_message' => 'You have succesfully registered. Please visit the link in the account confirmation email to verify your email address.',
'erase_data' => 'This will permanently erase your data.', 'erase_data' => 'This will permanently erase your data.',
'password' => 'Password',

7
app/lang/nl/texts.php
View File

@ -252,7 +252,6 @@ return array(
'confirmation_subject' => 'Invoice Ninja Bevestiging Account', 'confirmation_subject' => 'Invoice Ninja Bevestiging Account',
'confirmation_header' => 'Bevestiging Account', 'confirmation_header' => 'Bevestiging Account',
'confirmation_message' => 'Ga alstublieft naar onderstaande link om je account te bevestiging.', 'confirmation_message' => 'Ga alstublieft naar onderstaande link om je account te bevestiging.',
'invoice_subject' => 'Nieuwe factuur :invoice',
'invoice_message' => 'Om je factuur voor :amount te bekijken, klik op onderstaande link.', 'invoice_message' => 'Om je factuur voor :amount te bekijken, klik op onderstaande link.',
'payment_subject' => 'Betaling ontvangen :invoice', 'payment_subject' => 'Betaling ontvangen :invoice',
'payment_message' => 'Bedankt voor je betaling van :amount.', 'payment_message' => 'Bedankt voor je betaling van :amount.',
@ -303,7 +302,7 @@ return array(
'success' => 'Success', 'success' => 'Success',
'success_message' => 'You have succesfully registered. Please visit the link in the account confirmation email to verify your email address.', 'success_message' => 'You have succesfully registered. Please visit the link in the account confirmation email to verify your email address.',
'erase_data' => 'This will permanently erase your data.', 'erase_data' => 'This will permanently erase your data.',
'password' => 'Password',
'invoice_subject' => 'New invoice from :account',
); );

5
app/lang/pt_BR/texts.php
View File

@ -251,7 +251,6 @@ return array(
'confirmation_subject' => 'Confirmação de Conta do Invoice Ninja', 'confirmation_subject' => 'Confirmação de Conta do Invoice Ninja',
'confirmation_header' => 'Confirmação de Conta', 'confirmation_header' => 'Confirmação de Conta',
'confirmation_message' => 'Favor acessar o link abaixo para confirmar a sua conta.', 'confirmation_message' => 'Favor acessar o link abaixo para confirmar a sua conta.',
'invoice_subject' => 'Nova fatura :invoice',
'invoice_message' => 'Para visualizar a sua fatura de :amount, clique no link abaixo.', 'invoice_message' => 'Para visualizar a sua fatura de :amount, clique no link abaixo.',
'payment_subject' => 'Recebido Pagamento de :invoice', 'payment_subject' => 'Recebido Pagamento de :invoice',
'payment_message' => 'Obrigado pelo seu pagamento de :amount.', 'payment_message' => 'Obrigado pelo seu pagamento de :amount.',
@ -291,7 +290,7 @@ return array(
'success' => 'Success', 'success' => 'Success',
'success_message' => 'You have succesfully registered. Please visit the link in the account confirmation email to verify your email address.', 'success_message' => 'You have succesfully registered. Please visit the link in the account confirmation email to verify your email address.',
'erase_data' => 'This will permanently erase your data.', 'erase_data' => 'This will permanently erase your data.',
'password' => 'Password',
'invoice_subject' => 'New invoice from :account',
); );

6
app/ninja/mailers/ContactMailer.php
View File

@ -13,11 +13,11 @@ class ContactMailer extends Mailer {
public function sendInvoice(Invoice $invoice) public function sendInvoice(Invoice $invoice)
{ {
$view = 'invoice';
$subject = trans('texts.invoice_subject', ['invoice' => $invoice->invoice_number]);
$invoice->load('invitations', 'client', 'account'); $invoice->load('invitations', 'client', 'account');
$view = 'invoice';
$subject = trans('texts.invoice_subject', ['invoice' => $invoice->invoice_number, 'account' => $invoice->account->getDisplayName()]);
foreach ($invoice->invitations as $invitation) foreach ($invoice->invitations as $invitation)
{ {
if (!$invitation->user->email) if (!$invitation->user->email)