Merge pull request #11180 from annando/announce-notification
Desktop notification for announced posts
This commit is contained in:
GitHub
commit
b6aeb6e903
|
|
@ -257,8 +257,12 @@ class UserNotification
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (empty($notification_type)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// Only create notifications for posts and comments, not for activities
|
// Only create notifications for posts and comments, not for activities
|
||||||
if (empty($notification_type) || !in_array($item['gravity'], [GRAVITY_PARENT, GRAVITY_COMMENT])) {
|
if (($item['gravity'] == GRAVITY_ACTIVITY) && ($item['verb'] != Activity::ANNOUNCE)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -280,7 +284,7 @@ class UserNotification
|
||||||
*/
|
*/
|
||||||
private static function insertNotificationByItem(int $type, int $uid, array $item): void
|
private static function insertNotificationByItem(int $type, int $uid, array $item): void
|
||||||
{
|
{
|
||||||
if (($item['gravity'] == GRAVITY_ACTIVITY) &&
|
if (($item['verb'] != Activity::ANNOUNCE) && ($item['gravity'] == GRAVITY_ACTIVITY) &&
|
||||||
!in_array($type, [self::TYPE_DIRECT_COMMENT, self::TYPE_DIRECT_THREAD_COMMENT])) {
|
!in_array($type, [self::TYPE_DIRECT_COMMENT, self::TYPE_DIRECT_THREAD_COMMENT])) {
|
||||||
// Activities are only stored when performed on the user's post or comment
|
// Activities are only stored when performed on the user's post or comment
|
||||||
return;
|
return;
|
||||||
|
|
@ -402,21 +406,6 @@ class UserNotification
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
// The following check doesn't make sense on activities, so quit here
|
|
||||||
if ($item['verb'] == Activity::ANNOUNCE) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check if the contact is a mentioned forum
|
|
||||||
$tags = DBA::select('tag-view', ['url'], ['uri-id' => $item['uri-id'], 'type' => [Tag::MENTION, Tag::EXCLUSIVE_MENTION]]);
|
|
||||||
while ($tag = DBA::fetch($tags)) {
|
|
||||||
$condition = ['nurl' => Strings::normaliseLink($tag['url']), 'uid' => $uid, 'notify_new_posts' => true, 'contact-type' => Contact::TYPE_COMMUNITY];
|
|
||||||
if (DBA::exists('contact', $condition)) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
DBA::close($tags);
|
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -114,7 +114,7 @@ class Notification extends BaseFactory implements ICanCreateFromTableRow
|
||||||
return $message;
|
return $message;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($Notification->verb == Activity::POST) {
|
if (($Notification->verb == Activity::POST) || ($Notification->type === Post\UserNotification::TYPE_SHARED)) {
|
||||||
$item = Post::selectFirst([], ['uri-id' => $item['thr-parent-id'], 'uid' => [0, $Notification->uid]], ['order' => ['uid' => true]]);
|
$item = Post::selectFirst([], ['uri-id' => $item['thr-parent-id'], 'uid' => [0, $Notification->uid]], ['order' => ['uid' => true]]);
|
||||||
if (empty($item)) {
|
if (empty($item)) {
|
||||||
$this->logger->info('Thread parent post not found', ['uri-id' => $item['thr-parent-id']]);
|
$this->logger->info('Thread parent post not found', ['uri-id' => $item['thr-parent-id']]);
|
||||||
|
|
@ -123,20 +123,7 @@ class Notification extends BaseFactory implements ICanCreateFromTableRow
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($item['owner-id'] != $item['author-id']) {
|
if (in_array($Notification->type, [Post\UserNotification::TYPE_COMMENT_PARTICIPATION, Post\UserNotification::TYPE_ACTIVITY_PARTICIPATION, Post\UserNotification::TYPE_SHARED])) {
|
||||||
$cid = $item['owner-id'];
|
|
||||||
}
|
|
||||||
if (!empty($item['causer-id']) && ($item['causer-id'] != $item['author-id'])) {
|
|
||||||
$cid = $item['causer-id'];
|
|
||||||
}
|
|
||||||
|
|
||||||
if (($Notification->type === Post\UserNotification::TYPE_SHARED) && !empty($cid)) {
|
|
||||||
$causer = Contact::getById($cid, ['id', 'name', 'url']);
|
|
||||||
if (empty($causer)) {
|
|
||||||
$this->logger->info('Causer not found', ['causer' => $cid]);
|
|
||||||
return $message;
|
|
||||||
}
|
|
||||||
} elseif (in_array($Notification->type, [Post\UserNotification::TYPE_COMMENT_PARTICIPATION, Post\UserNotification::TYPE_ACTIVITY_PARTICIPATION])) {
|
|
||||||
$author = Contact::getById($item['author-id'], ['id', 'name', 'url']);
|
$author = Contact::getById($item['author-id'], ['id', 'name', 'url']);
|
||||||
if (empty($author)) {
|
if (empty($author)) {
|
||||||
$this->logger->info('Author not found', ['author' => $item['author-id']]);
|
$this->logger->info('Author not found', ['author' => $item['author-id']]);
|
||||||
|
|
@ -153,6 +140,8 @@ class Notification extends BaseFactory implements ICanCreateFromTableRow
|
||||||
$title = '';
|
$title = '';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$this->logger->debug('Got verb and type', ['verb' => $Notification->verb, 'type' => $Notification->type]);
|
||||||
|
|
||||||
switch ($Notification->verb) {
|
switch ($Notification->verb) {
|
||||||
case Activity::LIKE:
|
case Activity::LIKE:
|
||||||
switch ($Notification->type) {
|
switch ($Notification->type) {
|
||||||
|
|
@ -182,6 +171,38 @@ class Notification extends BaseFactory implements ICanCreateFromTableRow
|
||||||
case Post\UserNotification::TYPE_DIRECT_THREAD_COMMENT:
|
case Post\UserNotification::TYPE_DIRECT_THREAD_COMMENT:
|
||||||
$msg = $userL10n->t('%1$s shared your post %2$s');
|
$msg = $userL10n->t('%1$s shared your post %2$s');
|
||||||
break;
|
break;
|
||||||
|
case Post\UserNotification::TYPE_SHARED:
|
||||||
|
if (($causer['id'] != $author['id']) && ($title != '')) {
|
||||||
|
$msg = $userL10n->t('%1$s shared the post %2$s from %3$s');
|
||||||
|
} elseif ($causer['id'] != $author['id']) {
|
||||||
|
$msg = $userL10n->t('%1$s shared a post from %3$s');
|
||||||
|
} elseif ($title != '') {
|
||||||
|
$msg = $userL10n->t('%1$s shared the post %2$s');
|
||||||
|
} else {
|
||||||
|
$msg = $userL10n->t('%1$s shared a post');
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case Activity::ATTEND:
|
||||||
|
switch ($Notification->type) {
|
||||||
|
case Post\UserNotification::TYPE_DIRECT_THREAD_COMMENT:
|
||||||
|
$msg = $userL10n->t('%1$s wants to attend your event %2$s');
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case Activity::ATTENDNO:
|
||||||
|
switch ($Notification->type) {
|
||||||
|
case Post\UserNotification::TYPE_DIRECT_THREAD_COMMENT:
|
||||||
|
$msg = $userL10n->t('%1$s does not want to attend your event %2$s');
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case Activity::ATTENDMAYBE:
|
||||||
|
switch ($Notification->type) {
|
||||||
|
case Post\UserNotification::TYPE_DIRECT_THREAD_COMMENT:
|
||||||
|
$msg = $userL10n->t('%1$s maybe wants to attend your event %2$s');
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case Activity::POST:
|
case Activity::POST:
|
||||||
|
|
@ -218,18 +239,6 @@ class Notification extends BaseFactory implements ICanCreateFromTableRow
|
||||||
case Post\UserNotification::TYPE_DIRECT_THREAD_COMMENT:
|
case Post\UserNotification::TYPE_DIRECT_THREAD_COMMENT:
|
||||||
$msg = $userL10n->t('%1$s commented on your thread %2$s');
|
$msg = $userL10n->t('%1$s commented on your thread %2$s');
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case Post\UserNotification::TYPE_SHARED:
|
|
||||||
if (($causer['id'] != $author['id']) && ($title != '')) {
|
|
||||||
$msg = $userL10n->t('%1$s shared the post %2$s from %3$s');
|
|
||||||
} elseif ($causer['id'] != $author['id']) {
|
|
||||||
$msg = $userL10n->t('%1$s shared a post from %3$s');
|
|
||||||
} elseif ($title != '') {
|
|
||||||
$msg = $userL10n->t('%1$s shared the post %2$s');
|
|
||||||
} else {
|
|
||||||
$msg = $userL10n->t('%1$s shared a post');
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: 2021.12-rc\n"
|
"Project-Id-Version: 2021.12-rc\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
"POT-Creation-Date: 2022-01-21 14:21+0100\n"
|
"POT-Creation-Date: 2022-01-24 04:58+0000\n"
|
||||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||||
|
|
@ -465,7 +465,7 @@ msgid "OStatus support is disabled. Contact can't be added."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: mod/follow.php:138 src/Content/Item.php:463 src/Content/Widget.php:76
|
#: mod/follow.php:138 src/Content/Item.php:463 src/Content/Widget.php:76
|
||||||
#: src/Model/Contact.php:1055 src/Model/Contact.php:1067
|
#: src/Model/Contact.php:1056 src/Model/Contact.php:1068
|
||||||
#: view/theme/vier/theme.php:172
|
#: view/theme/vier/theme.php:172
|
||||||
msgid "Connect/Follow"
|
msgid "Connect/Follow"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -1965,7 +1965,7 @@ msgstr ""
|
||||||
msgid "Friend Suggestions"
|
msgid "Friend Suggestions"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: mod/tagger.php:78 src/Content/Item.php:346 src/Model/Item.php:2628
|
#: mod/tagger.php:78 src/Content/Item.php:346 src/Model/Item.php:2629
|
||||||
msgid "photo"
|
msgid "photo"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2085,7 +2085,7 @@ msgstr ""
|
||||||
msgid "File upload failed."
|
msgid "File upload failed."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: mod/wall_upload.php:221 src/Model/Photo.php:1008
|
#: mod/wall_upload.php:221 src/Model/Photo.php:1049
|
||||||
msgid "Wall Photos"
|
msgid "Wall Photos"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2719,7 +2719,7 @@ msgstr ""
|
||||||
msgid "%1$s poked %2$s"
|
msgid "%1$s poked %2$s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Content/Item.php:338 src/Model/Item.php:2626
|
#: src/Content/Item.php:338 src/Model/Item.php:2627
|
||||||
msgid "event"
|
msgid "event"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2727,31 +2727,31 @@ msgstr ""
|
||||||
msgid "Follow Thread"
|
msgid "Follow Thread"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Content/Item.php:443 src/Model/Contact.php:1060
|
#: src/Content/Item.php:443 src/Model/Contact.php:1061
|
||||||
msgid "View Status"
|
msgid "View Status"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Content/Item.php:444 src/Content/Item.php:466 src/Model/Contact.php:994
|
#: src/Content/Item.php:444 src/Content/Item.php:466 src/Model/Contact.php:995
|
||||||
#: src/Model/Contact.php:1052 src/Model/Contact.php:1061
|
#: src/Model/Contact.php:1053 src/Model/Contact.php:1062
|
||||||
#: src/Module/Directory.php:157 src/Module/Settings/Profile/Index.php:225
|
#: src/Module/Directory.php:157 src/Module/Settings/Profile/Index.php:225
|
||||||
msgid "View Profile"
|
msgid "View Profile"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Content/Item.php:445 src/Model/Contact.php:1062
|
#: src/Content/Item.php:445 src/Model/Contact.php:1063
|
||||||
msgid "View Photos"
|
msgid "View Photos"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Content/Item.php:446 src/Model/Contact.php:1053
|
#: src/Content/Item.php:446 src/Model/Contact.php:1054
|
||||||
#: src/Model/Contact.php:1063
|
#: src/Model/Contact.php:1064
|
||||||
msgid "Network Posts"
|
msgid "Network Posts"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Content/Item.php:447 src/Model/Contact.php:1054
|
#: src/Content/Item.php:447 src/Model/Contact.php:1055
|
||||||
#: src/Model/Contact.php:1064
|
#: src/Model/Contact.php:1065
|
||||||
msgid "View Contact"
|
msgid "View Contact"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Content/Item.php:448 src/Model/Contact.php:1065
|
#: src/Content/Item.php:448 src/Model/Contact.php:1066
|
||||||
msgid "Send PM"
|
msgid "Send PM"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2774,7 +2774,7 @@ msgstr ""
|
||||||
msgid "Languages"
|
msgid "Languages"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Content/Item.php:458 src/Model/Contact.php:1066
|
#: src/Content/Item.php:458 src/Model/Contact.php:1067
|
||||||
msgid "Poke"
|
msgid "Poke"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -3070,8 +3070,8 @@ msgid ""
|
||||||
"<a href=\"%1$s\" target=\"_blank\" rel=\"noopener noreferrer\">%2$s</a> %3$s"
|
"<a href=\"%1$s\" target=\"_blank\" rel=\"noopener noreferrer\">%2$s</a> %3$s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Content/Text/BBCode.php:1185 src/Model/Item.php:3157
|
#: src/Content/Text/BBCode.php:1185 src/Model/Item.php:3158
|
||||||
#: src/Model/Item.php:3163 src/Model/Item.php:3164
|
#: src/Model/Item.php:3164 src/Model/Item.php:3165
|
||||||
msgid "Link to source"
|
msgid "Link to source"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -3226,7 +3226,7 @@ msgstr ""
|
||||||
msgid "Organisations"
|
msgid "Organisations"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Content/Widget.php:522 src/Model/Contact.php:1493
|
#: src/Content/Widget.php:522 src/Model/Contact.php:1494
|
||||||
msgid "News"
|
msgid "News"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -4049,81 +4049,81 @@ msgstr ""
|
||||||
msgid "Legacy module file not found: %s"
|
msgid "Legacy module file not found: %s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Model/Contact.php:1056 src/Model/Contact.php:1068
|
#: src/Model/Contact.php:1057 src/Model/Contact.php:1069
|
||||||
msgid "UnFollow"
|
msgid "UnFollow"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Model/Contact.php:1074 src/Module/Admin/Users/Pending.php:107
|
#: src/Model/Contact.php:1075 src/Module/Admin/Users/Pending.php:107
|
||||||
#: src/Module/Notifications/Introductions.php:130
|
#: src/Module/Notifications/Introductions.php:130
|
||||||
#: src/Module/Notifications/Introductions.php:202
|
#: src/Module/Notifications/Introductions.php:202
|
||||||
msgid "Approve"
|
msgid "Approve"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Model/Contact.php:1489
|
#: src/Model/Contact.php:1490
|
||||||
msgid "Organisation"
|
msgid "Organisation"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Model/Contact.php:1497
|
#: src/Model/Contact.php:1498
|
||||||
msgid "Forum"
|
msgid "Forum"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Model/Contact.php:2372
|
#: src/Model/Contact.php:2426
|
||||||
msgid "Disallowed profile URL."
|
msgid "Disallowed profile URL."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Model/Contact.php:2377 src/Module/Friendica.php:81
|
#: src/Model/Contact.php:2431 src/Module/Friendica.php:81
|
||||||
msgid "Blocked domain"
|
msgid "Blocked domain"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Model/Contact.php:2382
|
#: src/Model/Contact.php:2436
|
||||||
msgid "Connect URL missing."
|
msgid "Connect URL missing."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Model/Contact.php:2391
|
#: src/Model/Contact.php:2445
|
||||||
msgid ""
|
msgid ""
|
||||||
"The contact could not be added. Please check the relevant network "
|
"The contact could not be added. Please check the relevant network "
|
||||||
"credentials in your Settings -> Social Networks page."
|
"credentials in your Settings -> Social Networks page."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Model/Contact.php:2428
|
#: src/Model/Contact.php:2482
|
||||||
msgid "The profile address specified does not provide adequate information."
|
msgid "The profile address specified does not provide adequate information."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Model/Contact.php:2430
|
#: src/Model/Contact.php:2484
|
||||||
msgid "No compatible communication protocols or feeds were discovered."
|
msgid "No compatible communication protocols or feeds were discovered."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Model/Contact.php:2433
|
#: src/Model/Contact.php:2487
|
||||||
msgid "An author or name was not found."
|
msgid "An author or name was not found."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Model/Contact.php:2436
|
#: src/Model/Contact.php:2490
|
||||||
msgid "No browser URL could be matched to this address."
|
msgid "No browser URL could be matched to this address."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Model/Contact.php:2439
|
#: src/Model/Contact.php:2493
|
||||||
msgid ""
|
msgid ""
|
||||||
"Unable to match @-style Identity Address with a known protocol or email "
|
"Unable to match @-style Identity Address with a known protocol or email "
|
||||||
"contact."
|
"contact."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Model/Contact.php:2440
|
#: src/Model/Contact.php:2494
|
||||||
msgid "Use mailto: in front of address to force email check."
|
msgid "Use mailto: in front of address to force email check."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Model/Contact.php:2446
|
#: src/Model/Contact.php:2500
|
||||||
msgid ""
|
msgid ""
|
||||||
"The profile address specified belongs to a network which has been disabled "
|
"The profile address specified belongs to a network which has been disabled "
|
||||||
"on this site."
|
"on this site."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Model/Contact.php:2451
|
#: src/Model/Contact.php:2505
|
||||||
msgid ""
|
msgid ""
|
||||||
"Limited profile. This person will be unable to receive direct/personal "
|
"Limited profile. This person will be unable to receive direct/personal "
|
||||||
"notifications from you."
|
"notifications from you."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Model/Contact.php:2510
|
#: src/Model/Contact.php:2564
|
||||||
msgid "Unable to retrieve contact information."
|
msgid "Unable to retrieve contact information."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -4243,33 +4243,33 @@ msgstr ""
|
||||||
msgid "Edit groups"
|
msgid "Edit groups"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Model/Item.php:1679
|
#: src/Model/Item.php:1680
|
||||||
#, php-format
|
#, php-format
|
||||||
msgid "Detected languages in this post:\\n%s"
|
msgid "Detected languages in this post:\\n%s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Model/Item.php:2630
|
#: src/Model/Item.php:2631
|
||||||
msgid "activity"
|
msgid "activity"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Model/Item.php:2632
|
#: src/Model/Item.php:2633
|
||||||
msgid "comment"
|
msgid "comment"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Model/Item.php:2635
|
#: src/Model/Item.php:2636
|
||||||
msgid "post"
|
msgid "post"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Model/Item.php:2772
|
#: src/Model/Item.php:2773
|
||||||
#, php-format
|
#, php-format
|
||||||
msgid "Content warning: %s"
|
msgid "Content warning: %s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Model/Item.php:3122
|
#: src/Model/Item.php:3123
|
||||||
msgid "bytes"
|
msgid "bytes"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Model/Item.php:3151 src/Model/Item.php:3152
|
#: src/Model/Item.php:3152 src/Model/Item.php:3153
|
||||||
msgid "View on separate page"
|
msgid "View on separate page"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -4417,7 +4417,7 @@ msgstr ""
|
||||||
msgid "Contact information and Social Networks"
|
msgid "Contact information and Social Networks"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Model/User.php:208 src/Model/User.php:1029
|
#: src/Model/User.php:208 src/Model/User.php:1056
|
||||||
msgid "SERIOUS ERROR: Generation of security keys failed."
|
msgid "SERIOUS ERROR: Generation of security keys failed."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -4448,111 +4448,111 @@ msgid ""
|
||||||
"The password can't contain accentuated letters, white spaces or colons (:)"
|
"The password can't contain accentuated letters, white spaces or colons (:)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Model/User.php:909
|
#: src/Model/User.php:936
|
||||||
msgid "Passwords do not match. Password unchanged."
|
msgid "Passwords do not match. Password unchanged."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Model/User.php:916
|
#: src/Model/User.php:943
|
||||||
msgid "An invitation is required."
|
msgid "An invitation is required."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Model/User.php:920
|
#: src/Model/User.php:947
|
||||||
msgid "Invitation could not be verified."
|
msgid "Invitation could not be verified."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Model/User.php:928
|
#: src/Model/User.php:955
|
||||||
msgid "Invalid OpenID url"
|
msgid "Invalid OpenID url"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Model/User.php:941 src/Security/Authentication.php:235
|
#: src/Model/User.php:968 src/Security/Authentication.php:235
|
||||||
msgid ""
|
msgid ""
|
||||||
"We encountered a problem while logging in with the OpenID you provided. "
|
"We encountered a problem while logging in with the OpenID you provided. "
|
||||||
"Please check the correct spelling of the ID."
|
"Please check the correct spelling of the ID."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Model/User.php:941 src/Security/Authentication.php:235
|
#: src/Model/User.php:968 src/Security/Authentication.php:235
|
||||||
msgid "The error message was:"
|
msgid "The error message was:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Model/User.php:947
|
#: src/Model/User.php:974
|
||||||
msgid "Please enter the required information."
|
msgid "Please enter the required information."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Model/User.php:961
|
#: src/Model/User.php:988
|
||||||
#, php-format
|
#, php-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"system.username_min_length (%s) and system.username_max_length (%s) are "
|
"system.username_min_length (%s) and system.username_max_length (%s) are "
|
||||||
"excluding each other, swapping values."
|
"excluding each other, swapping values."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Model/User.php:968
|
#: src/Model/User.php:995
|
||||||
#, php-format
|
#, php-format
|
||||||
msgid "Username should be at least %s character."
|
msgid "Username should be at least %s character."
|
||||||
msgid_plural "Username should be at least %s characters."
|
msgid_plural "Username should be at least %s characters."
|
||||||
msgstr[0] ""
|
msgstr[0] ""
|
||||||
msgstr[1] ""
|
msgstr[1] ""
|
||||||
|
|
||||||
#: src/Model/User.php:972
|
#: src/Model/User.php:999
|
||||||
#, php-format
|
#, php-format
|
||||||
msgid "Username should be at most %s character."
|
msgid "Username should be at most %s character."
|
||||||
msgid_plural "Username should be at most %s characters."
|
msgid_plural "Username should be at most %s characters."
|
||||||
msgstr[0] ""
|
msgstr[0] ""
|
||||||
msgstr[1] ""
|
msgstr[1] ""
|
||||||
|
|
||||||
#: src/Model/User.php:980
|
#: src/Model/User.php:1007
|
||||||
msgid "That doesn't appear to be your full (First Last) name."
|
msgid "That doesn't appear to be your full (First Last) name."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Model/User.php:985
|
#: src/Model/User.php:1012
|
||||||
msgid "Your email domain is not among those allowed on this site."
|
msgid "Your email domain is not among those allowed on this site."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Model/User.php:989
|
#: src/Model/User.php:1016
|
||||||
msgid "Not a valid email address."
|
msgid "Not a valid email address."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Model/User.php:992
|
#: src/Model/User.php:1019
|
||||||
msgid "The nickname was blocked from registration by the nodes admin."
|
msgid "The nickname was blocked from registration by the nodes admin."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Model/User.php:996 src/Model/User.php:1004
|
#: src/Model/User.php:1023 src/Model/User.php:1031
|
||||||
msgid "Cannot use that email."
|
msgid "Cannot use that email."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Model/User.php:1011
|
#: src/Model/User.php:1038
|
||||||
msgid "Your nickname can only contain a-z, 0-9 and _."
|
msgid "Your nickname can only contain a-z, 0-9 and _."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Model/User.php:1019 src/Model/User.php:1076
|
#: src/Model/User.php:1046 src/Model/User.php:1103
|
||||||
msgid "Nickname is already registered. Please choose another."
|
msgid "Nickname is already registered. Please choose another."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Model/User.php:1063 src/Model/User.php:1067
|
#: src/Model/User.php:1090 src/Model/User.php:1094
|
||||||
msgid "An error occurred during registration. Please try again."
|
msgid "An error occurred during registration. Please try again."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Model/User.php:1090
|
#: src/Model/User.php:1117
|
||||||
msgid "An error occurred creating your default profile. Please try again."
|
msgid "An error occurred creating your default profile. Please try again."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Model/User.php:1097
|
#: src/Model/User.php:1124
|
||||||
msgid "An error occurred creating your self contact. Please try again."
|
msgid "An error occurred creating your self contact. Please try again."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Model/User.php:1102
|
#: src/Model/User.php:1129
|
||||||
msgid "Friends"
|
msgid "Friends"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Model/User.php:1106
|
#: src/Model/User.php:1133
|
||||||
msgid ""
|
msgid ""
|
||||||
"An error occurred creating your default contact group. Please try again."
|
"An error occurred creating your default contact group. Please try again."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Model/User.php:1144
|
#: src/Model/User.php:1171
|
||||||
msgid "Profile Photos"
|
msgid "Profile Photos"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Model/User.php:1338
|
#: src/Model/User.php:1365
|
||||||
#, php-format
|
#, php-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"\n"
|
"\n"
|
||||||
|
|
@ -4560,7 +4560,7 @@ msgid ""
|
||||||
"\t\t\tthe administrator of %2$s has set up an account for you."
|
"\t\t\tthe administrator of %2$s has set up an account for you."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Model/User.php:1341
|
#: src/Model/User.php:1368
|
||||||
#, php-format
|
#, php-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"\n"
|
"\n"
|
||||||
|
|
@ -4597,12 +4597,12 @@ msgid ""
|
||||||
"\t\tThank you and welcome to %4$s."
|
"\t\tThank you and welcome to %4$s."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Model/User.php:1374 src/Model/User.php:1481
|
#: src/Model/User.php:1401 src/Model/User.php:1508
|
||||||
#, php-format
|
#, php-format
|
||||||
msgid "Registration details for %s"
|
msgid "Registration details for %s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Model/User.php:1394
|
#: src/Model/User.php:1421
|
||||||
#, php-format
|
#, php-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"\n"
|
"\n"
|
||||||
|
|
@ -4618,12 +4618,12 @@ msgid ""
|
||||||
"\t\t"
|
"\t\t"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Model/User.php:1413
|
#: src/Model/User.php:1440
|
||||||
#, php-format
|
#, php-format
|
||||||
msgid "Registration at %s"
|
msgid "Registration at %s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Model/User.php:1437
|
#: src/Model/User.php:1464
|
||||||
#, php-format
|
#, php-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"\n"
|
"\n"
|
||||||
|
|
@ -4632,7 +4632,7 @@ msgid ""
|
||||||
"\t\t\t"
|
"\t\t\t"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Model/User.php:1445
|
#: src/Model/User.php:1472
|
||||||
#, php-format
|
#, php-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"\n"
|
"\n"
|
||||||
|
|
@ -9957,101 +9957,116 @@ msgstr ""
|
||||||
msgid "%1$s had started following you"
|
msgid "%1$s had started following you"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Navigation/Notifications/Factory/Notification.php:160
|
#: src/Navigation/Notifications/Factory/Notification.php:149
|
||||||
#, php-format
|
#, php-format
|
||||||
msgid "%1$s liked your comment %2$s"
|
msgid "%1$s liked your comment %2$s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Navigation/Notifications/Factory/Notification.php:163
|
#: src/Navigation/Notifications/Factory/Notification.php:152
|
||||||
#, php-format
|
#, php-format
|
||||||
msgid "%1$s liked your post %2$s"
|
msgid "%1$s liked your post %2$s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Navigation/Notifications/Factory/Notification.php:170
|
#: src/Navigation/Notifications/Factory/Notification.php:159
|
||||||
#, php-format
|
#, php-format
|
||||||
msgid "%1$s disliked your comment %2$s"
|
msgid "%1$s disliked your comment %2$s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Navigation/Notifications/Factory/Notification.php:173
|
#: src/Navigation/Notifications/Factory/Notification.php:162
|
||||||
#, php-format
|
#, php-format
|
||||||
msgid "%1$s disliked your post %2$s"
|
msgid "%1$s disliked your post %2$s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Navigation/Notifications/Factory/Notification.php:180
|
#: src/Navigation/Notifications/Factory/Notification.php:169
|
||||||
#, php-format
|
#, php-format
|
||||||
msgid "%1$s shared your comment %2$s"
|
msgid "%1$s shared your comment %2$s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Navigation/Notifications/Factory/Notification.php:183
|
#: src/Navigation/Notifications/Factory/Notification.php:172
|
||||||
#, php-format
|
#, php-format
|
||||||
msgid "%1$s shared your post %2$s"
|
msgid "%1$s shared your post %2$s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Navigation/Notifications/Factory/Notification.php:190
|
#: src/Navigation/Notifications/Factory/Notification.php:176
|
||||||
#, php-format
|
|
||||||
msgid "%1$s tagged you on %2$s"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
#: src/Navigation/Notifications/Factory/Notification.php:194
|
|
||||||
#, php-format
|
|
||||||
msgid "%1$s replied to you on %2$s"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
#: src/Navigation/Notifications/Factory/Notification.php:198
|
|
||||||
#, php-format
|
|
||||||
msgid "%1$s commented in your thread %2$s"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
#: src/Navigation/Notifications/Factory/Notification.php:202
|
|
||||||
#, php-format
|
|
||||||
msgid "%1$s commented on your comment %2$s"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
#: src/Navigation/Notifications/Factory/Notification.php:208
|
|
||||||
#, php-format
|
|
||||||
msgid "%1$s commented in their thread %2$s"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
#: src/Navigation/Notifications/Factory/Notification.php:210
|
|
||||||
#, php-format
|
|
||||||
msgid "%1$s commented in their thread"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
#: src/Navigation/Notifications/Factory/Notification.php:212
|
|
||||||
#, php-format
|
|
||||||
msgid "%1$s commented in the thread %2$s from %3$s"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
#: src/Navigation/Notifications/Factory/Notification.php:214
|
|
||||||
#, php-format
|
|
||||||
msgid "%1$s commented in the thread from %3$s"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
#: src/Navigation/Notifications/Factory/Notification.php:219
|
|
||||||
#, php-format
|
|
||||||
msgid "%1$s commented on your thread %2$s"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
#: src/Navigation/Notifications/Factory/Notification.php:224
|
|
||||||
#, php-format
|
#, php-format
|
||||||
msgid "%1$s shared the post %2$s from %3$s"
|
msgid "%1$s shared the post %2$s from %3$s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Navigation/Notifications/Factory/Notification.php:226
|
#: src/Navigation/Notifications/Factory/Notification.php:178
|
||||||
#, php-format
|
#, php-format
|
||||||
msgid "%1$s shared a post from %3$s"
|
msgid "%1$s shared a post from %3$s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Navigation/Notifications/Factory/Notification.php:228
|
#: src/Navigation/Notifications/Factory/Notification.php:180
|
||||||
#, php-format
|
#, php-format
|
||||||
msgid "%1$s shared the post %2$s"
|
msgid "%1$s shared the post %2$s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: src/Navigation/Notifications/Factory/Notification.php:230
|
#: src/Navigation/Notifications/Factory/Notification.php:182
|
||||||
#, php-format
|
#, php-format
|
||||||
msgid "%1$s shared a post"
|
msgid "%1$s shared a post"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
#: src/Navigation/Notifications/Factory/Notification.php:190
|
||||||
|
#, php-format
|
||||||
|
msgid "%1$s wants to attend your event %2$s"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: src/Navigation/Notifications/Factory/Notification.php:197
|
||||||
|
#, php-format
|
||||||
|
msgid "%1$s does not want to attend your event %2$s"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: src/Navigation/Notifications/Factory/Notification.php:204
|
||||||
|
#, php-format
|
||||||
|
msgid "%1$s maybe wants to attend your event %2$s"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: src/Navigation/Notifications/Factory/Notification.php:211
|
||||||
|
#, php-format
|
||||||
|
msgid "%1$s tagged you on %2$s"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: src/Navigation/Notifications/Factory/Notification.php:215
|
||||||
|
#, php-format
|
||||||
|
msgid "%1$s replied to you on %2$s"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: src/Navigation/Notifications/Factory/Notification.php:219
|
||||||
|
#, php-format
|
||||||
|
msgid "%1$s commented in your thread %2$s"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: src/Navigation/Notifications/Factory/Notification.php:223
|
||||||
|
#, php-format
|
||||||
|
msgid "%1$s commented on your comment %2$s"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: src/Navigation/Notifications/Factory/Notification.php:229
|
||||||
|
#, php-format
|
||||||
|
msgid "%1$s commented in their thread %2$s"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: src/Navigation/Notifications/Factory/Notification.php:231
|
||||||
|
#, php-format
|
||||||
|
msgid "%1$s commented in their thread"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: src/Navigation/Notifications/Factory/Notification.php:233
|
||||||
|
#, php-format
|
||||||
|
msgid "%1$s commented in the thread %2$s from %3$s"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: src/Navigation/Notifications/Factory/Notification.php:235
|
||||||
|
#, php-format
|
||||||
|
msgid "%1$s commented in the thread from %3$s"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: src/Navigation/Notifications/Factory/Notification.php:240
|
||||||
|
#, php-format
|
||||||
|
msgid "%1$s commented on your thread %2$s"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: src/Navigation/Notifications/Repository/Notify.php:211
|
#: src/Navigation/Notifications/Repository/Notify.php:211
|
||||||
#: src/Navigation/Notifications/Repository/Notify.php:694
|
#: src/Navigation/Notifications/Repository/Notify.php:694
|
||||||
msgid "[Friendica:Notify]"
|
msgid "[Friendica:Notify]"
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue