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

Merge pull request #7466 from qTranslate-Team/master 

replace get_bloginfo('name') with get_bloginfo('name', 'display')
This commit is contained in:
Claudio Sanches 2015-02-18 13:44:49 -02:00
parent 12732ce3a6 6c9f863c04
commit 0979fc475a
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
includes/admin/settings/class-wc-settings-emails.php
View File

@ -75,7 +75,7 @@ class WC_Settings_Emails extends WC_Settings_Page {
'id' => 'woocommerce_email_from_name', 'id' => 'woocommerce_email_from_name',
'type' => 'text', 'type' => 'text',
'css' => 'min-width:300px;', 'css' => 'min-width:300px;',
'default' => esc_attr(get_bloginfo('title')), 'default' => esc_attr(get_bloginfo('title', 'display')),
'autoload' => false 'autoload' => false
), ),
@ -112,7 +112,7 @@ class WC_Settings_Emails extends WC_Settings_Page {
'id' => 'woocommerce_email_footer_text', 'id' => 'woocommerce_email_footer_text',
'css' => 'width:100%; height: 75px;', 'css' => 'width:100%; height: 75px;',
'type' => 'textarea', 'type' => 'textarea',
'default' => get_bloginfo('title') . ' - ' . __( 'Powered by WooCommerce', 'woocommerce' ), 'default' => get_bloginfo('title', 'display') . ' - ' . __( 'Powered by WooCommerce', 'woocommerce' ),
'autoload' => false 'autoload' => false
), ),

4
includes/gateways/simplify-commerce/class-wc-addons-gateway-simplify-commerce.php
View File

