kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-08-28 17:07:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop

Browse Source
This commit is contained in:
James Cole
2020-05-29 06:09:27 +02:00
parent a7ab5b7504 d3cd657501
commit 3c1361e377
34 changed files with 194 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Jobs/MailError.php
View File

@@ -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'));
}
}
);

2
app/Mail/AccessTokenCreatedMail.php
View File

@@ -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'));
}
}

2
app/Mail/AdminTestMail.php
View File

@@ -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'));
}
}

2
app/Mail/ConfirmEmailChangeMail.php
View File

@@ -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'));
}
}

2
app/Mail/OAuthTokenCreatedMail.php
View File

@@ -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'));
}
}

2
app/Mail/RegisteredUser.php
View File

@@ -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'));
}
}

2
app/Mail/ReportNewJournalsMail.php
View File

@@ -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

2
app/Mail/RequestedNewPassword.php
View File

@@ -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'));
}
}

2
app/Mail/UndoEmailChangeMail.php
View File

@@ -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'));
}
}

96
resources/lang/en_US/email.php Normal file
View File

@@ -0,0 +1,96 @@
<?php
/**
* email.php
* Copyright (c) 2019 james@firefly-iii.org
*
* This file is part of Firefly III (https://github.com/firefly-iii).
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
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 <strong>all</strong> 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 <a style="color:#337ab7" href=":address">Firefly III</a>. 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 <a style="color:#337ab7" href=":address/password/reset">the password reset tool</a>.',
'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 <a style="color:#337ab7" href="https://docs.firefly-iii.org/about-firefly-iii/grand-theory">grand theory</a>.',
'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 <strong>must</strong> 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: <strong>:email</strong>',
'email_change_new' => 'The new email address is: :email',
'email_change_new_strong' => 'The new email address is: <strong>:email</strong>',
'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 <span style="font-family: monospace;">:url</span>.',
'oauth_created_explanation' => 'With this client, they can access <strong>all</strong> 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' => '<strong>PLEASE</strong> 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: <span style="font-family: monospace;">:errorMessage</span>.',
'error_type' => 'The error was of type ":class".',
'error_timestamp' => 'The error occurred on/at: :time.',
'error_location' => 'This error occurred in file "<span style="font-family: monospace;">:file</span>" on line :line with code :code.',
'error_user' => 'The error was encountered by user #:id, <a href="mailto::email">:email</a>.',
'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 <a href="mailto:james@firefly-iii.org?subject=BUG!">james@firefly-iii.org</a>. This can help fix the bug you just encountered.',
'error_github_html' => 'If you prefer, you can also open a new issue on <a href="https://github.com/firefly-iii/firefly-iii/issues">GitHub</a>.',
'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:'
];

6
resources/views/v1/emails/access-token-created-html.twig
View File

@@ -1,13 +1,13 @@
{% include 'emails.header-html' %}
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
Somebody (hopefully you) just created a new Firefly III API Access Token for your user account.
{{ trans('email.access_token_created_body') }}
</p>
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
With this token, they can access <strong>all</strong> of your financial records through the Firefly III API.
{{ trans('email.access_token_created_explanation')|raw }}
</p>
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
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') }) }}
</p>
{% include 'emails.footer-html' %}

6
resources/views/v1/emails/access-token-created-text.twig
View File

@@ -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' %}

2
resources/views/v1/emails/admin-test-html.twig
View File

@@ -1,5 +1,5 @@
{% include 'emails.header-html' %}
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
This is a test message from your Firefly III instance. It was sent to {{ email }}.
{{ trans('email.admin_test_body', {email: email })}}
</p>
{% include 'emails.footer-html' %}

2
resources/views/v1/emails/admin-test-text.twig
View File

@@ -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' %}

20
resources/views/v1/emails/confirm-account-html.twig
View File

@@ -1,20 +0,0 @@
{% include 'emails.header-html' %}
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
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!
</p>
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
To active your account please follow the link below.
</p>
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
<strong>PLEASE</strong> verify that this activation link goes to the Firefly III installation you expect it to be:
</p>
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
<a href="{{ route }}" style="color:#337ab7">{{ route }}</a>
</p>
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
You should be redirected to the index page right away. The link expires in about four hours.
</p>
{% include 'emails.footer-html' %}

11
resources/views/v1/emails/confirm-account-text.twig
View File

@@ -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' %}

8
resources/views/v1/emails/confirm-email-change-html.twig
View File

@@ -1,15 +1,15 @@
{% include 'emails.header-html' %}
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
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')}}
</p>
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
The old email address was: {{ oldEmail }}
{{trans('email.email_change_old', { email: oldEmail }) }}
</p>
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
The new email address is: <strong>{{ newEmail }}</strong>
{{trans('email.email_change_new_strong', { email: newEmail })|raw }}
</p>
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
You cannot use Firefly III until you confirm this change. Please follow the link below to do so.
{{ trans('email.email_change_instructions')}}
</p>
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">

9
resources/views/v1/emails/confirm-email-change-text.twig
View File

@@ -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' %}

28
resources/views/v1/emails/error-html.twig
View File

@@ -1,46 +1,44 @@
{% include 'emails.header-html' %}
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
Firefly III v{{ version }} ran into an error: <span style="font-family: monospace;">{{ errorMessage }}</span>
{{ trans('email.error_intro', { version: version, errorMessage: errorMessage })|raw }}
</p>
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
The error was of type "{{ class }}".
{{ trans('email.error_type', {class: class }) }}
</p>
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
The error occurred on/at: {{ time }}.
{{ trans('email.error_timestamp', {time: time }) }}
</p>
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
This error occurred in file <span style="font-family: monospace;">{{ file }}</span> on line {{ line }} with code {{ code }}.
{{ trans('email.error_location', { file: file, line: line, code: code })|raw }}
</p>
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
{% if loggedIn %}
The error was encountered by user #{{ user.id }}, <a href="mailto:{{ user.email }}">{{ user.email }}</a>.
{{ 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 %}
</p>
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
The IP address related to this error is: {{ ip }}<br />
URL is: {{ url }}<br>
User agent: {{ userAgent }}
{{ trans('email.error_ip', { ip: ip }) }}<br />
{{ trans('email.error_url', {url :url }) }}<br />
{{ trans('email.error_user_agent', {userAgent: userAgent }) }}
</p>
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
The full stacktrace is below. If you think this is a bug in Firefly III, you
can forward this message to
<a href="mailto:james@firefly-iii.org?subject=BUG!">james@firefly-iii.org</a>.
This can help fix the bug you just encountered.
{{ trans('email.error_stacktrace')|raw }}
</p>
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
If you prefer, you can also open a new issue on <a href="https://github.com/firefly-iii/firefly-iii/issues">GitHub</a>.
{{ trans('email.error_github_html')|raw }}
</p>
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
The full stacktrace is below:</p>
{{ trans('email.error_stacktrace_below') }}</p>
<p style="font-family: monospace;font-size:11px;color:#aaa">
{{ stackTrace|nl2br }}
</p>

30
resources/views/v1/emails/error-text.twig
View File

@@ -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' %}

6
resources/views/v1/emails/footer-html.twig
View File

@@ -1,12 +1,12 @@
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
Beep boop,
{{ trans('email.closing') }}
</p>
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
The Firefly III Mail Robot
{{ trans('email.signature') }}
</p>
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:11px;color:#aaa;">
PS: This message was sent because a request from IP {{ ip }}{{ userIp }}{{ ipAddress }} triggered it.
{{ trans('email.footer_ps', {ipAddress: ipAddress}) }}
</p>
</body>

6
resources/views/v1/emails/footer-text.twig
View File

@@ -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 }}

2
resources/views/v1/emails/header-html.twig
View File

@@ -6,5 +6,5 @@
</head>
<body>
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
Hi there,
{{ trans('email.greeting') }}
</p>

2
resources/views/v1/emails/header-text.twig
View File

@@ -1,2 +1,2 @@
Hi there,
{{ trans('email.greeting')|raw }}

7
resources/views/v1/emails/oauth-client-created-html.twig
View File

@@ -1,14 +1,13 @@
{% include 'emails.header-html' %}
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
Somebody (hopefully you) just created a new Firefly III API OAuth Client for your user account. It's labeled "{{ client.name }}"
and has callback URL <span style="font-family: monospace;">{{ client.redirect }}</span>.
{{ trans('email.oauth_created_body', { name:client.name, url: client.redirect })|raw }}
</p>
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
With this client, they can access <strong>all</strong> of your financial records through the Firefly III API.
{{ trans('email.oauth_created_explanation')|raw }}
</p>
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
If this wasn't you, please revoke this client as soon as possible at {{ route('profile.index') }}.
{{ trans('email.oauth_created_undo', { url:route('profile.index')}) }}
</p>
{% include 'emails.footer-html' %}

8
resources/views/v1/emails/oauth-client-created-text.twig
View File

@@ -1,9 +1,7 @@
{% include 'emails.header-text' %}
Somebody (hopefully you) just created a new Firefly III API OAuth Client for your user account. It's labeled "{{ client.name }}" and has callback URL:
{{ trans('email.oauth_created_body', {name: client.name, url: client.redirect })|striptags|raw }}
{{ client.redirect }}
{{ trans('email.oauth_created_explanation')|striptags|raw }}
With this client, they can access <strong>all</strong> of your financial records through the Firefly III API.
If this wasn't you, please revoke this client as soon as possible at {{ route('profile.index') }}.
{{ trans('email.oauth_created_undo', { url:route('profile.index')})|raw }}
{% include 'emails.footer-text' %}

4
resources/views/v1/emails/password-html.twig
View File

@@ -1,10 +1,10 @@
{% include 'emails.header-html' %}
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
Somebody tried to reset your password. If it was you, please follow the link below to do so.
{{ trans('email.reset_pw_instructions') }}
</p>
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
<strong>PLEASE</strong> verify that the link actually goes to the Firefly III you expect it to go!
{{ trans('email.reset_pw_warning')|raw }}
</p>
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">

4
resources/views/v1/emails/password-text.twig
View File

@@ -1,7 +1,7 @@
{% include 'emails.header-text' %}
Somebody tried to reset your password. If it was you, please follow the link below to do so.
{{ trans('email.reset_pw_instructions')|raw }}
PLEASE verify that the link actually goes to the Firefly III you expect it to go!
{{ trans('email.reset_pw_warning')|striptags|raw }}
{{ url }}
{% include 'emails.footer-text' %}

12
resources/views/v1/emails/registered-html.twig
View File

@@ -1,18 +1,20 @@
{% include 'emails.header-html' %}
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
Welcome to <a style="color:#337ab7" href="{{ address }}">Firefly III</a>. Your registration has made it, and this email is here to confirm it. Yay!
{{ trans('email.registered_welcome', {address: address})|raw }}
</p>
<ul>
<li style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
If you have forgotten your password already, please reset it using
<a style="color:#337ab7" href="{{ address }}/password/reset">the password reset tool</a>.
{{ trans('email.registered_pw', {address: address})|raw }}
</li>
<li style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
There is a help-icon in the top right corner of each page. If you need help, click it!
{{ trans('email.registered_help')}}
</li>
<li style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
If you haven't already, please read the <a style="color:#337ab7" href="https://docs.firefly-iii.org/about-firefly-iii/grand-theory">grand theory</a>.
{{ trans('email.registered_doc_html')|raw }}
</li>
</ul>
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
{{ trans('email.registered_closing')}}
</p>
{% include 'emails.footer-html' %}

17
resources/views/v1/emails/registered-text.twig
View File

@@ -1,19 +1,20 @@
{% include 'emails.header-text' %}
Welcome to Firefly III. Your registration has made it, and this email is here to confirm it. Yay!
* If you have forgotten your password already, please reset it using the password reset tool.
* There is a help-icon in the top right corner of each page. If you need help, click it!
* If you haven't already, please read the first use guide and the full description.
{{ trans('email.registered_welcome')|striptags|raw }}
Enjoy!
* {{ trans('email.registered_pw')|striptags|raw }}
* {{ trans('email.registered_help')|raw }}
* {{ trans('email.registered_doc_text')|raw }}
Firefly III:
{{ trans('email.registered_closing')|raw }}
{{ trans('email.registered_firefly_iii_link')|raw }}
{{ address }}
Password reset:
{{ trans('email.registered_pw_reset_link')|raw }}
{{ address }}/password/reset
Documentation:
{{ trans('email.registered_doc_link')}}
https://github.com/firefly-iii/firefly-iii
https://firefly-iii.org/

7
resources/views/v1/emails/report-new-journals-html.twig
View File

@@ -1,11 +1,6 @@
{% include 'emails.header-html' %}
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
{% if transformed|length == 1 %}
Firefly III has created a transaction for you. You can find it in your Firefly III installation:
{% endif %}
{% if transformed|length > 1 %}
Firefly III has created {{ groups.count }} transactions for you. You can find them in your Firefly III installation:
{% endif %}
{{ trans_choice('email.new_journals_header', transformed|length ) }}
</p>
<!-- loop groups -->

3
resources/views/v1/emails/report-new-journals-text.twig
View File

@@ -1,6 +1,5 @@
{% include 'emails.header-text' %}
{% if transformed|length == 1 %}Firefly III has created a transaction for you. You can find it in your Firefly III installation:{% endif %}
{% if transformed|length > 1 %}Firefly III has created {{ groups.count }} transactions for you. You can find them in your Firefly III installation:{% endif %}
{{ trans_choice('email.new_journals_header', transformed|length )|raw }}
{% for group in transformed %}

11
resources/views/v1/emails/undo-email-change-html.twig
View File

@@ -1,18 +1,17 @@
{% include 'emails.header-html' %}
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
You or somebody with access to your Firefly III account has changed your email address.
If you did not expect this to happen, you <strong>must</strong> follow the "undo"-link below to protect your account!
{{ trans('email.email_change_body_to_old')|raw }}
</p>
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
If you initiated this change, you may safely ignore this message.
{{ trans('email.email_change_ignore') }}
</p>
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
The old email address was: <strong>{{ oldEmail }}</strong>
{{trans('email.email_change_old_strong', { email: oldEmail })|raw }}
</p>
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
The new email address is: {{ newEmail }}
{{trans('email.email_change_new', { email: newEmail }) }}
</p>
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
To undo the change, follow this link: <a href="{{ uri }}">{{ uri }}</a>
{{trans('email.email_change_undo_link')}} <a href="{{ uri }}">{{ uri }}</a>
</p>
{% include 'emails.footer-html' %}

11
resources/views/v1/emails/undo-email-change-text.twig
View File

@@ -1,12 +1,11 @@
{% 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 to happen,
you must follow the "undo"-link below to protect your account!
{{ trans('email.email_change_body_to_old')|striptags|raw }}
If you initiated this change, you may safely ignore this message.
{{ trans('email.email_change_ignore')|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 }}
To undo the change, follow this link: {{ uri }}
{{ trans('email.email_change_undo_link')|raw }} {{ uri }}
{% include 'emails.footer-text' %}