yii\console\controllers\MessageController now sorts created messages, even if there is no new one, while saving to PHP file

This commit is contained in:
octicon-git-branch(16/)
octicon-tag(16/)
Klimov Paul
2015-05-13 16:08:36 +03:00
gitea-unlock(16/)
parent 72ec914992
commit adb0460ee1
octicon-diff(16/tw-mr-1) 2 changed files with 5 additions and 2 deletions

6
framework/console/controllers/MessageController.php
View File

@@ -412,13 +412,15 @@ class MessageController extends Controller
protected function saveMessagesCategoryToPHP($messages, $fileName, $overwrite, $removeUnused, $sort, $category)
{
if (is_file($fileName)) {
$existingMessages = require($fileName);
$rawExistingMessages = require($fileName);
$existingMessages = $rawExistingMessages;
sort($messages);
ksort($existingMessages);
if (array_keys($existingMessages) == $messages) {
if (array_keys($existingMessages) === $messages && (!$sort || array_keys($rawExistingMessages) === $messages)) {
$this->stdout("Nothing new in \"$category\" category... Nothing to save.\n\n", Console::FG_GREEN);
return;
}
unset($rawExistingMessages);
$merged = [];
$untranslated = [];
foreach ($messages as $message) {