Merge branch 'dev' into maliming/UserSecurityLog

docs/en/Getting-Started.md

@@ -344,6 +344,6 @@ If you don't plan to develop a mobile application with React Native, you can saf
 
 See the "[Getting Started with the React Native](Getting-Started-React-Native.md)" document to learn how to configure and run the React Native application.
 
-## See Also
+## Next
 
 * [Web Application Development Tutorial](Tutorials/Part-1.md)

docs/en/Index.md

@@ -1,28 +1,18 @@
 # ABP Documentation
 
-ABP is an **open source application framework** focused on ASP.NET Core based web application development, but also supports developing other type of applications.
+ABP is an **open source application framework** focused on **ASP.NET Core** based **web application development**. It also supports developing other type of applications.
 
-Explore the left navigation menu to deep dive in the documentation.
+Explore the navigation menu to deep dive in the documentation.
 
 ## Getting Started
 
-Easiest way to start a new project with ABP is to use the startup templates:
+The easiest way to start a new web application with the ABP Framework is to use the [getting started](Getting-Started.md) tutorial.
 
-* [ASP.NET Core MVC (Razor Pages) UI Startup Template](Getting-Started.md?UI=MVC&DB=EF&Tiered=No)
-* [Angular UI Startup Template](Getting-Started.md?UI=NG&DB=EF&Tiered=No)
-
-If you want to start from scratch (with an empty project) then manually install the ABP Framework and use the following tutorials:
-
-* [Console Application](Getting-Started-Console-Application.md)
-* [ASP.NET Core Web Application](Getting-Started-AspNetCore-Application.md)
-
-## Packages
-
-ABP Framework is distributed as NuGet and NPM packages. See [this page](http://abp.io/packages) for the complete list of the packages.
+Then you can continue with the [web application development tutorial](Tutorials/Part-1.md).
 
 ## Source Code
 
-ABP is hosted on GitHub. See [the source code](https://github.com/abpframework/abp).
+ABP is hosted on GitHub. See [the source code](https://github.com/abpframework).
 
 ## Want to Contribute?
 

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/en/docs-nav.json

@@ -626,6 +626,10 @@
     {
       "text": "API Documentation",
       "path": "{ApiDocumentationUrl}"
+    },
+    {
+      "text": "Official Packages",
+      "path": "https://abp.io/packages"
     }
   ]
 }

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'
   );
 

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/AbpAspNetCoreMvcUiThemeSharedDemoModule.cs

@@ -12,7 +12,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo
         {
             Configure<AbpVirtualFileSystemOptions>(options =>
             {
-                options.FileSets.AddEmbedded<AbpAspNetCoreMvcUiThemeSharedDemoModule>("Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo");
+                options.FileSets.AddEmbedded<AbpAspNetCoreMvcUiThemeSharedDemoModule>();
             });
         }
     }

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.csproj

@@ -12,6 +12,7 @@
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+    <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
     <IsPackable>true</IsPackable>
     <OutputType>Library</OutputType>
   </PropertyGroup>
@@ -23,5 +24,14 @@
   <ItemGroup>
     <ProjectReference Include="..\Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared\Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj" />
   </ItemGroup>
+  
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="3.1.5" />
+  </ItemGroup>
+  
+  <ItemGroup>
+    <Content Remove="Views\Components\Themes\Shared\**\*.cshtml" />
+    <EmbeddedResource Include="Views\Components\Themes\Shared\**\*.cshtml" />
+  </ItemGroup>
 
 </Project>

framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/cs.json

@@ -47,6 +47,8 @@
     "PagerInfoEmpty": "Zobrazeno od 0 do 0 z celkem 0 záznamů",
     "PagerInfoFiltered": "(filtrováno ze všech _MAX_ záznamů)",
     "NoDataAvailableInDatatable": "Nejsou žádná data",
+    "Total": "celkem",
+    "Selected": "vybráno",
     "PagerShowMenuEntries": "Zobrazit _MENU_ záznamů",
     "DatatableActionDropdownDefaultText": "Akce",
     "ChangePassword": "Změnit heslo",

framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/Pages/Components/Dropdowns/Index.cshtml

@@ -4,10 +4,10 @@
 @model Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.Pages.Components.Dropdowns.IndexModel
 @inject IPageLayout PageLayout
 @{
-    PageLayout.Content.Title = "DrowDowns";
+    PageLayout.Content.Title = "Dropdowns";
 }
