Merge commit 'refs/merge-requests/169' of git://gitorious.org/statusnet/mainline...

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

diff --git a/actions/public.php b/actions/public.php
index e4f98dacc35a41c782665853ccce1be1cc50c8bf..75217cb2293965ed4394a4701bad86f590650ce0 100644 (file)
--- a/actions/public.php
+++ b/actions/public.php
@@ -95,7 +95,7 @@ class PublicAction extends Action
 
         if (!$this->notice) {
             // TRANS: Server error displayed when a public timeline cannot be retrieved.
-            $this->serverError(_('Could not retrieve public stream.'));
+            $this->serverError(_('Could not retrieve public timeline.'));
             return;
         }
 
@@ -166,20 +166,20 @@ class PublicAction extends Action
                               common_local_url('ApiTimelinePublic',
                                                array('format' => 'as')),
                               // TRANS: Link description for public timeline feed.
-                              _('Public Stream Feed (Activity Streams JSON)')),
+                              _('Public Timeline Feed (Activity Streams JSON)')),
                     new Feed(Feed::RSS1, common_local_url('publicrss'),
                               // TRANS: Link description for public timeline feed.
-                              _('Public Stream Feed (RSS 1.0)')),
+                              _('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 Stream Feed (RSS 2.0)')),
+                              _('Public Timeline Feed (RSS 2.0)')),
                      new Feed(Feed::ATOM,
                               common_local_url('ApiTimelinePublic',
                                                array('format' => 'atom')),
                               // TRANS: Link description for public timeline feed.
-                              _('Public Stream Feed (Atom)')));
+                              _('Public Timeline Feed (Atom)')));
     }
 
     function showEmptyList()
@@ -245,8 +245,10 @@ class PublicAction extends Action
 
         $pop = new PopularNoticeSection($this);
         $pop->show();
-        $cloud = new PublicTagCloudSection($this);
-        $cloud->show();
+        if (!common_config('performance', 'high')) {
+            $cloud = new PublicTagCloudSection($this);
+            $cloud->show();
+        }
         $feat = new FeaturedUsersSection($this);
         $feat->show();
     }