[MediaWiki-commits] [Gerrit] Link to existing login help page by default from helplogin-url - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Link to existing login help page by default from helplogin-url
..
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
---
M RELEASE-NOTES-1.22
M includes/templates/Userlogin.php
M languages/messages/MessagesEn.php
M languages/messages/MessagesQqq.php
M maintenance/language/messageTypes.inc
M maintenance/language/messages.inc
6 files changed, 33 insertions(+), 11 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/RELEASE-NOTES-1.22 b/RELEASE-NOTES-1.22
index 284ef1f..66a3bb9 100644
--- a/RELEASE-NOTES-1.22
+++ b/RELEASE-NOTES-1.22
@@ -3,6 +3,18 @@
Security reminder: MediaWiki does not require PHP's register_globals. If you
have it on, turn it '''off''' if you can.
+== MediaWiki 1.22.5 ==
+
+This is a maintenance release of the MediaWiki 1.22 branch.
+
+=== Changes since 1.22.4 ===
+
+* (bug 53888) Corrected a regression in 1.22 which introduced red links on the
+ login page. If you previously installed 1.22.x and have created a local page
+ to make the red link blue, write its title as in [[MediaWiki:helplogin-url]]
+ if you didn't already. Otherwise, you don't need to do anything, but you can
+ translate the help page at https://www.mediawiki.org/wiki/Help:Logging_in .
+
== MediaWiki 1.22.4 ==
This is a maintenance release of the MediaWiki 1.22 branch.
diff --git a/includes/templates/Userlogin.php b/includes/templates/Userlogin.php
index 5eb6094..9aedd3c 100644
--- a/includes/templates/Userlogin.php
+++ b/includes/templates/Userlogin.php
@@ -154,9 +154,18 @@
) );
?>
-
- getMsg( 'userlogin-helplink'
)->parse(); ?>
+
Skin::makeInternalOrExternalUrl(
+ wfMessage(
'helplogin-url' )->inContentLanguage()->text()
+ ),
+ ),
+ $this->getMsg( 'userlogin-helplink2'
)->text()
+ );
+ ?>
haveData( 'createOrLoginHref' ) ) { ?>
data['loggedin'] ) { ?>
diff --git a/languages/messages/MessagesEn.php
b/languages/messages/MessagesEn.php
index e0ff25e..26ce598 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1131,8 +1131,8 @@
'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 63dc845..741f329 100644
--- a/languages/messages/MessagesQqq.php
+++ b/languages/messages/MessagesQqq.php
@@ -1343,13 +1343,13 @@
See example: [[Special:UserLogin]]
-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
Help.}}
-Used as name of the page that provides information about logging into the wiki.
+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 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
[MediaWiki-commits] [Gerrit] Link to existing login help page by default from helplogin-url - change (mediawiki/core)
Nemo bis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/119489
Change subject: Link to existing login help page by default from helplogin-url
..
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
Conflicts:
languages/messages/MessagesQqq.php
---
M RELEASE-NOTES-1.22
M includes/templates/Userlogin.php
M languages/messages/MessagesEn.php
M languages/messages/MessagesQqq.php
M maintenance/language/messageTypes.inc
M maintenance/language/messages.inc
6 files changed, 33 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/89/119489/1
diff --git a/RELEASE-NOTES-1.22 b/RELEASE-NOTES-1.22
index 284ef1f..66a3bb9 100644
--- a/RELEASE-NOTES-1.22
+++ b/RELEASE-NOTES-1.22
@@ -3,6 +3,18 @@
Security reminder: MediaWiki does not require PHP's register_globals. If you
have it on, turn it '''off''' if you can.
+== MediaWiki 1.22.5 ==
+
+This is a maintenance release of the MediaWiki 1.22 branch.
+
+=== Changes since 1.22.4 ===
+
+* (bug 53888) Corrected a regression in 1.22 which introduced red links on the
+ login page. If you previously installed 1.22.x and have created a local page
+ to make the red link blue, write its title as in [[MediaWiki:helplogin-url]]
+ if you didn't already. Otherwise, you don't need to do anything, but you can
+ translate the help page at https://www.mediawiki.org/wiki/Help:Logging_in .
+
== MediaWiki 1.22.4 ==
This is a maintenance release of the MediaWiki 1.22 branch.
diff --git a/includes/templates/Userlogin.php b/includes/templates/Userlogin.php
index 5eb6094..9aedd3c 100644
--- a/includes/templates/Userlogin.php
+++ b/includes/templates/Userlogin.php
@@ -154,9 +154,18 @@
) );
?>
-
- getMsg( 'userlogin-helplink'
)->parse(); ?>
+
Skin::makeInternalOrExternalUrl(
+ wfMessage(
'helplogin-url' )->inContentLanguage()->text()
+ ),
+ ),
+ $this->getMsg( 'userlogin-helplink2'
)->text()
+ );
+ ?>
haveData( 'createOrLoginHref' ) ) { ?>
data['loggedin'] ) { ?>
diff --git a/languages/messages/MessagesEn.php
b/languages/messages/MessagesEn.php
index e0ff25e..26ce598 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1131,8 +1131,8 @@
'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 63dc845..741f329 100644
--- a/languages/messages/MessagesQqq.php
+++ b/languages/messages/MessagesQqq.php
@@ -1343,13 +1343,13 @@
See example: [[Special:UserLogin]]
-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
Help.}}
-Used as name of the page that provides information about logging into the wiki.
+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 target page,
Special:MyLanguage handles it.}}
+Defines the URL to the page that provi
[MediaWiki-commits] [Gerrit] Link to existing login help page by default from helplogin-url - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Link to existing login help page by default from helplogin-url
..
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
---
M includes/templates/Userlogin.php
M languages/messages/MessagesEn.php
M languages/messages/MessagesQqq.php
M maintenance/language/messageTypes.inc
M maintenance/language/messages.inc
5 files changed, 19 insertions(+), 10 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
Objections:
Swalling: There's a problem with this change, please improve
diff --git a/includes/templates/Userlogin.php b/includes/templates/Userlogin.php
index 68097e3..f1b9f0e 100644
--- a/includes/templates/Userlogin.php
+++ b/includes/templates/Userlogin.php
@@ -153,9 +153,18 @@
) );
?>
-
- getMsg( 'userlogin-helplink'
)->parse(); ?>
+
Skin::makeInternalOrExternalUrl(
+ wfMessage(
'helplogin-url' )->inContentLanguage()->text()
+ ),
+ ),
+ $this->getMsg( 'userlogin-helplink2'
)->text()
+ );
+ ?>
haveData( 'createOrLoginHref' ) ) { ?>
data['loggedin'] ) { ?>
diff --git a/languages/messages/MessagesEn.php
b/languages/messages/MessagesEn.php
index efccdd9..a53d831 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1127,8 +1127,8 @@
'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
--- a/languages/messages/MessagesQqq.php
+++ b/languages/messages/MessagesQqq.php
@@ -1345,12 +1345,11 @@
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
Help.}}
-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
{{MediaWiki:helplogin-url}}.}}
-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
--- a/maintenance/language/messageTypes.inc
+++ b/maintenance/language/messageTypes.inc
@@ -267,6 +267,7 @@
'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
--- a/maintenance/languag
[MediaWiki-commits] [Gerrit] Link to existing login help page by default from helplogin-url - change (mediawiki/core)
Nemo bis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/83220
Change subject: Link to existing login help page by default from helplogin-url
..
Link to existing login help page by default from helplogin-url
Uses default interwiki prefix from maintenance/interwiki.list
to link mediawiki.org PD help page. Ready for future translations
via Special:MyLanguage, message is hence made optional.
Bug: 53888
Change-Id: I8cefafbcd3bd1d6a03cec7cf1d0efdf607fec21d
---
M languages/messages/MessagesEn.php
M maintenance/language/messageTypes.inc
2 files changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/20/83220/1
diff --git a/languages/messages/MessagesEn.php
b/languages/messages/MessagesEn.php
index a63d1f8..9fbd814 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1129,7 +1129,7 @@
'gotaccountlink' => 'Log in',
'userlogin-resetlink' => 'Forgotten your login details?',
'userlogin-resetpassword-link'=> 'Reset your password',
-'helplogin-url' => 'Help:Logging in',
+'helplogin-url' =>
'mediawikiwiki:Special:MyLanguage/Help:Logging_in',
'userlogin-helplink' => '[[{{MediaWiki:helplogin-url}}|Help with
logging in]]',
'createacct-join' => 'Enter your information below.',
'createacct-another-join' => "Enter the new account's information
below.",
diff --git a/maintenance/language/messageTypes.inc
b/maintenance/language/messageTypes.inc
index 0cdc069..f75b53f 100644
--- a/maintenance/language/messageTypes.inc
+++ b/maintenance/language/messageTypes.inc
@@ -483,6 +483,7 @@
'limitreport-ppgeneratednodes-value',
'limitreport-expansiondepth-value',
'limitreport-expensivefunctioncount-value',
+ 'helplogin-url',
);
/** Exif messages, which may be set as optional in several checks, but are
generally mandatory */
--
To view, visit https://gerrit.wikimedia.org/r/83220
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8cefafbcd3bd1d6a03cec7cf1d0efdf607fec21d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Nemo bis
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
