Merge remote-tracking branch 'upstream' into better-navigation

diff --git a/src/Content/Widget/VCard.php b/src/Content/Widget/VCard.php
index 62a8e90853f30ff2378bc166104ba28ccc480da0..478ab52fe798d62a738a826de62bb213963e6d4a 100644 (file)
--- a/src/Content/Widget/VCard.php
+++ b/src/Content/Widget/VCard.php
@@ -68,6 +68,7 @@ class VCard
                $follow_link      = '';
                $unfollow_link    = '';
                $wallmessage_link = '';
+               $showgroup_link   = '';
 
                $photo   = Contact::getPhoto($contact);
 
@@ -99,6 +100,10 @@ class VCard
                        if (in_array($rel, [Contact::FOLLOWER, Contact::FRIEND]) && Contact::canReceivePrivateMessages($contact)) {
                                $wallmessage_link = 'message/new/' . $id;
                        }
+
+                       if ($contact['contact-type'] == Contact::TYPE_COMMUNITY) {
+                               $showgroup_link = 'network/group/' . $id;
+                       }
                }
 
                return Renderer::replaceMacros(Renderer::getMarkupTemplate('widget/vcard.tpl'), [
@@ -119,6 +124,10 @@ class VCard
                        '$unfollow_link'    => $unfollow_link,
                        '$wallmessage'      => DI::l10n()->t('Message'),
                        '$wallmessage_link' => $wallmessage_link,
+                       '$mention'          => DI::l10n()->t('Mention'),
+                       '$posttogroup'      => DI::l10n()->t('Post to group'),
+                       '$showgroup'        => DI::l10n()->t('View group'),
+                       '$showgroup_link'   => $showgroup_link,
                ]);
        }
 }

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 243b48ad1d2124c6c08724f41f21bbdf1fe293f9..47b8ad4cfdd5a8ecefdc00c0e72c5d1db12c7476 100644 (file)
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -1177,6 +1177,7 @@ class Contact
                }
 
                $pm_url      = '';
+               $mention_url = '';
                $status_link = '';
                $photos_link = '';
 
@@ -1197,8 +1198,23 @@ class Contact
                        $pm_url = 'message/new/' . $contact['id'];
                }
 
+               if ($contact['contact-type'] == Contact::TYPE_COMMUNITY) {
+                       $mention_label = DI::l10n()->t('Post to group');
+                       $mention_url = 'compose/0?body=!' . $contact['addr'];
+               } else {
+                       $mention_label = DI::l10n()->t('Mention');
+                       $mention_url = 'compose/0?body=@' . $contact['addr'];
+               }
+
                $contact_url = 'contact/' . $contact['id'];
-               $posts_link = 'contact/' . $contact['id'] . '/conversations';
+
+               if ($contact['contact-type'] == Contact::TYPE_COMMUNITY) {
+                       $network_label = DI::l10n()->t('View group');
+                       $network_url = 'network/group/' . $contact['id'];
+               } else {
+                       $network_label = DI::l10n()->t('Network Posts');
+                       $network_url = 'contact/' . $contact['id'] . '/conversations';
+               }
 
                $follow_link   = '';
                $unfollow_link = '';
@@ -1214,24 +1230,30 @@ class Contact
                 * Menu array:
                 * "name" => [ "Label", "link", (bool)Should the link opened in a new tab? ]
                 */
+
+
                if (empty($contact['uid'])) {
                        $menu = [
                                'profile'  => [DI::l10n()->t('View Profile'), $profile_link, true],
-                               'network'  => [DI::l10n()->t('Network Posts'), $posts_link, false],
+                               'network'  => [$network_label, $network_url, false],
                                'edit'     => [DI::l10n()->t('View Contact'), $contact_url, false],
                                'follow'   => [DI::l10n()->t('Connect/Follow'), $follow_link, true],
                                'unfollow' => [DI::l10n()->t('Unfollow'), $unfollow_link, true],
+                               'mention'  => [DI::l10n()->t('Mention'), DI::l10n()->t('Post to group'), $mention_url, false],
+                               'group'    => [DI::l10n()->t('View group'), $group_link, $contact['forum'], true],
+                               'self'     => [$contact['self'] ?? false, true],
                        ];
                } else {
                        $menu = [
                                'status'   => [DI::l10n()->t('View Status'), $status_link, true],
                                'profile'  => [DI::l10n()->t('View Profile'), $profile_link, true],
                                'photos'   => [DI::l10n()->t('View Photos'), $photos_link, true],
-                               'network'  => [DI::l10n()->t('Network Posts'), $posts_link, false],
+                               'network'  => [$network_label, $network_url, false],
                                'edit'     => [DI::l10n()->t('View Contact'), $contact_url, false],
                                'pm'       => [DI::l10n()->t('Send PM'), $pm_url, false],
                                'follow'   => [DI::l10n()->t('Connect/Follow'), $follow_link, true],
                                'unfollow' => [DI::l10n()->t('Unfollow'), $unfollow_link, true],
+                               'mention'  => [$mention_label, $mention_url, false],
                        ];
 
                        if (!empty($contact['pending'])) {

diff --git a/src/Module/Contact/Hovercard.php b/src/Module/Contact/Hovercard.php
index 9f2fb67bdbabec6917cc0e248d884e384800c740..1ca91d056f32b487890f0723885b1692fe8d809e 100644 (file)
--- a/src/Module/Contact/Hovercard.php
+++ b/src/Module/Contact/Hovercard.php
@@ -112,6 +112,7 @@ class Hovercard extends BaseModule
                                'bd'           => $contact['bd'] <= DBA::NULL_DATE ? '' : $contact['bd'],
                                'account_type' => Contact::getAccountType($contact['contact-type']),
                                'actions'      => $actions,
+                               'self'         => $contact['self'],
                        ],
                ]);
 

diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po
index 6ca0fe4dadb03f68aeaa3133f93078917037e32e..5d4dc2f7d73c339f1eb74a8afe8a78e6bf76fdb7 100644 (file)
--- a/view/lang/C/messages.po
+++ b/view/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2023.09-dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-09-18 05:30+0000\n"
+"POT-Creation-Date: 2023-10-02 10:20+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -783,31 +783,31 @@ msgstr ""
 msgid "You must be logged in to use addons. "
 msgstr ""
 
-#: src/BaseModule.php:401
+#: src/BaseModule.php:403
 msgid ""
 "The form security token was not correct. This probably happened because the "
 "form has been opened for too long (>3 hours) before submitting it."
 msgstr ""
 
-#: src/BaseModule.php:428
+#: src/BaseModule.php:430
 msgid "All contacts"
 msgstr ""
 
-#: src/BaseModule.php:433 src/Content/Conversation/Factory/Timeline.php:62
+#: src/BaseModule.php:435 src/Content/Conversation/Factory/Timeline.php:62
 #: src/Content/Widget.php:239 src/Core/ACL.php:195 src/Module/Contact.php:415
 #: src/Module/PermissionTooltip.php:127 src/Module/PermissionTooltip.php:149
 msgid "Followers"
 msgstr ""
 
-#: src/BaseModule.php:438 src/Content/Widget.php:240 src/Module/Contact.php:418
+#: src/BaseModule.php:440 src/Content/Widget.php:240 src/Module/Contact.php:418
 msgid "Following"
 msgstr ""
 
-#: src/BaseModule.php:443 src/Content/Widget.php:241 src/Module/Contact.php:421
+#: src/BaseModule.php:445 src/Content/Widget.php:241 src/Module/Contact.php:421
 msgid "Mutual friends"
 msgstr ""
 
-#: src/BaseModule.php:451
+#: src/BaseModule.php:453
 msgid "Common"
 msgstr ""
 
@@ -1377,7 +1377,7 @@ msgstr ""
 msgid "Public post"
 msgstr ""
 
-#: src/Content/Conversation.php:424 src/Content/Widget/VCard.php:120
+#: src/Content/Conversation.php:424 src/Content/Widget/VCard.php:125
 #: src/Model/Profile.php:467 src/Module/Admin/Logs/View.php:92
 #: src/Module/Post/Edit.php:181
 msgid "Message"
@@ -1570,60 +1570,60 @@ msgstr ""
 msgid "Posts with videos"
 msgstr ""
 
-#: src/Content/Conversation/Factory/Timeline.php:85
+#: src/Content/Conversation/Factory/Timeline.php:84
 msgid "Local Community"
 msgstr ""
 
-#: src/Content/Conversation/Factory/Timeline.php:85
+#: src/Content/Conversation/Factory/Timeline.php:84
 msgid "Posts from local users on this server"
 msgstr ""
 
-#: src/Content/Conversation/Factory/Timeline.php:89
+#: src/Content/Conversation/Factory/Timeline.php:88
 msgid "Global Community"
 msgstr ""
 
-#: src/Content/Conversation/Factory/Timeline.php:89
+#: src/Content/Conversation/Factory/Timeline.php:88
 msgid "Posts from users of the whole federated network"
 msgstr ""
 
-#: src/Content/Conversation/Factory/Timeline.php:103
+#: src/Content/Conversation/Factory/Timeline.php:102
 msgid "Latest Activity"
 msgstr ""
 
-#: src/Content/Conversation/Factory/Timeline.php:103
+#: src/Content/Conversation/Factory/Timeline.php:102
 msgid "Sort by latest activity"
 msgstr ""
 
-#: src/Content/Conversation/Factory/Timeline.php:104
+#: src/Content/Conversation/Factory/Timeline.php:103
 msgid "Latest Posts"
 msgstr ""
 
-#: src/Content/Conversation/Factory/Timeline.php:104
+#: src/Content/Conversation/Factory/Timeline.php:103
 msgid "Sort by post received date"
 msgstr ""
 
-#: src/Content/Conversation/Factory/Timeline.php:105
+#: src/Content/Conversation/Factory/Timeline.php:104
 msgid "Latest Creation"
 msgstr ""
 
-#: src/Content/Conversation/Factory/Timeline.php:105
+#: src/Content/Conversation/Factory/Timeline.php:104
 msgid "Sort by post creation date"
 msgstr ""
 
