lucas.mathieu/cachet-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2890 from uxen-ab/subscriber-not-able-to-change-his-subscriptions-2887

Browse Source 
Adds a line in the notification email to manage its subscriptions.
This commit is contained in:
James Brooks
2018-03-27 19:24:05 +01:00
committed by GitHub
parent e05c6f9868 d63de58f8f
commit edbb0f6031
4 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Notifications/Component/ComponentStatusChangedNotification.php
+2 -1
View File
@@ -88,7 +88,8 @@ class ComponentStatusChangedNotification extends Notification
->greeting(trans('notifications.component.status_update.mail.subject')) ->greeting(trans('notifications.component.status_update.mail.subject'))
->line($content) ->line($content)
->action(trans('notifications.component.status_update.mail.action'), cachet_route('status-page')) ->action(trans('notifications.component.status_update.mail.action'), cachet_route('status-page'))
->line(trans('cachet.subscriber.unsubscribe', ['link' => cachet_route('subscribe.unsubscribe', $notifiable->verify_code)])); ->line(trans('cachet.subscriber.unsubscribe', ['link' => cachet_route('subscribe.unsubscribe', $notifiable->verify_code)]))
->line(trans('cachet.subscriber.manage.manage_at_link', ['link' => cachet_route('subscribe.manage', $notifiable->verify_code)]));
} }
/** /**
app/Notifications/Incident/NewIncidentNotification.php
+2 -1
View File
@@ -79,7 +79,8 @@ class NewIncidentNotification extends Notification
->line($content) ->line($content)
->action(trans('notifications.incident.new.mail.action'), cachet_route('incident', [$this->incident])) ->action(trans('notifications.incident.new.mail.action'), cachet_route('incident', [$this->incident]))
->markdown($this->incident->message) ->markdown($this->incident->message)
->line(trans('cachet.subscriber.unsubscribe', ['link' => cachet_route('subscribe.unsubscribe', $notifiable->verify_code)])); ->line(trans('cachet.subscriber.unsubscribe', ['link' => cachet_route('subscribe.unsubscribe', $notifiable->verify_code)]))
->line(trans('cachet.subscriber.manage.manage_at_link', ['link' => cachet_route('subscribe.manage', $notifiable->verify_code)]));
} }
/** /**
app/Notifications/IncidentUpdate/IncidentUpdatedNotification.php
+3 -1
View File
@@ -83,7 +83,9 @@ class IncidentUpdatedNotification extends Notification
->line($content) ->line($content)
->action(trans('notifications.incident.update.mail.action'), cachet_route('incident', [$this->update->incident])) ->action(trans('notifications.incident.update.mail.action'), cachet_route('incident', [$this->update->incident]))
->markdown($this->update->message) ->markdown($this->update->message)
->line(trans('cachet.subscriber.unsubscribe', ['link' => cachet_route('subscribe.unsubscribe', $notifiable->verify_code)])); ->line(trans('cachet.subscriber.unsubscribe', ['link' => cachet_route('subscribe.unsubscribe', $notifiable->verify_code)]))
->line(trans('cachet.subscriber.manage.manage_at_link', ['link' => cachet_route('subscribe.manage', $notifiable->verify_code)]));
} }
/** /**
resources/lang/en/cachet.php
+1
View File
@@ -81,6 +81,7 @@ return [
'manage' => [ 'manage' => [
'no_subscriptions' => 'You\'re currently subscribed to all updates.', 'no_subscriptions' => 'You\'re currently subscribed to all updates.',
'my_subscriptions' => 'You\'re currently subscribed to the following updates.', 'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
'manage_at_link' => 'Manage your subscriptions at :link'
], ],
'email' => [ 'email' => [
'subscribe' => 'Subscribe to email updates.', 'subscribe' => 'Subscribe to email updates.',