eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x

Browse Source
This commit is contained in:
Evan Prodromou
2011-08-25 18:03:30 -04:00
parent 44a46de7ff 8ea5cd0cac
commit c0bae505d9
10 changed files with 51 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/Activity/ActivityPlugin.php
View File

@@ -84,7 +84,7 @@ class ActivityPlugin extends Plugin
if (!empty($user)) {
$sub = Subscription::pkeyGet(array('subscriber' => $subscriber->id,
'subscribed' => $other->id));
$rendered = sprintf(_m('<em><a href="%s">%s</a> started following <a href="%s">%s</a></em>.'),
$rendered = sprintf(_m('<a href="%s">%s</a> started following <a href="%s">%s</a>.'),
$subscriber->profileurl,
$subscriber->getBestName(),
$other->profileurl,
@@ -114,7 +114,7 @@ class ActivityPlugin extends Plugin
if(!$this->StopFollowUser) return true;
$user = $subscriber->getUser();
if (!empty($user)) {
$rendered = sprintf(_m('<em><a href="%s">%s</a> stopped following <a href="%s">%s</a></em>.'),
$rendered = sprintf(_m('<a href="%s">%s</a> stopped following <a href="%s">%s</a>.'),
$subscriber->profileurl,
$subscriber->getBestName(),
$other->profileurl,
@@ -156,7 +156,7 @@ class ActivityPlugin extends Plugin
$fave = Fave::pkeyGet(array('user_id' => $user->id,
'notice_id' => $notice->id));
$rendered = sprintf(_m('<em><a href="%s">%s</a> liked <a href="%s">%s\'s update</a></em>.'),
$rendered = sprintf(_m('<a href="%s">%s</a> liked <a href="%s">%s\'s update</a>.'),
$profile->profileurl,
$profile->getBestName(),
$notice->bestUrl(),
@@ -189,7 +189,7 @@ class ActivityPlugin extends Plugin
if (!empty($user)) {
$author = Profile::staticGet('id', $notice->profile_id);
$rendered = sprintf(_m('<em><a href="%s">%s</a> stopped liking <a href="%s">%s\'s update</a></em>.'),
$rendered = sprintf(_m('<a href="%s">%s</a> stopped liking <a href="%s">%s\'s update</a>.'),
$profile->profileurl,
$profile->getBestName(),
$notice->bestUrl(),
@@ -230,7 +230,7 @@ class ActivityPlugin extends Plugin
return true;
}
$rendered = sprintf(_m('<em><a href="%s">%s</a> joined the group <a href="%s">%s</a></em>.'),
$rendered = sprintf(_m('<a href="%s">%s</a> joined the group <a href="%s">%s</a>.'),
$profile->profileurl,
$profile->getBestName(),
$group->homeUrl(),
@@ -267,7 +267,7 @@ class ActivityPlugin extends Plugin
return true;
}
$rendered = sprintf(_m('<em><a href="%s">%s</a> left the group <a href="%s">%s</a></em>.'),
$rendered = sprintf(_m('<a href="%s">%s</a> left the group <a href="%s">%s</a>.'),
$profile->profileurl,
$profile->getBestName(),
$group->homeUrl(),