Restore messages of old login and signup forms

The change 44840d15929d8ecfc1d7c31d6f7e86d873ac15a2 "Only new vertical format login and signup forms" removed
some messages no longer used in core, but 'userlogin' is used by
extensions including MobileFrontend

This restores the messages but marks them as unused in core and deprecated.

Change-Id: I82c4fc37481a4a0dea1e839238188f6555e3c60d

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index b4df4b6..2992dea 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1096,6 +1096,7 @@ Note that some pages may continue to be displayed as if you were still logged in
 'welcomeuser'                     => 'Welcome, $1!',
 'welcomecreation-msg'             => 'Your account has been created.
 Do not forget to change your [[Special:Preferences|{{SITENAME}} preferences]].',
+'yourname'                        => 'Username:',
 'userlogin-yourname'              => 'Username',
 'userlogin-yourname-ph'           => 'Enter your username',
 'createacct-helpusername'         => '', # do not translate or duplicate this message to other languages
@@ -1103,6 +1104,7 @@ Do not forget to change your [[Special:Preferences|{{SITENAME}} preferences]].',
 'userlogin-yourpassword'          => 'Password',
 'userlogin-yourpassword-ph'       => 'Enter your password',
 'createacct-yourpassword-ph'      => 'Enter a password',
+'yourpasswordagain'               => 'Retype password:',
 'createacct-yourpasswordagain'    => 'Confirm password',
 'createacct-yourpasswordagain-ph' => 'Enter password again',
 'remembermypassword'              => 'Remember my login on this browser (for a maximum of $1 {{PLURAL:$1|day|days}})',
@@ -1115,13 +1117,20 @@ Do not forget to change your [[Special:Preferences|{{SITENAME}} preferences]].',
 'login'                           => 'Log in',
 'nav-login-createaccount'         => 'Log in / create account',
 'loginprompt'                     => 'You must have cookies enabled to log in to {{SITENAME}}.',
+'userlogin'                       => 'Log in / create account',
+'userloginnocreate'               => 'Log in',
 'logout'                          => 'Log out',
 'userlogout'                      => 'Log out',
 'userlogout-summary'              => '', # do not translate or duplicate this message to other languages
 'notloggedin'                     => 'Not logged in',
 'userlogin-noaccount'             => "Don't have an account?",
 'userlogin-joinproject'           => 'Join {{SITENAME}}',
+'nologin'                         => "Don't have an account? $1.",
+'nologinlink'                     => 'Create an account',
 'createaccount'                   => 'Create account',
+'gotaccount'                      => 'Already have an account? $1.',
+'gotaccountlink'                  => 'Log in',
+'userlogin-resetlink'             => 'Forgotten your login details?',
 'userlogin-resetpassword-link'    => 'Reset your password',
 'helplogin-url'                   => 'Help:Logging in',
 'userlogin-helplink'              => '[[{{MediaWiki:helplogin-url}}|Help with logging in]]',
@@ -1131,6 +1140,7 @@ Do not forget to change your [[Special:Preferences|{{SITENAME}} preferences]].',
 'createacct-email-ph'             => 'Enter your email address',
 'createaccountmail'               => 'Use a temporary random password and send it to the email address specified below',
 'createacct-realname'             => 'Real name (optional)',
+'createaccountreason'             => 'Reason:',
 'createacct-reason'               => 'Reason',
 'createacct-reason-ph'            => 'Why you are creating another account',
 'createacct-captcha'              => 'Security check',

diff --git a/languages/messages/MessagesQqq.php b/languages/messages/MessagesQqq.php
index a981495..518efb6 100644 (file)
--- a/languages/messages/MessagesQqq.php
+++ b/languages/messages/MessagesQqq.php
@@ -1055,6 +1055,8 @@ Parameters:
 * $1 - an URL to [[Special:Userlogin]] containing <code>returnto</code> and <code>returntoquery</code> parameters',
 'welcomeuser' => 'Text for a welcome heading that users see after registering a user account. $1 is the username of the new user. See [[bugzilla:42215]]',
 'welcomecreation-msg' => 'A welcome message users see after registering a user account, following a welcomeuser heading. $1 is the username of the new user. Replaces welcomecreation in 1.21wmf5,see [[bugzilla:42215]]',
+'yourname' => 'Since 1.22 no longer used in core, but used by some extensions.
+{{Identical|Username}}',
 'userlogin-yourname' => "In user login & create account forms, label for username field.
 {{doc-important|<nowiki>{{</nowiki>[[Gender|GENDER]]<nowiki>}}</nowiki> is '''NOT''' supported.}}
 
