diff options
| author | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-03-18 18:07:37 +0100 |
|---|---|---|
| committer | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-03-18 18:07:37 +0100 |
| commit | 878bdeccfd66b7b8229fd761c23ba13bc51c7454 (patch) | |
| tree | 6b881c4f71389ef6aa49776e8b99ac65f30f4ec2 /mod/contacts.php | |
| parent | f4f5095e19badcc85453182b86bff97f57228257 (diff) | |
| parent | 9838245c6c9b2e311650b53a1c3aa1ef778ef935 (diff) | |
| download | volse-hubzilla-878bdeccfd66b7b8229fd761c23ba13bc51c7454.tar.gz volse-hubzilla-878bdeccfd66b7b8229fd761c23ba13bc51c7454.tar.bz2 volse-hubzilla-878bdeccfd66b7b8229fd761c23ba13bc51c7454.zip | |
Merge branch 'master' of git://github.com/friendika/friendika
Diffstat (limited to 'mod/contacts.php')
| -rw-r--r-- | mod/contacts.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mod/contacts.php b/mod/contacts.php index c2d28dc1f..029330b7a 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -137,7 +137,8 @@ function contacts_content(&$a) { intval(local_user()) ); if($r) { - notice( t('Contact has been ') . (($blocked) ? t('blocked') : t('unblocked')) . EOL ); + //notice( t('Contact has been ') . (($blocked) ? t('blocked') : t('unblocked')) . EOL ); + notice( (($blocked) ? t('Contact has been blocked') : t('Contact has been unblocked')) . EOL ); } goaway($a->get_baseurl() . '/contacts/' . $contact_id); return; // NOTREACHED @@ -151,7 +152,7 @@ function contacts_content(&$a) { intval(local_user()) ); if($r) { - notice( t('Contact has been ') . (($readonly) ? t('ignored') : t('unignored')) . EOL ); + notice( (($readonly) ? t('Contact has been ignored') : t('Contact has been unignored')) . EOL ); } goaway($a->get_baseurl() . '/contacts/' . $contact_id); return; // NOTREACHED @@ -364,13 +365,14 @@ function contacts_content(&$a) { $o .= replace_macros($tpl, array( - '$img_hover' => t('Visit ') . $rr['name'] . t('\'s profile'), + '$img_hover' => t('Visit $username\'s profile'), '$edit_hover' => t('Edit contact'), '$id' => $rr['id'], '$alt_text' => $alt_text, '$dir_icon' => $dir_icon, '$thumb' => $rr['thumb'], '$name' => substr($rr['name'],0,20), + '$username' => $rr['name'], '$sparkle' => $sparkle, '$url' => $url )); |