diff options
author | Evan Prodromou <evan@controlyourself.ca> | 2009-08-21 15:42:11 -0400 |
---|---|---|
committer | Evan Prodromou <evan@controlyourself.ca> | 2009-08-21 15:42:11 -0400 |
commit | b2664e1ae2e2cf66585cdd8696d88efdd053eb3b (patch) | |
tree | 3e406bc5502c0937f2cf81e0b4a6a1b714a1b403 /actions/tagrss.php | |
parent | c78772b2748f70acc8158b665218fe53b277a031 (diff) | |
parent | 9f07921b45190b462e1a798622068e24ef31e124 (diff) |
Merge branch '0.8.x' into 0.9.x
Conflicts:
actions/updateprofile.php
actions/userauthorization.php
classes/User_group.php
index.php
install.php
lib/accountsettingsaction.php
lib/logingroupnav.php
Diffstat (limited to 'actions/tagrss.php')
-rw-r--r-- | actions/tagrss.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actions/tagrss.php b/actions/tagrss.php index f69374fca..c3c03b9cd 100644 --- a/actions/tagrss.php +++ b/actions/tagrss.php @@ -61,7 +61,8 @@ class TagrssAction extends Rss10Action $c = array('url' => common_local_url('tagrss', array('tag' => $tagname)), 'title' => $tagname, 'link' => common_local_url('tagrss', array('tag' => $tagname)), - 'description' => sprintf(_('Microblog tagged with %s'), $tagname)); + 'description' => sprintf(_('Updates tagged with %1$s on %2$s!'), + $tagname, common_config('site', 'name'))); return $c; } |