Permalink
Browse files

Resolve merge conflcits between our translation updates and PR #2012

  • Loading branch information...
1 parent 7856bf0 commit 45e78db31ad3d885968ebf596b13dbe1b5199928 @JustinSainton JustinSainton committed Oct 28, 2015
Showing with 100 additions and 100 deletions.
  1. +2 −2 wpsc-admin/admin.php
  2. +13 −13 wpsc-admin/db-upgrades/routines/2.php
  3. +1 −1 wpsc-admin/includes/product-variation-list-table.class.php
  4. +1 −1 wpsc-admin/includes/save-data.functions.php
  5. +2 −2 wpsc-admin/includes/settings-tabs/gateway.php
  6. +1 −1 wpsc-admin/includes/settings-tabs/general.php
  7. +2 −2 wpsc-admin/includes/settings-tabs/marketing.php
  8. +3 −3 wpsc-admin/includes/settings-tabs/shipping.php
  9. +1 −1 wpsc-admin/init.php
  10. +1 −1 wpsc-components/marketplace-core-v1/library/Sputnik/API.php
  11. +2 −2 wpsc-components/merchant-core-v3/gateways/paypal-digital-goods.php
  12. +1 −1 wpsc-components/merchant-core-v3/gateways/paypal-express-checkout.php
  13. +1 −1 wpsc-components/merchant-core-v3/gateways/paypal-pro.php
  14. +1 −1 wpsc-components/merchant-core-v3/helpers/admin.php
  15. +2 −2 wpsc-components/theme-engine-v1/classes/settings-tab-presentation.php
  16. +3 −3 wpsc-components/theme-engine-v1/helpers/ajax.php
  17. +2 −2 wpsc-components/theme-engine-v1/templates/functions/wpsc-transaction_results_functions.php
  18. +2 −2 wpsc-components/theme-engine-v1/templates/wpsc-shopping_cart_page.php
  19. +1 −1 wpsc-components/theme-engine-v1/templates/wpsc-user-log.php
  20. +2 −2 wpsc-components/theme-engine-v2/mvc/controllers/cart.php
  21. +3 −3 wpsc-components/theme-engine-v2/mvc/controllers/checkout.php
  22. +1 −1 wpsc-components/theme-engine-v2/mvc/controllers/customer-account.php
  23. +1 −1 wpsc-components/theme-engine-v2/mvc/controllers/password-reminder.php
  24. +1 −1 wpsc-components/theme-engine-v2/theming/template-parts/cart.php
  25. +3 −3 wpsc-core/js/tinymce3/window.php
  26. +1 −1 wpsc-includes/ajax.functions.php
  27. +1 −1 wpsc-includes/cart-template-api.php
  28. +1 −1 wpsc-includes/cart.class.php
  29. +1 −1 wpsc-includes/checkout.class.php
  30. +1 −1 wpsc-includes/country.class.php
  31. +1 −1 wpsc-includes/wpsc-country.class.php
  32. +1 −1 wpsc-includes/wpsc-region.class.php
  33. +1 −1 wpsc-merchants/chronopay.php
  34. +6 −6 wpsc-merchants/paypal-express.merchant.php
  35. +3 −3 wpsc-merchants/paypal-pro.merchant.php
  36. +6 −6 wpsc-merchants/paypal-standard.merchant.php
  37. +2 −2 wpsc-merchants/testmode.merchant.php
  38. +6 −6 wpsc-shipping/australiapost.php
  39. +5 −5 wpsc-shipping/usps_20.php
  40. +1 −1 wpsc-taxes/models/taxes.class.php
  41. +2 −2 wpsc-theme/functions/wpsc-transaction_results_functions.php
  42. +4 −4 wpsc-theme/wpsc-shopping_cart_page.php
  43. +1 −1 wpsc-theme/wpsc-user-log.php
  44. +3 −3 wpsc-updates/updating_tasks.php
