Link to existing login help page by default from helplogin-url

Detailed rationale discussed on bugzilla, bug 53888 and parent,
where consensus on the design was gained.

Using https link per Brion et al. in comments and bug 54835,
with new keys for the messages in order to avoid any conflict
with existing messages. (The translations of the removed messages
will be automatically removed by localisation updates.)

https://www.mediawiki.org/wiki/Help:Logging_in was improved by Lloffiwr
and now also marked for translation. The link is ready for future
translations thanks to the use of the standard Special:MyLanguage, hence
the message is made ignored to allow customisations only locally.

Bug: 53888
Change-Id: I8cefafbcd3bd1d6a03cec7cf1d0efdf607fec21d

diff --git a/includes/templates/Userlogin.php b/includes/templates/Userlogin.php
index 68097e3..f1b9f0e 100644 (file)
--- a/includes/templates/Userlogin.php
+++ b/includes/templates/Userlogin.php
@@ -153,9 +153,18 @@ class UserloginTemplate extends BaseTemplate {
                                ) );
                                ?>
                        </div>
-
                        <div id="mw-userlogin-help">
-                               <?php echo $this->getMsg( 'userlogin-helplink' )->parse(); ?>
+                               <?php
+                               echo Html::element(
+                                       'a',
+                                       array(
+                                               'href' => Skin::makeInternalOrExternalUrl(
+                                                       wfMessage( 'helplogin-url' )->inContentLanguage()->text()
+                                               ),
+                                       ),
+                                       $this->getMsg( 'userlogin-helplink2' )->text()
+                               );
+                               ?>
                        </div>
                        <?php if ( $this->haveData( 'createOrLoginHref' ) ) { ?>
                                <?php if ( $this->data['loggedin'] ) { ?>

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index efccdd9..a53d831 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1127,8 +1127,8 @@ You can change your {{SITENAME}} [[Special:Preferences|preferences]] if you wish
 'gotaccountlink'                  => 'Log in',
 'userlogin-resetlink'             => 'Forgotten your login details?',
 'userlogin-resetpassword-link'    => 'Forgot your password?',
-'helplogin-url'                   => 'Help:Logging in',
-'userlogin-helplink'              => '[[{{MediaWiki:helplogin-url}}|Help with logging in]]',
+'helplogin-url'                   => 'https://www.mediawiki.org/wiki/Special:MyLanguage/Help:Logging_in',
+'userlogin-helplink2'              => 'Help with logging in',
 'userlogin-loggedin'              => 'You are already logged in as {{GENDER:$1|$1}}.
 Use the form below to log in as another user.',
 'userlogin-createanother'         => 'Create another account',

diff --git a/languages/messages/MessagesQqq.php b/languages/messages/MessagesQqq.php
index 50070df..c159536 100644 (file)
--- a/languages/messages/MessagesQqq.php
+++ b/languages/messages/MessagesQqq.php
@@ -1345,12 +1345,11 @@ See example: [[Special:UserLogin]]
 
 userlogin-resetpassword-link may have to be shorter than the old {{msg-mw|userlogin-resetlink}}.
 {{Identical|Forgot your password}}',
-'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.
+'helplogin-url' => '{{doc-important|Do not translate the target page, Special:MyLanguage handles it.}}
+Defines the URL to the page that provides information about logging into the wiki.
 
-Used as a link target in the message {{msg-mw|Userlogin-helplink}}.',
-'userlogin-helplink' => '{{doc-important|Do not change <code><nowiki>{{MediaWiki:helplogin-url}}</nowiki></code>.}}
-Wikitext linking to login help.
+Used as a link target for the link with label {{msg-mw|userlogin-helplink2}}; can be locally customised to be an URL or local page title.',
+'userlogin-helplink2' => 'Label for a link to login help.
 
 See example: [[Special:UserLogin]]
 

diff --git a/maintenance/language/messageTypes.inc b/maintenance/language/messageTypes.inc
index 142727c..e9d60aa 100644 (file)
--- a/maintenance/language/messageTypes.inc
+++ b/maintenance/language/messageTypes.inc
@@ -267,6 +267,7 @@ $wgIgnoredMessages = array(
        'today-at',
        'redirect-text',
        'edithelppage',
+       'helplogin-url',
        'autocomment-prefix',
        'move-redirect-text',
        'interlanguage-link-title-langonly',

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 074d440..3b942cb 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -472,7 +472,7 @@ $wgMessageStructure = array(
                'userlogin-resetlink',
                'userlogin-resetpassword-link',
                'helplogin-url',
-               'userlogin-helplink',
+               'userlogin-helplink2',
                'userlogin-loggedin',
                'userlogin-createanother',
                'createacct-join',