mexon/friendica
1
0
Fork 0
Code Pull requests Activity

notify_type => str_type

Browse source 
str_notifytype => st_notification_type
This commit is contained in:
Philipp Holzer 2020-01-24 18:39:50 +01:00
parent 16b1d3fc08
commit b016e420fe
No known key found for this signature in database
GPG key ID: D8365C3D36B77D90
5 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Model/Notification.php
View file

@ -623,7 +623,7 @@ final class Notification
$intro = [ $intro = [
'label' => 'friend_suggestion', 'label' => 'friend_suggestion',
'notify_type' => $this->l10n->t('Friend Suggestion'), 'str_type' => $this->l10n->t('Friend Suggestion'),
'intro_id' => $intro['intro_id'], 'intro_id' => $intro['intro_id'],
'madeby' => $intro['name'], 'madeby' => $intro['name'],
'madeby_url' => $intro['url'], 'madeby_url' => $intro['url'],
@ -657,7 +657,7 @@ final class Notification
} }
$intro = [ $intro = [
'label' => (($intro['network'] !== Protocol::OSTATUS) ? 'friend_request' : 'follower'), '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'], 'dfrn_id' => $intro['issued-id'],
'uid' => $_SESSION['uid'], 'uid' => $_SESSION['uid'],
'intro_id' => $intro['intro_id'], 'intro_id' => $intro['intro_id'],

8
src/Module/Notifications/Introductions.php
View file

@ -63,8 +63,8 @@ class Introductions extends BaseNotifications
case 'friend_suggestion': case 'friend_suggestion':
$notificationContent[] = Renderer::replaceMacros($notificationSuggestions, [ $notificationContent[] = Renderer::replaceMacros($notificationSuggestions, [
'$type' => $notification['label'], '$type' => $notification['label'],
'$str_notifytype' => DI::l10n()->t('Notification type:'), 'str_notification_type' => DI::l10n()->t('Notification type:'),
'$notify_type' => $notification['notify_type'], 'str_type' => $notification['str_type'],
'$intro_id' => $notification['intro_id'], '$intro_id' => $notification['intro_id'],
'$lbl_madeby' => DI::l10n()->t('Suggested by:'), '$lbl_madeby' => DI::l10n()->t('Suggested by:'),
'$madeby' => $notification['madeby'], '$madeby' => $notification['madeby'],
@ -148,8 +148,8 @@ class Introductions extends BaseNotifications
$notificationContent[] = Renderer::replaceMacros($notificationTemplate, [ $notificationContent[] = Renderer::replaceMacros($notificationTemplate, [
'$type' => $notification['label'], '$type' => $notification['label'],
'$header' => $header, '$header' => $header,
'$str_notifytype' => DI::l10n()->t('Notification type:'), 'str_notification_type' => DI::l10n()->t('Notification type:'),
'$notify_type' => $notification['notify_type'], 'str_type' => $notification['notifytype'],
'$dfrn_text' => $dfrn_text, '$dfrn_text' => $dfrn_text,
'$dfrn_id' => $notification['dfrn_id'], '$dfrn_id' => $notification['dfrn_id'],
'$uid' => $notification['uid'], '$uid' => $notification['uid'],

2
view/templates/notifications/intros.tpl
View file

@ -2,7 +2,7 @@
<div class="intro-wrapper" id="intro-{{$contact_id}}" > <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}}" /> <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> <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}} {{if $location}}<dl><dt>{{$lbl_location}}</dt><dd>{{$location}}</dd></dl>{{/if}}

2
view/templates/notifications/suggestions.tpl
View file

@ -2,7 +2,7 @@
<div class="intro-wrapper" > <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}} {{if $madeby}}<div class="intro-madeby">{{$lbl_madeby}} {{$madeby}}</div>{{/if}}
<div class="intro-fullname" >{{$fullname}}</div> <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> <a class="intro-url-link" href="{{$url}}" ><img class="intro-photo lframe" src="{{$photo}}" width="175" height="175" title="{{$fullname}}" alt="{{$fullname}}" /></a>

2
view/theme/frio/templates/notifications/intros.tpl
View file

@ -19,7 +19,7 @@
</form> </form>
</div> </div>
<div class='intro-enty-name'><h4 class="media-heading"><a href="{{$zrl}}">{{$fullname}}</a></h4></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 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}} {{if $madeby}}<div class="intro-madeby"><span class="intro-madeby-label">{{$lbl_madeby}}</span>&nbsp;<a href="{{$madeby_zrl}}">{{$madeby}}</a></div>{{/if}}