The directory holding email templates is renamed from `mails` to `mail`

apps/advanced/environments/dev/common/config/main-local.php

@@ -10,7 +10,7 @@ return [
 		],
 		'mail' => [
 			'class' => 'yii\swiftmailer\Mailer',
-			'viewPath' => '@common/mails',
+			'viewPath' => '@common/mail',
 			'useFileTransport' => true,
 		],
 	],

apps/advanced/environments/prod/common/config/main-local.php

@@ -10,7 +10,7 @@ return [
 		],
 		'mail' => [
 			'class' => 'yii\swiftmailer\Mailer',
-			'viewPath' => '@common/mails',
+			'viewPath' => '@common/mail',
 		],
 	],
 ];

apps/basic/README.md

@@ -16,7 +16,7 @@ DIRECTORY STRUCTURE
       commands/           contains console commands (controllers)
       config/             contains application configurations
       controllers/        contains Web controller classes
-      mails/              contains view files for e-mails
+      mail/               contains view files for e-mails
       models/             contains model classes
       runtime/            contains files generated during runtime
       tests/              contains various tests for the basic application

extensions/debug/panels/MailPanel.php

@@ -16,7 +16,7 @@ class MailPanel extends Panel
 {
 
 	/**
-	 * @var string path where all mails will be saved. should be an alias.
+	 * @var string path where all emails will be saved. should be an alias.
 	 */
 	public $mailPath = '@runtime/debug/mail';
 	/**

framework/CHANGELOG.md

@@ -169,6 +169,7 @@ Yii Framework 2 Change Log
 - Chg: Renamed `ActiveRecordInterface::createActiveRelation()` to `createRelation()` (qiangxue)
 - Chg: The scripts in asset bundles are now registered in `View` at the end of `endBody()`. It was done in `endPage()` previously (qiangxue)
 - Chg: Renamed `csrf-var` to `csrf-param` for CSRF header name (Dilip)
+- Cgh: The directory holding email templates is renamed from `mails` to `mail` (qiangxue)
 - New #66: [Auth client library](https://github.com/yiisoft/yii2-authclient) OpenId, OAuth1, OAuth2 clients (klimov-paul)
 - New #706: Added `yii\widgets\Pjax` and enhanced `GridView` to work with `Pjax` to support AJAX-update (qiangxue)
 - New #1393: [Codeception testing framework integration](https://github.com/yiisoft/yii2-codeception) (Ragazzo)

framework/mail/BaseMailer.php

@@ -29,7 +29,6 @@ use yii\base\MailEvent;
  */
 abstract class BaseMailer extends Component implements MailerInterface, ViewContextInterface
 {
-
 	/**
 	 * @event \yii\base\MailEvent an event raised right before send.
 	 * You may set [[\yii\base\MailEvent::isValid]] to be false to cancel the send.
@@ -43,13 +42,13 @@ abstract class BaseMailer extends Component implements MailerInterface, ViewCont
 	 * @var string directory containing view files for this email messages.
 	 * This can be specified as an absolute path or path alias.
 	 */
-	public $viewPath = '@app/mails';
+	public $viewPath = '@app/mail';
 	/**
 	 * @var string|boolean HTML layout view name. This is the layout used to render HTML mail body.
 	 * The property can take the following values:
 	 *
 	 * - a relative view name: a view file relative to [[viewPath]], e.g., 'layouts/html'.
-	 * - a path alias: an absolute view file path specified as a path alias, e.g., '@app/mails/html'.
+	 * - a path alias: an absolute view file path specified as a path alias, e.g., '@app/mail/html'.
 	 * - a boolean false: the layout is disabled.
 	 */
 	public $htmlLayout = 'layouts/html';
@@ -157,7 +156,7 @@ abstract class BaseMailer extends Component implements MailerInterface, ViewCont
 	 *
 	 * The view to be rendered can be specified in one of the following formats:
 	 *
-	 * - path alias (e.g. "@app/mails/contact");
+	 * - path alias (e.g. "@app/mail/contact");
 	 * - a relative view name (e.g. "contact"): the actual view file will be resolved by [[findViewFile()]]
 	 *
 	 * @param array $params the parameters (name-value pairs) that will be extracted and made available in the view file.