| Index: trunk/phase3/includes/diff/DifferenceInterface.php |
| — | — | @@ -817,16 +817,26 @@ |
| 818 | 818 | } else { |
| 819 | 819 | global $wgLang; |
| 820 | 820 | $dbr = wfGetDB( DB_SLAVE ); |
| | 821 | + |
| | 822 | + // Actually, the limit is $limit + 1. We do this so we can detect |
| | 823 | + // if there are > 100 authors in a given revision range. If they |
| | 824 | + // are, $limit will be passed to diff-multi-manyusers for l10n. |
| | 825 | + $limit = 100; |
| 821 | 826 | $res = $dbr->select( 'revision', 'DISTINCT rev_user_text', |
| 822 | 827 | array( |
| 823 | 828 | 'rev_page = ' . $this->mOldRev->getPage(), |
| 824 | 829 | 'rev_id > ' . $this->mOldRev->getId(), |
| 825 | 830 | 'rev_id < ' . $this->mNewRev->getId() |
| 826 | 831 | ), __METHOD__, |
| 827 | | - array( 'LIMIT' => 101 ) |
| | 832 | + array( 'LIMIT' => $limit + 1 ) |
| 828 | 833 | ); |
| 829 | 834 | $numUsers = $dbr->numRows( $res ); |
| 830 | | - $msg = $numUsers > 100 ? 'diff-multi-manyusers' : 'diff-multi'; |
| | 835 | + if( $numUsers > $limit ) { |
| | 836 | + $msg = 'diff-multi-manyusers'; |
| | 837 | + $numUsers = $limit; |
| | 838 | + } else { |
| | 839 | + $msg = 'diff-multi'; |
| | 840 | + } |
| 831 | 841 | return wfMsgExt( $msg, array( 'parseinline' ), $wgLang->formatnum( $n ), |
| 832 | 842 | $wgLang->formatnum( $numUsers ) ); |
| 833 | 843 | } |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -1618,7 +1618,7 @@ |
| 1619 | 1619 | 'showhideselectedversions' => 'Show/hide selected revisions', |
| 1620 | 1620 | 'editundo' => 'undo', |
| 1621 | 1621 | 'diff-multi' => '({{PLURAL:$1|One intermediate revision|$1 intermediate revisions}} by {{PLURAL:$2|one user|$2 users}} not shown)', |
| 1622 | | -'diff-multi-manyusers' => '($1 intermediate revisions by 100+ users not shown)', |
| | 1622 | +'diff-multi-manyusers' => '($1 intermediate revisions by $2+ users not shown)', |
| 1623 | 1623 | |
| 1624 | 1624 | # Search results |
| 1625 | 1625 | 'search-summary' => '', # do not translate or duplicate this message to other languages |