| Index: trunk/phase3/maintenance/language/messages.inc |
| — | — | @@ -804,6 +804,7 @@ |
| 805 | 805 | 'showhideselectedversions', |
| 806 | 806 | 'editundo', |
| 807 | 807 | 'diff-multi', |
| | 808 | + 'diff-multi-manyusers', |
| 808 | 809 | ), |
| 809 | 810 | 'search' => array( |
| 810 | 811 | 'search-summary', |
| Index: trunk/phase3/includes/diff/DifferenceInterface.php |
| — | — | @@ -812,10 +812,24 @@ |
| 813 | 813 | } |
| 814 | 814 | |
| 815 | 815 | $n = $this->mTitle->countRevisionsBetween( $oldid, $newid ); |
| 816 | | - if ( !$n ) |
| | 816 | + if ( !$n ) { |
| 817 | 817 | return ''; |
| 818 | | - |
| 819 | | - return wfMsgExt( 'diff-multi', array( 'parseinline' ), $n ); |
| | 818 | + } else { |
| | 819 | + global $wgLang; |
| | 820 | + $dbr = wfGetDB( DB_SLAVE ); |
| | 821 | + $res = $dbr->select( 'revision', 'DISTINCT rev_user_text', |
| | 822 | + array( |
| | 823 | + 'rev_page = ' . $this->mOldRev->getPage(), |
| | 824 | + 'rev_id > ' . $this->mOldRev->getId(), |
| | 825 | + 'rev_id < ' . $this->mNewRev->getId() |
| | 826 | + ), __METHOD__, |
| | 827 | + array( 'LIMIT' => 101 ) |
| | 828 | + ); |
| | 829 | + $numUsers = $dbr->numRows( $res ); |
| | 830 | + $msg = $numUsers > 100 ? 'diff-multi-manyusers' : 'diff-multi'; |
| | 831 | + return wfMsgExt( $msg, array( 'parseinline' ), $wgLang->formatnum( $n ), |
| | 832 | + $wgLang->formatnum( $numUsers ) ); |
| | 833 | + } |
| 820 | 834 | } |
| 821 | 835 | |
| 822 | 836 | |
| Index: trunk/phase3/languages/messages/MessagesQqq.php |
| — | — | @@ -1154,8 +1154,14 @@ |
| 1155 | 1155 | 'showhideselectedversions' => 'Text of the button which brings up the [[mw:RevisionDelete|RevisionDelete]] menu.', |
| 1156 | 1156 | 'editundo' => 'Undo link when viewing diffs |
| 1157 | 1157 | {{Identical|Undo}}', |
| 1158 | | -'diff-multi' => "This message appears in the revision history of a page when comparing two versions which aren't consecutive.", |
| | 1158 | +'diff-multi' => "This message appears in the revision history of a page when comparing two versions which aren't consecutive. |
| 1159 | 1159 | |
| | 1160 | +*Parameter $1 is the number of revisions |
| | 1161 | +*Parameter $2 is the number of users making those revisions", |
| | 1162 | +'diff-multi-manyuser' => "This message appears in the revision history of a page when comparing two versions which aren't consecutive, and the intermediate revisions have been edited by 100+ users |
| | 1163 | + |
| | 1164 | +*$1 is the number of revisions, will always be 100 or more", |
| | 1165 | + |
| 1160 | 1166 | # Search results |
| 1161 | 1167 | 'searchresults-title' => 'Appears as page title in the html header of the search result special page.', |
| 1162 | 1168 | 'notitlematches' => 'Header of results page after a search for a title for which no page exists', |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -1617,7 +1617,8 @@ |
| 1618 | 1618 | 'compareselectedversions' => 'Compare selected revisions', |
| 1619 | 1619 | 'showhideselectedversions' => 'Show/hide selected revisions', |
| 1620 | 1620 | 'editundo' => 'undo', |
| 1621 | | -'diff-multi' => '({{PLURAL:$1|One intermediate revision|$1 intermediate revisions}} not shown)', |
| | 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 intermediate revisions by 100+ users not shown)', |
| 1622 | 1623 | |
| 1623 | 1624 | # Search results |
| 1624 | 1625 | 'search-summary' => '', # do not translate or duplicate this message to other languages |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -148,6 +148,8 @@ |
| 149 | 149 | * The parser cache is now shared amongst users whose different settings aren't |
| 150 | 150 | used in the page. |
| 151 | 151 | * Any attribute beginning with "data-" can now be used in wikitext, per HTML5. |
| | 152 | +* (bug 24007) Diff pages now mention the number of users having edited |
| | 153 | + intermediate revisions |
| 152 | 154 | |
| 153 | 155 | === Bug fixes in 1.17 === |
| 154 | 156 | * (bug 17560) Half-broken deletion moved image files to deletion archive |