Merge branch 'master' of github.com:yiisoft/yii2

framework/messages/config.php

@@ -7,7 +7,7 @@ return [
 	'messagePath' => __DIR__,
 	// array, required, list of language codes that the extracted messages
 	// should be translated to. For example, ['zh-CN', 'de'].
-	'languages' => ['da', 'de', 'ru', 'pl', 'pt-BR', 'it', 'es', 'ro', 'ja'],
+	'languages' => ['da', 'de', 'ru', 'pl', 'pt-BR', 'it', 'es', 'ro', 'zh-CN', 'ja'],
 	// 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