Merge pull request #1038 from Webdiyer/docs_module

Improve localization & fix AddBaseTypes method parameter name spelling mistakes.

modules/blogging/src/Volo.Blogging.Web/BloggingWebModule.cs

@@ -1,4 +1,5 @@
-using Microsoft.AspNetCore.Mvc.RazorPages;
+using Localization.Resources.AbpUi;
+using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.AspNetCore.Mvc.Localization;
 using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap;
@@ -47,7 +48,7 @@ namespace Volo.Blogging
                 options.Resources
                     .Get<BloggingResource>()
                     .AddBaseTypes(typeof(AbpValidationResource))
-                    .AddBaseTypes(typeof(AbpUiModule))
+                    .AddBaseTypes(typeof(AbpUiResource))
                     .AddVirtualJson("/Localization/Resources/Blogging/Web");
             });
 

modules/docs/app/VoloDocs.EntityFrameworkCore/VoloDocsDbContextFactory.cs

@@ -20,7 +20,7 @@ namespace VoloDocs.EntityFrameworkCore
         private static IConfigurationRoot BuildConfiguration()
         {
             var builder = new ConfigurationBuilder()
-                .SetBasePath(Path.Combine(Directory.GetCurrentDirectory(), "../VoloDocs/"))
+                .SetBasePath(Path.Combine(Directory.GetCurrentDirectory(), "../VoloDocs.Web/"))
                 .AddJsonFile("appsettings.json", optional: false);
 
             return builder.Build();

modules/docs/app/VoloDocs.Web/VoloDocsWebModule.cs

@@ -29,7 +29,7 @@ using Volo.Docs;
 using Volo.Docs.Admin;
 using Volo.Docs.Localization;
 using VoloDocs.EntityFrameworkCore;
-using VoloDocs.Web.Utils;
+using Localization.Resources.AbpUi;
 
 namespace VoloDocs.Web
 {
@@ -107,14 +107,15 @@ namespace VoloDocs.Web
 
             Configure<AbpLocalizationOptions>(options =>
             {
-                options
-                    .Languages
-                    .Add(new LanguageInfo("en", "en", "English"));
+
+                options.Languages.Add(new LanguageInfo("en", "en", "English"));
+                options.Languages.Add(new LanguageInfo("tr", "tr", "Türkçe"));
+                options.Languages.Add(new LanguageInfo("zh-Hans", "zh-Hans", "简体中文"));
 
                 options.Resources
                     .Get<DocsResource>()
                     .AddBaseTypes(typeof(AbpValidationResource))
-                    .AddBaseTypes(typeof(AbpUiModule))
+                    .AddBaseTypes(typeof(AbpUiResource))
                     .AddVirtualJson("/Localization/Resources/VoloDocs/Web");
             });
 

modules/docs/src/Volo.Docs.Admin.Web/DocsAdminWebModule.cs

@@ -1,4 +1,5 @@
-using Volo.Abp.AspNetCore.Mvc.Localization;
+using Localization.Resources.AbpUi;
+using Volo.Abp.AspNetCore.Mvc.Localization;
 using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap;
 using Volo.Abp.AutoMapper;
 using Volo.Abp.Localization;
@@ -44,7 +45,7 @@ namespace Volo.Docs.Admin
                 options.Resources
                     .Get<DocsResource>()
                     .AddBaseTypes(typeof(AbpValidationResource))
-                    .AddBaseTypes(typeof(AbpUiModule))
+                    .AddBaseTypes(typeof(AbpUiResource))
                     .AddVirtualJson("/Localization/Resources/Docs/Web");
             });