jenkins-bot has submitted this change and it was merged. Change subject: Display MediaWiki:Loginprompt on the login page ......................................................................
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 <[email protected]> --- M RELEASE-NOTES-1.23 M includes/templates/Userlogin.php M languages/i18n/en.json M languages/i18n/qqq.json 4 files changed, 4 insertions(+), 2 deletions(-) Approvals: MaxSem: Looks good to me, approved jenkins-bot: Verified diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23 index 0a63c9b..bdebec6 100644 --- a/RELEASE-NOTES-1.23 +++ b/RELEASE-NOTES-1.23 @@ -8,6 +8,7 @@ === Changes since 1.23.2 === * (bug 64970) Fix support for blobs on DatabaseOracle::update +* (bug 66574) Display MediaWiki:Loginprompt on the login page == MediaWiki 1.23.2 == diff --git a/includes/templates/Userlogin.php b/includes/templates/Userlogin.php index 29908d7..29362663 100644 --- a/includes/templates/Userlogin.php +++ b/includes/templates/Userlogin.php @@ -28,6 +28,7 @@ $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 1d97774..68fe913 100644 --- a/languages/i18n/en.json +++ b/languages/i18n/en.json @@ -398,7 +398,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 ffca5ab..f69669b 100644 --- a/languages/i18n/qqq.json +++ b/languages/i18n/qqq.json @@ -561,7 +561,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}}", -- To view, visit https://gerrit.wikimedia.org/r/146022 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ife39fe868b46ef054101c2db2e4e901380998c0e Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/core Gerrit-Branch: REL1_23 Gerrit-Owner: Legoktm <[email protected]> Gerrit-Reviewer: Florianschmidtwelzow <[email protected]> Gerrit-Reviewer: Legoktm <[email protected]> Gerrit-Reviewer: MaxSem <[email protected]> Gerrit-Reviewer: Swalling <[email protected]> Gerrit-Reviewer: TTO <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
