X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fatomlistnoticefeed.php;h=f4765d44099b5ac70e88a316b45667abfea2a6ad;hb=10f2cde0b1d75fa023b00400162cb525e8719514;hp=fec7e1684680deb3e2a854f4ea846a4c1acb706e;hpb=57198a74647f8350db4de03b0b7ef157091a4359;p=quix0rs-gnu-social.git diff --git a/lib/atomlistnoticefeed.php b/lib/atomlistnoticefeed.php index fec7e16846..f4765d4409 100644 --- a/lib/atomlistnoticefeed.php +++ b/lib/atomlistnoticefeed.php @@ -59,17 +59,17 @@ class AtomListNoticeFeed extends AtomNoticeFeed function __construct($list, $cur = null, $indent = true) { parent::__construct($cur, $indent); $this->list = $list; - $this->tagger = Profile::staticGet('id', $list->tagger); + $this->tagger = Profile::getKV('id', $list->tagger); - // TRANS: Title in atom list notice feed. %s is a list name. - $title = sprintf(_("Timeline for people tagged #%s by %s"), $list->tag, $this->tagger->nickname); + // TRANS: Title in atom list notice feed. %1$s is a list name, %2$s is a tagger's nickname. + $title = sprintf(_('Timeline for people in list %1$s by %2$s'), $list->tag, $this->tagger->nickname); $this->setTitle($title); $sitename = common_config('site', 'name'); $subtitle = sprintf( // TRANS: Message is used as a subtitle in atom list notice feed. - // TRANS: %1$s is a list name, %2$s is a site name. - _('Updates from %1$s\'s %2$s people tag on %3$s!'), + // TRANS: %1$s is a tagger's nickname, %2$s is a list name, %3$s is a site name. + _('Updates from %1$s\'s list %2$s on %3$s!'), $this->tagger->nickname, $list->tag, $sitename @@ -88,11 +88,9 @@ class AtomListNoticeFeed extends AtomNoticeFeed $this->setId($self); $this->setSelfLink($self); - // FIXME: Stop using activity:subject? $ao = ActivityObject::fromPeopletag($this->list); - $this->addAuthorRaw($ao->asString('author'). - $ao->asString('activity:subject')); + $this->addAuthorRaw($ao->asString('author')); $this->addLink($this->list->getUri()); } @@ -101,5 +99,4 @@ class AtomListNoticeFeed extends AtomNoticeFeed { return $this->list; } - }