Message changes for new login form

Shorter "Reset your password" (new key userlogin-resetpassword-link).
Shorter "Use secure connection" (existing key userlogin-signwithsecure).
Better explanations.

Change-Id: Ia8e4219b200c25a61cbbade36841bb2c45cc9704

diff --git a/includes/templates/UserloginVForm.php b/includes/templates/UserloginVForm.php
index 0e688a4..4f44209 100644 (file)
--- a/includes/templates/UserloginVForm.php
+++ b/includes/templates/UserloginVForm.php
@@ -98,7 +98,7 @@ class UserloginTemplateVForm extends BaseTemplate {
                        if ( $this->data['useemail'] && $this->data['canreset'] && $this->data['resetlink'] === true ) {
                                echo Linker::link(
                                        SpecialPage::getTitleFor( 'PasswordReset' ),
-                                       $this->getMsg( 'userlogin-resetlink' )->parse(),
+                                       $this->getMsg( 'userlogin-resetpassword-link' )->parse(),
                                        array( 'class' => 'mw-ui-flush-right' )
                                        );
                                // TODO: remove the wpMailmypassword code branch from

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 93e9746..600a00c 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1094,7 +1094,7 @@ Do not forget to change your [[Special:Preferences|{{SITENAME}} preferences]].',
 'createacct-yourpasswordagain-ph' => 'Enter password again',
 'remembermypassword'           => 'Remember my login on this browser (for a maximum of $1 {{PLURAL:$1|day|days}})',
 'userlogin-remembermypassword' => 'Keep me logged in',
-'userlogin-signwithsecure'     => 'Sign in with secure server',
+'userlogin-signwithsecure'     => 'Use secure connection',
 'securelogin-stick-https'      => 'Stay connected to HTTPS after login',
 'yourdomainname'               => 'Your domain:',
 'password-change-forbidden'    => 'You cannot change passwords on this wiki.',
@@ -1116,6 +1116,7 @@ Do not forget to change your [[Special:Preferences|{{SITENAME}} preferences]].',
 '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]]',
 'createacct-join'                 => 'Enter your information below.',

diff --git a/languages/messages/MessagesQqq.php b/languages/messages/MessagesQqq.php
index ba508e6..99bf993 100644 (file)
--- a/languages/messages/MessagesQqq.php
+++ b/languages/messages/MessagesQqq.php
@@ -1084,7 +1084,9 @@ See example: [{{canonicalurl:Special:UserLogin|type=signup&useNew=1}} Special:Us
 'userlogin-remembermypassword' => 'The text for a check box in the new-style [[Special:UserLogin]].
 
 See example: [{{canonicalurl:Special:UserLogin|useNew=1}} Special:UserLogin?useNew=1]',
-'userlogin-signwithsecure' => 'Text of link to HTTPS login form',
+'userlogin-signwithsecure' => 'Text of link to HTTPS login form.
+
+See example: [{{canonicalurl:Special:UserLogin|useNew=1}} Special:UserLogin?useNew=1]',
 'securelogin-stick-https' => 'Used as label for checkbox.',
 'yourdomainname' => 'Used as label for listbox.',
 'password-change-forbidden' => 'Error message shown when an external authentication source does not allow the password to be changed.',
@@ -1141,6 +1143,11 @@ It is also used on the top of the page for logged out users, where it appears ne
 'gotaccountlink' => 'Text of the link to the log in form. Before that link, the message {{msg-mw|Gotaccount}} appears.
 {{Identical|Log in}}',
 'userlogin-resetlink' => 'Used on the login page.',
+'userlogin-resetpassword-link' => 'Text of link to [[Special:ResetPassword]] on new vertical-layout create account form.
+
+See example: [{{canonicalurl:Special:UserLogin|useNew=1}} Special:UserLogin?useNew=1]
+
+userlogin-resetpassword-link may have to be shorter than the old {{msg-mw|userlogin-resetlink}}',
 'helplogin-url' => '{{doc-important|Do not translate the namespace name <code>Help</code>.}}
 Used as name of the page that provides information about logging into the wiki.
 

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index a8b682b..933c558 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -464,6 +464,7 @@ $wgMessageStructure = array(
                'gotaccount',
                'gotaccountlink',
                'userlogin-resetlink',
+               'userlogin-resetpassword-link',
                'helplogin-url',
                'userlogin-helplink',
                'createacct-join',