Merge branch '2.4' into patch-1

This commit is contained in:
VeekeeFr
2018-10-15 18:33:26 +02:00
committed by GitHub
43 changed files with 736 additions and 513 deletions

View File

@@ -176,7 +176,7 @@ class Schedule extends Model implements HasPresenter
*/
public function scopeFutureSchedules($query)
{
return $query->whereIn('status', [self::UPCOMING, self::IN_PROGRESS])->where('completed_at', '>=', Carbon::now());
return $query->whereIn('status', [self::UPCOMING, self::IN_PROGRESS])->where('scheduled_at', '>=', Carbon::now());
}
/**

View File

@@ -85,11 +85,14 @@ class ComponentStatusChangedNotification extends Notification
return (new MailMessage())
->subject(trans('notifications.component.status_update.mail.subject'))
->greeting(trans('notifications.component.status_update.mail.subject'))
->line($content)
->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.manage.manage_at_link', ['link' => cachet_route('subscribe.manage', $notifiable->verify_code)]));
->markdown('notifications.component.update', [
'componentName' => $this->component->name,
'content' => $content,
'unsubscribeText' => trans('cachet.subscriber.unsubscribe'),
'unsubscribeUrl' => cachet_route('subscribe.unsubscribe', $notifiable->verify_code),
'manageSubscriptionText' => trans('cachet.subscriber.manage_subscription'),
'manageSubscriptionUrl' => cachet_route('subscribe.manage', $notifiable->verify_code),
]);
}
/**

View File

@@ -76,15 +76,18 @@ class IncidentUpdatedNotification extends Notification
return (new MailMessage())
->subject(trans('notifications.incident.update.mail.subject'))
->greeting(trans('notifications.incident.update.mail.title', [
'name' => $this->update->incident->name,
'new_status' => $this->update->human_status,
]))
->line($content)
->action(trans('notifications.incident.update.mail.action'), cachet_route('incident', [$this->update->incident]))
->line($this->update->raw_message)
->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)]));
->markdown('notifications.incident.update', [
'incident' => $this->update->incident,
'content' => $content,
'actionText' => trans('notifications.incident.new.mail.action'),
'actionUrl' => cachet_route('incident', [$this->update->incident]),
'incidentName' => $this->update->incident->name,
'newStatus' => $this->update->human_status,
'unsubscribeText' => trans('cachet.subscriber.unsubscribe'),
'unsubscribeUrl' => cachet_route('subscribe.unsubscribe', $notifiable->verify_code),
'manageSubscriptionText' => trans('cachet.subscriber.manage_subscription'),
'manageSubscriptionUrl' => cachet_route('subscribe.manage', $notifiable->verify_code),
]);
}
/**

View File

@@ -75,10 +75,13 @@ class NewScheduleNotification extends Notification
return (new MailMessage())
->subject(trans('notifications.schedule.new.mail.subject'))
->greeting(trans('notifications.schedule.new.mail.title'))
->line($content)
->action(trans('notifications.schedule.new.mail.action'), cachet_route('schedule', [$this->schedule]))
->line(trans('cachet.subscriber.unsubscribe', ['link' => cachet_route('subscribe.unsubscribe', $notifiable->verify_code)]));
->markdown('notifications.schedule.new', [
'content' => $content,
'unsubscribeText' => trans('cachet.subscriber.unsubscribe'),
'unsubscribeUrl' => cachet_route('subscribe.unsubscribe', $notifiable->verify_code),
'manageSubscriptionText' => trans('cachet.subscriber.manage_subscription'),
'manageSubscriptionUrl' => cachet_route('subscribe.manage', $notifiable->verify_code),
]);
}
/**

787
composer.lock generated

File diff suppressed because it is too large Load Diff

View File

@@ -132,7 +132,7 @@ body.dashboard {
@extend .hidden-sm;
position: fixed;
bottom: 0;
width: 237px;
width: 235px;
z-index: 999;
ul > li {
float: left;

View File

@@ -15,14 +15,16 @@ return [
'last_updated' => 'Last updated :timestamp',
'status' => [
0 => 'Unknown',
1 => 'Operational',
2 => 'Performance Issues',
3 => 'Partial Outage',
4 => 'Major Outage',
1 => 'Operasioneel',
2 => 'Prestasieprobleme',
3 => 'Gedeeltelike Onderbreking',
4 => 'Groot Onderbreking',
],
'group' => [
'other' => 'Other Components',
],
'select_all' => 'Select All',
'deselect_all' => 'Deselect All',
],
// Incidents
@@ -80,7 +82,10 @@ return [
'button' => 'Teken aan',
'manage_subscription' => 'Manage subscription',
'manage' => [
'notifications' => 'Notifications',
'notifications_for' => 'Manage notifications for',
'no_subscriptions' => 'You\'re currently subscribed to all updates.',
'update_subscription' => 'Update Subscription',
'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
'manage_at_link' => 'Manage your subscriptions at :link',
],
@@ -133,7 +138,7 @@ return [
'home' => 'Tuiste',
'powered_by' => 'Powered by <a href="https://cachethq.io" class="links">Cachet</a>.',
'timezone' => 'Times are shown in :timezone.',
'about_this_site' => 'About This Site',
'about_this_site' => 'Aangaande Hierdie Webwerf',
'rss-feed' => 'RSS',
'atom-feed' => 'Atom',
'feed' => 'Status Feed',

View File

@@ -23,6 +23,8 @@ return [
'group' => [
'other' => 'Other Components',
],
'select_all' => 'Select All',
'deselect_all' => 'Deselect All',
],
// Incidents
@@ -80,7 +82,10 @@ return [
'button' => 'Subscribe',
'manage_subscription' => 'Manage subscription',
'manage' => [
'notifications' => 'Notifications',
'notifications_for' => 'Manage notifications for',
'no_subscriptions' => 'You\'re currently subscribed to all updates.',
'update_subscription' => 'Update Subscription',
'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
'manage_at_link' => 'Manage your subscriptions at :link',
],

View File

@@ -23,6 +23,8 @@ return [
'group' => [
'other' => 'Other Components',
],
'select_all' => 'Select All',
'deselect_all' => 'Deselect All',
],
// Incidents
@@ -80,7 +82,10 @@ return [
'button' => 'Subscribe',
'manage_subscription' => 'Manage subscription',
'manage' => [
'notifications' => 'Notifications',
'notifications_for' => 'Manage notifications for',
'no_subscriptions' => 'You\'re currently subscribed to all updates.',
'update_subscription' => 'Update Subscription',
'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
'manage_at_link' => 'Manage your subscriptions at :link',
],

View File

@@ -23,6 +23,8 @@ return [
'group' => [
'other' => 'Other Components',
],
'select_all' => 'Select All',
'deselect_all' => 'Deselect All',
],
// Incidents
@@ -80,7 +82,10 @@ return [
'button' => 'Subscribe',
'manage_subscription' => 'Manage subscription',
'manage' => [
'notifications' => 'Notifications',
'notifications_for' => 'Manage notifications for',
'no_subscriptions' => 'Aktuálně jsi přihlášen(a) ke všem upozorněním.',
'update_subscription' => 'Update Subscription',
'my_subscriptions' => 'Aktuálně jsi přihlášen(a) k následujícím upozorněním.',
'manage_at_link' => 'Manage your subscriptions at :link',
],

View File

@@ -23,6 +23,8 @@ return [
'group' => [
'other' => 'Andre komponenter',
],
'select_all' => 'Select All',
'deselect_all' => 'Deselect All',
],
// Incidents
@@ -80,7 +82,10 @@ return [
'button' => 'Abonner',
'manage_subscription' => 'Manage subscription',
'manage' => [
'notifications' => 'Notifikationer',
'notifications_for' => 'Manage notifications for',
'no_subscriptions' => 'Du abonner i øjeblikket på alle opdateringer.',
'update_subscription' => 'Update Subscription',
'my_subscriptions' => 'Du abonnere i øjeblikket på følgende opdateringer.',
'manage_at_link' => 'Manage your subscriptions at :link',
],

View File

@@ -23,6 +23,8 @@ return [
'group' => [
'other' => 'Andere Komponenten',
],
'select_all' => 'Select All',
'deselect_all' => 'Deselect All',
],
// Incidents
@@ -80,7 +82,10 @@ return [
'button' => 'Abonnieren',
'manage_subscription' => 'Manage subscription',
'manage' => [
'notifications' => 'Benachrichtigungen',
'notifications_for' => 'Manage notifications for',
'no_subscriptions' => 'Du hast im Augenblick alle Updates abonniert.',
'update_subscription' => 'Update Subscription',
'my_subscriptions' => 'Du hast im Augenblick folgende Updates abonniert.',
'manage_at_link' => 'Manage your subscriptions at :link',
],

View File

@@ -23,6 +23,8 @@ return [
'group' => [
'other' => 'Other Components',
],
'select_all' => 'Select All',
'deselect_all' => 'Deselect All',
],
// Incidents
@@ -80,7 +82,10 @@ return [
'button' => 'Subscribe',
'manage_subscription' => 'Manage subscription',
'manage' => [
'notifications' => 'Notifications',
'notifications_for' => 'Manage notifications for',
'no_subscriptions' => 'You\'re currently subscribed to all updates.',
'update_subscription' => 'Update Subscription',
'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
'manage_at_link' => 'Manage your subscriptions at :link',
],

View File

@@ -23,6 +23,8 @@ return [
'group' => [
'other' => 'Otros componentes',
],
'select_all' => 'Select All',
'deselect_all' => 'Deselect All',
],
// Incidents
@@ -80,7 +82,10 @@ return [
'button' => 'Suscríbete',
'manage_subscription' => 'Manage subscription',
'manage' => [
'notifications' => 'Notificaciones',
'notifications_for' => 'Manage notifications for',
'no_subscriptions' => 'Actualmente estás suscrito a todas las actualizaciones.',
'update_subscription' => 'Update Subscription',
'my_subscriptions' => 'Actualmente estás suscrito a las siguientes actualizaciones.',
'manage_at_link' => 'Manage your subscriptions at :link',
],

View File

@@ -23,6 +23,8 @@ return [
'group' => [
'other' => 'Other Components',
],
'select_all' => 'Select All',
'deselect_all' => 'Deselect All',
],
// Incidents
@@ -80,7 +82,10 @@ return [
'button' => 'Subscribe',
'manage_subscription' => 'Manage subscription',
'manage' => [
'notifications' => 'Notifications',
'notifications_for' => 'Manage notifications for',
'no_subscriptions' => 'You\'re currently subscribed to all updates.',
'update_subscription' => 'Update Subscription',
'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
'manage_at_link' => 'Manage your subscriptions at :link',
],

View File

@@ -23,6 +23,8 @@ return [
'group' => [
'other' => 'Other Components',
],
'select_all' => 'Select All',
'deselect_all' => 'Deselect All',
],
// Incidents
@@ -80,7 +82,10 @@ return [
'button' => 'Subscribe',
'manage_subscription' => 'Manage subscription',
'manage' => [
'notifications' => 'Notifications',
'notifications_for' => 'Manage notifications for',
'no_subscriptions' => 'You\'re currently subscribed to all updates.',
'update_subscription' => 'Update Subscription',
'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
'manage_at_link' => 'Manage your subscriptions at :link',
],

View File

@@ -23,6 +23,8 @@ return [
'group' => [
'other' => 'Autres composants',
],
'select_all' => 'Select All',
'deselect_all' => 'Deselect All',
],
// Incidents
@@ -80,7 +82,10 @@ return [
'button' => 'S\'abonner',
'manage_subscription' => 'Manage subscription',
'manage' => [
'notifications' => 'Notifications',
'notifications_for' => 'Manage notifications for',
'no_subscriptions' => 'Vous êtes actuellement abonné à toutes les mises à jour.',
'update_subscription' => 'Update Subscription',
'my_subscriptions' => 'Vous êtes actuellement abonné aux mises à jour suivantes.',
'manage_at_link' => 'Manage your subscriptions at :link',
],

View File

@@ -23,6 +23,8 @@ return [
'group' => [
'other' => 'Other Components',
],
'select_all' => 'Select All',
'deselect_all' => 'Deselect All',
],
// Incidents
@@ -80,7 +82,10 @@ return [
'button' => 'Subscribe',
'manage_subscription' => 'Manage subscription',
'manage' => [
'notifications' => 'Notifications',
'notifications_for' => 'Manage notifications for',
'no_subscriptions' => 'You\'re currently subscribed to all updates.',
'update_subscription' => 'Update Subscription',
'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
'manage_at_link' => 'Manage your subscriptions at :link',
],

View File

@@ -23,6 +23,8 @@ return [
'group' => [
'other' => 'Other Components',
],
'select_all' => 'Select All',
'deselect_all' => 'Deselect All',
],
// Incidents
@@ -80,7 +82,10 @@ return [
'button' => 'Subscribe',
'manage_subscription' => 'Manage subscription',
'manage' => [
'notifications' => 'Notifications',
'notifications_for' => 'Manage notifications for',
'no_subscriptions' => 'You\'re currently subscribed to all updates.',
'update_subscription' => 'Update Subscription',
'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
'manage_at_link' => 'Manage your subscriptions at :link',
],

View File

@@ -23,6 +23,8 @@ return [
'group' => [
'other' => 'Komponen Lain',
],
'select_all' => 'Select All',
'deselect_all' => 'Deselect All',
],
// Incidents
@@ -80,7 +82,10 @@ return [
'button' => 'Daftar',
'manage_subscription' => 'Manage subscription',
'manage' => [
'notifications' => 'Notifikasi',
'notifications_for' => 'Manage notifications for',
'no_subscriptions' => 'Anda saat ini terdaftar untuk semua update.',
'update_subscription' => 'Update Subscription',
'my_subscriptions' => 'Anda saat ini berlangganan update berikut.',
'manage_at_link' => 'Manage your subscriptions at :link',
],

View File

@@ -23,6 +23,8 @@ return [
'group' => [
'other' => 'Altri componenti',
],
'select_all' => 'Select All',
'deselect_all' => 'Deselect All',
],
// Incidents
@@ -80,7 +82,10 @@ return [
'button' => 'Iscriviti',
'manage_subscription' => 'Manage subscription',
'manage' => [
'notifications' => 'Notifiche',
'notifications_for' => 'Manage notifications for',
'no_subscriptions' => 'Sei attualmente iscritto a tutti gli aggiornamenti.',
'update_subscription' => 'Update Subscription',
'my_subscriptions' => 'Sei attualmente iscritto ai seguenti suggerimenti.',
'manage_at_link' => 'Manage your subscriptions at :link',
],

View File

@@ -23,6 +23,8 @@ return [
'group' => [
'other' => 'その他のコンポーネント',
],
'select_all' => 'Select All',
'deselect_all' => 'Deselect All',
],
// Incidents
@@ -80,7 +82,10 @@ return [
'button' => '購読',
'manage_subscription' => '購読の管理',
'manage' => [
'notifications' => 'Notifications',
'notifications_for' => 'Manage notifications for',
'no_subscriptions' => '現在、すべてのアップデートを購読しています。',
'update_subscription' => 'Update Subscription',
'my_subscriptions' => '現在、以下のアップデートを購読しています。',
'manage_at_link' => '購読の管理',
],

View File

@@ -23,6 +23,8 @@ return [
'group' => [
'other' => 'Other Components',
],
'select_all' => 'Select All',
'deselect_all' => 'Deselect All',
],
// Incidents
@@ -80,7 +82,10 @@ return [
'button' => '구독',
'manage_subscription' => 'Manage subscription',
'manage' => [
'notifications' => 'Notifications',
'notifications_for' => 'Manage notifications for',
'no_subscriptions' => 'You\'re currently subscribed to all updates.',
'update_subscription' => 'Update Subscription',
'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
'manage_at_link' => 'Manage your subscriptions at :link',
],

View File

@@ -23,6 +23,8 @@ return [
'group' => [
'other' => 'Andere componenten',
],
'select_all' => 'Select All',
'deselect_all' => 'Deselect All',
],
// Incidents
@@ -80,7 +82,10 @@ return [
'button' => 'Abonneren',
'manage_subscription' => 'Manage subscription',
'manage' => [
'notifications' => 'Notificaties',
'notifications_for' => 'Manage notifications for',
'no_subscriptions' => 'Je bent momenteel geabonneerd op alle updates.',
'update_subscription' => 'Update Subscription',
'my_subscriptions' => 'Je bent momenteel geabonneerd op de volgende updates.',
'manage_at_link' => 'Beheer uw abonnementen op: link',
],

View File

@@ -23,6 +23,8 @@ return [
'group' => [
'other' => 'Andre komponenter',
],
'select_all' => 'Select All',
'deselect_all' => 'Deselect All',
],
// Incidents
@@ -80,7 +82,10 @@ return [
'button' => 'Abonner',
'manage_subscription' => 'Manage subscription',
'manage' => [
'notifications' => 'Notifications',
'notifications_for' => 'Manage notifications for',
'no_subscriptions' => 'Du abonnerer for øyeblikket på alle oppdateringer.',
'update_subscription' => 'Update Subscription',
'my_subscriptions' => 'Du abonnerer for øyeblikket på følgende oppdateringer.',
'manage_at_link' => 'Manage your subscriptions at :link',
],

View File

@@ -23,6 +23,8 @@ return [
'group' => [
'other' => 'Pozostałe komponenty',
],
'select_all' => 'Select All',
'deselect_all' => 'Deselect All',
],
// Incidents
@@ -80,7 +82,10 @@ return [
'button' => 'Abonnieren',
'manage_subscription' => 'Manage subscription',
'manage' => [
'notifications' => 'Benachrichtigungen',
'notifications_for' => 'Manage notifications for',
'no_subscriptions' => 'Jesteś obecnie zapisany na wszystkie aktualizacje.',
'update_subscription' => 'Update Subscription',
'my_subscriptions' => 'Jesteś obecnie zapisany na poniższe aktualizacje.',
'manage_at_link' => 'Manage your subscriptions at :link',
],

View File

@@ -23,6 +23,8 @@ return [
'group' => [
'other' => 'Outros componentes',
],
'select_all' => 'Select All',
'deselect_all' => 'Deselect All',
],
// Incidents
@@ -80,7 +82,10 @@ return [
'button' => 'Inscreva-se',
'manage_subscription' => 'Manage subscription',
'manage' => [
'notifications' => 'Notificações',
'notifications_for' => 'Manage notifications for',
'no_subscriptions' => 'Você está atualmente inscrito a todas as atualizações.',
'update_subscription' => 'Update Subscription',
'my_subscriptions' => 'Você está atualmente inscrito para as seguintes atualizações.',
'manage_at_link' => 'Manage your subscriptions at :link',
],

View File

@@ -23,6 +23,8 @@ return [
'group' => [
'other' => 'Other Components',
],
'select_all' => 'Select All',
'deselect_all' => 'Deselect All',
],
// Incidents
@@ -80,7 +82,10 @@ return [
'button' => 'Subscrever',
'manage_subscription' => 'Manage subscription',
'manage' => [
'notifications' => 'Notificações',
'notifications_for' => 'Manage notifications for',
'no_subscriptions' => 'You\'re currently subscribed to all updates.',
'update_subscription' => 'Update Subscription',
'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
'manage_at_link' => 'Manage your subscriptions at :link',
],

View File

@@ -23,6 +23,8 @@ return [
'group' => [
'other' => 'Alte Componente',
],
'select_all' => 'Select All',
'deselect_all' => 'Deselect All',
],
// Incidents
@@ -80,7 +82,10 @@ return [
'button' => 'Abonează-te',
'manage_subscription' => 'Manage subscription',
'manage' => [
'notifications' => 'Notificări',
'notifications_for' => 'Manage notifications for',
'no_subscriptions' => 'Acum eşti abonat la toate actualizările.',
'update_subscription' => 'Update Subscription',
'my_subscriptions' => 'Acum eşti abonat la următoarele actualizări.',
'manage_at_link' => 'Manage your subscriptions at :link',
],

View File

@@ -23,6 +23,8 @@ return [
'group' => [
'other' => 'Другие компоненты',
],
'select_all' => 'Select All',
'deselect_all' => 'Deselect All',
],
// Incidents
@@ -80,7 +82,10 @@ return [
'button' => 'Подписаться',
'manage_subscription' => 'Manage subscription',
'manage' => [
'notifications' => 'Уведомления',
'notifications_for' => 'Manage notifications for',
'no_subscriptions' => 'Вы подписаны на все изменения.',
'update_subscription' => 'Update Subscription',
'my_subscriptions' => 'Вы подписаны на следующие изменения.',
'manage_at_link' => 'Manage your subscriptions at :link',
],

View File

@@ -23,6 +23,8 @@ return [
'group' => [
'other' => 'Other Components',
],
'select_all' => 'Select All',
'deselect_all' => 'Deselect All',
],
// Incidents
@@ -80,7 +82,10 @@ return [
'button' => 'Subscribe',
'manage_subscription' => 'Manage subscription',
'manage' => [
'notifications' => 'Notifications',
'notifications_for' => 'Manage notifications for',
'no_subscriptions' => 'You\'re currently subscribed to all updates.',
'update_subscription' => 'Update Subscription',
'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
'manage_at_link' => 'Manage your subscriptions at :link',
],

View File

@@ -23,6 +23,8 @@ return [
'group' => [
'other' => 'Other Components',
],
'select_all' => 'Select All',
'deselect_all' => 'Deselect All',
],
// Incidents
@@ -80,7 +82,10 @@ return [
'button' => 'Prenumerera',
'manage_subscription' => 'Manage subscription',
'manage' => [
'notifications' => 'Notifieringar',
'notifications_for' => 'Manage notifications for',
'no_subscriptions' => 'You\'re currently subscribed to all updates.',
'update_subscription' => 'Update Subscription',
'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
'manage_at_link' => 'Manage your subscriptions at :link',
],

View File

@@ -23,6 +23,8 @@ return [
'group' => [
'other' => 'Other Components',
],
'select_all' => 'Select All',
'deselect_all' => 'Deselect All',
],
// Incidents
@@ -80,7 +82,10 @@ return [
'button' => 'Subscribe',
'manage_subscription' => 'Manage subscription',
'manage' => [
'notifications' => 'Notifications',
'notifications_for' => 'Manage notifications for',
'no_subscriptions' => 'You\'re currently subscribed to all updates.',
'update_subscription' => 'Update Subscription',
'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
'manage_at_link' => 'Manage your subscriptions at :link',
],

View File

@@ -23,6 +23,8 @@ return [
'group' => [
'other' => 'Other Components',
],
'select_all' => 'Select All',
'deselect_all' => 'Deselect All',
],
// Incidents
@@ -80,7 +82,10 @@ return [
'button' => 'Subscribe',
'manage_subscription' => 'Manage subscription',
'manage' => [
'notifications' => 'Notifications',
'notifications_for' => 'Manage notifications for',
'no_subscriptions' => 'You\'re currently subscribed to all updates.',
'update_subscription' => 'Update Subscription',
'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
'manage_at_link' => 'Manage your subscriptions at :link',
],

View File

@@ -23,6 +23,8 @@ return [
'group' => [
'other' => 'Other Components',
],
'select_all' => 'Select All',
'deselect_all' => 'Deselect All',
],
// Incidents
@@ -80,7 +82,10 @@ return [
'button' => 'Subscribe',
'manage_subscription' => 'Manage subscription',
'manage' => [
'notifications' => 'Notifications',
'notifications_for' => 'Manage notifications for',
'no_subscriptions' => 'You\'re currently subscribed to all updates.',
'update_subscription' => 'Update Subscription',
'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
'manage_at_link' => 'Manage your subscriptions at :link',
],

View File

@@ -23,6 +23,8 @@ return [
'group' => [
'other' => 'Other Components',
],
'select_all' => 'Select All',
'deselect_all' => 'Deselect All',
],
// Incidents
@@ -80,7 +82,10 @@ return [
'button' => 'Subscribe',
'manage_subscription' => 'Manage subscription',
'manage' => [
'notifications' => 'Notifications',
'notifications_for' => 'Manage notifications for',
'no_subscriptions' => 'You\'re currently subscribed to all updates.',
'update_subscription' => 'Update Subscription',
'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
'manage_at_link' => 'Manage your subscriptions at :link',
],

View File

@@ -23,6 +23,8 @@ return [
'group' => [
'other' => '其他组件',
],
'select_all' => 'Select All',
'deselect_all' => 'Deselect All',
],
// Incidents
@@ -80,7 +82,10 @@ return [
'button' => '订阅',
'manage_subscription' => 'Manage subscription',
'manage' => [
'notifications' => '通知',
'notifications_for' => 'Manage notifications for',
'no_subscriptions' => '您当前已订阅所有更新。',
'update_subscription' => 'Update Subscription',
'my_subscriptions' => '您当前已订阅下列更新',
'manage_at_link' => '在 :link 管理你的订阅',
],

View File

@@ -23,6 +23,8 @@ return [
'group' => [
'other' => 'Other Components',
],
'select_all' => 'Select All',
'deselect_all' => 'Deselect All',
],
// Incidents
@@ -80,7 +82,10 @@ return [
'button' => 'Subscribe',
'manage_subscription' => 'Manage subscription',
'manage' => [
'notifications' => '通知',
'notifications_for' => 'Manage notifications for',
'no_subscriptions' => 'You\'re currently subscribed to all updates.',
'update_subscription' => 'Update Subscription',
'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
'manage_at_link' => 'Manage your subscriptions at :link',
],

View File

@@ -23,6 +23,8 @@ return [
'group' => [
'other' => 'crwdns883:0crwdne883:0',
],
'select_all' => 'crwdns1510:0crwdne1510:0',
'deselect_all' => 'crwdns1512:0crwdne1512:0',
],
// Incidents
@@ -80,7 +82,10 @@ return [
'button' => 'crwdns909:0crwdne909:0',
'manage_subscription' => 'crwdns1448:0crwdne1448:0',
'manage' => [
'notifications' => 'crwdns1514:0crwdne1514:0',
'notifications_for' => 'crwdns1516:0crwdne1516:0',
'no_subscriptions' => 'crwdns910:0crwdne910:0',
'update_subscription' => 'crwdns1518:0crwdne1518:0',
'my_subscriptions' => 'crwdns911:0crwdne911:0',
'manage_at_link' => 'crwdns1432:0crwdne1432:0',
],

View File

@@ -3,6 +3,7 @@
@section('content')
@include('partials.modules.messages')
@include('partials.modules.status')
@include('partials.about-app')
@include('partials.modules.components')
@include('partials.modules.metrics')
@include('partials.modules.stickied')

View File

@@ -0,0 +1,11 @@
@component('mail::message')
# {{ trans('notifications.component.status_update.mail.greeting') }}
{{ $content }}
Thanks,<br>
{{ Config::get('setting.app_name') }}
@include('notifications.partials.subscription')
@endcomponent

View File

@@ -0,0 +1,11 @@
@component('mail::message')
# {{ trans('notifications.incident.update.mail.title', ['name' => $incidentName, 'new_status' => $newStatus]) }}
{{ $content }}
Thanks,<br>
{{ Config::get('setting.app_name') }}
@include('notifications.partials.subscription')
@endcomponent

View File

@@ -0,0 +1,11 @@
@component('mail::message')
# {{ trans('notifications.schedule.new.mail.title') }}
{{ $content }}
Thanks,<br>
{{ Config::get('setting.app_name') }}
@include('notifications.partials.subscription')
@endcomponent