Skip to content

Commit

Permalink
ENGCOM-2159: fix: change "My Dashboard" to "My Account", fixes #16007 #…
Browse files Browse the repository at this point in the history
  • Loading branch information
VladimirZaets authored Jul 2, 2018

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
2 parents 9f0ef00 + 5a088e6 commit 2eec840
Showing 10 changed files with 8 additions and 12 deletions.
2 changes: 1 addition & 1 deletion app/code/Magento/Customer/etc/frontend/page_types.xml
Original file line number Diff line number Diff line change
@@ -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"/>
2 changes: 0 additions & 2 deletions app/code/Magento/Customer/i18n/en_US.csv
Original file line number Diff line number Diff line change
@@ -531,8 +531,6 @@ 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"
Original file line number Diff line number Diff line change
@@ -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>
Original file line number Diff line number Diff line change
@@ -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">
1 change: 0 additions & 1 deletion app/design/frontend/Magento/blank/i18n/en_US.csv
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
Summary,Summary
"Account Dashboard","Account Dashboard"
"Account Information","Account Information"
"Address Book","Address Book"
Menu,Menu
Original file line number Diff line number Diff line change
@@ -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>
1 change: 0 additions & 1 deletion app/design/frontend/Magento/luma/i18n/en_US.csv
Original file line number Diff line number Diff line change
@@ -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"
Original file line number Diff line number Diff line change
@@ -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",
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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();

0 comments on commit 2eec840

Please sign in to comment.