r55688 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r55687‎ | r55688 | r55689 >
Date:06:54, 31 August 2009
Author:nikerabbit
Status:ok
Tags:
Comment:
Revert r55685, r55686 and r55687 for now. Limits not working.
Modified paths:
  • /trunk/phase3/RELEASE-NOTES (modified) (history)
  • /trunk/phase3/includes/Pager.php (modified) (history)
  • /trunk/phase3/includes/specials/SpecialAllmessages.php (modified) (history)
  • /trunk/phase3/languages/messages/MessagesEn.php (modified) (history)
  • /trunk/phase3/languages/messages/MessagesLzh.php (modified) (history)
  • /trunk/phase3/languages/messages/MessagesYue.php (modified) (history)
  • /trunk/phase3/languages/messages/MessagesZh_hans.php (modified) (history)
  • /trunk/phase3/languages/messages/MessagesZh_hant.php (modified) (history)
  • /trunk/phase3/maintenance/language/messages.inc (modified) (history)

Diff [purge]

Index: trunk/phase3/maintenance/language/messages.inc
@@ -2822,7 +2822,6 @@
28232823 'watchlistall2',
28242824 'namespacesall',
28252825 'monthsall',
2826 - 'messagesall',
28272826 ),
28282827 'confirmemail' => array(
28292828 'confirmemail',
Index: trunk/phase3/includes/specials/SpecialAllmessages.php
@@ -128,7 +128,6 @@
129129
130130 var $messages = null;
131131 var $talkPages = null;
132 - public $mLimitsShown;
133132
134133 function __construct( $page, $conds, $langObj = null ) {
135134 parent::__construct();
@@ -136,10 +135,6 @@
137136 $this->mPage = $page;
138137 $this->mConds = $conds;
139138 $this->mDefaultDirection = true; // always sort ascending
140 - // We want to have an option for people to view *all* the messages,
141 - // so they can use Ctrl+F to search them. 5000 is the maximum that
142 - // will get through WebRequest::getLimitOffset().
143 - $this->mLimitsShown = array( 20, 50, 100, 250, 500, 5000 => wfMsg('messagesall') );
144139
145140 global $wgLang, $wgContLang, $wgRequest;
146141
Index: trunk/phase3/includes/Pager.php
@@ -879,9 +879,9 @@
880880 function getLimitSelect() {
881881 global $wgLang;
882882 $s = "<select name=\"limit\">";
883 - foreach ( $this->mLimitsShown as $limit => $text ) {
 883+ foreach ( $this->mLimitsShown as $limit ) {
884884 $selected = $limit == $this->mLimit ? 'selected="selected"' : '';
885 - $formattedLimit = $text ? $text : $wgLang->formatNum( $limit );
 885+ $formattedLimit = $wgLang->formatNum( $limit );
886886 $s .= "<option value=\"$limit\" $selected>$formattedLimit</option>\n";
887887 }
888888 $s .= "</select>";
Index: trunk/phase3/languages/messages/MessagesZh_hans.php
@@ -2993,7 +2993,6 @@
29942994 'watchlistall2' => '全部',
29952995 'namespacesall' => '全部',
29962996 'monthsall' => '全部',
2997 -'messagesall' => '全部',
29982997
29992998 # E-mail address confirmation
30002999 'confirmemail' => '确认邮箱地址',
Index: trunk/phase3/languages/messages/MessagesYue.php
@@ -2956,7 +2956,6 @@
29572957 'watchlistall2' => '全部',
29582958 'namespacesall' => '全部',
29592959 'monthsall' => '全部',
2960 -'messagesall' => '全部',
29612960
29622961 # E-mail address confirmation
29632962 'confirmemail' => '確認電郵地址',
Index: trunk/phase3/languages/messages/MessagesZh_hant.php
@@ -2981,7 +2981,6 @@
29822982 'watchlistall2' => '全部',
29832983 'namespacesall' => '全部',
29842984 'monthsall' => '全部',
2985 -'messagesall' => '全部',
29862985
29872986 # E-mail address confirmation
29882987 'confirmemail' => '確認郵箱位址',
Index: trunk/phase3/languages/messages/MessagesEn.php
@@ -3814,7 +3814,6 @@
38153815 'watchlistall2' => 'all',
38163816 'namespacesall' => 'all',
38173817 'monthsall' => 'all',
3818 -'messagesall' => 'all',
38193818
38203819 # E-mail address confirmation
38213820 'confirmemail' => 'Confirm e-mail address',
Index: trunk/phase3/languages/messages/MessagesLzh.php
@@ -2433,7 +2433,6 @@
24342434 'watchlistall2' => '全',
24352435 'namespacesall' => '全',
24362436 'monthsall' => '全',
2437 -'messagesall' => '全',
24382437
24392438 # E-mail address confirmation
24402439 'confirmemail' => '核郵驛',
Index: trunk/phase3/RELEASE-NOTES
@@ -197,8 +197,6 @@
198198 * (bug 20404) Custom fields in the user creation form template can now have
199199 detail labels in prefsectiontip divs.
200200 * MakeSysop and MakeBot are now aliases for Special:UserRights
201 -* IndexPager->mLimitsShown can now be an associative array of limit => text-to-
202 - display-in-limit-form.
203201
204202 === Bug fixes in 1.16 ===
205203

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r55685* Allow IndexPager->mLimitsShown to be an associative array of limit => text-...happy-melon21:50, 30 August 2009
r55686Follow-up to r55685 - update messages.inc, and fix wierd positioning of comme...happy-melon22:06, 30 August 2009
r55687Localisation updates Cantonese, Chinese and Literary Chineseshinjiman01:24, 31 August 2009

Status & tagging log