* Restored prior text for password reminder button and e-mail, replacing

  the factually inaccurate text that was there.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 9c7f3bb..84702ac 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -319,6 +319,8 @@ Various bugfixes, small features, and a few experimental things:
   harwest e.g. article counts from multiple wikis.
 * The copyright confirmation box at Special:Upload is now turned off by default
   and can be turned back on by setting $wgCopyrightAffirmation to a true value.
+* Restored prior text for password reminder button and e-mail, replacing
+  the factually inaccurate text that was there.
 
 === Caveats ===
 

diff --git a/includes/SpecialUserlogin.php b/includes/SpecialUserlogin.php
index e684c44..f7b6680 100644 (file)
--- a/includes/SpecialUserlogin.php
+++ b/includes/SpecialUserlogin.php
@@ -399,9 +399,9 @@ class LoginForm {
                $ip = $wgIP;
                if ( '' == $ip ) { $ip = '(Unknown)'; }
 
-               $m = wfMsg( 'passwordremindermailbody', $ip, $u->getName(), wfUrlencode($u->getName()), $np );
-               $result = $u->sendMail( wfMsg( 'passwordremindermailsubject' ), $m );
-               
+               $m = wfMsg( 'passwordremindertext', $ip, $u->getName(), $np );
+
+               $result = $u->sendMail( wfMsg( 'passwordremindertitle' ), $m );
                return $result;
        }
 

diff --git a/languages/Language.php b/languages/Language.php
index a18598f..88c7562 100644 (file)
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -612,21 +612,15 @@ email address to them, and it can be used to send you a new password if you forg
 Check your spelling, or use the form below to create a new user account.",
 'nosuchusershort'      => "There is no user by the name \"$1\". Check your spelling.",
 'wrongpassword'                => 'The password you entered is incorrect (or missing). Please try again.',
-'mailmypassword'       => 'Mail me a temporary password',
-'mailmypasswordauthent'        => 'Mail me a temporary password',
-'passwordremindermailsubject' => "Email address authentication and temporary login password from {{SITENAME}}",
-'passwordremindermailbody'     => "Someone, probably you from IP address $1,
-requested that we send you a temporary one-time login password for {{SITENAME}}.
-
-This mail is also be sent for the purpose of authentication of your email address.
-The password for user \"$2\" is now \"$4\".
-
-You can now log in with this temporary password, which is valid for only one login.
-You may wish to keep using your old password if you remember it or to set a new one.
-
-{{SERVER}}{{localurl:Special:Userlogin|wpName=$3&wpPassword=$4&returnto=Special:Preferences}}",
+'mailmypassword'       => 'Mail me a new password',
+'passwordremindertitle' => "Password reminder from {{SITENAME}}",
+'passwordremindertext' => "Someone (probably you, from IP address $1)
+requested that we send you a new {{SITENAME}} login password.
+The password for user \"$2\" is now \"$3\".
+You should log in and change your password now.",
 'noemail'                          => "There is no e-mail address recorded for user \"$1\".",
-'passwordsent'                 => "A temporary password has been sent to the e-mail address registered for \"$1\".
+'passwordsent' => "A new password has been sent to the e-mail address
+registered for \"$1\".
 Please log in again after you receive it.",
 'eauthentsent'             =>  "A confirmation email has been sent to the nominated email address. 
 Before any other mail is sent to the account, you will have to follow the instructions in the email, 

diff --git a/languages/LanguageCs.php b/languages/LanguageCs.php
index 2f1072c..e86d747 100644 (file)
--- a/languages/LanguageCs.php
+++ b/languages/LanguageCs.php
@@ -446,16 +446,6 @@ adresu může být zasláno nové heslo v případě, že své heslo zapomenete.
 'wrongpassword' => 'Vámi uvedené heslo nesouhlasí. Zkuste to znovu.',
 'mailmypassword' => 'Poslat e-mailem dočasné heslo',
 'mailmypasswordauthent'        => 'Poslat e-mailem dočasné heslo',
