Page notice message as instructions class

[quix0rs-gnu-social.git] / actions / networkpublic.php

diff --git a/actions/networkpublic.php b/actions/networkpublic.php
index 79e642b773e0a13ef636a0fbe4e7fdf927538d09..41c4e37e3cd41cce1db97872a390fc79f4ba3471 100644 (file)
--- a/actions/networkpublic.php
+++ b/actions/networkpublic.php
@@ -2,7 +2,7 @@
 
 if (!defined('GNUSOCIAL')) { exit(1); }
 
-class NetworkpublicAction extends PublicAction
+class NetworkpublicAction extends SitestreamAction
 {
     protected function streamPrepare()
     {
@@ -28,13 +28,6 @@ class NetworkpublicAction extends PublicAction
         }
     }
 
-    function extraHead()
-    {
-        // the PublicAction has some XRDS stuff that might be unique to the non-network public feed
-        // FIXME: Solve this with a call that doesn't rely on parent:: and is unique for each class.
-        ManagedAction::extraHead();
-    }
-
     function showSections()
     {
         // Show invite button, as long as site isn't closed, and
@@ -61,20 +54,20 @@ class NetworkpublicAction extends PublicAction
         return array(new Feed(Feed::JSON,
                               common_local_url('ApiTimelineNetworkPublic',
                                                array('format' => 'as')),
-                              // TRANS: Link description for public timeline feed.
-                              _('Public Timeline Feed (Activity Streams JSON)')),
+                              // TRANS: Link description for the _global_ network public timeline feed.
+                              _('Network 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)')),
+                              // TRANS: Link description for the _global_ network public timeline feed.
+                              _('Network Public Timeline Feed (RSS 1.0)')),
                      new Feed(Feed::RSS2,
                               common_local_url('ApiTimelineNetworkPublic',
                                                array('format' => 'rss')),
-                              // TRANS: Link description for public timeline feed.
-                              _('Public Timeline Feed (RSS 2.0)')),
+                              // TRANS: Link description for the _global_ network public timeline feed.
+                              _('Network Public Timeline Feed (RSS 2.0)')),
                      new Feed(Feed::ATOM,
                               common_local_url('ApiTimelineNetworkPublic',
                                                array('format' => 'atom')),
-                              // TRANS: Link description for public timeline feed.
-                              _('Public Timeline Feed (Atom)')));
+                              // TRANS: Link description for the _global_ network public timeline feed.
+                              _('Network Public Timeline Feed (Atom)')));
     }
 }