-#: src/Content/Conversation/Factory/Timeline.php:106
+#: src/Content/Conversation/Factory/Timeline.php:105
 #: src/Module/Settings/Profile/Index.php:260
 msgid "Personal"
 msgstr ""
 
-#: src/Content/Conversation/Factory/Timeline.php:106
+#: src/Content/Conversation/Factory/Timeline.php:105
 msgid "Posts that mention or involve you"
 msgstr ""
 
-#: src/Content/Conversation/Factory/Timeline.php:107 src/Object/Post.php:380
+#: src/Content/Conversation/Factory/Timeline.php:106 src/Object/Post.php:380
 msgid "Starred"
 msgstr ""
 
-#: src/Content/Conversation/Factory/Timeline.php:107
+#: src/Content/Conversation/Factory/Timeline.php:106
 msgid "Favourite Posts"
 msgstr ""
 
@@ -1762,7 +1762,7 @@ msgstr ""
 msgid "Create new group"
 msgstr ""
 
-#: src/Content/Item.php:331 src/Model/Item.php:3003
+#: src/Content/Item.php:331 src/Model/Item.php:3021
 msgid "event"
 msgstr ""
 
@@ -1770,7 +1770,7 @@ msgstr ""
 msgid "status"
 msgstr ""
 
-#: src/Content/Item.php:340 src/Model/Item.php:3005
+#: src/Content/Item.php:340 src/Model/Item.php:3023
 #: src/Module/Post/Tag/Add.php:123
 msgid "photo"
 msgstr ""
@@ -1784,31 +1784,31 @@ msgstr ""
 msgid "Follow Thread"
 msgstr ""
 
-#: src/Content/Item.php:429 src/Model/Contact.php:1227
+#: src/Content/Item.php:429 src/Model/Contact.php:1239
 msgid "View Status"
 msgstr ""
 
 #: src/Content/Item.php:430 src/Content/Item.php:451 src/Model/Contact.php:1176
-#: src/Model/Contact.php:1219 src/Model/Contact.php:1228
+#: src/Model/Contact.php:1229 src/Model/Contact.php:1240
 #: src/Module/Directory.php:157 src/Module/Settings/Profile/Index.php:259
 msgid "View Profile"
 msgstr ""
 
-#: src/Content/Item.php:431 src/Model/Contact.php:1229
+#: src/Content/Item.php:431 src/Model/Contact.php:1241
 msgid "View Photos"
 msgstr ""
 
-#: src/Content/Item.php:432 src/Model/Contact.php:1220
-#: src/Model/Contact.php:1230
+#: src/Content/Item.php:432 src/Model/Contact.php:1230
+#: src/Model/Contact.php:1242
 msgid "Network Posts"
 msgstr ""
 
-#: src/Content/Item.php:433 src/Model/Contact.php:1221
-#: src/Model/Contact.php:1231
+#: src/Content/Item.php:433 src/Model/Contact.php:1231
+#: src/Model/Contact.php:1243
 msgid "View Contact"
 msgstr ""
 
-#: src/Content/Item.php:434 src/Model/Contact.php:1232
+#: src/Content/Item.php:434 src/Model/Contact.php:1244
 msgid "Send PM"
 msgstr ""
 
@@ -1843,7 +1843,7 @@ msgid "Languages"
 msgstr ""
 
 #: src/Content/Item.php:448 src/Content/Widget.php:80
-#: src/Model/Contact.php:1222 src/Model/Contact.php:1233
+#: src/Model/Contact.php:1232 src/Model/Contact.php:1245
 #: src/Module/Contact/Follow.php:167 view/theme/vier/theme.php:195
 msgid "Connect/Follow"
 msgstr ""
@@ -2181,8 +2181,8 @@ msgid ""
 "<a href=\"%1$s\" target=\"_blank\" rel=\"noopener noreferrer\">%2$s</a> %3$s"
 msgstr ""
 
-#: src/Content/Text/BBCode.php:939 src/Model/Item.php:3745
-#: src/Model/Item.php:3751 src/Model/Item.php:3752
+#: src/Content/Text/BBCode.php:939 src/Model/Item.php:3763
+#: src/Model/Item.php:3769 src/Model/Item.php:3770
 msgid "Link to source"
 msgstr ""
 
@@ -2214,7 +2214,7 @@ msgstr ""
 msgid "The end"
 msgstr ""
 
-#: src/Content/Text/HTML.php:859 src/Content/Widget/VCard.php:116
+#: src/Content/Text/HTML.php:859 src/Content/Widget/VCard.php:121
 #: src/Model/Profile.php:461 src/Module/Contact/Profile.php:471
 msgid "Follow"
 msgstr ""
@@ -2350,7 +2350,7 @@ msgstr ""
 msgid "Organisations"
 msgstr ""
 
-#: src/Content/Widget.php:536 src/Model/Contact.php:1698
+#: src/Content/Widget.php:536 src/Model/Contact.php:1713
 msgid "News"
 msgstr ""
 
