diff --git a/app/Jobs/MailError.php b/app/Jobs/MailError.php
index abcc87a586..032b15ba50 100644
--- a/app/Jobs/MailError.php
+++ b/app/Jobs/MailError.php
@@ -84,7 +84,7 @@ class MailError extends Job implements ShouldQueue
$args,
function (Message $message) use ($email) {
if ('mail@example.com' !== $email) {
- $message->to($email, $email)->subject('Caught an error in Firefly III');
+ $message->to($email, $email)->subject(trans('email.error_subject'));
}
}
);
diff --git a/app/Mail/AccessTokenCreatedMail.php b/app/Mail/AccessTokenCreatedMail.php
index 584a7b5eee..96f4c3a594 100644
--- a/app/Mail/AccessTokenCreatedMail.php
+++ b/app/Mail/AccessTokenCreatedMail.php
@@ -63,6 +63,6 @@ class AccessTokenCreatedMail extends Mailable
public function build(): self
{
return $this->view('emails.access-token-created-html')->text('emails.access-token-created-text')
- ->subject('A new access token was created');
+ ->subject(trans('email.access_token_created_subject'));
}
}
diff --git a/app/Mail/AdminTestMail.php b/app/Mail/AdminTestMail.php
index 91d65bcba2..c02f50f345 100644
--- a/app/Mail/AdminTestMail.php
+++ b/app/Mail/AdminTestMail.php
@@ -62,6 +62,6 @@ class AdminTestMail extends Mailable
public function build(): self
{
return $this->view('emails.admin-test-html')->text('emails.admin-test-text')
- ->subject('A test message from your Firefly III installation');
+ ->subject(trans('email.admin_test_subject'));
}
}
diff --git a/app/Mail/ConfirmEmailChangeMail.php b/app/Mail/ConfirmEmailChangeMail.php
index 1e7be38f1a..91d6e6a5cf 100644
--- a/app/Mail/ConfirmEmailChangeMail.php
+++ b/app/Mail/ConfirmEmailChangeMail.php
@@ -70,6 +70,6 @@ class ConfirmEmailChangeMail extends Mailable
public function build(): self
{
return $this->view('emails.confirm-email-change-html')->text('emails.confirm-email-change-text')
- ->subject('Your Firefly III email address has changed');
+ ->subject(trans('email.email_change_subject'));
}
}
diff --git a/app/Mail/OAuthTokenCreatedMail.php b/app/Mail/OAuthTokenCreatedMail.php
index ad3dbfb474..72336b0853 100644
--- a/app/Mail/OAuthTokenCreatedMail.php
+++ b/app/Mail/OAuthTokenCreatedMail.php
@@ -67,6 +67,6 @@ class OAuthTokenCreatedMail extends Mailable
public function build(): self
{
return $this->view('emails.oauth-client-created-html')->text('emails.oauth-client-created-text')
- ->subject('A new OAuth client has been created');
+ ->subject(trans('email.oauth_created_subject'));
}
}
diff --git a/app/Mail/RegisteredUser.php b/app/Mail/RegisteredUser.php
index edda7e6885..1d90ec36e5 100644
--- a/app/Mail/RegisteredUser.php
+++ b/app/Mail/RegisteredUser.php
@@ -61,6 +61,6 @@ class RegisteredUser extends Mailable
*/
public function build(): self
{
- return $this->view('emails.registered-html')->text('emails.registered-text')->subject('Welcome to Firefly III!');
+ return $this->view('emails.registered-html')->text('emails.registered-text')->subject(trans('email.registered_subject'));
}
}
diff --git a/app/Mail/ReportNewJournalsMail.php b/app/Mail/ReportNewJournalsMail.php
index 26da94db1d..14d687b894 100644
--- a/app/Mail/ReportNewJournalsMail.php
+++ b/app/Mail/ReportNewJournalsMail.php
@@ -79,7 +79,7 @@ class ReportNewJournalsMail extends Mailable
$this->transform();
return $this->view('emails.report-new-journals-html')->text('emails.report-new-journals-text')
- ->subject($subject);
+ ->subject(trans_choice('email.new_journals_subject', $this->groups->count() ));
}
private function transform(): void
diff --git a/app/Mail/RequestedNewPassword.php b/app/Mail/RequestedNewPassword.php
index f1bb6c9b75..eccf9a5eb6 100644
--- a/app/Mail/RequestedNewPassword.php
+++ b/app/Mail/RequestedNewPassword.php
@@ -60,6 +60,6 @@ class RequestedNewPassword extends Mailable
*/
public function build(): self
{
- return $this->view('emails.password-html')->text('emails.password-text')->subject('Your password reset request');
+ return $this->view('emails.password-html')->text('emails.password-text')->subject(trans('email.reset_pw_subject'));
}
}
diff --git a/app/Mail/UndoEmailChangeMail.php b/app/Mail/UndoEmailChangeMail.php
index dd54a573ef..0d325bff82 100644
--- a/app/Mail/UndoEmailChangeMail.php
+++ b/app/Mail/UndoEmailChangeMail.php
@@ -68,6 +68,6 @@ class UndoEmailChangeMail extends Mailable
public function build(): self
{
return $this->view('emails.undo-email-change-html')->text('emails.undo-email-change-text')
- ->subject('Your Firefly III email address has changed');
+ ->subject(trans('email.email_change_subject'));
}
}
diff --git a/resources/lang/en_US/email.php b/resources/lang/en_US/email.php
new file mode 100644
index 0000000000..872c37cc00
--- /dev/null
+++ b/resources/lang/en_US/email.php
@@ -0,0 +1,96 @@
+.
+ */
+
+declare(strict_types=1);
+
+return [
+ // common items
+ 'greeting' => 'Hi there,',
+ 'closing' => 'Beep boop,',
+ 'signature' => 'The Firefly III Mail Robot',
+ 'footer_ps' => 'PS: This message was sent because a request from IP :ipAddress triggered it.',
+
+ // admin test
+ 'admin_test_subject' => 'A test message from your Firefly III installation',
+ 'admin_test_body' => 'This is a test message from your Firefly III instance. It was sent to :email.',
+
+ // access token created
+ 'access_token_created_subject' => 'A new access token was created',
+ 'access_token_created_body' => 'Somebody (hopefully you) just created a new Firefly III API Access Token for your user account.',
+ 'access_token_created_explanation' => 'With this token, they can access all of your financial records through the Firefly III API.',
+ 'access_token_created_revoke' => 'If this wasn\'t you, please revoke this token as soon as possible at :url.',
+
+ // registered
+ 'registered_subject' => 'Welcome to Firefly III!',
+ 'registered_welcome' => 'Welcome to Firefly III. Your registration has made it, and this email is here to confirm it. Yay!',
+ 'registered_pw' => 'If you have forgotten your password already, please reset it using the password reset tool.',
+ 'registered_help' => 'There is a help-icon in the top right corner of each page. If you need help, click it!',
+ 'registered_doc_html' => 'If you haven\'t already, please read the grand theory.',
+ 'registered_doc_text' => 'If you haven\'t already, please read the first use guide and the full description.',
+ 'registered_closing' => 'Enjoy!',
+ 'registered_firefly_iii_link' => 'Firefly III:',
+ 'registered_pw_reset_link' => 'Password reset:',
+ 'registered_doc_link' => 'Documentation:',
+
+ // email change
+ 'email_change_subject' => 'Your Firefly III email address has changed',
+ 'email_change_body_to_new' => 'You or somebody with access to your Firefly III account has changed your email address. If you did not expect this message, please ignore and delete it.',
+ 'email_change_body_to_old' => 'You or somebody with access to your Firefly III account has changed your email address. If you did not expect this to happen, you must follow the "undo"-link below to protect your account!',
+ 'email_change_ignore' => 'If you initiated this change, you may safely ignore this message.',
+ 'email_change_old' => 'The old email address was: :email',
+ 'email_change_old_strong' => 'The old email address was: :email',
+ 'email_change_new' => 'The new email address is: :email',
+ 'email_change_new_strong' => 'The new email address is: :email',
+ 'email_change_instructions' => 'You cannot use Firefly III until you confirm this change. Please follow the link below to do so.',
+ 'email_change_undo_link' => 'To undo the change, follow this link:',
+
+ // OAuth token created
+ 'oauth_created_subject' => 'A new OAuth client has been created',
+ 'oauth_created_body' => 'Somebody (hopefully you) just created a new Firefly III API OAuth Client for your user account. It\'s labeled ":name" and has callback URL :url.',
+ 'oauth_created_explanation' => 'With this client, they can access all of your financial records through the Firefly III API.',
+ 'oauth_created_undo' => 'If this wasn\'t you, please revoke this client as soon as possible at :url.',
+
+ // reset password
+ 'reset_pw_subject' => 'Your password reset request',
+ 'reset_pw_instructions' => 'Somebody tried to reset your password. If it was you, please follow the link below to do so.',
+ 'reset_pw_warning' => 'PLEASE verify that the link actually goes to the Firefly III you expect it to go!',
+
+ // error
+ 'error_subject' => 'Caught an error in Firefly III',
+ 'error_intro' => 'Firefly III v:version ran into an error: :errorMessage.',
+ 'error_type' => 'The error was of type ":class".',
+ 'error_timestamp' => 'The error occurred on/at: :time.',
+ 'error_location' => 'This error occurred in file ":file" on line :line with code :code.',
+ 'error_user' => 'The error was encountered by user #:id, :email.',
+ 'error_no_user' => 'There was no user logged in for this error or no user was detected.',
+ 'error_ip' => 'The IP address related to this error is: :ip',
+ 'error_url' => 'URL is: :url',
+ 'error_user_agent' => 'User agent: :userAgent',
+ 'error_stacktrace' => 'The full stacktrace is below. If you think this is a bug in Firefly III, you can forward this message to james@firefly-iii.org. This can help fix the bug you just encountered.',
+ 'error_github_html' => 'If you prefer, you can also open a new issue on GitHub.',
+ 'error_github_text' => 'If you prefer, you can also open a new issue on https://github.com/firefly-iii/firefly-iii/issues.',
+ 'error_stacktrace_below' => 'The full stacktrace is below:',
+
+ // report new journals
+ 'new_journals_subject' => 'Firefly III has created a new transaction|Firefly III has created :count new transactions',
+ 'new_journals_header' => 'Firefly III has created a transaction for you. You can find it in your Firefly III installation:|Firefly III has created :count transactions for you. You can find them in your Firefly III installation:'
+];
diff --git a/resources/views/v1/emails/access-token-created-html.twig b/resources/views/v1/emails/access-token-created-html.twig
index 1c88099a1d..ede3a2f044 100644
--- a/resources/views/v1/emails/access-token-created-html.twig
+++ b/resources/views/v1/emails/access-token-created-html.twig
@@ -1,13 +1,13 @@
{% include 'emails.header-html' %}
- Somebody (hopefully you) just created a new Firefly III API Access Token for your user account.
+ {{ trans('email.access_token_created_body') }}
- With this token, they can access all of your financial records through the Firefly III API.
+ {{ trans('email.access_token_created_explanation')|raw }}
- If this wasn't you, please revoke this token as soon as possible at {{ route('profile.index') }}.
+ {{ trans('email.access_token_created_revoke', {url: route('profile.index') }) }}
{% include 'emails.footer-html' %}
diff --git a/resources/views/v1/emails/access-token-created-text.twig b/resources/views/v1/emails/access-token-created-text.twig
index 5ea41eb0fe..04d85cdf35 100644
--- a/resources/views/v1/emails/access-token-created-text.twig
+++ b/resources/views/v1/emails/access-token-created-text.twig
@@ -1,7 +1,7 @@
{% include 'emails.header-text' %}
-Somebody (hopefully you) just created a new Firefly III API Access Token for your user account.
+{{ trans('email.access_token_created_body')|raw }}
-With this token, they can access all of your financial records through the Firefly III API.
+{{ trans('email.access_token_created_explanation')|striptags|raw }}
-If this wasn't you, please revoke this token as soon as possible at {{ route('profile.index') }}.
+{{ trans('email.access_token_created_revoke', {url: route('profile.index') })|raw }}
{% include 'emails.footer-text' %}
diff --git a/resources/views/v1/emails/admin-test-html.twig b/resources/views/v1/emails/admin-test-html.twig
index 0862786993..6d343085b8 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('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..e6c5aca702 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('email.admin_test_body', {email: email })|raw }}
{% include 'emails.footer-text' %}
diff --git a/resources/views/v1/emails/confirm-account-html.twig b/resources/views/v1/emails/confirm-account-html.twig
deleted file mode 100644
index 9dacd4e6a5..0000000000
--- a/resources/views/v1/emails/confirm-account-html.twig
+++ /dev/null
@@ -1,20 +0,0 @@
-{% include 'emails.header-html' %}
-
- To start using your brand new Firefly III account, you need to activate it. Activating your account allows the website to verify that this email address is
- valid. Unfortunately, not even the most complex routines can work this out, without actually sending an email message. And here it is!
-
-
-
- To active your account please follow the link below.
-
-
- PLEASE verify that this activation link goes to the Firefly III installation you expect it to be:
-
-
- {{ route }}
-
-
-
- You should be redirected to the index page right away. The link expires in about four hours.
-
-{% include 'emails.footer-html' %}
diff --git a/resources/views/v1/emails/confirm-account-text.twig b/resources/views/v1/emails/confirm-account-text.twig
deleted file mode 100644
index ca8f3a1e1b..0000000000
--- a/resources/views/v1/emails/confirm-account-text.twig
+++ /dev/null
@@ -1,11 +0,0 @@
-{% include 'emails.header-text' %}
-To start using your brand new Firefly III account, you need to activate it. Activating your account allows the website to verify that this email address is valid. Unfortunately, not even the most complex routines can work this out, without actually sending an email message. And here it is!
-
-To active your account please follow the link below.
-
-PLEASE verify that this activation link goes to the Firefly III installation you expect it to be:
-
-{{ route }}
-
-You should be redirected to the index page right away. The link expires in about four hours.
-{% include 'emails.footer-text' %}
diff --git a/resources/views/v1/emails/confirm-email-change-html.twig b/resources/views/v1/emails/confirm-email-change-html.twig
index 0a5091e505..7eb907c421 100644
--- a/resources/views/v1/emails/confirm-email-change-html.twig
+++ b/resources/views/v1/emails/confirm-email-change-html.twig
@@ -1,15 +1,15 @@
{% include 'emails.header-html' %}
- You or somebody with access to your Firefly III account has changed your email address. If you did not expect this message, please ignore and delete it.
+ {{ trans('email.email_change_body_to_new')}}
- The old email address was: {{ oldEmail }}
+ {{trans('email.email_change_old', { email: oldEmail }) }}
- The new email address is: {{ newEmail }}
+ {{trans('email.email_change_new_strong', { email: newEmail })|raw }}
- You cannot use Firefly III until you confirm this change. Please follow the link below to do so.
+ {{ trans('email.email_change_instructions')}}
diff --git a/resources/views/v1/emails/confirm-email-change-text.twig b/resources/views/v1/emails/confirm-email-change-text.twig
index c2ddf3600a..1fd8695814 100644
--- a/resources/views/v1/emails/confirm-email-change-text.twig
+++ b/resources/views/v1/emails/confirm-email-change-text.twig
@@ -1,9 +1,10 @@
{% include 'emails.header-text' %}
-You or somebody with access to your Firefly III account has changed your email address. If you did not expect this message, please ignore and delete it.
+{{ trans('email.email_change_body_to_new')|raw }}
-The old email address was: {{ oldEmail }}
+{{trans('email.email_change_old', { email: oldEmail })|raw }}
-The new email address is: {{ newEmail }}
+{{trans('email.email_change_new', { email: newEmail })|raw }}
-You cannot use Firefly III until you confirm this change. Please follow the link to do so: {{ uri }}
+{{ trans('email.email_change_instructions')|raw }}
+{{ uri }}
{% include 'emails.footer-text' %}
diff --git a/resources/views/v1/emails/error-html.twig b/resources/views/v1/emails/error-html.twig
index 2017bad70a..d90bc67879 100644
--- a/resources/views/v1/emails/error-html.twig
+++ b/resources/views/v1/emails/error-html.twig
@@ -1,46 +1,44 @@
{% include 'emails.header-html' %}
- Firefly III v{{ version }} ran into an error: {{ errorMessage }}
+ {{ trans('email.error_intro', { version: version, errorMessage: errorMessage })|raw }}
- The error was of type "{{ class }}".
+ {{ trans('email.error_type', {class: class }) }}
- The error occurred on/at: {{ time }}.
+ {{ trans('email.error_timestamp', {time: time }) }}
+
- This error occurred in file {{ file }} on line {{ line }} with code {{ code }}.
+ {{ trans('email.error_location', { file: file, line: line, code: code })|raw }}
{% if loggedIn %}
- The error was encountered by user #{{ user.id }}, {{ user.email }}.
+ {{ trans('email.error_user', { id: user.id, email: user.email })|raw }}
{% else %}
- There was no user logged in for this error or no user was detected.
+ {{ trans('email.error_no_user') }}
{% endif %}
- The IP address related to this error is: {{ ip }}
- URL is: {{ url }}
- User agent: {{ userAgent }}
+ {{ trans('email.error_ip', { ip: ip }) }}
+ {{ trans('email.error_url', {url :url }) }}
+ {{ trans('email.error_user_agent', {userAgent: userAgent }) }}
- The full stacktrace is below. If you think this is a bug in Firefly III, you
- can forward this message to
- james@firefly-iii.org.
- This can help fix the bug you just encountered.
+ {{ trans('email.error_stacktrace')|raw }}
- If you prefer, you can also open a new issue on GitHub.
+ {{ trans('email.error_github_html')|raw }}
- The full stacktrace is below:
+ {{ trans('email.error_stacktrace_below') }}
{{ stackTrace|nl2br }}
diff --git a/resources/views/v1/emails/error-text.twig b/resources/views/v1/emails/error-text.twig
index 18df8c3696..35e4a46334 100644
--- a/resources/views/v1/emails/error-text.twig
+++ b/resources/views/v1/emails/error-text.twig
@@ -1,31 +1,27 @@
{% include 'emails.header-text' %}
-Firefly III v{{ version }} ran into an error: {{ errorMessage }}.
+{{ trans('email.error_intro', { version: version, errorMessage: errorMessage })|striptags|raw }}
-The error was of type "{{ class }}".
+{{ trans('email.error_type', {class: class })|raw }}
-The error occurred on/at: {{ time }}.
+{{ trans('email.error_timestamp', {time: time })|raw }}
-This error occurred in file "{{ file }}" on line {{ line }} with code {{ code }}.
+{{ trans('email.error_location', { file: file , line: line, code: code })|striptags|raw }}
{% if loggedIn %}
- The error was encountered by user #{{ user.id }}, {{ user.email }}.
+{{ trans('email.error_user', { id: user.id, email: user.email })|striptags|raw }}
{% else %}
- There was no user logged in for this error or no user was detected.
+{{ trans('email.error_no_user')|raw }}
{% endif %}
-The IP address related to this error is: {{ ip }}
-URL is: {{ url }}
-User agent: {{ userAgent }}
+{{ trans('email.error_ip', { ip: ip }) }}
+{{ trans('email.error_url', {url :url}) }}
+{{ trans('email.error_user_agent', {userAgent: userAgent } ) }}
-The full stacktrace is below. If you think this is a bug in Firefly III, you
-can forward this message to james@firefly-iii.org. This can help fix
-the bug you just encountered.
+{{ trans('email.error_stacktrace')|striptags|raw }}
-If you prefer, you can also open a new issue here:
+{{ trans('email.error_github_text' )|raw }}
-https://github.com/firefly-iii/firefly-iii/issues
+{{ trans('email.error_stacktrace_below')|raw }}
-The full stacktrace is below:
-
-{{ stackTrace }}
+{{ stackTrace|raw }}
{% include 'emails.footer-text' %}
diff --git a/resources/views/v1/emails/footer-html.twig b/resources/views/v1/emails/footer-html.twig
index 6e2ca37007..a5caad932a 100644
--- a/resources/views/v1/emails/footer-html.twig
+++ b/resources/views/v1/emails/footer-html.twig
@@ -1,12 +1,12 @@
- Beep boop,
+ {{ trans('email.closing') }}
- The Firefly III Mail Robot
+ {{ trans('email.signature') }}
- PS: This message was sent because a request from IP {{ ip }}{{ userIp }}{{ ipAddress }} triggered it.
+ {{ trans('email.footer_ps', {ipAddress: ipAddress}) }}
diff --git a/resources/views/v1/emails/footer-text.twig b/resources/views/v1/emails/footer-text.twig
index e2ec3ff9d4..54a6c6b68d 100644
--- a/resources/views/v1/emails/footer-text.twig
+++ b/resources/views/v1/emails/footer-text.twig
@@ -1,6 +1,6 @@
-Beep boop,
+{{ trans('email.closing')|raw }}
-The Firefly III Mail Robot
+{{ trans('email.signature')|raw }}
-PS: This message was sent because a request from IP {{ ip }}{{ userIp }}{{ ipAddress }} triggered it.
+{{ trans('email.footer_ps', {ipAddress: ipAddress})|raw }}
diff --git a/resources/views/v1/emails/header-html.twig b/resources/views/v1/emails/header-html.twig
index f3a4e8edc7..d4e89e3255 100644
--- a/resources/views/v1/emails/header-html.twig
+++ b/resources/views/v1/emails/header-html.twig
@@ -6,5 +6,5 @@