Merge branch 'master' of https://github.com/nestjs/nest

Author: kamilmysliwiec

Readme.md

@@ -37,7 +37,8 @@
 
 ## Getting started
 
-To check out the [guide](https://docs.nestjs.com), visit [docs.nestjs.com](https://docs.nestjs.com). :books:
+* To check out the [guide](https://docs.nestjs.com), visit [docs.nestjs.com](https://docs.nestjs.com). :books:
+* 要查看中文 [指南](readme_zh.md), 请访问 [docs.nestjs.cn](https://docs.nestjs.cn). :books:
 
 ## Support
 
@@ -47,13 +48,13 @@ Nest is an MIT-licensed open source project. It can grow thanks to the sponsors
 
 <a href="https://valor-software.com/"><img src="https://docs.nestjs.com/assets/sponsors/valor-software.png" width="300" /></a>
 
-#### Silver Sponsor
+#### Silver Sponsors
 
-<a href="https://neoteric.eu/"><img src="https://nestjs.com/img/neoteric-cut.png" width="130" /></a>
+<a href="https://neoteric.eu/"><img src="https://nestjs.com/img/neoteric-cut.png" width="130" /></a> &nbsp; <a href="https://www.swingdev.io"><img src="https://nestjs.com/img/swingdev-logo.svg#1" width="160" /></a>
 
 #### Sponsors
 
-<a href="https://scal.io"><img src="https://nestjs.com/img/scalio-logo.svg" width="120" /></a> &nbsp; <a href="https://www.swingdev.io"><img src="https://nestjs.com/img/swingdev-logo.svg#1" width="120" /></a> &nbsp; <a href="http://angularity.io"><img src="http://angularity.io/media/logo.svg" height="32" /></a> &nbsp; <a href="http://gojob.com"><img src="https://gojob.com/w/wp-content/uploads/2017/02/cropped-Logo-web-home.png" height="44" /> &nbsp; <a href="https://keycdn.com"><img src="https://nestjs.com/img/keycdn.svg" height="37" /></a> &nbsp; <a href="https://hostpresto.com"><img src="https://nestjs.com/img/hostpresto.png" height="32" /></a>
+<a href="https://scal.io"><img src="https://nestjs.com/img/scalio-logo.svg" width="120" /></a> &nbsp; <a href="http://angularity.io"><img src="http://angularity.io/media/logo.svg" height="32" /></a> &nbsp; <a href="http://gojob.com"><img src="https://gojob.com/w/wp-content/uploads/2017/02/cropped-Logo-web-home.png" height="44" /> &nbsp; <a href="https://keycdn.com"><img src="https://nestjs.com/img/keycdn.svg" height="37" /></a> &nbsp; <a href="https://hostpresto.com"><img src="https://nestjs.com/img/hostpresto.png" height="32" /></a>
 
 ## Backers
 
@@ -68,5 +69,3 @@ Nest is an MIT-licensed open source project. It can grow thanks to the sponsors
 ## License
 
 Nest is [MIT licensed](LICENSE).
-
-<h4 align="center"> <a href="readme_zh.md">中文说明</a></h4>

packages/core/errors/messages.ts

@@ -10,21 +10,21 @@ export const UnknownDependenciesMessage = (
   args[index] = '?';
   message += args.join(', ');
 
-  message += `). Please verify whether [${index}] argument is available in the current context.`;
+  message += `). Please make sure that the argument at index [${index}] is available in the current context.`;
   return message;
 };
 
 export const InvalidMiddlewareMessage = (name: string) =>
   `The middleware doesn't provide the 'resolve' method (${name})`;
 
 export const InvalidModuleMessage = (scope: string) =>
-  `Nest cannot create the module instance. The frequent reason of this exception is the circular dependency between modules. Use forwardRef() to avoid it (read more https://docs.nestjs.com/advanced/circular-dependency). Scope [${scope}]`;
+  `Nest cannot create the module instance. Often, this is because of a circular dependency between modules. Use forwardRef() to avoid it. (Read more https://docs.nestjs.com/advanced/circular-dependency.) Scope [${scope}]`;
 
 export const UnknownExportMessage = (module: string) =>
-  `Nest cannot export component/module that is not a part of the currently proccessed module (${module}). Please verify whether each exported unit is available in this particular context.`;
+  `Nest cannot export a component/module that is not a part of the currently processed module (${module}). Please verify whether each exported unit is available in this particular context.`;
 
 export const INVALID_MIDDLEWARE_CONFIGURATION = `Invalid middleware configuration passed inside the module 'configure()' method.`;
 export const UNKNOWN_REQUEST_MAPPING = `Request mapping properties not defined in the @RequestMapping() annotation!`;
 export const UNHANDLED_RUNTIME_EXCEPTION = `Unhandled Runtime Exception.`;
 export const INVALID_EXCEPTION_FILTER = `Invalid exception filters (@UseFilters()).`;
-export const MICROSERVICES_PACKAGE_NOT_FOUND_EXCEPTION = `Unable to load @nestjs/microservices package (please, make sure whether it's installed already).`;
+export const MICROSERVICES_PACKAGE_NOT_FOUND_EXCEPTION = `Unable to load @nestjs/microservices package. (Please make sure that it's already installed.)`;

packages/core/helpers/external-context-creator.ts

@@ -5,7 +5,7 @@ import { InterceptorsContextCreator } from './../interceptors/interceptors-conte
 import { InterceptorsConsumer } from './../interceptors/interceptors-consumer';
 import { Controller } from '@nestjs/common/interfaces';
 import { FORBIDDEN_MESSAGE } from '../guards/constants';
-import { HttpStatus, HttpException } from '@nestjs/common';
+import { ForbiddenException } from '@nestjs/common';
 import { Module } from './../injector/module';
 import { ModulesContainer } from './../injector/modules-container';
 
@@ -38,7 +38,7 @@ export class ExternalContextCreator {
         callback,
       );
       if (!canActivate) {
-        throw new HttpException(FORBIDDEN_MESSAGE, HttpStatus.FORBIDDEN);
+        throw new ForbiddenException(FORBIDDEN_MESSAGE);
       }
       const handler = () => callback.apply(instance, args);
       return await this.interceptorsConsumer.intercept(

packages/core/router/router-execution-context.ts

@@ -21,9 +21,8 @@ import { PipesConsumer } from './../pipes/pipes-consumer';
 import {
   ParamData,
   PipeTransform,
-  HttpStatus,
   RequestMethod,
-  HttpException,
+  ForbiddenException,
   HttpServer,
 } from '@nestjs/common';
 import { GuardsContextCreator } from '../guards/guards-context-creator';
@@ -238,7 +237,7 @@ export class RouterExecutionContext {
         callback,
       );
       if (!canActivate) {
-        throw new HttpException(FORBIDDEN_MESSAGE, HttpStatus.FORBIDDEN);
+        throw new ForbiddenException(FORBIDDEN_MESSAGE);
       }
     };
     return guards.length ? canActivateFn : null;

readme_zh.md

@@ -38,9 +38,8 @@
 
 ## 开始
 
-要查看 [指南](https://docs.nestjs.cn), 请浏览 [docs.nestjs.cn](https://docs.nestjs.cn). :books:
-
-英文官方原文档： [docs.nestjs.com](https://docs.nestjs.com). 
+* 要查看 [指南](https://docs.nestjs.cn), 请访问 [docs.nestjs.cn](https://docs.nestjs.cn). :books:
+* 要查看 [English指南](https://docs.nestjs.com), 请访问 [docs.nestjs.com](https://docs.nestjs.com). :books:
 
 ## 赞助商