@@ -2412,17 +2412,17 @@ msgstr[1] ""
 msgid "More Trending Tags"
 msgstr ""
 
-#: src/Content/Widget/VCard.php:109 src/Model/Profile.php:376
+#: src/Content/Widget/VCard.php:114 src/Model/Profile.php:376
 #: src/Module/Contact/Profile.php:408 src/Module/Profile/Profile.php:199
 msgid "XMPP:"
 msgstr ""
 
-#: src/Content/Widget/VCard.php:110 src/Model/Profile.php:377
+#: src/Content/Widget/VCard.php:115 src/Model/Profile.php:377
 #: src/Module/Contact/Profile.php:410 src/Module/Profile/Profile.php:203
 msgid "Matrix:"
 msgstr ""
 
-#: src/Content/Widget/VCard.php:111 src/Model/Event.php:82
+#: src/Content/Widget/VCard.php:116 src/Model/Event.php:82
 #: src/Model/Event.php:109 src/Model/Event.php:471 src/Model/Event.php:963
 #: src/Model/Profile.php:371 src/Module/Contact/Profile.php:406
 #: src/Module/Directory.php:147 src/Module/Notifications/Introductions.php:187
@@ -2430,17 +2430,32 @@ msgstr ""
 msgid "Location:"
 msgstr ""
 
-#: src/Content/Widget/VCard.php:114 src/Model/Profile.php:474
+#: src/Content/Widget/VCard.php:119 src/Model/Profile.php:474
 #: src/Module/Notifications/Introductions.php:201
 msgid "Network:"
 msgstr ""
 
-#: src/Content/Widget/VCard.php:118 src/Model/Contact.php:1223
-#: src/Model/Contact.php:1234 src/Model/Profile.php:463
+#: src/Content/Widget/VCard.php:123 src/Model/Contact.php:1233
+#: src/Model/Contact.php:1246 src/Model/Profile.php:463
 #: src/Module/Contact/Profile.php:463
 msgid "Unfollow"
 msgstr ""
 
+#: src/Content/Widget/VCard.php:127 src/Model/Contact.php:1234
+#: src/Model/Contact.php:1247 src/Module/Moderation/Item/Source.php:85
+msgid "Mention"
+msgstr ""
+
+#: src/Content/Widget/VCard.php:128 src/Model/Contact.php:1234
+#: src/Model/Contact.php:1247
+msgid "Post to group"
+msgstr ""
+
+#: src/Content/Widget/VCard.php:129 src/Model/Contact.php:1235
+#: src/Model/Contact.php:1248
+msgid "View group"
+msgstr ""
+
 #: src/Core/ACL.php:166 src/Module/Profile/Profile.php:269
 msgid "Yourself"
 msgstr ""
@@ -2701,8 +2716,8 @@ msgstr ""
 
 #: src/Core/Installer.php:511
 msgid ""
-"The web installer needs to be able to create a file called \"local.config.php"
-"\" in the \"config\" folder of your web server and it is unable to do so."
+"The web installer needs to be able to create a file called \"local.config."
+"php\" in the \"config\" folder of your web server and it is unable to do so."
 msgstr ""
 
 #: src/Core/Installer.php:512
@@ -2820,158 +2835,158 @@ msgstr ""
 msgid "Could not connect to database."
 msgstr ""
 
-#: src/Core/L10n.php:476 src/Model/Event.php:430
+#: src/Core/L10n.php:494 src/Model/Event.php:430
 #: src/Module/Settings/Display.php:235
 msgid "Monday"
 msgstr ""
 
-#: src/Core/L10n.php:476 src/Model/Event.php:431
+#: src/Core/L10n.php:494 src/Model/Event.php:431
 #: src/Module/Settings/Display.php:236
 msgid "Tuesday"
 msgstr ""
 
-#: src/Core/L10n.php:476 src/Model/Event.php:432
+#: src/Core/L10n.php:494 src/Model/Event.php:432
 #: src/Module/Settings/Display.php:237
 msgid "Wednesday"
 msgstr ""
 
-#: src/Core/L10n.php:476 src/Model/Event.php:433
+#: src/Core/L10n.php:494 src/Model/Event.php:433
 #: src/Module/Settings/Display.php:238
 msgid "Thursday"
 msgstr ""
 
-#: src/Core/L10n.php:476 src/Model/Event.php:434
+#: src/Core/L10n.php:494 src/Model/Event.php:434
 #: src/Module/Settings/Display.php:239
 msgid "Friday"
 msgstr ""
 
-#: src/Core/L10n.php:476 src/Model/Event.php:435
+#: src/Core/L10n.php:494 src/Model/Event.php:435
 #: src/Module/Settings/Display.php:240
 msgid "Saturday"
 msgstr ""
 
-#: src/Core/L10n.php:476 src/Model/Event.php:429
+#: src/Core/L10n.php:494 src/Model/Event.php:429
 #: src/Module/Settings/Display.php:234
 msgid "Sunday"
 msgstr ""
 
-#: src/Core/L10n.php:480 src/Model/Event.php:450
+#: src/Core/L10n.php:498 src/Model/Event.php:450
 msgid "January"
 msgstr ""
 
