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

- Reworked order of parameters in order to keep backwards compatibility

Browse Source 
- Update statement of unused messages in DB now depends on $markUnused parameter
This commit is contained in:
Marius Ebel
2015-06-08 09:08:17 +02:00
parent 622ed0130a
commit fff61bf99b
1 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -129,9 +129,9 @@ class MessageController extends Controller
} }
if ($config['format'] === 'po') { if ($config['format'] === 'po') {
$catalog = isset($config['catalog']) ? $config['catalog'] : 'messages'; $catalog = isset($config['catalog']) ? $config['catalog'] : 'messages';
$this->saveMessagesToPO($messages, $dir, $config['overwrite'], $config['removeUnused'], $config['markUnused'], $config['sort'], $catalog); $this->saveMessagesToPO($messages, $dir, $config['overwrite'], $config['removeUnused'], $config['sort'], $catalog, $config['markUnused']);
} else { } else {
$this->saveMessagesToPHP($messages, $dir, $config['overwrite'], $config['removeUnused'], $config['markUnused'], $config['sort']); $this->saveMessagesToPHP($messages, $dir, $config['overwrite'], $config['removeUnused'], $config['sort'], $config['markUnused']);
} }
} }
} elseif ($config['format'] === 'db') { } elseif ($config['format'] === 'db') {
@@ -147,8 +147,8 @@ class MessageController extends Controller
$sourceMessageTable, $sourceMessageTable,
$messageTable, $messageTable,
$config['removeUnused'], $config['removeUnused'],
$config['markUnused'], $config['languages'],
$config['languages'] $config['markUnused']
); );
} elseif ($config['format'] === 'pot') { } elseif ($config['format'] === 'pot') {
$catalog = isset($config['catalog']) ? $config['catalog'] : 'messages'; $catalog = isset($config['catalog']) ? $config['catalog'] : 'messages';
@@ -164,10 +164,10 @@ class MessageController extends Controller
* @param string $sourceMessageTable * @param string $sourceMessageTable
* @param string $messageTable * @param string $messageTable
* @param boolean $removeUnused * @param boolean $removeUnused
* @param boolean $markUnused
* @param array $languages * @param array $languages
* @param boolean $markUnused
*/ */
protected function saveMessagesToDb($messages, $db, $sourceMessageTable, $messageTable, $removeUnused, $markUnused, $languages) protected function saveMessagesToDb($messages, $db, $sourceMessageTable, $messageTable, $removeUnused, $languages, $markUnused)
{ {
$q = new \yii\db\Query; $q = new \yii\db\Query;
$current = []; $current = [];
@@ -229,15 +229,11 @@ class MessageController extends Controller
->delete($sourceMessageTable, ['in', 'id', $obsolete]) ->delete($sourceMessageTable, ['in', 'id', $obsolete])
->execute(); ->execute();
$this->stdout("deleted.\n"); $this->stdout("deleted.\n");
} else { } else if ($markUnused) {
$expression = 'message';
if ($markUnused) {
$expression = "CONCAT('@@',message,'@@')";
}
$db->createCommand() $db->createCommand()
->update( ->update(
$sourceMessageTable, $sourceMessageTable,
['message' => new \yii\db\Expression($expression)], ['message' => new \yii\db\Expression("CONCAT('@@',message,'@@')")],
['in', 'id', $obsolete] ['in', 'id', $obsolete]
)->execute(); )->execute();
$this->stdout("updated.\n"); $this->stdout("updated.\n");
@@ -394,10 +390,10 @@ class MessageController extends Controller
* @param string $dirName name of the directory to write to * @param string $dirName name of the directory to write to
* @param boolean $overwrite if existing file should be overwritten without backup * @param boolean $overwrite if existing file should be overwritten without backup
* @param boolean $removeUnused if obsolete translations should be removed * @param boolean $removeUnused if obsolete translations should be removed
* @param boolean $markUnused if obsolete translations should be marked
* @param boolean $sort if translations should be sorted * @param boolean $sort if translations should be sorted
* @param boolean $markUnused if obsolete translations should be marked
*/ */
protected function saveMessagesToPHP($messages, $dirName, $overwrite, $removeUnused, $markUnused, $sort) protected function saveMessagesToPHP($messages, $dirName, $overwrite, $removeUnused, $sort, $markUnused)
{ {
foreach ($messages as $category => $msgs) { foreach ($messages as $category => $msgs) {
$file = str_replace("\\", '/', "$dirName/$category.php"); $file = str_replace("\\", '/', "$dirName/$category.php");
@@ -406,7 +402,7 @@ class MessageController extends Controller
$msgs = array_values(array_unique($msgs)); $msgs = array_values(array_unique($msgs));
$coloredFileName = Console::ansiFormat($file, [Console::FG_CYAN]); $coloredFileName = Console::ansiFormat($file, [Console::FG_CYAN]);
$this->stdout("Saving messages to $coloredFileName...\n"); $this->stdout("Saving messages to $coloredFileName...\n");
$this->saveMessagesCategoryToPHP($msgs, $file, $overwrite, $removeUnused, $markUnused, $sort, $category); $this->saveMessagesCategoryToPHP($msgs, $file, $overwrite, $removeUnused, $sort, $category, $markUnused);
} }
} }
@@ -417,11 +413,11 @@ class MessageController extends Controller
* @param string $fileName name of the file to write to * @param string $fileName name of the file to write to
* @param boolean $overwrite if existing file should be overwritten without backup * @param boolean $overwrite if existing file should be overwritten without backup
* @param boolean $removeUnused if obsolete translations should be removed * @param boolean $removeUnused if obsolete translations should be removed
* @param boolean $markUnused if obsolete translations should be marked
* @param boolean $sort if translations should be sorted * @param boolean $sort if translations should be sorted
* @param string $category message category * @param string $category message category
* @param boolean $markUnused if obsolete translations should be marked
*/ */
protected function saveMessagesCategoryToPHP($messages, $fileName, $overwrite, $removeUnused, $markUnused, $sort, $category) protected function saveMessagesCategoryToPHP($messages, $fileName, $overwrite, $removeUnused, $sort, $category, $markUnused)
{ {
if (is_file($fileName)) { if (is_file($fileName)) {
$rawExistingMessages = require($fileName); $rawExistingMessages = require($fileName);
@@ -510,11 +506,11 @@ EOD;
* @param string $dirName name of the directory to write to * @param string $dirName name of the directory to write to
* @param boolean $overwrite if existing file should be overwritten without backup * @param boolean $overwrite if existing file should be overwritten without backup
* @param boolean $removeUnused if obsolete translations should be removed * @param boolean $removeUnused if obsolete translations should be removed
* @param boolean $markUnused if obsolete translations should be marked
* @param boolean $sort if translations should be sorted * @param boolean $sort if translations should be sorted
* @param string $catalog message catalog * @param string $catalog message catalog
* @param boolean $markUnused if obsolete translations should be marked
*/ */
protected function saveMessagesToPO($messages, $dirName, $overwrite, $removeUnused, $markUnused, $sort, $catalog) protected function saveMessagesToPO($messages, $dirName, $overwrite, $removeUnused, $sort, $catalog, $markUnused)
{ {
$file = str_replace("\\", '/', "$dirName/$catalog.po"); $file = str_replace("\\", '/', "$dirName/$catalog.po");
FileHelper::createDirectory(dirname($file)); FileHelper::createDirectory(dirname($file));