| Index: trunk/phase3/maintenance/language/messages.inc |
| — | — | @@ -818,6 +818,7 @@ |
| 819 | 819 | 'searchprofile-everything-tooltip', |
| 820 | 820 | 'searchprofile-advanced-tooltip', |
| 821 | 821 | 'search-result-size', |
| | 822 | + 'search-result-category-size', |
| 822 | 823 | 'search-result-score', |
| 823 | 824 | 'search-redirect', |
| 824 | 825 | 'search-section', |
| Index: trunk/phase3/CREDITS |
| — | — | @@ -89,9 +89,10 @@ |
| 90 | 90 | * Karun Dambietz |
| 91 | 91 | * Kim Hyun-Joon |
| 92 | 92 | * Lee Worden |
| | 93 | +* Lejonel |
| 93 | 94 | * liangent |
| | 95 | +* Louperivois |
| 94 | 96 | * Lucas Garczewski |
| 95 | | -* Louperivois |
| 96 | 97 | * Luigi Corsaro |
| 97 | 98 | * Manuel Menal |
| 98 | 99 | * Marcin Cieślak |
| Index: trunk/phase3/includes/specials/SpecialSearch.php |
| — | — | @@ -539,6 +539,18 @@ |
| 540 | 540 | $this->sk->formatSize( $byteSize ), |
| 541 | 541 | $wgLang->formatNum( $wordCount ) |
| 542 | 542 | ); |
| | 543 | + |
| | 544 | + if( $t->getNamespace() == NS_CATEGORY ) { |
| | 545 | + $cat = Category::newFromTitle( $t ); |
| | 546 | + $size = wfMsgExt( |
| | 547 | + 'search-result-category-size', |
| | 548 | + array( 'parsemag', 'escape' ), |
| | 549 | + $wgLang->formatNum( $cat->getPageCount() ), |
| | 550 | + $wgLang->formatNum( $cat->getSubcatCount() ), |
| | 551 | + $wgLang->formatNum( $cat->getFileCount() ) |
| | 552 | + ); |
| | 553 | + } |
| | 554 | + |
| 543 | 555 | $date = $wgLang->timeanddate( $timestamp ); |
| 544 | 556 | |
| 545 | 557 | // link to related articles if supported |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -1625,6 +1625,7 @@ |
| 1626 | 1626 | 'searchprofile-everything-tooltip' => 'Search all of content (including talk pages)', |
| 1627 | 1627 | 'searchprofile-advanced-tooltip' => 'Search in custom namespaces', |
| 1628 | 1628 | 'search-result-size' => '$1 ({{PLURAL:$2|1 word|$2 words}})', |
| | 1629 | +'search-result-category-size' => '{{PLURAL:$1|1 member|$1 members}} ({{PLURAL:$2|1 subcategory|$2 subcategories}}, {{PLURAL:$3|1 file|$3 files}})', |
| 1629 | 1630 | 'search-result-score' => 'Relevance: $1%', |
| 1630 | 1631 | 'search-redirect' => '(redirect $1)', |
| 1631 | 1632 | 'search-section' => '(section $1)', |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -51,6 +51,7 @@ |
| 52 | 52 | * (bug 23206) Add Special::Search hook for detecting successful "Go" |
| 53 | 53 | * When visiting a "red link" of a deleted file, a deletion and move log excerpt |
| 54 | 54 | is provided on the Upload form. |
| | 55 | +* (bug 22647) Add category details in search results. |
| 55 | 56 | |
| 56 | 57 | === Bug fixes in 1.17 === |
| 57 | 58 | * (bug 17560) Half-broken deletion moved image files to deletion archive |