@@ -641,8 +641,8 @@ function wpsc_admin_include_css_and_js_refac( $pagehook ) {
'wpsc_core_images_url' => WPSC_CORE_IMAGES_URL,
'variation_parent_swap' => esc_html_x( 'New Variation Set', 'Variation taxonomy parent', 'wp-e-commerce' ),
/* translators : This string is prepended to the 'New Variation Set' string */
- 'variation_helper_text' => esc_html_x( 'Choose the Variation Set you want to add variants to. If you\'re creating a new variation set, then select', 'Variation helper text', 'wpsc' ),
- 'variations_tutorial' => esc_html__( 'Variations allow you to create options for your products. For example, if you\'re selling T-Shirts, they will generally have a "Size" option. Size will be the Variation Set name, and it will be a "New Variant Set". You will then create variants (small, medium, large) which will have the "Variation Set" of Size. Once you have made your set you can use the table on the right to manage them (edit, delete). You will be able to order your variants by dragging and dropping them within their Variation Set.', 'wpsc' ),
+ 'variation_helper_text' => esc_html_x( 'Choose the Variation Set you want to add variants to. If you\'re creating a new variation set, then select', 'Variation helper text', 'wp-e-commerce' ),
+ 'variations_tutorial' => esc_html__( 'Variations allow you to create options for your products. For example, if you\'re selling T-Shirts, they will generally have a "Size" option. Size will be the Variation Set name, and it will be a "New Variant Set". You will then create variants (small, medium, large) which will have the "Variation Set" of Size. Once you have made your set you can use the table on the right to manage them (edit, delete). You will be able to order your variants by dragging and dropping them within their Variation Set.', 'wp-e-commerce' ),
/* translators : These strings are dynamically inserted as a drop-down for the Coupon comparison conditions */
'coupons_compare_or' => esc_html_x( 'OR' , 'Coupon comparison logic', 'wp-e-commerce' ),
'coupons_compare_and' => esc_html_x( 'AND' , 'Coupon comparison logic', 'wp-e-commerce' ),
@@ -87,9 +87,9 @@ function _wpsc_fix_timor_leste_name() {
'id' => 245,
'country' => __( 'Timor-Leste', 'wp-e-commerce' ),
'isocode' => 'TL',
- 'currency' => __( 'US Dollar', 'wpsc' ),
- 'symbol' => __( '$', 'wpsc' ),
- 'symbol_html' => __( '$', 'wpsc' ),
+ 'currency' => __( 'US Dollar', 'wp-e-commerce' ),
+ 'symbol' => __( '$', 'wp-e-commerce' ),
+ 'symbol_html' => __( '$', 'wp-e-commerce' ),
'code' => 'USD',
'continent' => 'asiapacific',
'visible' => '0',
@@ -171,10 +171,10 @@ function _wpsc_new_country_palestinian_territories() {
'id' => 251,
'country' => __( 'Palestinian Territories', 'wp-e-commerce' ),
'isocode' => 'PS',
- 'currency' => __( 'Israeli New Shekel', 'wpsc' ),
- 'symbol' => __( '', 'wpsc' ),
- 'symbol_html' => __( '₪', 'wpsc' ),
- 'code' => __( 'ILS', 'wpsc' ),
+ 'currency' => __( 'Israeli New Shekel', 'wp-e-commerce' ),
+ 'symbol' => __( '', 'wp-e-commerce' ),
+ 'symbol_html' => __( '₪', 'wp-e-commerce' ),
+ 'code' => __( 'ILS', 'wp-e-commerce' ),
'continent' => 'asiapacific',
'visible' => '0',
) );
@@ -274,9 +274,9 @@ function _wpsc_fix_republic_of_the_congo() {
function _wpsc_fix_currency_el_salvador() {
$country = new WPSC_Country( array(
'isocode' => 'SV',
- 'currency' => __( 'US Dollar', 'wpsc' ),
- 'symbol' => __( '$', 'wpsc' ),
- 'symbol_html' => __( '$', 'wpsc' ),
+ 'currency' => __( 'US Dollar', 'wp-e-commerce' ),
+ 'symbol' => __( '$', 'wp-e-commerce' ),
+ 'symbol_html' => __( '$', 'wp-e-commerce' ),
'code' => 'USD',
) );
}
@@ -421,9 +421,9 @@ function _wpsc_fix_venezuela_currency() {
function _wpsc_fix_zimbabwe_currency() {
$country = new WPSC_Country( array(
'isocode' => 'ZW',
- 'currency' => __( 'US Dollar', 'wpsc' ),
- 'symbol' => __( '$', 'wpsc' ),
- 'symbol_html' => __( '$', 'wpsc' ),
+ 'currency' => __( 'US Dollar', 'wp-e-commerce' ),
+ 'symbol' => __( '$', 'wp-e-commerce' ),
+ 'symbol_html' => __( '$', 'wp-e-commerce' ),
'code' => 'USD',
'continent' => 'asiapacific',
) );
@@ -179,7 +179,7 @@ private function get_row_actions( $item ) {
'post' => $item->ID,
'bulk_action_nonce' => wp_create_nonce( 'wpsc_product_variations_bulk_action' ),
) );
- $actions['hide'] = '<a class="wpsc-variation-hide-link" href="' . esc_url( $hide_url ) . '" title="' . __( 'Mark this variation as draft to hide it from the front-end.', 'wpsc' ) . '">' . __( 'Mark as Draft', 'wpsc' ) . '</a>';
+ $actions['hide'] = '<a class="wpsc-variation-hide-link" href="' . esc_url( $hide_url ) . '" title="' . __( 'Mark this variation as draft to hide it from the front-end.', 'wp-e-commerce' ) . '">' . __( 'Mark as Draft', 'wp-e-commerce' ) . '</a>';
}
if ( current_user_can( $post_type_object->cap->delete_post, $item->ID ) ) {
@@ -198,7 +198,7 @@ function wpsc_admin_category_forms_add() {
<h4><?php esc_html_e( 'Restrict to Target Markets', 'wp-e-commerce' )?></h4>
<div class='form-field'>
<?php if ( wpsc_is_suhosin_enabled() ) : ?>
- <em><?php esc_html_e( "The Target Markets feature has been disabled because you have the Suhosin PHP extension installed on this server. If you need to use the Target Markets feature, then disable the suhosin extension. If you can not do this, you will need to contact your hosting provider.", 'wpsc' ); ?></em>
+ <em><?php esc_html_e( "The Target Markets feature has been disabled because you have the Suhosin PHP extension installed on this server. If you need to use the Target Markets feature, then disable the suhosin extension. If you can not do this, you will need to contact your hosting provider.", 'wp-e-commerce' ); ?></em>
<?php else: ?>
<div class='multiple-select-container'>
<span><?php esc_html_e( 'Select', 'wp-e-commerce' ); ?> <a href='' class='wpsc_select_all'><?php esc_html_e( 'All', 'wp-e-commerce' ); ?></a>&nbsp; <a href='' class='wpsc_select_none'><?php esc_html_e( 'None', 'wp-e-commerce' ); ?></a></span><br />
@@ -39,8 +39,8 @@ public function display_payment_gateway_settings_form( $selected_gateway = null
$payment_data = $this->get_gateway_form( $selected_gateway );
if ( ! $payment_data ) {
$payment_data = array(
- 'name' => __( 'Edit Gateway Settings', 'wpsc' ),
- 'form_fields' => __( 'Modify the settings of a payment gateway by clicking the "Edit" link on the left.', 'wpsc' ),
+ 'name' => __( 'Edit Gateway Settings', 'wp-e-commerce' ),
+ 'form_fields' => __( 'Modify the settings of a payment gateway by clicking the "Edit" link on the left.', 'wp-e-commerce' ),
'has_submit_button' => 1,
);
}
@@ -85,7 +85,7 @@ public function display() {
<?php
// check for the suhosin module
if ( wpsc_is_suhosin_enabled() ) {
- echo "<em>" . __( "The Target Markets feature has been disabled because you have the Suhosin PHP extension installed on this server. If you need to use the Target Markets feature, then disable the suhosin extension. If you can not do this, you will need to contact your hosting provider.", 'wpsc' ) . "</em>";
+ echo "<em>" . __( "The Target Markets feature has been disabled because you have the Suhosin PHP extension installed on this server. If you need to use the Target Markets feature, then disable the suhosin extension. If you can not do this, you will need to contact your hosting provider.", 'wp-e-commerce' ) . "</em>";
} else {
?>
<span>
@@ -188,7 +188,7 @@ public function google_analytics_integration_settings_form() {
<input value='1' <?php checked( '1', get_option( 'wpsc_ga_currently_tracking' ) ); ?> type='checkbox' name='wpsc_ga_currently_tracking' />
<?php _e( 'Google Analytics is tracking my site', 'wp-e-commerce' ); ?>
</label>
- <p class='description'><?php printf( __( 'Enable this if the Google Analytics tracking code is already present on your site, e.g. manually placed in your theme, or managed by another plugin. We will only insert the <a href="%s">E-Commerce tracking events</a> on the transaction results page.', 'wpsc' ), 'https://developers.google.com/analytics/devguides/collection/gajs/methods/gaJSApiEcommerce'); ?></p>
+ <p class='description'><?php printf( __( 'Enable this if the Google Analytics tracking code is already present on your site, e.g. manually placed in your theme, or managed by another plugin. We will only insert the <a href="%s">E-Commerce tracking events</a> on the transaction results page.', 'wp-e-commerce' ), 'https://developers.google.com/analytics/devguides/collection/gajs/methods/gaJSApiEcommerce'); ?></p>
</td>
</tr>
<tr>
@@ -200,7 +200,7 @@ public function google_analytics_integration_settings_form() {
<input value='1' <?php checked( '1', get_option( 'wpsc_ga_advanced' ) ); ?> type='checkbox' name='wpsc_ga_advanced' />
<?php _e( 'Enable Advanced Mode', 'wp-e-commerce' ); ?>
</label>
- <p class='description'><?php _e( 'By default, we insert the multiple-domain asynchronous tracking code. This should be fine for 99% of users. If you need to fine-tune it, select the Advanced option. Then, instead of simply entering your tracking ID, you will enter the tracking code from Google Analytics into the header.php file of your theme.', 'wpsc' ); ?></p>
+ <p class='description'><?php _e( 'By default, we insert the multiple-domain asynchronous tracking code. This should be fine for 99% of users. If you need to fine-tune it, select the Advanced option. Then, instead of simply entering your tracking ID, you will enter the tracking code from Google Analytics into the header.php file of your theme.', 'wp-e-commerce' ); ?></p>
</td>
</tr>
</table>
@@ -155,8 +155,8 @@ public function display() {
<td>
<input type='text' name='wpsc_options[base_zipcode]' value='<?php esc_attr_e( get_option( 'base_zipcode' ) ); ?>' />
<p class='description'>
- <?php esc_html_e( 'The ZIP code / Postal code from where you fulfill and ship orders.', 'wpsc' ); ?><br />
- <?php esc_html_e( 'If you are based in the United States, then this field is required in order for the UPS and USPS Shipping Calculators to work.', 'wpsc' ); ?>
+ <?php esc_html_e( 'The ZIP code / Postal code from where you fulfill and ship orders.', 'wp-e-commerce' ); ?><br />
+ <?php esc_html_e( 'If you are based in the United States, then this field is required in order for the UPS and USPS Shipping Calculators to work.', 'wp-e-commerce' ); ?>
</p>
</td>
</tr>
@@ -282,7 +282,7 @@ public function display() {
<h4><?php _e( 'External Shipping Calculators', 'wp-e-commerce' ); ?></h4>
<?php if ( ! function_exists( 'curl_init' ) ) : ?>
<p style='color: red; font-size:8pt; line-height:10pt;'>
- <?php _e( 'The following shipping modules all need cURL which is not installed on this server. You may need to contact your web hosting provider to get it set up. ', 'wpsc' ); ?>
+ <?php _e( 'The following shipping modules all need cURL which is not installed on this server. You may need to contact your web hosting provider to get it set up. ', 'wp-e-commerce' ); ?>
</p>
<?php endif; ?>
<table id='wpsc-shipping-options-external' class='wpsc-edit-module-options wp-list-table widefat plugins'>
View
@@ -477,7 +477,7 @@ function wpsc_purchlog_clear_download_items( $log_id = '' ) {
$download_links .= add_query_arg( 'downloadid', $downloadable_item['uniqueid'], home_url() ) . "\n";
}
- wp_mail( $email_address, __( 'The administrator has unlocked your file', 'wpsc' ), str_replace( "[download_links]", $download_links, __( 'Dear Customer, We are pleased to advise you that your order has been updated and your downloads are now active. Please download your purchase using the links provided below. [download_links] Thank you for your order.', 'wpsc' ) ), "From: " . get_option( 'return_email' ) );
+ wp_mail( $email_address, __( 'The administrator has unlocked your file', 'wp-e-commerce' ), str_replace( "[download_links]", $download_links, __( 'Dear Customer, We are pleased to advise you that your order has been updated and your downloads are now active. Please download your purchase using the links provided below. [download_links] Thank you for your order.', 'wp-e-commerce' ) ), "From: " . get_option( 'return_email' ) );
return true;
@@ -121,7 +121,7 @@ public static function auth_access() {
// Close the authentication popup ?>
<!DOCTYPE html><html>
<head>
- <title><?php _e( 'Redirecting...', 'wpsc' ); ?></title>
+ <title><?php _e( 'Redirecting...', 'wp-e-commerce' ); ?></title>
<script type="text/javascript">
parent.location = '<?php echo wp_validate_redirect( $return_url ); ?>';
window.close();
@@ -674,12 +674,12 @@ public function setup_form() {
</tr>
<tr>
<td colspan="2">
- <p><?php _e( "Your base currency is currently not accepted by PayPal. As a result, before a payment request is sent to PayPal, WP eCommerce has to convert the amounts into one of PayPal's supported currencies. Please select your preferred currency below.", 'wpsc' ); ?></p>
+ <p><?php _e( "Your base currency is currently not accepted by PayPal. As a result, before a payment request is sent to PayPal, WP eCommerce has to convert the amounts into one of PayPal's supported currencies. Please select your preferred currency below.", 'wp-e-commerce' ); ?></p>
</td>
</tr>
<tr>
<td>
- <label for "wpsc-paypal-express-currency"><?php _e( 'PayPal Currency', 'wpsc' ); ?></label>
+ <label for "wpsc-paypal-express-currency"><?php _e( 'PayPal Currency', 'wp-e-commerce' ); ?></label>
</td>
<td>
<select name="<?php echo esc_attr( $this->setting->get_field_name( 'currency' ) ); ?>" id="wpsc-paypal-express-currency">
@@ -854,7 +854,7 @@ public function setup_form() {
</tr>
<tr>
<td colspan="2">
- <p><?php _e( "Your base currency is currently not accepted by PayPal. As a result, before a payment request is sent to PayPal, WP eCommerce has to convert the amounts into one of PayPal's supported currencies. Please select your preferred currency below.", 'wpsc' ); ?></p>
+ <p><?php _e( "Your base currency is currently not accepted by PayPal. As a result, before a payment request is sent to PayPal, WP eCommerce has to convert the amounts into one of PayPal's supported currencies. Please select your preferred currency below.", 'wp-e-commerce' ); ?></p>
</td>
</tr>
<tr>
@@ -445,7 +445,7 @@ public function setup_form() {
</tr>
<tr>
<td colspan="2">
- <p><?php _e( "Your base currency is currently not accepted by PayPal. As a result, before a payment request is sent to PayPal, WP eCommerce has to convert the amounts into one of PayPal's supported currencies. Please select your preferred currency below.", 'wpsc' ); ?></p>
+ <p><?php _e( "Your base currency is currently not accepted by PayPal. As a result, before a payment request is sent to PayPal, WP eCommerce has to convert the amounts into one of PayPal's supported currencies. Please select your preferred currency below.", 'wp-e-commerce' ); ?></p>
</td>
</tr>
<tr>
@@ -42,7 +42,7 @@ function _wpsc_filter_merchant_v3_gateway_form( $form, $gateway_id ) {
</td>
<td style='border-top: none;'>
<input type='text' name='user_defined_name[<?php echo esc_attr( $gateway_id ); ?>]' value='<?php echo esc_attr( $display_name ); ?>' /><br />
- <span class='small description'><?php _e('The text that people see when making a purchase.', 'wpsc'); ?></span>
+ <span class='small description'><?php _e('The text that people see when making a purchase.', 'wp-e-commerce'); ?></span>
</td>
</tr>
<?php
@@ -166,8 +166,8 @@ private function theme_metabox(){
</p>
<br style="clear:both" />
- <p><?php esc_html_e( 'If you have moved your files in some other way, e.g. through FTP, you may need to click the Flush Theme Cache. This will refresh the locations in which WordPress looks for your templates.' ,'wpsc' ); ?></p>
- <p><?php printf( __( '<a href="%s" class="button">Flush Theme Cache</a>', 'wpsc' ), wp_nonce_url( 'admin.php?wpsc_flush_theme_transients=true', 'wpsc_flush_theme_transients' ) ); ?></p>
+ <p><?php esc_html_e( 'If you have moved your files in some other way, e.g. through FTP, you may need to click the Flush Theme Cache. This will refresh the locations in which WordPress looks for your templates.' ,'wp-e-commerce' ); ?></p>
+ <p><?php printf( __( '<a href="%s" class="button">Flush Theme Cache</a>', 'wp-e-commerce' ), wp_nonce_url( 'admin.php?wpsc_flush_theme_transients=true', 'wpsc_flush_theme_transients' ) ); ?></p>
<br style="clear:both" />
<br style="clear:both" />
</div>
@@ -630,7 +630,7 @@ function wpsc_submit_checkout( $collected_data = true ) {
}
if ( ! empty( $countries ) && ! in_array( $country_id, (array) $countries ) ) {
- $errormessage = sprintf( __( '%s cannot be shipped to %s. To continue with your transaction, please remove this product from the list below.', 'wpsc' ), $cartitem->get_title(), $country_name );
+ $errormessage = sprintf( __( '%s cannot be shipped to %s. To continue with your transaction, please remove this product from the list below.', 'wp-e-commerce' ), $cartitem->get_title(), $country_name );
wpsc_update_customer_meta( 'category_shipping_conflict', $errormessage );
$is_valid = false;
}
@@ -959,13 +959,13 @@ function wpsc_update_shipping_quotes_on_shipping_same_as_billing() {
<?php if ( ! wpsc_have_valid_shipping_zipcode() ) : ?>
<tr class='wpsc_update_location'>
<td colspan='5' class='shipping_error' >
- <?php _e('Please provide a ZIP code and click Calculate in order to continue.', 'wpsc'); ?>
+ <?php _e('Please provide a ZIP code and click Calculate in order to continue.', 'wp-e-commerce'); ?>
</td>
</tr>
<?php else: ?>
<tr class='wpsc_update_location_error'>
<td colspan='5' class='shipping_error' >
- <?php _e('Sorry, online ordering is unavailable for this destination and/or weight. Please double check your destination details.', 'wpsc'); ?>
+ <?php _e('Sorry, online ordering is unavailable for this destination and/or weight. Please double check your destination details.', 'wp-e-commerce'); ?>
</td>
</tr>
<?php endif; ?>
@@ -89,7 +89,7 @@ function wpsc_transaction_theme() {
if($result == 'Insufficient Funds' && $ec == 5){
$processed_id = '6';
- $payment_instructions = printf( __( 'Sorry, your transaction was not accepted due to insufficient funds <br /><a href="%1$s">Click here to go back to the checkout page</a>.', 'wpsc' ), get_option( "shopping_cart_url" ) );
+ $payment_instructions = printf( __( 'Sorry, your transaction was not accepted due to insufficient funds <br /><a href="%1$s">Click here to go back to the checkout page</a>.', 'wp-e-commerce' ), get_option( "shopping_cart_url" ) );
}
if ( $processed_id )
wpsc_update_purchase_log_status( $sessionid, $processed_id, 'sessionid' );
@@ -120,6 +120,6 @@ function wpsc_transaction_theme() {
$cart_log_id = $wpdb->get_var( $wpdb->prepare( "SELECT `id` FROM `" . WPSC_TABLE_PURCHASE_LOGS . "` WHERE `sessionid`= %s LIMIT 1", $sessionid ) );
return transaction_results( $sessionid, true );
}else
- printf( __( 'Sorry, your transaction was not accepted.<br /><a href="%1$s">Click here to go back to the checkout page</a>.', 'wpsc' ), get_option( "shopping_cart_url" ) );
+ printf( __( 'Sorry, your transaction was not accepted.<br /><a href="%1$s">Click here to go back to the checkout page</a>.', 'wp-e-commerce' ), get_option( "shopping_cart_url" ) );
}
}
Oops, something went wrong.

0 comments on commit 45e78db

Please sign in to comment.