From 9a899902931b158eea9a23427623a809100d2016 Mon Sep 17 00:00:00 2001 From: Mikael Nordfeldth Date: Wed, 2 Mar 2016 00:13:28 +0100 Subject: [PATCH] Some changes since getFancyName() is longer with full acct: URI --- plugins/ActivityModeration/classes/Deleted_notice.php | 4 +++- plugins/OStatus/OStatusPlugin.php | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/plugins/ActivityModeration/classes/Deleted_notice.php b/plugins/ActivityModeration/classes/Deleted_notice.php index 4ffc0c895f..05414caab2 100644 --- a/plugins/ActivityModeration/classes/Deleted_notice.php +++ b/plugins/ActivityModeration/classes/Deleted_notice.php @@ -151,9 +151,11 @@ class Deleted_notice extends Managed_DataObject $actobj->title = ActivityUtils::verbToTitle($actobj->verb); $actor = $this->getActor(); + // TRANS: Notice HTML content of a deleted notice. %1$s is the + // TRANS: actor's URL, %2$s its "fancy name" and %3$s the notice URI. $actobj->content = sprintf(_m('%2$s deleted notice {{%3$s}}.'), htmlspecialchars($actor->getUrl()), - htmlspecialchars($actor->getBestName()), + htmlspecialchars($actor->getFancyName()), htmlspecialchars($this->getUri()) ); diff --git a/plugins/OStatus/OStatusPlugin.php b/plugins/OStatus/OStatusPlugin.php index 292af658ed..d702703c81 100644 --- a/plugins/OStatus/OStatusPlugin.php +++ b/plugins/OStatus/OStatusPlugin.php @@ -312,7 +312,7 @@ class OStatusPlugin extends Plugin assert($profile instanceof Profile); $text = !empty($profile->nickname) && mb_strlen($profile->nickname) < mb_strlen($target) - ? $profile->getNickname() // TODO: we could do getFancyName() or getFullname() here + ? $profile->getNickname() // TODO: we could do getBestName() or getFullname() here : $target; $url = $profile->getUri(); if (!common_valid_http_url($url)) {