Skip to content

Updated strings and XML comments. #25064

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

Merged
merged 2 commits into from
Oct 18, 2019
Merged

Updated strings and XML comments. #25064

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
1e209aa
Removed unnecessary duplicated words and XML comments.
Oct 15, 2019
ae322be
static-test fix
Nazar65 Oct 16, 2019
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/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@
<waitForPageLoad stepKey="waitForGridLoad"/>
</actionGroup>

<!--Filter and select the the product -->
<!--Filter and select the product -->
<actionGroup name="filterAndSelectProduct">
<annotations>
<description>Goes to the Admin Products grid. Filters the Product grid by the provided Product SKU.</description>
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Checkout/Test/Mftf/ActionGroup/CheckoutActionGroup.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@
<!-- Check product in checkout cart items -->
<actionGroup name="CheckProductInCheckoutCartItemsActionGroup">
<annotations>
<description>Validates the the provided Product appears in the Storefront Checkout 'Order Summary' section.</description>
<description>Validates the provided Product appears in the Storefront Checkout 'Order Summary' section.</description>
</annotations>
<arguments>
<argument name="productVar"/>
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Config/Test/Mftf/ActionGroup/AdminConfigCreateNewAccountActionGroup.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
<actionGroup name="SetGroupForValidVATIdIntraUnionActionGroup">
<annotations>
<description>Goes to the 'Configuration' page for 'Customer Configuration'. Sets the 'Group For Valid VAT ID Intra Union' option. Clicks on the Save button. Validates the the Save message is present.</description>
<description>Goes to the 'Configuration' page for 'Customer Configuration'. Sets the 'Group For Valid VAT ID Intra Union' option. Clicks on the Save button. Validates the Save message is present.</description>
</annotations>
<arguments>
<argument name="value" type="string"/>
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Tinymce3/view/base/web/tiny_mce/classes/html/Node.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@
},

/**
* Wraps the node in in another node.
* Wraps the node in another node.
*
* @example
* node.wrap(wrapperNode);
Expand Down
6 changes: 5 additions & 1 deletion lib/internal/Magento/Framework/App/Request/InvalidRequestException.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class InvalidRequestException extends RuntimeException
/**
* @param ResponseInterface|ResultInterface|NotFoundException $replaceResult
* Use this result instead of calling an action instance,
* if NotFoundException is given the the default 404 mechanism will be triggered.
* if NotFoundException is given the default 404 mechanism will be triggered.
* @param Phrase[]|null $messages Messages to show to client
* as error messages.
*/
Expand All @@ -45,6 +45,8 @@ public function __construct($replaceResult, ?array $messages = null)
}

/**
* Return replaced result
*
* @return ResponseInterface|ResultInterface|NotFoundException
*/
public function getReplaceResult()
Expand All @@ -53,6 +55,8 @@ public function getReplaceResult()
}

/**
* Return messages
*
* @return Phrase[]|null
*/
public function getMessages(): ?array
Expand Down
2 changes: 1 addition & 1 deletion lib/internal/Magento/Framework/GraphQl/Query/IntrospectionConfiguration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public function __construct(
}

/**
* Check the the environment config to determine if introspection should be disabled.
* Check the environment config to determine if introspection should be disabled.
*
* @return bool
*/
Expand Down