diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md index c77e5bac26..ba5382b54c 100644 --- a/framework/CHANGELOG.md +++ b/framework/CHANGELOG.md @@ -28,6 +28,7 @@ Yii Framework 2 Change Log - Bug #19368: Fix PHP 8.1 error when `$fileMimeType` is `null` in `yii\validators\FileValidator::validateMimeType()` (bizley) - Enh #19384: Normalize `setBodyParams()` and `getBodyParam()` in `yii\web\Request` (WinterSilence, albertborsos) - Bug #19386: Fix recursive calling `yii\helpers\BaseArrayHelper::htmlDecode()` (WinterSilence) +- Enh #19416: Update and improve configurations for `yii\console\controllers\MessageController` (WinterSilence) 2.0.45 February 11, 2022 diff --git a/framework/messages/config.php b/framework/messages/config.php index 0a0a8aacdd..98e8fe257d 100644 --- a/framework/messages/config.php +++ b/framework/messages/config.php @@ -12,12 +12,17 @@ return [ 'messagePath' => __DIR__, // array, required, list of language codes that the extracted messages // should be translated to. For example, ['zh-CN', 'de']. - 'languages' => ['af', 'ar', 'az', 'be', 'bg', 'bs', 'ca', 'cs', 'da', 'de', 'el', 'es', 'et', 'fa', 'fi', 'fr', 'he', 'hi', 'hr', 'hu', 'hy', 'id', 'it', 'ja', 'ka', 'kk', 'ko', 'kz', 'lt', 'lv', 'ms', 'nb-NO', 'nl', 'pl', 'pt', 'pt-BR', 'ro', 'ru', 'sk', 'sl', 'sr', 'sr-Latn', 'sv', 'tg', 'th', 'tr', 'uk', 'uz', 'uz-Cy', 'vi', 'zh-CN', 'zh-TW'], + 'languages' => [ + 'af', 'ar', 'az', 'be', 'bg', 'bs', 'ca', 'cs', 'da', 'de', 'el', 'es', 'et', 'fa', 'fi', 'fr', 'he', 'hi', + 'pt-BR', 'ro', 'hr', 'hu', 'hy', 'id', 'it', 'ja', 'ka', 'kk', 'ko', 'kz', 'lt', 'lv', 'ms', 'nb-NO', 'nl', + 'pl', 'pt', 'ru', 'sk', 'sl', 'sr', 'sr-Latn', 'sv', 'tg', 'th', 'tr', 'uk', 'uz', 'uz-Cy', 'vi', 'zh-CN', + 'zh-TW' + ], // string, the name of the function for translating messages. // Defaults to 'Yii::t'. This is used as a mark to find the messages to be // translated. You may use a string for single function name or an array for // multiple function names. - 'translator' => 'Yii::t', + 'translator' => ['\Yii::t', 'Yii::t'], // boolean, whether to sort messages by keys when merging new messages // with the existing ones. Defaults to false, which means the new (untranslated) // messages will be separated from the old (translated) ones. @@ -39,13 +44,13 @@ return [ // Note, the '/' characters in a pattern matches both '/' and '\'. // See helpers/FileHelper::findFiles() description for more details on pattern matching rules. 'except' => [ - '.svn', - '.git', - '.gitignore', - '.gitkeep', - '.hgignore', - '.hgkeep', + '.*', + '/.*', '/messages', + '/tests', + '/runtime', + '/vendor', + '/BaseYii.php', ], // array, list of patterns that specify which files (not directories) should be processed. // If empty or not set, all files will be processed. @@ -53,9 +58,9 @@ return [ // If a file/directory matches both a pattern in "only" and "except", it will NOT be processed. 'only' => ['*.php'], 'phpFileHeader' => '/** - * @link http://www.yiiframework.com/ + * @link https://www.yiiframework.com/ * @copyright Copyright (c) 2008 Yii Software LLC - * @license http://www.yiiframework.com/license/ + * @license https://www.yiiframework.com/license/ */ ', diff --git a/framework/views/messageConfig.php b/framework/views/messageConfig.php index 2495aed76a..dc041d2a41 100644 --- a/framework/views/messageConfig.php +++ b/framework/views/messageConfig.php @@ -5,12 +5,17 @@ return [ 'sourcePath' => __DIR__ . DIRECTORY_SEPARATOR . '..', // array, required, list of language codes that the extracted messages // should be translated to. For example, ['zh-CN', 'de']. - 'languages' => ['de'], + 'languages' => [ + 'af', 'ar', 'az', 'be', 'bg', 'bs', 'ca', 'cs', 'da', 'de', 'el', 'es', 'et', 'fa', 'fi', 'fr', 'he', 'hi', + 'pt-BR', 'ro', 'hr', 'hu', 'hy', 'id', 'it', 'ja', 'ka', 'kk', 'ko', 'kz', 'lt', 'lv', 'ms', 'nb-NO', 'nl', + 'pl', 'pt', 'ru', 'sk', 'sl', 'sr', 'sr-Latn', 'sv', 'tg', 'th', 'tr', 'uk', 'uz', 'uz-Cy', 'vi', 'zh-CN', + 'zh-TW' + ], // string, the name of the function for translating messages. // Defaults to 'Yii::t'. This is used as a mark to find the messages to be // translated. You may use a string for single function name or an array for // multiple function names. - 'translator' => 'Yii::t', + 'translator' => ['\Yii::t', 'Yii::t'], // boolean, whether to sort messages by keys when merging new messages // with the existing ones. Defaults to false, which means the new (untranslated) // messages will be separated from the old (translated) ones. @@ -31,15 +36,14 @@ return [ // See helpers/FileHelper::findFiles() for pattern matching rules. // If a file/directory matches both a pattern in "only" and "except", it will NOT be processed. 'except' => [ - '.svn', - '.git', - '.gitignore', - '.gitkeep', - '.hgignore', - '.hgkeep', + '.*', + '/.*', '/messages', + '/tests', + '/runtime', + '/vendor', + '/BaseYii.php', ], - // 'php' output format is for saving messages to php files. 'format' => 'php', // Root directory containing message translations.