-#: src/Core/L10n.php:480 src/Model/Event.php:451
+#: src/Core/L10n.php:498 src/Model/Event.php:451
 msgid "February"
 msgstr ""
 
-#: src/Core/L10n.php:480 src/Model/Event.php:452
+#: src/Core/L10n.php:498 src/Model/Event.php:452
 msgid "March"
 msgstr ""
 
-#: src/Core/L10n.php:480 src/Model/Event.php:453
+#: src/Core/L10n.php:498 src/Model/Event.php:453
 msgid "April"
 msgstr ""
 
-#: src/Core/L10n.php:480 src/Core/L10n.php:499 src/Model/Event.php:441
+#: src/Core/L10n.php:498 src/Core/L10n.php:517 src/Model/Event.php:441
 msgid "May"
 msgstr ""
 
-#: src/Core/L10n.php:480 src/Model/Event.php:454
+#: src/Core/L10n.php:498 src/Model/Event.php:454
 msgid "June"
 msgstr ""
 
-#: src/Core/L10n.php:480 src/Model/Event.php:455
+#: src/Core/L10n.php:498 src/Model/Event.php:455
 msgid "July"
 msgstr ""
 
-#: src/Core/L10n.php:480 src/Model/Event.php:456
+#: src/Core/L10n.php:498 src/Model/Event.php:456
 msgid "August"
 msgstr ""
 
-#: src/Core/L10n.php:480 src/Model/Event.php:457
+#: src/Core/L10n.php:498 src/Model/Event.php:457
 msgid "September"
 msgstr ""
 
-#: src/Core/L10n.php:480 src/Model/Event.php:458
+#: src/Core/L10n.php:498 src/Model/Event.php:458
 msgid "October"
 msgstr ""
 
-#: src/Core/L10n.php:480 src/Model/Event.php:459
+#: src/Core/L10n.php:498 src/Model/Event.php:459
 msgid "November"
 msgstr ""
 
-#: src/Core/L10n.php:480 src/Model/Event.php:460
+#: src/Core/L10n.php:498 src/Model/Event.php:460
 msgid "December"
 msgstr ""
 
-#: src/Core/L10n.php:495 src/Model/Event.php:422
+#: src/Core/L10n.php:513 src/Model/Event.php:422
 msgid "Mon"
 msgstr ""
 
-#: src/Core/L10n.php:495 src/Model/Event.php:423
+#: src/Core/L10n.php:513 src/Model/Event.php:423
 msgid "Tue"
 msgstr ""
 
-#: src/Core/L10n.php:495 src/Model/Event.php:424
+#: src/Core/L10n.php:513 src/Model/Event.php:424
 msgid "Wed"
 msgstr ""
 
-#: src/Core/L10n.php:495 src/Model/Event.php:425
+#: src/Core/L10n.php:513 src/Model/Event.php:425
 msgid "Thu"
 msgstr ""
 
-#: src/Core/L10n.php:495 src/Model/Event.php:426
+#: src/Core/L10n.php:513 src/Model/Event.php:426
 msgid "Fri"
 msgstr ""
 
-#: src/Core/L10n.php:495 src/Model/Event.php:427
+#: src/Core/L10n.php:513 src/Model/Event.php:427
 msgid "Sat"
 msgstr ""
 
-#: src/Core/L10n.php:495 src/Model/Event.php:421
+#: src/Core/L10n.php:513 src/Model/Event.php:421
 msgid "Sun"
 msgstr ""
 
-#: src/Core/L10n.php:499 src/Model/Event.php:437
+#: src/Core/L10n.php:517 src/Model/Event.php:437
 msgid "Jan"
 msgstr ""
 
-#: src/Core/L10n.php:499 src/Model/Event.php:438
+#: src/Core/L10n.php:517 src/Model/Event.php:438
 msgid "Feb"
 msgstr ""
 
-#: src/Core/L10n.php:499 src/Model/Event.php:439
+#: src/Core/L10n.php:517 src/Model/Event.php:439
 msgid "Mar"
 msgstr ""
 
-#: src/Core/L10n.php:499 src/Model/Event.php:440
+#: src/Core/L10n.php:517 src/Model/Event.php:440
 msgid "Apr"
 msgstr ""
 
-#: src/Core/L10n.php:499 src/Model/Event.php:442
+#: src/Core/L10n.php:517 src/Model/Event.php:442
 msgid "Jun"
 msgstr ""
 
-#: src/Core/L10n.php:499 src/Model/Event.php:443
+#: src/Core/L10n.php:517 src/Model/Event.php:443
 msgid "Jul"
 msgstr ""
 
-#: src/Core/L10n.php:499 src/Model/Event.php:444
+#: src/Core/L10n.php:517 src/Model/Event.php:444
 msgid "Aug"
 msgstr ""
 
-#: src/Core/L10n.php:499
+#: src/Core/L10n.php:517
 msgid "Sep"
 msgstr ""
 
-#: src/Core/L10n.php:499 src/Model/Event.php:446
+#: src/Core/L10n.php:517 src/Model/Event.php:446
 msgid "Oct"
 msgstr ""
 