-<h2>Cards</h2>
-<p>Based on <a href="https://getbootstrap.com/docs/4.1/components/dropdowns/" target="_blank"> Bootstrap button</a>.</p>
+<h2>Dropdowns</h2>
+<p>Based on <a href="https://getbootstrap.com/docs/4.1/components/dropdowns/" target="_blank"> Bootstrap Dropdown</a>.</p>
 <p>Check the <a href="https://docs.abp.io/en/abp/latest/UI/AspNetCore/Tag-Helpers/Dropdowns" target="_blank">ABP Documentation</a>.</p>
 
 @await Component.InvokeAsync(typeof(DropdownsDemoViewComponent))

modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/cs.json

@@ -40,6 +40,9 @@
     "DisplayName:Abp.Account.IsSelfRegistrationEnabled": "Je povolena automatická registrace",
     "Description:Abp.Account.IsSelfRegistrationEnabled": "Zda si uživatel může účet zaregistrovat sám.",
     "DisplayName:Abp.Account.EnableLocalLogin": "Ověření pomocí místního účtu",
-    "Description:Abp.Account.EnableLocalLogin": "Označuje, zda server umožní uživatelům ověřovat se pomocí místního účtu."
+    "Description:Abp.Account.EnableLocalLogin": "Označuje, zda server umožní uživatelům ověřovat se pomocí místního účtu.",
+    "LoggedOutTitle": "Odhlášeno",
+    "LoggedOutText": "Byli jste odhlášeni a brzy budete přesměrováni.",
+    "ReturnToText": "Kliknutím sem přejdete na {0}"
   }
 }

modules/blogging/src/Volo.Blogging.Admin.Application.Contracts/Volo/Blogging/Admin/Localization/Resources/Blogging/Admin/ApplicationContracts/cs.json

@@ -1,7 +1,7 @@
 {
   "culture": "cs",
   "texts": {
-    "Permission:BloggingAdmin": "Blog",
+    "Permission:BloggingAdmin": "Blogování",
     "Permission:Blogs": "Blogy",
     "Permission:Management": "Správa",
     "Permission:Edit": "Upravit",

modules/blogging/src/Volo.Blogging.Domain.Shared/Volo/Blogging/Localization/Resources/cs.json

@@ -2,7 +2,7 @@
   "culture": "cs",
   "texts": {
     "Menu:Blogs": "Blogy",
-    "Menu:BlogManagement": "Správa blogu",
+    "Menu:BlogManagement": "Blogování",
     "Title": "Nadpis",
     "Delete": "Smazat",
     "Reply": "Odpovědět",

modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Localization/Resources/Docs/ApplicationContracts/cs.json

@@ -7,6 +7,7 @@
     "Permission:Delete": "Smazat",
     "Permission:Create": "Vytvořit",
     "Permission:Documents": "Dokumenty",
+    "Menu:Documents": "Dokumenty",
     "Menu:DocumentManagement": "Dokumenty",
     "Menu:ProjectManagement": "Projekty",
     "CreateANewProject": "Vytvořit nový projekt",
@@ -32,6 +33,26 @@
     "DisplayName:GitHubUserAgent": "GitHub user agent",
     "DisplayName:All": "Pull všeho",
     "DisplayName:LanguageCode": "Kód jazyka",
-    "DisplayName:Version": "Verze"
+    "DisplayName:Version": "Verze",
+    "Documents": "Dokumenty",
+    "RemoveFromCache": "Odebrat z mezipaměti",
+    "Reindex": "Reindex",
+    "ReindexCompleted": "Reindex dokončen",
+    "RemovedFromCache": "Odebráno z mezipaměti",
+    "RemoveFromCacheConfirmation": "Opravdu chcete tuto položku odebrat z mezipaměti?",
+    "ReIndexDocumentConfirmation": "Opravdu chcete tuto položku reindexovat?",
+    "DeleteDocumentFromDbConfirmation": "Opravdu chcete tuto položku odstranit z databáze?",
+    "DeleteFromDatabase": "Odstranit z databáze",
+    "Deleted": "Vymazáno",
+    "Search": "Vyhledávání",
+    "StartDate": "Počáteční datum",
+    "EndDate": "Datum ukončení",
+    "CreationTime": "Čas vytvoření",
+    "LastUpdateTime": "Poslední aktualizace",
+    "LastSignificantUpdateTime": "Poslední významná aktualizace",
+    "Version": "Verze",
+    "LanguageCode": "Kód jazyka",
+    "FileName": "Název souboru",
+    "LastCachedTime": "Čas uložení v mezipaměti"
   }
 }

templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/cs.json

@@ -1,6 +1,7 @@
 {
   "culture": "cs",
   "texts": {
-    "ManageYourProfile": "Spravovat profil"
+    "ManageYourProfile": "Spravovat profil",
+    "SamplePageMessage": "Ukázková stránka pro modul MyProjectName"
   }
 }