Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:woothemes/woocommerce

This commit is contained in:
Claudio Sanches 2015-06-28 23:07:11 -03:00
parent 0c2d161125 d0a41989c9
commit c8da607fa2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
includes/emails/class-wc-email-cancelled-order.php
View File

@ -26,7 +26,7 @@ class WC_Email_Cancelled_Order extends WC_Email {
$this->id = 'cancelled_order';
$this->title = __( 'Cancelled order', 'woocommerce' );
$this->description = __( 'Cancelled order emails are sent to the recipient list when orders have been marked cancelled (if they were previously pending or on-hold).', 'woocommerce' );
$this->description = __( 'Cancelled order emails are sent to the recipient list when orders have been marked cancelled (if they were previously processing or on-hold).', 'woocommerce' );
$this->heading = __( 'Cancelled order', 'woocommerce' );
$this->subject = __( '[{site_title}] Cancelled order ({order_number})', 'woocommerce' );

2
includes/walkers/class-product-cat-list-walker.php
View File

@ -75,7 +75,7 @@ class WC_Product_Cat_List_Walker extends Walker {
$output .= ' current-cat-parent';
}
$output .= '"><a href="' . get_term_link( (int) $cat->term_id, 'product_cat' ) . '">' . __( $cat->name, 'woocommerce' ) . '</a>';
$output .= '"><a href="' . get_term_link( (int) $cat->term_id, $this->tree_type ) . '">' . __( $cat->name, 'woocommerce' ) . '</a>';
if ( $args['show_count'] ) {
$output .= ' <span class="count">(' . $cat->count . ')</span>';