-#: src/Core/L10n.php:499 src/Model/Event.php:447
+#: src/Core/L10n.php:517 src/Model/Event.php:447
 msgid "Nov"
 msgstr ""
 
-#: src/Core/L10n.php:499 src/Model/Event.php:448
+#: src/Core/L10n.php:517 src/Model/Event.php:448
 msgid "Dec"
 msgstr ""
 
@@ -3189,82 +3204,82 @@ msgstr ""
 msgid "Edit circles"
 msgstr ""
 
-#: src/Model/Contact.php:1240 src/Module/Moderation/Users/Pending.php:102
+#: src/Model/Contact.php:1255 src/Module/Moderation/Users/Pending.php:102
 #: src/Module/Notifications/Introductions.php:132
 #: src/Module/Notifications/Introductions.php:204
 msgid "Approve"
 msgstr ""
 
-#: src/Model/Contact.php:1694
+#: src/Model/Contact.php:1709
 msgid "Organisation"
 msgstr ""
 
-#: src/Model/Contact.php:1702
+#: src/Model/Contact.php:1717
 msgid "Group"
 msgstr ""
 
-#: src/Model/Contact.php:3005
+#: src/Model/Contact.php:3020
 msgid "Disallowed profile URL."
 msgstr ""
 
-#: src/Model/Contact.php:3010 src/Module/Friendica.php:101
+#: src/Model/Contact.php:3025 src/Module/Friendica.php:101
 msgid "Blocked domain"
 msgstr ""
 
-#: src/Model/Contact.php:3015
+#: src/Model/Contact.php:3030
 msgid "Connect URL missing."
 msgstr ""
 
-#: src/Model/Contact.php:3024
+#: src/Model/Contact.php:3039
 msgid ""
 "The contact could not be added. Please check the relevant network "
 "credentials in your Settings -> Social Networks page."
 msgstr ""
 
-#: src/Model/Contact.php:3042
+#: src/Model/Contact.php:3057
 #, php-format
 msgid "Expected network %s does not match actual network %s"
 msgstr ""
 
-#: src/Model/Contact.php:3059
+#: src/Model/Contact.php:3074
 msgid "The profile address specified does not provide adequate information."
 msgstr ""
 
-#: src/Model/Contact.php:3061
+#: src/Model/Contact.php:3076
 msgid "No compatible communication protocols or feeds were discovered."
 msgstr ""
 
-#: src/Model/Contact.php:3064
+#: src/Model/Contact.php:3079
 msgid "An author or name was not found."
 msgstr ""
 
-#: src/Model/Contact.php:3067
+#: src/Model/Contact.php:3082
 msgid "No browser URL could be matched to this address."
 msgstr ""
 
-#: src/Model/Contact.php:3070
+#: src/Model/Contact.php:3085
 msgid ""
 "Unable to match @-style Identity Address with a known protocol or email "
 "contact."
 msgstr ""
 
-#: src/Model/Contact.php:3071
+#: src/Model/Contact.php:3086
 msgid "Use mailto: in front of address to force email check."
 msgstr ""
 
-#: src/Model/Contact.php:3077
+#: src/Model/Contact.php:3092
 msgid ""
 "The profile address specified belongs to a network which has been disabled "
 "on this site."
 msgstr ""
 
-#: src/Model/Contact.php:3082
+#: src/Model/Contact.php:3097
 msgid ""
 "Limited profile. This person will be unable to receive direct/personal "
 "notifications from you."
 msgstr ""
 
-#: src/Model/Contact.php:3148
+#: src/Model/Contact.php:3163
 msgid "Unable to retrieve contact information."
 msgstr ""
 
@@ -3369,81 +3384,81 @@ msgstr ""
 msgid "Happy Birthday %s"
 msgstr ""
 
-#: src/Model/Item.php:2062
+#: src/Model/Item.php:2080
 #, php-format
 msgid "Detected languages in this post:\\n%s"
 msgstr ""
 
-#: src/Model/Item.php:3007
+#: src/Model/Item.php:3025
 msgid "activity"
 msgstr ""
 
-#: src/Model/Item.php:3009
+#: src/Model/Item.php:3027
 msgid "comment"
 msgstr ""
 
-#: src/Model/Item.php:3012 src/Module/Post/Tag/Add.php:123
+#: src/Model/Item.php:3030 src/Module/Post/Tag/Add.php:123
 msgid "post"
 msgstr ""
 
-#: src/Model/Item.php:3182
+#: src/Model/Item.php:3200
 #, php-format
 msgid "%s is blocked"
 msgstr ""
 
-#: src/Model/Item.php:3184
+#: src/Model/Item.php:3202
 #, php-format
 msgid "%s is ignored"
 msgstr ""
 
-#: src/Model/Item.php:3186
+#: src/Model/Item.php:3204
 #, php-format
 msgid "Content from %s is collapsed"
 msgstr ""
 
-#: src/Model/Item.php:3190
+#: src/Model/Item.php:3208
 #, php-format
 msgid "Content warning: %s"
 msgstr ""
 
