ENGCOM-2182: [Forwardport] fix: change "My Dashboard" to "My Account", fixes #16007 #16520

Stanislav Idolov · web-flow · commit 57c4675eb952 · 2018-07-06T16:43:45.000+03:00
diff --git a/app/code/Magento/Customer/etc/frontend/page_types.xml b/app/code/Magento/Customer/etc/frontend/page_types.xml
@@ -11,7 +11,7 @@
     <type id="customer_account_createpassword" label="Reset a Password"/>
     <type id="customer_account_edit" label="Customer Account Edit Form"/>
     <type id="customer_account_forgotpassword" label="Customer Forgot Password Form"/>
-    <type id="customer_account_index" label="Customer My Account Dashboard"/>
+    <type id="customer_account_index" label="Customer My Account"/>
     <type id="customer_account_login" label="Customer Account Login Form"/>
     <type id="customer_account_logoutsuccess" label="Customer Account Logout Success"/>
     <type id="customer_address_form" label="Customer My Account Address Edit Form"/>
diff --git a/app/code/Magento/Customer/i18n/en_US.csv b/app/code/Magento/Customer/i18n/en_US.csv
@@ -531,10 +531,8 @@ Type,Type
 "Send Welcome Email From","Send Welcome Email From"
 "Are you sure you want to delete this item?","Are you sure you want to delete this item?"
 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"
 "Associate to Website","Associate to Website"
 "Prefix","Prefix"
diff --git a/app/code/Magento/Customer/view/frontend/layout/customer_account.xml b/app/code/Magento/Customer/view/frontend/layout/customer_account.xml
@@ -22,7 +22,7 @@
                     </arguments>
                     <block class="Magento\Customer\Block\Account\SortLinkInterface" name="customer-account-navigation-account-link">
                         <arguments>
-                            <argument name="label" xsi:type="string" translate="true">Account Dashboard</argument>
+                            <argument name="label" xsi:type="string" translate="true">My Account</argument>
                             <argument name="path" xsi:type="string">customer/account</argument>
                             <argument name="sortOrder" xsi:type="number">250</argument>
                         </arguments>
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
@@ -10,7 +10,7 @@
     <body>
         <referenceBlock name="page.main.title">
             <action method="setPageTitle">
-                <argument translate="true" name="title" xsi:type="string">My Dashboard</argument>
+                <argument translate="true" name="title" xsi:type="string">My Account</argument>
             </action>
         </referenceBlock>
         <referenceContainer name="content">
diff --git 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
@@ -10,7 +10,7 @@
         <referenceContainer name="sidebar.main">
             <block class="Magento\Framework\View\Element\Template" name="customer_account_navigation_block" template="Magento_Theme::html/collapsible.phtml" before="-">
                 <arguments>
-                    <argument name="block_title" translate="true" xsi:type="string">Account Dashboard</argument>
+                    <argument name="block_title" translate="true" xsi:type="string">My Account</argument>
                     <argument name="block_css" xsi:type="string">block-collapsible-nav</argument>
                 </arguments>
                 <block class="Magento\Customer\Block\Account\Navigation" name="customer_account_navigation" before="-">
@@ -19,7 +19,7 @@
                     </arguments>
                     <block class="Magento\Customer\Block\Account\SortLinkInterface" name="customer-account-navigation-account-link">
                         <arguments>
-                            <argument name="label" xsi:type="string" translate="true">Account Dashboard</argument>
+                            <argument name="label" xsi:type="string" translate="true">My Account</argument>
                             <argument name="path" xsi:type="string">customer/account</argument>
                             <argument name="sortOrder" xsi:type="number">250</argument>
                         </arguments>
diff --git a/app/design/frontend/Magento/luma/i18n/en_US.csv b/app/design/frontend/Magento/luma/i18n/en_US.csv
@@ -52,6 +52,5 @@ Footer,Footer
 "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"
-"Account Dashboard","Account Dashboard"
 "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
@@ -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",
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
@@ -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
@@ -49,7 +49,7 @@ public function run()
     {
         $this->customerAccount->open();
         $this->cmsIndex->getCmsPageBlock()->waitPageInit();
-        if ($this->cmsIndex->getTitleBlock()->getTitle() === 'My Dashboard') {
+        if ($this->cmsIndex->getTitleBlock()->getTitle() === 'My Account') {
             $this->cmsIndex->getLinksBlock()->openLink('Sign Out');
             $this->cmsIndex->getCmsPageBlock()->waitUntilTextIsVisible('Home Page');
             $this->cmsIndex->getCmsPageBlock()->waitPageInit();

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`Summary,Summary`
`2`		`-"Account Dashboard","Account Dashboard"`
`3`	`2`	`"Account Information","Account Information"`
`4`	`3`	`"Address Book","Address Book"`
`5`	`4`	`Menu,Menu`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ class AssertCustomerDefaultAddresses extends AbstractConstraint`
`24`	`24`	`*/`
`25`	`25`	`public function processAssert(CustomerAccountIndex $customerAccountIndex, Address $address)`
`26`	`26`	`{`
`27`		`- $customerAccountIndex->getAccountMenuBlock()->openMenuItem('Account Dashboard');`
	`27`	`+ $customerAccountIndex->getAccountMenuBlock()->openMenuItem('My Account');`
`28`	`28`	`sleep(6);`
`29`	`29`	`$defaultBillingAddress = explode(`
`30`	`30`	`"\n",`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public function run()`
`49`	`49`	`{`
`50`	`50`	`$this->customerAccount->open();`
`51`	`51`	`$this->cmsIndex->getCmsPageBlock()->waitPageInit();`
`52`		`- if ($this->cmsIndex->getTitleBlock()->getTitle() === 'My Dashboard') {`
	`52`	`+ if ($this->cmsIndex->getTitleBlock()->getTitle() === 'My Account') {`
`53`	`53`	`$this->cmsIndex->getLinksBlock()->openLink('Sign Out');`
`54`	`54`	`$this->cmsIndex->getCmsPageBlock()->waitUntilTextIsVisible('Home Page');`
`55`	`55`	`$this->cmsIndex->getCmsPageBlock()->waitPageInit();`