php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-08-14 06:11:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into sync-to-master.

Browse Source
This commit is contained in:
Wilmer Arambula
2024-03-20 06:11:31 -03:00
parent 3587dfb322 e2a167028b
commit 20d6c65db2
516 changed files with 1216 additions and 2289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,5 @@
<?php
/**
* @link https://www.yiiframework.com/
* @copyright Copyright (c) 2008 Yii Software LLC
@ -353,7 +354,7 @@ EOD;
foreach ($rows as $row) {
$currentMessages[$row['category']][$row['id']] = $row['message'];
}
$new = [];
$obsolete = [];
@ -368,7 +369,7 @@ EOD;
$new[$category] = $msgs;
}
}
// obsolete categories
foreach (array_diff(array_keys($currentMessages), array_keys($messages)) as $category) {
$obsolete += $currentMessages[$category];
@ -381,8 +382,8 @@ EOD;
unset($obsolete[$pk]);
}
}
}
}
$this->stdout('Inserting new messages...');
$insertCount = 0;
@ -392,9 +393,9 @@ EOD;
$db->schema->insert($sourceMessageTable, ['category' => $category, 'message' => $msg]);
}
}
$this->stdout($insertCount ? "{$insertCount} saved.\n" : "Nothing to save.\n");
$this->stdout($removeUnused ? 'Deleting obsoleted messages...' : 'Updating obsoleted messages...');
if (empty($obsolete)) {
@ -408,13 +409,13 @@ EOD;
->execute();
$this->stdout("{$affected} deleted.\n");
} elseif ($markUnused) {
$marked=0;
$marked = 0;
$rows = (new Query())
->select(['id', 'message'])
->from($sourceMessageTable)
->where(['in', 'id', array_keys($obsolete)])
->all($db);
foreach ($rows as $row) {
$marked++;
$db->createCommand()->update(
@ -428,64 +429,64 @@ EOD;
$this->stdout("kept untouched.\n");
}
}
// get fresh message id list
$freshMessagesIds = [];
$rows = (new Query())->select(['id'])->from($sourceMessageTable)->all($db);
foreach ($rows as $row) {
$freshMessagesIds[] = $row['id'];
}
$this->stdout("Generating missing rows...");
$this->stdout('Generating missing rows...');
$generatedMissingRows = [];
foreach ($languages as $language) {
$count = 0;
// get list of ids of translations for this language
$msgRowsIds = [];
$msgRows = (new Query())->select(['id'])->from($messageTable)->where([
'language'=>$language,
])->all($db);
foreach ($msgRows as $row) {
$msgRowsIds[] = $row['id'];
}
// insert missing
foreach ($freshMessagesIds as $id) {
if (!in_array($id, $msgRowsIds)) {
$db->createCommand()
->insert($messageTable, ['id' => $id, 'language' => $language])
->execute();
$count++;
$count = 0;
// get list of ids of translations for this language
$msgRowsIds = [];
$msgRows = (new Query())->select(['id'])->from($messageTable)->where([
'language' => $language,
])->all($db);
foreach ($msgRows as $row) {
$msgRowsIds[] = $row['id'];
}
// insert missing
foreach ($freshMessagesIds as $id) {
if (!in_array($id, $msgRowsIds)) {
$db->createCommand()
->insert($messageTable, ['id' => $id, 'language' => $language])
->execute();
$count++;
}
}
if ($count) {
$generatedMissingRows[] = "{$count} for {$language}";
}
}
if ($count) {
$generatedMissingRows[] = "{$count} for {$language}";
}
}
$this->stdout($generatedMissingRows ? implode(", ", $generatedMissingRows).".\n" : "Nothing to do.\n");
$this->stdout("Dropping unused languages...");
$droppedLanguages=[];
$this->stdout($generatedMissingRows ? implode(', ', $generatedMissingRows) . ".\n" : "Nothing to do.\n");
$this->stdout('Dropping unused languages...');
$droppedLanguages = [];
$currentLanguages = [];
$rows = (new Query())->select(['language'])->from($messageTable)->groupBy('language')->all($db);
foreach ($rows as $row) {
$currentLanguages[] = $row['language'];
}
foreach ($currentLanguages as $currentLanguage) {
if (!in_array($currentLanguage, $languages)) {
$deleted=$db->createCommand()->delete($messageTable, "language=:language", [
'language'=>$currentLanguage,
])->execute();
$droppedLanguages[] = "removed {$deleted} rows for $currentLanguage";
}
if (!in_array($currentLanguage, $languages)) {
$deleted = $db->createCommand()->delete($messageTable, 'language=:language', [
'language' => $currentLanguage,
])->execute();
$droppedLanguages[] = "removed {$deleted} rows for $currentLanguage";
}
}
$this->stdout($droppedLanguages ? implode(", ", $droppedLanguages).".\n" : "Nothing to do.\n");
$this->stdout($droppedLanguages ? implode(', ', $droppedLanguages) . ".\n" : "Nothing to do.\n");
}
/**