Skip to content

Commit 70299e0

Browse files
author
Stanislav Idolov
authored
ENGCOM-2556: [Backport] Removed double occurrence of keywords in sentences. #17157
2 parents 836f5e6 + d8be3fc commit 70299e0

File tree

11 files changed

+14
-13
lines changed

11 files changed

+14
-13
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2351,7 +2351,7 @@ Tests:
23512351
* [#686](https://github.com/magento/magento2/issues/686) -- Product save validation errors in the admin don't hide the overlay
23522352
* [#702](https://github.com/magento/magento2/issues/702) -- Base table or view not found
23532353
* [#652](https://github.com/magento/magento2/issues/652) -- Multishipping checkout not to change the Billing address js issue
2354-
* [#648](https://github.com/magento/magento2/issues/648) -- An equal (=) sign in the hash of the product page to to break the tabs functionality
2354+
* [#648](https://github.com/magento/magento2/issues/648) -- An equal (=) sign in the hash of the product page to break the tabs functionality
23552355
* Service Contracts:
23562356
* Refactored usage of new API of the Customer module
23572357
* Implemented Service Contracts for the Sales module

app/code/Magento/Integration/view/adminhtml/web/js/integration.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,9 @@ define([
166166
try {
167167
//Is the success callback invoked
168168
if (IdentityLogin.win.closed ||
169-
(IdentityLogin.win.location.href == IdentityLogin.successCallbackUrl)) {
170-
//Stop the the polling
169+
IdentityLogin.win.location.href == IdentityLogin.successCallbackUrl //eslint-disable-line eqeqeq
170+
) {
171+
//Stop the polling
171172
clearInterval(IdentityLogin.checker);
172173
$('body').trigger('processStart');
173174
//Check for window closed

dev/tests/integration/testsuite/Magento/CatalogRule/Model/Indexer/ProductRuleTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public function testReindexWithProductNotVisibleIndividually()
6666
$this->assertEquals(
6767
7.5,
6868
$this->resourceRule->getRulePrice(new \DateTime(), 1, 1, $product->getId()),
69-
"Catalog price rule doesn't apply to to product with visibility value \"Not Visibility Individually\""
69+
"Catalog price rule doesn't apply to product with visibility value \"Not Visibility Individually\""
7070
);
7171
}
7272
}

dev/tests/integration/testsuite/Magento/Tax/Model/TaxCalculationTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2189,7 +2189,7 @@ protected function setupMultiRuleQuote()
21892189
}
21902190

21912191
/**
2192-
* Create the base results for the the multi rules test
2192+
* Create the base results for the multi rules test
21932193
*
21942194
* @return array
21952195
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)

lib/internal/Magento/Framework/Api/Uploader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public function __construct()
2121
}
2222

2323
/**
24-
* Explicitly set the the file attributes instead of setting it via constructor
24+
* Explicitly set the file attributes instead of setting it via constructor
2525
*
2626
* @param array $fileAttributes
2727
* @return void

lib/web/MutationObserver.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@
324324
if (lastRecord === newRecord)
325325
return lastRecord;
326326

327-
// Check if the the record we are adding represents the same record. If
327+
// Check if the record we are adding represents the same record. If
328328
// so, we keep the one with the oldValue in it.
329329
if (recordWithOldValue && recordRepresentsCurrentMutation(lastRecord))
330330
return recordWithOldValue;

lib/web/mage/requirejs/static.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ define('buildTools', [
1313
isEnabled: storage.getItem(storeName) === null,
1414

1515
/**
16-
* Removes base url from the the provided string.
16+
* Removes base url from the provided string
1717
*
1818
* @param {String} url - Url to be processed.
1919
* @param {Object} config - RequiereJs config object.

lib/web/modernizr/modernizr.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1013,7 +1013,7 @@ window.Modernizr = (function( window, document, undefined ) {
10131013
/** Name of the expando, to work with multiple documents or to re-shiv one document */
10141014
var expando = '_html5shiv';
10151015

1016-
/** The id for the the documents expando */
1016+
/** The id for the documents expando */
10171017
var expanID = 0;
10181018

10191019
/** Cached data for each document */

lib/web/tiny_mce/plugins/autosave/editor_plugin_src.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
* 1. localStorage - A new feature of HTML 5, localStorage can store megabytes of data per domain
2121
* on the client computer. Data stored in the localStorage area has no expiration date, so we must
2222
* manage expiring the data ourselves. localStorage is fully supported by IE8, and it is supposed
23-
* to be working in Firefox 3 and Safari 3.2, but in reality is is flaky in those browsers. As
23+
* to be working in Firefox 3 and Safari 3.2, but in reality is flaky in those browsers. As
2424
* HTML 5 gets wider support, the AutoSave plugin will use it automatically. In Windows Vista/7,
2525
* localStorage is stored in the following folder:
2626
* C:\Users\[username]\AppData\Local\Microsoft\Internet Explorer\DOMStore\[tempFolder]
@@ -297,7 +297,7 @@
297297
},
298298

299299
/**
300-
* This method will store the current contents in the the storage engine.
300+
* This method will store the current contents in the storage engine.
301301
*
302302
* @method storeDraft
303303
*/

lib/web/tiny_mce/plugins/paste/editor_plugin_src.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@
207207
sel.setRng(oldRng);
208208
sel.setContent('');
209209

210-
// For some odd reason we need to detach the the mceInsertContent call from the paste event
210+
// For some odd reason we need to detach the mceInsertContent call from the paste event
211211
// It's like IE has a reference to the parent element that you paste in and the selection gets messed up
212212
// when it tries to restore the selection
213213
setTimeout(function() {

setup/pub/angular/angular.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7770,7 +7770,7 @@
77707770
* caching.
77717771
* - **timeout** – `{number|Promise}` – timeout in milliseconds, or {@link ng.$q promise}
77727772
* that should abort the request when resolved.
7773-
* - **withCredentials** - `{boolean}` - whether to to set the `withCredentials` flag on the
7773+
* - **withCredentials** - `{boolean}` - whether to set the `withCredentials` flag on the
77747774
* XHR object. See [requests with credentials]https://developer.mozilla.org/en/http_access_control#section_5
77757775
* for more information.
77767776
* - **responseType** - `{string}` - see

0 commit comments

Comments
 (0)