From 657c312caeef7345b225ffb899da6dbb84692936 Mon Sep 17 00:00:00 2001 From: Claudio Sanches Date: Wed, 12 Oct 2016 07:16:30 -0300 Subject: [PATCH] Fix strings case (#12069) * Fixed case for all _e, esc_attr_e and esc_html_e strings * Fixed case for all _n_noop strings * Fixed case for all _x strings * Fixed case for all __, esc_html__ and esc_attr__ strings * Fixed a few more strings * Fixed strings in unit tests * Fix PayPal Standard case. * Save Order text --- CHANGELOG.txt | 6 +- i18n/languages/woocommerce.pot | 4 +- includes/abstracts/abstract-wc-order.php | 2 +- .../abstracts/abstract-wc-payment-gateway.php | 2 +- .../abstract-wc-rest-posts-controller.php | 2 +- .../abstracts/abstract-wc-settings-api.php | 2 +- .../class-wc-admin-api-keys-table-list.php | 8 +- includes/admin/class-wc-admin-api-keys.php | 6 +- includes/admin/class-wc-admin-attributes.php | 8 +- includes/admin/class-wc-admin-dashboard.php | 4 +- includes/admin/class-wc-admin-help.php | 62 ++-- includes/admin/class-wc-admin-importers.php | 2 +- includes/admin/class-wc-admin-menus.php | 16 +- includes/admin/class-wc-admin-meta-boxes.php | 16 +- .../class-wc-admin-permalink-settings.php | 4 +- includes/admin/class-wc-admin-pointers.php | 20 +- includes/admin/class-wc-admin-post-types.php | 18 +- includes/admin/class-wc-admin-profile.php | 14 +- includes/admin/class-wc-admin-reports.php | 4 +- includes/admin/class-wc-admin-settings.php | 4 +- .../admin/class-wc-admin-setup-wizard.php | 38 +-- .../class-wc-admin-webhooks-table-list.php | 8 +- includes/admin/class-wc-admin-webhooks.php | 4 +- includes/admin/class-wc-admin.php | 2 +- .../importers/class-wc-tax-rate-importer.php | 4 +- .../class-wc-meta-box-coupon-data.php | 4 +- .../class-wc-meta-box-order-actions.php | 6 +- .../class-wc-meta-box-order-data.php | 20 +- .../class-wc-meta-box-order-downloads.php | 2 +- .../class-wc-meta-box-product-data.php | 18 +- .../class-wc-meta-box-product-images.php | 2 +- .../views/html-order-download-permission.php | 2 +- .../admin/meta-boxes/views/html-order-fee.php | 2 +- .../meta-boxes/views/html-order-items.php | 8 +- .../meta-boxes/views/html-order-shipping.php | 4 +- .../views/html-product-attribute.php | 6 +- .../views/html-product-download.php | 2 +- .../views/html-product-variation-download.php | 2 +- .../meta-boxes/views/html-variation-admin.php | 2 +- .../reports/class-wc-report-coupon-usage.php | 10 +- .../reports/class-wc-report-customer-list.php | 2 +- .../reports/class-wc-report-customers.php | 18 +- .../class-wc-report-sales-by-category.php | 8 +- .../reports/class-wc-report-sales-by-date.php | 10 +- .../class-wc-report-sales-by-product.php | 14 +- .../reports/class-wc-report-taxes-by-code.php | 12 +- .../reports/class-wc-report-taxes-by-date.php | 12 +- .../settings/class-wc-settings-accounts.php | 34 +- .../admin/settings/class-wc-settings-api.php | 2 +- .../settings/class-wc-settings-checkout.php | 34 +- .../settings/class-wc-settings-emails.php | 26 +- .../settings/class-wc-settings-general.php | 38 +-- .../settings/class-wc-settings-products.php | 54 +-- .../settings/class-wc-settings-shipping.php | 22 +- .../admin/settings/class-wc-settings-tax.php | 14 +- .../html-admin-page-shipping-classes.php | 12 +- .../html-admin-page-shipping-zone-methods.php | 10 +- ...tml-admin-page-shipping-zones-instance.php | 2 +- .../views/html-admin-page-shipping-zones.php | 12 +- .../admin/settings/views/html-keys-edit.php | 14 +- .../settings/views/html-settings-tax.php | 12 +- .../settings/views/html-webhooks-edit.php | 44 +-- .../admin/settings/views/settings-tax.php | 22 +- .../admin/views/html-admin-page-addons.php | 2 +- .../views/html-admin-page-status-logs.php | 2 +- .../views/html-admin-page-status-report.php | 92 ++--- .../admin/views/html-admin-page-status.php | 2 +- .../admin/views/html-bulk-edit-product.php | 40 +-- includes/admin/views/html-notice-install.php | 2 +- .../views/html-notice-legacy-shipping.php | 4 +- .../views/html-notice-no-shipping-methods.php | 2 +- .../views/html-notice-template-check.php | 2 +- .../admin/views/html-notice-theme-support.php | 4 +- includes/admin/views/html-notice-update.php | 2 +- includes/admin/views/html-notice-updating.php | 2 +- .../admin/views/html-quick-edit-product.php | 12 +- includes/api/class-wc-rest-authentication.php | 10 +- ...-wc-rest-product-variations-controller.php | 2 +- .../api/class-wc-rest-products-controller.php | 2 +- ...class-wc-rest-system-status-controller.php | 106 +++--- ...wc-rest-system-status-tools-controller.php | 18 +- .../class-wc-rest-tax-classes-controller.php | 2 +- .../legacy/v1/class-wc-api-authentication.php | 14 +- .../legacy/v2/class-wc-api-authentication.php | 14 +- .../legacy/v3/class-wc-api-authentication.php | 10 +- includes/api/legacy/v3/class-wc-api-taxes.php | 2 +- includes/class-wc-ajax.php | 2 +- includes/class-wc-auth.php | 2 +- includes/class-wc-cart.php | 4 +- includes/class-wc-checkout.php | 2 +- includes/class-wc-countries.php | 8 +- includes/class-wc-emails.php | 4 +- includes/class-wc-embed.php | 2 +- includes/class-wc-form-handler.php | 6 +- includes/class-wc-frontend-scripts.php | 2 +- includes/class-wc-install.php | 12 +- includes/class-wc-post-types.php | 156 ++++----- includes/class-wc-query.php | 12 +- includes/cli/class-wc-cli-tax.php | 2 +- .../emails/class-wc-email-cancelled-order.php | 4 +- ...lass-wc-email-customer-completed-order.php | 6 +- .../class-wc-email-customer-invoice.php | 10 +- ...class-wc-email-customer-refunded-order.php | 12 +- ...class-wc-email-customer-reset-password.php | 6 +- .../emails/class-wc-email-failed-order.php | 4 +- includes/emails/class-wc-email-new-order.php | 4 +- includes/emails/class-wc-email.php | 8 +- .../gateways/bacs/class-wc-gateway-bacs.php | 34 +- .../cheque/class-wc-gateway-cheque.php | 6 +- .../gateways/class-wc-payment-gateway-cc.php | 4 +- .../class-wc-payment-gateway-echeck.php | 4 +- .../gateways/cod/class-wc-gateway-cod.php | 6 +- .../paypal/class-wc-gateway-paypal.php | 8 +- .../paypal/includes/settings-paypal.php | 28 +- .../class-wc-gateway-simplify-commerce.php | 26 +- includes/libraries/wp-background-process.php | 2 +- .../flat-rate/class-wc-shipping-flat-rate.php | 2 +- .../flat-rate/includes/settings-flat-rate.php | 18 +- .../class-wc-shipping-free-shipping.php | 8 +- .../class-wc-shipping-legacy-flat-rate.php | 4 +- .../includes/settings-flat-rate.php | 28 +- ...class-wc-shipping-legacy-free-shipping.php | 12 +- ...shipping-legacy-international-delivery.php | 4 +- ...lass-wc-shipping-legacy-local-delivery.php | 14 +- .../class-wc-shipping-legacy-local-pickup.php | 12 +- .../class-wc-shipping-local-pickup.php | 6 +- .../class-wc-shortcode-checkout.php | 8 +- .../class-wc-shortcode-my-account.php | 8 +- includes/wc-account-functions.php | 12 +- includes/wc-cart-functions.php | 4 +- includes/wc-coupon-functions.php | 8 +- includes/wc-order-functions.php | 6 +- includes/wc-template-functions.php | 6 +- includes/wc-update-functions.php | 2 +- includes/widgets/class-wc-widget-cart.php | 4 +- .../class-wc-widget-layered-nav-filters.php | 4 +- .../widgets/class-wc-widget-layered-nav.php | 2 +- .../widgets/class-wc-widget-price-filter.php | 2 +- .../class-wc-widget-product-categories.php | 6 +- .../class-wc-widget-product-search.php | 2 +- .../class-wc-widget-product-tag-cloud.php | 4 +- includes/widgets/class-wc-widget-products.php | 8 +- .../widgets/class-wc-widget-rating-filter.php | 4 +- .../class-wc-widget-recent-reviews.php | 4 +- .../class-wc-widget-recently-viewed.php | 4 +- .../class-wc-widget-top-rated-products.php | 4 +- readme.txt | 2 +- templates/auth/header.php | 2 +- templates/cart/cart-empty.php | 2 +- templates/cart/cart-totals.php | 2 +- templates/cart/cart.php | 4 +- templates/cart/proceed-to-checkout-button.php | 2 +- templates/cart/shipping-calculator.php | 4 +- templates/checkout/cart-errors.php | 2 +- templates/checkout/form-billing.php | 2 +- templates/checkout/form-coupon.php | 2 +- templates/checkout/form-shipping.php | 2 +- templates/checkout/thankyou.php | 6 +- templates/emails/email-order-items.php | 2 +- templates/myaccount/downloads.php | 2 +- .../myaccount/form-add-payment-method.php | 2 +- templates/myaccount/form-edit-account.php | 14 +- templates/myaccount/form-edit-address.php | 4 +- templates/myaccount/form-login.php | 2 +- templates/myaccount/form-lost-password.php | 2 +- templates/myaccount/my-address.php | 6 +- templates/myaccount/my-downloads.php | 2 +- templates/myaccount/my-orders.php | 2 +- templates/myaccount/orders.php | 2 +- templates/myaccount/payment-methods.php | 2 +- templates/myaccount/view-order.php | 2 +- templates/order/form-tracking.php | 2 +- templates/order/order-again.php | 2 +- templates/order/order-details-customer.php | 6 +- templates/order/order-details.php | 2 +- templates/order/tracking.php | 2 +- templates/product-searchform.php | 2 +- templates/single-product-reviews.php | 6 +- templates/single-product/related.php | 2 +- .../tabs/additional-information.php | 2 +- ...unit-test-factory-for-webhook-delivery.php | 2 +- .../helpers/class-wc-helper-product.php | 2 +- .../helpers/class-wc-helper-settings.php | 24 +- .../helpers/class-wc-helper-shipping.php | 2 +- tests/unit-tests/account/functions.php | 28 +- tests/unit-tests/api/orders.php | 4 +- tests/unit-tests/api/payment-gateways.php | 6 +- tests/unit-tests/api/settings.php | 8 +- tests/unit-tests/api/shipping-methods.php | 6 +- tests/unit-tests/api/shipping-zones.php | 6 +- tests/unit-tests/api/system-status.php | 2 +- tests/unit-tests/cart/functions.php | 12 +- tests/unit-tests/coupon/functions.php | 10 +- tests/unit-tests/order/functions.php | 8 +- tests/unit-tests/product/functions.php | 12 +- tests/unit-tests/product/product-simple.php | 6 +- tests/unit-tests/tax/tax.php | 2 +- tests/unit-tests/util/core-functions.php | 320 +++++++++--------- 198 files changed, 1142 insertions(+), 1142 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 875afd2d1dc..551f6652174 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -249,7 +249,7 @@ * Tweak - Revised email settings screens to show emails in a table and avoid a long sub-nav. * Tweak - Default customer role capabilities. * Tweak - Expire mini-cart cache after 24 hours. -* Tweak - Improved refund error messages in PayPal standard. +* Tweak - Improved refund error messages in PayPal Standard. * Tweak - Removed language pack downloader in favour of translate.wordpress.org. * Tweak - Added onboarding wizard button to the contextual help so it can be accessed again. * Tweak - When a WordPress user is deleted, turn any orders they have into Guest orders. @@ -1303,7 +1303,7 @@ * Feature - Customer list reports. * Feature - Reports - New design, export csvs, more data. * Feature - Ability to link past orders to a customer (before they registered). -* Feature - Authorize option for paypal standard. +* Feature - Authorize option for PayPal Standard. * Feature - Separate options for countries you can ship to and sell to. * Feature - BACS supports multiple account details. * Feature - PayPal PDT support (as alternative to IPN). @@ -1597,7 +1597,7 @@ = 2.0.4 - 18/03/2013 = * Tweak - Like my account, added order_count attribute to view order shortcode. * Tweak - Moved WC_Order_Item_Meta into own file. -* Tweak - PayPal standard gateway - no longer needs sandbox fix, and notify-validate should be first in the requests. +* Tweak - PayPal Standard gateway - no longer needs sandbox fix, and notify-validate should be first in the requests. * Tweak - Flat rate interface tidy up. * Tweak - Add order_id to woocommerce_download_product hook * Tweak - Disabled prettyPhoto deeplinking diff --git a/i18n/languages/woocommerce.pot b/i18n/languages/woocommerce.pot index a1a5a9183d6..9ca926d4a98 100644 --- a/i18n/languages/woocommerce.pot +++ b/i18n/languages/woocommerce.pot @@ -18143,7 +18143,7 @@ msgstr "" #: includes/gateways/paypal/class-wc-gateway-paypal.php:37 msgid "" -"PayPal standard sends customers to PayPal to enter their payment " +"PayPal Standard sends customers to PayPal to enter their payment " "information. PayPal IPN requires fsockopen/cURL support to update order " "statuses after payment. Check the %1$ssystem status%2$s page for more " "details." @@ -18261,7 +18261,7 @@ msgid "Shipping via %s" msgstr "" #: includes/gateways/paypal/includes/settings-paypal.php:14 -msgid "Enable PayPal standard" +msgid "Enable PayPal Standard" msgstr "" #: includes/gateways/paypal/includes/settings-paypal.php:28 diff --git a/includes/abstracts/abstract-wc-order.php b/includes/abstracts/abstract-wc-order.php index 6fbed783640..5b47e4981b1 100644 --- a/includes/abstracts/abstract-wc-order.php +++ b/includes/abstracts/abstract-wc-order.php @@ -1598,7 +1598,7 @@ abstract class WC_Abstract_Order extends WC_Abstract_Legacy_Order { if ( $this->get_total() > 0 && $this->get_payment_method_title() ) { $total_rows['payment_method'] = array( - 'label' => __( 'Payment Method:', 'woocommerce' ), + 'label' => __( 'Payment method:', 'woocommerce' ), 'value' => $this->get_payment_method_title(), ); } diff --git a/includes/abstracts/abstract-wc-payment-gateway.php b/includes/abstracts/abstract-wc-payment-gateway.php index 789b7d117b3..0692f36130c 100644 --- a/includes/abstracts/abstract-wc-payment-gateway.php +++ b/includes/abstracts/abstract-wc-payment-gateway.php @@ -453,7 +453,7 @@ abstract class WC_Payment_Gateway extends WC_Settings_API {

', esc_attr( $this->id ), - esc_html__( 'Save to Account', 'woocommerce' ) + esc_html__( 'Save to account', 'woocommerce' ) ); } } diff --git a/includes/abstracts/abstract-wc-rest-posts-controller.php b/includes/abstracts/abstract-wc-rest-posts-controller.php index 5082e96d370..63d271877ce 100644 --- a/includes/abstracts/abstract-wc-rest-posts-controller.php +++ b/includes/abstracts/abstract-wc-rest-posts-controller.php @@ -415,7 +415,7 @@ abstract class WC_REST_Posts_Controller extends WC_REST_Controller { $post = get_post( $id ); if ( empty( $id ) || empty( $post->ID ) || ! in_array( $post->post_type, $this->get_post_types() ) ) { - return new WP_Error( "woocommerce_rest_{$this->post_type}_invalid_id", __( 'Invalid post id.', 'woocommerce' ), array( 'status' => 404 ) ); + return new WP_Error( "woocommerce_rest_{$this->post_type}_invalid_id", __( 'ID is invalid.', 'woocommerce' ), array( 'status' => 404 ) ); } $supports_trash = EMPTY_TRASH_DAYS > 0; diff --git a/includes/abstracts/abstract-wc-settings-api.php b/includes/abstracts/abstract-wc-settings-api.php index 411d7b47812..66e6d484f0c 100644 --- a/includes/abstracts/abstract-wc-settings-api.php +++ b/includes/abstracts/abstract-wc-settings-api.php @@ -732,7 +732,7 @@ abstract class WC_Settings_API { get_description_html( $data ); ?> -
+
diff --git a/includes/admin/class-wc-admin-api-keys-table-list.php b/includes/admin/class-wc-admin-api-keys-table-list.php index f95b907b442..457e66d70a6 100644 --- a/includes/admin/class-wc-admin-api-keys-table-list.php +++ b/includes/admin/class-wc-admin-api-keys-table-list.php @@ -38,10 +38,10 @@ class WC_Admin_API_Keys_Table_List extends WP_List_Table { return array( 'cb' => '', 'description' => __( 'Description', 'woocommerce' ), - 'truncated_key' => __( 'Consumer Key Ending In', 'woocommerce' ), + 'truncated_key' => __( 'Consumer key ending in', 'woocommerce' ), 'user' => __( 'User', 'woocommerce' ), 'permissions' => __( 'Permissions', 'woocommerce' ), - 'last_access' => __( 'Last Access', 'woocommerce' ), + 'last_access' => __( 'Last access', 'woocommerce' ), ); } @@ -67,7 +67,7 @@ class WC_Admin_API_Keys_Table_List extends WP_List_Table { $output = ''; $output .= ''; if ( empty( $key['description'] ) ) { - $output .= esc_html__( 'API Key', 'woocommerce' ); + $output .= esc_html__( 'API key', 'woocommerce' ); } else { $output .= esc_html( $key['description'] ); } @@ -78,7 +78,7 @@ class WC_Admin_API_Keys_Table_List extends WP_List_Table { $actions = array( 'id' => sprintf( __( 'ID: %d', 'woocommerce' ), $key['key_id'] ), 'edit' => '' . __( 'View/Edit', 'woocommerce' ) . '', - 'trash' => '' . __( 'Revoke', 'woocommerce' ) . '', + 'trash' => '' . __( 'Revoke', 'woocommerce' ) . '', ); $row_actions = array(); diff --git a/includes/admin/class-wc-admin-api-keys.php b/includes/admin/class-wc-admin-api-keys.php index 94289cfafbf..1f75834d986 100644 --- a/includes/admin/class-wc-admin-api-keys.php +++ b/includes/admin/class-wc-admin-api-keys.php @@ -58,7 +58,7 @@ class WC_Admin_API_Keys { * Table list output. */ private static function table_list_output() { - echo '

' . __( 'Keys/Apps', 'woocommerce' ) . ' ' . __( 'Add Key', 'woocommerce' ) . '

'; + echo '

' . __( 'Keys/Apps', 'woocommerce' ) . ' ' . __( 'Add key', 'woocommerce' ) . '

'; $keys_table_list = new WC_Admin_API_Keys_Table_List(); $keys_table_list->prepare_items(); @@ -68,7 +68,7 @@ class WC_Admin_API_Keys { echo ''; $keys_table_list->views(); - $keys_table_list->search_box( __( 'Search Key', 'woocommerce' ), 'key' ); + $keys_table_list->search_box( __( 'Search key', 'woocommerce' ), 'key' ); $keys_table_list->display(); } @@ -129,7 +129,7 @@ class WC_Admin_API_Keys { */ public static function notices() { if ( isset( $_GET['revoked'] ) && 1 == $_GET['revoked'] ) { - WC_Admin_Settings::add_message( __( 'API Key revoked successfully.', 'woocommerce' ) ); + WC_Admin_Settings::add_message( __( 'API key revoked successfully.', 'woocommerce' ) ); } } diff --git a/includes/admin/class-wc-admin-attributes.php b/includes/admin/class-wc-admin-attributes.php index 049a3da0eee..df660f27955 100644 --- a/includes/admin/class-wc-admin-attributes.php +++ b/includes/admin/class-wc-admin-attributes.php @@ -253,7 +253,7 @@ class WC_Admin_Attributes { ?>

-

+

- + /> @@ -438,7 +438,7 @@ class WC_Admin_Attributes {
-

+

@@ -494,7 +494,7 @@ class WC_Admin_Attributes { -

+

diff --git a/includes/admin/class-wc-admin-dashboard.php b/includes/admin/class-wc-admin-dashboard.php index 8971390317a..6cd4c03415c 100644 --- a/includes/admin/class-wc-admin-dashboard.php +++ b/includes/admin/class-wc-admin-dashboard.php @@ -34,10 +34,10 @@ class WC_Admin_Dashboard { */ public function init() { if ( current_user_can( 'publish_shop_orders' ) ) { - wp_add_dashboard_widget( 'woocommerce_dashboard_recent_reviews', __( 'WooCommerce Recent Reviews', 'woocommerce' ), array( $this, 'recent_reviews' ) ); + wp_add_dashboard_widget( 'woocommerce_dashboard_recent_reviews', __( 'WooCommerce recent reviews', 'woocommerce' ), array( $this, 'recent_reviews' ) ); } - wp_add_dashboard_widget( 'woocommerce_dashboard_status', __( 'WooCommerce Status', 'woocommerce' ), array( $this, 'status_widget' ) ); + wp_add_dashboard_widget( 'woocommerce_dashboard_status', __( 'WooCommerce status', 'woocommerce' ), array( $this, 'status_widget' ) ); } /** diff --git a/includes/admin/class-wc-admin-help.php b/includes/admin/class-wc-admin-help.php index e9723884774..ae8e67d009a 100644 --- a/includes/admin/class-wc-admin-help.php +++ b/includes/admin/class-wc-admin-help.php @@ -38,47 +38,47 @@ class WC_Admin_Help { $video_map = array( 'wc-settings' => array( - 'title' => __( 'General Settings', 'woocommerce' ), + 'title' => __( 'General settings', 'woocommerce' ), 'url' => '//fast.wistia.net/embed/iframe/mz2l10u5f6?videoFoam=true', ), 'wc-settings-general' => array( - 'title' => __( 'General Settings', 'woocommerce' ), + 'title' => __( 'General settings', 'woocommerce' ), 'url' => '//fast.wistia.net/embed/iframe/mz2l10u5f6?videoFoam=true', ), 'wc-settings-products' => array( - 'title' => __( 'Product Settings', 'woocommerce' ), + 'title' => __( 'Product settings', 'woocommerce' ), 'url' => '//fast.wistia.net/embed/iframe/lolkan4fxf?videoFoam=true', ), 'wc-settings-tax' => array( - 'title' => __( 'Tax Settings', 'woocommerce' ), + 'title' => __( 'Tax settings', 'woocommerce' ), 'url' => '//fast.wistia.net/embed/iframe/qp1v19dwrh?videoFoam=true', ), 'wc-settings-shipping' => array( - 'title' => __( 'Shipping Zones', 'woocommerce' ), + 'title' => __( 'Shipping zones', 'woocommerce' ), 'url' => '//fast.wistia.net/embed/iframe/95yiocro6p?videoFoam=true', ), 'wc-settings-shipping-options' => array( - 'title' => __( 'Shipping Options', 'woocommerce' ), + 'title' => __( 'Shipping options', 'woocommerce' ), 'url' => '//fast.wistia.net/embed/iframe/9c9008dxnr?videoFoam=true', ), 'wc-settings-shipping-classes' => array( - 'title' => __( 'Shipping Classes', 'woocommerce' ), + 'title' => __( 'Shipping classes', 'woocommerce' ), 'url' => '//fast.wistia.net/embed/iframe/tpqg17aq99?videoFoam=true', ), 'wc-settings-checkout' => array( - 'title' => __( 'Checkout Settings', 'woocommerce' ), + 'title' => __( 'Checkout settings', 'woocommerce' ), 'url' => '//fast.wistia.net/embed/iframe/65yjv96z51?videoFoam=true', ), 'wc-settings-checkout-bacs' => array( - 'title' => __( 'Bank Transfer (BACS) Payments', 'woocommerce' ), + 'title' => __( 'Bank transfer (BACS) payments', 'woocommerce' ), 'url' => '//fast.wistia.net/embed/iframe/dh4piy3sek?videoFoam=true', ), 'wc-settings-checkout-cheque' => array( - 'title' => __( 'Check Payments', 'woocommerce' ), + 'title' => __( 'Check payments', 'woocommerce' ), 'url' => '//fast.wistia.net/embed/iframe/u2m2kcakea?videoFoam=true', ), 'wc-settings-checkout-cod' => array( - 'title' => __( 'Cash on Delivery', 'woocommerce' ), + 'title' => __( 'Cash on delivery', 'woocommerce' ), 'url' => '//fast.wistia.net/embed/iframe/8hyli8wu5f?videoFoam=true', ), 'wc-settings-checkout-paypal' => array( @@ -98,35 +98,35 @@ class WC_Admin_Help { 'url' => '//fast.wistia.net/embed/iframe/jdfzjiiw61?videoFoam=true', ), 'wc-settings-account' => array( - 'title' => __( 'Account Settings', 'woocommerce' ), + 'title' => __( 'Account settings', 'woocommerce' ), 'url' => '//fast.wistia.net/embed/iframe/35mazq7il2?videoFoam=true', ), 'wc-settings-email' => array( - 'title' => __( 'Email Settings', 'woocommerce' ), + 'title' => __( 'Email settings', 'woocommerce' ), 'url' => '//fast.wistia.net/embed/iframe/svcaftq4xv?videoFoam=true', ), 'wc-settings-api' => array( - 'title' => __( 'Webhook Settings', 'woocommerce' ), + 'title' => __( 'Webhook settings', 'woocommerce' ), 'url' => '//fast.wistia.net/embed/iframe/1q0ny74vvq?videoFoam=true', ), 'product' => array( - 'title' => __( 'Simple Products', 'woocommerce' ), + 'title' => __( 'Simple products', 'woocommerce' ), 'url' => '//fast.wistia.net/embed/iframe/ziyjmd4kut?videoFoam=true', ), 'edit-product_cat' => array( - 'title' => __( 'Product Categories', 'woocommerce' ), + 'title' => __( 'Product categories', 'woocommerce' ), 'url' => '//fast.wistia.net/embed/iframe/f0j5gzqigg?videoFoam=true', ), 'edit-product_tag' => array( - 'title' => __( 'Product Categories, Tags, Shipping Classes, & Attributes', 'woocommerce' ), + 'title' => __( 'Product categories, tags, shipping classes, and attributes', 'woocommerce' ), 'url' => '//fast.wistia.net/embed/iframe/f0j5gzqigg?videoFoam=true', ), 'product_attributes' => array( - 'title' => __( 'Product Categories, Tags, Shipping Classes, & Attributes', 'woocommerce' ), + 'title' => __( 'Product categories, tags, shipping classes, and attributes', 'woocommerce' ), 'url' => '//fast.wistia.net/embed/iframe/f0j5gzqigg?videoFoam=true', ), 'wc-status' => array( - 'title' => __( 'System Status', 'woocommerce' ), + 'title' => __( 'System status', 'woocommerce' ), 'url' => '//fast.wistia.net/embed/iframe/xdn733nnhi?videoFoam=true', ), 'wc-reports' => array( @@ -142,11 +142,11 @@ class WC_Admin_Help { 'url' => '//fast.wistia.net/embed/iframe/gupd4h8sit?videoFoam=true', ), 'edit-shop_order' => array( - 'title' => __( 'Managing Orders', 'woocommerce' ), + 'title' => __( 'Managing orders', 'woocommerce' ), 'url' => '//fast.wistia.net/embed/iframe/n8n0sa8hee?videoFoam=true', ), 'shop_order' => array( - 'title' => __( 'Managing Orders', 'woocommerce' ), + 'title' => __( 'Managing orders', 'woocommerce' ), 'url' => '//fast.wistia.net/embed/iframe/n8n0sa8hee?videoFoam=true', ), ); @@ -194,7 +194,7 @@ class WC_Admin_Help { '' ) . '

' . '

' . __( 'Before asking for help we recommend checking the system status page to identify any problems with your configuration.', 'woocommerce' ) . '

' . - '

' . __( 'System Status', 'woocommerce' ) . ' ' . __( 'Community Forum', 'woocommerce' ) . ' ' . __( 'WooCommerce Helpdesk', 'woocommerce' ) . '

', + '

' . __( 'System status', 'woocommerce' ) . ' ' . __( 'Community forum', 'woocommerce' ) . ' ' . __( 'WooCommerce helpdesk', 'woocommerce' ) . '

', ) ); $screen->add_help_tab( array( @@ -203,7 +203,7 @@ class WC_Admin_Help { 'content' => '

' . __( 'Found a bug?', 'woocommerce' ) . '

' . '

' . sprintf( __( 'If you find a bug within WooCommerce core you can create a ticket via Github issues. Ensure you read the contribution guide prior to submitting your report. To help us solve your issue, please be as descriptive as possible and include your system status report.', 'woocommerce' ), 'https://github.com/woocommerce/woocommerce/issues?state=open', 'https://github.com/woocommerce/woocommerce/blob/master/.github/CONTRIBUTING.md', admin_url( 'admin.php?page=wc-status' ) ) . '

' . - '

' . __( 'Report a bug', 'woocommerce' ) . ' ' . __( 'System Status', 'woocommerce' ) . '

', + '

' . __( 'Report a bug', 'woocommerce' ) . ' ' . __( 'System status', 'woocommerce' ) . '

', ) ); @@ -213,26 +213,26 @@ class WC_Admin_Help { 'content' => '

' . __( 'Education', 'woocommerce' ) . '

' . '

' . __( 'If you would like to learn about using WooCommerce from an expert, consider following a WooCommerce course offered by one of our educational partners.', 'woocommerce' ) . '

' . - '

' . __( 'View Education Partners', 'woocommerce' ) . '

', + '

' . __( 'View education partners', 'woocommerce' ) . '

', ) ); $screen->add_help_tab( array( 'id' => 'woocommerce_onboard_tab', - 'title' => __( 'Setup Wizard', 'woocommerce' ), + 'title' => __( 'Setup wizard', 'woocommerce' ), 'content' => - '

' . __( 'Setup Wizard', 'woocommerce' ) . '

' . + '

' . __( 'Setup wizard', 'woocommerce' ) . '

' . '

' . __( 'If you need to access the setup wizard again, please click on the button below.', 'woocommerce' ) . '

' . - '

' . __( 'Setup Wizard', 'woocommerce' ) . '

', + '

' . __( 'Setup wizard', 'woocommerce' ) . '

', ) ); $screen->set_help_sidebar( '

' . __( 'For more information:', 'woocommerce' ) . '

' . '

' . __( 'About WooCommerce', 'woocommerce' ) . '

' . - '

' . __( 'WordPress.org Project', 'woocommerce' ) . '

' . - '

' . __( 'Github Project', 'woocommerce' ) . '

' . - '

' . __( 'Official Themes', 'woocommerce' ) . '

' . - '

' . __( 'Official Extensions', 'woocommerce' ) . '

' + '

' . __( 'WordPress.org project', 'woocommerce' ) . '

' . + '

' . __( 'Github project', 'woocommerce' ) . '

' . + '

' . __( 'Official themes', 'woocommerce' ) . '

' . + '

' . __( 'Official extensions', 'woocommerce' ) . '

' ); } } diff --git a/includes/admin/class-wc-admin-importers.php b/includes/admin/class-wc-admin-importers.php index 5f5fb0bff91..7b6ac91cd71 100644 --- a/includes/admin/class-wc-admin-importers.php +++ b/includes/admin/class-wc-admin-importers.php @@ -31,7 +31,7 @@ class WC_Admin_Importers { * Add menu items. */ public function register_importers() { - register_importer( 'woocommerce_tax_rate_csv', __( 'WooCommerce Tax Rates (CSV)', 'woocommerce' ), __( 'Import tax rates to your store via a csv file.', 'woocommerce' ), array( $this, 'tax_rates_importer' ) ); + register_importer( 'woocommerce_tax_rate_csv', __( 'WooCommerce tax rates (CSV)', 'woocommerce' ), __( 'Import tax rates to your store via a csv file.', 'woocommerce' ), array( $this, 'tax_rates_importer' ) ); } /** diff --git a/includes/admin/class-wc-admin-menus.php b/includes/admin/class-wc-admin-menus.php index e196d221c17..5f74ae85608 100644 --- a/includes/admin/class-wc-admin-menus.php +++ b/includes/admin/class-wc-admin-menus.php @@ -69,7 +69,7 @@ class WC_Admin_Menus { if ( current_user_can( 'manage_woocommerce' ) ) { add_submenu_page( 'woocommerce', __( 'Reports', 'woocommerce' ), __( 'Reports', 'woocommerce' ) , 'view_woocommerce_reports', 'wc-reports', array( $this, 'reports_page' ) ); } else { - add_menu_page( __( 'Sales Reports', 'woocommerce' ), __( 'Sales Reports', 'woocommerce' ) , 'view_woocommerce_reports', 'wc-reports', array( $this, 'reports_page' ), null, '55.6' ); + add_menu_page( __( 'Sales reports', 'woocommerce' ), __( 'Sales reports', 'woocommerce' ) , 'view_woocommerce_reports', 'wc-reports', array( $this, 'reports_page' ), null, '55.6' ); } } @@ -77,7 +77,7 @@ class WC_Admin_Menus { * Add menu item. */ public function settings_menu() { - $settings_page = add_submenu_page( 'woocommerce', __( 'WooCommerce Settings', 'woocommerce' ), __( 'Settings', 'woocommerce' ) , 'manage_woocommerce', 'wc-settings', array( $this, 'settings_page' ) ); + $settings_page = add_submenu_page( 'woocommerce', __( 'WooCommerce settings', 'woocommerce' ), __( 'Settings', 'woocommerce' ) , 'manage_woocommerce', 'wc-settings', array( $this, 'settings_page' ) ); add_action( 'load-' . $settings_page, array( $this, 'settings_page_init' ) ); } @@ -94,14 +94,14 @@ class WC_Admin_Menus { * Add menu item. */ public function status_menu() { - add_submenu_page( 'woocommerce', __( 'WooCommerce Status', 'woocommerce' ), __( 'System Status', 'woocommerce' ) , 'manage_woocommerce', 'wc-status', array( $this, 'status_page' ) ); + add_submenu_page( 'woocommerce', __( 'WooCommerce status', 'woocommerce' ), __( 'System status', 'woocommerce' ) , 'manage_woocommerce', 'wc-status', array( $this, 'status_page' ) ); } /** * Addons menu item. */ public function addons_menu() { - add_submenu_page( 'woocommerce', __( 'WooCommerce Extensions', 'woocommerce' ), __( 'Extensions', 'woocommerce' ) , 'manage_woocommerce', 'wc-addons', array( $this, 'addons_page' ) ); + add_submenu_page( 'woocommerce', __( 'WooCommerce extensions', 'woocommerce' ), __( 'Extensions', 'woocommerce' ) , 'manage_woocommerce', 'wc-addons', array( $this, 'addons_page' ) ); } /** @@ -231,7 +231,7 @@ class WC_Admin_Menus { * Adapted from http://www.johnmorrisonline.com/how-to-add-a-fully-functional-custom-meta-box-to-wordpress-navigation-menus/. */ public function add_nav_menu_meta_boxes() { - add_meta_box( 'woocommerce_endpoints_nav_link', __( 'WooCommerce Endpoints', 'woocommerce' ), array( $this, 'nav_menu_links' ), 'nav-menus', 'side', 'low' ); + add_meta_box( 'woocommerce_endpoints_nav_link', __( 'WooCommerce endpoints', 'woocommerce' ), array( $this, 'nav_menu_links' ), 'nav-menus', 'side', 'low' ); } /** @@ -267,10 +267,10 @@ class WC_Admin_Menus {

- + - +

@@ -303,7 +303,7 @@ class WC_Admin_Menus { $wp_admin_bar->add_node( array( 'parent' => 'site-name', 'id' => 'view-store', - 'title' => __( 'Visit Store', 'woocommerce' ), + 'title' => __( 'Visit store', 'woocommerce' ), 'href' => wc_get_page_permalink( 'shop' ), ) ); } diff --git a/includes/admin/class-wc-admin-meta-boxes.php b/includes/admin/class-wc-admin-meta-boxes.php index d78ed71c77e..2a8556bbd19 100644 --- a/includes/admin/class-wc-admin-meta-boxes.php +++ b/includes/admin/class-wc-admin-meta-boxes.php @@ -110,22 +110,22 @@ class WC_Admin_Meta_Boxes { */ public function add_meta_boxes() { // Products - add_meta_box( 'postexcerpt', __( 'Product Short Description', 'woocommerce' ), 'WC_Meta_Box_Product_Short_Description::output', 'product', 'normal' ); - add_meta_box( 'woocommerce-product-data', __( 'Product Data', 'woocommerce' ), 'WC_Meta_Box_Product_Data::output', 'product', 'normal', 'high' ); - add_meta_box( 'woocommerce-product-images', __( 'Product Gallery', 'woocommerce' ), 'WC_Meta_Box_Product_Images::output', 'product', 'side', 'low' ); + add_meta_box( 'postexcerpt', __( 'Product short description', 'woocommerce' ), 'WC_Meta_Box_Product_Short_Description::output', 'product', 'normal' ); + add_meta_box( 'woocommerce-product-data', __( 'Product data', 'woocommerce' ), 'WC_Meta_Box_Product_Data::output', 'product', 'normal', 'high' ); + add_meta_box( 'woocommerce-product-images', __( 'Product gallery', 'woocommerce' ), 'WC_Meta_Box_Product_Images::output', 'product', 'side', 'low' ); // Orders foreach ( wc_get_order_types( 'order-meta-boxes' ) as $type ) { $order_type_object = get_post_type_object( $type ); - add_meta_box( 'woocommerce-order-data', sprintf( __( '%s Data', 'woocommerce' ), $order_type_object->labels->singular_name ), 'WC_Meta_Box_Order_Data::output', $type, 'normal', 'high' ); + add_meta_box( 'woocommerce-order-data', sprintf( __( '%s data', 'woocommerce' ), $order_type_object->labels->singular_name ), 'WC_Meta_Box_Order_Data::output', $type, 'normal', 'high' ); add_meta_box( 'woocommerce-order-items', __( 'Items', 'woocommerce' ), 'WC_Meta_Box_Order_Items::output', $type, 'normal', 'high' ); - add_meta_box( 'woocommerce-order-notes', sprintf( __( '%s Notes', 'woocommerce' ), $order_type_object->labels->singular_name ), 'WC_Meta_Box_Order_Notes::output', $type, 'side', 'default' ); - add_meta_box( 'woocommerce-order-downloads', __( 'Downloadable Product Permissions', 'woocommerce' ) . wc_help_tip( __( 'Note: Permissions for order items will automatically be granted when the order status changes to processing/completed.', 'woocommerce' ) ), 'WC_Meta_Box_Order_Downloads::output', $type, 'normal', 'default' ); - add_meta_box( 'woocommerce-order-actions', sprintf( __( '%s Actions', 'woocommerce' ), $order_type_object->labels->singular_name ), 'WC_Meta_Box_Order_Actions::output', $type, 'side', 'high' ); + add_meta_box( 'woocommerce-order-notes', sprintf( __( '%s notes', 'woocommerce' ), $order_type_object->labels->singular_name ), 'WC_Meta_Box_Order_Notes::output', $type, 'side', 'default' ); + add_meta_box( 'woocommerce-order-downloads', __( 'Downloadable product permissions', 'woocommerce' ) . wc_help_tip( __( 'Note: Permissions for order items will automatically be granted when the order status changes to processing/completed.', 'woocommerce' ) ), 'WC_Meta_Box_Order_Downloads::output', $type, 'normal', 'default' ); + add_meta_box( 'woocommerce-order-actions', sprintf( __( '%s actions', 'woocommerce' ), $order_type_object->labels->singular_name ), 'WC_Meta_Box_Order_Actions::output', $type, 'side', 'high' ); } // Coupons - add_meta_box( 'woocommerce-coupon-data', __( 'Coupon Data', 'woocommerce' ), 'WC_Meta_Box_Coupon_Data::output', 'shop_coupon', 'normal', 'high' ); + add_meta_box( 'woocommerce-coupon-data', __( 'Coupon data', 'woocommerce' ), 'WC_Meta_Box_Coupon_Data::output', 'shop_coupon', 'normal', 'high' ); } /** diff --git a/includes/admin/class-wc-admin-permalink-settings.php b/includes/admin/class-wc-admin-permalink-settings.php index 682a77132e5..61a6e7287b1 100644 --- a/includes/admin/class-wc-admin-permalink-settings.php +++ b/includes/admin/class-wc-admin-permalink-settings.php @@ -33,7 +33,7 @@ class WC_Admin_Permalink_Settings { */ public function settings_init() { // Add a section to the permalinks page - add_settings_section( 'woocommerce-permalink', __( 'Product Permalinks', 'woocommerce' ), array( $this, 'settings' ), 'permalink' ); + add_settings_section( 'woocommerce-permalink', __( 'Product permalinks', 'woocommerce' ), array( $this, 'settings' ), 'permalink' ); // Add our settings add_settings_field( @@ -127,7 +127,7 @@ class WC_Admin_Permalink_Settings { + must
be set or WordPress will use default instead.', 'woocommerce' ); ?> diff --git a/includes/admin/class-wc-admin-pointers.php b/includes/admin/class-wc-admin-pointers.php index b045e4fe631..c207a8f4c54 100644 --- a/includes/admin/class-wc-admin-pointers.php +++ b/includes/admin/class-wc-admin-pointers.php @@ -57,7 +57,7 @@ class WC_Admin_Pointers { 'event' => 'input', ), 'options' => array( - 'content' => '

' . esc_html__( 'Product Name', 'woocommerce' ) . '

' . + 'content' => '

' . esc_html__( 'Product name', 'woocommerce' ) . '

' . '

' . esc_html__( 'Give your new product a name here. This is a required field and will be what your customers will see in your store.', 'woocommerce' ) . '

', 'position' => array( 'edge' => 'top', @@ -70,7 +70,7 @@ class WC_Admin_Pointers { 'next' => 'product-type', 'next_trigger' => array(), 'options' => array( - 'content' => '

' . esc_html__( 'Product Description', 'woocommerce' ) . '

' . + 'content' => '

' . esc_html__( 'Product description', 'woocommerce' ) . '

' . '

' . esc_html__( 'This is your products main body of content. Here you should describe your product in detail.', 'woocommerce' ) . '

', 'position' => array( 'edge' => 'bottom', @@ -86,7 +86,7 @@ class WC_Admin_Pointers { 'event' => 'change blur click', ), 'options' => array( - 'content' => '

' . esc_html__( 'Choose Product Type', 'woocommerce' ) . '

' . + 'content' => '

' . esc_html__( 'Choose product type', 'woocommerce' ) . '

' . '

' . esc_html__( 'Choose a type for this product. Simple is suitable for most physical goods and services (we recommend setting up a simple product for now).', 'woocommerce' ) . '

' . '

' . esc_html__( 'Variable is for more complex products such as t-shirts with multiple sizes.', 'woocommerce' ) . '

' . '

' . esc_html__( 'Grouped products are for grouping several simple products into one.', 'woocommerce' ) . '

' . @@ -105,7 +105,7 @@ class WC_Admin_Pointers { 'event' => 'change', ), 'options' => array( - 'content' => '

' . esc_html__( 'Virtual Products', 'woocommerce' ) . '

' . + 'content' => '

' . esc_html__( 'Virtual products', 'woocommerce' ) . '

' . '

' . esc_html__( 'Check the "Virtual" box if this is a non-physical item, for example a service, which does not need shipping.', 'woocommerce' ) . '

', 'position' => array( 'edge' => 'bottom', @@ -121,7 +121,7 @@ class WC_Admin_Pointers { 'event' => 'change', ), 'options' => array( - 'content' => '

' . esc_html__( 'Downloadable Products', 'woocommerce' ) . '

' . + 'content' => '

' . esc_html__( 'Downloadable products', 'woocommerce' ) . '

' . '

' . esc_html__( 'If purchasing this product gives a customer access to a downloadable file, e.g. software, check this box.', 'woocommerce' ) . '

', 'position' => array( 'edge' => 'bottom', @@ -153,7 +153,7 @@ class WC_Admin_Pointers { 'event' => 'input', ), 'options' => array( - 'content' => '

' . esc_html__( 'Product Short Description', 'woocommerce' ) . '

' . + 'content' => '

' . esc_html__( 'Product short description', 'woocommerce' ) . '

' . '

' . esc_html__( 'Add a quick summary for your product here. This will appear on the product page under the product name.', 'woocommerce' ) . '

', 'position' => array( 'edge' => 'bottom', @@ -165,7 +165,7 @@ class WC_Admin_Pointers { 'target' => "#postimagediv", 'next' => 'product_tag', 'options' => array( - 'content' => '

' . esc_html__( 'Product Images', 'woocommerce' ) . '

' . + 'content' => '

' . esc_html__( 'Product images', 'woocommerce' ) . '

' . '

' . esc_html__( 'Upload or assign an image to your product here. This image will be shown in your store\'s catalog.', 'woocommerce' ) . '

', 'position' => array( 'edge' => 'right', @@ -177,7 +177,7 @@ class WC_Admin_Pointers { 'target' => "#tagsdiv-product_tag", 'next' => 'product_catdiv', 'options' => array( - 'content' => '

' . esc_html__( 'Product Tags', 'woocommerce' ) . '

' . + 'content' => '

' . esc_html__( 'Product tags', 'woocommerce' ) . '

' . '

' . esc_html__( 'You can optionally "tag" your products here. Tags as a method of labeling your products to make them easier for customers to find.', 'woocommerce' ) . '

', 'position' => array( 'edge' => 'right', @@ -189,7 +189,7 @@ class WC_Admin_Pointers { 'target' => "#product_catdiv", 'next' => 'submitdiv', 'options' => array( - 'content' => '

' . esc_html__( 'Product Categories', 'woocommerce' ) . '

' . + 'content' => '

' . esc_html__( 'Product categories', 'woocommerce' ) . '

' . '

' . esc_html__( 'Optionally assign categories to your products to make them easier to browse through and find in your store.', 'woocommerce' ) . '

', 'position' => array( 'edge' => 'right', @@ -201,7 +201,7 @@ class WC_Admin_Pointers { 'target' => "#submitdiv", 'next' => '', 'options' => array( - 'content' => '

' . esc_html__( 'Publish Your Product!', 'woocommerce' ) . '

' . + 'content' => '

' . esc_html__( 'Publish your product!', 'woocommerce' ) . '

' . '

' . esc_html__( 'When you are finished editing your product, hit the "Publish" button to publish your product to your store.', 'woocommerce' ) . '

', 'position' => array( 'edge' => 'right', diff --git a/includes/admin/class-wc-admin-post-types.php b/includes/admin/class-wc-admin-post-types.php index 899e2032737..a0158502ed4 100644 --- a/includes/admin/class-wc-admin-post-types.php +++ b/includes/admin/class-wc-admin-post-types.php @@ -135,10 +135,10 @@ class WC_Admin_Post_Types { 5 => isset( $_GET['revision'] ) ? sprintf( __( 'Product restored to revision from %s', 'woocommerce' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false, 6 => sprintf( __( 'Product published. View Product', 'woocommerce' ), esc_url( get_permalink( $post_ID ) ) ), 7 => __( 'Product saved.', 'woocommerce' ), - 8 => sprintf( __( 'Product submitted. Preview Product', 'woocommerce' ), esc_url( add_query_arg( 'preview', 'true', get_permalink( $post_ID ) ) ) ), - 9 => sprintf( __( 'Product scheduled for: %1$s. Preview Product', 'woocommerce' ), + 8 => sprintf( __( 'Product submitted. Preview product', 'woocommerce' ), esc_url( add_query_arg( 'preview', 'true', get_permalink( $post_ID ) ) ) ), + 9 => sprintf( __( 'Product scheduled for: %1$s. Preview product', 'woocommerce' ), date_i18n( __( 'M j, Y @ G:i', 'woocommerce' ), strtotime( $post->post_date ) ), esc_url( get_permalink( $post_ID ) ) ), - 10 => sprintf( __( 'Product draft updated. Preview Product', 'woocommerce' ), esc_url( add_query_arg( 'preview', 'true', get_permalink( $post_ID ) ) ) ), + 10 => sprintf( __( 'Product draft updated. Preview product', 'woocommerce' ), esc_url( add_query_arg( 'preview', 'true', get_permalink( $post_ID ) ) ) ), ); $messages['shop_order'] = array( @@ -278,8 +278,8 @@ class WC_Admin_Post_Types { $columns['order_items'] = __( 'Purchased', 'woocommerce' ); $columns['billing_address'] = __( 'Billing', 'woocommerce' ); $columns['shipping_address'] = __( 'Ship to', 'woocommerce' ); - $columns['customer_message'] = '' . esc_attr__( 'Customer Message', 'woocommerce' ) . ''; - $columns['order_notes'] = '' . esc_attr__( 'Order Notes', 'woocommerce' ) . ''; + $columns['customer_message'] = '' . esc_attr__( 'Customer message', 'woocommerce' ) . ''; + $columns['order_notes'] = '' . esc_attr__( 'Order notes', 'woocommerce' ) . ''; $columns['order_date'] = __( 'Date', 'woocommerce' ); $columns['order_total'] = __( 'Total', 'woocommerce' ); $columns['order_actions'] = __( 'Actions', 'woocommerce' ); @@ -457,7 +457,7 @@ class WC_Admin_Post_Types { } if ( 'trash' == $post->post_status || ! EMPTY_TRASH_DAYS ) { - $actions['delete'] = '' . __( 'Delete Permanently', 'woocommerce' ) . ''; + $actions['delete'] = '' . __( 'Delete permanently', 'woocommerce' ) . ''; } } if ( $post_type_object->public ) { @@ -584,7 +584,7 @@ class WC_Admin_Post_Types { } if ( 'trash' == $post->post_status || ! EMPTY_TRASH_DAYS ) { - $actions['delete'] = "" . __( 'Delete Permanently', 'woocommerce' ) . ""; + $actions['delete'] = "" . __( 'Delete permanently', 'woocommerce' ) . ""; } } @@ -939,7 +939,7 @@ class WC_Admin_Post_Types { $query_string = remove_query_arg( array( 'orderby', 'order' ) ); $query_string = add_query_arg( 'orderby', urlencode( 'menu_order title' ), $query_string ); $query_string = add_query_arg( 'order', urlencode( 'ASC' ), $query_string ); - $views['byorder'] = '' . __( 'Sort Products', 'woocommerce' ) . ''; + $views['byorder'] = '' . __( 'Sort products', 'woocommerce' ) . ''; return $views; } @@ -2127,7 +2127,7 @@ class WC_Admin_Post_Types { echo '

' . __( 'Enable this option to feature this product.', 'woocommerce' ) . '

'; - echo '
'; + echo '
'; ?>

diff --git a/includes/admin/class-wc-admin-profile.php b/includes/admin/class-wc-admin-profile.php index 85ea1e0828d..1e56ba2d06e 100644 --- a/includes/admin/class-wc-admin-profile.php +++ b/includes/admin/class-wc-admin-profile.php @@ -38,14 +38,14 @@ class WC_Admin_Profile { public function get_customer_meta_fields() { $show_fields = apply_filters('woocommerce_customer_meta_fields', array( 'billing' => array( - 'title' => __( 'Customer Billing Address', 'woocommerce' ), + 'title' => __( 'Customer billing address', 'woocommerce' ), 'fields' => array( 'billing_first_name' => array( - 'label' => __( 'First Name', 'woocommerce' ), + 'label' => __( 'First name', 'woocommerce' ), 'description' => '', ), 'billing_last_name' => array( - 'label' => __( 'Last Name', 'woocommerce' ), + 'label' => __( 'Last name', 'woocommerce' ), 'description' => '', ), 'billing_company' => array( @@ -85,20 +85,20 @@ class WC_Admin_Profile { 'description' => '', ), 'billing_email' => array( - 'label' => __( 'Email Address', 'woocommerce' ), + 'label' => __( 'Email address', 'woocommerce' ), 'description' => '', ), ), ), 'shipping' => array( - 'title' => __( 'Customer Shipping Address', 'woocommerce' ), + 'title' => __( 'Customer shipping address', 'woocommerce' ), 'fields' => array( 'shipping_first_name' => array( - 'label' => __( 'First Name', 'woocommerce' ), + 'label' => __( 'First name', 'woocommerce' ), 'description' => '', ), 'shipping_last_name' => array( - 'label' => __( 'Last Name', 'woocommerce' ), + 'label' => __( 'Last name', 'woocommerce' ), 'description' => '', ), 'shipping_company' => array( diff --git a/includes/admin/class-wc-admin-reports.php b/includes/admin/class-wc-admin-reports.php index e0f5cd9c7bb..d5bbaa04b0e 100644 --- a/includes/admin/class-wc-admin-reports.php +++ b/includes/admin/class-wc-admin-reports.php @@ -74,13 +74,13 @@ class WC_Admin_Reports { 'title' => __( 'Customers', 'woocommerce' ), 'reports' => array( "customers" => array( - 'title' => __( 'Customers vs. Guests', 'woocommerce' ), + 'title' => __( 'Customers vs. guests', 'woocommerce' ), 'description' => '', 'hide_title' => true, 'callback' => array( __CLASS__, 'get_report' ), ), "customer_list" => array( - 'title' => __( 'Customer List', 'woocommerce' ), + 'title' => __( 'Customer list', 'woocommerce' ), 'description' => '', 'hide_title' => true, 'callback' => array( __CLASS__, 'get_report' ), diff --git a/includes/admin/class-wc-admin-settings.php b/includes/admin/class-wc-admin-settings.php index ef1ad3e9b79..d887fbb5011 100644 --- a/includes/admin/class-wc-admin-settings.php +++ b/includes/admin/class-wc-admin-settings.php @@ -520,7 +520,7 @@ class WC_Admin_Settings { id="-width" type="text" size="3" value="" /> × id="-height" type="text" size="3" value="" />px - + -
+
'', ), 'pages' => array( - 'name' => __( 'Page Setup', 'woocommerce' ), + 'name' => __( 'Page setup', 'woocommerce' ), 'view' => array( $this, 'wc_setup_pages' ), 'handler' => array( $this, 'wc_setup_pages_save' ), ), 'locale' => array( - 'name' => __( 'Store Locale', 'woocommerce' ), + 'name' => __( 'Store locale', 'woocommerce' ), 'view' => array( $this, 'wc_setup_locale' ), 'handler' => array( $this, 'wc_setup_locale_save' ), ), 'shipping_taxes' => array( - 'name' => __( 'Shipping & Tax', 'woocommerce' ), + 'name' => __( 'Shipping & tax', 'woocommerce' ), 'view' => array( $this, 'wc_setup_shipping_taxes' ), 'handler' => array( $this, 'wc_setup_shipping_taxes_save' ), ), @@ -206,7 +206,7 @@ class WC_Admin_Setup_Wizard {

It’s completely optional and shouldn’t take longer than five minutes.', 'woocommerce' ); ?>

- +

-

+

', '' ); ?>

- + @@ -243,7 +243,7 @@ class WC_Admin_Setup_Wizard { - + @@ -291,7 +291,7 @@ class WC_Admin_Setup_Wizard { $dimension_unit = get_option( 'woocommerce_dimension_unit', 'cm' ); $weight_unit = get_option( 'woocommerce_weight_unit', 'kg' ); ?> -

+

@@ -317,7 +317,7 @@ class WC_Admin_Setup_Wizard { - + - + - + - + @@ -411,7 +411,7 @@ class WC_Admin_Setup_Wizard { */ public function wc_setup_shipping_taxes() { ?> -

+

@@ -599,19 +599,19 @@ class WC_Admin_Setup_Wizard { ), ), 'cheque' => array( - 'name' => _x( 'Check Payments', 'Check payment method', 'woocommerce' ), + 'name' => _x( 'Check payments', 'Check payment method', 'woocommerce' ), 'description' => __( 'A simple offline gateway that lets you accept a check as method of payment.', 'woocommerce' ), 'image' => '', 'class' => '', ), 'bacs' => array( - 'name' => __( 'Bank Transfer (BACS) Payments', 'woocommerce' ), + 'name' => __( 'Bank transfer (BACS) payments', 'woocommerce' ), 'description' => __( 'A simple offline gateway that lets you accept BACS payment.', 'woocommerce' ), 'image' => '', 'class' => '', ), 'cod' => array( - 'name' => __( 'Cash on Delivery', 'woocommerce' ), + 'name' => __( 'Cash on delivery', 'woocommerce' ), 'description' => __( 'A simple offline gateway that lets you accept cash on delivery.', 'woocommerce' ), 'image' => '', 'class' => '', @@ -748,7 +748,7 @@ class WC_Admin_Setup_Wizard { -

+

@@ -762,13 +762,13 @@ class WC_Admin_Setup_Wizard {
-

+

-

+

  • diff --git a/includes/admin/class-wc-admin-webhooks-table-list.php b/includes/admin/class-wc-admin-webhooks-table-list.php index d6ae77c0c89..e2015f91ee2 100644 --- a/includes/admin/class-wc-admin-webhooks-table-list.php +++ b/includes/admin/class-wc-admin-webhooks-table-list.php @@ -106,7 +106,7 @@ class WC_Admin_Webhooks_Table_List extends WP_List_Table { $actions['trash'] = '' . __( 'Trash', 'woocommerce' ) . ''; } if ( 'trash' == $post_status || ! EMPTY_TRASH_DAYS ) { - $actions['delete'] = '' . __( 'Delete Permanently', 'woocommerce' ) . ''; + $actions['delete'] = '' . __( 'Delete permanently', 'woocommerce' ) . ''; } } @@ -244,12 +244,12 @@ class WC_Admin_Webhooks_Table_List extends WP_List_Table { if ( isset( $_GET['status'] ) && 'trash' == $_GET['status'] ) { return array( 'untrash' => __( 'Restore', 'woocommerce' ), - 'delete' => __( 'Delete Permanently', 'woocommerce' ), + 'delete' => __( 'Delete permanently', 'woocommerce' ), ); } return array( - 'trash' => __( 'Move to Trash', 'woocommerce' ), + 'trash' => __( 'Move to trash', 'woocommerce' ), ); } @@ -260,7 +260,7 @@ class WC_Admin_Webhooks_Table_List extends WP_List_Table { */ protected function extra_tablenav( $which ) { if ( 'top' == $which && isset( $_GET['status'] ) && 'trash' == $_GET['status'] && current_user_can( 'delete_shop_webhooks' ) ) { - echo ''; + echo ''; } } diff --git a/includes/admin/class-wc-admin-webhooks.php b/includes/admin/class-wc-admin-webhooks.php index 33194072cae..2a633fbf5f5 100644 --- a/includes/admin/class-wc-admin-webhooks.php +++ b/includes/admin/class-wc-admin-webhooks.php @@ -407,7 +407,7 @@ class WC_Admin_Webhooks { * Table list output. */ private static function table_list_output() { - echo '

    ' . __( 'Webhooks', 'woocommerce' ) . ' ' . __( 'Add Webhook', 'woocommerce' ) . '

    '; + echo '

    ' . __( 'Webhooks', 'woocommerce' ) . ' ' . __( 'Add webhook', 'woocommerce' ) . '

    '; $webhooks_table_list = new WC_Admin_Webhooks_Table_List(); $webhooks_table_list->prepare_items(); @@ -417,7 +417,7 @@ class WC_Admin_Webhooks { echo ''; $webhooks_table_list->views(); - $webhooks_table_list->search_box( __( 'Search Webhooks', 'woocommerce' ), 'webhook' ); + $webhooks_table_list->search_box( __( 'Search webhooks', 'woocommerce' ), 'webhook' ); $webhooks_table_list->display(); } diff --git a/includes/admin/class-wc-admin.php b/includes/admin/class-wc-admin.php index 80162227937..63f162257eb 100644 --- a/includes/admin/class-wc-admin.php +++ b/includes/admin/class-wc-admin.php @@ -179,7 +179,7 @@ class WC_Admin { $mailer = WC()->mailer(); // get the preview email subject - $email_heading = __( 'HTML Email Template', 'woocommerce' ); + $email_heading = __( 'HTML email template', 'woocommerce' ); // get the preview email content ob_start(); diff --git a/includes/admin/importers/class-wc-tax-rate-importer.php b/includes/admin/importers/class-wc-tax-rate-importer.php index f636537da1c..98de59649a8 100644 --- a/includes/admin/importers/class-wc-tax-rate-importer.php +++ b/includes/admin/importers/class-wc-tax-rate-importer.php @@ -174,7 +174,7 @@ class WC_Tax_Rate_Importer extends WP_Importer { * Performs post-import cleanup of files and the cache. */ public function import_end() { - echo '

    ' . __( 'All done!', 'woocommerce' ) . ' ' . __( 'View Tax Rates', 'woocommerce' ) . '' . '

    '; + echo '

    ' . __( 'All done!', 'woocommerce' ) . ' ' . __( 'View tax rates', 'woocommerce' ) . '' . '

    '; do_action( 'import_end' ); } @@ -210,7 +210,7 @@ class WC_Tax_Rate_Importer extends WP_Importer { */ public function header() { echo '

    '; - echo '

    ' . __( 'Import Tax Rates', 'woocommerce' ) . '

    '; + echo '

    ' . __( 'Import tax rates', 'woocommerce' ) . '

    '; } /** diff --git a/includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php b/includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php index 45324230e11..2e32b5e612b 100644 --- a/includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php +++ b/includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php @@ -45,12 +45,12 @@ class WC_Meta_Box_Coupon_Data { 'class' => 'general_coupon_data', ), 'usage_restriction' => array( - 'label' => __( 'Usage Restriction', 'woocommerce' ), + 'label' => __( 'Usage restriction', 'woocommerce' ), 'target' => 'usage_restriction_coupon_data', 'class' => '', ), 'usage_limit' => array( - 'label' => __( 'Usage Limits', 'woocommerce' ), + 'label' => __( 'Usage limits', 'woocommerce' ), 'target' => 'usage_limit_coupon_data', 'class' => '', ), diff --git a/includes/admin/meta-boxes/class-wc-meta-box-order-actions.php b/includes/admin/meta-boxes/class-wc-meta-box-order-actions.php index 690cd72e641..90ba6b71ec1 100644 --- a/includes/admin/meta-boxes/class-wc-meta-box-order-actions.php +++ b/includes/admin/meta-boxes/class-wc-meta-box-order-actions.php @@ -73,15 +73,15 @@ class WC_Meta_Box_Order_Actions { if ( current_user_can( 'delete_post', $post->ID ) ) { if ( ! EMPTY_TRASH_DAYS ) { - $delete_text = __( 'Delete Permanently', 'woocommerce' ); + $delete_text = __( 'Delete permanently', 'woocommerce' ); } else { - $delete_text = __( 'Move to Trash', 'woocommerce' ); + $delete_text = __( 'Move to trash', 'woocommerce' ); } ?>
    - + ID ); ?> diff --git a/includes/admin/meta-boxes/class-wc-meta-box-order-data.php b/includes/admin/meta-boxes/class-wc-meta-box-order-data.php index 84ed69001f8..89a5510c8ae 100644 --- a/includes/admin/meta-boxes/class-wc-meta-box-order-data.php +++ b/includes/admin/meta-boxes/class-wc-meta-box-order-data.php @@ -40,11 +40,11 @@ class WC_Meta_Box_Order_Data { self::$billing_fields = apply_filters( 'woocommerce_admin_billing_fields', array( 'first_name' => array( - 'label' => __( 'First Name', 'woocommerce' ), + 'label' => __( 'First name', 'woocommerce' ), 'show' => false, ), 'last_name' => array( - 'label' => __( 'Last Name', 'woocommerce' ), + 'label' => __( 'Last name', 'woocommerce' ), 'show' => false, ), 'company' => array( @@ -80,7 +80,7 @@ class WC_Meta_Box_Order_Data { 'show' => false, ), 'email' => array( - 'label' => __( 'Email Address', 'woocommerce' ), + 'label' => __( 'Email address', 'woocommerce' ), ), 'phone' => array( 'label' => __( 'Phone', 'woocommerce' ), @@ -89,11 +89,11 @@ class WC_Meta_Box_Order_Data { self::$shipping_fields = apply_filters( 'woocommerce_admin_shipping_fields', array( 'first_name' => array( - 'label' => __( 'First Name', 'woocommerce' ), + 'label' => __( 'First name', 'woocommerce' ), 'show' => false, ), 'last_name' => array( - 'label' => __( 'Last Name', 'woocommerce' ), + 'label' => __( 'Last name', 'woocommerce' ), 'show' => false, ), 'company' => array( @@ -246,7 +246,7 @@ class WC_Meta_Box_Order_Data {

- +

@@ -295,7 +295,7 @@ class WC_Meta_Box_Order_Data { } ?>

- +

- +

diff --git a/includes/admin/meta-boxes/class-wc-meta-box-product-data.php b/includes/admin/meta-boxes/class-wc-meta-box-product-data.php index 9eff165e7f7..896e316d749 100644 --- a/includes/admin/meta-boxes/class-wc-meta-box-product-data.php +++ b/includes/admin/meta-boxes/class-wc-meta-box-product-data.php @@ -37,7 +37,7 @@ class WC_Meta_Box_Product_Data { $product_type = apply_filters( 'default_product_type', 'simple' ); } - $type_box = '
- + - + diff --git a/includes/admin/meta-boxes/views/html-product-variation-download.php b/includes/admin/meta-boxes/views/html-product-variation-download.php index acabc71e175..18cb2de00b9 100644 --- a/includes/admin/meta-boxes/views/html-product-variation-download.php +++ b/includes/admin/meta-boxes/views/html-product-variation-download.php @@ -1,5 +1,5 @@ - + diff --git a/includes/admin/meta-boxes/views/html-variation-admin.php b/includes/admin/meta-boxes/views/html-variation-admin.php index bba8fefa710..a1e2e8daab9 100644 --- a/includes/admin/meta-boxes/views/html-variation-admin.php +++ b/includes/admin/meta-boxes/views/html-variation-admin.php @@ -284,7 +284,7 @@ extract( $variation_data ); ob_start(); include( 'html-product-variation-download.php' ); echo esc_attr( ob_get_clean() ); - ?>"> + ?>"> diff --git a/includes/admin/reports/class-wc-report-coupon-usage.php b/includes/admin/reports/class-wc-report-coupon-usage.php index d039571db97..6af31b992b7 100644 --- a/includes/admin/reports/class-wc-report-coupon-usage.php +++ b/includes/admin/reports/class-wc-report-coupon-usage.php @@ -126,9 +126,9 @@ class WC_Report_Coupon_Usage extends WC_Admin_Report { $ranges = array( 'year' => __( 'Year', 'woocommerce' ), - 'last_month' => __( 'Last Month', 'woocommerce' ), - 'month' => __( 'This Month', 'woocommerce' ), - '7day' => __( 'Last 7 Days', 'woocommerce' ), + 'last_month' => __( 'Last month', 'woocommerce' ), + 'month' => __( 'This month', 'woocommerce' ), + '7day' => __( 'Last 7 days', 'woocommerce' ), ); $this->chart_colours = array( @@ -217,7 +217,7 @@ class WC_Report_Coupon_Usage extends WC_Admin_Report { -

+

:: is_editable() ) : ?>
@@ -218,8 +218,8 @@ if ( wc_tax_enabled() ) { do_action( 'woocommerce_order_item_add_action_buttons', $order ); ?> is_editable() ) : ?> - - + +

@@ -269,7 +269,7 @@ if ( wc_tax_enabled() ) { ' . wc_price( 0, array( 'currency' => $order->get_currency() ) ) . ''; $gateway_supports_refunds = false !== $payment_gateway && $payment_gateway->supports( 'refunds' ); - $gateway_name = false !== $payment_gateway ? ( ! empty( $payment_gateway->method_title ) ? $payment_gateway->method_title : $payment_gateway->get_title() ) : __( 'Payment Gateway', 'woocommerce' ); + $gateway_name = false !== $payment_gateway ? ( ! empty( $payment_gateway->method_title ) ? $payment_gateway->method_title : $payment_gateway->get_title() ) : __( 'Payment gateway', 'woocommerce' ); ?> diff --git a/includes/admin/meta-boxes/views/html-order-shipping.php b/includes/admin/meta-boxes/views/html-order-shipping.php index 85947e499ab..905fe7372c1 100644 --- a/includes/admin/meta-boxes/views/html-order-shipping.php +++ b/includes/admin/meta-boxes/views/html-order-shipping.php @@ -18,9 +18,9 @@ if ( ! defined( 'ABSPATH' ) ) {
" name="_wc_file_urls[]" value="" />
" name="_wc_variation_file_urls[][]" value="" />
-

+

__( 'Email', 'woocommerce' ), 'location' => __( 'Location', 'woocommerce' ), 'orders' => __( 'Orders', 'woocommerce' ), - 'spent' => __( 'Money Spent', 'woocommerce' ), + 'spent' => __( 'Money spent', 'woocommerce' ), 'last_order' => __( 'Last order', 'woocommerce' ), 'user_actions' => __( 'Actions', 'woocommerce' ), ); diff --git a/includes/admin/reports/class-wc-report-customers.php b/includes/admin/reports/class-wc-report-customers.php index 46a4ac0b958..95989798419 100644 --- a/includes/admin/reports/class-wc-report-customers.php +++ b/includes/admin/reports/class-wc-report-customers.php @@ -105,8 +105,8 @@ class WC_Report_Customers extends WC_Admin_Report {
    -
  • -
  • +
  • +
@@ -49,7 +49,7 @@ if ( ! defined( 'ABSPATH' ) ) {
- +
diff --git a/includes/admin/settings/views/html-admin-page-shipping-zone-methods.php b/includes/admin/settings/views/html-admin-page-shipping-zone-methods.php index 2c440a7af8a..a684d13aa85 100644 --- a/includes/admin/settings/views/html-admin-page-shipping-zone-methods.php +++ b/includes/admin/settings/views/html-admin-page-shipping-zone-methods.php @@ -5,7 +5,7 @@ if ( ! defined( 'ABSPATH' ) ) { ?>

- > + > get_zone_name() ); ?>

@@ -16,16 +16,16 @@ if ( ! defined( 'ABSPATH' ) ) { get_zone_id() ) : ?>
- + - + @@ -58,9 +58,9 @@ if ( ! defined( 'ABSPATH' ) ) {

    -
  • -
  • -
  • +
  • +
  • +

diff --git a/includes/admin/settings/views/html-keys-edit.php b/includes/admin/settings/views/html-keys-edit.php index 5ea4804c55d..0ff534e897d 100644 --- a/includes/admin/settings/views/html-keys-edit.php +++ b/includes/admin/settings/views/html-keys-edit.php @@ -5,7 +5,7 @@ if ( ! defined( 'ABSPATH' ) ) { ?>
-

+

@@ -59,7 +59,7 @@ if ( ! defined( 'ABSPATH' ) ) {
- + - +
- + @@ -60,7 +60,7 @@ if ( ! defined( 'ABSPATH' ) ) {
- + diff --git a/includes/admin/settings/views/html-admin-page-shipping-zones-instance.php b/includes/admin/settings/views/html-admin-page-shipping-zones-instance.php index 571471c4dce..fdb8c6ad637 100644 --- a/includes/admin/settings/views/html-admin-page-shipping-zones-instance.php +++ b/includes/admin/settings/views/html-admin-page-shipping-zones-instance.php @@ -4,7 +4,7 @@ if ( ! defined( 'ABSPATH' ) ) { } ?>

- > + > get_zone_name() ); ?> > get_method_title() ); ?>

diff --git a/includes/admin/settings/views/html-admin-page-shipping-zones.php b/includes/admin/settings/views/html-admin-page-shipping-zones.php index 2c74ee8558b..faf96560df3 100644 --- a/includes/admin/settings/views/html-admin-page-shipping-zones.php +++ b/includes/admin/settings/views/html-admin-page-shipping-zones.php @@ -5,7 +5,7 @@ if ( ! defined( 'ABSPATH' ) ) { ?>

- +

@@ -13,9 +13,9 @@ if ( ! defined( 'ABSPATH' ) ) {
- + @@ -67,7 +67,7 @@ if ( ! defined( 'ABSPATH' ) ) {
- +

- +

- + @@ -115,7 +115,7 @@ if ( ! defined( 'ABSPATH' ) ) {
- + diff --git a/includes/admin/settings/views/html-settings-tax.php b/includes/admin/settings/views/html-settings-tax.php index 45310278bb6..6e2122c59a9 100644 --- a/includes/admin/settings/views/html-settings-tax.php +++ b/includes/admin/settings/views/html-settings-tax.php @@ -10,17 +10,17 @@ if ( ! defined( 'ABSPATH' ) ) {
-

+

- - + + - + @@ -85,7 +85,7 @@ if ( ! defined( 'ABSPATH' ) ) { @@ -105,7 +105,7 @@ if ( ! defined( 'ABSPATH' ) ) { - + " aria-describedby="table-paging">', '{{ data.qty_pages }}' ); ?> diff --git a/includes/admin/settings/views/html-webhooks-edit.php b/includes/admin/settings/views/html-webhooks-edit.php index a03ce25d37f..f4a351f3847 100644 --- a/includes/admin/settings/views/html-webhooks-edit.php +++ b/includes/admin/settings/views/html-webhooks-edit.php @@ -7,7 +7,7 @@ if ( ! defined( 'ABSPATH' ) ) {
-

+

                  
@@ -52,18 +52,18 @@ if ( ! defined( 'ABSPATH' ) ) { $topics = apply_filters( 'woocommerce_webhook_topics', array( '' => __( 'Select an option…', 'woocommerce' ), - 'coupon.created' => __( 'Coupon Created', 'woocommerce' ), - 'coupon.updated' => __( 'Coupon Updated', 'woocommerce' ), - 'coupon.deleted' => __( 'Coupon Deleted', 'woocommerce' ), - 'customer.created' => __( 'Customer Created', 'woocommerce' ), - 'customer.updated' => __( 'Customer Updated', 'woocommerce' ), - 'customer.deleted' => __( 'Customer Deleted', 'woocommerce' ), - 'order.created' => __( 'Order Created', 'woocommerce' ), - 'order.updated' => __( 'Order Updated', 'woocommerce' ), - 'order.deleted' => __( 'Order Deleted', 'woocommerce' ), - 'product.created' => __( 'Product Created', 'woocommerce' ), - 'product.updated' => __( 'Product Updated', 'woocommerce' ), - 'product.deleted' => __( 'Product Deleted', 'woocommerce' ), + 'coupon.created' => __( 'Coupon created', 'woocommerce' ), + 'coupon.updated' => __( 'Coupon updated', 'woocommerce' ), + 'coupon.deleted' => __( 'Coupon deleted', 'woocommerce' ), + 'customer.created' => __( 'Customer created', 'woocommerce' ), + 'customer.updated' => __( 'Customer updated', 'woocommerce' ), + 'customer.deleted' => __( 'Customer deleted', 'woocommerce' ), + 'order.created' => __( 'Order created', 'woocommerce' ), + 'order.updated' => __( 'Order updated', 'woocommerce' ), + 'order.deleted' => __( 'Order deleted', 'woocommerce' ), + 'product.created' => __( 'Product created', 'woocommerce' ), + 'product.updated' => __( 'Product updated', 'woocommerce' ), + 'product.deleted' => __( 'Product deleted', 'woocommerce' ), 'action' => __( 'Action', 'woocommerce' ), 'custom' => __( 'Custom', 'woocommerce' ), ) ); @@ -76,8 +76,8 @@ if ( ! defined( 'ABSPATH' ) ) {
- - + + @@ -85,8 +85,8 @@ if ( ! defined( 'ABSPATH' ) ) {
- - + + @@ -104,7 +104,7 @@ if ( ! defined( 'ABSPATH' ) ) {
- + @@ -117,7 +117,7 @@ if ( ! defined( 'ABSPATH' ) ) {
-

+

post_data->post_modified_gmt ) : ?> @@ -152,9 +152,9 @@ if ( ! defined( 'ABSPATH' ) ) { @@ -164,7 +164,7 @@ if ( ! defined( 'ABSPATH' ) ) {
-

+

diff --git a/includes/admin/settings/views/settings-tax.php b/includes/admin/settings/views/settings-tax.php index 81894b2990f..6681cdf7553 100644 --- a/includes/admin/settings/views/settings-tax.php +++ b/includes/admin/settings/views/settings-tax.php @@ -6,10 +6,10 @@ if ( ! defined( 'ABSPATH' ) ) { return apply_filters( 'woocommerce_tax_settings', array( - array( 'title' => __( 'Tax Options', 'woocommerce' ), 'type' => 'title','desc' => '', 'id' => 'tax_options' ), + array( 'title' => __( 'Tax options', 'woocommerce' ), 'type' => 'title','desc' => '', 'id' => 'tax_options' ), array( - 'title' => __( 'Prices Entered With Tax', 'woocommerce' ), + 'title' => __( 'Prices entered with tax', 'woocommerce' ), 'id' => 'woocommerce_prices_include_tax', 'default' => 'no', 'type' => 'radio', @@ -21,7 +21,7 @@ return apply_filters( 'woocommerce_tax_settings', array( ), array( - 'title' => __( 'Calculate Tax Based On', 'woocommerce' ), + 'title' => __( 'Calculate tax based on', 'woocommerce' ), 'id' => 'woocommerce_tax_based_on', 'desc_tip' => __( 'This option determines which address is used to calculate tax.', 'woocommerce' ), 'default' => 'shipping', @@ -35,7 +35,7 @@ return apply_filters( 'woocommerce_tax_settings', array( ), array( - 'title' => __( 'Shipping Tax Class', 'woocommerce' ), + 'title' => __( 'Shipping tax class', 'woocommerce' ), 'desc' => __( 'Optionally control which tax class shipping gets, or leave it so shipping tax is based on the cart items themselves.', 'woocommerce' ), 'id' => 'woocommerce_shipping_tax_class', 'css' => 'min-width:150px;', @@ -55,16 +55,16 @@ return apply_filters( 'woocommerce_tax_settings', array( ), array( - 'title' => __( 'Additional Tax Classes', 'woocommerce' ), - 'desc_tip' => __( 'List additional tax classes below (1 per line). This is in addition to the default "Standard Rate".', 'woocommerce' ), + 'title' => __( 'Additional tax classes', 'woocommerce' ), + 'desc_tip' => __( 'List additional tax classes below (1 per line). This is in addition to the default "Standard rate".', 'woocommerce' ), 'id' => 'woocommerce_tax_classes', 'css' => 'width:100%; height: 65px;', 'type' => 'textarea', - 'default' => sprintf( __( 'Reduced Rate%sZero Rate', 'woocommerce' ), PHP_EOL ), + 'default' => sprintf( __( 'Reduced rate%sZero rate', 'woocommerce' ), PHP_EOL ), ), array( - 'title' => __( 'Display Prices in the Shop', 'woocommerce' ), + 'title' => __( 'Display prices in the shop', 'woocommerce' ), 'id' => 'woocommerce_tax_display_shop', 'default' => 'excl', 'type' => 'select', @@ -76,7 +76,7 @@ return apply_filters( 'woocommerce_tax_settings', array( ), array( - 'title' => __( 'Display Prices During Cart and Checkout', 'woocommerce' ), + 'title' => __( 'Display prices during cart and checkout', 'woocommerce' ), 'id' => 'woocommerce_tax_display_cart', 'default' => 'excl', 'type' => 'select', @@ -89,7 +89,7 @@ return apply_filters( 'woocommerce_tax_settings', array( ), array( - 'title' => __( 'Price Display Suffix', 'woocommerce' ), + 'title' => __( 'Price display suffix', 'woocommerce' ), 'id' => 'woocommerce_price_display_suffix', 'default' => '', 'placeholder' => __( 'N/A', 'woocommerce' ), @@ -98,7 +98,7 @@ return apply_filters( 'woocommerce_tax_settings', array( ), array( - 'title' => __( 'Display Tax Totals', 'woocommerce' ), + 'title' => __( 'Display tax totals', 'woocommerce' ), 'id' => 'woocommerce_tax_total_display', 'default' => 'itemized', 'type' => 'select', diff --git a/includes/admin/views/html-admin-page-addons.php b/includes/admin/views/html-admin-page-addons.php index b1a6dd81d39..77c6049ac53 100644 --- a/includes/admin/views/html-admin-page-addons.php +++ b/includes/admin/views/html-admin-page-addons.php @@ -13,7 +13,7 @@ if ( ! defined( 'ABSPATH' ) ) {

- +

    diff --git a/includes/admin/views/html-admin-page-status-logs.php b/includes/admin/views/html-admin-page-status-logs.php index e25616e68a6..f16e64ac95d 100644 --- a/includes/admin/views/html-admin-page-status-logs.php +++ b/includes/admin/views/html-admin-page-status-logs.php @@ -14,7 +14,7 @@ if ( ! defined( 'ABSPATH' ) ) {

    - +

diff --git a/includes/admin/views/html-admin-page-status-report.php b/includes/admin/views/html-admin-page-status-report.php index 220368da68a..31525390dc7 100644 --- a/includes/admin/views/html-admin-page-status-report.php +++ b/includes/admin/views/html-admin-page-status-report.php @@ -18,18 +18,18 @@ $pages = $system_status->get_pages(); ?>

-

-

+

+

-

+

- + id ) ) : ?> - +

- + @@ -44,12 +44,12 @@ $pages = $system_status->get_pages(); - + - + - + - + - + - + - +

::
:: get_pages(); ?>
::
:: ' : '–'; ?>
:: get_pages(); ?>
:: @@ -92,7 +92,7 @@ $pages = $system_status->get_pages();
:: @@ -112,17 +112,17 @@ $pages = $system_status->get_pages(); - + - + - + - + - + - + - + - + @@ -166,12 +166,12 @@ $pages = $system_status->get_pages(); } if ( ! empty( $wpdb->is_mysql ) && ! stristr( $ver, 'MariaDB' ) ) : ?> - + - + - + - + - + - + - - + + - + - +

::
:: get_pages();
::
::
::
::
:: ' : '–'; ?>
:: ' . sprintf( __( '%1$s - We recommend a minimum MySQL version of 5.6. See: %2$s', 'woocommerce' ), esc_html( $environment['mysql_version'] ), '' . __( 'WordPress Requirements', 'woocommerce' ) . '' ) . ''; + echo ' ' . sprintf( __( '%1$s - We recommend a minimum MySQL version of 5.6. See: %2$s', 'woocommerce' ), esc_html( $environment['mysql_version'] ), '' . __( 'WordPress requirements', 'woocommerce' ) . '' ) . ''; } else { echo '' . esc_html( $environment['mysql_version'] ) . ''; } @@ -180,12 +180,12 @@ $pages = $system_status->get_pages();
::
:: get_pages();
:: get_pages();
:: get_pages();
:: get_pages();
::
  20 ) { @@ -312,7 +312,7 @@ $pages = $system_status->get_pages(); if ( $settings['geolocation_enabled'] ) { ?>
:: get_pages(); - + @@ -376,7 +376,7 @@ $pages = $system_status->get_pages(); - + @@ -391,27 +391,27 @@ $pages = $system_status->get_pages(); - + - + - + - + -

()

()

:: ' : ''; ?>
()
+ get_pages(); - + @@ -499,7 +499,7 @@ $pages = $system_status->get_pages(); - + - + - + - + - + - + @@ -593,7 +593,7 @@ $pages = $system_status->get_pages(); if ( true === $theme['has_outdated_templates'] ) { ?> - + diff --git a/includes/admin/views/html-admin-page-status.php b/includes/admin/views/html-admin-page-status.php index c703494cab3..63ec0a37b01 100644 --- a/includes/admin/views/html-admin-page-status.php +++ b/includes/admin/views/html-admin-page-status.php @@ -9,7 +9,7 @@ if ( ! defined( 'ABSPATH' ) ) { $current_tab = ! empty( $_REQUEST['tab'] ) ? sanitize_title( $_REQUEST['tab'] ) : 'status'; $tabs = array( - 'status' => __( 'System Status', 'woocommerce' ), + 'status' => __( 'System status', 'woocommerce' ), 'tools' => __( 'Tools', 'woocommerce' ), 'logs' => __( 'Logs', 'woocommerce' ), ); diff --git a/includes/admin/views/html-bulk-edit-product.php b/includes/admin/views/html-bulk-edit-product.php index 900e9b067cd..7c8bc276cd2 100644 --- a/includes/admin/views/html-bulk-edit-product.php +++ b/includes/admin/views/html-bulk-edit-product.php @@ -12,7 +12,7 @@ if ( ! defined( 'ABSPATH' ) ) {
-

+

@@ -23,7 +23,7 @@ if ( ! defined( 'ABSPATH' ) ) { __( '— No Change —', 'woocommerce' ), + '' => __( '— No change —', 'woocommerce' ), '1' => __( 'Change to:', 'woocommerce' ), '2' => __( 'Increase by (fixed amount or %):', 'woocommerce' ), '3' => __( 'Decrease by (fixed amount or %):', 'woocommerce' ), @@ -67,12 +67,12 @@ if ( ! defined( 'ABSPATH' ) ) {
@@ -278,7 +278,7 @@ if ( ! defined( 'ABSPATH' ) ) { __( '— No Change —', 'woocommerce' ), + '' => __( '— No change —', 'woocommerce' ), 'yes' => __( 'Yes', 'woocommerce' ), 'no' => __( 'No', 'woocommerce' ), ); diff --git a/includes/admin/views/html-notice-install.php b/includes/admin/views/html-notice-install.php index 16c569931a6..0f735cc1e72 100644 --- a/includes/admin/views/html-notice-install.php +++ b/includes/admin/views/html-notice-install.php @@ -10,5 +10,5 @@ if ( ! defined( 'ABSPATH' ) ) { ?>

Welcome to WooCommerce – You‘re almost ready to start selling :)', 'woocommerce' ); ?>

-

+

diff --git a/includes/admin/views/html-notice-legacy-shipping.php b/includes/admin/views/html-notice-legacy-shipping.php index f99bda57069..6e4d88f3350 100644 --- a/includes/admin/views/html-notice-legacy-shipping.php +++ b/includes/admin/views/html-notice-legacy-shipping.php @@ -10,8 +10,8 @@ if ( ! defined( 'ABSPATH' ) ) {
-

-

They will be removed in future versions of WooCommerce. We recommend disabling these and setting up new rates within shipping zones as soon as possible.', 'woocommerce' ); ?>

+

+

They will be removed in future versions of WooCommerce. We recommend disabling these and setting up new rates within shipping zones as soon as possible.', 'woocommerce' ); ?>

diff --git a/includes/admin/views/html-notice-no-shipping-methods.php b/includes/admin/views/html-notice-no-shipping-methods.php index 2169c2bc5f7..e879c3ffea7 100644 --- a/includes/admin/views/html-notice-no-shipping-methods.php +++ b/includes/admin/views/html-notice-no-shipping-methods.php @@ -10,7 +10,7 @@ if ( ! defined( 'ABSPATH' ) ) {

-

+

diff --git a/includes/admin/views/html-notice-template-check.php b/includes/admin/views/html-notice-template-check.php index 1d55257659c..8e8c1638b45 100644 --- a/includes/admin/views/html-notice-template-check.php +++ b/includes/admin/views/html-notice-template-check.php @@ -13,5 +13,5 @@ $theme = wp_get_theme();

Your theme (%1$s) contains outdated copies of some WooCommerce template files. These files may need updating to ensure they are compatible with the current version of WooCommerce. You can see which files are affected from the %2$ssystem status page%3$s. If in doubt, check with the author of the theme.', 'woocommerce' ), esc_html( $theme['Name'] ), '', '' ); ?>

-

+

diff --git a/includes/admin/views/html-notice-theme-support.php b/includes/admin/views/html-notice-theme-support.php index c43192daf48..4c7ec2cf7df 100644 --- a/includes/admin/views/html-notice-theme-support.php +++ b/includes/admin/views/html-notice-theme-support.php @@ -13,7 +13,7 @@ if ( ! defined( 'ABSPATH' ) ) {

Your theme does not declare WooCommerce support – Please read our %1$sintegration%2$s guide or check out our %3$sStorefront%4$s theme which is totally free to download and designed specifically for use with WooCommerce.', 'woocommerce' ), '', '', '', '' ); ?>

- - + +

diff --git a/includes/admin/views/html-notice-update.php b/includes/admin/views/html-notice-update.php index c4da264694f..3044a9a385a 100644 --- a/includes/admin/views/html-notice-update.php +++ b/includes/admin/views/html-notice-update.php @@ -9,7 +9,7 @@ if ( ! defined( 'ABSPATH' ) ) { ?>
-

+

- ' . __( 'Cancel order & restore cart', 'woocommerce' ) . ' + ' . __( 'Cancel order & restore cart', 'woocommerce' ) . ' '; } diff --git a/includes/libraries/wp-background-process.php b/includes/libraries/wp-background-process.php index a0a3fd06f3f..3b7e76f0f04 100755 --- a/includes/libraries/wp-background-process.php +++ b/includes/libraries/wp-background-process.php @@ -420,7 +420,7 @@ if ( ! class_exists( 'WP_Background_Process' ) ) { // Adds every 5 minutes to the existing schedules. $schedules[ $this->identifier . '_cron_interval' ] = array( 'interval' => MINUTE_IN_SECONDS * $interval, - 'display' => sprintf( __( 'Every %d Minutes', 'woocommerce' ), $interval ), + 'display' => sprintf( __( 'Every %d minutes', 'woocommerce' ), $interval ), ); return $schedules; diff --git a/includes/shipping/flat-rate/class-wc-shipping-flat-rate.php b/includes/shipping/flat-rate/class-wc-shipping-flat-rate.php index 02836335d03..5df0db791ff 100644 --- a/includes/shipping/flat-rate/class-wc-shipping-flat-rate.php +++ b/includes/shipping/flat-rate/class-wc-shipping-flat-rate.php @@ -22,7 +22,7 @@ class WC_Shipping_Flat_Rate extends WC_Shipping_Method { public function __construct( $instance_id = 0 ) { $this->id = 'flat_rate'; $this->instance_id = absint( $instance_id ); - $this->method_title = __( 'Flat Rate', 'woocommerce' ); + $this->method_title = __( 'Flat rate', 'woocommerce' ); $this->method_description = __( 'Lets you charge a fixed rate for shipping.', 'woocommerce' ); $this->supports = array( 'shipping-zones', diff --git a/includes/shipping/flat-rate/includes/settings-flat-rate.php b/includes/shipping/flat-rate/includes/settings-flat-rate.php index 1970c279679..769192a606e 100644 --- a/includes/shipping/flat-rate/includes/settings-flat-rate.php +++ b/includes/shipping/flat-rate/includes/settings-flat-rate.php @@ -11,14 +11,14 @@ $cost_desc = __( 'Enter a cost (excl. tax) or sum, e.g. 10.00 * [qty] array( - 'title' => __( 'Method Title', 'woocommerce' ), + 'title' => __( 'Method title', 'woocommerce' ), 'type' => 'text', 'description' => __( 'This controls the title which the user sees during checkout.', 'woocommerce' ), - 'default' => __( 'Flat Rate', 'woocommerce' ), + 'default' => __( 'Flat rate', 'woocommerce' ), 'desc_tip' => true, ), 'tax_status' => array( - 'title' => __( 'Tax Status', 'woocommerce' ), + 'title' => __( 'Tax status', 'woocommerce' ), 'type' => 'select', 'class' => 'wc-enhanced-select', 'default' => 'taxable', @@ -41,7 +41,7 @@ $shipping_classes = WC()->shipping->get_shipping_classes(); if ( ! empty( $shipping_classes ) ) { $settings['class_costs'] = array( - 'title' => __( 'Shipping Class Costs', 'woocommerce' ), + 'title' => __( 'Shipping class costs', 'woocommerce' ), 'type' => 'title', 'default' => '', 'description' => sprintf( __( 'These costs can optionally be added based on the %1$sproduct shipping class%2$s.', 'woocommerce' ), '', '' ), @@ -51,7 +51,7 @@ if ( ! empty( $shipping_classes ) ) { continue; } $settings[ 'class_cost_' . $shipping_class->term_id ] = array( - 'title' => sprintf( __( '"%s" Shipping Class Cost', 'woocommerce' ), esc_html( $shipping_class->name ) ), + 'title' => sprintf( __( '"%s" shipping class cost', 'woocommerce' ), esc_html( $shipping_class->name ) ), 'type' => 'text', 'placeholder' => __( 'N/A', 'woocommerce' ), 'description' => $cost_desc, @@ -60,7 +60,7 @@ if ( ! empty( $shipping_classes ) ) { ); } $settings['no_class_cost'] = array( - 'title' => __( 'No Shipping Class Cost', 'woocommerce' ), + 'title' => __( 'No shipping class cost', 'woocommerce' ), 'type' => 'text', 'placeholder' => __( 'N/A', 'woocommerce' ), 'description' => $cost_desc, @@ -68,13 +68,13 @@ if ( ! empty( $shipping_classes ) ) { 'desc_tip' => true, ); $settings['type'] = array( - 'title' => __( 'Calculation Type', 'woocommerce' ), + 'title' => __( 'Calculation type', 'woocommerce' ), 'type' => 'select', 'class' => 'wc-enhanced-select', 'default' => 'class', 'options' => array( - 'class' => __( 'Per Class: Charge shipping for each shipping class individually', 'woocommerce' ), - 'order' => __( 'Per Order: Charge shipping for the most expensive shipping class', 'woocommerce' ), + 'class' => __( 'Per class: Charge shipping for each shipping class individually', 'woocommerce' ), + 'order' => __( 'Per order: Charge shipping for the most expensive shipping class', 'woocommerce' ), ), ); } diff --git a/includes/shipping/free-shipping/class-wc-shipping-free-shipping.php b/includes/shipping/free-shipping/class-wc-shipping-free-shipping.php index 79394783f58..a595d908fef 100644 --- a/includes/shipping/free-shipping/class-wc-shipping-free-shipping.php +++ b/includes/shipping/free-shipping/class-wc-shipping-free-shipping.php @@ -37,8 +37,8 @@ class WC_Shipping_Free_Shipping extends WC_Shipping_Method { public function __construct( $instance_id = 0 ) { $this->id = 'free_shipping'; $this->instance_id = absint( $instance_id ); - $this->method_title = __( 'Free Shipping', 'woocommerce' ); - $this->method_description = __( 'Free Shipping is a special method which can be triggered with coupons and minimum spends.', 'woocommerce' ); + $this->method_title = __( 'Free shipping', 'woocommerce' ); + $this->method_description = __( 'Free shipping is a special method which can be triggered with coupons and minimum spends.', 'woocommerce' ); $this->supports = array( 'shipping-zones', 'instance-settings', @@ -78,7 +78,7 @@ class WC_Shipping_Free_Shipping extends WC_Shipping_Method { 'desc_tip' => true, ), 'requires' => array( - 'title' => __( 'Free Shipping Requires...', 'woocommerce' ), + 'title' => __( 'Free shipping requires...', 'woocommerce' ), 'type' => 'select', 'class' => 'wc-enhanced-select', 'default' => '', @@ -91,7 +91,7 @@ class WC_Shipping_Free_Shipping extends WC_Shipping_Method { ), ), 'min_amount' => array( - 'title' => __( 'Minimum Order Amount', 'woocommerce' ), + 'title' => __( 'Minimum order amount', 'woocommerce' ), 'type' => 'price', 'placeholder' => wc_format_localized_price( 0 ), 'description' => __( 'Users will need to spend this amount to get free shipping (if enabled above).', 'woocommerce' ), diff --git a/includes/shipping/legacy-flat-rate/class-wc-shipping-legacy-flat-rate.php b/includes/shipping/legacy-flat-rate/class-wc-shipping-legacy-flat-rate.php index d3b4de50127..dbc40deb9ba 100644 --- a/includes/shipping/legacy-flat-rate/class-wc-shipping-legacy-flat-rate.php +++ b/includes/shipping/legacy-flat-rate/class-wc-shipping-legacy-flat-rate.php @@ -23,8 +23,8 @@ class WC_Shipping_Legacy_Flat_Rate extends WC_Shipping_Method { */ public function __construct() { $this->id = 'legacy_flat_rate'; - $this->method_title = __( 'Flat Rate (Legacy)', 'woocommerce' ); - $this->method_description = sprintf( __( 'This method is deprecated in 2.6.0 and will be removed in future versions - we recommend disabling it and instead setting up a new rate within your Shipping Zones.', 'woocommerce' ), admin_url( 'admin.php?page=wc-settings&tab=shipping' ) ); + $this->method_title = __( 'Flat rate (legacy)', 'woocommerce' ); + $this->method_description = sprintf( __( 'This method is deprecated in 2.6.0 and will be removed in future versions - we recommend disabling it and instead setting up a new rate within your Shipping zones.', 'woocommerce' ), admin_url( 'admin.php?page=wc-settings&tab=shipping' ) ); $this->init(); add_action( 'woocommerce_update_options_shipping_' . $this->id, array( $this, 'process_admin_options' ) ); diff --git a/includes/shipping/legacy-flat-rate/includes/settings-flat-rate.php b/includes/shipping/legacy-flat-rate/includes/settings-flat-rate.php index ce2029624bc..66ed9102cc0 100644 --- a/includes/shipping/legacy-flat-rate/includes/settings-flat-rate.php +++ b/includes/shipping/legacy-flat-rate/includes/settings-flat-rate.php @@ -17,10 +17,10 @@ $settings = array( 'default' => 'no', ), 'title' => array( - 'title' => __( 'Method Title', 'woocommerce' ), + 'title' => __( 'Method title', 'woocommerce' ), 'type' => 'text', 'description' => __( 'This controls the title which the user sees during checkout.', 'woocommerce' ), - 'default' => __( 'Flat Rate', 'woocommerce' ), + 'default' => __( 'Flat rate', 'woocommerce' ), 'desc_tip' => true, ), 'availability' => array( @@ -34,7 +34,7 @@ $settings = array( ), ), 'countries' => array( - 'title' => __( 'Specific Countries', 'woocommerce' ), + 'title' => __( 'Specific countries', 'woocommerce' ), 'type' => 'multiselect', 'class' => 'wc-enhanced-select', 'css' => 'width: 450px;', @@ -45,7 +45,7 @@ $settings = array( ), ), 'tax_status' => array( - 'title' => __( 'Tax Status', 'woocommerce' ), + 'title' => __( 'Tax status', 'woocommerce' ), 'type' => 'select', 'class' => 'wc-enhanced-select', 'default' => 'taxable', @@ -68,7 +68,7 @@ $shipping_classes = WC()->shipping->get_shipping_classes(); if ( ! empty( $shipping_classes ) ) { $settings['class_costs'] = array( - 'title' => __( 'Shipping Class Costs', 'woocommerce' ), + 'title' => __( 'Shipping class costs', 'woocommerce' ), 'type' => 'title', 'default' => '', 'description' => sprintf( __( 'These costs can optionally be added based on the %1$sproduct shipping class%2$s.', 'woocommerce' ), '', '' ), @@ -78,7 +78,7 @@ if ( ! empty( $shipping_classes ) ) { continue; } $settings[ 'class_cost_' . $shipping_class->term_id ] = array( - 'title' => sprintf( __( '"%s" Shipping Class Cost', 'woocommerce' ), esc_html( $shipping_class->name ) ), + 'title' => sprintf( __( '"%s" shipping class cost', 'woocommerce' ), esc_html( $shipping_class->name ) ), 'type' => 'text', 'placeholder' => __( 'N/A', 'woocommerce' ), 'description' => $cost_desc, @@ -87,7 +87,7 @@ if ( ! empty( $shipping_classes ) ) { ); } $settings['no_class_cost'] = array( - 'title' => __( 'No Shipping Class Cost', 'woocommerce' ), + 'title' => __( 'No shipping class cost', 'woocommerce' ), 'type' => 'text', 'placeholder' => __( 'N/A', 'woocommerce' ), 'description' => $cost_desc, @@ -95,31 +95,31 @@ if ( ! empty( $shipping_classes ) ) { 'desc_tip' => true, ); $settings['type'] = array( - 'title' => __( 'Calculation Type', 'woocommerce' ), + 'title' => __( 'Calculation type', 'woocommerce' ), 'type' => 'select', 'class' => 'wc-enhanced-select', 'default' => 'class', 'options' => array( - 'class' => __( 'Per Class: Charge shipping for each shipping class individually', 'woocommerce' ), - 'order' => __( 'Per Order: Charge shipping for the most expensive shipping class', 'woocommerce' ), + 'class' => __( 'Per class: Charge shipping for each shipping class individually', 'woocommerce' ), + 'order' => __( 'Per order: Charge shipping for the most expensive shipping class', 'woocommerce' ), ), ); } if ( apply_filters( 'woocommerce_enable_deprecated_additional_flat_rates', $this->get_option( 'options', false ) ) ) { $settings['additional_rates'] = array( - 'title' => __( 'Additional Rates', 'woocommerce' ), + 'title' => __( 'Additional rates', 'woocommerce' ), 'type' => 'title', 'default' => '', 'description' => __( 'These rates are extra shipping options with additional costs (based on the flat rate).', 'woocommerce' ), ); $settings['options'] = array( - 'title' => __( 'Additional Rates', 'woocommerce' ), + 'title' => __( 'Additional rates', 'woocommerce' ), 'type' => 'textarea', - 'description' => __( 'One per line: Option Name | Additional Cost [+- Percents] | Per Cost Type (order, class, or item) Example: Priority Mail | 6.95 [+ 0.2%] | order.', 'woocommerce' ), + 'description' => __( 'One per line: Option name | Additional cost [+- Percents] | Per cost type (order, class, or item) Example: Priority mail | 6.95 [+ 0.2%] | order.', 'woocommerce' ), 'default' => '', 'desc_tip' => true, - 'placeholder' => __( 'Option Name | Additional Cost [+- Percents%] | Per Cost Type (order, class, or item)', 'woocommerce' ), + 'placeholder' => __( 'Option name | Additional cost [+- Percents%] | Per cost type (order, class, or item)', 'woocommerce' ), ); } diff --git a/includes/shipping/legacy-free-shipping/class-wc-shipping-legacy-free-shipping.php b/includes/shipping/legacy-free-shipping/class-wc-shipping-legacy-free-shipping.php index 76c30cb2570..78dc01f1b2f 100644 --- a/includes/shipping/legacy-free-shipping/class-wc-shipping-legacy-free-shipping.php +++ b/includes/shipping/legacy-free-shipping/class-wc-shipping-legacy-free-shipping.php @@ -27,8 +27,8 @@ class WC_Shipping_Legacy_Free_Shipping extends WC_Shipping_Method { */ public function __construct() { $this->id = 'legacy_free_shipping'; - $this->method_title = __( 'Free Shipping (Legacy)', 'woocommerce' ); - $this->method_description = sprintf( __( 'This method is deprecated in 2.6.0 and will be removed in future versions - we recommend disabling it and instead setting up a new rate within your Shipping Zones.', 'woocommerce' ), admin_url( 'admin.php?page=wc-settings&tab=shipping' ) ); + $this->method_title = __( 'Free shipping (legacy)', 'woocommerce' ); + $this->method_description = sprintf( __( 'This method is deprecated in 2.6.0 and will be removed in future versions - we recommend disabling it and instead setting up a new rate within your Shipping zones.', 'woocommerce' ), admin_url( 'admin.php?page=wc-settings&tab=shipping' ) ); $this->init(); } @@ -86,7 +86,7 @@ class WC_Shipping_Legacy_Free_Shipping extends WC_Shipping_Method { 'default' => 'no', ), 'title' => array( - 'title' => __( 'Method Title', 'woocommerce' ), + 'title' => __( 'Method title', 'woocommerce' ), 'type' => 'text', 'description' => __( 'This controls the title which the user sees during checkout.', 'woocommerce' ), 'default' => __( 'Free Shipping', 'woocommerce' ), @@ -103,7 +103,7 @@ class WC_Shipping_Legacy_Free_Shipping extends WC_Shipping_Method { ), ), 'countries' => array( - 'title' => __( 'Specific Countries', 'woocommerce' ), + 'title' => __( 'Specific countries', 'woocommerce' ), 'type' => 'multiselect', 'class' => 'wc-enhanced-select', 'css' => 'width: 450px;', @@ -114,7 +114,7 @@ class WC_Shipping_Legacy_Free_Shipping extends WC_Shipping_Method { ), ), 'requires' => array( - 'title' => __( 'Free Shipping Requires...', 'woocommerce' ), + 'title' => __( 'Free shipping requires...', 'woocommerce' ), 'type' => 'select', 'class' => 'wc-enhanced-select', 'default' => '', @@ -127,7 +127,7 @@ class WC_Shipping_Legacy_Free_Shipping extends WC_Shipping_Method { ), ), 'min_amount' => array( - 'title' => __( 'Minimum Order Amount', 'woocommerce' ), + 'title' => __( 'Minimum order amount', 'woocommerce' ), 'type' => 'price', 'placeholder' => wc_format_localized_price( 0 ), 'description' => __( 'Users will need to spend this amount to get free shipping (if enabled above).', 'woocommerce' ), diff --git a/includes/shipping/legacy-international-delivery/class-wc-shipping-legacy-international-delivery.php b/includes/shipping/legacy-international-delivery/class-wc-shipping-legacy-international-delivery.php index 66400c0f174..87eb7d60460 100644 --- a/includes/shipping/legacy-international-delivery/class-wc-shipping-legacy-international-delivery.php +++ b/includes/shipping/legacy-international-delivery/class-wc-shipping-legacy-international-delivery.php @@ -20,8 +20,8 @@ class WC_Shipping_Legacy_International_Delivery extends WC_Shipping_Legacy_Flat_ */ public function __construct() { $this->id = 'legacy_international_delivery'; - $this->method_title = __( 'International Flat Rate (Legacy)', 'woocommerce' ); - $this->method_description = sprintf( __( 'This method is deprecated in 2.6.0 and will be removed in future versions - we recommend disabling it and instead setting up a new rate within your Shipping Zones.', 'woocommerce' ), admin_url( 'admin.php?page=wc-settings&tab=shipping' ) ); + $this->method_title = __( 'International flat rate (legacy)', 'woocommerce' ); + $this->method_description = sprintf( __( 'This method is deprecated in 2.6.0 and will be removed in future versions - we recommend disabling it and instead setting up a new rate within your Shipping zones.', 'woocommerce' ), admin_url( 'admin.php?page=wc-settings&tab=shipping' ) ); $this->init(); add_action( 'woocommerce_update_options_shipping_' . $this->id, array( $this, 'process_admin_options' ) ); diff --git a/includes/shipping/legacy-local-delivery/class-wc-shipping-legacy-local-delivery.php b/includes/shipping/legacy-local-delivery/class-wc-shipping-legacy-local-delivery.php index f3e71cc2d2d..d1823fb2571 100644 --- a/includes/shipping/legacy-local-delivery/class-wc-shipping-legacy-local-delivery.php +++ b/includes/shipping/legacy-local-delivery/class-wc-shipping-legacy-local-delivery.php @@ -21,8 +21,8 @@ class WC_Shipping_Legacy_Local_Delivery extends WC_Shipping_Local_Pickup { */ public function __construct() { $this->id = 'legacy_local_delivery'; - $this->method_title = __( 'Local Delivery (Legacy)', 'woocommerce' ); - $this->method_description = sprintf( __( 'This method is deprecated in 2.6.0 and will be removed in future versions - we recommend disabling it and instead setting up a new rate within your Shipping Zones.', 'woocommerce' ), admin_url( 'admin.php?page=wc-settings&tab=shipping' ) ); + $this->method_title = __( 'Local delivery (legacy)', 'woocommerce' ); + $this->method_description = sprintf( __( 'This method is deprecated in 2.6.0 and will be removed in future versions - we recommend disabling it and instead setting up a new rate within your Shipping zones.', 'woocommerce' ), admin_url( 'admin.php?page=wc-settings&tab=shipping' ) ); $this->init(); } @@ -117,11 +117,11 @@ class WC_Shipping_Legacy_Local_Delivery extends WC_Shipping_Local_Pickup { 'title' => __( 'Title', 'woocommerce' ), 'type' => 'text', 'description' => __( 'This controls the title which the user sees during checkout.', 'woocommerce' ), - 'default' => __( 'Local Delivery', 'woocommerce' ), + 'default' => __( 'Local delivery', 'woocommerce' ), 'desc_tip' => true, ), 'type' => array( - 'title' => __( 'Fee Type', 'woocommerce' ), + 'title' => __( 'Fee type', 'woocommerce' ), 'type' => 'select', 'class' => 'wc-enhanced-select', 'description' => __( 'How to calculate delivery charges', 'woocommerce' ), @@ -134,7 +134,7 @@ class WC_Shipping_Legacy_Local_Delivery extends WC_Shipping_Local_Pickup { 'desc_tip' => true, ), 'fee' => array( - 'title' => __( 'Delivery Fee', 'woocommerce' ), + 'title' => __( 'Delivery fee', 'woocommerce' ), 'type' => 'price', 'description' => __( 'What fee do you want to charge for local delivery, disregarded if you choose free. Leave blank to disable.', 'woocommerce' ), 'default' => '', @@ -142,7 +142,7 @@ class WC_Shipping_Legacy_Local_Delivery extends WC_Shipping_Local_Pickup { 'placeholder' => wc_format_localized_price( 0 ), ), 'codes' => array( - 'title' => __( 'Allowed ZIP/Post Codes', 'woocommerce' ), + 'title' => __( 'Allowed ZIP/post codes', 'woocommerce' ), 'type' => 'text', 'desc_tip' => __( 'What ZIP/post codes are available for local delivery?', 'woocommerce' ), 'default' => '', @@ -160,7 +160,7 @@ class WC_Shipping_Legacy_Local_Delivery extends WC_Shipping_Local_Pickup { ), ), 'countries' => array( - 'title' => __( 'Specific Countries', 'woocommerce' ), + 'title' => __( 'Specific countries', 'woocommerce' ), 'type' => 'multiselect', 'class' => 'wc-enhanced-select', 'css' => 'width: 450px;', diff --git a/includes/shipping/legacy-local-pickup/class-wc-shipping-legacy-local-pickup.php b/includes/shipping/legacy-local-pickup/class-wc-shipping-legacy-local-pickup.php index ba551d68e0d..6c0569c5c52 100644 --- a/includes/shipping/legacy-local-pickup/class-wc-shipping-legacy-local-pickup.php +++ b/includes/shipping/legacy-local-pickup/class-wc-shipping-legacy-local-pickup.php @@ -21,8 +21,8 @@ class WC_Shipping_Legacy_Local_Pickup extends WC_Shipping_Method { */ public function __construct() { $this->id = 'legacy_local_pickup'; - $this->method_title = __( 'Local Pickup (Legacy)', 'woocommerce' ); - $this->method_description = sprintf( __( 'This method is deprecated in 2.6.0 and will be removed in future versions - we recommend disabling it and instead setting up a new rate within your Shipping Zones.', 'woocommerce' ), admin_url( 'admin.php?page=wc-settings&tab=shipping' ) ); + $this->method_title = __( 'Local pickup (legacy)', 'woocommerce' ); + $this->method_description = sprintf( __( 'This method is deprecated in 2.6.0 and will be removed in future versions - we recommend disabling it and instead setting up a new rate within your Shipping zones.', 'woocommerce' ), admin_url( 'admin.php?page=wc-settings&tab=shipping' ) ); $this->init(); } @@ -94,11 +94,11 @@ class WC_Shipping_Legacy_Local_Pickup extends WC_Shipping_Method { 'title' => __( 'Title', 'woocommerce' ), 'type' => 'text', 'description' => __( 'This controls the title which the user sees during checkout.', 'woocommerce' ), - 'default' => __( 'Local Pickup', 'woocommerce' ), + 'default' => __( 'Local pickup', 'woocommerce' ), 'desc_tip' => true, ), 'codes' => array( - 'title' => __( 'Allowed ZIP/Post Codes', 'woocommerce' ), + 'title' => __( 'Allowed ZIP/post codes', 'woocommerce' ), 'type' => 'text', 'desc_tip' => __( 'What ZIP/post codes are available for local pickup?', 'woocommerce' ), 'default' => '', @@ -112,11 +112,11 @@ class WC_Shipping_Legacy_Local_Pickup extends WC_Shipping_Method { 'class' => 'availability wc-enhanced-select', 'options' => array( 'all' => __( 'All allowed countries', 'woocommerce' ), - 'specific' => __( 'Specific Countries', 'woocommerce' ), + 'specific' => __( 'Specific countries', 'woocommerce' ), ), ), 'countries' => array( - 'title' => __( 'Specific Countries', 'woocommerce' ), + 'title' => __( 'Specific countries', 'woocommerce' ), 'type' => 'multiselect', 'class' => 'wc-enhanced-select', 'css' => 'width: 450px;', diff --git a/includes/shipping/local-pickup/class-wc-shipping-local-pickup.php b/includes/shipping/local-pickup/class-wc-shipping-local-pickup.php index 2bd0476b2f8..fa50aab0b78 100644 --- a/includes/shipping/local-pickup/class-wc-shipping-local-pickup.php +++ b/includes/shipping/local-pickup/class-wc-shipping-local-pickup.php @@ -21,7 +21,7 @@ class WC_Shipping_Local_Pickup extends WC_Shipping_Method { public function __construct( $instance_id = 0 ) { $this->id = 'local_pickup'; $this->instance_id = absint( $instance_id ); - $this->method_title = __( 'Local Pickup', 'woocommerce' ); + $this->method_title = __( 'Local pickup', 'woocommerce' ); $this->method_description = __( 'Allow customers to pick up orders themselves. By default, when using local pickup store base taxes will apply regardless of customer address.', 'woocommerce' ); $this->supports = array( 'shipping-zones', @@ -70,11 +70,11 @@ class WC_Shipping_Local_Pickup extends WC_Shipping_Method { 'title' => __( 'Title', 'woocommerce' ), 'type' => 'text', 'description' => __( 'This controls the title which the user sees during checkout.', 'woocommerce' ), - 'default' => __( 'Local Pickup', 'woocommerce' ), + 'default' => __( 'Local pickup', 'woocommerce' ), 'desc_tip' => true, ), 'tax_status' => array( - 'title' => __( 'Tax Status', 'woocommerce' ), + 'title' => __( 'Tax status', 'woocommerce' ), 'type' => 'select', 'class' => 'wc-enhanced-select', 'default' => 'taxable', diff --git a/includes/shortcodes/class-wc-shortcode-checkout.php b/includes/shortcodes/class-wc-shortcode-checkout.php index ee50b651571..09b26e0de9b 100644 --- a/includes/shortcodes/class-wc-shortcode-checkout.php +++ b/includes/shortcodes/class-wc-shortcode-checkout.php @@ -86,7 +86,7 @@ class WC_Shortcode_Checkout { $order = wc_get_order( $order_id ); if ( ! current_user_can( 'pay_for_order', $order_id ) ) { - echo '
' . __( 'Invalid order. If you have an account please log in and try again.', 'woocommerce' ) . ' ' . __( 'My Account', 'woocommerce' ) . '' . '
'; + echo '
' . __( 'Invalid order. If you have an account please log in and try again.', 'woocommerce' ) . ' ' . __( 'My account', 'woocommerce' ) . '' . '
'; return; } @@ -131,7 +131,7 @@ class WC_Shortcode_Checkout { ?>
  • - + get_order_number(); ?>
  • @@ -144,7 +144,7 @@ class WC_Shortcode_Checkout {
  • get_payment_method_title() ) : ?>
  • - + get_payment_method_title(); ?> @@ -234,7 +234,7 @@ class WC_Shortcode_Checkout { $non_js_checkout = ! empty( $_POST['woocommerce_checkout_update_totals'] ) ? true : false; if ( wc_notice_count( 'error' ) == 0 && $non_js_checkout ) - wc_add_notice( __( 'The order totals have been updated. Please confirm your order by pressing the Place Order button at the bottom of the page.', 'woocommerce' ) ); + wc_add_notice( __( 'The order totals have been updated. Please confirm your order by pressing the "Place order" button at the bottom of the page.', 'woocommerce' ) ); wc_get_template( 'checkout/form-checkout.php', array( 'checkout' => $checkout ) ); diff --git a/includes/shortcodes/class-wc-shortcode-my-account.php b/includes/shortcodes/class-wc-shortcode-my-account.php index 2f9cac6d6eb..41899d2afb8 100644 --- a/includes/shortcodes/class-wc-shortcode-my-account.php +++ b/includes/shortcodes/class-wc-shortcode-my-account.php @@ -115,7 +115,7 @@ class WC_Shortcode_My_Account { $order = wc_get_order( $order_id ); if ( ! current_user_can( 'view_order', $order_id ) ) { - echo '
    ' . __( 'Invalid order.', 'woocommerce' ) . ' ' . __( 'My Account', 'woocommerce' ) . '' . '
    '; + echo '
    ' . __( 'Invalid order.', 'woocommerce' ) . ' ' . __( 'My account', 'woocommerce' ) . '' . '
    '; return; } @@ -234,7 +234,7 @@ class WC_Shortcode_My_Account { if ( empty( $login ) ) { - wc_add_notice( __( 'Enter a username or e-mail address.', 'woocommerce' ), 'error' ); + wc_add_notice( __( 'Enter a username or email address.', 'woocommerce' ), 'error' ); return false; } else { @@ -250,12 +250,12 @@ class WC_Shortcode_My_Account { do_action( 'lostpassword_post' ); if ( ! $user_data ) { - wc_add_notice( __( 'Invalid username or e-mail.', 'woocommerce' ), 'error' ); + wc_add_notice( __( 'Invalid username or email.', 'woocommerce' ), 'error' ); return false; } if ( is_multisite() && ! is_user_member_of_blog( $user_data->ID, get_current_blog_id() ) ) { - wc_add_notice( __( 'Invalid username or e-mail.', 'woocommerce' ), 'error' ); + wc_add_notice( __( 'Invalid username or email.', 'woocommerce' ), 'error' ); return false; } diff --git a/includes/wc-account-functions.php b/includes/wc-account-functions.php index 15f11b4861c..4a396979226 100644 --- a/includes/wc-account-functions.php +++ b/includes/wc-account-functions.php @@ -90,8 +90,8 @@ function wc_get_account_menu_items() { 'orders' => __( 'Orders', 'woocommerce' ), 'downloads' => __( 'Downloads', 'woocommerce' ), 'edit-address' => __( 'Addresses', 'woocommerce' ), - 'payment-methods' => __( 'Payment Methods', 'woocommerce' ), - 'edit-account' => __( 'Account Details', 'woocommerce' ), + 'payment-methods' => __( 'Payment methods', 'woocommerce' ), + 'edit-account' => __( 'Account details', 'woocommerce' ), 'customer-logout' => __( 'Logout', 'woocommerce' ), ); @@ -193,7 +193,7 @@ function wc_get_account_orders_columns() { function wc_get_account_downloads_columns() { $columns = apply_filters( 'woocommerce_account_downloads_columns', array( 'download-product' => __( 'Product', 'woocommerce' ), - 'download-remaining' => __( 'Downloads Remaining', 'woocommerce' ), + 'download-remaining' => __( 'Downloads remaining', 'woocommerce' ), 'download-expires' => __( 'Expires', 'woocommerce' ), 'download-file' => __( 'File', 'woocommerce' ), 'download-actions' => ' ', @@ -228,7 +228,7 @@ function wc_get_account_payment_methods_columns() { */ function wc_get_account_payment_methods_types() { return apply_filters( 'woocommerce_payment_methods_types', array( - 'cc' => __( 'Credit Card', 'woocommerce' ), + 'cc' => __( 'Credit card', 'woocommerce' ), 'echeck' => __( 'eCheck', 'woocommerce' ), ) ); } @@ -268,7 +268,7 @@ function wc_get_account_saved_payment_methods_list( $list, $customer_id ) { if ( ! $payment_token->is_default() ) { $list[ $type ][ $key ]['actions']['default'] = array( 'url' => $set_default_url, - 'name' => esc_html__( 'Make Default', 'woocommerce' ), + 'name' => esc_html__( 'Make default', 'woocommerce' ), ); } @@ -294,7 +294,7 @@ function wc_get_account_saved_payment_methods_list_item_cc( $item, $payment_toke $card_type = $payment_token->get_card_type(); $item['method']['last4'] = $payment_token->get_last4(); - $item['method']['brand'] = ( ! empty( $card_type ) ? ucfirst( $card_type ) : esc_html__( 'Credit Card', 'woocommerce' ) ); + $item['method']['brand'] = ( ! empty( $card_type ) ? ucfirst( $card_type ) : esc_html__( 'Credit card', 'woocommerce' ) ); $item['expires'] = $payment_token->get_expiry_month() . '/' . substr( $payment_token->get_expiry_year(), -2 ); return $item; diff --git a/includes/wc-cart-functions.php b/includes/wc-cart-functions.php index 93c1e7f5ef9..f24a379cb0b 100644 --- a/includes/wc-cart-functions.php +++ b/includes/wc-cart-functions.php @@ -111,9 +111,9 @@ function wc_add_to_cart_message( $products, $show_qty = false, $return = false ) // Output success messages if ( 'yes' === get_option( 'woocommerce_cart_redirect_after_add' ) ) { $return_to = apply_filters( 'woocommerce_continue_shopping_redirect', wc_get_raw_referer() ? wp_validate_redirect( wc_get_raw_referer(), false ) : wc_get_page_permalink( 'shop' ) ); - $message = sprintf( '%s %s', esc_url( $return_to ), esc_html__( 'Continue Shopping', 'woocommerce' ), esc_html( $added_text ) ); + $message = sprintf( '%s %s', esc_url( $return_to ), esc_html__( 'Continue shopping', 'woocommerce' ), esc_html( $added_text ) ); } else { - $message = sprintf( '%s %s', esc_url( wc_get_page_permalink( 'cart' ) ), esc_html__( 'View Cart', 'woocommerce' ), esc_html( $added_text ) ); + $message = sprintf( '%s %s', esc_url( wc_get_page_permalink( 'cart' ) ), esc_html__( 'View cart', 'woocommerce' ), esc_html( $added_text ) ); } $message = apply_filters( 'wc_add_to_cart_message', $message, $product_id ); diff --git a/includes/wc-coupon-functions.php b/includes/wc-coupon-functions.php index bf1d677a111..48114aa34d2 100644 --- a/includes/wc-coupon-functions.php +++ b/includes/wc-coupon-functions.php @@ -21,10 +21,10 @@ if ( ! defined( 'ABSPATH' ) ) { */ function wc_get_coupon_types() { return (array) apply_filters( 'woocommerce_coupon_discount_types', array( - 'fixed_cart' => __( 'Cart Discount', 'woocommerce' ), - 'percent' => __( 'Cart % Discount', 'woocommerce' ), - 'fixed_product' => __( 'Product Discount', 'woocommerce' ), - 'percent_product' => __( 'Product % Discount', 'woocommerce' ), + 'fixed_cart' => __( 'Cart discount', 'woocommerce' ), + 'percent' => __( 'Cart % discount', 'woocommerce' ), + 'fixed_product' => __( 'Product discount', 'woocommerce' ), + 'percent_product' => __( 'Product % discount', 'woocommerce' ), ) ); } diff --git a/includes/wc-order-functions.php b/includes/wc-order-functions.php index a69f6bcde82..f0cacf59020 100644 --- a/includes/wc-order-functions.php +++ b/includes/wc-order-functions.php @@ -189,9 +189,9 @@ function _wc_get_orders_generate_customer_meta_query( $values, $relation = 'or' */ function wc_get_order_statuses() { $order_statuses = array( - 'wc-pending' => _x( 'Pending Payment', 'Order status', 'woocommerce' ), + 'wc-pending' => _x( 'Pending payment', 'Order status', 'woocommerce' ), 'wc-processing' => _x( 'Processing', 'Order status', 'woocommerce' ), - 'wc-on-hold' => _x( 'On Hold', 'Order status', 'woocommerce' ), + 'wc-on-hold' => _x( 'On hold', 'Order status', 'woocommerce' ), 'wc-completed' => _x( 'Completed', 'Order status', 'woocommerce' ), 'wc-cancelled' => _x( 'Cancelled', 'Order status', 'woocommerce' ), 'wc-refunded' => _x( 'Refunded', 'Order status', 'woocommerce' ), @@ -940,7 +940,7 @@ function wc_order_fully_refunded( $order_id ) { // Create the refund object wc_create_refund( array( 'amount' => $max_refund, - 'reason' => __( 'Order Fully Refunded', 'woocommerce' ), + 'reason' => __( 'Order fully refunded', 'woocommerce' ), 'order_id' => $order_id, 'line_items' => array(), ) ); diff --git a/includes/wc-template-functions.php b/includes/wc-template-functions.php index 003076fd865..0accb5e31f5 100644 --- a/includes/wc-template-functions.php +++ b/includes/wc-template-functions.php @@ -511,7 +511,7 @@ if ( ! function_exists( 'woocommerce_page_title' ) ) { function woocommerce_page_title( $echo = true ) { if ( is_search() ) { - $page_title = sprintf( __( 'Search Results: “%s”', 'woocommerce' ), get_search_query() ); + $page_title = sprintf( __( 'Search results: “%s”', 'woocommerce' ), get_search_query() ); if ( get_query_var( 'paged' ) ) $page_title .= sprintf( __( ' – Page %s', 'woocommerce' ), get_query_var( 'paged' ) ); @@ -1165,7 +1165,7 @@ if ( ! function_exists( 'woocommerce_default_product_tabs' ) ) { // Additional information tab - shows attributes if ( $product && ( $product->has_attributes() || $product->enable_dimensions_display() ) ) { $tabs['additional_information'] = array( - 'title' => __( 'Additional Information', 'woocommerce' ), + 'title' => __( 'Additional information', 'woocommerce' ), 'priority' => 20, 'callback' => 'woocommerce_product_additional_information_tab', ); @@ -1420,7 +1420,7 @@ if ( ! function_exists( 'woocommerce_widget_shopping_cart_button_view_cart' ) ) * @subpackage Cart */ function woocommerce_widget_shopping_cart_button_view_cart() { - echo '' . __( 'View Cart', 'woocommerce' ) . ''; + echo '' . __( 'View cart', 'woocommerce' ) . ''; } } diff --git a/includes/wc-update-functions.php b/includes/wc-update-functions.php index 49a768f4a98..5b62c7a7212 100644 --- a/includes/wc-update-functions.php +++ b/includes/wc-update-functions.php @@ -770,7 +770,7 @@ function wc_update_240_refunds() { if ( $order_total > $refunded_total ) { wc_create_refund( array( 'amount' => $order_total - $refunded_total, - 'reason' => __( 'Order Fully Refunded', 'woocommerce' ), + 'reason' => __( 'Order fully refunded', 'woocommerce' ), 'order_id' => $refunded_order->ID, 'line_items' => array(), 'date' => $refunded_order->post_modified, diff --git a/includes/widgets/class-wc-widget-cart.php b/includes/widgets/class-wc-widget-cart.php index 14fa3402d4a..f7f359b8891 100644 --- a/includes/widgets/class-wc-widget-cart.php +++ b/includes/widgets/class-wc-widget-cart.php @@ -22,9 +22,9 @@ class WC_Widget_Cart extends WC_Widget { */ public function __construct() { $this->widget_cssclass = 'woocommerce widget_shopping_cart'; - $this->widget_description = __( "Display the user's Cart in the sidebar.", 'woocommerce' ); + $this->widget_description = __( "Display the user's cart in the sidebar.", 'woocommerce' ); $this->widget_id = 'woocommerce_widget_cart'; - $this->widget_name = __( 'WooCommerce Cart', 'woocommerce' ); + $this->widget_name = __( 'WooCommerce cart', 'woocommerce' ); $this->settings = array( 'title' => array( 'type' => 'text', diff --git a/includes/widgets/class-wc-widget-layered-nav-filters.php b/includes/widgets/class-wc-widget-layered-nav-filters.php index cd87f6ff06f..7b98e3e7472 100644 --- a/includes/widgets/class-wc-widget-layered-nav-filters.php +++ b/includes/widgets/class-wc-widget-layered-nav-filters.php @@ -22,11 +22,11 @@ class WC_Widget_Layered_Nav_Filters extends WC_Widget { $this->widget_cssclass = 'woocommerce widget_layered_nav_filters'; $this->widget_description = __( 'Shows active layered nav filters so users can see and deactivate them.', 'woocommerce' ); $this->widget_id = 'woocommerce_layered_nav_filters'; - $this->widget_name = __( 'WooCommerce Layered Nav Filters', 'woocommerce' ); + $this->widget_name = __( 'WooCommerce layered nav filters', 'woocommerce' ); $this->settings = array( 'title' => array( 'type' => 'text', - 'std' => __( 'Active Filters', 'woocommerce' ), + 'std' => __( 'Active filters', 'woocommerce' ), 'label' => __( 'Title', 'woocommerce' ), ), ); diff --git a/includes/widgets/class-wc-widget-layered-nav.php b/includes/widgets/class-wc-widget-layered-nav.php index ccd1869b4b0..7cd7ac0ea77 100644 --- a/includes/widgets/class-wc-widget-layered-nav.php +++ b/includes/widgets/class-wc-widget-layered-nav.php @@ -22,7 +22,7 @@ class WC_Widget_Layered_Nav extends WC_Widget { $this->widget_cssclass = 'woocommerce widget_layered_nav'; $this->widget_description = __( 'Shows a custom attribute in a widget which lets you narrow down the list of products when viewing product categories.', 'woocommerce' ); $this->widget_id = 'woocommerce_layered_nav'; - $this->widget_name = __( 'WooCommerce Layered Nav', 'woocommerce' ); + $this->widget_name = __( 'WooCommerce layered nav', 'woocommerce' ); parent::__construct(); } diff --git a/includes/widgets/class-wc-widget-price-filter.php b/includes/widgets/class-wc-widget-price-filter.php index 278f3d38b67..5da5bb11fb9 100644 --- a/includes/widgets/class-wc-widget-price-filter.php +++ b/includes/widgets/class-wc-widget-price-filter.php @@ -24,7 +24,7 @@ class WC_Widget_Price_Filter extends WC_Widget { $this->widget_cssclass = 'woocommerce widget_price_filter'; $this->widget_description = __( 'Shows a price filter slider in a widget which lets you narrow down the list of shown products when viewing product categories.', 'woocommerce' ); $this->widget_id = 'woocommerce_price_filter'; - $this->widget_name = __( 'WooCommerce Price Filter', 'woocommerce' ); + $this->widget_name = __( 'WooCommerce price filter', 'woocommerce' ); $this->settings = array( 'title' => array( 'type' => 'text', diff --git a/includes/widgets/class-wc-widget-product-categories.php b/includes/widgets/class-wc-widget-product-categories.php index 7106169881a..6ba8d22c3f3 100644 --- a/includes/widgets/class-wc-widget-product-categories.php +++ b/includes/widgets/class-wc-widget-product-categories.php @@ -36,11 +36,11 @@ class WC_Widget_Product_Categories extends WC_Widget { $this->widget_cssclass = 'woocommerce widget_product_categories'; $this->widget_description = __( 'A list or dropdown of product categories.', 'woocommerce' ); $this->widget_id = 'woocommerce_product_categories'; - $this->widget_name = __( 'WooCommerce Product Categories', 'woocommerce' ); + $this->widget_name = __( 'WooCommerce product categories', 'woocommerce' ); $this->settings = array( 'title' => array( 'type' => 'text', - 'std' => __( 'Product Categories', 'woocommerce' ), + 'std' => __( 'Product categories', 'woocommerce' ), 'label' => __( 'Title', 'woocommerce' ), ), 'orderby' => array( @@ -48,7 +48,7 @@ class WC_Widget_Product_Categories extends WC_Widget { 'std' => 'name', 'label' => __( 'Order by', 'woocommerce' ), 'options' => array( - 'order' => __( 'Category Order', 'woocommerce' ), + 'order' => __( 'Category order', 'woocommerce' ), 'name' => __( 'Name', 'woocommerce' ), ), ), diff --git a/includes/widgets/class-wc-widget-product-search.php b/includes/widgets/class-wc-widget-product-search.php index b43f38be434..ed3d0053e2c 100644 --- a/includes/widgets/class-wc-widget-product-search.php +++ b/includes/widgets/class-wc-widget-product-search.php @@ -22,7 +22,7 @@ class WC_Widget_Product_Search extends WC_Widget { $this->widget_cssclass = 'woocommerce widget_product_search'; $this->widget_description = __( 'A Search box for products only.', 'woocommerce' ); $this->widget_id = 'woocommerce_product_search'; - $this->widget_name = __( 'WooCommerce Product Search', 'woocommerce' ); + $this->widget_name = __( 'WooCommerce product search', 'woocommerce' ); $this->settings = array( 'title' => array( 'type' => 'text', diff --git a/includes/widgets/class-wc-widget-product-tag-cloud.php b/includes/widgets/class-wc-widget-product-tag-cloud.php index 31e4fbcde60..527ab29849e 100644 --- a/includes/widgets/class-wc-widget-product-tag-cloud.php +++ b/includes/widgets/class-wc-widget-product-tag-cloud.php @@ -22,11 +22,11 @@ class WC_Widget_Product_Tag_Cloud extends WC_Widget { $this->widget_cssclass = 'woocommerce widget_product_tag_cloud'; $this->widget_description = __( 'Your most used product tags in cloud format.', 'woocommerce' ); $this->widget_id = 'woocommerce_product_tag_cloud'; - $this->widget_name = __( 'WooCommerce Product Tags', 'woocommerce' ); + $this->widget_name = __( 'WooCommerce product tags', 'woocommerce' ); $this->settings = array( 'title' => array( 'type' => 'text', - 'std' => __( 'Product Tags', 'woocommerce' ), + 'std' => __( 'Product tags', 'woocommerce' ), 'label' => __( 'Title', 'woocommerce' ), ), ); diff --git a/includes/widgets/class-wc-widget-products.php b/includes/widgets/class-wc-widget-products.php index e78048f8ff8..b33de72b882 100644 --- a/includes/widgets/class-wc-widget-products.php +++ b/includes/widgets/class-wc-widget-products.php @@ -22,7 +22,7 @@ class WC_Widget_Products extends WC_Widget { $this->widget_cssclass = 'woocommerce widget_products'; $this->widget_description = __( 'Display a list of your products on your site.', 'woocommerce' ); $this->widget_id = 'woocommerce_products'; - $this->widget_name = __( 'WooCommerce Products', 'woocommerce' ); + $this->widget_name = __( 'WooCommerce products', 'woocommerce' ); $this->settings = array( 'title' => array( 'type' => 'text', @@ -42,9 +42,9 @@ class WC_Widget_Products extends WC_Widget { 'std' => '', 'label' => __( 'Show', 'woocommerce' ), 'options' => array( - '' => __( 'All Products', 'woocommerce' ), - 'featured' => __( 'Featured Products', 'woocommerce' ), - 'onsale' => __( 'On-sale Products', 'woocommerce' ), + '' => __( 'All products', 'woocommerce' ), + 'featured' => __( 'Featured products', 'woocommerce' ), + 'onsale' => __( 'On-sale products', 'woocommerce' ), ), ), 'orderby' => array( diff --git a/includes/widgets/class-wc-widget-rating-filter.php b/includes/widgets/class-wc-widget-rating-filter.php index 627fc24fee5..6c4a906816f 100644 --- a/includes/widgets/class-wc-widget-rating-filter.php +++ b/includes/widgets/class-wc-widget-rating-filter.php @@ -23,11 +23,11 @@ class WC_Widget_Rating_Filter extends WC_Widget { $this->widget_cssclass = 'woocommerce widget_rating_filter'; $this->widget_description = __( 'Filter products by rating when viewing product archives and categories.', 'woocommerce' ); $this->widget_id = 'woocommerce_rating_filter'; - $this->widget_name = __( 'WooCommerce Average Rating Filter', 'woocommerce' ); + $this->widget_name = __( 'WooCommerce average rating filter', 'woocommerce' ); $this->settings = array( 'title' => array( 'type' => 'text', - 'std' => __( 'Average Rating', 'woocommerce' ), + 'std' => __( 'Average rating', 'woocommerce' ), 'label' => __( 'Title', 'woocommerce' ), ), ); diff --git a/includes/widgets/class-wc-widget-recent-reviews.php b/includes/widgets/class-wc-widget-recent-reviews.php index 8ed9191f1f8..d893f7cd4c2 100644 --- a/includes/widgets/class-wc-widget-recent-reviews.php +++ b/includes/widgets/class-wc-widget-recent-reviews.php @@ -22,11 +22,11 @@ class WC_Widget_Recent_Reviews extends WC_Widget { $this->widget_cssclass = 'woocommerce widget_recent_reviews'; $this->widget_description = __( 'Display a list of your most recent reviews on your site.', 'woocommerce' ); $this->widget_id = 'woocommerce_recent_reviews'; - $this->widget_name = __( 'WooCommerce Recent Reviews', 'woocommerce' ); + $this->widget_name = __( 'WooCommerce recent reviews', 'woocommerce' ); $this->settings = array( 'title' => array( 'type' => 'text', - 'std' => __( 'Recent Reviews', 'woocommerce' ), + 'std' => __( 'Recent reviews', 'woocommerce' ), 'label' => __( 'Title', 'woocommerce' ), ), 'number' => array( diff --git a/includes/widgets/class-wc-widget-recently-viewed.php b/includes/widgets/class-wc-widget-recently-viewed.php index 05cd4e7c35b..af6f7961ffa 100644 --- a/includes/widgets/class-wc-widget-recently-viewed.php +++ b/includes/widgets/class-wc-widget-recently-viewed.php @@ -22,11 +22,11 @@ class WC_Widget_Recently_Viewed extends WC_Widget { $this->widget_cssclass = 'woocommerce widget_recently_viewed_products'; $this->widget_description = __( 'Display a list of recently viewed products.', 'woocommerce' ); $this->widget_id = 'woocommerce_recently_viewed_products'; - $this->widget_name = __( 'WooCommerce Recently Viewed', 'woocommerce' ); + $this->widget_name = __( 'WooCommerce recently viewed', 'woocommerce' ); $this->settings = array( 'title' => array( 'type' => 'text', - 'std' => __( 'Recently Viewed Products', 'woocommerce' ), + 'std' => __( 'Recently viewed products', 'woocommerce' ), 'label' => __( 'Title', 'woocommerce' ), ), 'number' => array( diff --git a/includes/widgets/class-wc-widget-top-rated-products.php b/includes/widgets/class-wc-widget-top-rated-products.php index 309f81c5972..0586f82a19e 100644 --- a/includes/widgets/class-wc-widget-top-rated-products.php +++ b/includes/widgets/class-wc-widget-top-rated-products.php @@ -24,11 +24,11 @@ class WC_Widget_Top_Rated_Products extends WC_Widget { $this->widget_cssclass = 'woocommerce widget_top_rated_products'; $this->widget_description = __( 'Display a list of your top rated products on your site.', 'woocommerce' ); $this->widget_id = 'woocommerce_top_rated_products'; - $this->widget_name = __( 'WooCommerce Top Rated Products', 'woocommerce' ); + $this->widget_name = __( 'WooCommerce top rated products', 'woocommerce' ); $this->settings = array( 'title' => array( 'type' => 'text', - 'std' => __( 'Top Rated Products', 'woocommerce' ), + 'std' => __( 'Top rated products', 'woocommerce' ), 'label' => __( 'Title', 'woocommerce' ), ), 'number' => array( diff --git a/readme.txt b/readme.txt index 1927673b6a4..e44aa40bce9 100644 --- a/readme.txt +++ b/readme.txt @@ -166,7 +166,7 @@ Yes you can! Join in on our [GitHub repository](http://github.com/woocommerce/wo * Added Nigerian Provinces to i18n/state. * Improved handling of shop page rewrite rules to allow subpages. * Redirect to login after password reset. -* When using authorizations in PayPal standard, automatically capture funds when the order goes processing/completed. +* When using authorizations in PayPal Standard, automatically capture funds when the order goes processing/completed. * On multisite, when a user logs into a store with an account on a site, but not the current site, rather than error, add the user to the current site as a customer. * Show variable weights/dimensions even when parent values are not set. * Automatically sort tax rates rather than allow clunky manual sorting. diff --git a/templates/auth/header.php b/templates/auth/header.php index e320ddb86d2..fdbc6483364 100644 --- a/templates/auth/header.php +++ b/templates/auth/header.php @@ -26,7 +26,7 @@ if ( ! defined( 'ABSPATH' ) ) { - <?php _e( 'Application Authentication Request', 'woocommerce' ); ?> + <?php _e( 'Application authentication request', 'woocommerce' ); ?> diff --git a/templates/cart/cart-empty.php b/templates/cart/cart-empty.php index fd0f87bc592..964f696bf74 100644 --- a/templates/cart/cart-empty.php +++ b/templates/cart/cart-empty.php @@ -33,7 +33,7 @@ wc_print_notices(); 0 ) : ?>

    - +

    diff --git a/templates/cart/cart-totals.php b/templates/cart/cart-totals.php index 3fe5705736c..4af9992956d 100644 --- a/templates/cart/cart-totals.php +++ b/templates/cart/cart-totals.php @@ -25,7 +25,7 @@ if ( ! defined( 'ABSPATH' ) ) { -

    +

:: ' : ' – ' . sprintf( __( 'If you\'re modifying WooCommerce on a parent theme you didn\'t build personally, then we recommend using a child theme. See: How to create a child theme', 'woocommerce' ), 'https://codex.wordpress.org/Child_Themes' ); @@ -509,12 +509,12 @@ $pages = $system_status->get_pages(); if ( $theme['is_child_theme'] ) : ?>
::
:: get_pages(); ?>
::
:: ' . __( 'Not Declared', 'woocommerce' ) . ''; + echo ' ' . __( 'Not declared', 'woocommerce' ) . ''; } else { echo ''; } @@ -551,7 +551,7 @@ $pages = $system_status->get_pages();
::  
::  
diff --git a/templates/cart/cart.php b/templates/cart/cart.php index 412312764bc..e0a169a175e 100644 --- a/templates/cart/cart.php +++ b/templates/cart/cart.php @@ -135,13 +135,13 @@ do_action( 'woocommerce_before_cart' ); ?>
- +
- + diff --git a/templates/cart/proceed-to-checkout-button.php b/templates/cart/proceed-to-checkout-button.php index a35a4f48fb6..33069918b9b 100644 --- a/templates/cart/proceed-to-checkout-button.php +++ b/templates/cart/proceed-to-checkout-button.php @@ -24,5 +24,5 @@ if ( ! defined( 'ABSPATH' ) ) { ?> - + diff --git a/templates/cart/shipping-calculator.php b/templates/cart/shipping-calculator.php index 5984d75fcf1..9cb5e5f01a9 100644 --- a/templates/cart/shipping-calculator.php +++ b/templates/cart/shipping-calculator.php @@ -30,7 +30,7 @@ if ( 'no' === get_option( 'woocommerce_enable_shipping_calc' ) || ! WC()->cart->
-

+

diff --git a/templates/checkout/cart-errors.php b/templates/checkout/cart-errors.php index 6f0bdf4afba..a50eef6e0a5 100644 --- a/templates/checkout/cart-errors.php +++ b/templates/checkout/cart-errors.php @@ -28,4 +28,4 @@ if ( ! defined( 'ABSPATH' ) ) { -

+

diff --git a/templates/checkout/form-billing.php b/templates/checkout/form-billing.php index a8730c4f421..2f9162a0d2d 100644 --- a/templates/checkout/form-billing.php +++ b/templates/checkout/form-billing.php @@ -30,7 +30,7 @@ if ( ! defined( 'ABSPATH' ) ) { -

+

diff --git a/templates/checkout/form-coupon.php b/templates/checkout/form-coupon.php index 480632e89c8..d9c71293937 100644 --- a/templates/checkout/form-coupon.php +++ b/templates/checkout/form-coupon.php @@ -37,7 +37,7 @@ if ( empty( WC()->cart->applied_coupons ) ) {

- +

diff --git a/templates/checkout/form-shipping.php b/templates/checkout/form-shipping.php index 13733d60ec0..3c82f627e50 100644 --- a/templates/checkout/form-shipping.php +++ b/templates/checkout/form-shipping.php @@ -51,7 +51,7 @@ if ( ! defined( 'ABSPATH' ) ) { cart->needs_shipping() || wc_ship_to_billing_address_only() ) : ?> -

+

diff --git a/templates/checkout/thankyou.php b/templates/checkout/thankyou.php index 945a753bba8..1f53be77442 100644 --- a/templates/checkout/thankyou.php +++ b/templates/checkout/thankyou.php @@ -32,7 +32,7 @@ if ( ! defined( 'ABSPATH' ) ) {

- +

@@ -43,7 +43,7 @@ if ( ! defined( 'ABSPATH' ) ) {
  • - + get_order_number(); ?>
  • @@ -60,7 +60,7 @@ if ( ! defined( 'ABSPATH' ) ) { get_payment_method_title() ) : ?>
  • - + get_payment_method_title(); ?>
  • diff --git a/templates/emails/email-order-items.php b/templates/emails/email-order-items.php index 17568c645a5..9ba4f7fd09e 100644 --- a/templates/emails/email-order-items.php +++ b/templates/emails/email-order-items.php @@ -29,7 +29,7 @@ foreach ( $items as $item_id => $item ) : // Show title/image etc if ( $show_image ) { - echo apply_filters( 'woocommerce_order_item_thumbnail', '
    ' . esc_attr__( 'Product Image', 'woocommerce' ) . '
    ', $item ); + echo apply_filters( 'woocommerce_order_item_thumbnail', '
    ' . esc_attr__( 'Product image', 'woocommerce' ) . '
    ', $item ); } // Product name diff --git a/templates/myaccount/downloads.php b/templates/myaccount/downloads.php index fb13247f01a..1f13ed2fe1a 100644 --- a/templates/myaccount/downloads.php +++ b/templates/myaccount/downloads.php @@ -95,7 +95,7 @@ do_action( 'woocommerce_before_account_downloads', $has_downloads ); ?> diff --git a/templates/myaccount/form-add-payment-method.php b/templates/myaccount/form-add-payment-method.php index d2c7c699c9a..091e357868c 100644 --- a/templates/myaccount/form-add-payment-method.php +++ b/templates/myaccount/form-add-payment-method.php @@ -50,7 +50,7 @@ if ( $available_gateways = WC()->payment_gateways->get_available_payment_gateway
    - +
    diff --git a/templates/myaccount/form-edit-account.php b/templates/myaccount/form-edit-account.php index c5bbd1f01c0..1f4acc6850d 100644 --- a/templates/myaccount/form-edit-account.php +++ b/templates/myaccount/form-edit-account.php @@ -27,33 +27,33 @@ do_action( 'woocommerce_before_edit_account_form' ); ?>

    - +

    - +

    - +

    - +

    - +

    - +

    - +

    diff --git a/templates/myaccount/form-edit-address.php b/templates/myaccount/form-edit-address.php index 14eac64b61a..f0619f3d972 100644 --- a/templates/myaccount/form-edit-address.php +++ b/templates/myaccount/form-edit-address.php @@ -20,7 +20,7 @@ if ( ! defined( 'ABSPATH' ) ) { exit; } -$page_title = ( 'billing' === $load_address ) ? __( 'Billing Address', 'woocommerce' ) : __( 'Shipping Address', 'woocommerce' ); +$page_title = ( 'billing' === $load_address ) ? __( 'Billing address', 'woocommerce' ) : __( 'Shipping address', 'woocommerce' ); do_action( 'woocommerce_before_edit_account_address_form' ); ?> @@ -43,7 +43,7 @@ do_action( 'woocommerce_before_edit_account_address_form' ); ?>

    - +

    diff --git a/templates/myaccount/form-login.php b/templates/myaccount/form-login.php index 8ca933223c7..71178d63856 100644 --- a/templates/myaccount/form-login.php +++ b/templates/myaccount/form-login.php @@ -88,7 +88,7 @@ if ( ! defined( 'ABSPATH' ) ) {

    - +

    diff --git a/templates/myaccount/form-lost-password.php b/templates/myaccount/form-lost-password.php index f5e9bfb2c8e..21e41f31fcd 100644 --- a/templates/myaccount/form-lost-password.php +++ b/templates/myaccount/form-lost-password.php @@ -37,7 +37,7 @@ wc_print_notices(); ?>

    - +

    diff --git a/templates/myaccount/my-address.php b/templates/myaccount/my-address.php index b082813a506..446df895005 100644 --- a/templates/myaccount/my-address.php +++ b/templates/myaccount/my-address.php @@ -24,12 +24,12 @@ $customer_id = get_current_user_id(); if ( ! wc_ship_to_billing_address_only() && wc_shipping_enabled() ) { $get_addresses = apply_filters( 'woocommerce_my_account_get_addresses', array( - 'billing' => __( 'Billing Address', 'woocommerce' ), - 'shipping' => __( 'Shipping Address', 'woocommerce' ), + 'billing' => __( 'Billing address', 'woocommerce' ), + 'shipping' => __( 'Shipping address', 'woocommerce' ), ), $customer_id ); } else { $get_addresses = apply_filters( 'woocommerce_my_account_get_addresses', array( - 'billing' => __( 'Billing Address', 'woocommerce' ), + 'billing' => __( 'Billing address', 'woocommerce' ), ), $customer_id ); } diff --git a/templates/myaccount/my-downloads.php b/templates/myaccount/my-downloads.php index 6fa628dfdeb..86e6b38102e 100644 --- a/templates/myaccount/my-downloads.php +++ b/templates/myaccount/my-downloads.php @@ -27,7 +27,7 @@ if ( $downloads = WC()->customer->get_downloadable_products() ) : ?> -

    +

      diff --git a/templates/myaccount/my-orders.php b/templates/myaccount/my-orders.php index cca2a2e0dec..f7420ddf51d 100644 --- a/templates/myaccount/my-orders.php +++ b/templates/myaccount/my-orders.php @@ -27,7 +27,7 @@ $customer_orders = get_posts( apply_filters( 'woocommerce_my_account_my_orders_q if ( $customer_orders ) : ?> -

      +

diff --git a/templates/myaccount/orders.php b/templates/myaccount/orders.php index 0655ff28ad5..7e5e657c550 100644 --- a/templates/myaccount/orders.php +++ b/templates/myaccount/orders.php @@ -116,7 +116,7 @@ do_action( 'woocommerce_before_account_orders', $has_orders ); ?> diff --git a/templates/myaccount/payment-methods.php b/templates/myaccount/payment-methods.php index 05cd3d13d04..17f639e5088 100644 --- a/templates/myaccount/payment-methods.php +++ b/templates/myaccount/payment-methods.php @@ -75,4 +75,4 @@ do_action( 'woocommerce_before_account_payment_methods', $has_methods ); ?> - + diff --git a/templates/myaccount/view-order.php b/templates/myaccount/view-order.php index 06f3018245d..54686cdb2da 100644 --- a/templates/myaccount/view-order.php +++ b/templates/myaccount/view-order.php @@ -33,7 +33,7 @@ if ( ! defined( 'ABSPATH' ) ) { ?>

get_customer_order_notes() ) : ?> -

+

  1. diff --git a/templates/order/form-tracking.php b/templates/order/form-tracking.php index a08168a1b10..a390c6e537b 100644 --- a/templates/order/form-tracking.php +++ b/templates/order/form-tracking.php @@ -29,7 +29,7 @@ global $post;

    -

    +

    diff --git a/templates/order/order-again.php b/templates/order/order-again.php index 1d2a15e37bd..a7ba7a703cf 100644 --- a/templates/order/order-again.php +++ b/templates/order/order-again.php @@ -22,5 +22,5 @@ if ( ! defined( 'ABSPATH' ) ) { ?>

    - +

    diff --git a/templates/order/order-details-customer.php b/templates/order/order-details-customer.php index 10375b9fc85..fc9090ca396 100644 --- a/templates/order/order-details-customer.php +++ b/templates/order/order-details-customer.php @@ -23,7 +23,7 @@ if ( ! defined( 'ABSPATH' ) ) {
    -

    +

@@ -60,7 +60,7 @@ if ( ! defined( 'ABSPATH' ) ) { -

+

get_formatted_billing_address() ) ? $address : __( 'N/A', 'woocommerce' ); ?> @@ -72,7 +72,7 @@ if ( ! defined( 'ABSPATH' ) ) {
-

+

get_formatted_shipping_address() ) ? $address : __( 'N/A', 'woocommerce' ); ?> diff --git a/templates/order/order-details.php b/templates/order/order-details.php index 8f21039a22f..dab2647a6e4 100644 --- a/templates/order/order-details.php +++ b/templates/order/order-details.php @@ -28,7 +28,7 @@ $show_customer_details = is_user_logged_in() && $order->get_user_id() === get_cu
-

+

diff --git a/templates/order/tracking.php b/templates/order/tracking.php index 14df67add0e..35605e61e47 100644 --- a/templates/order/tracking.php +++ b/templates/order/tracking.php @@ -31,7 +31,7 @@ if ( ! defined( 'ABSPATH' ) ) { ?>

get_customer_order_notes() ) : ?> -

+

  1. diff --git a/templates/product-searchform.php b/templates/product-searchform.php index 2fb8732e9e9..193d1ea42fe 100644 --- a/templates/product-searchform.php +++ b/templates/product-searchform.php @@ -23,7 +23,7 @@ if ( ! defined( 'ABSPATH' ) ) { ?> - + diff --git a/templates/single-product-reviews.php b/templates/single-product-reviews.php index f0808825abd..d5696976cda 100644 --- a/templates/single-product-reviews.php +++ b/templates/single-product-reviews.php @@ -87,17 +87,17 @@ if ( ! comments_open() ) { } if ( get_option( 'woocommerce_enable_review_rating' ) === 'yes' ) { - $comment_form['comment_field'] = '

    - +

    '; } - $comment_form['comment_field'] .= '

    '; + $comment_form['comment_field'] .= '

    '; comment_form( apply_filters( 'woocommerce_product_review_comment_form_args', $comment_form ) ); ?> diff --git a/templates/single-product/related.php b/templates/single-product/related.php index 330f6356030..eb89bec14b6 100644 --- a/templates/single-product/related.php +++ b/templates/single-product/related.php @@ -48,7 +48,7 @@ if ( $products->have_posts() ) : ?>