From: Niklas Laxström <nikerabbit@users.mediawiki.org>
Date: Tue, 17 Jun 2008 08:03:34 +0000 (+0000)
Subject: * No point passing sitename in parameter, as needs to be accompanied with grammar... 
X-Git-Tag: 1.31.0-rc.0~46981
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=c9397a83554536a68d07b8ff5155359e074d8405;p=lhc%2Fweb%2Fwiklou.git

* No point passing sitename in parameter, as needs to be accompanied with grammar support
---

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