Withoutaname has uploaded a new change for review.
https://gerrit.wikimedia.org/r/151536
Change subject: Remove unused system messages "loginstart", "loginend" and
"loginend-https"
......................................................................
Remove unused system messages "loginstart", "loginend" and "loginend-https"
Change-Id: Ib55492fb0e61f364bdc2a599d926e78ba98fe698
---
M includes/specials/SpecialUserlogin.php
M languages/i18n/en.json
M languages/i18n/qqq.json
M maintenance/dictionary/mediawiki.dic
M tests/parser/preprocess/All_system_messages.expected
M tests/parser/preprocess/All_system_messages.txt
6 files changed, 5 insertions(+), 34 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/36/151536/1
diff --git a/includes/specials/SpecialUserlogin.php
b/includes/specials/SpecialUserlogin.php
index 46b4999..e85158f 100644
--- a/includes/specials/SpecialUserlogin.php
+++ b/includes/specials/SpecialUserlogin.php
@@ -1330,16 +1330,9 @@
}
$template->set( 'secureLoginUrl', $this->mSecureLoginUrl );
- // Use loginend-https for HTTPS requests if it's not blank,
loginend otherwise
- // Ditto for signupend. New forms use neither.
+ // Use signupend-https for HTTPS requests if it's not blank,
signupend otherwise
$usingHTTPS = $this->mRequest->getProtocol() == 'https';
- $loginendHTTPS = $this->msg( 'loginend-https' );
$signupendHTTPS = $this->msg( 'signupend-https' );
- if ( $usingHTTPS && !$loginendHTTPS->isBlank() ) {
- $template->set( 'loginend', $loginendHTTPS->parse() );
- } else {
- $template->set( 'loginend', $this->msg( 'loginend'
)->parse() );
- }
if ( $usingHTTPS && !$signupendHTTPS->isBlank() ) {
$template->set( 'signupend', $signupendHTTPS->parse() );
} else {
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index d506ad2..c907d2c 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -459,11 +459,8 @@
"blocked-mailpassword": "Your IP address is blocked from editing, and
so is not allowed to use the password recovery function to prevent abuse.",
"eauthentsent": "A confirmation email has been sent to the specified
email address.\nBefore any other email is sent to the account, you will have to
follow the instructions in the email, to confirm that the account is actually
yours.",
"throttled-mailpassword": "A password reset email has already been
sent, within the last {{PLURAL:$1|hour|$1 hours}}.\nTo prevent abuse, only one
password reset email will be sent per {{PLURAL:$1|hour|$1 hours}}.",
- "loginstart": "",
- "loginend": "",
- "loginend-https": "",
- "signupstart": "{{int:loginstart}}",
- "signupend": "{{int:loginend}}",
+ "signupstart": "",
+ "signupend": "",
"signupend-https": "",
"mailerror": "Error sending mail: $1",
"acct_creation_throttle_hit": "Visitors to this wiki using your IP
address have created {{PLURAL:$1|1 account|$1 accounts}} in the last day, which
is the maximum allowed in this time period.\nAs a result, visitors using this
IP address cannot create any more accounts at the moment.",
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index 9a1d2e1..b782073 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -621,11 +621,8 @@
"blocked-mailpassword": "Used as error message in password recovery.",
"eauthentsent": "This message appears after entering an email address
in [[Special:Preferences]] > {{int:prefs-personal}} > {{int:email}}, then
clicking on \"{{int:saveprefs}}\".",
"throttled-mailpassword": "Used in [[Special:PasswordReset]].
Parameters:\n* $1 - password reset email resend time (in hours)",
- "loginstart": "{{notranslate}}",
- "loginend": "{{notranslate}}",
- "loginend-https": "{{notranslate}}",
- "signupstart": "{{notranslate}}\nDefault:\n* {{msg-mw|Loginstart}}",
- "signupend": "{{notranslate}}\nDefault:\n* {{msg-mw|Loginend}}",
+ "signupstart": "{{notranslate}}",
+ "signupend": "{{notranslate}}",
"signupend-https": "{{notranslate}}",
"mailerror": "Used as error message in sending confirmation mail to
user. Parameters:\n* $1 - new mail address",
"acct_creation_throttle_hit": "Error message at
[[Special:CreateAccount]].\n\n\"in the last day\" precisely means: during the
lasts 86400 seconds (24 hours) ending right now.\n\nParameters:\n* $1 - number
of accounts",
diff --git a/maintenance/dictionary/mediawiki.dic
b/maintenance/dictionary/mediawiki.dic
index 81bc06e..df282a7 100644
--- a/maintenance/dictionary/mediawiki.dic
+++ b/maintenance/dictionary/mediawiki.dic
@@ -2232,7 +2232,6 @@
loggedin
logid
login
-loginend
loginerror
loginfo
loginlanguagelinks
@@ -2242,7 +2241,6 @@
loginreqpagetext
loginreqtitle
logins
-loginstart
logitem
loglink
loglist
diff --git a/tests/parser/preprocess/All_system_messages.expected
b/tests/parser/preprocess/All_system_messages.expected
index 078d8f0..2ee805e 100644
--- a/tests/parser/preprocess/All_system_messages.expected
+++ b/tests/parser/preprocess/All_system_messages.expected
@@ -2207,13 +2207,6 @@
</td><td>
<template lineStart="1"><title>int:Login</title></template>
</td></tr><tr><td>
-[http://tl.wiktionary.org/w/wiki.phtml?title=MediaWiki:Loginend&action=edit
loginend]<br>
-[[MediaWiki_talk:Loginend|Talk]]
-</td><td>
-&amp;nbsp;
-</td><td>
-<template lineStart="1"><title>int:Loginend</title></template>
-</td></tr><tr><td>
[http://tl.wiktionary.org/w/wiki.phtml?title=MediaWiki:Loginerror&action=edit
loginerror]<br>
[[MediaWiki_talk:Loginerror|Talk]]
</td><td>
diff --git a/tests/parser/preprocess/All_system_messages.txt
b/tests/parser/preprocess/All_system_messages.txt
index 3c30da9..4a30f56 100644
--- a/tests/parser/preprocess/All_system_messages.txt
+++ b/tests/parser/preprocess/All_system_messages.txt
@@ -2207,13 +2207,6 @@
</td><td>
{{int:Login}}
</td></tr><tr><td>
-[http://tl.wiktionary.org/w/wiki.phtml?title=MediaWiki:Loginend&action=edit
loginend]<br>
-[[MediaWiki_talk:Loginend|Talk]]
-</td><td>
-&nbsp;
-</td><td>
-{{int:Loginend}}
-</td></tr><tr><td>
[http://tl.wiktionary.org/w/wiki.phtml?title=MediaWiki:Loginerror&action=edit
loginerror]<br>
[[MediaWiki_talk:Loginerror|Talk]]
</td><td>
--
To view, visit https://gerrit.wikimedia.org/r/151536
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib55492fb0e61f364bdc2a599d926e78ba98fe698
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Withoutaname <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
