From d1ecedfffebbb0c9687cca7e37fa3558c15ad92a Mon Sep 17 00:00:00 2001 From: millette Date: Mon, 17 Nov 2008 12:56:27 -0500 Subject: nudge: better nudge email, better nudge disable language. darcs-hash:20081117175627-099f7-59da80fe33257fa736a354c0a422a227e534ab2c.gz --- actions/emailsettings.php | 2 +- lib/mail.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/actions/emailsettings.php b/actions/emailsettings.php index 84be12675..61e59e4db 100644 --- a/actions/emailsettings.php +++ b/actions/emailsettings.php @@ -95,7 +95,7 @@ class EmailsettingsAction extends SettingsAction { _('Send me email when someone sends me a private message.'), $user->emailnotifymsg); common_checkbox('emailnotifynudge', - _('Send me an email when someone nudges me.'), + _('Allow friends to nudge me and send me an email.'), $user->emailnotifynudge); common_checkbox('emailpost', _('I want to post notices by email.'), diff --git a/lib/mail.php b/lib/mail.php index a4764bfb5..0fb36a465 100644 --- a/lib/mail.php +++ b/lib/mail.php @@ -240,14 +240,14 @@ function mail_notify_nudge($from, $to) { $from_profile = $from->getProfile(); $body = sprintf(_("%1\$s (%2\$s) is wondering what you are up to these days and is inviting you to post some news.\n\n". - "You can reply to their message here:\n\n". + "So let's hear from you :)\n\n". "%3\$s\n\n". "Don't reply to this email; it won't get to them.\n\n". "With kind regards,\n". "%4\$s\n"), $from_profile->getBestName(), $from->nickname, - common_local_url('newmessage', array('to' => $from->id)), + common_local_url('all', array('nickname' => $to->nickname)), common_config('site', 'name')); return mail_to_user($to, $subject, $body); -- cgit v1.2.3-54-g00ecf