nudge: better nudge email, better nudge disable language.

darcs-hash:20081117175627-099f7-59da80fe33257fa736a354c0a422a227e534ab2c.gz

diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index 84be12675b868567fea3bac989a61f4b7e816579..61e59e4db122a68f78fd690829d958d72aeb1005 100644 (file)
--- 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 a4764bfb5491443e5b55f13a9a69b8c4c20bac2e..0fb36a465a926e6a67bf977072e0f815778ec362 100644 (file)
--- 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);