clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

notify_type => str_type

Browse Source 
str_notifytype => st_notification_type
This commit is contained in:
nupplaPhil
2020-01-24 18:39:50 +01:00
parent 16b1d3fc08
commit b016e420fe
5 changed files with 9 additions and 9 deletions
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 = [
'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'],

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

@@ -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'],