From c9397a83554536a68d07b8ff5155359e074d8405 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Niklas=20Laxstr=C3=B6m?= Date: Tue, 17 Jun 2008 08:03:34 +0000 Subject: [PATCH] * No point passing sitename in parameter, as needs to be accompanied with grammar support --- includes/specials/Emailuser.php | 4 ++-- languages/messages/MessagesEn.php | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/includes/specials/Emailuser.php b/includes/specials/Emailuser.php index bf4eea7575..4e7045dda9 100644 --- a/includes/specials/Emailuser.php +++ b/includes/specials/Emailuser.php @@ -155,7 +155,7 @@ class EmailUserForm { $footerArgs[1] = $from->name; $footerArgs[2] = $to->name; $footerArgs[3] = $prefsTitle->getFullURL(); - $this->text = $this->text . "\n" . wfMsg( 'emailuserfooter', $footerArgs ); + $this->text = $this->text . "\n" . wfMsgExt( 'emailuserfooter', 'parsemag', $footerArgs ); if( wfRunHooks( 'EmailUser', array( &$to, &$from, &$subject, &$this->text ) ) ) { @@ -190,7 +190,7 @@ class EmailUserForm { $mailResult = UserMailer::send( $to, $mailFrom, $subject, $this->text, $replyTo ); if( WikiError::isError( $mailResult ) ) { - return $mailResult; + return $mailResult; } else { diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index 3606efad03..5dac099040 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -2014,9 +2014,9 @@ The e-mail address you entered in your user preferences will appear as the "From 'emailccsubject' => 'Copy of your message to $1: $2', 'emailsent' => 'E-mail sent', 'emailsenttext' => 'Your e-mail message has been sent.', -'emailuserfooter' => 'Sent automatically by $1 to $2 for $3 -Please note, $1 cannot be held responsible for the content of this email. -The option to remove yourself from these mailings is in your preferences +'emailuserfooter' => 'Sent automatically by {{SITENAME}} to $2 for $3. +Please note, {{SITENAME}} cannot be held responsible for the content of this email. +The option to remove yourself from these mailings is in your preferences. Check your preferences at $4 and uncheck "Enable e-mail from other users."', # Watchlist -- 2.20.1