From: Happy-melon Date: Mon, 31 Aug 2009 11:30:50 +0000 (+0000) Subject: Reimplement r55685, r55686, r55687, with correct parsing of the associative array... X-Git-Tag: 1.31.0-rc.0~39993 X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_aide%28?a=commitdiff_plain;h=255e855e34a727935c8553c1453ffd1181b72a09;p=lhc%2Fweb%2Fwiklou.git Reimplement r55685, r55686, r55687, with correct parsing of the associative array. Also add message description to MessagesQqq as requested at r55685. --- diff --git a/RELEASE-NOTES b/RELEASE-NOTES index ead2b92615..aa149b0273 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -197,6 +197,8 @@ this. Was used when mwEmbed was going to be an extension. * (bug 20404) Custom fields in the user creation form template can now have detail labels in prefsectiontip divs. * MakeSysop and MakeBot are now aliases for Special:UserRights +* IndexPager->mLimitsShown can now be an associative array of limit => text-to- + display-in-limit-form. === Bug fixes in 1.16 === diff --git a/includes/Pager.php b/includes/Pager.php index 054ca38286..3a129e77fb 100644 --- a/includes/Pager.php +++ b/includes/Pager.php @@ -879,10 +879,18 @@ abstract class TablePager extends IndexPager { function getLimitSelect() { global $wgLang; $s = ""; return $s; diff --git a/includes/specials/SpecialAllmessages.php b/includes/specials/SpecialAllmessages.php index f762532b35..417e36736f 100644 --- a/includes/specials/SpecialAllmessages.php +++ b/includes/specials/SpecialAllmessages.php @@ -128,6 +128,7 @@ class AllmessagesTablePager extends TablePager { var $messages = null; var $talkPages = null; + public $mLimitsShown; function __construct( $page, $conds, $langObj = null ) { parent::__construct(); @@ -135,6 +136,10 @@ class AllmessagesTablePager extends TablePager { $this->mPage = $page; $this->mConds = $conds; $this->mDefaultDirection = true; // always sort ascending + // We want to have an option for people to view *all* the messages, + // so they can use Ctrl+F to search them. 5000 is the maximum that + // will get through WebRequest::getLimitOffset(). + $this->mLimitsShown = array( 20, 50, 100, 250, 500, 5000 => wfMsg('limitall') ); global $wgLang, $wgContLang, $wgRequest; diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index 3e43790785..f708c2194e 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -3814,6 +3814,7 @@ Others will be hidden by default. 'watchlistall2' => 'all', 'namespacesall' => 'all', 'monthsall' => 'all', +'limitall' => 'all', # E-mail address confirmation 'confirmemail' => 'Confirm e-mail address', diff --git a/languages/messages/MessagesLzh.php b/languages/messages/MessagesLzh.php index 4f6472b44a..24e9adcde1 100644 --- a/languages/messages/MessagesLzh.php +++ b/languages/messages/MessagesLzh.php @@ -2433,6 +2433,7 @@ $1', 'watchlistall2' => '全', 'namespacesall' => '全', 'monthsall' => '全', +'limitall' => '全', # E-mail address confirmation 'confirmemail' => '核郵驛', diff --git a/languages/messages/MessagesQqq.php b/languages/messages/MessagesQqq.php index 89ae8de944..310e9aae03 100644 --- a/languages/messages/MessagesQqq.php +++ b/languages/messages/MessagesQqq.php @@ -2996,6 +2996,9 @@ Please leave the link http://www.mediawiki.org/wiki/Manual:External_editors exac {{Identical|All}}', 'monthsall' => 'Used in a drop-down box on [[Special:Contributions]] as an option for "all months". See also [[MediaWiki:Month/{{SUBPAGENAME}}]]. +{{Identical|All}}', +'limitall' => 'Used on [[Special:AllMessages]] (and potentially other TablePager based tables) to display "all" the messages. + {{Identical|All}}', # E-mail address confirmation diff --git a/languages/messages/MessagesYue.php b/languages/messages/MessagesYue.php index d9b041c330..34586f26ef 100644 --- a/languages/messages/MessagesYue.php +++ b/languages/messages/MessagesYue.php @@ -2956,6 +2956,7 @@ Variants for Chinese language 'watchlistall2' => '全部', 'namespacesall' => '全部', 'monthsall' => '全部', +'limitall' => '全部', # E-mail address confirmation 'confirmemail' => '確認電郵地址', diff --git a/languages/messages/MessagesZh_hans.php b/languages/messages/MessagesZh_hans.php index 71eeafd6b8..97f7f7f112 100644 --- a/languages/messages/MessagesZh_hans.php +++ b/languages/messages/MessagesZh_hans.php @@ -2993,6 +2993,7 @@ Variants for Chinese language 'watchlistall2' => '全部', 'namespacesall' => '全部', 'monthsall' => '全部', +'limitall' => '全部', # E-mail address confirmation 'confirmemail' => '确认邮箱地址', diff --git a/languages/messages/MessagesZh_hant.php b/languages/messages/MessagesZh_hant.php index c03eec6101..013ffc2510 100644 --- a/languages/messages/MessagesZh_hant.php +++ b/languages/messages/MessagesZh_hant.php @@ -2981,6 +2981,7 @@ Variants for Chinese language 'watchlistall2' => '全部', 'namespacesall' => '全部', 'monthsall' => '全部', +'limitall' => '全部', # E-mail address confirmation 'confirmemail' => '確認郵箱位址', diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc index f8b901bb7a..82426f4eb1 100644 --- a/maintenance/language/messages.inc +++ b/maintenance/language/messages.inc @@ -2822,6 +2822,7 @@ $wgMessageStructure = array( 'watchlistall2', 'namespacesall', 'monthsall', + 'limitall', ), 'confirmemail' => array( 'confirmemail',