From 1ec2f5f93f4356b457423085c1b1c55e00b0ea94 Mon Sep 17 00:00:00 2001 From: Raimond Spekking Date: Tue, 6 Nov 2007 19:13:55 +0000 Subject: [PATCH] * Add two messages for Special:Blockme which were used sinces ages but undefined: ** 'blockme' and 'proxyblocker-disabled' (renamed from 'disabled' to clarify context of using) --- RELEASE-NOTES | 1 + includes/SpecialBlockme.php | 2 +- languages/messages/MessagesEn.php | 6 ++++-- maintenance/language/messages.inc | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index da8a2653d4..c729f1bbbc 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -138,6 +138,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN 255 characters (already restricted in the database) * In the deletion default reasons, calculate how much text to get from the article text, rather than getting 150 characters (which may be too much) +* Add two messages for Special:Blockme which were used but undefined === API changes in 1.12 === diff --git a/includes/SpecialBlockme.php b/includes/SpecialBlockme.php index da2757ac71..e68f9423e4 100644 --- a/includes/SpecialBlockme.php +++ b/includes/SpecialBlockme.php @@ -13,7 +13,7 @@ function wfSpecialBlockme() { $ip = wfGetIP(); if( !$wgBlockOpenProxies || $wgRequest->getText( 'ip' ) != md5( $ip . $wgProxyKey ) ) { - $wgOut->addWikiText( wfMsg( 'disabled' ) ); + $wgOut->addWikiText( wfMsg( 'proxyblocker-disabled' ) ); return; } diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index 684a60c4a7..35f8b924bf 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -364,7 +364,7 @@ $specialPageAliases = array( 'Uncategorizedpages' => array( 'Uncategorizedpages' ), 'Uncategorizedcategories' => array( 'Uncategorizedcategories' ), 'Uncategorizedimages' => array( 'Uncategorizedimages' ), - 'Uncategorizedtemplates' => array( 'Uncategorizedtemplates' ), + 'Uncategorizedtemplates' => array( 'Uncategorizedtemplates' ), 'Unusedcategories' => array( 'Unusedcategories' ), 'Unusedimages' => array( 'Unusedimages' ), 'Wantedpages' => array( 'Wantedpages', 'Brokenlinks' ), @@ -2087,9 +2087,11 @@ the list of currently operational bans and blocks.', 'range_block_disabled' => 'The sysop ability to create range blocks is disabled.', 'ipb_expiry_invalid' => 'Expiry time invalid.', 'ipb_already_blocked' => '"$1" is already blocked', +'ipb_cant_unblock' => 'Error: Block ID $1 not found. It may have been unblocked already.', 'ip_range_invalid' => 'Invalid IP range.', +'blockme' => 'Block me', 'proxyblocker' => 'Proxy blocker', -'ipb_cant_unblock' => 'Error: Block ID $1 not found. It may have been unblocked already.', +'proxyblocker-disabled' => 'This function is disabled.', 'proxyblockreason' => 'Your IP address has been blocked because it is an open proxy. Please contact your Internet service provider or tech support and inform them of this serious security problem.', 'proxyblocksuccess' => 'Done.', 'sorbs' => 'DNSBL', # only translate this message to other languages if you have to change it diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc index 2fcf11a5c6..55ff4b2950 100644 --- a/maintenance/language/messages.inc +++ b/maintenance/language/messages.inc @@ -1396,8 +1396,9 @@ $wgMessageStructure = array( 'ipb_expiry_invalid', 'ipb_already_blocked', 'ip_range_invalid', - 'proxyblocker', 'ipb_cant_unblock', + 'proxyblocker', + 'proxyblocker-disabled', 'proxyblockreason', 'proxyblocksuccess', 'sorbs', -- 2.20.1