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

Revert/36294 (#36714) 

* Revert "Update spelling of Cancelled to Canceled for US English. (#36294)"

This reverts commit e588c560bf.

* Changelog note
This commit is contained in:
Barry Hughes 2023-02-01 11:59:42 -08:00 committed by GitHub
parent 5570f6a3e8
commit 463082fb28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/js/components/changelog/canceled
View File

@ -1,4 +0,0 @@
Significance: minor
Type: tweak
Update spelling of Cancelled to Canceled for US English.

2
packages/js/e2e-core-tests/src/specs/merchant/wp-admin-order-status-filters.test.js
View File

@ -16,7 +16,7 @@ const orderStatus = [
[ 'Processing', 'wc-processing' ],
[ 'On hold', 'wc-on-hold' ],
[ 'Completed', 'wc-completed' ],
[ 'Canceled', 'wc-cancelled' ],
[ 'Cancelled', 'wc-cancelled' ],
[ 'Refunded', 'wc-refunded' ],
[ 'Failed', 'wc-failed' ],
];

5
plugins/woocommerce/changelog/revert-36294 Normal file
View File

@ -0,0 +1,5 @@
Significance: patch
Type: dev
Comment: This is a revert: we don't need a further changelog entry and the existing entry should be removed by the revert itself.

4
plugins/woocommerce/includes/admin/settings/class-wc-settings-accounts.php
View File

@ -203,8 +203,8 @@ class WC_Settings_Accounts extends WC_Settings_Page {
'autoload' => false,
),
array(
'title' => __( 'Retain canceled orders', 'woocommerce' ),
'desc_tip' => __( 'Canceled orders are unpaid and may have been cancelled by the store owner or customer. They will be trashed after the specified duration.', 'woocommerce' ),
'title' => __( 'Retain cancelled orders', 'woocommerce' ),
'desc_tip' => __( 'Cancelled orders are unpaid and may have been cancelled by the store owner or customer. They will be trashed after the specified duration.', 'woocommerce' ),
'id' => 'woocommerce_trash_cancelled_orders',
'type' => 'relative_date_selector',
'placeholder' => __( 'N/A', 'woocommerce' ),

4
plugins/woocommerce/includes/class-wc-post-types.php
View File

@ -598,13 +598,13 @@ class WC_Post_Types {
'label_count' => _n_noop( 'Completed <span class="count">(%s)</span>', 'Completed <span class="count">(%s)</span>', 'woocommerce' ),
),
'wc-cancelled' => array(
'label' => _x( 'Canceled', 'Order status', 'woocommerce' ),
'label' => _x( 'Cancelled', 'Order status', 'woocommerce' ),
'public' => false,
'exclude_from_search' => false,
'show_in_admin_all_list' => true,
'show_in_admin_status_list' => true,
/* translators: %s: number of orders */
'label_count' => _n_noop( 'Canceled <span class="count">(%s)</span>', 'Canceled <span class="count">(%s)</span>', 'woocommerce' ),
'label_count' => _n_noop( 'Cancelled <span class="count">(%s)</span>', 'Cancelled <span class="count">(%s)</span>', 'woocommerce' ),
),
'wc-refunded' => array(
'label' => _x( 'Refunded', 'Order status', 'woocommerce' ),

2
plugins/woocommerce/includes/class-wc-regenerate-images.php
View File

@ -158,7 +158,7 @@ class WC_Regenerate_Images {
$log = wc_get_logger();
$log->info(
__( 'Canceled product image regeneration job.', 'woocommerce' ),
__( 'Cancelled product image regeneration job.', 'woocommerce' ),
array(
'source' => 'wc-image-regeneration',
)

6
plugins/woocommerce/includes/emails/class-wc-email-cancelled-order.php
View File

@ -28,8 +28,8 @@ if ( ! class_exists( 'WC_Email_Cancelled_Order', false ) ) :
*/
public function __construct() {
$this->id = 'cancelled_order';
$this->title = __( 'Canceled order', 'woocommerce' );
$this->description = __( 'Canceled order emails are sent to chosen recipient(s) when orders have been marked canceled (if they were previously processing or on-hold).', 'woocommerce' );
$this->title = __( 'Cancelled order', 'woocommerce' );
$this->description = __( 'Cancelled order emails are sent to chosen recipient(s) when orders have been marked cancelled (if they were previously processing or on-hold).', 'woocommerce' );
$this->template_html = 'emails/admin-cancelled-order.php';
$this->template_plain = 'emails/plain/admin-cancelled-order.php';
$this->placeholders = array(
@ -66,7 +66,7 @@ if ( ! class_exists( 'WC_Email_Cancelled_Order', false ) ) :
* @return string
*/
public function get_default_heading() {
return __( 'Order Canceled: #{order_number}', 'woocommerce' );
return __( 'Order Cancelled: #{order_number}', 'woocommerce' );
}
/**

2
plugins/woocommerce/includes/emails/class-wc-email-customer-on-hold-order.php
View File

@ -30,7 +30,7 @@ if ( ! class_exists( 'WC_Email_Customer_On_Hold_Order', false ) ) :
$this->id = 'customer_on_hold_order';
$this->customer_email = true;
$this->title = __( 'Order on-hold', 'woocommerce' );
$this->description = __( 'This is an order notification sent to customers containing order details after an order is placed on-hold from Pending, Canceled or Failed order status.', 'woocommerce' );
$this->description = __( 'This is an order notification sent to customers containing order details after an order is placed on-hold from Pending, Cancelled or Failed order status.', 'woocommerce' );
$this->template_html = 'emails/customer-on-hold-order.php';
$this->template_plain = 'emails/plain/customer-on-hold-order.php';
$this->placeholders = array(

2
plugins/woocommerce/includes/wc-order-functions.php
View File

@ -98,7 +98,7 @@ function wc_get_order_statuses() {
'wc-processing' => _x( 'Processing', 'Order status', 'woocommerce' ),
'wc-on-hold' => _x( 'On hold', 'Order status', 'woocommerce' ),
'wc-completed' => _x( 'Completed', 'Order status', 'woocommerce' ),
'wc-cancelled' => _x( 'Canceled', 'Order status', 'woocommerce' ),
'wc-cancelled' => _x( 'Cancelled', 'Order status', 'woocommerce' ),
'wc-refunded' => _x( 'Refunded', 'Order status', 'woocommerce' ),
'wc-failed' => _x( 'Failed', 'Order status', 'woocommerce' ),
);

2
plugins/woocommerce/tests/api-core-tests/tests/reports/reports-crud.test.js
View File

@ -281,7 +281,7 @@ test.describe('Reports API tests', () => {
expect.arrayContaining([
expect.objectContaining({
"slug": "cancelled",
"name": "Canceled",
"name": "Cancelled",
"total": expect.any(Number)
})
]));

8
plugins/woocommerce/tests/api-core-tests/tests/settings/settings-crud.test.js
View File

@ -141,8 +141,8 @@ test.describe('Settings API tests: CRUD', () => {
expect.arrayContaining([
expect.objectContaining({
id: "email_cancelled_order",
label: "Canceled order",
description: "Canceled order emails are sent to chosen recipient(s) when orders have been marked canceled (if they were previously processing or on-hold).",
label: "Cancelled order",
description: "Cancelled order emails are sent to chosen recipient(s) when orders have been marked cancelled (if they were previously processing or on-hold).",
parent_id: "email",
"sub_groups": expect.arrayContaining([]),
})
@ -162,7 +162,7 @@ test.describe('Settings API tests: CRUD', () => {
expect.objectContaining({
id: "email_customer_on_hold_order",
label: "Order on-hold",
description: "This is an order notification sent to customers containing order details after an order is placed on-hold from Pending, Canceled or Failed order status.",
description: "This is an order notification sent to customers containing order details after an order is placed on-hold from Pending, Cancelled or Failed order status.",
parent_id: "email",
"sub_groups": expect.arrayContaining([]),
})
@ -2549,4 +2549,4 @@ test.describe('Settings API tests: CRUD', () => {
});
});
});
});

2
plugins/woocommerce/tests/e2e-pw/tests/merchant/order-status-filter.spec.js
View File

@ -10,7 +10,7 @@ const orderStatus = [
[ 'Processing', 'wc-processing' ],
[ 'On hold', 'wc-on-hold' ],
[ 'Completed', 'wc-completed' ],
[ 'Canceled', 'wc-cancelled' ],
[ 'Cancelled', 'wc-cancelled' ],
[ 'Refunded', 'wc-refunded' ],
[ 'Failed', 'wc-failed' ],
];

2
plugins/woocommerce/tests/legacy/unit-tests/order/class-wc-tests-order-functions.php
View File

@ -29,7 +29,7 @@ class WC_Tests_Order_Functions extends WC_Unit_Test_Case {
'wc-processing' => _x( 'Processing', 'Order status', 'woocommerce' ),
'wc-on-hold' => _x( 'On hold', 'Order status', 'woocommerce' ),
'wc-completed' => _x( 'Completed', 'Order status', 'woocommerce' ),
'wc-cancelled' => _x( 'Canceled', 'Order status', 'woocommerce' ),
'wc-cancelled' => _x( 'Cancelled', 'Order status', 'woocommerce' ),
'wc-refunded' => _x( 'Refunded', 'Order status', 'woocommerce' ),
'wc-failed' => _x( 'Failed', 'Order status', 'woocommerce' ),
)