From: This, that and the other <at.light@live.com.au>
Date: Thu, 10 Jul 2014 12:32:18 +0000 (+1000)
Subject: Display MediaWiki:Loginprompt on the login page
X-Git-Tag: 1.31.0-rc.0~14958^2
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22suivi_revisions%22%2C%22id_auteur=%24connecte%22%29%20.%20%22?a=commitdiff_plain;h=3aa6ea645b90819a753ea2e85149a08641a35d51;p=lhc%2Fweb%2Fwiklou.git

Display MediaWiki:Loginprompt on the login page

This reinstates functionality removed in 44840d1.

There is no longer a default message, and must
be created on wikis locally.

Bug: 66574
Change-Id: Ife39fe868b46ef054101c2db2e4e901380998c0e
Co-Authored-By: Dan Poltawski <dan@moodle.com>
---

diff --git a/includes/templates/Userlogin.php b/includes/templates/Userlogin.php
index 0aad07d9d1..c027afd279 100644
--- a/includes/templates/Userlogin.php
+++ b/includes/templates/Userlogin.php
@@ -29,6 +29,7 @@ class UserloginTemplate extends BaseTemplate {
 		$expirationDays = ceil( $wgCookieExpiration / ( 3600 * 24 ) );
 ?>
 <div class="mw-ui-container">
+	<div id="userloginprompt"><?php $this->msgWiki('loginprompt') ?></div>
 	<?php if ( $this->haveData( 'languages' ) ) { ?>
 		<div id="languagelinks">
 			<p><?php $this->html( 'languages' ); ?></p>
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index df4a05fe65..df9076870e 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -397,7 +397,7 @@
 	"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",
-	"loginprompt": "You must have cookies enabled to log in to {{SITENAME}}.",
+	"loginprompt": "",
 	"userlogin": "Log in / create account",
 	"userloginnocreate": "Log in",
 	"logout": "Log out",
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index 2dd4d63e81..1ee784d774 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -559,7 +559,7 @@
 	"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": "{{Doc-special|UserLogin|unlisted=1}}\n{{Identical|Log in}}",
 	"nav-login-createaccount": "Shown to anonymous users in the upper right corner of the page. When you can't create an account, the message {{msg-mw|login}} is shown.\n{{Identical|Log in / create account}}",
-	"loginprompt": "A small notice in the log in form.",
+	"loginprompt": "{{ignored}}",
 	"userlogin": "Since 1.22 no longer used in core, but may still be used by extensions. DEPRECATED\n\n{{Identical|Log in / create account}}",
 	"userloginnocreate": "Since 1.22 no longer used in core, but may still be used by some extensions. A variant of {{msg-mw|Userlogin}} when the user is not allowed to create a new account. DEPRECATED\n\n{{Identical|Log in}}",
 	"logout": "Used as link text in your personal toolbox (upper right side).\n\nSee also:\n* {{msg-mw|Logout}}\n* {{msg-mw|Accesskey-pt-logout}}\n* {{msg-mw|Tooltip-pt-logout}}\n{{Identical|Log out}}",