Merge pull request #2052 from GeertDD/result_count

Improved the result-count template
This commit is contained in:
Mike Jolley 2012-12-27 10:36:53 -08:00
commit 6ef1d9222c
1 changed files with 12 additions and 9 deletions

View File

@ -20,13 +20,16 @@ if ( ! woocommerce_products_will_display() )
<?php <?php
$paged = max( 1, $wp_query->get( 'paged' ) ); $paged = max( 1, $wp_query->get( 'paged' ) );
$per_page = $wp_query->get( 'posts_per_page' ); $per_page = $wp_query->get( 'posts_per_page' );
$max = $wp_query->found_posts; $total = $wp_query->found_posts;
$first = ( $per_page * $paged ) - $per_page + 1; $first = ( $per_page * $paged ) - $per_page + 1;
$last = $wp_query->get( 'posts_per_page' ) * $paged; $last = min( $total, $wp_query->get( 'posts_per_page' ) * $paged );
if ( $last > $max ) if ( 1 == $total ) {
$last = $max; _e( 'Showing the single result', 'woocommerce' );
} elseif ( $total <= $per_page ) {
printf( __( 'Showing %s - %s of %s results', 'woocommerce' ), $first, $last, $max ); printf( __( 'Showing all %d results', 'woocommerce' ), $total );
} else {
printf( _x( 'Showing %1$d%2$d of %3$d results', '%1$d = first, %2$d = last, %3$d = total', 'woocommerce' ), $first, $last, $total );
}
?> ?>
</p> </p>