Skip to content

Commit 02b4c31

Browse files
author
Igor Melnikov
committed
MAGETWO-50657: Static files are not loaded if Install Magento with non-Eng locale and deploy static
Fixing class and method descriptions
1 parent 3022eb0 commit 02b4c31

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

app/code/Magento/Deploy/Console/Command/DeployStaticContentCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
use Magento\Framework\Validator\Locale;
1818

1919
/**
20-
* Command for deploy static content
20+
* Deploy static content command
2121
*/
2222
class DeployStaticContentCommand extends Command
2323
{

app/code/Magento/Deploy/Console/Command/SetModeCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
use Magento\Framework\App\State;
1818

1919
/**
20-
* Command for change the Magento mode
20+
* Command to set application mode
2121
*/
2222
class SetModeCommand extends Command
2323
{

app/code/Magento/Deploy/Console/Command/ShowModeCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
use Magento\Framework\App\State;
1515

1616
/**
17-
* Command for change the Magento mode
17+
* Command to show application mode
1818
*/
1919
class ShowModeCommand extends Command
2020
{

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
use Magento\User\Model\ResourceModel\User\Collection as UserCollection;
1414

1515
/**
16+
* Generate static files, compile; clear var/generation, var/di/, var/view_preprocessed and pub/static directories
17+
*
1618
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
1719
*/
1820
class Filesystem
@@ -126,7 +128,7 @@ public function __construct(
126128
public function regenerateStatic(
127129
OutputInterface $output
128130
) {
129-
// Сlean up /var/generation, /var/di/, /var/view_preprocessed and /pub/static directories
131+
// Сlear var/generation, var/di/, var/view_preprocessed and pub/static directories
130132
$this->cleanupFilesystem(
131133
[
132134
DirectoryList::CACHE,
@@ -156,7 +158,7 @@ protected function deployStaticContent(
156158
. implode(' ', $this->getUsedLocales());
157159

158160
/**
159-
* @todo build a solution that does not depend on exec
161+
* @todo eliminate exec
160162
*/
161163
try {
162164
$execOutput = $this->shell->execute($cmd);
@@ -213,7 +215,7 @@ private function getUserCollection()
213215
}
214216

215217
/**
216-
* Runs code multi-tenant compiler to generate code and DI information
218+
* Runs compiler
217219
*
218220
* @param OutputInterface $output
219221
* @return void
@@ -235,7 +237,7 @@ protected function compile(OutputInterface $output)
235237
* exec command is necessary for now to isolate the autoloaders in the compiler from the memory state
236238
* of this process, which would prevent some classes from being generated
237239
*
238-
* @todo build a solution that does not depend on exec
240+
* @todo eliminate exec
239241
*/
240242
try {
241243
$execOutput = $this->shell->execute($cmd);
@@ -288,7 +290,6 @@ public function cleanupFilesystem($directoryCodeList)
288290
* @param int $dirPermissions
289291
* @param int $filePermissions
290292
* @return void
291-
*
292293
* @deprecated
293294
*/
294295
protected function changePermissions($directoryCodeList, $dirPermissions, $filePermissions)
@@ -308,7 +309,6 @@ protected function changePermissions($directoryCodeList, $dirPermissions, $fileP
308309
* Chenge permissions on static resources
309310
*
310311
* @return void
311-
*
312312
* @deprecated
313313
*/
314314
public function lockStaticResources()

0 commit comments

Comments
 (0)