From: Mormegil <mormegil@centrum.cz>
Date: Mon, 21 Sep 2015 12:58:37 +0000 (+0200)
Subject: Translate password reset e-mail subject into proper language
X-Git-Tag: 1.31.0-rc.0~9899^2
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=320a63ffe48599ed9c5d9f5aec15705dbc2f481c;p=lhc%2Fweb%2Fwiklou.git

Translate password reset e-mail subject into proper language

The password reset e-mail should have the subject line localized into
the same language as the body, which is the preferred UI language
set by the user, not the content language of the wiki.

Bug: T113227
Change-Id: I3bb1e1035004a329b934afb2fbfbd407685c6e8c
---

diff --git a/includes/specials/SpecialPasswordReset.php b/includes/specials/SpecialPasswordReset.php
index 8cad61683b..9e72807f0b 100644
--- a/includes/specials/SpecialPasswordReset.php
+++ b/includes/specials/SpecialPasswordReset.php
@@ -271,7 +271,7 @@ class SpecialPasswordReset extends FormSpecialPage {
 			round( $this->getConfig()->get( 'NewPasswordExpiry' ) / 86400 )
 		);
 
-		$title = $this->msg( 'passwordreset-emailtitle' );
+		$title = $this->msg( 'passwordreset-emailtitle' )->inLanguage( $userLanguage );
 
 		$this->result = $firstUser->sendMail( $title->text(), $this->email->text() );