diff --git a/docs/guide-zh-CN/structure-filters.md b/docs/guide-zh-CN/structure-filters.md
index 8d64b6aa37..4a6354409f 100644
--- a/docs/guide-zh-CN/structure-filters.md
+++ b/docs/guide-zh-CN/structure-filters.md
@@ -1,27 +1,17 @@
过滤器
-Filters
=======
过滤器是 [控制器 动作](structure-controllers.md#actions) 执行之前或之后执行的对象。
例如访问控制过滤器可在动作执行之前来控制特殊终端用户是否有权限执行动作，
内容压缩过滤器可在动作执行之后发给终端用户之前压缩响应内容。
-Filters are objects that run before and/or after [controller actions](structure-controllers.md#actions). For example,
-an access control filter may run before actions to ensure that they are allowed to be accessed by particular end users;
-a content compression filter may run after actions to compress the response content before sending them out to end users.
过滤器可包含 预过滤（过滤逻辑在动作*之前*） 或 后过滤（过滤逻辑在动作*之后*），也可同时包含两者。
-A filter may consist of a pre-filter (filtering logic applied *before* actions) and/or a post-filter (logic applied
-*after* actions).
## 使用过滤器
-## Using Filters
过滤器本质上是一类特殊的 [行为](concept-behaviors.md)，所以使用过滤器和 [使用 行为](concept-behaviors.md#attaching-behaviors)一样。
可以在控制器类中覆盖它的 [[yii\base\Controller::behaviors()|behaviors()]] 方法来申明过滤器，如下所示：
-Filters are essentially a special kind of [behaviors](concept-behaviors.md). Therefore, using filters is the same
-as [using behaviors](concept-behaviors.md#attaching-behaviors). You can declare filters in a controller class
-by overriding its [[yii\base\Controller::behaviors()|behaviors()]] method like the following:
```php
public function behaviors()
@@ -42,29 +32,16 @@ public function behaviors()
控制器类的过滤器默认应用到该类的 *所有* 动作，你可以配置[[yii\base\ActionFilter::only|only]]属性明确指定控制器应用到哪些动作。
在上述例子中，`HttpCache` 过滤器只应用到`index`和`view`动作。
也可以配置[[yii\base\ActionFilter::except|except]]属性使一些动作不执行过滤器。
-By default, filters declared in a controller class will be applied to *all* actions in that controller. You can,
-however, explicitly specify which actions the filter should be applied to by configuring the
-[[yii\base\ActionFilter::only|only]] property. In the above example, the `HttpCache` filter only applies to the
-`index` and `view` actions. You can also configure the [[yii\base\ActionFilter::except|except]] property to blacklist
-some actions from being filtered.
除了控制器外，可在 [模块](structure-modules.md)或[应用主体](structure-applications.md) 中申明过滤器。
申明之后，过滤器会应用到所属该模块或应用主体的 *所有* 控制器动作，
除非像上述一样配置过滤器的 [[yii\base\ActionFilter::only|only]] 和 [[yii\base\ActionFilter::except|except]] 属性。
-Besides controllers, you can also declare filters in a [module](structure-modules.md) or [application](structure-applications.md).
-When you do so, the filters will be applied to *all* controller actions belonging to that module or application,
-unless you configure the filters' [[yii\base\ActionFilter::only|only]] and [[yii\base\ActionFilter::except|except]]
-properties like described above.
-> 补充: 在模块或应用主体中申明过滤器，在[[yii\base\ActionFilter::only|only]] 和 [[yii\base\ActionFilter::except|except]]
+> 补充: 在模块或应用主体中申明过滤器，在[[yii\base\ActionFilter::only|only]] 和 [[yii\base\ActionFilter::except|except]]
属性中使用[路由](structure-controllers.md#routes) 代替动作ID，
因为在模块或应用主体中只用动作ID并不能唯一指定到具体动作。.
-> Note: When declaring filters in modules or applications, you should use [routes](structure-controllers.md#routes)
- instead of action IDs in the [[yii\base\ActionFilter::only|only]] and [[yii\base\ActionFilter::except|except]] properties.
- This is because action IDs alone cannot fully specify actions within the scope of a module or application.
当一个动作有多个过滤器时，根据以下规则先后执行：
-When multiple filters are configured for a single action, they are applied according to the rules described below,
* 预过滤
- 按顺序执行应用主体中`behaviors()`列出的过滤器。
@@ -76,35 +53,17 @@ When multiple filters are configured for a single action, they are applied accor
- 倒序执行控制器中`behaviors()`列出的过滤器。
- 倒序执行模块中`behaviors()`列出的过滤器。
- 倒序执行应用主体中`behaviors()`列出的过滤器。
-* Pre-filtering
- - Apply filters declared in the application in the order they are listed in `behaviors()`.
- - Apply filters declared in the module in the order they are listed in `behaviors()`.
- - Apply filters declared in the controller in the order they are listed in `behaviors()`.
- - If any of the filters cancel the action execution, the filters (both pre-filters and post-filters) after it will
- not be applied.
-* Running the action if it passes the pre-filtering.
-* Post-filtering
- - Apply filters declared in the controller in the reverse order they are listed in `behaviors()`.
- - Apply filters declared in the module in the reverse order they are listed in `behaviors()`.
- - Apply filters declared in the application in the reverse order they are listed in `behaviors()`.
## 创建过滤器
-## Creating Filters
继承 [[yii\base\ActionFilter]] 类并覆盖
[[yii\base\ActionFilter::beforeAction()|beforeAction()]] 和/或 [[yii\base\ActionFilter::afterAction()|afterAction()]]
方法来创建动作的过滤器，前者在动作执行之前执行，后者在动作执行之后执行。
[[yii\base\ActionFilter::beforeAction()|beforeAction()]] 返回值决定动作是否应该执行，
如果为false，之后的过滤器和动作不会继续执行。
-To create a new action filter, extend from [[yii\base\ActionFilter]] and override the
-[[yii\base\ActionFilter::beforeAction()|beforeAction()]] and/or [[yii\base\ActionFilter::afterAction()|afterAction()]]
-methods. The former will be executed before an action runs while the latter after an action runs.
-The return value of [[yii\base\ActionFilter::beforeAction()|beforeAction()]] determines whether an action should
-be executed or not. If it is false, the filters after this one will be skipped and the action will not be executed.
下面的例子申明一个记录动作执行时间日志的过滤器。
-The following example shows a filter that logs the action execution time:
```php
namespace app\components;
@@ -133,27 +92,17 @@ class ActionTimeFilter extends ActionFilter
## 核心过滤器
-## Core Filters
Yii提供了一组常用过滤器，在`yii\filters`命名空间下，接下来我们简要介绍这些过滤器。
-Yii provides a set of commonly used filters, found primarily under the `yii\filters` namespace. In the following,
-we will briefly introduce these filters.
### [[yii\filters\AccessControl|AccessControl]]
-AccessControl提供基于[[yii\filters\AccessControl::rules|rules]]规则的访问控制。
+AccessControl提供基于[[yii\filters\AccessControl::rules|rules]]规则的访问控制。
特别是在动作执行之前，访问控制会检测所有规则并找到第一个符合上下文的变量（比如用户IP地址、登录状态等等）的规则，
来决定允许还是拒绝请求动作的执行，如果没有规则符合，访问就会被拒绝。
-AccessControl provides simple access control based on a set of [[yii\filters\AccessControl::rules|rules]].
-In particular, before an action is executed, AccessControl will examine the listed rules and find the first one
-that matches the current context variables (such as user IP address, user login status, etc.) The matching
-rule will dictate whether to allow or deny the execution of the requested action. If no rule matches, the access
-will be denied.
如下示例表示表示允许已认证用户访问`create` 和 `update` 动作，拒绝其他用户访问这两个动作。
-The following example shows how to allow authenticated users to access the `create` and `update` actions
-while denying all other users from accessing these two actions.
```php
use yii\filters\AccessControl;
@@ -165,12 +114,12 @@ public function behaviors()
'class' => AccessControl::className(),
'only' => ['create', 'update'],
'rules' => [
- // allow authenticated users
+ // 允许认证用户
[
'allow' => true,
'roles' => ['@'],
],
- // everything else is denied by default
+ // 默认禁止其他用户
],
],
];
@@ -178,25 +127,16 @@ public function behaviors()
```
更多关于访问控制的详情请参阅 [授权](security-authorization.md) 一节。
-For more details about access control in general, please refer to the [Authorization](security-authorization.md) section.
### 认证方法过滤器
-### Authentication Method Filters
认证方法过滤器通过[HTTP Basic Auth](http://en.wikipedia.org/wiki/Basic_access_authentication)或[OAuth 2](http://oauth.net/2/)
来认证一个用户，认证方法过滤器类在 `yii\filters\auth` 命名空间下。
-Authentication method filters are used to authenticate a user based using various methods, such as
-[HTTP Basic Auth](http://en.wikipedia.org/wiki/Basic_access_authentication), [OAuth 2](http://oauth.net/2/).
-These filter classes are all under the `yii\filters\auth` namespace.
如下示例表示可使用[[yii\filters\auth\HttpBasicAuth]]来认证一个用户，它使用基于HTTP基础认证方法的令牌。
注意为了可运行，[[yii\web\User::identityClass|user identity class]] 类必须
实现 [[yii\web\IdentityInterface::findIdentityByAccessToken()|findIdentityByAccessToken()]]方法。
-The following example shows how you can use [[yii\filters\auth\HttpBasicAuth]] to authenticate a user using
-an access token based on HTTP Basic Auth method. Note that in order for this to work, your
-[[yii\web\User::identityClass|user identity class]] must implement the [[yii\web\IdentityInterface::findIdentityByAccessToken()|findIdentityByAccessToken()]]
-method.
```php
use yii\filters\auth\HttpBasicAuth;
@@ -211,22 +151,15 @@ public function behaviors()
}
```
-认证方法过滤器通常在实现RESTful API中使用，更多关于访问控制的详情请参阅 RESTful [认证](rest-authentication.md) 一节。
-Authentication method filters are commonly used in implementing RESTful APIs. For more details, please refer to the
-RESTful [Authentication](rest-authentication.md) section.
+认证方法过滤器通常在实现RESTful API中使用，更多关于访问控制的详情请参阅 RESTful [认证](rest-authentication.md) 一节。
### [[yii\filters\ContentNegotiator|ContentNegotiator]]
-ContentNegotiator支持响应内容格式处理和语言处理。
+ContentNegotiator支持响应内容格式处理和语言处理。
通过检查 `GET` 参数和 `Accept` HTTP头部来决定响应内容格式和语言。
-ContentNegotiator supports response format negotiation and application language negotiation. It will try to
-determine the response format and/or language by examining `GET` parameters and `Accept` HTTP header.
-如下示例，配置ContentNegotiator支持JSON和XML响应格式和英语（美国）和德语。 is configured to support JSON and XML response formats, and
-English (United States) and German languages.
-In the following example, ContentNegotiator is configured to support JSON and XML response formats, and
-English (United States) and German languages.
+如下示例，配置ContentNegotiator支持JSON和XML响应格式和英语（美国）和德语。
```php
use yii\filters\ContentNegotiator;
@@ -253,11 +186,6 @@ public function behaviors()
在[应用主体生命周期](structure-applications.md#application-lifecycle)过程中检测响应格式和语言简单很多，
因此ContentNegotiator设计可被[引导启动组件](structure-applications.md#bootstrap)调用的过滤器。
如下例所示可以将它配置在[应用主体配置](structure-applications.md#application-configurations)。
-Response formats and languages often need to be determined much earlier during
-the [application lifecycle](structure-applications.md#application-lifecycle). For this reason, ContentNegotiator
-is designed in a way such that it can also be used as a [bootstrapping component](structure-applications.md#bootstrap)
-besides filter. For example, you may configure it in the [application configuration](structure-applications.md#application-configurations)
-like the following:
```php
use yii\filters\ContentNegotiator;
@@ -281,16 +209,12 @@ use yii\web\Response;
```
> 补充: 如果请求中没有检测到内容格式和语言，使用[[formats]]和[[languages]]第一个配置项。
-> Info: In case the preferred content type and language cannot be determined from a request, the first format and
- language listed in [[formats]] and [[languages]] will be used.
### [[yii\filters\HttpCache|HttpCache]]
HttpCache利用`Last-Modified` 和 `Etag` HTTP头实现客户端缓存。例如：
-HttpCache implements client-side caching by utilizing the `Last-Modified` and `Etag` HTTP headers.
-For example,
```php
use yii\filters\HttpCache;
@@ -311,16 +235,12 @@ public function behaviors()
```
更多关于使用HttpCache详情请参阅 [HTTP 缓存](caching-http.md) 一节。
-Please refer to the [HTTP Caching](caching-http.md) section for more details about using HttpCache.
### [[yii\filters\PageCache|PageCache]]
-PageCache实现服务器端整个页面的缓存。如下示例所示，PageCache应用在`index`动作，
+PageCache实现服务器端整个页面的缓存。如下示例所示，PageCache应用在`index`动作，
缓存整个页面60秒或`post`表的记录数发生变化。它也会根据不同应用语言保存不同的页面版本。
-PageCache implements server-side caching of whole pages. In the following example, PageCache is applied
-to the `index` action to cache the whole page for maximum 60 seconds or until the count of entries in the `post`
-table changes. It also stores different versions of the page depending on the chosen application language.
```php
use yii\filters\PageCache;
@@ -346,25 +266,18 @@ public function behaviors()
```
更多关于使用PageCache详情请参阅 [页面缓存](caching-page.md) 一节。
-Please refer to the [Page Caching](caching-page.md) section for more details about using PageCache.
### [[yii\filters\RateLimiter|RateLimiter]]
RateLimiter 根据 [漏桶算法](http://en.wikipedia.org/wiki/Leaky_bucket) 来实现速率限制。
-主要用在实现RESTful APIs，更多关于该过滤器详情请参阅 [Rate Limiting](rest-rate-limiting.md) 一节。 Please refer to the [Rate Limiting](rest-rate-limiting.md) section
-RateLimiter implements a rate limiting algorithm based on the [leaky bucket algorithm](http://en.wikipedia.org/wiki/Leaky_bucket).
-It is primarily used in implementing RESTful APIs. Please refer to the [Rate Limiting](rest-rate-limiting.md) section
-for details about using this filter.
+主要用在实现RESTful APIs，更多关于该过滤器详情请参阅 [Rate Limiting](rest-rate-limiting.md) 一节。
### [[yii\filters\VerbFilter|VerbFilter]]
VerbFilter检查请求动作的HTTP请求方式是否允许执行，如果不允许，会抛出HTTP 405异常。
如下示例，VerbFilter指定CRUD动作所允许的请求方式。
-VerbFilter checks if the HTTP request methods are allowed by the requested actions. If not allowed, it will
-throw an HTTP 405 exception. In the following example, VerbFilter is declared to specify a typical set of allowed
-request methods for CRUD actions.
```php
use yii\filters\VerbFilter;
@@ -392,14 +305,8 @@ public function behaviors()
这些资源可以通过其他域名访问获取。
特别是JavaScript's AJAX 调用可使用 XMLHttpRequest 机制，由于同源安全策略该跨域请求会被网页浏览器禁止.
CORS定义浏览器和服务器交互时哪些跨域请求允许和禁止。
-Cross-origin resource sharing [CORS](https://developer.mozilla.org/fr/docs/HTTP/Access_control_CORS) is a mechanism that allows many resources (e.g. fonts, JavaScript, etc.)
-on a Web page to be requested from another domain outside the domain the resource originated from.
-In particular, JavaScript's AJAX calls can use the XMLHttpRequest mechanism. Such "cross-domain" requests would
-otherwise be forbidden by Web browsers, per the same origin security policy.
-CORS defines a way in which the browser and the server can interact to determine whether or not to allow the cross-origin request.
-The [[yii\filters\Cors|Cors filter]] should be defined before Authentication / Authorization filters to make sure the CORS headers
-will always be sent.
+[[yii\filters\Cors|Cors filter]] 应在 授权 / 认证 过滤器之前定义，以保证CORS头部被发送。
```php
use yii\filters\Cors;
@@ -416,21 +323,14 @@ public function behaviors()
```
Cors 可转为使用 `cors` 属性。
-The Cors filtering could be tuned using the `cors` property.
* `cors['Origin']`: 定义允许来源的数组，可为`['*']` (任何用户) 或 `['http://www.myserver.net', 'http://www.myotherserver.com']`. 默认为 `['*']`.
* `cors['Access-Control-Request-Method']`: 允许动作数组如 `['GET', 'OPTIONS', 'HEAD']`. 默认为 `['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'HEAD', 'OPTIONS']`.
* `cors['Access-Control-Request-Headers']`: 允许请求头部数组，可为 `['*']` 所有类型头部 或 `['X-Request-With']` 指定类型头部. 默认为 `['*']`.
* `cors['Access-Control-Allow-Credentials']`: 定义当前请求是否使用证书，可为 `true`, `false` 或 `null` (不设置). 默认为 `null`.
* `cors['Access-Control-Max-Age']`: 定义请求的有效时间，默认为 `86400`.
-* `cors['Origin']`: array used to define allowed origins. Can be `['*']` (everyone) or `['http://www.myserver.net', 'http://www.myotherserver.com']`. Default to `['*']`.
-* `cors['Access-Control-Request-Method']`: array of allowed verbs like `['GET', 'OPTIONS', 'HEAD']`. Default to `['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'HEAD', 'OPTIONS']`.
-* `cors['Access-Control-Request-Headers']`: array of allowed headers. Can be `['*']` all headers or specific ones `['X-Request-With']`. Default to `['*']`.
-* `cors['Access-Control-Allow-Credentials']`: define if current request can be made using credentials. Can be `true`, `false` or `null` (not set). Default to `null`.
-* `cors['Access-Control-Max-Age']`: define lifetime of pre-flight request. Default to `86400`.
例如，允许来源为 `http://www.myserver.net` 和方式为 `GET`, `HEAD` 和 `OPTIONS` 的CORS如下：
-For example, allowing CORS for origin : `http://www.myserver.net` with method `GET`, `HEAD` and `OPTIONS` :
```php
use yii\filters\Cors;
@@ -451,8 +351,6 @@ public function behaviors()
```
可以覆盖默认参数为每个动作调整CORS 头部。例如，为`login`动作增加`Access-Control-Allow-Credentials`参数如下所示：
-You may tune the CORS headers by overriding default parameters on a per action basis.
-For example adding the `Access-Control-Allow-Credentials` for the `login` action could be done like this :
```php
use yii\filters\Cors;
diff --git a/docs/guide-zh-CN/structure-widgets.md b/docs/guide-zh-CN/structure-widgets.md
index 7caf16a0b6..149fa0d63d 100644
--- a/docs/guide-zh-CN/structure-widgets.md
+++ b/docs/guide-zh-CN/structure-widgets.md
@@ -1,15 +1,9 @@
小部件
-Widgets
=======
小部件是在 [视图](structure-views.md) 中使用的可重用单元，使用面向对象方式创建复杂和可配置用户界面单元。
例如，日期选择器小部件可生成一个精致的允许用户选择日期的日期选择器，
你只需要在视图中插入如下代码：
-like the following:
-Widgets are reusable building blocks used in [views](structure-views.md) to create complex and configurable user
-interface elements in an object-oriented fashion. For example, a date picker widget may generate a fancy date picker
-that allows users to pick a date as their input. All you need to do is just to insert the code in a view
-like the following:
```php
'date']) ?>
```
-Yii提供许多优秀的小部件，比如[[yii\widgets\ActiveForm|active form]], [yii\widgets\Menu|menu]],
+Yii提供许多优秀的小部件，比如[[yii\widgets\ActiveForm|active form]], [yii\widgets\Menu|menu]],
[jQuery UI widgets](widget-jui.md), [Twitter Bootstrap widgets](widget-bootstrap.md)。
接下来介绍小部件的基本知识，如果你想了解某个小部件请参考对应的类API文档。
-There are a good number of widgets bundled with Yii, such as [[yii\widgets\ActiveForm|active form]],
-[[yii\widgets\Menu|menu]], [jQuery UI widgets](widget-jui.md), [Twitter Bootstrap widgets](widget-bootstrap.md).
-In the following, we will introduce the basic knowledge about widgets. Please refer to the class API documentation
-if you want to learn about the usage of a particular widget.
## 使用小部件
-## Using Widgets
小部件基本上在[views](structure-views.md)中使用，在视图中可调用 [[yii\base\Widget::widget()]] 方法使用小部件。
该方法使用 [配置](concept-configurations.md) 数组初始化小部件并返回小部件渲染后的结果。
例如如下代码插入一个日期选择器小部件，它配置为使用俄罗斯语，输入框内容为`$model`的`from_date`属性值。
-Widgets are primarily used in [views](structure-views.md). You can call the [[yii\base\Widget::widget()]] method
-to use a widget in a view. The method takes a [configuration](concept-configurations.md) array for initializing
-the widget and returns the rendering result of the widget. For example, the following code inserts a date picker
-widget which is configured to use Russian language and keep the input in the `from_date` attribute of `$model`.
```php
`的开始标签和结束标签，中间的任何代码也会被渲染。
-Some widgets can take a block of content which should be enclosed between the invocation of
-[[yii\base\Widget::begin()]] and [[yii\base\Widget::end()]]. For example, the following code uses the
-[[yii\widgets\ActiveForm]] widget to generate a login form. The widget will generate the opening and closing
-`