Merge branch 'master' of gitorious.org:statusnet/mainline

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

diff --git a/actions/allrss.php b/actions/allrss.php
index 28b1be27d82a254d82bebca9943138576b9e3927..7df0b1ef7c67c0ee2dc7389f9bede96d7373cdda 100644 (file)
--- a/actions/allrss.php
+++ b/actions/allrss.php
@@ -83,6 +83,7 @@ class AllrssAction extends Rss10Action
     function getNotices($limit=0)
     {
         $cur = common_current_user();
+        $user = $this->user;
 
         if (!empty($cur) && $cur->id == $user->id) {
             $notice = $this->user->noticeInbox(0, $limit);
@@ -90,7 +91,6 @@ class AllrssAction extends Rss10Action
             $notice = $this->user->noticesWithFriends(0, $limit);
         }
 
-        $user    = $this->user;
         $notice  = $user->noticesWithFriends(0, $limit);
         $notices = array();
 
@@ -112,10 +112,12 @@ class AllrssAction extends Rss10Action
         $c    = array('url' => common_local_url('allrss',
                                              array('nickname' =>
                                                    $user->nickname)),
+                   // TRANS: Message is used as link title. %s is a user nickname.
                    'title' => sprintf(_('%s and friends'), $user->nickname),
                    'link' => common_local_url('all',
                                              array('nickname' =>
                                                    $user->nickname)),
+                   // TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
                    'description' => sprintf(_('Updates from %1$s and friends on %2$s!'),
                                             $user->nickname, common_config('site', 'name')));
         return $c;