Better titles and instructions for Featured and Popular tabs

(Do not be afraid of this patch!)

darcs-hash:20081211235341-7b5ce-98bae58e267b4e4b0adb5835e5a05e19cd910363.gz

diff --git a/actions/favorited.php b/actions/favorited.php
index 13962b42e1eb88f97aeee90bbafcf2d8186e5bce..5f6c19c167ab9adf558bb9110e4691d260810438 100644 (file)
--- a/actions/favorited.php
+++ b/actions/favorited.php
@@ -28,7 +28,7 @@ class FavoritedAction extends StreamAction {
 
                $page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
 
-               common_show_header(_('Favorited timeline'),
+               common_show_header(_('Popular notices'),
                                                   array($this, 'show_header'), NULL,
                                                   array($this, 'show_top'));
 
@@ -51,7 +51,7 @@ class FavoritedAction extends StreamAction {
        }
 
        function get_instructions() {
-               return _('Showing most favorited notices from the last week');
+               return _('Showing recently popular notices');
        }
 
        function show_notices($page) {

diff --git a/actions/featured.php b/actions/featured.php
index 2bbe7c70cef666ea594922abe251f49af17e1b44..96fbd89ab7d05440cd7bc3f588d20464a89b3ee2 100644 (file)
--- a/actions/featured.php
+++ b/actions/featured.php
@@ -29,7 +29,7 @@ class FeaturedAction extends StreamAction {
 
                $page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
 
-               common_show_header(_('Featured timeline'),
+               common_show_header(_('Featured users'),
                                                   array($this, 'show_header'), NULL,
                                                   array($this, 'show_top'));
 

diff --git a/lib/stream.php b/lib/stream.php
index 4569f39296dd33bb9bea1177aec7e3c2be82eb08..27ab78137f430f7f6ba1205897d6e938815500c3 100644 (file)
--- a/lib/stream.php
+++ b/lib/stream.php
@@ -38,11 +38,11 @@ class StreamAction extends PersonalAction {
 
                if (count(common_config('nickname', 'featured')) > 0) {
                        common_menu_item(common_local_url('featured'), _('Featured'),
-                               _('Notices from featured Users'), $action == 'featured');
+                               _('Featured users'), $action == 'featured');
                }
 
                common_menu_item(common_local_url('favorited'), _('Popular'),
-                       _("Latest popular notices"), $action == 'favorited');
+                       _("Popular notices"), $action == 'favorited');
 
                common_element_end('ul');