nudge: better nudge email, better nudge disable language.

darcs-hash:20081117175627-099f7-59da80fe33257fa736a354c0a422a227e534ab2c.gz
This commit is contained in:
millette 2008-11-17 12:56:27 -05:00
parent e369c5f740
commit d1ecedfffe
2 changed files with 3 additions and 3 deletions

View File

@ -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.'),

View File

@ -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);