Merge branch 'master' into dev

docs/en/Tutorials/Part-3.md

@@ -832,7 +832,7 @@ Open `/src/app/book/book.component.html` and replace `<ng-template #abpBody> </n
       <label for="book-type">Type</label><span> * </span>
       <select class="form-control" id="book-type" formControlName="type">
         <option [ngValue]="null">Select a book type</option>
-        <option [ngValue]="booksType[type]" *ngFor="let type of bookTypeArr"> {%{{{ type }}}%}</option>
+        <option [ngValue]="booksType[type]" *ngFor="let type of bookTypes"> {%{{{ type }}}%}</option>
       </select>
     </div>
 
@@ -921,7 +921,7 @@ export class BookComponent implements OnInit {
 
   form: FormGroup;
 
-  // <== added bookTypeArr array ==>
+  // <== added bookTypes array ==>
   bookTypes = Object.keys(BookType).filter(
     (bookType) => typeof this.booksType[bookType] === 'number'
   );

docs/en/Tutorials/Part-4.md

@@ -82,7 +82,8 @@ using Volo.Abp.Application.Dtos;
 using Xunit;
 
 namespace Acme.BookStore.Books
-{
+{ {{if DB=="Mongo"}}
+    [Collection(BookStoreTestConsts.CollectionDefinitionName)]{{end}}
     public class BookAppService_Tests : BookStoreApplicationTestBase
     {
         private readonly IBookAppService _bookAppService;
@@ -172,7 +173,8 @@ using Volo.Abp.Validation;
 using Xunit;
 
 namespace Acme.BookStore.Books
-{
+{ {{if DB=="Mongo"}}
+    [Collection(BookStoreTestConsts.CollectionDefinitionName)]{{end}}
     public class BookAppService_Tests : BookStoreApplicationTestBase
     {
         private readonly IBookAppService _bookAppService;

docs/en/Tutorials/Part-5.md

@@ -366,7 +366,7 @@ Open the `/src/app/book/book.component.html` file and replace the create button
 <!-- Add the abpPermission directive -->
 <button abpPermission="BookStore.Books.Create" id="create" class="btn btn-primary" type="button" (click)="createBook()">
   <i class="fa fa-plus mr-1"></i>
-  <span>{{ '::NewBook' | abpLocalization }}</span>
+  <span>{%{{{ '::NewBook' | abpLocalization }}}%}</span>
 </button>
 ````
 
@@ -385,12 +385,12 @@ Open the `/src/app/book/book.component.html` file and replace the edit and delet
 ````html
 <!-- Add the abpPermission directive -->
 <button abpPermission="BookStore.Books.Edit" ngbDropdownItem (click)="editBook(row.id)">
-  {{ '::Edit' | abpLocalization }}
+  {%{{{ '::Edit' | abpLocalization }}}%}
 </button>
 
 <!-- Add the abpPermission directive -->
 <button abpPermission="BookStore.Books.Delete" ngbDropdownItem (click)="delete(row.id)">
-  {{ 'AbpAccount::Delete' | abpLocalization }}
+  {%{{{ 'AbpAccount::Delete' | abpLocalization }}}%}
 </button>
 ````
 

docs/pt-BR/Tutorials/Angular/Part-II.md

@@ -195,7 +195,7 @@ Abra `book-list.component.html`e adicione o formulário no modelo de corpo do mo
       <label for="book-type">Type</label><span> * </span>
       <select class="form-control" id="book-type" formControlName="type">
         <option [ngValue]="null">Select a book type</option>
-        <option [ngValue]="booksType[type]" *ngFor="let type of bookTypeArr"> {%{{{ type }}}%}</option>
+        <option [ngValue]="booksType[type]" *ngFor="let type of bookTypes"> {%{{{ type }}}%}</option>
       </select>
     </div>
 
@@ -218,18 +218,18 @@ Abra `book-list.component.html`e adicione o formulário no modelo de corpo do mo
 
 > Usamos o [datepicker do NgBootstrap](https://ng-bootstrap.github.io/#/components/datepicker/overview) neste componente.
 
-Abra o `book-list.component.ts`e crie uma matriz chamada `bookTypeArr`:
+Abra o `book-list.component.ts`e crie uma matriz chamada `bookTypes`:
 
 ```js
 //...
 form: FormGroup;
 
-bookTypeArr = Object.keys(Books.BookType).filter(
+bookTypes = Object.keys(Books.BookType).filter(
     bookType => typeof this.booksType[bookType] === 'number'
 );
 ```
 
-O `bookTypeArr`contém os campos da `BookType`enumeração. A matriz resultante é mostrada abaixo:
+O `bookTypes`contém os campos da `BookType`enumeração. A matriz resultante é mostrada abaixo:
 
 ```js
 ['Adventure', 'Biography', 'Dystopia', 'Fantastic' ...]

docs/zh-Hans/Tutorials/Part-2.md

@@ -650,7 +650,7 @@ export class BookListComponent implements OnInit {
       <label for="book-type">Type</label><span> * </span>
       <select class="form-control" id="book-type" formControlName="type">
         <option [ngValue]="null">Select a book type</option>
-        <option [ngValue]="bookType[type]" *ngFor="let type of bookTypeArr"> {%{{{ type }}}%}</option>
+        <option [ngValue]="bookType[type]" *ngFor="let type of bookTypes"> {%{{{ type }}}%}</option>
       </select>
     </div>
 
@@ -721,8 +721,8 @@ export class BookListComponent implements OnInit {
 
   booksType = BookType;
 
-  // <== added bookTypeArr array ==>
-  bookTypeArr = Object.keys(BookType).filter(
+  // <== added bookTypes array ==>
+  bookTypes = Object.keys(BookType).filter(
     (bookType) => typeof this.booksType[bookType] === 'number'
   );
 
@@ -764,7 +764,7 @@ export class BookListComponent implements OnInit {
 
 * 我们添加了一个新的 `NgbDateAdapter` 提供程序,它将Datepicker值转换为Date类型. 有关更多详细信息,请参见[datepicker adapters](https://ng-bootstrap.github.io/#/components/datepicker/overview).
 
-* 我们添加了 `bookTypeArr` 数组,以便能够在combobox值中使用它. `bookTypeArr` 包含 `BookType` 枚举的字段. 得到的数组如下所示:
+* 我们添加了 `bookTypes` 数组,以便能够在combobox值中使用它. `bookTypes` 包含 `BookType` 枚举的字段. 得到的数组如下所示:
 
   ```js
   ['Adventure', 'Biography', 'Dystopia', 'Fantastic' ...]
@@ -799,7 +799,7 @@ export class BookListComponent implements OnInit {
 
   booksType = BookType;
 
-  bookTypeArr = Object.keys(BookType).filter(
+  bookTypes = Object.keys(BookType).filter(
     (bookType) => typeof this.booksType[bookType] === 'number'
   );
 
@@ -904,7 +904,7 @@ export class BookListComponent implements OnInit {
 
   booksType = BookType;
 
-  bookTypeArr = Object.keys(BookType).filter(
+  bookTypes = Object.keys(BookType).filter(
     (bookType) => typeof this.booksType[bookType] === 'number'
   );