From 2aeb6809e10e4378d3137ce2aef2b26d3f697b10 Mon Sep 17 00:00:00 2001 From: Rotem Liss Date: Sun, 28 Sep 2008 18:52:34 +0000 Subject: [PATCH] Localization: * Updating messages.inc. * Rebuilding English localization. * Making restrictlogpage an ignored message, as there seems to be no reason to localize it. --- languages/messages/MessagesEn.php | 34 ++++++------- maintenance/language/messageTypes.inc | 2 +- maintenance/language/messages.inc | 70 +++++++++++++++++++++++++++ 3 files changed, 88 insertions(+), 18 deletions(-) diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index 7e9b9632a4..c47bbed709 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -1200,14 +1200,14 @@ It appears to have been deleted.', 'edit-no-change' => 'Your edit was ignored, because no change was made to the text.', 'edit-already-exists' => 'Could not create a new page. It already exists.', -'userrestricted-page' => "'''Your user name or IP address has been restricted from editing page \"$1\".''' +'userrestricted-page' => '\'\'\'Your user name or IP address has been restricted from editing page "$1".\'\'\' The restriction was put by [[User:$2|$2]]. -The reason given is ''$3''. +The reason given is \'\'$3\'\'. Restriction was put at $4 and expires at $5. -You can contact [[User:$2|$2]] or another [[{{MediaWiki:Grouppage-sysop}}|administrator]] to discuss the restriction.", +You can contact [[User:$2|$2]] or another [[{{MediaWiki:Grouppage-sysop}}|administrator]] to discuss the restriction.', 'userrestricted-namespace' => "'''Your user name or IP address has been restricted from editing $1 namespace.''' The restriction was put by [[User:$2|$2]]. @@ -1634,6 +1634,7 @@ please see math/README to configure.', 'right-suppressrevision' => 'Review and restore revisions hidden from Sysops', 'right-suppressionlog' => 'View private logs', 'right-block' => 'Block other users from editing', +'right-restrict' => 'Restrict user from editing certain namespaces and pages', 'right-blockemail' => 'Block a user from sending email', 'right-hideuser' => 'Block a username, hiding it from the public', 'right-ipblock-exempt' => 'Bypass IP blocks, auto-blocks and range blocks', @@ -1656,7 +1657,6 @@ please see math/README to configure.', 'right-userrights' => 'Edit all user rights', 'right-userrights-interwiki' => 'Edit user rights of users on other wikis', 'right-siteadmin' => 'Lock and unlock the database', -'right-restrict' => 'Restrict user from editing certain namespaces and pages', # User rights log 'rightslog' => 'User rights log', @@ -2611,18 +2611,18 @@ Note that blocks are listed [[Special:Ipblocklist|there]] and are not listed her 'userrestrictiontype-page' => 'Page', # Special:RemoveRestrictions -'removerestrictions' => 'Remove restriction from a user', -'removerestrictions-intro' => 'Use the form below to remove a restriction from a certain user.', -'removerestrictions-noid' => 'No restriction ID was specified.', -'removerestrictions-wrongid' => 'Restriction with that ID not found. Most probably someone has removed it or it expired.', -'removerestrictions-legend' => 'Remove a restriction', -'removerestrictions-user' => 'Restricted user:', -'removerestrictions-type' => 'Restriction type:', -'removerestrictions-page' => 'Page:', -'removerestrictions-namespace' => 'Namespace:', -'removerestrictions-reason' => 'Reason:', -'removerestrictions-submit' => 'Remove the restriction', -'removerestrictions-success' => 'Successfully removed the restriction from [[User:$1|$1]].', +'removerestrictions' => 'Remove restriction from a user', +'removerestrictions-intro' => 'Use the form below to remove a restriction from a certain user.', +'removerestrictions-noid' => 'No restriction ID was specified.', +'removerestrictions-wrongid' => 'Restriction with that ID not found. Most probably someone has removed it or it expired.', +'removerestrictions-legend' => 'Remove a restriction', +'removerestrictions-user' => 'Restricted user:', +'removerestrictions-type' => 'Restriction type:', +'removerestrictions-page' => 'Page:', +'removerestrictions-namespace' => 'Namespace:', +'removerestrictions-reason' => 'Reason:', +'removerestrictions-submit' => 'Remove the restriction', +'removerestrictions-success' => 'Successfully removed the restriction from [[User:$1|$1]].', # Special:RestrictUser 'restrictuser' => 'Restrict user', @@ -2651,7 +2651,7 @@ Note that blocks are listed [[Special:Ipblocklist|there]] and are not listed her 'restrictentry' => 'restricted $1 from editing $2 (expiry set to $3)', 'restrictremoveentry' => 'removed restriction from $1 for editing $2', 'restrictlognamespace' => '$1 namespace', -'restrictlogpage' => '[[$1]]', # only translate this message to other languages if you have to change it +'restrictlogpage' => '[[$1]]', # do not translate or duplicate this message to other languages # Developer tools 'lockdb' => 'Lock database', diff --git a/maintenance/language/messageTypes.inc b/maintenance/language/messageTypes.inc index 0312701771..793532221c 100644 --- a/maintenance/language/messageTypes.inc +++ b/maintenance/language/messageTypes.inc @@ -153,6 +153,7 @@ $wgIgnoredMessages = array( 'upload-summary', 'pagetitle-view-mainpage', 'newuserlogentry', + 'restrictlogpage', ); /** Optional messages, which may be translated only if changed in the target language. */ @@ -320,7 +321,6 @@ $wgOptionalMessages = array( 'recentchangeslinked-backlink', 'diff-with-additional', 'statistics-footer', - 'restrictlogpage', ); /** EXIF messages, which may be set as optional in several checks, but are generally mandatory */ diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc index f33992f75a..279f53fd8e 100644 --- a/maintenance/language/messages.inc +++ b/maintenance/language/messages.inc @@ -563,6 +563,8 @@ $wgMessageStructure = array( 'edit-conflict', 'edit-no-change', 'edit-already-exists', + 'userrestricted-page', + 'userrestricted-namespace', ), 'parserwarnings' => array( 'expensive-parserfunction-warning', @@ -941,6 +943,7 @@ $wgMessageStructure = array( 'right-suppressrevision', 'right-suppressionlog', 'right-block', + 'right-restrict', 'right-blockemail', 'right-hideuser', 'right-ipblock-exempt', @@ -1695,6 +1698,7 @@ $wgMessageStructure = array( 'ipbsubmit', 'ipbother', 'ipboptions', + 'ipbinfinite', 'ipbotheroption', 'ipbotherreason', 'ipbhidename', @@ -1759,6 +1763,68 @@ $wgMessageStructure = array( 'sorbs_create_account_reason', 'cant-block-while-blocked', ), + 'listrestrictions' => array( + 'listuserrestrictions', + 'listuserrestrictions-intro', + 'listuserrestrictions-row-ns', + 'listuserrestrictions-row-page', + 'listuserrestrictions-row-expiry', + 'listuserrestrictions-legend', + 'listuserrestrictions-type', + 'listuserrestrictions-user', + 'listuserrestrictions-namespace', + 'listuserrestrictions-page', + 'listuserrestrictions-submit', + 'listuserrestrictions-notfound', + 'listuserrestrictions-empty', + 'listuserrestrictions-remove', + 'userrestrictiontype-none', + 'userrestrictiontype-namespace', + 'userrestrictiontype-page', + ), + 'removerestrictions' => array( + 'removerestrictions', + 'removerestrictions-intro', + 'removerestrictions-noid', + 'removerestrictions-wrongid', + 'removerestrictions-legend', + 'removerestrictions-user', + 'removerestrictions-type', + 'removerestrictions-page', + 'removerestrictions-namespace', + 'removerestrictions-reason', + 'removerestrictions-submit', + 'removerestrictions-success', + ), + 'restrictuser' => array( + 'restrictuser', + 'restrictuser-userselect', + 'restrictuser-user', + 'restrictuser-go', + 'restrictuser-notfound', + 'restrictuser-existing', + 'restrictuser-legend-page', + 'restrictuser-legend-namespace', + 'restrictuser-title', + 'restrictuser-namespace', + 'restrictuser-expiry', + 'restrictuser-reason', + 'restrictuser-sumbit', + 'restrictuser-badtitle', + 'restrictuser-badnamespace', + 'restrictuser-badexpiry', + 'restrictuser-duptitle', + 'restrictuser-dupnamespace', + 'restrictuser-success', + ), + 'restrictionlog' => array( + 'restrictionlog', + 'restrictionlogtext', + 'restrictentry', + 'restrictremoveentry', + 'restrictlognamespace', + 'restrictlogpage', + ), 'developertools' => array( 'lockdb', 'unlockdb', @@ -2852,6 +2918,10 @@ XHTML id names.", 'sp-contributions' => '', 'whatlinkshere' => 'What links here', 'block' => 'Block/unblock', + 'listrestrictions' => 'Special:ListUserRestrictions', + 'removerestrictions' => 'Special:RemoveRestrictions', + 'restrictuser' => 'Special:RestrictUser', + 'restrictionlog' => 'Special:Log/restrict', 'developertools' => 'Developer tools', 'movepage' => 'Move page', 'export' => 'Export', -- 2.20.1