diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-08-24 16:55:49 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-08-24 16:55:49 -0400 |
| commit | ff87732053bae38879988ba7d002a294998ccb4e (patch) | |
| tree | ccccfe7fc8976baf1f0cd4438a57bf817dc4052c /actions/tagrss.php | |
| parent | 27aeba01dd366f15f7847267b7518fb873987ddb (diff) | |
| parent | f3cdc7f272e409d391979d3e6c58dd63573530c0 (diff) | |
Merge branch '0.8.x' into testing
Conflicts:
actions/twitterauthorization.php
lib/oauthclient.php
lib/twitter.php
lib/twitterapi.php
lib/twitteroauthclient.php
scripts/twitterstatusfetcher.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; } |