Merge pull request #1402 from abpframework/maliming/issue1397

Resolve #1397 ContentLayout supports html lang.

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Application.cshtml

@@ -29,7 +29,7 @@
 
 <!DOCTYPE html>
 
-<html lang="en">
+<html lang="@CultureInfo.CurrentCulture.Name">
 <head>
     @await Component.InvokeLayoutHookAsync(LayoutHooks.Head.First, StandardLayouts.Application)
 

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Empty.cshtml

@@ -28,7 +28,7 @@
 
 <!DOCTYPE html>
 
-<html lang="en">
+<html lang="@CultureInfo.CurrentCulture.Name">
 <head>
     @await Component.InvokeLayoutHookAsync(LayoutHooks.Head.First, StandardLayouts.Empty)
 

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/_ViewImports.cshtml

@@ -1,3 +1,4 @@
-@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+@using System.Globalization
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
 @addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bootstrap
 @addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bundling

modules/docs/app/VoloDocs.Web/Branding/VoloDocsBrandingProvider.cs

@@ -1,20 +1,19 @@
-using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Components;
+using Microsoft.Extensions.Localization;
+using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Components;
 using Volo.Abp.Configuration;
 using Volo.Abp.DependencyInjection;
+using Volo.Docs.Localization;
 
 namespace VoloDocs.Web.Branding
 {
     [Dependency(ReplaceServices = true)]
     public class VoloDocsBrandingProvider : DefaultBrandingProvider
     {
-        public VoloDocsBrandingProvider(IConfigurationAccessor configurationAccessor)
+        public VoloDocsBrandingProvider(IConfigurationAccessor configurationAccessor, IStringLocalizer<DocsResource> localizer)
         {
             var configuration = configurationAccessor.Configuration;
 
-            if (configuration["Title"] != null)
+            AppName = localizer["DocsTitle"];
-            {
-                AppName = configuration["Title"];
-            }
 
             if (configuration["LogoUrl"] != null)
             {

modules/docs/app/VoloDocs.Web/Localization/Resources/VoloDocs/Web/en.json

@@ -1,6 +1,7 @@
 {
   "culture": "en",
   "texts": {
+    "DocsTitle": "VoloDocs",
     "WelcomeVoloDocs": "Welcome to the VoloDocs!",
     "NoProjectWarning": "There`s no defined project yet!",
     "CreateYourFirstProject": "Click here to start your first project",

modules/docs/app/VoloDocs.Web/Localization/Resources/VoloDocs/Web/zh-Hans.json

@@ -1,6 +1,7 @@
 {
   "culture": "zh-Hans",
   "texts": {
+    "DocsTitle": "Volo文档",
     "WelcomeVoloDocs": "欢迎使用VoloDocs!",
     "NoProjectWarning": "当前没有定义的项目！",
     "CreateYourFirstProject": "点击这里开始你的第一个项目",

modules/docs/app/VoloDocs.Web/appsettings.json

@@ -1,5 +1,4 @@
 {
   "ConnectionString": "Server=localhost;Database=VoloDocs;Trusted_Connection=True;MultipleActiveResultSets=true",
-  "Title": "VoloDocs",
   "LogoUrl": "/assets/images/Logo.png"
 }

modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/GithubRepositoryManager.cs

@@ -30,7 +30,10 @@ namespace Volo.Docs.GitHub.Documents
                 httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Token", token);
             }
 
-            httpClient.DefaultRequestHeaders.Add("User-Agent", userAgent ?? "");
+            if (!userAgent.IsNullOrWhiteSpace())
+            {
+                httpClient.DefaultRequestHeaders.Add("User-Agent", userAgent);
+            }
 
             return await httpClient.GetStringAsync(new Uri(rawUrl));
         }
@@ -43,7 +46,10 @@ namespace Volo.Docs.GitHub.Documents
                 httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Token", token);
             }
 
-            httpClient.DefaultRequestHeaders.Add("User-Agent", userAgent ?? "");
+            if (!userAgent.IsNullOrWhiteSpace())
+            {
+                httpClient.DefaultRequestHeaders.Add("User-Agent", userAgent);
+            }
 
             return await httpClient.GetByteArrayAsync(new Uri(rawUrl));
         }