-'passwordremindermailsubject' => 'Ověření e-mailu a dočasné heslo pro přihlášení do {{grammar:2sg|{{SITENAME}}}}',
-'passwordremindermailbody' => 'Někdo (patrně vy, z IP adresy $1) žádal, abychom vám poslali dočasné jednorázové heslo pro přihlášení do {{grammar:2sg|{{SITENAME}}}}.
-
-Tento e-mail slouží také jako autentizace vaší e-mailové adresy.
-Heslo pro uživatele  "$2" je nyní "$4".
-
-Tímto dočasným heslem se můžete přihlásit pouze jednou. Pokud si pamatujete
-původní heslo, můžete ho používat dál, jinak si můžete své heslo změnit.
-
-{{SERVER}}{{localurl:Special:Userlogin|wpName=$3&wpPassword=$4&returnto=Special:Preferences}}',
 'noemail'              => 'Uživatel „$1“ nemá zaregistrovanou e-mailovou adresu.',
 'passwordsent' => 'Dočasné heslo bylo zasláno na e-mailovou adresu registrovanou pro „$1“. Přihlašte se, prosím, znovu, jakmile ho obdržíte.',
 'eauthentsent'             =>  'Potvrzovací e-mail byl zaslán na zadanou adresu.

diff --git a/languages/LanguageRu.php b/languages/LanguageRu.php
index 802d2f4..2545302 100644 (file)
--- a/languages/LanguageRu.php
+++ b/languages/LanguageRu.php
@@ -497,10 +497,6 @@ $1',
 'wrongpassword'         => 'Введённый вами пароль неверен. Попробуйте ещё раз.',
 'mailmypassword'        => 'Выслать новый пароль',
 'mailmypasswordauthent' => 'Выслать новый пароль',
-'passwordremindermailsubject' => "Напоминание пароля участника {{grammar:genitive|{{SITENAME}}}}",
-'passwordremindermailbody'      => "Кто-то (возможно вы) с IP-адресом $1 запросил, чтобы мы выслали вам новый пароль участника {{grammar:genitive|{{SITENAME}}}}.
-Пароль для участника $2 теперь таков: <code>$3</code>.
-Теперь Вам следует представиться системе и поменять пароль.", 
 'noemail'               => "Для участника с именем $1 электронный адрес указан не был.",
 'passwordsent'          => "Новый пароль был выслан на адрес электронной почты, указанный для участника $1.
 

diff --git a/languages/LanguageSk.php b/languages/LanguageSk.php
index d393cbb..c1033f0 100644 (file)
--- a/languages/LanguageSk.php
+++ b/languages/LanguageSk.php
@@ -443,14 +443,6 @@ Vaše skutočné meno, ak sa rozhodnete ho uverejniť, bude priradené k vašej
 'wrongpassword' => 'Zadané heslo je nesprávne. Skúste to znovu.',
 'mailmypassword' => 'Pošlite mi e-mailom dočasné heslo',
 'mailmypasswordauthent' => 'Pošlite mi e-mailom dočasné heslo',
-'passwordremindermailsubject' => "Oznámenie o hesle z {{GRAMMAR:genitív|{{SITENAME}}}}",
-'passwordremindermailbody' => "Niekto (pravdepodobne vy, z IP adresy $1)
-požiadal, aby sme vám zaslali nové prihlasovacie heslo do {{GRAMMAR:genitív|{{SITENAME}}}}.
-Heslo pre redaktora \"$2\" je teraz \"$4\".
-Teraz by ste sa mali prihlásiť a zmeniť vaše heslo, ktoré je platné iba pre jedno prihlásenie.
-Môžete používať svoje staré heslo, ak si naňho spomeniete alebo si zvoľte nové.
-
-{{SERVER}}{{localurl:Special:Userlogin|wpName=$3&wpPassword=$4&returnto=Special:Preferences}}",
 'noemail' => "Redaktor \"$1\" nezadal e-mailovú adresu.",
 'passwordsent' => "Nové heslo bolo zaslané na e-mailovú adresu
 redaktora \"$1\".