From 081c3d428b825371b874f33e7540df56af91414a Mon Sep 17 00:00:00 2001 From: withoutaname Date: Sun, 3 Aug 2014 15:44:23 -0700 Subject: [PATCH] Remove unused system messages "loginstart", "loginend" and "loginend-https" Change-Id: Ib55492fb0e61f364bdc2a599d926e78ba98fe698 --- includes/specials/SpecialUserlogin.php | 9 +-------- languages/i18n/en.json | 7 ++----- languages/i18n/qqq.json | 7 ++----- maintenance/dictionary/mediawiki.dic | 2 -- tests/parser/preprocess/All_system_messages.expected | 7 ------- tests/parser/preprocess/All_system_messages.txt | 7 ------- 6 files changed, 5 insertions(+), 34 deletions(-) diff --git a/includes/specials/SpecialUserlogin.php b/includes/specials/SpecialUserlogin.php index 845413e514..580ad4673b 100644 --- a/includes/specials/SpecialUserlogin.php +++ b/includes/specials/SpecialUserlogin.php @@ -1414,16 +1414,9 @@ class LoginForm extends SpecialPage { } $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 db1325c1b0..899654f812 100644 --- a/languages/i18n/en.json +++ b/languages/i18n/en.json @@ -460,11 +460,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 bef8ee078d..5bc8493dc3 100644 --- a/languages/i18n/qqq.json +++ b/languages/i18n/qqq.json @@ -622,11 +622,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 fc7290856c..4204aef896 100644 --- a/maintenance/dictionary/mediawiki.dic +++ b/maintenance/dictionary/mediawiki.dic @@ -2245,7 +2245,6 @@ logextract loggedin logid login -loginend loginerror loginfo loginlanguagelinks @@ -2255,7 +2254,6 @@ loginreqlink 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 078d8f0d01..2ee805e02b 100644 --- a/tests/parser/preprocess/All_system_messages.expected +++ b/tests/parser/preprocess/All_system_messages.expected @@ -2207,13 +2207,6 @@ Log in </td><td> </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> - -</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 3c30da94eb..4a30f56f99 100644 --- a/tests/parser/preprocess/All_system_messages.txt +++ b/tests/parser/preprocess/All_system_messages.txt @@ -2207,13 +2207,6 @@ Log in {{int:Login}} -[http://tl.wiktionary.org/w/wiki.phtml?title=MediaWiki:Loginend&action=edit loginend]
-[[MediaWiki_talk:Loginend|Talk]] - -&nbsp; - -{{int:Loginend}} - [http://tl.wiktionary.org/w/wiki.phtml?title=MediaWiki:Loginerror&action=edit loginerror]
[[MediaWiki_talk:Loginerror|Talk]] -- 2.20.1