@@ -1078,6 +1080,7 @@ See examples: [{{canonicalurl:Special:UserLogin}} Special:UserLogin] and [{{cano
 
 See example: [{{canonicalurl:Special:UserLogin|type=signup}} Special:UserLogin?type=signup]
 {{Identical|Enter password}}',
+'yourpasswordagain' => 'Since 1.22 no longer used in core, but may be used by some extensions. DEPRECATED',
 'createacct-yourpasswordagain' => 'In create account form, label for field to re-enter password
 
 See example: [{{canonicalurl:Special:UserLogin|type=signup}} Special:UserLogin?type=signup]
@@ -1108,6 +1111,12 @@ See also:
 '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.
 {{Identical|Log in / create account}}",
 'loginprompt' => 'A small notice in the log in form.',
+'userlogin' => 'Since 1.22 no longer used in core, but may still be used by extensions. DEPRECATED
+
+{{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
+
+{{Identical|Log in}}',
 'logout' => 'Used as link text in your personal toolbox (upper right side).
 
 See also:
@@ -1128,11 +1137,21 @@ See example: [{{canonicalurl:Special:UserLogin}} Special:UserLogin]
 'userlogin-joinproject' => 'Text of button inviting user to create an account.
 
 See example: [{{canonicalurl:Special:UserLogin}} Special:UserLogin]',
+'nologin' => 'Since 1.22 no longer used in core, but may be used by some extensions. DEPRECATED. Parameters:
+* $1 - a link to the account creation form, and the text of it is {{msg-mw|Nologinlink}}
+{{Identical|Do not have an account}}',
+'nologinlink' => 'Since 1.22 no longer used in core, but may be used by some extensions. DEPRECATED.
+{{Identical|Create an account}}',
 'createaccount' => 'Used on the top of the page for logged out users, where it appears next to {{msg-mw|login}}, so consider making them similar.
 
 It is also used on the submit button in the form/special page where you register a new account.
 {{doc-special|CreateAccount}}
 {{Identical|Create account}}',
+'gotaccount' => 'Since 1.22 no longer used in core, but may be used by some extensions. DEPRECATED. Parameter:
+* $1 - a link to the log in form, and the text of it is {{msg-mw|Gotaccountlink}}',
+'gotaccountlink' => 'Since 1.22 no longer used in core, but may be used by some extensions. DEPRECATED.
+{{Identical|Log in}}',
+'userlogin-resetlink' => 'Since 1.22 no longer used in core, but may be used by some extensions. DEPRECATED.',
 'userlogin-resetpassword-link' => 'Used as link text on login form.
 
 The link points to the local [[Special:PasswordReset]].
@@ -1172,6 +1191,9 @@ See example: [{{canonicalurl:Special:UserLogin|type=signup}} Special:UserLogin?t
 
 See example: [{{canonicalurl:Special:UserLogin|type=signup}} Special:UserLogin?type=signup]',
 'createacct-realname' => 'In vertical-layout create account form, label for field to enter optional real name.',
+'createaccountreason' => 'Since 1.22 no longer used in core, but may be used by some extensions. DEPRECATED
+
+{{Identical|Reason}}',
 'createacct-reason' => 'In create account form, label for field to enter reason to create an account when already logged-in.
 
 See example: [{{canonicalurl:Special:UserLogin|type=signup}} Special:UserLogin?type=signup]

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index bc254b9..c226ce8 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -443,6 +443,7 @@ $wgMessageStructure = array(
                'logouttext',
                'welcomeuser',
                'welcomecreation-msg',
+               'yourname',
                'userlogin-yourname',
                'userlogin-yourname-ph',
                'createacct-helpusername',
@@ -450,6 +451,7 @@ $wgMessageStructure = array(
                'userlogin-yourpassword',
                'userlogin-yourpassword-ph',
                'createacct-yourpassword-ph',
+               'yourpasswordagain',
                'createacct-yourpasswordagain',
                'createacct-yourpasswordagain-ph',
                'remembermypassword',
@@ -462,13 +464,20 @@ $wgMessageStructure = array(
                'login',
                'nav-login-createaccount',
                'loginprompt',
+               'userlogin',
+               'userloginnocreate',
                'logout',
                'userlogout',
                'userlogout-summary',
                'notloggedin',
                'userlogin-noaccount',
                'userlogin-joinproject',
+               'nologin',
+               'nologinlink',
                'createaccount',
+               'gotaccount',
+               'gotaccountlink',
+               'userlogin-resetlink',
                'userlogin-resetpassword-link',
                'helplogin-url',
                'userlogin-helplink',
@@ -478,6 +487,7 @@ $wgMessageStructure = array(
                'createacct-email-ph',
                'createaccountmail',
                'createacct-realname',
+               'createaccountreason',
                'createacct-reason',
                'createacct-reason-ph',
                'createacct-captcha',