-#: src/Model/Item.php:3652
+#: src/Model/Item.php:3670
 msgid "bytes"
 msgstr ""
 
-#: src/Model/Item.php:3683
+#: src/Model/Item.php:3701
 #, php-format
 msgid "%2$s (%3$d%%, %1$d vote)"
 msgid_plural "%2$s (%3$d%%, %1$d votes)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Model/Item.php:3685
+#: src/Model/Item.php:3703
 #, php-format
 msgid "%2$s (%1$d vote)"
 msgid_plural "%2$s (%1$d votes)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Model/Item.php:3690
+#: src/Model/Item.php:3708
 #, php-format
 msgid "%d voter. Poll end: %s"
 msgid_plural "%d voters. Poll end: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Model/Item.php:3692
+#: src/Model/Item.php:3710
 #, php-format
 msgid "%d voter."
 msgid_plural "%d voters."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Model/Item.php:3694
+#: src/Model/Item.php:3712
 #, php-format
 msgid "Poll end: %s"
 msgstr ""
 
-#: src/Model/Item.php:3728 src/Model/Item.php:3729
+#: src/Model/Item.php:3746 src/Model/Item.php:3747
 msgid "View on separate page"
 msgstr ""
 
@@ -5328,9 +5343,9 @@ msgstr ""
 
 #: src/Module/Admin/Summary.php:98
 msgid ""
-"The last update failed. Please run \"php bin/console.php dbstructure update"
-"\" from the command line and have a look at the errors that might appear. "
-"(Some of the errors are possibly inside the logfile.)"
+"The last update failed. Please run \"php bin/console.php dbstructure "
+"update\" from the command line and have a look at the errors that might "
+"appear. (Some of the errors are possibly inside the logfile.)"
 msgstr ""
 
 #: src/Module/Admin/Summary.php:102
@@ -5481,8 +5496,8 @@ msgstr ""
 #, php-format
 msgid ""
 "Show some informations regarding the needed information to operate the node "
-"according e.g. to <a href=\"%s\" target=\"_blank\" rel=\"noopener noreferrer"
-"\">EU-GDPR</a>."
+"according e.g. to <a href=\"%s\" target=\"_blank\" rel=\"noopener "
+"noreferrer\">EU-GDPR</a>."
 msgstr ""
 
 #: src/Module/Admin/Tos.php:81
@@ -5507,7 +5522,7 @@ msgstr ""
 msgid "Enter your system rules here. Each line represents one rule."
 msgstr ""
 
-#: src/Module/Api/ApiResponse.php:279
+#: src/Module/Api/ApiResponse.php:293
 #, php-format
 msgid "API endpoint %s %s is not implemented but might be in the future."
 msgstr ""
@@ -7973,10 +7988,6 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
-#: src/Module/Moderation/Item/Source.php:85
-msgid "Mention"
-msgstr ""
-
 #: src/Module/Moderation/Item/Source.php:86
 msgid "Implicit Mention"
 msgstr ""
@@ -8834,8 +8845,8 @@ msgstr ""
 #: src/Module/Profile/Profile.php:158
 #, php-format
 msgid ""
-"You're currently viewing your profile as <b>%s</b> <a href=\"%s\" class="
-"\"btn btn-sm pull-right\">Cancel</a>"
+"You're currently viewing your profile as <b>%s</b> <a href=\"%s\" "
+"class=\"btn btn-sm pull-right\">Cancel</a>"
 msgstr ""
 
 #: src/Module/Profile/Profile.php:167
@@ -9383,8 +9394,8 @@ msgstr ""
 #: src/Module/Security/TwoFactor/Verify.php:100
 #, php-format
 msgid ""
-"If you do not have access to your authentication code you can use a <a href="
-"\"%s\">two-factor recovery code</a>."
+"If you do not have access to your authentication code you can use a <a "
+"href=\"%s\">two-factor recovery code</a>."
 msgstr ""
 
 #: src/Module/Security/TwoFactor/Verify.php:101
@@ -10924,8 +10935,8 @@ msgstr ""
 #: src/Module/Settings/TwoFactor/Verify.php:149
 #, php-format
 msgid ""
-"<p>Or you can open the following URL in your mobile device:</p><p><a href="
-"\"%s\">%s</a></p>"
+"<p>Or you can open the following URL in your mobile device:</p><p><a "
+"href=\"%s\">%s</a></p>"
 msgstr ""
 
 #: src/Module/Settings/TwoFactor/Verify.php:156
@@ -11034,9 +11045,9 @@ msgstr ""
 msgid ""
 "At any point in time a logged in user can export their account data from the "
 "<a href=\"%1$s/settings/userexport\">account settings</a>. If the user wants "
-"to delete their account they can do so at <a href=\"%1$s/settings/removeme\">"
-"%1$s/settings/removeme</a>. The deletion of the account will be permanent. "
-"Deletion of the data will also be requested from the nodes of the "
+"to delete their account they can do so at <a href=\"%1$s/settings/"
+"removeme\">%1$s/settings/removeme</a>. The deletion of the account will be "
+"permanent. Deletion of the data will also be requested from the nodes of the "
 "communication partners."
 msgstr ""
 

