From b7d92c71e45f447e7421835bf336efa1cab6611e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bartosz=20Dziewo=C5=84ski?= Date: Thu, 25 Aug 2016 22:23:17 +0200 Subject: [PATCH] LoginSignupSpecialPage: Restore old display of 'createacct-helpusername' Note that this message is empty by default. You'll have to create it on your wiki to see effects of this change. Bug: T143923 Change-Id: I509c13775426b8d51f65c95af49dffb84ccaa0f4 --- includes/specialpage/LoginSignupSpecialPage.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/includes/specialpage/LoginSignupSpecialPage.php b/includes/specialpage/LoginSignupSpecialPage.php index 22c38cb21b..c3d43df266 100644 --- a/includes/specialpage/LoginSignupSpecialPage.php +++ b/includes/specialpage/LoginSignupSpecialPage.php @@ -835,6 +835,12 @@ abstract class LoginSignupSpecialPage extends AuthManagerSpecialPage { 'class' => 'mw-ui-flush-right mw-secure', ], $this->msg( 'userlogin-signwithsecure' )->text() ); } + $usernameHelpLink = ''; + if ( !$this->msg( 'createacct-helpusername' )->isDisabled() ) { + $usernameHelpLink = Html::rawElement( 'span', [ + 'class' => 'mw-ui-flush-right', + ], $this->msg( 'createacct-helpusername' )->parse() ); + } if ( $this->isSignup() ) { $fieldDefinitions = [ @@ -847,9 +853,7 @@ abstract class LoginSignupSpecialPage extends AuthManagerSpecialPage { 'weight' => -105, ], 'username' => [ - 'label-message' => 'userlogin-yourname', - // FIXME help-message does not match old formatting - 'help-message' => 'createacct-helpusername', + 'label-raw' => $this->msg( 'userlogin-yourname' )->escaped() . $usernameHelpLink, 'id' => 'wpName2', 'placeholder-message' => $isLoggedIn ? 'createacct-another-username-ph' : 'userlogin-yourname-ph', -- 2.20.1