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 ); ?> -' . __( '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' => '' . 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' => '' . __( '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' => - '' . __( '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' ) . '
' . + '' . + '' ); } } 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 {' . 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__( '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 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__( '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__( '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__( '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__( '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__( '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__( '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__( '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 '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 - +
It’s completely optional and shouldn’t take longer than five minutes.', 'woocommerce' ); ?>
- +