@ -268,7 +268,7 @@ class WC_Addons_Gateway_Simplify_Commerce extends WC_Gateway_Simplify_Commerce {
public function process_subscription_payment( $order = '', $amount = 0 ) { public function process_subscription_payment( $order = '', $amount = 0 ) {
$order_items = $order->get_items(); $order_items = $order->get_items();
$order_item = array_shift( $order_items ); $order_item = array_shift( $order_items );
$subscription_name = sprintf( __( '%s - Subscription for "%s"', 'woocommerce' ), esc_html( get_bloginfo( 'name' ) ), $order_item['name'] ) . ' ' . sprintf( __( '(Order #%s)', 'woocommerce' ), $order->get_order_number() ); $subscription_name = sprintf( __( '%s - Subscription for "%s"', 'woocommerce' ), esc_html( get_bloginfo( 'name', 'display' ) ), $order_item['name'] ) . ' ' . sprintf( __( '(Order #%s)', 'woocommerce' ), $order->get_order_number() );
if ( $amount * 100 < 50 ) { if ( $amount * 100 < 50 ) {
return new WP_Error( 'simplify_error', __( 'Sorry, the minimum allowed order total is 0.50 to use this payment method.', 'woocommerce' ) ); return new WP_Error( 'simplify_error', __( 'Sorry, the minimum allowed order total is 0.50 to use this payment method.', 'woocommerce' ) );
@ -371,7 +371,7 @@ class WC_Addons_Gateway_Simplify_Commerce extends WC_Gateway_Simplify_Commerce {
try { try {
$order_items = $order->get_items(); $order_items = $order->get_items();
$order_item = array_shift( $order_items ); $order_item = array_shift( $order_items );
$pre_order_name = sprintf( __( '%s - Pre-order for "%s"', 'woocommerce' ), esc_html( get_bloginfo( 'name' ) ), $order_item['name'] ) . ' ' . sprintf( __( '(Order #%s)', 'woocommerce' ), $order->get_order_number() ); $pre_order_name = sprintf( __( '%s - Pre-order for "%s"', 'woocommerce' ), esc_html( get_bloginfo( 'name', 'display' ) ), $order_item['name'] ) . ' ' . sprintf( __( '(Order #%s)', 'woocommerce' ), $order->get_order_number() );
$customer_id = get_post_meta( $order->id, '_simplify_customer_id', true ); $customer_id = get_post_meta( $order->id, '_simplify_customer_id', true );

4
includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php
View File

@ -326,7 +326,7 @@ class WC_Gateway_Simplify_Commerce extends WC_Payment_Gateway {
$payment = Simplify_Payment::createPayment( array( $payment = Simplify_Payment::createPayment( array(
'amount' => $order->order_total * 100, // In cents 'amount' => $order->order_total * 100, // In cents
'token' => $cart_token, 'token' => $cart_token,
'description' => sprintf( __( '%s - Order #%s', 'woocommerce' ), esc_html( get_bloginfo( 'name' ) ), $order->get_order_number() ), 'description' => sprintf( __( '%s - Order #%s', 'woocommerce' ), esc_html( get_bloginfo( 'name', 'display' ) ), $order->get_order_number() ),
'currency' => strtoupper( get_woocommerce_currency() ), 'currency' => strtoupper( get_woocommerce_currency() ),
'reference' => $order->id, 'reference' => $order->id,
'card.addressCity' => $order->billing_city, 'card.addressCity' => $order->billing_city,
@ -408,7 +408,7 @@ class WC_Gateway_Simplify_Commerce extends WC_Payment_Gateway {
'sc-key' => $this->public_key, 'sc-key' => $this->public_key,
'amount' => $order->order_total * 100, 'amount' => $order->order_total * 100,
'reference' => $order->id, 'reference' => $order->id,
'name' => esc_html( get_bloginfo( 'name' ) ), 'name' => esc_html( get_bloginfo( 'name', 'display' ) ),
'description' => sprintf( __( 'Order #%s', 'woocommerce' ), $order->get_order_number() ), 'description' => sprintf( __( 'Order #%s', 'woocommerce' ), $order->get_order_number() ),
'receipt' => 'false', 'receipt' => 'false',
'color' => $this->modal_color, 'color' => $this->modal_color,

2
templates/emails/customer-invoice.php
View File

@ -17,7 +17,7 @@ if ( ! defined( 'ABSPATH' ) ) {
<?php if ( $order->has_status( 'pending' ) ) : ?> <?php if ( $order->has_status( 'pending' ) ) : ?>
<p><?php printf( __( 'An order has been created for you on %s. To pay for this order please use the following link: %s', 'woocommerce' ), get_bloginfo( 'name' ), '<a href="' . esc_url( $order->get_checkout_payment_url() ) . '">' . __( 'pay', 'woocommerce' ) . '</a>' ); ?></p> <p><?php printf( __( 'An order has been created for you on %s. To pay for this order please use the following link: %s', 'woocommerce' ), get_bloginfo( 'name', 'display' ), '<a href="' . esc_url( $order->get_checkout_payment_url() ) . '">' . __( 'pay', 'woocommerce' ) . '</a>' ); ?></p>
<?php endif; ?> <?php endif; ?>

4
templates/emails/email-header.php
View File

@ -16,7 +16,7 @@ if ( ! defined( 'ABSPATH' ) ) {
<html> <html>
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title><?php echo get_bloginfo( 'name' ); ?></title> <title><?php echo get_bloginfo( 'name', 'display' ); ?></title>
</head> </head>
<body <?php echo is_rtl() ? 'rightmargin' : 'leftmargin'; ?>="0" marginwidth="0" topmargin="0" marginheight="0" offset="0"> <body <?php echo is_rtl() ? 'rightmargin' : 'leftmargin'; ?>="0" marginwidth="0" topmargin="0" marginheight="0" offset="0">
<div id="wrapper"> <div id="wrapper">
@ -26,7 +26,7 @@ if ( ! defined( 'ABSPATH' ) ) {
<div id="template_header_image"> <div id="template_header_image">
<?php <?php
if ( $img = get_option( 'woocommerce_email_header_image' ) ) { if ( $img = get_option( 'woocommerce_email_header_image' ) ) {
echo '<p style="margin-top:0;"><img src="' . esc_url( $img ) . '" alt="' . get_bloginfo( 'name' ) . '" /></p>'; echo '<p style="margin-top:0;"><img src="' . esc_url( $img ) . '" alt="' . get_bloginfo( 'name', 'display' ) . '" /></p>';
} }
?> ?>
</div> </div>

2
templates/emails/plain/customer-invoice.php
View File

@ -14,7 +14,7 @@ if ( ! defined( 'ABSPATH' ) ) {
echo $email_heading . "\n\n"; echo $email_heading . "\n\n";
if ( $order->has_status( 'pending' ) ) if ( $order->has_status( 'pending' ) )
echo sprintf( __( 'An order has been created for you on %s. To pay for this order please use the following link: %s', 'woocommerce' ), get_bloginfo( 'name' ), $order->get_checkout_payment_url() ) . "\n\n"; echo sprintf( __( 'An order has been created for you on %s. To pay for this order please use the following link: %s', 'woocommerce' ), get_bloginfo( 'name', 'display' ), $order->get_checkout_payment_url() ) . "\n\n";
echo "****************************************************\n\n"; echo "****************************************************\n\n";