From 89f07da20dc194bfd6ed719820d80db0d39dcf41 Mon Sep 17 00:00:00 2001
From: Remi Corson <remicorson@gmail.com>
Date: Tue, 11 Feb 2020 10:46:32 +0100
Subject: [PATCH] Replace {sitde_address} by {site_url} for consistency

Replace {sitde_address} by {site_url} for consistency in WooCommerce emails, for better consistency.
---
 includes/admin/settings/class-wc-settings-emails.php         | 2 +-
 includes/class-wc-emails.php                                 | 2 +-
 includes/emails/class-wc-email-customer-invoice.php          | 2 +-
 includes/emails/class-wc-email-customer-processing-order.php | 2 +-
 includes/emails/class-wc-email.php                           | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/includes/admin/settings/class-wc-settings-emails.php b/includes/admin/settings/class-wc-settings-emails.php
index 5c5525bafd5..00df3150196 100644
--- a/includes/admin/settings/class-wc-settings-emails.php
+++ b/includes/admin/settings/class-wc-settings-emails.php
@@ -128,7 +128,7 @@ class WC_Settings_Emails extends WC_Settings_Page {
 				array(
 					'title'       => __( 'Footer text', 'woocommerce' ),
 					/* translators: %s: Available placeholders for use */
-					'desc'        => __( 'The text to appear in the footer of all WooCommerce emails.', 'woocommerce' ) . ' ' . sprintf( __( 'Available placeholders: %s', 'woocommerce' ), '{site_title} {site_address}' ),
+					'desc'        => __( 'The text to appear in the footer of all WooCommerce emails.', 'woocommerce' ) . ' ' . sprintf( __( 'Available placeholders: %s', 'woocommerce' ), '{site_title} {site_url}' ),
 					'id'          => 'woocommerce_email_footer_text',
 					'css'         => 'width:400px; height: 75px;',
 					'placeholder' => __( 'N/A', 'woocommerce' ),
diff --git a/includes/class-wc-emails.php b/includes/class-wc-emails.php
index 3edef5e03f3..a7d98673910 100644
--- a/includes/class-wc-emails.php
+++ b/includes/class-wc-emails.php
@@ -289,7 +289,7 @@ class WC_Emails {
 		return str_replace(
 			array(
 				'{site_title}',
-				'{site_address}',
+				'{site_url}',
 				'{woocommerce}',
 				'{WooCommerce}',
 			),
diff --git a/includes/emails/class-wc-email-customer-invoice.php b/includes/emails/class-wc-email-customer-invoice.php
index 320509cb7a9..a1973bfbc3e 100644
--- a/includes/emails/class-wc-email-customer-invoice.php
+++ b/includes/emails/class-wc-email-customer-invoice.php
@@ -112,7 +112,7 @@ if ( ! class_exists( 'WC_Email_Customer_Invoice', false ) ) :
 		 * @return string
 		 */
 		public function get_default_additional_content() {
-			return __( 'Thanks for using {site_address}!', 'woocommerce' );
+			return __( 'Thanks for using {site_url}!', 'woocommerce' );
 		}
 
 		/**
diff --git a/includes/emails/class-wc-email-customer-processing-order.php b/includes/emails/class-wc-email-customer-processing-order.php
index 589f4a7359c..42fc858c038 100644
--- a/includes/emails/class-wc-email-customer-processing-order.php
+++ b/includes/emails/class-wc-email-customer-processing-order.php
@@ -141,7 +141,7 @@ if ( ! class_exists( 'WC_Email_Customer_Processing_Order', false ) ) :
 		 * @return string
 		 */
 		public function get_default_additional_content() {
-			return __( 'Thanks for using {site_address}!', 'woocommerce' );
+			return __( 'Thanks for using {site_url}!', 'woocommerce' );
 		}
 	}
 
diff --git a/includes/emails/class-wc-email.php b/includes/emails/class-wc-email.php
index 8e7aba18270..9a72b00e577 100644
--- a/includes/emails/class-wc-email.php
+++ b/includes/emails/class-wc-email.php
@@ -232,7 +232,7 @@ class WC_Email extends WC_Settings_API {
 		$this->placeholders = array_merge(
 			array(
 				'{site_title}'   => $this->get_blogname(),
-				'{site_address}' => wp_parse_url( home_url(), PHP_URL_HOST ),
+				'{site_url}' => wp_parse_url( home_url(), PHP_URL_HOST ),
 			),
 			$this->placeholders
 		);