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

Merge pull request #22971 from woocommerce/fix/22958 

Reword cancelled email
This commit is contained in:
Gerhard Potgieter 2019-03-14 10:07:12 +02:00 committed by GitHub
parent 8c09e28be4 89b485e8da
commit fbb18db896
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,7 +57,7 @@ if ( ! class_exists( 'WC_Email_Cancelled_Order', false ) ) :
* @return string * @return string
*/ */
public function get_default_subject() { public function get_default_subject() {
return __( '[{site_title}]: {order_billing_full_name} has cancelled order #{order_number}', 'woocommerce' ); return __( '[{site_title}]: Order #{order_number} has been cancelled', 'woocommerce' );
} }
/** /**
@ -104,7 +104,8 @@ if ( ! class_exists( 'WC_Email_Cancelled_Order', false ) ) :
*/ */
public function get_content_html() { public function get_content_html() {
return wc_get_template_html( return wc_get_template_html(
$this->template_html, array( $this->template_html,
array(
'order' => $this->object, 'order' => $this->object,
'email_heading' => $this->get_heading(), 'email_heading' => $this->get_heading(),
'sent_to_admin' => true, 'sent_to_admin' => true,
@ -121,7 +122,8 @@ if ( ! class_exists( 'WC_Email_Cancelled_Order', false ) ) :
*/ */
public function get_content_plain() { public function get_content_plain() {
return wc_get_template_html( return wc_get_template_html(
$this->template_plain, array( $this->template_plain,
array(
'order' => $this->object, 'order' => $this->object,
'email_heading' => $this->get_heading(), 'email_heading' => $this->get_heading(),
'sent_to_admin' => true, 'sent_to_admin' => true,

6
templates/emails/admin-cancelled-order.php
View File

@ -12,7 +12,7 @@
* *
* @see https://docs.woocommerce.com/document/template-structure/ * @see https://docs.woocommerce.com/document/template-structure/
* @package WooCommerce/Templates/Emails * @package WooCommerce/Templates/Emails
* @version 3.5.0 * @version 3.6.0
*/ */
if ( ! defined( 'ABSPATH' ) ) { if ( ! defined( 'ABSPATH' ) ) {
@ -24,8 +24,8 @@ if ( ! defined( 'ABSPATH' ) ) {
*/ */
do_action( 'woocommerce_email_header', $email_heading, $email ); ?> do_action( 'woocommerce_email_header', $email_heading, $email ); ?>
<?php /* translators: %1$s: Customer full name. %2$s: Order number */ ?> <?php /* translators: %1$s: Order number, %2$s: Customer full name. */ ?>
<p><?php printf( esc_html__( 'Alas. Just to let you know &mdash; %1$s has cancelled order #%2$s:', 'woocommerce' ), esc_html( $order->get_formatted_billing_full_name() ), esc_html( $order->get_order_number() ) ); ?></p> <p><?php printf( esc_html__( 'Alas. Just to let you know &mdash; order #%1$s belonging to %2$s has been cancelled:', 'woocommerce' ), esc_html( $order->get_order_number() ), esc_html( $order->get_formatted_billing_full_name() ) ); ?></p>
<?php <?php

6
templates/emails/plain/admin-cancelled-order.php
View File

@ -12,7 +12,7 @@
* *
* @see https://docs.woocommerce.com/document/template-structure/ * @see https://docs.woocommerce.com/document/template-structure/
* @package WooCommerce/Templates/Emails/Plain * @package WooCommerce/Templates/Emails/Plain
* @version 3.5.0 * @version 3.6.0
*/ */
if ( ! defined( 'ABSPATH' ) ) { if ( ! defined( 'ABSPATH' ) ) {
@ -21,8 +21,8 @@ if ( ! defined( 'ABSPATH' ) ) {
echo '= ' . esc_html( $email_heading ) . " =\n\n"; echo '= ' . esc_html( $email_heading ) . " =\n\n";
/* translators: %1$s: Customer full name. %2$s: Order numer */ /* translators: %1$s: Order number. %2$s: Customer full name */
echo sprintf( esc_html__( 'Alas. Just to let you know &mdash; %1$s has cancelled order #%2$s:', 'woocommerce' ), esc_html( $order->get_formatted_billing_full_name() ), esc_html( $order->get_order_number() ) ) . "\n\n"; echo sprintf( esc_html__( 'Alas. Just to let you know &mdash; order #%1$s belonging to %2$s has been cancelled:', 'woocommerce' ), esc_html( $order->get_order_number() ), esc_html( $order->get_formatted_billing_full_name() ) ) . "\n\n";
echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\n\n"; echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\n\n";