summaryrefslogtreecommitdiff
path: root/actions/userrss.php
diff options
context:
space:
mode:
authorCraig Andrews <candrews@integralblue.com>2010-04-18 19:21:15 -0400
committerCraig Andrews <candrews@integralblue.com>2010-04-18 19:21:15 -0400
commit39392e03a71d94d6b984033b994b417edfc2d8d6 (patch)
treecb3ae36fc9a20a4cd884e271ef36dcce28f109c8 /actions/userrss.php
parent727ea5a5163249eb40fa0c4b2c63054fc997473b (diff)
parent23bad16bba52a09f0cea3d2c40e6cf91e2945e37 (diff)
Merge branch '0.9.x' into 1.0.x
Conflicts: actions/confirmaddress.php actions/imsettings.php
Diffstat (limited to 'actions/userrss.php')
-rw-r--r--actions/userrss.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/actions/userrss.php b/actions/userrss.php
index e03eb9356..b7078fcaf 100644
--- a/actions/userrss.php
+++ b/actions/userrss.php
@@ -72,7 +72,7 @@ class UserrssAction extends Rss10Action
{
$notice = $this->user->getNotices(
0,
- ($limit == 0) ? NOTICES_PER_PAGE : $limit
+ ($this->limit == 0) ? NOTICES_PER_PAGE : $this->limit
);
$notices = array();
@@ -90,8 +90,10 @@ class UserrssAction extends Rss10Action
$c = array('url' => common_local_url('userrss',
array('nickname' =>
$user->nickname)),
+ // TRANS: Message is used as link title. %s is a user nickname.
'title' => sprintf(_('%s timeline'), $user->nickname),
'link' => $profile->profileurl,
+ // TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
'description' => sprintf(_('Updates from %1$s on %2$s!'),
$user->nickname, common_config('site', 'name')));
return $c;
@@ -103,7 +105,7 @@ class UserrssAction extends Rss10Action
$profile = $user->getProfile();
if (!$profile) {
common_log_db_error($user, 'SELECT', __FILE__);
- $this->serverError(_('User without matching profile'));
+ $this->serverError(_('User without matching profile.'));
return null;
}
$avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);