Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from Jul 7, 2018
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4aac430
fix: change "My Dashboard" to "My Account"
Jun 11, 2018
9f14c7d
fix: change "Account Dashboard" to "My Account"
Jul 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/code/Magento/Customer/etc/frontend/page_types.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down
2 changes: 0 additions & 2 deletions app/code/Magento/Customer/i18n/en_US.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Customer/view/frontend/layout/customer_account.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Customer/view/frontend/layout/customer_account_index.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
1 change: 0 additions & 1 deletion app/design/frontend/Magento/blank/i18n/en_US.csv
View file
Open in desktop
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
Expand Down
4 changes: 2 additions & 2 deletions app/design/frontend/Magento/luma/Magento_Customer/layout/customer_account.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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="-">
Expand All @@ -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>
Expand Down
1 change: 0 additions & 1 deletion app/design/frontend/Magento/luma/i18n/en_US.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion .../functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerDefaultAddresses.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion ...nctional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerRedirectToDashboard.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...ests/functional/tests/app/Magento/Customer/Test/TestStep/LogoutCustomerOnFrontendStep.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down