Skip to content

Commit 048a0d2

Browse files
authored
ENGCOM-5568: Replace Cyrillic with appropriate characters #24076
2 parents 11862c3 + d638bed commit 048a0d2

File tree

10 files changed

+43
-30
lines changed

10 files changed

+43
-30
lines changed

app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontSortingByPriceForConfigurableWithCatalogRuleAppliedTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<description value="Sort by price should be correct if the apply Catalog Rule to child product of configurable product"/>
1717
<severity value="CRITICAL"/>
1818
<testCaseId value="MAGETWO-69988"/>
19-
<group value="сonfigurable_product"/>
19+
<group value="configurable_product"/>
2020
</annotations>
2121
<before>
2222
<createData entity="ApiCategory" stepKey="createCategory"/>

app/code/Magento/Deploy/Model/Filesystem.php

Lines changed: 29 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
/**
1717
* Generate static files, compile
1818
*
19-
* Сlear generated/code, generated/metadata/, var/view_preprocessed and pub/static directories
19+
* Clear generated/code, generated/metadata/, var/view_preprocessed and pub/static directories
2020
*
2121
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
2222
*/
@@ -156,7 +156,7 @@ public function __construct(
156156
public function regenerateStatic(
157157
OutputInterface $output
158158
) {
159-
// Сlear generated/code, generated/metadata/, var/view_preprocessed and pub/static directories
159+
// Clear generated/code, generated/metadata/, var/view_preprocessed and pub/static directories
160160
$this->cleanupFilesystem(
161161
[
162162
DirectoryList::CACHE,
@@ -285,22 +285,7 @@ public function cleanupFilesystem($directoryCodeList)
285285
$excludePatterns = ['#.htaccess#', '#deployed_version.txt#'];
286286
foreach ($directoryCodeList as $code) {
287287
if ($code == DirectoryList::STATIC_VIEW) {
288-
$directoryPath = $this->directoryList->getPath(DirectoryList::STATIC_VIEW);
289-
if ($this->driverFile->isExists($directoryPath)) {
290-
$files = $this->driverFile->readDirectory($directoryPath);
291-
foreach ($files as $file) {
292-
foreach ($excludePatterns as $pattern) {
293-
if (preg_match($pattern, $file)) {
294-
continue 2;
295-
}
296-
}
297-
if ($this->driverFile->isFile($file)) {
298-
$this->driverFile->deleteFile($file);
299-
} else {
300-
$this->driverFile->deleteDirectory($file);
301-
}
302-
}
303-
}
288+
$this->cleanupStaticDirectory($excludePatterns);
304289
} else {
305290
$this->filesystem->getDirectoryWrite($code)
306291
->delete();
@@ -374,4 +359,30 @@ private function reinitCacheDirectories()
374359
$command = $this->functionCallPath . 'cache:flush';
375360
$this->shell->execute($command);
376361
}
362+
363+
/**
364+
* Cleanup directory with static view files.
365+
*
366+
* @param array $excludePatterns
367+
* @throws \Magento\Framework\Exception\FileSystemException
368+
*/
369+
private function cleanupStaticDirectory(array $excludePatterns): void
370+
{
371+
$directoryPath = $this->directoryList->getPath(DirectoryList::STATIC_VIEW);
372+
if ($this->driverFile->isExists($directoryPath)) {
373+
$files = $this->driverFile->readDirectory($directoryPath);
374+
foreach ($files as $file) {
375+
foreach ($excludePatterns as $pattern) {
376+
if (preg_match($pattern, $file)) {
377+
continue 2;
378+
}
379+
}
380+
if ($this->driverFile->isFile($file)) {
381+
$this->driverFile->deleteFile($file);
382+
} else {
383+
$this->driverFile->deleteDirectory($file);
384+
}
385+
}
386+
}
387+
}
377388
}

app/code/Magento/Directory/Setup/Patch/Data/InitializeDirectoryData.php

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
/**
1515
* Class InitializeDirectoryData
16+
*
1617
* @package Magento\Directory\Setup\Patch
1718
*/
1819
class InitializeDirectoryData implements DataPatchInterface, PatchVersionInterface
@@ -41,7 +42,8 @@ public function __construct(
4142
}
4243

4344
/**
44-
* {@inheritdoc}
45+
* @inheritdoc
46+
*
4547
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
4648
*/
4749
public function apply()
@@ -874,23 +876,23 @@ public function apply()
874876
}
875877

876878
/**
877-
* {@inheritdoc}
879+
* @inheritdoc
878880
*/
879881
public static function getDependencies()
880882
{
881883
return [];
882884
}
883885

884886
/**
885-
* {@inheritdoc}
887+
* @inheritdoc
886888
*/
887889
public static function getVersion()
888890
{
889891
return '2.0.0';
890892
}
891893

892894
/**
893-
* {@inheritdoc}
895+
* @inheritdoc
894896
*/
895897
public function getAliases()
896898
{

app/code/Magento/Ui/etc/ui_configuration.xsd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,7 @@
560560
<xs:annotation>
561561
<xs:documentation>
562562
The ExportButton component exports grid data to the specified data format (cvs, xml, and so on).
563-
To enable the ExportButton сomponent, add the "exportButton" element with a "selectProvider" item
563+
To enable the ExportButton component, add the "exportButton" element with a "selectProvider" item
564564
to the listing configuration file.
565565
</xs:documentation>
566566
</xs:annotation>

dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/Constraint/AssertImportedProducts.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ private function getResultCsv($productSku)
155155
* 'type' => 'simple',
156156
* 'qty' => '100',
157157
* 'weight' => '30',
158-
* 'url_key' => 'simple_url'б,
158+
* 'url_key' => 'simple_url',
159159
* 'website_ids' => [
160160
* '1'
161161
* ]

dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleApplying.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ abstract protected function assert();
111111
* 4. Clear shopping cart
112112
* 5. Add test product(s) to shopping cart with specify quantity
113113
* 6. If "salesRule/data/coupon_code" not empty:
114-
* - fill "Enter your code" input in Dіscount Codes
114+
* - fill "Enter your code" input in Discount Codes
115115
* - click "Apply Coupon" button
116116
* 7. If "address/data/country_id" not empty:
117117
* On Estimate Shipping and Tax:

dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_properties.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@
239239
['_url', 'Magento\Framework\View\Asset\Minified', 'url'],
240240
['_viewUrl', 'Magento\Framework\View\Asset\Minified', 'viewUrl'],
241241
['_logger', 'Magento\Framework\View\Asset\Minified', 'logger'],
242-
['_scopeConfig', 'Magento\Framework\View\Asset\MinifyService', 'сonfig'],
242+
['_scopeConfig', 'Magento\Framework\View\Asset\MinifyService', 'config'],
243243
['_objectManager', 'Magento\Framework\View\Asset\MinifyService', 'objectManager'],
244244
['_enabled', 'Magento\Framework\View\Asset\MinifyService', 'enabled'],
245245
['_minifiers', 'Magento\Framework\View\Asset\MinifyService', 'minifiers'],

lib/internal/Magento/Framework/DB/Query/BatchIteratorInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public function current();
3434
/**
3535
* Return the key of the current element
3636
*
37-
* Сan return the number of the current sub-select in the iteration.
37+
* Can return the number of the current sub-select in the iteration.
3838
*
3939
* @return int
4040
*/

lib/internal/Magento/Framework/DB/Query/BatchRangeIterator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ public function current()
122122
/**
123123
* Return the key of the current element
124124
*
125-
* Сan return the number of the current sub-select in the iteration.
125+
* Can return the number of the current sub-select in the iteration.
126126
*
127127
* @return int
128128
*/

lib/internal/Magento/Framework/Locale/Config.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ class Config implements \Magento\Framework\Locale\ConfigInterface
8181
'ms_Latn_MY', /*Malaysian (Malaysia)*/
8282
'nl_BE', /*Dutch (Belgium)*/
8383
'nl_NL', /*Dutch (Netherlands)*/
84-
'nb_NO', /*Norwegian BokmГ_l (Norway)*/
84+
'nb_NO', /*Norwegian Bokmål (Norway)*/
8585
'nn_NO', /*Norwegian Nynorsk (Norway)*/
8686
'pl_PL', /*Polish (Poland)*/
8787
'pt_BR', /*Portuguese (Brazil)*/

0 commit comments

Comments
 (0)