friendica/dir
6
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' of git://github.com/tobiasd/friendika

Browse source
This commit is contained in:
root 2011-01-22 09:22:16 +01:00
commit 0dc7e0975a
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mod/like.php
View file

@ -150,7 +150,7 @@ EOT;
$arr['author-link'] = $contact['url']; $arr['author-link'] = $contact['url'];
$arr['author-avatar'] = $contact['thumb']; $arr['author-avatar'] = $contact['thumb'];
$arr['body'] = '[url=' . $contact['url'] . ']' . $contact['name'] . '[/url]' . ' ' . t('likes') . ' ' $arr['body'] = '[url=' . $contact['url'] . ']' . $contact['name'] . '[/url]' . ' ' . t('likes') . ' '
. '[url=' . $owner['url'] . ']' . $owner['name'] . t('\'s') . '[/url]' . ' ' . '[url=' . $item['author-link'] . ']' . $item['author-name'] . t('\'s') . '[/url]' . ' '
. '[url=' . $a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . ']' . $post_type . '[/url]' ; . '[url=' . $a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . ']' . $post_type . '[/url]' ;
$arr['verb'] = $activity; $arr['verb'] = $activity;

3
view/de/cmnt_received_eml.tpl
View file

@ -1,8 +1,7 @@
Hallo $username, Hallo $username,
'$from' hat ein Ding oder eine Konversation kommentiert welchem/r du '$from' hat einen Pinnwandeintrag kommentiert dem du auch folgst.
auch folgst.
----- -----
$body $body