From cc41c38ff8bd7b3f988c5b7f93c87670688cc94d Mon Sep 17 00:00:00 2001
From: Mike Jolley <mike.jolley@me.com>
Date: Tue, 24 May 2016 19:09:07 +0100
Subject: [PATCH] Tweak page titles on account pages

---
 includes/admin/settings/class-wc-settings-accounts.php | 4 ++--
 includes/class-wc-query.php                            | 4 ++--
 templates/myaccount/my-address.php                     | 8 ++------
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/includes/admin/settings/class-wc-settings-accounts.php b/includes/admin/settings/class-wc-settings-accounts.php
index adb0534657c..65ae405d443 100644
--- a/includes/admin/settings/class-wc-settings-accounts.php
+++ b/includes/admin/settings/class-wc-settings-accounts.php
@@ -146,8 +146,8 @@ class WC_Settings_Accounts extends WC_Settings_Page {
 			),
 
 			array(
-				'title'    => __( 'Edit Address', 'woocommerce' ),
-				'desc'     => __( 'Endpoint for the My Account &rarr; Edit Address page', 'woocommerce' ),
+				'title'    => __( 'Addresses', 'woocommerce' ),
+				'desc'     => __( 'Endpoint for the My Account &rarr; Addresses page', 'woocommerce' ),
 				'id'       => 'woocommerce_myaccount_edit_address_endpoint',
 				'type'     => 'text',
 				'default'  => 'edit-address',
diff --git a/includes/class-wc-query.php b/includes/class-wc-query.php
index 13aebec7984..4175d303f95 100644
--- a/includes/class-wc-query.php
+++ b/includes/class-wc-query.php
@@ -110,10 +110,10 @@ class WC_Query {
 				$title = __( 'Downloads', 'woocommerce' );
 			break;
 			case 'edit-account' :
-				$title = __( 'Edit Account Details', 'woocommerce' );
+				$title = __( 'Account Details', 'woocommerce' );
 			break;
 			case 'edit-address' :
-				$title = __( 'Edit Address', 'woocommerce' );
+				$title = __( 'Addresses', 'woocommerce' );
 			break;
 			case 'payment-methods' :
 				$title = __( 'Payment Methods', 'woocommerce' );
diff --git a/templates/myaccount/my-address.php b/templates/myaccount/my-address.php
index 914115afa77..0540e4a627b 100644
--- a/templates/myaccount/my-address.php
+++ b/templates/myaccount/my-address.php
@@ -23,24 +23,20 @@ if ( ! defined( 'ABSPATH' ) ) {
 $customer_id = get_current_user_id();
 
 if ( ! wc_ship_to_billing_address_only() && wc_shipping_enabled() ) {
-	$page_title = apply_filters( 'woocommerce_my_account_my_address_title', __( 'My Addresses', 'woocommerce' ) );
 	$get_addresses = apply_filters( 'woocommerce_my_account_get_addresses', array(
 		'billing' => __( 'Billing Address', 'woocommerce' ),
 		'shipping' => __( 'Shipping Address', 'woocommerce' )
 	), $customer_id );
 } else {
-	$page_title = apply_filters( 'woocommerce_my_account_my_address_title', __( 'My Address', 'woocommerce' ) );
 	$get_addresses = apply_filters( 'woocommerce_my_account_get_addresses', array(
 		'billing' =>  __( 'Billing Address', 'woocommerce' )
 	), $customer_id );
 }
 
-$oldcol    = 1;
-$col = 1;
+$oldcol = 1;
+$col    = 1;
 ?>
 
-<h2><?php echo $page_title; ?></h2>
-
 <p>
 	<?php echo apply_filters( 'woocommerce_my_account_my_address_description', __( 'The following addresses will be used on the checkout page by default.', 'woocommerce' ) ); ?>
 </p>