aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
Diffstat (limited to 'mod')
-rw-r--r--mod/dfrn_notify.php2
-rw-r--r--mod/item.php2
-rw-r--r--mod/like.php12
3 files changed, 9 insertions, 7 deletions
diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index 3a75123a5..2cc5a62f3 100644
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -472,7 +472,7 @@ function dfrn_notify_post(&$a) {
));
$res = mail($importer['email'], sprintf( t("%s commented on an item at %s") , $from ,$a->config['sitename']),
- $email_tpl, t("From: Administrator@") . $a->get_hostname() );
+ $email_tpl, "From: ".t("Administrator") . "@". $a->get_hostname() );
break;
}
}
diff --git a/mod/item.php b/mod/item.php
index 2cdfb0d66..da317a8c0 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -443,7 +443,7 @@ function item_post(&$a) {
));
$res = mail($user['email'], sprintf( t("%s posted on your profile wall at %s") ,$from, $a->config['sitename']),
- $email_tpl,"From: " . t("Administrator@") . "@" . $a->get_hostname() );
+ $email_tpl,"From: " . t("Administrator") . "@" . $a->get_hostname() );
}
}
diff --git a/mod/like.php b/mod/like.php
index 406d6cc00..3e3d69529 100644
--- a/mod/like.php
+++ b/mod/like.php
@@ -124,9 +124,9 @@ function like_content(&$a) {
</object>
EOT;
if($verb === 'like')
- $bodyverb = t('likes');
+ $bodyverb = t('%1$s likes %2$s\'s %3$s');
if($verb === 'dislike')
- $bodyverb = t('doesn\'t like');
+ $bodyverb = t('%1$s doesn\'t like %2$s\'s %3$s');
if(! isset($bodyverb))
return;
@@ -147,9 +147,11 @@ EOT;
$arr['author-name'] = $contact['name'];
$arr['author-link'] = $contact['url'];
$arr['author-avatar'] = $contact['thumb'];
- $arr['body'] = '[url=' . $contact['url'] . ']' . $contact['name'] . '[/url]' . ' ' . $bodyverb . ' '
- . '[url=' . $item['author-link'] . ']' . sprintf( t("%s's") ,$item['author-name']) . '[/url]' . ' '
- . '[url=' . $a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . ']' . $post_type . '[/url]' ;
+
+ $ulink = '[url=' . $contact['url'] . ']' . $contact['name'] . '[/url]';
+ $alink = '[url=' . $item['author-link'] . ']' . $item['author-name'] . '[/url]';
+ $plink = '[url=' . $a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . ']' . $post_type . '[/url]';
+ $arr['body'] = sprintf( $bodyverb, $ulink, $alink, $plink );
$arr['verb'] = $activity;
$arr['object-type'] = $objtype;