Merge branch 'ATOM-priority" from Alexandre Alapetite into HEAD

source: https://git.gnu.io/gnu/gnu-social/merge_requests/174
This commit is contained in:
Diogo Cordeiro 2019-05-03 13:26:06 +01:00
commit 515682c0cd

View File

@ -97,23 +97,29 @@ class PublicAction extends SitestreamAction
*/ */
function getFeeds() function getFeeds()
{ {
return array(new Feed(Feed::JSON, return [
common_local_url('ApiTimelinePublic',
array('format' => 'as')),
// TRANS: Link description for public timeline feed.
_('Public Timeline Feed (Activity Streams JSON)')),
new Feed(Feed::RSS1, common_local_url('publicrss'),
// TRANS: Link description for public timeline feed.
_('Public Timeline Feed (RSS 1.0)')),
new Feed(Feed::RSS2,
common_local_url('ApiTimelinePublic',
array('format' => 'rss')),
// TRANS: Link description for public timeline feed.
_('Public Timeline Feed (RSS 2.0)')),
new Feed(Feed::ATOM, new Feed(Feed::ATOM,
common_local_url('ApiTimelinePublic', common_local_url('ApiTimelinePublic',
array('format' => 'atom')), array('format' => 'atom')),
// TRANS: Link description for public timeline feed. // TRANS: Link description for public timeline feed.
_('Public Timeline Feed (Atom)'))); _('Public Timeline Feed (Atom)')
),
new Feed(Feed::JSON,
common_local_url('ApiTimelinePublic',
array('format' => 'as')),
// TRANS: Link description for public timeline feed.
_('Public Timeline Feed (Activity Streams JSON)')
),
new Feed(Feed::RSS1, common_local_url('publicrss'),
// TRANS: Link description for public timeline feed.
_('Public Timeline Feed (RSS 1.0)')
),
new Feed(Feed::RSS2,
common_local_url('ApiTimelinePublic',
array('format' => 'rss')),
// TRANS: Link description for public timeline feed.
_('Public Timeline Feed (RSS 2.0)')
),
];
} }
} }