From: Brion Vibber <brion@users.mediawiki.org>
Date: Mon, 7 Jul 2008 20:27:52 +0000 (+0000)
Subject: Revert r37223 "keeping the consistence of the function name string"
X-Git-Tag: 1.31.0-rc.0~46645
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=18f570644b01418bf0525532045860a478c457fe;p=lhc%2Fweb%2Fwiklou.git

Revert r37223 "keeping the consistence of the function name string"
Incorrect use of UI language message in content-language text
---

diff --git a/includes/specials/SpecialEmailuser.php b/includes/specials/SpecialEmailuser.php
index 205002fbdf..3874c6a1d6 100644
--- a/includes/specials/SpecialEmailuser.php
+++ b/includes/specials/SpecialEmailuser.php
@@ -150,7 +150,7 @@ class EmailUserForm {
 
 		// Add a standard footer and trim up trailing newlines
 		$this->text = rtrim($this->text) . "\n\n---\n" . wfMsgExt( 'emailuserfooter',
-			array( 'content', 'parsemag' ), array( $from->name, $to->name, wfMsg ('emailuser') ) );
+			array( 'content', 'parsemag' ), array( $from->name, $to->name ) );
 		
 		if( wfRunHooks( 'EmailUser', array( &$to, &$from, &$subject, &$this->text ) ) ) {
 
diff --git a/languages/messages/MessagesCs.php b/languages/messages/MessagesCs.php
index 9408655e26..59629c16cf 100644
--- a/languages/messages/MessagesCs.php
+++ b/languages/messages/MessagesCs.php
@@ -1666,7 +1666,6 @@ Zobrazení můžete zúžit výběrem typu záznamu, uživatelského jména nebo
 'emailccsubject'  => 'Kopie Vaší zprávy pro uživatele $1: $2',
 'emailsent'       => 'Zpráva odeslána',
 'emailsenttext'   => 'Váš e-mail byl odeslán.',
-'emailuserfooter' => 'Tento e-mail byl zaslal(a) $1 uživateli/uživatelce $2 s použitím funkce „$3“ na {{grammar:6sg|{{SITENAME}}}}.',
 
 # Watchlist
 'watchlist'            => 'Sledované stránky',
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 673e7bd3ad..028cc603b6 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -2039,7 +2039,7 @@ 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' => 'This e-mail was sent by $1 to $2 by the "$3" function at {{SITENAME}}.',
+'emailuserfooter' => 'This e-mail was sent by $1 to $2 by the "Email user" function at {{SITENAME}}.',
 
 # Watchlist
 'watchlist'            => 'My watchlist',