diff options
| author | Brion Vibber <brion@pobox.com> | 2010-05-21 13:12:25 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-05-21 13:12:25 -0700 |
| commit | 87b8a89aa7b96e63586bdd3b1afb9d43355fd48b (patch) | |
| tree | ef227ad50cd25699d34dd1a3364ac0cf430443da /lib/mail.php | |
| parent | a39a934dd4a133bad6e76fa9a5018cedcb70225c (diff) | |
| parent | bbfd6eff0c69f038d151d3bf6c8bf9b45a64716f (diff) | |
Merge branch 'master' of gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'lib/mail.php')
| -rw-r--r-- | lib/mail.php | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/mail.php b/lib/mail.php index a4065e8d5..ab5742e33 100644 --- a/lib/mail.php +++ b/lib/mail.php @@ -245,6 +245,11 @@ function mail_subscribe_notify_profile($listenee, $other) $other->getBestName(), common_config('site', 'name')); + $blocklink = sprintf(_("If you believe this account is being used abusively, " . + "you can block them from your subscribers list and " . + "report as spam to site administrators at %s"), + common_local_url('block', array('profileid' => $other->id))); + // TRANS: Main body of new-subscriber notification e-mail $body = sprintf(_('%1$s is now listening to your notices on %2$s.'."\n\n". "\t".'%3$s'."\n\n". @@ -264,9 +269,10 @@ function mail_subscribe_notify_profile($listenee, $other) ($other->homepage) ? // TRANS: Profile info line in new-subscriber notification e-mail sprintf(_("Homepage: %s"), $other->homepage) . "\n" : '', - ($other->bio) ? + (($other->bio) ? // TRANS: Profile info line in new-subscriber notification e-mail - sprintf(_("Bio: %s"), $other->bio) . "\n\n" : '', + sprintf(_("Bio: %s"), $other->bio) . "\n" : '') . + "\n\n" . $blocklink . "\n", common_config('site', 'name'), common_local_url('emailsettings')); |