diff --git a/view/templates/hovercard.tpl b/view/templates/hovercard.tpl
index 563a5a248e25e1989fbf1decf4192598231141c9..70a341035d5b1bbd1aa20a7831c3d15c6299cddc 100644 (file)
--- a/view/templates/hovercard.tpl
+++ b/view/templates/hovercard.tpl
@@ -21,7 +21,20 @@
                                {{* here are the different actions like private message, delete and so on *}}
                                {{* @todo we have two different photo menus one for contacts and one for items at the network stream. We currently use the contact photo menu, so the items options are missing We need to move them *}}
                                <div class="hover-card-actions-social">
-                                       {{if $profile.actions.pm}}<a class="btn btn-labeled btn-primary btn-sm add-to-modal" href="{{$profile.actions.pm.1}}" aria-label="{{$profile.actions.pm.0}}"><i class="fa fa-envelope" aria-hidden="true" title="{{$profile.actions.pm.0}}"></i><span class="sr-only">{{$profile.actions.pm.0}}</span></a>{{/if}}
+                               {{if $profile.actions.pm}}
+                                       <a class="btn btn-labeled btn-primary btn-sm add-to-modal" href="{{$profile.actions.pm.1}}" title="{{$profile.actions.pm.0}}">
+                                               <i class="fa fa-envelope" aria-hidden="true"></i>
+                                               <span class="sr-only">{{$profile.actions.pm.0}}</span>
+                                       </a>
+                               {{/if}}
+
+                               {{if $profile.addr && !$profile.self}}
+                                       <a class="btn btn-labeled btn-primary btn-sm" href="{{$profile.actions.mention.1}}" title="{{$profile.actions.mention.0}}">
+                                               <i class="fa fa-pencil-square-o" aria-hidden="true"></i>
+                                               <span class="sr-only">{{$profile.actions.mention.0}}</span>
+                                       </a>
+                               {{/if}}
+
                                </div>
                                <div class="hover-card-actions-connection">
                                        {{if $profile.actions.network}}<a class="btn btn-labeled btn-primary btn-sm" href="{{$profile.actions.network.1}}" aria-label="{{$profile.actions.network.0}}" title="{{$profile.actions.network.0}}"><i class="fa fa-cloud" aria-hidden="true"></i></a>{{/if}}

diff --git a/view/theme/frio/templates/profile/vcard.tpl b/view/theme/frio/templates/profile/vcard.tpl
index cc67227a2a5e6fb135dda29cf19a1d0421e68508..94f62bd0d3e663a7ca6fbb67c5946ef1b31bffd3 100644 (file)
--- a/view/theme/frio/templates/profile/vcard.tpl
+++ b/view/theme/frio/templates/profile/vcard.tpl
@@ -70,6 +70,13 @@
                                </button>
                        </div>
                        {{/if}}
+                        {{if $profile.addr}}
+                               <div id="mention-link-button">
+                                       <button type="button" id="mention-link" class="btn btn-labeled btn-primary" onclick="openWallMessage('compose/0?body={{if $profile.forum==1}}!{{else}}@{{/if}}{{$profile.addr}}')">
+                                              <span class=""><i class="fa fa-pencil-square-o"></i></span>
+                                              <span class="">{{$mention}}</span>
+                               </div>
+                       {{/if}}
                </div>
                {{/if}}
 

diff --git a/view/theme/frio/templates/widget/vcard.tpl b/view/theme/frio/templates/widget/vcard.tpl
index 9fef57a9d72dc959b92c6ab5b9d391bd256826ae..e3a8918eb9a1afd2d90082b5c8d98818697eb2e7 100644 (file)
--- a/view/theme/frio/templates/widget/vcard.tpl
+++ b/view/theme/frio/templates/widget/vcard.tpl
@@ -56,6 +56,22 @@
                                        </button>
                                </div>
                        {{/if}}
+                        {{if $contact.addr}}
+                               <div id="mention-link-button">
+                                       <button type="button" id="mention-link" class="btn btn-labeled btn-primary{{if !$always_open_compose}} modal-open{{/if}}" onclick="openWallMessage('compose/0?body={{if $contact.forum==1}}!{{else}}@{{/if}}{{$contact.addr}}')">
+                                               <span class=""><i class="fa fa-pencil-square-o"></i></span>
+                                               <span class="">{{if $contact.forum==1}}{{$posttogroup}}{{else}}{{$mention}}{{/if}}</span>
+                                       </button>
+                               </div>
+                        {{/if}}
+                        {{if $contact.forum==1 || $contact.prv==1}}
+                               <div id="show-group-button">
+                                       <button type="button" id="show-group" class="btn btn-labeled btn-primary{{if !$always_open_compose}} modal-open{{/if}}" onclick="window.location.href='{{$showgroup_link}}'">
+                                               <span class=""><i class="fa fa-group"></i></span>
+                                               <span class="">{{$showgroup}}</span>
+                                       </button>
+                               </div>
+                        {{/if}}
                </div>
 
                <div class="clear"></div>