mexon/friendica
1
0
Fork 0
Code Pull requests Activity

Merge remote-tracking branch 'origin/develop' into profile

Browse source
This commit is contained in:
Michael 2021-07-23 13:29:36 +00:00
parent f6e5a14805 fa28eb650f
commit fae0f839bc
3 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/Module/HoverCard.php → src/Module/HCard.php
View file

@ -29,9 +29,10 @@ use Friendica\Model\User;
use Friendica\Network\HTTPException; use Friendica\Network\HTTPException;
/** /**
* Loads a profile for the HoverCard view * Loads a profile for the hCard page
* @see http://microformats.org/wiki/hcard
*/ */
class HoverCard extends BaseModule class HCard extends BaseModule
{ {
public static function rawContent(array $parameters = []) public static function rawContent(array $parameters = [])
{ {
@ -41,7 +42,7 @@ class HoverCard extends BaseModule
// A logged in user views a profile of a user // A logged in user views a profile of a user
$nickname = $a->user['nickname']; $nickname = $a->user['nickname'];
} elseif (empty($parameters['action'])) { } elseif (empty($parameters['action'])) {
// Show the profile hovercard // Show the profile hCard
$nickname = $parameters['profile']; $nickname = $parameters['profile'];
} else { } else {
throw new HTTPException\NotFoundException(DI::l10n()->t('No profile')); throw new HTTPException\NotFoundException(DI::l10n()->t('No profile'));

2
static/routes.config.php
View file

@ -292,7 +292,7 @@ return [
'/hashtag' => [Module\Hashtag::class, [R::GET]], '/hashtag' => [Module\Hashtag::class, [R::GET]],
'/help[/{doc:.+}]' => [Module\Help::class, [R::GET]], '/help[/{doc:.+}]' => [Module\Help::class, [R::GET]],
'/home' => [Module\Home::class, [R::GET]], '/home' => [Module\Home::class, [R::GET]],
'/hcard/{profile}[/{action}]' => [Module\HoverCard::class, [R::GET]], '/hcard/{profile}[/{action}]' => [Module\HCard::class, [R::GET]],
'/inbox[/{nickname}]' => [Module\ActivityPub\Inbox::class, [R::GET, R::POST]], '/inbox[/{nickname}]' => [Module\ActivityPub\Inbox::class, [R::GET, R::POST]],
'/invite' => [Module\Invite::class, [R::GET, R::POST]], '/invite' => [Module\Invite::class, [R::GET, R::POST]],

10
view/lang/C/messages.po
View file

@ -864,7 +864,7 @@ msgstr ""
msgid "Access denied." msgid "Access denied."
msgstr "" msgstr ""
#: mod/cal.php:72 mod/cal.php:133 src/Module/HoverCard.php:53 #: mod/cal.php:72 mod/cal.php:133 src/Module/HCard.php:54
#: src/Module/Profile/Common.php:41 src/Module/Profile/Common.php:53 #: src/Module/Profile/Common.php:41 src/Module/Profile/Common.php:53
#: src/Module/Profile/Contacts.php:40 src/Module/Profile/Contacts.php:51 #: src/Module/Profile/Contacts.php:40 src/Module/Profile/Contacts.php:51
#: src/Module/Profile/Status.php:58 src/Module/Register.php:254 #: src/Module/Profile/Status.php:58 src/Module/Register.php:254
@ -8208,6 +8208,10 @@ msgstr ""
msgid "Add contact to group" msgid "Add contact to group"
msgstr "" msgstr ""
#: src/Module/HCard.php:48
msgid "No profile"
msgstr ""
#: src/Module/HTTPException/MethodNotAllowed.php:32 #: src/Module/HTTPException/MethodNotAllowed.php:32
msgid "Method Not Allowed." msgid "Method Not Allowed."
msgstr "" msgstr ""
@ -8221,10 +8225,6 @@ msgstr ""
msgid "Welcome to %s" msgid "Welcome to %s"
msgstr "" msgstr ""
#: src/Module/HoverCard.php:47
msgid "No profile"
msgstr ""
#: src/Module/Install.php:188 #: src/Module/Install.php:188
msgid "Friendica Communications Server - Setup" msgid "Friendica Communications Server - Setup"
msgstr "" msgstr ""