From b54bb20617daf45bc96b4198aff71e47b4fd71bb Mon Sep 17 00:00:00 2001 From: Florian Dupret Date: Mon, 25 May 2020 13:13:33 +0200 Subject: [PATCH] Make admin test email translatable --- resources/lang/en_US/firefly.php | 9 +++++++++ resources/views/v1/emails/admin-test-html.twig | 2 +- resources/views/v1/emails/admin-test-text.twig | 2 +- resources/views/v1/emails/footer-html.twig | 6 +++--- resources/views/v1/emails/footer-text.twig | 6 +++--- resources/views/v1/emails/header-html.twig | 2 +- resources/views/v1/emails/header-text.twig | 3 +-- 7 files changed, 19 insertions(+), 11 deletions(-) diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php index d0c7de9560..6b7cf41cb0 100644 --- a/resources/lang/en_US/firefly.php +++ b/resources/lang/en_US/firefly.php @@ -1621,6 +1621,15 @@ return [ 'box_net_worth_in_currency' => 'Net worth (:currency)', 'box_spend_per_day' => 'Left to spend per day: :amount', + // emails + 'email_greeting' => 'Hi there,', + 'email_closing' => 'Beep boop,', + 'email_signature' => 'The Firefly III Mail Robot', + 'email_footer_ps' => 'PS: This message was sent because a request from IP :ip:userIp:ipAddress triggered it.', + + 'email_admin_test_subject' => 'A test message from your Firefly III installation', + 'email_admin_test_body' => 'This is a test message from your Firefly III instance. It was sent to :email.', + // telemetry 'telemetry_admin_index' => 'Telemetry', 'telemetry_intro' => 'Firefly III supports the collection and sending of usage telemetry. This means that Firefly III will try to collect info on how you use Firefly III, and send it to the developer of Firefly III. This is always opt-in, and is disabled by default. Firefly III will never collect or send financial information. Firefly III will also never collect or send financial meta-information, like sums or calculations. The collected data will never be made publicly accessible.', diff --git a/resources/views/v1/emails/admin-test-html.twig b/resources/views/v1/emails/admin-test-html.twig index 0862786993..30ef2cacdf 100644 --- a/resources/views/v1/emails/admin-test-html.twig +++ b/resources/views/v1/emails/admin-test-html.twig @@ -1,5 +1,5 @@ {% include 'emails.header-html' %}

- This is a test message from your Firefly III instance. It was sent to {{ email }}. + {{ trans('firefly.email_admin_test_body', {email: email })}}

{% include 'emails.footer-html' %} diff --git a/resources/views/v1/emails/admin-test-text.twig b/resources/views/v1/emails/admin-test-text.twig index 23c246e694..dd2799b575 100644 --- a/resources/views/v1/emails/admin-test-text.twig +++ b/resources/views/v1/emails/admin-test-text.twig @@ -1,3 +1,3 @@ {% include 'emails.header-text' %} - This is a test message from your Firefly III instance. It was sent to {{ email }}. + {{ trans('firefly.email_admin_test_body', {email: email })}} {% include 'emails.footer-text' %} diff --git a/resources/views/v1/emails/footer-html.twig b/resources/views/v1/emails/footer-html.twig index 6e2ca37007..ed426326d4 100644 --- a/resources/views/v1/emails/footer-html.twig +++ b/resources/views/v1/emails/footer-html.twig @@ -1,12 +1,12 @@

- Beep boop, + {{ trans('firefly.email_closing') }}

- The Firefly III Mail Robot + {{ trans('firefly.email_signature') }}

- PS: This message was sent because a request from IP {{ ip }}{{ userIp }}{{ ipAddress }} triggered it. + {{ trans('firefly.email_footer_ps', {ip: ip, userIp: userIp, ipAddress: ipAddress}) }}

diff --git a/resources/views/v1/emails/footer-text.twig b/resources/views/v1/emails/footer-text.twig index e2ec3ff9d4..321902a6b4 100644 --- a/resources/views/v1/emails/footer-text.twig +++ b/resources/views/v1/emails/footer-text.twig @@ -1,6 +1,6 @@ -Beep boop, +{{ trans('firefly.email_closing') }} -The Firefly III Mail Robot +{{ trans('firefly.email_signature') }} -PS: This message was sent because a request from IP {{ ip }}{{ userIp }}{{ ipAddress }} triggered it. +{{ trans('firefly.email_footer_ps', {ip: ip, userIp: userIp, ipAddress: ipAddress}) }} diff --git a/resources/views/v1/emails/header-html.twig b/resources/views/v1/emails/header-html.twig index f3a4e8edc7..a6e8ac4475 100644 --- a/resources/views/v1/emails/header-html.twig +++ b/resources/views/v1/emails/header-html.twig @@ -6,5 +6,5 @@

- Hi there, + {{ trans('firefly.email_greeting') }}

diff --git a/resources/views/v1/emails/header-text.twig b/resources/views/v1/emails/header-text.twig index e60df7e024..3ea6e074da 100644 --- a/resources/views/v1/emails/header-text.twig +++ b/resources/views/v1/emails/header-text.twig @@ -1,2 +1 @@ -Hi there, - +{{ trans('firefly.email_greeting') }}