diff --git a/admin/admin-settings-forms.php b/admin/admin-settings-forms.php index 1ae3e6bcf10d9..8bf7a3bcea1f5 100644 --- a/admin/admin-settings-forms.php +++ b/admin/admin-settings-forms.php @@ -169,9 +169,9 @@ function woocommerce_admin_fields($options) { - + - + diff --git a/admin/post-types/product.php b/admin/post-types/product.php index 07e226873e64e..5653854baad22 100644 --- a/admin/post-types/product.php +++ b/admin/post-types/product.php @@ -91,19 +91,19 @@ function woocommerce_custom_product_columns($column) { break; case "product_date" : if ( '0000-00-00 00:00:00' == $post->post_date ) : - $t_time = $h_time = __( 'Unpublished' ); + $t_time = $h_time = __( 'Unpublished', 'woothemes' ); $time_diff = 0; else : - $t_time = get_the_time( __( 'Y/m/d g:i:s A' ) ); + $t_time = get_the_time( __( 'Y/m/d g:i:s A', 'woothemes' ) ); $m_time = $post->post_date; $time = get_post_time( 'G', true, $post ); $time_diff = time() - $time; if ( $time_diff > 0 && $time_diff < 24*60*60 ) - $h_time = sprintf( __( '%s ago' ), human_time_diff( $time ) ); + $h_time = sprintf( __( '%s ago', 'woothemes' ), human_time_diff( $time ) ); else - $h_time = mysql2date( __( 'Y/m/d' ), $m_time ); + $h_time = mysql2date( __( 'Y/m/d', 'woothemes' ), $m_time ); endif; echo '' . apply_filters( 'post_date_column_time', $h_time, $post ) . '
'; @@ -112,7 +112,7 @@ function woocommerce_custom_product_columns($column) { _e( 'Published' ); elseif ( 'future' == $post->post_status ) : if ( $time_diff > 0 ) : - echo '' . __( 'Missed schedule' ) . ''; + echo '' . __( 'Missed schedule', 'woothemes' ) . ''; else : _e( 'Scheduled' ); endif; @@ -303,7 +303,7 @@ function woocommerce_feature_product() { if( !is_admin() ) die; - if( !current_user_can('edit_posts') ) wp_die( __('You do not have sufficient permissions to access this page.') ); + if( !current_user_can('edit_posts') ) wp_die( __('You do not have sufficient permissions to access this page.', 'woothemes') ); if( !check_admin_referer()) wp_die( __('You have taken too long. Please go back and retry.', 'woothemes') ); diff --git a/admin/post-types/shop_order.php b/admin/post-types/shop_order.php index 2539d75579d84..30e8c185e3e07 100644 --- a/admin/post-types/shop_order.php +++ b/admin/post-types/shop_order.php @@ -104,19 +104,19 @@ function woocommerce_custom_order_columns($column) { break; case "order_date" : if ( '0000-00-00 00:00:00' == $post->post_date ) : - $t_time = $h_time = __( 'Unpublished' ); + $t_time = $h_time = __( 'Unpublished', 'woothemes' ); $time_diff = 0; else : - $t_time = get_the_time( __( 'Y/m/d g:i:s A' ) ); + $t_time = get_the_time( __( 'Y/m/d g:i:s A', 'woothemes' ) ); $m_time = $post->post_date; $time = get_post_time( 'G', true, $post ); $time_diff = time() - $time; if ( $time_diff > 0 && $time_diff < 24*60*60 ) - $h_time = sprintf( __( '%s ago' ), human_time_diff( $time ) ); + $h_time = sprintf( __( '%s ago', 'woothemes' ), human_time_diff( $time ) ); else - $h_time = mysql2date( __( 'Y/m/d' ), $m_time ); + $h_time = mysql2date( __( 'Y/m/d', 'woothemes' ), $m_time ); endif; echo '' . apply_filters( 'post_date_column_time', $h_time, $post ) . ''; @@ -294,7 +294,7 @@ function woocommerce_custom_shop_order_orderby( $vars ) { function woocommerce_mark_order_complete() { if( !is_admin() ) die; - if( !current_user_can('edit_posts') ) wp_die( __('You do not have sufficient permissions to access this page.') ); + if( !current_user_can('edit_posts') ) wp_die( __('You do not have sufficient permissions to access this page.', 'woothemes') ); if( !check_admin_referer()) wp_die( __('You have taken too long. Please go back and retry.', 'woothemes') ); $order_id = isset($_GET['order_id']) && (int) $_GET['order_id'] ? (int) $_GET['order_id'] : ''; if(!$order_id) die; @@ -313,7 +313,7 @@ function woocommerce_mark_order_complete() { function woocommerce_mark_order_processing() { if( !is_admin() ) die; - if( !current_user_can('edit_posts') ) wp_die( __('You do not have sufficient permissions to access this page.') ); + if( !current_user_can('edit_posts') ) wp_die( __('You do not have sufficient permissions to access this page.', 'woothemes') ); if( !check_admin_referer()) wp_die( __('You have taken too long. Please go back and retry.', 'woothemes') ); $order_id = isset($_GET['order_id']) && (int) $_GET['order_id'] ? (int) $_GET['order_id'] : ''; if(!$order_id) die; diff --git a/admin/writepanels/writepanel-order_data.php b/admin/writepanels/writepanel-order_data.php index dad0e367ac2a1..88e4e0d176def 100644 --- a/admin/writepanels/writepanel-order_data.php +++ b/admin/writepanels/writepanel-order_data.php @@ -336,9 +336,9 @@ function woocommerce_order_actions_meta_box($post) { ID ) ) { if ( !EMPTY_TRASH_DAYS ) - $delete_text = __('Delete Permanently'); + $delete_text = __('Delete Permanently', 'woothemes'); else - $delete_text = __('Move to Trash'); + $delete_text = __('Move to Trash', 'woothemes'); ?> diff --git a/admin/writepanels/writepanels-init.php b/admin/writepanels/writepanels-init.php index e39b71316421e..c480c668c24f4 100644 --- a/admin/writepanels/writepanels-init.php +++ b/admin/writepanels/writepanels-init.php @@ -61,19 +61,6 @@ function woocommerce_enter_title_here( $text, $post ) { return $text; } -/** - * Let variations have a product as the parent - -function variations_product_meta_box($post) { - $post_type_object = get_post_type_object($post->post_type); - if ( $post_type_object->hierarchical ) { - $pages = wp_dropdown_pages(array('post_type' => 'product', 'selected' => $post->post_parent, 'name' => 'parent_id', 'show_option_none' => __('(no parent)'), 'sort_column'=> 'menu_order, post_title', 'echo' => 0)); - if ( ! empty($pages) ) { - echo $pages; - } // end empty pages check - } // end hierarchical check. -}*/ - /** * Save meta boxes * diff --git a/classes/gateways/gateway-paypal.php b/classes/gateways/gateway-paypal.php index dcbc5e686a1e3..c6cbc3a5b6d72 100644 --- a/classes/gateways/gateway-paypal.php +++ b/classes/gateways/gateway-paypal.php @@ -454,7 +454,7 @@ function successful_request( $posted ) { ); // Send the mail - woocommerce_mail( get_option('woocommerce_new_order_email_recipient'), sprintf(__('Payment for order #%s refunded/reversed'), $order->id), $message ); + woocommerce_mail( get_option('woocommerce_new_order_email_recipient'), sprintf(__('Payment for order #%s refunded/reversed', 'woothemes'), $order->id), $message ); break; default: diff --git a/templates/emails/customer_new_account.php b/templates/emails/customer_new_account.php index e6adcf7ccb5c8..f6472e806e628 100644 --- a/templates/emails/customer_new_account.php +++ b/templates/emails/customer_new_account.php @@ -7,8 +7,8 @@

diff --git a/templates/single-product-reviews.php b/templates/single-product-reviews.php index 3571f6f665038..4b0e0cfc69259 100644 --- a/templates/single-product-reviews.php +++ b/templates/single-product-reviews.php @@ -76,9 +76,9 @@ 'comment_notes_before' => '', 'comment_notes_after' => '', 'fields' => array( - 'author' => '

' . ' ' . '*' . + 'author' => '

' . ' ' . '*' . '

', - 'email' => '

' . '*' . + 'email' => '

' . '*' . '

', ), 'label_submit' => __('Submit Review', 'woothemes'), diff --git a/woocommerce_actions.php b/woocommerce_actions.php index 3be1e9c2928c1..b7f7076bb140c 100644 --- a/woocommerce_actions.php +++ b/woocommerce_actions.php @@ -728,22 +728,22 @@ function woocommerce_process_registration() { // Check the username if ( $sanitized_user_login == '' ) { - $woocommerce->add_error( __( 'ERROR: Please enter a username.' ) ); + $woocommerce->add_error( __( 'ERROR: Please enter a username.', 'woothemes' ) ); } elseif ( ! validate_username( $_POST['username'] ) ) { - $woocommerce->add_error( __( 'ERROR: This username is invalid because it uses illegal characters. Please enter a valid username.' ) ); + $woocommerce->add_error( __( 'ERROR: This username is invalid because it uses illegal characters. Please enter a valid username.', 'woothemes' ) ); $sanitized_user_login = ''; } elseif ( username_exists( $sanitized_user_login ) ) { - $woocommerce->add_error( __( 'ERROR: This username is already registered, please choose another one.' ) ); + $woocommerce->add_error( __( 'ERROR: This username is already registered, please choose another one.', 'woothemes' ) ); } // Check the e-mail address if ( $user_email == '' ) { - $woocommerce->add_error( __( 'ERROR: Please type your e-mail address.' ) ); + $woocommerce->add_error( __( 'ERROR: Please type your e-mail address.', 'woothemes' ) ); } elseif ( ! is_email( $user_email ) ) { - $woocommerce->add_error( __( 'ERROR: The email address isn’t correct.' ) ); + $woocommerce->add_error( __( 'ERROR: The email address isn’t correct.', 'woothemes' ) ); $user_email = ''; } elseif ( email_exists( $user_email ) ) { - $woocommerce->add_error( __( 'ERROR: This email is already registered, please choose another one.' ) ); + $woocommerce->add_error( __( 'ERROR: This email is already registered, please choose another one.', 'woothemes' ) ); } // Password diff --git a/woocommerce_taxonomy.php b/woocommerce_taxonomy.php index d364f6c1624df..4a486de95f823 100644 --- a/woocommerce_taxonomy.php +++ b/woocommerce_taxonomy.php @@ -357,10 +357,10 @@ function woocommerce_custom_update_messages( $messages ) { 3 => __( 'Custom field deleted.', 'woothemes' ), 4 => sprintf( __( '%s updated.', 'woothemes' ), $post_object->labels->singular_name ), 5 => isset( $_GET['revision'] ) ? sprintf( __( '%s restored to revision from %s', 'woothemes' ), $post_object->labels->singular_name, wp_post_revision_title( (int) $_GET['revision'], false ) ) : false, - 6 => sprintf( __( '%s published. View %s' ), $post_object->labels->singular_name, esc_url( get_permalink( $post_ID ) ), $post_object->labels->singular_name ), + 6 => sprintf( __( '%s published. View %s', 'woothemes' ), $post_object->labels->singular_name, esc_url( get_permalink( $post_ID ) ), $post_object->labels->singular_name ), 7 => sprintf( __( '%s saved.', 'woothemes' ), $post_object->labels->singular_name ), 8 => sprintf( __( '%s submitted. Preview %s', 'woothemes' ), $post_object->labels->singular_name, esc_url( add_query_arg( 'preview', 'true', get_permalink( $post_ID ) ) ), $post_object->labels->singular_name ), - 9 => sprintf( __( '%s scheduled for: %1$s. Preview %s', 'woothemes' ), $post_object->labels->singular_name, date_i18n( __( 'M j, Y @ G:i' ), strtotime( $post->post_date ) ), esc_url( get_permalink( $post_ID ) ), $post_object->labels->singular_name ), + 9 => sprintf( __( '%s scheduled for: %1$s. Preview %s', 'woothemes' ), $post_object->labels->singular_name, date_i18n( __( 'M j, Y @ G:i', 'woothemes' ), strtotime( $post->post_date ) ), esc_url( get_permalink( $post_ID ) ), $post_object->labels->singular_name ), 10 => sprintf( __( '%s draft updated. Preview %s', 'woothemes' ), $post_object->labels->singular_name, esc_url( add_query_arg( 'preview', 'true', get_permalink( $post_ID ) ) ), $post_object->labels->singular_name ), ); }