Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Extends ignore list in yii\console\MessageController::$except #18962

Merged
merged 7 commits into from
Oct 26, 2021
Merged

Extends ignore list in yii\console\MessageController::$except #18962

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d3722e8
Update property defaults in MessageController
WinterSilence Oct 20, 2021
f6f9ee8
Merge branch 'master' into patch-19
WinterSilence Oct 24, 2021
036f4be
Update CHANGELOG.md
WinterSilence Oct 25, 2021
8fba1d9
Update CHANGELOG.md
WinterSilence Oct 25, 2021
a195ba9
Update MessageController.php
WinterSilence Oct 25, 2021
38478c8
Update CHANGELOG.md
samdark Oct 25, 2021
7c867dd
Merge branch 'master' into patch-19
samdark Oct 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions framework/console/controllers/MessageController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ class MessageController extends \yii\console\Controller
* translated. You may use a string for single function name or an array for
* multiple function names.
*/
public $translator = 'Yii::t';
public $translator = ['Yii::t', '\Yii::t'];
/**
* @var bool whether to sort messages by keys when merging new messages
* with the existing ones. Defaults to false, which means the new (untranslated)
Expand Down Expand Up @@ -91,13 +91,12 @@ class MessageController extends \yii\console\Controller
* If a file/directory matches both a pattern in "only" and "except", it will NOT be processed.
*/
public $except = [
'.svn',
WinterSilence marked this conversation as resolved.
Show resolved Hide resolved
'.git',
'.gitignore',
'.gitkeep',
'.hgignore',
'.hgkeep',
'.*',
'/.*',
'/messages',
'/tests',
'/runtime',
'/vendor',
'/BaseYii.php', // contains examples about Yii::t()
];
/**
Expand Down