kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-05-04 05:06:37 +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'));
}
}