diff --git a/src/resources/lang/en/mail.php b/src/resources/lang/en/mail.php index fc49baa9..994ecfac 100644 --- a/src/resources/lang/en/mail.php +++ b/src/resources/lang/en/mail.php @@ -1,64 +1,65 @@ "Dear :name,", - 'footer' => "Best regards,\nYour :site Team", + 'footer1' => "Best regards,", + 'footer2' => "Your :site Team", 'more-info-html' => "See here for more information.", 'more-info-text' => "See :href for more information.", 'negativebalance-subject' => ":site Payment Reminder", 'negativebalance-body' => "It has probably skipped your attention that you are behind on paying for your :site account. " . "Consider setting up auto-payment to avoid messages like this in the future.", - 'negativebalance-body-extd' => "Settle up to keep your account running.", + 'negativebalance-body-ext' => "Settle up to keep your account running:", 'passwordreset-subject' => ":site Password Reset", - 'passwordreset-body' => "Someone recently asked to change your :site password.\n" - . "If this was you, use this verification code to complete the process: :code.\n" - . "You can also click the link below.\n" - . "If you did not make such a request, you can either ignore this message or get in touch with us about this incident.", + 'passwordreset-body1' => "Someone recently asked to change your :site password.", + 'passwordreset-body2' => "If this was you, use this verification code to complete the process:", + 'passwordreset-body3' => "You can also click the link below:", + 'passwordreset-body4' => "If you did not make such a request, you can either ignore this message or get in touch with us about this incident.", 'paymentmandatedisabled-subject' => ":site Auto-payment Problem", 'paymentmandatedisabled-body' => "Your :site account balance is negative " . "and the configured amount for automatically topping up the balance does not cover " . "the costs of subscriptions consumed.", 'paymentmandatedisabled-body-ext' => "Charging you multiple times for the same amount in short succession " . "could lead to issues with the payment provider. " . "In order to not cause any problems, we suspended auto-payment for your account. " . "To resolve this issue, login to your account settings and adjust your auto-payment amount.", 'paymentfailure-subject' => ":site Payment Failed", 'paymentfailure-body' => "Something went wrong with auto-payment for your :site account.\n" . "We tried to charge you via your preferred payment method, but the charge did not go through.", 'paymentfailure-body-ext' => "In order to not cause any further issues, we suspended auto-payment for your account. " . "To resolve this issue, login to your account settings at", 'paymentfailure-body-rest' => "There you can pay manually for your account and " . "change your auto-payment settings.", 'paymentsuccess-subject' => ":site Payment Succeeded", 'paymentsuccess-body' => "The auto-payment for your :site account went through without issues. " . "You can check your new account balance and more details here:", 'support' => "Special circumstances? Something is wrong with a charge?\n" . ":site Support is here to help.", 'signupcode-subject' => ":site Registration", - 'signupcode-body' => "This is your verification code for the :site registration process: :code.\n" - . "You can also click the link below to continue the registration process:", + 'signupcode-body1' => "This is your verification code for the :site registration process:", + 'signupcode-body2' => "You can also click the link below to continue the registration process:", 'suspendeddebtor-subject' => ":site Account Suspended", 'suspendeddebtor-body' => "You have been behind on paying for your :site account " ."for over :days days. Your account has been suspended.", 'suspendeddebtor-middle' => "Settle up now to reactivate your account.", 'suspendeddebtor-cancel' => "Don't want to be our customer anymore? " . "Here is how you can cancel your account:", ]; diff --git a/src/resources/views/emails/html/negative_balance.blade.php b/src/resources/views/emails/html/negative_balance.blade.php index 3d32f390..54a9385c 100644 --- a/src/resources/views/emails/html/negative_balance.blade.php +++ b/src/resources/views/emails/html/negative_balance.blade.php @@ -1,20 +1,21 @@
{{ __('mail.header', ['name' => $username]) }}
{{ __('mail.negativebalance-body', ['site' => $site]) }}
{{ __('mail.negativebalance-body-ext', ['site' => $site]) }}
@if ($supportUrl){{ __('mail.support', ['site' => $site]) }}
@endif -{{ __('mail.footer', ['site' => $site]) }}
+{{ __('mail.footer1') }}
+{{ __('mail.footer2', ['site' => $site]) }}
diff --git a/src/resources/views/emails/html/password_reset.blade.php b/src/resources/views/emails/html/password_reset.blade.php index 31ee02ae..e83d05e4 100644 --- a/src/resources/views/emails/html/password_reset.blade.php +++ b/src/resources/views/emails/html/password_reset.blade.php @@ -1,15 +1,22 @@{{ __('mail.header', ['name' => $username]) }}
-{{ __('mail.passwordreset-body', ['code' => $short_code, 'site' => $site]) }}
+{{ __('mail.passwordreset-body1', ['site' => $site]) }}
{{ __('mail.passwordreset-body2') }}
{!! $short_code !!}
+ +{{ __('mail.passwordreset-body3') }}
{!! $link !!}
-{{ __('mail.footer', ['site' => $site]) }}
+{{ __('mail.passwordreset-body4') }}
+ +{{ __('mail.footer1') }}
+{{ __('mail.footer2', ['site' => $site]) }}
diff --git a/src/resources/views/emails/html/payment_failure.blade.php b/src/resources/views/emails/html/payment_failure.blade.php index 3a272320..6a4a3f87 100644 --- a/src/resources/views/emails/html/payment_failure.blade.php +++ b/src/resources/views/emails/html/payment_failure.blade.php @@ -1,21 +1,22 @@{{ __('mail.header', ['name' => $username]) }}
{{ __('mail.paymentfailure-body', ['site' => $site]) }}
{{ __('mail.paymentfailure-body-ext', ['site' => $site]) }}
{{ __('mail.paymentfailure-body-rest', ['site' => $site]) }}
@if ($supportUrl){{ __('mail.support', ['site' => $site]) }}
@endif -{{ __('mail.footer', ['site' => $site]) }}
+{{ __('mail.footer1') }}
+{{ __('mail.footer2', ['site' => $site]) }}
diff --git a/src/resources/views/emails/html/payment_mandate_disabled.blade.php b/src/resources/views/emails/html/payment_mandate_disabled.blade.php index 22dfd114..10da9121 100644 --- a/src/resources/views/emails/html/payment_mandate_disabled.blade.php +++ b/src/resources/views/emails/html/payment_mandate_disabled.blade.php @@ -1,21 +1,22 @@{{ __('mail.header', ['name' => $username]) }}
{{ __('mail.paymentmandatedisabled-body', ['site' => $site]) }}
{{ __('mail.paymentmandatedisabled-body-ext', ['site' => $site]) }}
{{ __('mail.paymentfailure-body-rest', ['site' => $site]) }}
@if ($supportUrl){{ __('mail.support', ['site' => $site]) }}
@endif -{{ __('mail.footer', ['site' => $site]) }}
+{{ __('mail.footer1') }}
+{{ __('mail.footer2', ['site' => $site]) }}
diff --git a/src/resources/views/emails/html/payment_success.blade.php b/src/resources/views/emails/html/payment_success.blade.php index 1def7c9d..69a4ceb0 100644 --- a/src/resources/views/emails/html/payment_success.blade.php +++ b/src/resources/views/emails/html/payment_success.blade.php @@ -1,19 +1,20 @@{{ __('mail.header', ['name' => $username]) }}
{{ __('mail.paymentsuccess-body', ['site' => $site]) }}
@if ($supportUrl){{ __('mail.support', ['site' => $site]) }}
@endif -{{ __('mail.footer', ['site' => $site]) }}
+{{ __('mail.footer1') }}
+{{ __('mail.footer2', ['site' => $site]) }}
diff --git a/src/resources/views/emails/html/signup_code.blade.php b/src/resources/views/emails/html/signup_code.blade.php index eab5c98b..b582a128 100644 --- a/src/resources/views/emails/html/signup_code.blade.php +++ b/src/resources/views/emails/html/signup_code.blade.php @@ -1,15 +1,20 @@{{ __('mail.header', ['name' => $username]) }}
-{{ __('mail.signupcode-body', ['code' => $short_code, 'site' => $site]) }}
+{{ __('mail.signupcode-body1', ['site' => $site]) }}
+ +{!! $short_code !!}
+ +{{ __('mail.signupcode-body2') }}
-{{ __('mail.footer', ['site' => $site]) }}
+{{ __('mail.footer1') }}
+{{ __('mail.footer2', ['site' => $site]) }}
diff --git a/src/resources/views/emails/html/suspended_debtor.blade.php b/src/resources/views/emails/html/suspended_debtor.blade.php index 5c116e59..61453a0a 100644 --- a/src/resources/views/emails/html/suspended_debtor.blade.php +++ b/src/resources/views/emails/html/suspended_debtor.blade.php @@ -1,24 +1,25 @@{{ __('mail.header', ['name' => $username]) }}
{{ __('mail.suspendeddebtor-body', ['site' => $site, 'days' => $days]) }} {!! $moreInfoHtml !!}
{{ __('mail.suspendeddebtor-middle') }}
@if ($supportUrl){{ __('mail.support', ['site' => $site]) }}
@endif @if ($cancelUrl){{ __('mail.suspendeddebtor-cancel') }}
@endif -{{ __('mail.footer', ['site' => $site]) }}
+{{ __('mail.footer1') }}
+{{ __('mail.footer2', ['site' => $site]) }}
diff --git a/src/resources/views/emails/plain/negative_balance.blade.php b/src/resources/views/emails/plain/negative_balance.blade.php index f243c17b..89e2a01d 100644 --- a/src/resources/views/emails/plain/negative_balance.blade.php +++ b/src/resources/views/emails/plain/negative_balance.blade.php @@ -1,16 +1,17 @@ {!! __('mail.header', ['name' => $username]) !!} {!! __('mail.negativebalance-body', ['site' => $site]) !!} {!! __('mail.negativebalance-body-ext', ['site' => $site]) !!} {!! $walletUrl !!} @if ($supportUrl) {!! __('mail.support', ['site' => $site]) !!} {!! $supportUrl !!} @endif -- -{!! __('mail.footer', ['site' => $site]) !!} +{!! __('mail.footer1') !!} +{!! __('mail.footer2', ['site' => $site]) !!} diff --git a/src/resources/views/emails/plain/password_reset.blade.php b/src/resources/views/emails/plain/password_reset.blade.php index 5e458ed9..221bea40 100644 --- a/src/resources/views/emails/plain/password_reset.blade.php +++ b/src/resources/views/emails/plain/password_reset.blade.php @@ -1,8 +1,16 @@ {!! __('mail.header', ['name' => $username]) !!} -{!! __('mail.passwordreset-body', ['code' => $short_code, 'site' => $site]) !!} +{!! __('mail.passwordreset-body1', ['site' => $site]) !!} +{!! __('mail.passwordreset-body2') !!} + +{!! $short_code !!} + +{!! __('mail.passwordreset-body3') !!} {!! $link !!} +{!! __('mail.passwordreset-body4') !!} + -- -{!! __('mail.footer', ['site' => $site]) !!} +{!! __('mail.footer1') !!} +{!! __('mail.footer2', ['site' => $site]) !!} diff --git a/src/resources/views/emails/plain/payment_failure.blade.php b/src/resources/views/emails/plain/payment_failure.blade.php index 0994c119..96f13248 100644 --- a/src/resources/views/emails/plain/payment_failure.blade.php +++ b/src/resources/views/emails/plain/payment_failure.blade.php @@ -1,18 +1,19 @@ {!! __('mail.header', ['name' => $username]) !!} {!! __('mail.paymentfailure-body', ['site' => $site]) !!} {!! __('mail.paymentfailure-body-ext', ['site' => $site]) !!} {!! $walletUrl !!} {!! __('mail.paymentfailure-body-rest', ['site' => $site]) !!} @if ($supportUrl) {!! __('mail.support', ['site' => $site]) !!} {!! $supportUrl !!} @endif -- -{!! __('mail.footer', ['site' => $site]) !!} +{!! __('mail.footer1') !!} +{!! __('mail.footer2', ['site' => $site]) !!} \ No newline at end of file diff --git a/src/resources/views/emails/plain/payment_mandate_disabled.blade.php b/src/resources/views/emails/plain/payment_mandate_disabled.blade.php index 40bfde85..f0a42fcc 100644 --- a/src/resources/views/emails/plain/payment_mandate_disabled.blade.php +++ b/src/resources/views/emails/plain/payment_mandate_disabled.blade.php @@ -1,18 +1,19 @@ {!! __('mail.header', ['name' => $username]) !!} {!! __('mail.paymentmandatedisabled-body', ['site' => $site]) !!} {!! __('mail.paymentmandatedisabled-body-ext', ['site' => $site]) !!} {!! $walletUrl !!} {!! __('mail.paymentfailure-body-rest', ['site' => $site]) !!} @if ($supportUrl) {!! __('mail.support', ['site' => $site]) !!} {!! $supportUrl !!} @endif -- -{!! __('mail.footer', ['site' => $site]) !!} +{!! __('mail.footer1') !!} +{!! __('mail.footer2', ['site' => $site]) !!} diff --git a/src/resources/views/emails/plain/payment_success.blade.php b/src/resources/views/emails/plain/payment_success.blade.php index 72e29786..e55349e5 100644 --- a/src/resources/views/emails/plain/payment_success.blade.php +++ b/src/resources/views/emails/plain/payment_success.blade.php @@ -1,14 +1,15 @@ {!! __('mail.header', ['name' => $username]) !!} {!! __('mail.paymentsuccess-body', ['site' => $site]) !!} {!! $walletUrl !!} @if ($supportUrl) {!! __('mail.support', ['site' => $site]) !!} {!! $supportUrl !!} @endif -- -{!! __('mail.footer', ['site' => $site]) !!} +{!! __('mail.footer1') !!} +{!! __('mail.footer2', ['site' => $site]) !!} \ No newline at end of file diff --git a/src/resources/views/emails/plain/signup_code.blade.php b/src/resources/views/emails/plain/signup_code.blade.php index 38ccd283..0ccb2a94 100644 --- a/src/resources/views/emails/plain/signup_code.blade.php +++ b/src/resources/views/emails/plain/signup_code.blade.php @@ -1,8 +1,13 @@ {!! __('mail.header', ['name' => $username]) !!} -{!! __('mail.signupcode-body', ['code' => $short_code, 'site' => $site]) !!} +{!! __('mail.signupcode-body1', ['site' => $site]) !!} + +{!! $short_code !!} + +{!! __('mail.signupcode-body2') !!} {!! $href !!} -- -{!! __('mail.footer', ['site' => $site]) !!} +{!! __('mail.footer1') !!} +{!! __('mail.footer2', ['site' => $site]) !!} diff --git a/src/resources/views/emails/plain/suspended_debtor.blade.php b/src/resources/views/emails/plain/suspended_debtor.blade.php index 2dccacc8..c760dc75 100644 --- a/src/resources/views/emails/plain/suspended_debtor.blade.php +++ b/src/resources/views/emails/plain/suspended_debtor.blade.php @@ -1,22 +1,23 @@ {!! __('mail.header', ['name' => $username]) !!} {!! __('mail.suspendeddebtor-body', ['site' => $site, 'days' => $days]) !!} {!! $moreInfoText !!} {!! __('mail.suspendeddebtor-middle') !!} {!! $walletUrl !!} @if ($supportUrl) {!! __('mail.support', ['site' => $site]) !!} {!! $supportUrl !!} @endif @if ($cancelUrl) {!! __('mail.suspendeddebtor-cancel') !!} {!! $cancelUrl !!} @endif -- -{!! __('mail.footer', ['site' => $site]) !!} +{!! __('mail.footer1') !!} +{!! __('mail.footer2', ['site' => $site]) !!}