Skip to content

Replace Cyrillic with appropriate characters #24076

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.

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
Aug 14, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<description value="Sort by price should be correct if the apply Catalog Rule to child product of configurable product"/>
<severity value="CRITICAL"/>
<testCaseId value="MAGETWO-69988"/>
<group value="сonfigurable_product"/>
<group value="configurable_product"/>
</annotations>
<before>
<createData entity="ApiCategory" stepKey="createCategory"/>
Expand Down
47 changes: 29 additions & 18 deletions app/code/Magento/Deploy/Model/Filesystem.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
/**
* Generate static files, compile
*
* Сlear generated/code, generated/metadata/, var/view_preprocessed and pub/static directories
* Clear generated/code, generated/metadata/, var/view_preprocessed and pub/static directories
*
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
Expand Down Expand Up @@ -156,7 +156,7 @@ public function __construct(
public function regenerateStatic(
OutputInterface $output
) {
// Сlear generated/code, generated/metadata/, var/view_preprocessed and pub/static directories
// Clear generated/code, generated/metadata/, var/view_preprocessed and pub/static directories
$this->cleanupFilesystem(
[
DirectoryList::CACHE,
Expand Down Expand Up @@ -285,22 +285,7 @@ public function cleanupFilesystem($directoryCodeList)
$excludePatterns = ['#.htaccess#', '#deployed_version.txt#'];
foreach ($directoryCodeList as $code) {
if ($code == DirectoryList::STATIC_VIEW) {
$directoryPath = $this->directoryList->getPath(DirectoryList::STATIC_VIEW);
if ($this->driverFile->isExists($directoryPath)) {
$files = $this->driverFile->readDirectory($directoryPath);
foreach ($files as $file) {
foreach ($excludePatterns as $pattern) {
if (preg_match($pattern, $file)) {
continue 2;
}
}
if ($this->driverFile->isFile($file)) {
$this->driverFile->deleteFile($file);
} else {
$this->driverFile->deleteDirectory($file);
}
}
}
$this->cleanupStaticDirectory($excludePatterns);
} else {
$this->filesystem->getDirectoryWrite($code)
->delete();
Expand Down Expand Up @@ -374,4 +359,30 @@ private function reinitCacheDirectories()
$command = $this->functionCallPath . 'cache:flush';
$this->shell->execute($command);
}

/**
* Cleanup directory with static view files.
*
* @param array $excludePatterns
* @throws \Magento\Framework\Exception\FileSystemException
*/
private function cleanupStaticDirectory(array $excludePatterns): void
{
$directoryPath = $this->directoryList->getPath(DirectoryList::STATIC_VIEW);
if ($this->driverFile->isExists($directoryPath)) {
$files = $this->driverFile->readDirectory($directoryPath);
foreach ($files as $file) {
foreach ($excludePatterns as $pattern) {
if (preg_match($pattern, $file)) {
continue 2;
}
}
if ($this->driverFile->isFile($file)) {
$this->driverFile->deleteFile($file);
} else {
$this->driverFile->deleteDirectory($file);
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

/**
* Class InitializeDirectoryData
*
* @package Magento\Directory\Setup\Patch
*/
class InitializeDirectoryData implements DataPatchInterface, PatchVersionInterface
Expand Down Expand Up @@ -41,7 +42,8 @@ public function __construct(
}

/**
* {@inheritdoc}
* @inheritdoc
*
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function apply()
Expand Down Expand Up @@ -874,23 +876,23 @@ public function apply()
}

/**
* {@inheritdoc}
* @inheritdoc
*/
public static function getDependencies()
{
return [];
}

/**
* {@inheritdoc}
* @inheritdoc
*/
public static function getVersion()
{
return '2.0.0';
}

/**
* {@inheritdoc}
* @inheritdoc
*/
public function getAliases()
{
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Ui/etc/ui_configuration.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -560,7 +560,7 @@
<xs:annotation>
<xs:documentation>
The ExportButton component exports grid data to the specified data format (cvs, xml, and so on).
To enable the ExportButton сomponent, add the "exportButton" element with a "selectProvider" item
To enable the ExportButton component, add the "exportButton" element with a "selectProvider" item
to the listing configuration file.
</xs:documentation>
</xs:annotation>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ private function getResultCsv($productSku)
* 'type' => 'simple',
* 'qty' => '100',
* 'weight' => '30',
* 'url_key' => 'simple_url'б,
* 'url_key' => 'simple_url',
* 'website_ids' => [
* '1'
* ]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ abstract protected function assert();
* 4. Clear shopping cart
* 5. Add test product(s) to shopping cart with specify quantity
* 6. If "salesRule/data/coupon_code" not empty:
* - fill "Enter your code" input in Dіscount Codes
* - fill "Enter your code" input in Discount Codes
* - click "Apply Coupon" button
* 7. If "address/data/country_id" not empty:
* On Estimate Shipping and Tax:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@
['_url', 'Magento\Framework\View\Asset\Minified', 'url'],
['_viewUrl', 'Magento\Framework\View\Asset\Minified', 'viewUrl'],
['_logger', 'Magento\Framework\View\Asset\Minified', 'logger'],
['_scopeConfig', 'Magento\Framework\View\Asset\MinifyService', 'сonfig'],
['_scopeConfig', 'Magento\Framework\View\Asset\MinifyService', 'config'],
['_objectManager', 'Magento\Framework\View\Asset\MinifyService', 'objectManager'],
['_enabled', 'Magento\Framework\View\Asset\MinifyService', 'enabled'],
['_minifiers', 'Magento\Framework\View\Asset\MinifyService', 'minifiers'],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public function current();
/**
* Return the key of the current element
*
* Сan return the number of the current sub-select in the iteration.
* Can return the number of the current sub-select in the iteration.
*
* @return int
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ public function current()
/**
* Return the key of the current element
*
* Сan return the number of the current sub-select in the iteration.
* Can return the number of the current sub-select in the iteration.
*
* @return int
*/
Expand Down
2 changes: 1 addition & 1 deletion lib/internal/Magento/Framework/Locale/Config.php
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ class Config implements \Magento\Framework\Locale\ConfigInterface
'ms_Latn_MY', /*Malaysian (Malaysia)*/
'nl_BE', /*Dutch (Belgium)*/
'nl_NL', /*Dutch (Netherlands)*/
'nb_NO', /*Norwegian BokmГ_l (Norway)*/
'nb_NO', /*Norwegian Bokmål (Norway)*/
'nn_NO', /*Norwegian Nynorsk (Norway)*/
'pl_PL', /*Polish (Poland)*/
'pt_BR', /*Portuguese (Brazil)*/
Expand Down