Page MenuHomePhorge
Files F117424590

D1414.1774831411.diff
No OneTemporary
Actions

Authored By
Unknown
Size
10 KB
Referenced Files
None
Subscribers
None

D1414.1774831411.diff
View Options

diff --git a/src/resources/lang/en/mail.php b/src/resources/lang/en/mail.php
--- a/src/resources/lang/en/mail.php
+++ b/src/resources/lang/en/mail.php
@@ -11,7 +11,8 @@
*/
'header' => "Dear :name,",
- 'footer' => "Best regards,\nYour :site Team",
+ 'footer1' => "Best regards,",
+ 'footer2' => "Your :site Team",
'more-info-html' => "See <a href=\":href\">here</a> for more information.",
'more-info-text' => "See :href for more information.",
@@ -19,13 +20,13 @@
'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 "
@@ -52,8 +53,8 @@
. ":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 "
diff --git a/src/resources/views/emails/html/negative_balance.blade.php b/src/resources/views/emails/html/negative_balance.blade.php
--- a/src/resources/views/emails/html/negative_balance.blade.php
+++ b/src/resources/views/emails/html/negative_balance.blade.php
@@ -15,6 +15,7 @@
<p><a href="{{ $supportUrl }}">{{ $supportUrl }}</a></p>
@endif
- <p>{{ __('mail.footer', ['site' => $site]) }}</p>
+ <p>{{ __('mail.footer1') }}</p>
+ <p>{{ __('mail.footer2', ['site' => $site]) }}</p>
</body>
</html>
diff --git a/src/resources/views/emails/html/password_reset.blade.php b/src/resources/views/emails/html/password_reset.blade.php
--- a/src/resources/views/emails/html/password_reset.blade.php
+++ b/src/resources/views/emails/html/password_reset.blade.php
@@ -6,10 +6,17 @@
<body>
<p>{{ __('mail.header', ['name' => $username]) }}</p>
- <p>{{ __('mail.passwordreset-body', ['code' => $short_code, 'site' => $site]) }}</p>
+ <p>{{ __('mail.passwordreset-body1', ['site' => $site]) }} <br/> {{ __('mail.passwordreset-body2') }}</p>
+
+ <p><strong>{!! $short_code !!}</strong></p>
+
+ <p>{{ __('mail.passwordreset-body3') }}</p>
<p>{!! $link !!}</p>
- <p>{{ __('mail.footer', ['site' => $site]) }}</p>
+ <p>{{ __('mail.passwordreset-body4') }}</p>
+
+ <p>{{ __('mail.footer1') }}</p>
+ <p>{{ __('mail.footer2', ['site' => $site]) }}</p>
</body>
</html>
diff --git a/src/resources/views/emails/html/payment_failure.blade.php b/src/resources/views/emails/html/payment_failure.blade.php
--- a/src/resources/views/emails/html/payment_failure.blade.php
+++ b/src/resources/views/emails/html/payment_failure.blade.php
@@ -16,6 +16,7 @@
<p><a href="{{ $supportUrl }}">{{ $supportUrl }}</a></p>
@endif
- <p>{{ __('mail.footer', ['site' => $site]) }}</p>
+ <p>{{ __('mail.footer1') }}</p>
+ <p>{{ __('mail.footer2', ['site' => $site]) }}</p>
</body>
</html>
diff --git a/src/resources/views/emails/html/payment_mandate_disabled.blade.php b/src/resources/views/emails/html/payment_mandate_disabled.blade.php
--- a/src/resources/views/emails/html/payment_mandate_disabled.blade.php
+++ b/src/resources/views/emails/html/payment_mandate_disabled.blade.php
@@ -16,6 +16,7 @@
<p><a href="{{ $supportUrl }}">{{ $supportUrl }}</a></p>
@endif
- <p>{{ __('mail.footer', ['site' => $site]) }}</p>
+ <p>{{ __('mail.footer1') }}</p>
+ <p>{{ __('mail.footer2', ['site' => $site]) }}</p>
</body>
</html>
diff --git a/src/resources/views/emails/html/payment_success.blade.php b/src/resources/views/emails/html/payment_success.blade.php
--- a/src/resources/views/emails/html/payment_success.blade.php
+++ b/src/resources/views/emails/html/payment_success.blade.php
@@ -14,6 +14,7 @@
<p><a href="{{ $supportUrl }}">{{ $supportUrl }}</a></p>
@endif
- <p>{{ __('mail.footer', ['site' => $site]) }}</p>
+ <p>{{ __('mail.footer1') }}</p>
+ <p>{{ __('mail.footer2', ['site' => $site]) }}</p>
</body>
</html>
diff --git a/src/resources/views/emails/html/signup_code.blade.php b/src/resources/views/emails/html/signup_code.blade.php
--- a/src/resources/views/emails/html/signup_code.blade.php
+++ b/src/resources/views/emails/html/signup_code.blade.php
@@ -6,10 +6,15 @@
<body>
<p>{{ __('mail.header', ['name' => $username]) }}</p>
- <p>{{ __('mail.signupcode-body', ['code' => $short_code, 'site' => $site]) }}</p>
+ <p>{{ __('mail.signupcode-body1', ['site' => $site]) }}</p>
+
+ <p><strong>{!! $short_code !!}</strong></p>
+
+ <p>{{ __('mail.signupcode-body2') }}</p>
<p><a href="{!! $href !!}">{!! $href !!}</a></p>
- <p>{{ __('mail.footer', ['site' => $site]) }}</p>
+ <p>{{ __('mail.footer1') }}</p>
+ <p>{{ __('mail.footer2', ['site' => $site]) }}</p>
</body>
</html>
diff --git a/src/resources/views/emails/html/suspended_debtor.blade.php b/src/resources/views/emails/html/suspended_debtor.blade.php
--- a/src/resources/views/emails/html/suspended_debtor.blade.php
+++ b/src/resources/views/emails/html/suspended_debtor.blade.php
@@ -19,6 +19,7 @@
<p><a href="{{ $cancelUrl }}">{{ $cancelUrl }}</a></p>
@endif
- <p>{{ __('mail.footer', ['site' => $site]) }}</p>
+ <p>{{ __('mail.footer1') }}</p>
+ <p>{{ __('mail.footer2', ['site' => $site]) }}</p>
</body>
</html>
diff --git a/src/resources/views/emails/plain/negative_balance.blade.php b/src/resources/views/emails/plain/negative_balance.blade.php
--- a/src/resources/views/emails/plain/negative_balance.blade.php
+++ b/src/resources/views/emails/plain/negative_balance.blade.php
@@ -13,4 +13,5 @@
@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
--- 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
--- a/src/resources/views/emails/plain/payment_failure.blade.php
+++ b/src/resources/views/emails/plain/payment_failure.blade.php
@@ -15,4 +15,5 @@
@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
--- a/src/resources/views/emails/plain/payment_mandate_disabled.blade.php
+++ b/src/resources/views/emails/plain/payment_mandate_disabled.blade.php
@@ -15,4 +15,5 @@
@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
--- a/src/resources/views/emails/plain/payment_success.blade.php
+++ b/src/resources/views/emails/plain/payment_success.blade.php
@@ -11,4 +11,5 @@
@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
--- 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
--- a/src/resources/views/emails/plain/suspended_debtor.blade.php
+++ b/src/resources/views/emails/plain/suspended_debtor.blade.php
@@ -19,4 +19,5 @@
@endif
--
-{!! __('mail.footer', ['site' => $site]) !!}
+{!! __('mail.footer1') !!}
+{!! __('mail.footer2', ['site' => $site]) !!}

File Metadata

Mime Type
text/plain
Expires
Mon, Mar 30, 12:43 AM (3 d, 17 h ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
18784020
Default Alt Text
D1414.1774831411.diff (10 KB)

Event Timeline