From: Mark A. Hershberger <mah@everybody.org>
Date: Wed, 25 Jul 2012 16:57:18 +0000 (-0400)
Subject: Bug 38676 - password-change-forbidden isn't properly localized
X-Git-Tag: 1.31.0-rc.0~22854^2
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22suivi_revisions%22%29%20.%20%22?a=commitdiff_plain;h=b0a1c5dfb768edb3feaa1b762648cf1c42d005b5;p=lhc%2Fweb%2Fwiklou.git

Bug 38676 - password-change-forbidden isn't properly localized

Change-Id: Idfe4ec283826fed2e02431d5f1cb12f359261484
---

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 48ec9b9091..9fcc101cdb 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1068,6 +1068,7 @@ Do not forget to change your [[Special:Preferences|{{SITENAME}} preferences]].',
 'remembermypassword'         => 'Remember my login on this browser (for a maximum of $1 {{PLURAL:$1|day|days}})',
 'securelogin-stick-https'    => 'Stay connected to HTTPS after login',
 'yourdomainname'             => 'Your domain:',
+'password-change-forbidden'  => 'You cannot change passwords on this wiki.',
 'externaldberror'            => 'There was either an authentication database error or you are not allowed to update your external account.',
 'login'                      => 'Log in',
 'nav-login-createaccount'    => 'Log in / create account',
diff --git a/languages/messages/MessagesQqq.php b/languages/messages/MessagesQqq.php
index b36bef86dc..36f1774ec5 100644
--- a/languages/messages/MessagesQqq.php
+++ b/languages/messages/MessagesQqq.php
@@ -716,6 +716,7 @@ $1 is a filename, I think.',
 'remembermypassword' => 'A check box in [[Special:UserLogin]]
 
 {{Identical|Remember my login on this computer}}',
+'password-change-forbidden' => 'Error message shown when an external authentication source does not allow the password to be changed.',
 'externaldberror' => 'This message is thrown when a valid attempt to change the wiki password for a user fails because of a database error or an error from an external system.',
 'login' => "Shown as the caption of the button at [[Special:UserLogin]], and also to anonymous users in the upper right corner of the page when they can't create an account (otherwise the message {{msg|nav-login-createaccount}} is shown there).
 
@@ -2069,7 +2070,7 @@ Used on [[Special:UploadWizard]].',
 'http-invalid-scheme' => 'The message appears in the Mediawiki code as follows:
 
  if ( $this->parsedUrl[\'scheme\'] != \'http\' ) {
-    $this->status->fatal( \'http-invalid-scheme\', $this->parsedUrl[\'scheme\'] );
+	$this->status->fatal( \'http-invalid-scheme\', $this->parsedUrl[\'scheme\'] );
  }
 
 Siebrand think this has to do with allowing MediaWiki to fetch remote URLs, and in that not allowing anything but "http://" request. So if this for example is "irc://" or "https://", $1 would be "irc" or "https" respectively.
diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 126faaaaa2..55906be7f1 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -430,6 +430,7 @@ $wgMessageStructure = array(
 		'remembermypassword',
 		'securelogin-stick-https',
 		'yourdomainname',
+		'password-change-forbidden',
 		'externaldberror',
 		'login',
 		'nav-login-createaccount',