mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-12-12 01:42:32 +00:00
Auto commit for release 'branch-v6.2' on 2024-12-14
This commit is contained in:
@@ -61,7 +61,8 @@ class UnknownUserLoginAttempt extends Notification
|
||||
{
|
||||
return new MailMessage()
|
||||
->markdown('emails.owner.unknown-user', ['address' => $this->address])
|
||||
->subject((string) trans('email.unknown_user_subject'));
|
||||
->subject((string) trans('email.unknown_user_subject'))
|
||||
;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -84,7 +85,8 @@ class UnknownUserLoginAttempt extends Notification
|
||||
public function toPushover(OwnerNotifiable $notifiable): PushoverMessage
|
||||
{
|
||||
return PushoverMessage::create((string) trans('email.unknown_user_message', ['address' => $this->address]))
|
||||
->title((string) trans('email.unknown_user_subject'));
|
||||
->title((string) trans('email.unknown_user_subject'))
|
||||
;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -46,7 +46,6 @@ class UserInvitation extends Notification
|
||||
private InvitedUser $invitee;
|
||||
private OwnerNotifiable $owner;
|
||||
|
||||
|
||||
public function __construct(OwnerNotifiable $owner, InvitedUser $invitee)
|
||||
{
|
||||
$this->invitee = $invitee;
|
||||
@@ -69,7 +68,8 @@ class UserInvitation extends Notification
|
||||
{
|
||||
return (new MailMessage())
|
||||
->markdown('emails.invitation-created', ['email' => $this->invitee->user->email, 'invitee' => $this->invitee->email])
|
||||
->subject((string) trans('email.invitation_created_subject'));
|
||||
->subject((string) trans('email.invitation_created_subject'))
|
||||
;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -95,7 +95,8 @@ class UserInvitation extends Notification
|
||||
Log::debug('Now in toPushover() for UserInvitation');
|
||||
|
||||
return PushoverMessage::create((string) trans('email.invitation_created_body', ['email' => $this->invitee->user->email, 'invitee' => $this->invitee->email]))
|
||||
->title((string) trans('email.invitation_created_subject'));
|
||||
->title((string) trans('email.invitation_created_subject'))
|
||||
;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -46,7 +46,6 @@ class UserRegistration extends Notification
|
||||
private OwnerNotifiable $owner;
|
||||
private User $user;
|
||||
|
||||
|
||||
public function __construct(OwnerNotifiable $owner, User $user)
|
||||
{
|
||||
$this->user = $user;
|
||||
@@ -69,7 +68,8 @@ class UserRegistration extends Notification
|
||||
{
|
||||
return (new MailMessage())
|
||||
->markdown('emails.registered-admin', ['email' => $this->user->email, 'id' => $this->user->id])
|
||||
->subject((string) trans('email.registered_subject_admin'));
|
||||
->subject((string) trans('email.registered_subject_admin'))
|
||||
;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -95,7 +95,8 @@ class UserRegistration extends Notification
|
||||
Log::debug('Now in toPushover() for UserRegistration');
|
||||
|
||||
return PushoverMessage::create((string) trans('email.admin_new_user_registered', ['email' => $this->user->email, 'invitee' => $this->user->email]))
|
||||
->title((string) trans('email.registered_subject_admin'));
|
||||
->title((string) trans('email.registered_subject_admin'))
|
||||
;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -44,7 +44,6 @@ class VersionCheckResult extends Notification
|
||||
|
||||
private string $message;
|
||||
|
||||
|
||||
public function __construct(string $message)
|
||||
{
|
||||
$this->message = $message;
|
||||
@@ -66,7 +65,8 @@ class VersionCheckResult extends Notification
|
||||
{
|
||||
return (new MailMessage())
|
||||
->markdown('emails.new-version', ['message' => $this->message])
|
||||
->subject((string) trans('email.new_version_email_subject'));
|
||||
->subject((string) trans('email.new_version_email_subject'))
|
||||
;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -92,7 +92,8 @@ class VersionCheckResult extends Notification
|
||||
Log::debug('Now in toPushover() for VersionCheckResult');
|
||||
|
||||
return PushoverMessage::create($this->message)
|
||||
->title((string) trans('email.new_version_email_subject'));
|
||||
->title((string) trans('email.new_version_email_subject'))
|
||||
;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -101,9 +102,10 @@ class VersionCheckResult extends Notification
|
||||
public function toSlack(OwnerNotifiable $notifiable)
|
||||
{
|
||||
return new SlackMessage()->content($this->message)
|
||||
->attachment(static function ($attachment): void {
|
||||
$attachment->title('Firefly III @ GitHub', 'https://github.com/firefly-iii/firefly-iii/releases');
|
||||
});
|
||||
->attachment(static function ($attachment): void {
|
||||
$attachment->title('Firefly III @ GitHub', 'https://github.com/firefly-iii/firefly-iii/releases');
|
||||
})
|
||||
;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user