summaryrefslogtreecommitdiff
path: root/actions/userrss.php
diff options
context:
space:
mode:
authorCraig Andrews <candrews@integralblue.com>2009-08-06 22:45:09 -0400
committerCraig Andrews <candrews@integralblue.com>2009-08-06 22:45:09 -0400
commit91cba7a76f97a1669cbe9a2c2fa1b3e653786f26 (patch)
tree41b17a816862539845900c4d28ece7b638e6a77d /actions/userrss.php
parentaba2fcb45141929d9fdb0ec5e91e3aef8c44d709 (diff)
parentadc5901d21be286ff3459f2cd2bf4373625ac5e5 (diff)
Merge commit 'jeff-themovie/0.8.x-rss-1.0-descriptions' into 0.8.x
Diffstat (limited to 'actions/userrss.php')
-rw-r--r--actions/userrss.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/actions/userrss.php b/actions/userrss.php
index 8a940865f..a9f3fd5f8 100644
--- a/actions/userrss.php
+++ b/actions/userrss.php
@@ -88,9 +88,10 @@ class UserrssAction extends Rss10Action
$c = array('url' => common_local_url('userrss',
array('nickname' =>
$user->nickname)),
- 'title' => $user->nickname,
+ 'title' => sprintf(_('%s timeline'), $user->nickname),
'link' => $profile->profileurl,
- 'description' => sprintf(_('Microblog by %s'), $user->nickname));
+ 'description' => sprintf(_('Updates from %1$s on %2$s!'),
+ $user->nickname, common_config('site', 'name')));
return $c;
}