From b016e420fea8f40e4e7f9279c5789bfcf68fbbe1 Mon Sep 17 00:00:00 2001 From: nupplaPhil Date: Fri, 24 Jan 2020 18:39:50 +0100 Subject: [PATCH] notify_type => str_type str_notifytype => st_notification_type --- src/Model/Notification.php | 4 ++-- src/Module/Notifications/Introductions.php | 8 ++++---- view/templates/notifications/intros.tpl | 2 +- view/templates/notifications/suggestions.tpl | 2 +- view/theme/frio/templates/notifications/intros.tpl | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Model/Notification.php b/src/Model/Notification.php index b7e10a0f3..8b0e0f1a5 100644 --- a/src/Model/Notification.php +++ b/src/Model/Notification.php @@ -623,7 +623,7 @@ final class Notification $intro = [ 'label' => 'friend_suggestion', - 'notify_type' => $this->l10n->t('Friend Suggestion'), + 'str_type' => $this->l10n->t('Friend Suggestion'), 'intro_id' => $intro['intro_id'], 'madeby' => $intro['name'], 'madeby_url' => $intro['url'], @@ -657,7 +657,7 @@ final class Notification } $intro = [ 'label' => (($intro['network'] !== Protocol::OSTATUS) ? 'friend_request' : 'follower'), - 'notify_type' => (($intro['network'] !== Protocol::OSTATUS) ? $this->l10n->t('Friend/Connect Request') : $this->l10n->t('New Follower')), + 'str_type' => (($intro['network'] !== Protocol::OSTATUS) ? $this->l10n->t('Friend/Connect Request') : $this->l10n->t('New Follower')), 'dfrn_id' => $intro['issued-id'], 'uid' => $_SESSION['uid'], 'intro_id' => $intro['intro_id'], diff --git a/src/Module/Notifications/Introductions.php b/src/Module/Notifications/Introductions.php index 9b64e7691..dc62110e2 100644 --- a/src/Module/Notifications/Introductions.php +++ b/src/Module/Notifications/Introductions.php @@ -63,8 +63,8 @@ class Introductions extends BaseNotifications case 'friend_suggestion': $notificationContent[] = Renderer::replaceMacros($notificationSuggestions, [ '$type' => $notification['label'], - '$str_notifytype' => DI::l10n()->t('Notification type:'), - '$notify_type' => $notification['notify_type'], + 'str_notification_type' => DI::l10n()->t('Notification type:'), + 'str_type' => $notification['str_type'], '$intro_id' => $notification['intro_id'], '$lbl_madeby' => DI::l10n()->t('Suggested by:'), '$madeby' => $notification['madeby'], @@ -148,8 +148,8 @@ class Introductions extends BaseNotifications $notificationContent[] = Renderer::replaceMacros($notificationTemplate, [ '$type' => $notification['label'], '$header' => $header, - '$str_notifytype' => DI::l10n()->t('Notification type:'), - '$notify_type' => $notification['notify_type'], + 'str_notification_type' => DI::l10n()->t('Notification type:'), + 'str_type' => $notification['notifytype'], '$dfrn_text' => $dfrn_text, '$dfrn_id' => $notification['dfrn_id'], '$uid' => $notification['uid'], diff --git a/view/templates/notifications/intros.tpl b/view/templates/notifications/intros.tpl index 1f7f838bc..808f155b9 100644 --- a/view/templates/notifications/intros.tpl +++ b/view/templates/notifications/intros.tpl @@ -2,7 +2,7 @@
-

{{$str_notifytype}} {{$notify_type}}

+

{{$str_notification_type}} {{$str_type}}

{{$fullname}}
{{$lbl_url}}
{{$url}}
{{if $location}}
{{$lbl_location}}
{{$location}}
{{/if}} diff --git a/view/templates/notifications/suggestions.tpl b/view/templates/notifications/suggestions.tpl index 44fe86510..d7bb7b601 100644 --- a/view/templates/notifications/suggestions.tpl +++ b/view/templates/notifications/suggestions.tpl @@ -2,7 +2,7 @@
-

{{$str_notifytype}} {{$notify_type}}

+

{{$str_notification_type}} {{$str_type}}

{{if $madeby}}
{{$lbl_madeby}} {{$madeby}}
{{/if}}
{{$fullname}}
{{$fullname}} diff --git a/view/theme/frio/templates/notifications/intros.tpl b/view/theme/frio/templates/notifications/intros.tpl index a8a033c9b..4bab6fa96 100644 --- a/view/theme/frio/templates/notifications/intros.tpl +++ b/view/theme/frio/templates/notifications/intros.tpl @@ -19,7 +19,7 @@
-
{{$str_notifytype}} {{$notify_type}}
+
{{$str_notification_type}} {{$str_type}}
{{* if the contact was suggestested by another contact, the contact who made the suggestion is displayed*}} {{if $madeby}}
{{$lbl_madeby}} {{$madeby}}
{{/if}}