From 92f6cbc244273c2c7f27745e3f33f1facb305f7d Mon Sep 17 00:00:00 2001 From: Daniel Ruf Date: Mon, 11 Jun 2018 13:08:29 +0200 Subject: [PATCH 1/3] fix: change "My Dashboard" to "My Account" --- app/code/Magento/Customer/i18n/en_US.csv | 1 - .../Customer/view/frontend/layout/customer_account_index.xml | 2 +- .../Test/Constraint/AssertCustomerRedirectToDashboard.php | 2 +- .../Customer/Test/TestStep/LogoutCustomerOnFrontendStep.php | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/code/Magento/Customer/i18n/en_US.csv b/app/code/Magento/Customer/i18n/en_US.csv index ab7df0a3aa514..e4654c84005f6 100644 --- a/app/code/Magento/Customer/i18n/en_US.csv +++ b/app/code/Magento/Customer/i18n/en_US.csv @@ -515,7 +515,6 @@ Addresses,Addresses "Account Dashboard","Account Dashboard" "Edit Account Information","Edit Account Information" "Password forgotten","Password forgotten" -"My Dashboard","My Dashboard" "You are signed out","You are signed out" "No Password","No Password" "Weak","Weak" diff --git a/app/code/Magento/Customer/view/frontend/layout/customer_account_index.xml b/app/code/Magento/Customer/view/frontend/layout/customer_account_index.xml index 1c9a142fda351..e4ba073731839 100644 --- a/app/code/Magento/Customer/view/frontend/layout/customer_account_index.xml +++ b/app/code/Magento/Customer/view/frontend/layout/customer_account_index.xml @@ -10,7 +10,7 @@ - My Dashboard + My Account diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerRedirectToDashboard.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerRedirectToDashboard.php index e5201d18b3fd4..96c3c3933cc07 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerRedirectToDashboard.php +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerRedirectToDashboard.php @@ -17,7 +17,7 @@ class AssertCustomerRedirectToDashboard extends AbstractConstraint /** * Dashboard Message on account index page. */ - const DASHBOARD_MESSAGE = 'My Dashboard'; + const DASHBOARD_MESSAGE = 'My Account'; /** * Constraint severeness diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/LogoutCustomerOnFrontendStep.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/LogoutCustomerOnFrontendStep.php index df14db909a8f6..22cd5bd13e94c 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/LogoutCustomerOnFrontendStep.php +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/LogoutCustomerOnFrontendStep.php @@ -49,7 +49,7 @@ public function run() { $this->customerAccount->open(); $this->cmsIndex->getCmsPageBlock()->waitPageInit(); - if ($this->cmsIndex->getTitleBlock()->getTitle() != 'Customer Login') { + if ($this->cmsIndex->getTitleBlock()->getTitle() === 'My Account') { $this->cmsIndex->getLinksBlock()->openLink('Sign Out'); $this->cmsIndex->getCmsPageBlock()->waitUntilTextIsVisible('Home Page'); $this->cmsIndex->getCmsPageBlock()->waitPageInit(); From 6095013a6176f2a3a551741323090fe5d8a30879 Mon Sep 17 00:00:00 2001 From: Daniel Ruf Date: Mon, 2 Jul 2018 10:34:12 +0200 Subject: [PATCH 2/3] fix: change "Account Dashboard" to "My Account" --- .../Customer/etc/frontend/page_types.xml | 2 +- app/code/Magento/Customer/i18n/en_US.csv | 1 - .../view/frontend/layout/customer_account.xml | 31 +++++++++++++++++++ .../frontend/Magento/blank/i18n/en_US.csv | 1 - .../layout/customer_account.xml | 4 +-- .../frontend/Magento/luma/i18n/en_US.csv | 3 ++ .../AssertCustomerDefaultAddresses.php | 2 +- 7 files changed, 38 insertions(+), 6 deletions(-) diff --git a/app/code/Magento/Customer/etc/frontend/page_types.xml b/app/code/Magento/Customer/etc/frontend/page_types.xml index 2c0feeac532a1..a49d735b4467e 100644 --- a/app/code/Magento/Customer/etc/frontend/page_types.xml +++ b/app/code/Magento/Customer/etc/frontend/page_types.xml @@ -11,7 +11,7 @@ - + diff --git a/app/code/Magento/Customer/i18n/en_US.csv b/app/code/Magento/Customer/i18n/en_US.csv index e4654c84005f6..ed33d30d93b9d 100644 --- a/app/code/Magento/Customer/i18n/en_US.csv +++ b/app/code/Magento/Customer/i18n/en_US.csv @@ -512,7 +512,6 @@ Type,Type "Send Welcome Email From","Send Welcome Email From" Addresses,Addresses "Are you sure you want to delete this item?","Are you sure you want to delete this item?" -"Account Dashboard","Account Dashboard" "Edit Account Information","Edit Account Information" "Password forgotten","Password forgotten" "You are signed out","You are signed out" diff --git a/app/code/Magento/Customer/view/frontend/layout/customer_account.xml b/app/code/Magento/Customer/view/frontend/layout/customer_account.xml index dd972321f27e2..1260401d5061f 100644 --- a/app/code/Magento/Customer/view/frontend/layout/customer_account.xml +++ b/app/code/Magento/Customer/view/frontend/layout/customer_account.xml @@ -30,6 +30,37 @@ Address Book customer/address + + + My Account + customer/account + 250 + + + + + 200 + + + + + Address Book + customer/address + 190 + + + + + Account Information + customer/account/edit + 180 + + + + + 130 + + diff --git a/app/design/frontend/Magento/blank/i18n/en_US.csv b/app/design/frontend/Magento/blank/i18n/en_US.csv index b9a1d343b7f2d..a491a567a3777 100644 --- a/app/design/frontend/Magento/blank/i18n/en_US.csv +++ b/app/design/frontend/Magento/blank/i18n/en_US.csv @@ -1,5 +1,4 @@ Summary,Summary -"Account Dashboard","Account Dashboard" "Account Information","Account Information" "Address Book","Address Book" Menu,Menu diff --git a/app/design/frontend/Magento/luma/Magento_Customer/layout/customer_account.xml b/app/design/frontend/Magento/luma/Magento_Customer/layout/customer_account.xml index e64adea22f636..b27d996b6c12f 100644 --- a/app/design/frontend/Magento/luma/Magento_Customer/layout/customer_account.xml +++ b/app/design/frontend/Magento/luma/Magento_Customer/layout/customer_account.xml @@ -10,7 +10,7 @@ - Account Dashboard + My Account block-collapsible-nav @@ -19,7 +19,7 @@ - Account Dashboard + My Account customer/account diff --git a/app/design/frontend/Magento/luma/i18n/en_US.csv b/app/design/frontend/Magento/luma/i18n/en_US.csv index 6f79508746d9d..2146cb8fc24b6 100644 --- a/app/design/frontend/Magento/luma/i18n/en_US.csv +++ b/app/design/frontend/Magento/luma/i18n/en_US.csv @@ -42,3 +42,6 @@ Password:,Password: "Placed on %created_at","Placed on %created_at" "Your shipping confirmation is below. Thank you again for your business.","Your shipping confirmation is below. Thank you again for your business." "Your Shipment #%shipment_id for Order #%order_id","Your Shipment #%shipment_id for Order #%order_id" +"Update to your %store_name shipment","Update to your %store_name shipment" +"Address Book","Address Book" +"Account Information","Account Information" diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerDefaultAddresses.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerDefaultAddresses.php index 07e4717fda4a6..c130af57c48b7 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerDefaultAddresses.php +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerDefaultAddresses.php @@ -24,7 +24,7 @@ class AssertCustomerDefaultAddresses extends AbstractConstraint */ public function processAssert(CustomerAccountIndex $customerAccountIndex, Address $address) { - $customerAccountIndex->getAccountMenuBlock()->openMenuItem('Account Dashboard'); + $customerAccountIndex->getAccountMenuBlock()->openMenuItem('My Account'); sleep(6); $defaultBillingAddress = explode( "\n", From 5b969471f8a656a077959a40dbfeef26b4411dfe Mon Sep 17 00:00:00 2001 From: Vishal Gelani Date: Sun, 29 Jul 2018 07:10:07 +0530 Subject: [PATCH 3/3] Update customer_account.xml --- .../view/frontend/layout/customer_account.xml | 33 +------------------ 1 file changed, 1 insertion(+), 32 deletions(-) diff --git a/app/code/Magento/Customer/view/frontend/layout/customer_account.xml b/app/code/Magento/Customer/view/frontend/layout/customer_account.xml index 1260401d5061f..27000dc013412 100644 --- a/app/code/Magento/Customer/view/frontend/layout/customer_account.xml +++ b/app/code/Magento/Customer/view/frontend/layout/customer_account.xml @@ -15,7 +15,7 @@ - Account Dashboard + My Account customer/account @@ -30,37 +30,6 @@ Address Book customer/address - - - My Account - customer/account - 250 - - - - - 200 - - - - - Address Book - customer/address - 190 - - - - - Account Information - customer/account/edit - 180 - - - - - 130 - -