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

Merge pull request #12510 from MarekBenjamin/email-notification_like-in-subject 

Change email subject to "(...)like in conversation(...)" for likes in…
This commit is contained in:
Hypolite Petovan 2022-12-23 07:57:28 -05:00 committed by GitHub
parent e5e4d142ce 3061cee083
commit e4ac3c7922
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 392 additions and 370 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Navigation/Notifications/Repository/Notify.php
View File

@ -771,7 +771,7 @@ class Notify extends BaseRepository
$title = '"' . trim(str_replace("\n", " ", $title)) . '"';
}
// Some mail software relies on subject field for threading.
// Some mail software relies on the subject field for threading.
// So, we cannot have different subjects for notifications of the same thread.
// Before this we have the name of the replier on the subject rendering
// different subjects for messages on the same thread.
@ -783,7 +783,18 @@ class Notify extends BaseRepository
$subject = $l10n->t('%s %s shared a new post', $subjectPrefix, $contact['name']);
} else {
$params['type'] = Model\Notification\Type::COMMENT;
$subject = $l10n->t('%1$s Comment to conversation #%2$d by %3$s', $subjectPrefix, $item['parent'], $contact['name']);
if ($params['verb'] = Activity::LIKE) {
switch ($Notification->type) {
case Model\Post\UserNotification::TYPE_DIRECT_COMMENT:
$subject = $l10n->t('%1$s %2$s liked your post #%3$d', $subjectPrefix, $contact['name'], $item['parent']);
break;
case Model\Post\UserNotification::TYPE_DIRECT_THREAD_COMMENT:
$subject = $l10n->t('%1$s %2$s liked your comment on #%3$d', $subjectPrefix, $contact['name'], $item['parent']);
break;
}
} else {
$subject = $l10n->t('%1$s Comment to conversation #%2$d by %3$s', $subjectPrefix, $item['parent'], $contact['name']);
}
}
$msg = $this->notification->getMessageFromNotification($Notification);

747
view/lang/C/messages.po
View File

File diff suppressed because it is too large Load Diff