notify_type => str_type

str_notifytype => st_notification_type

diff --git a/src/Model/Notification.php b/src/Model/Notification.php
index b7e10a0f31e2ba2b9505296271bf728d53ceb0cd..8b0e0f1a5133921a012ed5d57bea73a72bcd1a0b 100644 (file)
--- 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 9b64e7691166423e1d51a9bcd9bc3a20ab20a486..dc62110e2b8a2d23bd6a6b5a39533dac94c29c0a 100644 (file)
--- 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 1f7f838bcfda95830c46694b4e55d5f25facf035..808f155b9dc59da33bc8f7de64a0d5fbc1331e1d 100644 (file)
--- a/view/templates/notifications/intros.tpl
+++ b/view/templates/notifications/intros.tpl
@@ -2,7 +2,7 @@
 
 <div class="intro-wrapper" id="intro-{{$contact_id}}" >
 
-<p class="intro-desc">{{$str_notifytype}} {{$notify_type}}</p>
+<p class="intro-desc">{{$str_notification_type}} {{$str_type}}</p>
 <img id="photo-{{$contact_id}}" class="intro-photo" src="{{$photo}}" width="175" height=175" title="{{$fullname}}" alt="{{$fullname}}" />
 <dl><dt>{{$lbl_url}}</dt><dd><a target="blank" href="{{$zrl}}">{{$url}}</a></dd></dl>
 {{if $location}}<dl><dt>{{$lbl_location}}</dt><dd>{{$location}}</dd></dl>{{/if}}

diff --git a/view/templates/notifications/suggestions.tpl b/view/templates/notifications/suggestions.tpl
index 44fe86510448c8f59902b24b7e328c359044c9f9..d7bb7b6019dd1a2e953688a6ed6088464ffbf0b3 100644 (file)
--- a/view/templates/notifications/suggestions.tpl
+++ b/view/templates/notifications/suggestions.tpl
@@ -2,7 +2,7 @@
 
 <div class="intro-wrapper" >
 
-<p class="intro-desc">{{$str_notifytype}} {{$notify_type}}</p>
+<p class="intro-desc">{{$str_notification_type}} {{$str_type}}</p>
 {{if $madeby}}<div class="intro-madeby">{{$lbl_madeby}} {{$madeby}}</div>{{/if}}
 <div class="intro-fullname" >{{$fullname}}</div>
 <a class="intro-url-link" href="{{$url}}" ><img class="intro-photo lframe" src="{{$photo}}" width="175" height="175" title="{{$fullname}}" alt="{{$fullname}}" /></a>

diff --git a/view/theme/frio/templates/notifications/intros.tpl b/view/theme/frio/templates/notifications/intros.tpl
index a8a033c9b5834e225e5f887c163c7fa610716097..4bab6fa964b5bb582764b5dc665745856d3e9441 100644 (file)
--- a/view/theme/frio/templates/notifications/intros.tpl
+++ b/view/theme/frio/templates/notifications/intros.tpl
@@ -19,7 +19,7 @@
                        </form>
                </div>
                <div class='intro-enty-name'><h4 class="media-heading"><a href="{{$zrl}}">{{$fullname}}</a></h4></div>
-               <div class="intro-desc"><span class="intro-desc-label">{{$str_notifytype}}</span>&nbsp;{{$notify_type}}</div>
+               <div class="intro-desc"><span class="intro-desc-label">{{$str_notification_type}}</span>&nbsp;{{$str_type}}</div>
                {{* if the contact was suggestested by another contact, the contact who made the suggestion is displayed*}}
                {{if $madeby}}<div class="intro-madeby"><span class="intro-madeby-label">{{$lbl_madeby}}</span>&nbsp;<a href="{{$madeby_zrl}}">{{$madeby}}</a></div>{{/if}}