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

Fixes #6895: Added ignoreCategories config option for message command to ignore categories specified

Browse Source
This commit is contained in:
Alexander Makarov
2015-03-06 21:51:42 +03:00
parent b6a591c720
commit b7a29e38d9
6 changed files with 71 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,6 +91,7 @@ class MessageController extends Controller
'removeUnused' => false,
'sort' => false,
'format' => 'php',
'ignoreCategories' => [],
], require($configFile));
if (!isset($config['sourcePath'], $config['languages'])) {
@ -117,7 +118,7 @@ class MessageController extends Controller
$messages = [];
foreach ($files as $file) {
$messages = array_merge_recursive($messages, $this->extractMessages($file, $config['translator']));
$messages = array_merge_recursive($messages, $this->extractMessages($file, $config['translator'], $config['ignoreCategories']));
}
if (in_array($config['format'], ['php', 'po'])) {
foreach ($config['languages'] as $language) {
@ -240,9 +241,10 @@ class MessageController extends Controller
*
* @param string $fileName name of the file to extract messages from
* @param string $translator name of the function used to translate messages
* @param array $ignoreCategories message categories to ignore
* @return array
*/
protected function extractMessages($fileName, $translator)
protected function extractMessages($fileName, $translator, $ignoreCategories = [])
{
$coloredFileName = Console::ansiFormat($fileName, [Console::FG_CYAN]);
$this->stdout("Extracting messages from $coloredFileName...\n");
@ -276,10 +278,12 @@ class MessageController extends Controller
$category = stripcslashes($buffer[0][1]);
$category = mb_substr($category, 1, mb_strlen($category) - 2);
$message = stripcslashes($buffer[2][1]);
$message = mb_substr($message, 1, mb_strlen($message) - 2);
if (!in_array($category, $ignoreCategories, true)) {
$message = stripcslashes($buffer[2][1]);
$message = mb_substr($message, 1, mb_strlen($message) - 2);
$messages[$category][] = $message;
$messages[$category][] = $message;
}
} else {
// invalid call or dynamic call we can't extract