Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Remove unused system messages "loginstart", "loginend" and "loginend-https""

Browse source
This commit is contained in:
jenkins-bot 2014-09-24 17:29:54 +00:00 committed by Gerrit Code Review
commit bb2d133137
6 changed files with 5 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
includes/specials/SpecialUserlogin.php
View file

@ -1423,16 +1423,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 {

7
languages/i18n/en.json
View file

@ -463,11 +463,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.",

7
languages/i18n/qqq.json
View file

@ -625,11 +625,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",

2
maintenance/dictionary/mediawiki.dic
View file

@ -2248,7 +2248,6 @@ logextract
loggedin
logid
login
loginend
loginerror
loginfo
loginlanguagelinks
@ -2259,7 +2258,6 @@ loginreqlink
loginreqpagetext
loginreqtitle
logins
loginstart
logitem
loglink
loglist

7
tests/parser/preprocess/All_system_messages.expected
View file

@ -2207,13 +2207,6 @@ Log in
</td><td>
<template lineStart="1"><title>int:Login</title></template>
&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;
[http://tl.wiktionary.org/w/wiki.phtml?title=MediaWiki:Loginend&amp;action=edit loginend]&lt;br&gt;
[[MediaWiki_talk:Loginend|Talk]]
&lt;/td&gt;&lt;td&gt;
&amp;amp;nbsp;
&lt;/td&gt;&lt;td&gt;
<template lineStart="1"><title>int:Loginend</title></template>
&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;
[http://tl.wiktionary.org/w/wiki.phtml?title=MediaWiki:Loginerror&amp;action=edit loginerror]&lt;br&gt;
[[MediaWiki_talk:Loginerror|Talk]]
&lt;/td&gt;&lt;td&gt;

7
tests/parser/preprocess/All_system_messages.txt
View file

@ -2207,13 +2207,6 @@ Log in
</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>
&amp;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>