GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Make RSS 1.0 channel descriptions more consistent with RSS 2.0 and Atom descriptions

This commit is contained in:
Jeffery To 2009-08-06 23:36:24 +08:00
parent c8c2d9d7c9
commit adc5901d21
8 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
actions/allrss.php
View File

@ -115,8 +115,8 @@ class AllrssAction extends Rss10Action
'link' => common_local_url('all', 'link' => common_local_url('all',
array('nickname' => array('nickname' =>
$user->nickname)), $user->nickname)),
'description' => sprintf(_('Feed for friends of %s'), 'description' => sprintf(_('Updates from %1$s and friends on %2$s!'),
$user->nickname)); $user->nickname, common_config('site', 'name')));
return $c; return $c;
} }

4
actions/favoritesrss.php
View File

@ -111,8 +111,8 @@ class FavoritesrssAction extends Rss10Action
'link' => common_local_url('showfavorites', 'link' => common_local_url('showfavorites',
array('nickname' => array('nickname' =>
$user->nickname)), $user->nickname)),
'description' => sprintf(_('Feed of favorite notices of %s'), 'description' => sprintf(_('Updates favored by %1$s on %2$s!'),
$user->nickname)); $user->nickname, common_config('site', 'name')));
return $c; return $c;
} }

5
actions/grouprss.php
View File

@ -132,9 +132,10 @@ class groupRssAction extends Rss10Action
$c = array('url' => common_local_url('grouprss', $c = array('url' => common_local_url('grouprss',
array('nickname' => array('nickname' =>
$group->nickname)), $group->nickname)),
'title' => $group->nickname, 'title' => sprintf(_('%s timeline'), $group->nickname),
'link' => common_local_url('showgroup', array('nickname' => $group->nickname)), 'link' => common_local_url('showgroup', array('nickname' => $group->nickname)),
'description' => sprintf(_('Microblog by %s group'), $group->nickname)); 'description' => sprintf(_('Updates from members of %1$s on %2$s!'),
$group->nickname, common_config('site', 'name')));
return $c; return $c;
} }

5
actions/noticesearchrss.php
View File

@ -86,9 +86,10 @@ class NoticesearchrssAction extends Rss10Action
{ {
$q = $this->trimmed('q'); $q = $this->trimmed('q');
$c = array('url' => common_local_url('noticesearchrss', array('q' => $q)), $c = array('url' => common_local_url('noticesearchrss', array('q' => $q)),
'title' => common_config('site', 'name') . sprintf(_(' Search Stream for "%s"'), $q), 'title' => sprintf(_('Updates with "%s"'), $q),
'link' => common_local_url('noticesearch', array('q' => $q)), 'link' => common_local_url('noticesearch', array('q' => $q)),
'description' => sprintf(_('All updates matching search term "%s"'), $q)); 'description' => sprintf(_('Updates matching search term "%1$s" on %2$s!'),
$q, common_config('site', 'name')));
return $c; return $c;
} }

4
actions/publicrss.php
View File

@ -86,9 +86,9 @@ class PublicrssAction extends Rss10Action
{ {
$c = array( $c = array(
'url' => common_local_url('publicrss') 'url' => common_local_url('publicrss')
, 'title' => sprintf(_('%s Public Stream'), common_config('site', 'name')) , 'title' => sprintf(_('%s public timeline'), common_config('site', 'name'))
, 'link' => common_local_url('public') , 'link' => common_local_url('public')
, 'description' => sprintf(_('All updates for %s'), common_config('site', 'name'))); , 'description' => sprintf(_('%s updates from everyone!'), common_config('site', 'name')));
return $c; return $c;
} }

3
actions/repliesrss.php
View File

@ -68,7 +68,8 @@ class RepliesrssAction extends Rss10Action
'link' => common_local_url('replies', 'link' => common_local_url('replies',
array('nickname' => array('nickname' =>
$user->nickname)), $user->nickname)),
'description' => sprintf(_('Feed for replies to %s'), $user->nickname)); 'description' => sprintf(_('Replies to %1$s on %2$s!'),
$user->nickname, common_config('site', 'name')));
return $c; return $c;
} }

3
actions/tagrss.php
View File

@ -61,7 +61,8 @@ class TagrssAction extends Rss10Action
$c = array('url' => common_local_url('tagrss', array('tag' => $tagname)), $c = array('url' => common_local_url('tagrss', array('tag' => $tagname)),
'title' => $tagname, 'title' => $tagname,
'link' => common_local_url('tagrss', array('tag' => $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; return $c;
} }

5
actions/userrss.php
View File

@ -88,9 +88,10 @@ class UserrssAction extends Rss10Action
$c = array('url' => common_local_url('userrss', $c = array('url' => common_local_url('userrss',
array('nickname' => array('nickname' =>
$user->nickname)), $user->nickname)),
'title' => $user->nickname, 'title' => sprintf(_('%s timeline'), $user->nickname),
'link' => $profile->profileurl, '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; return $c;
} }