Add localization (#181)

* add locale * page resource * update resx * update * refresh language in layout * update
ant-design-blazor · Jun 23, 2024 · ccc5c4a · ccc5c4a
1 parent bb37624
commit ccc5c4a
Show file tree

Hide file tree

Showing 28 changed files with 364 additions and 236 deletions.
diff --git a/.template.config/templates/server/AntDesign.Pro.Template.csproj b/.template.config/templates/server/AntDesign.Pro.Template.csproj
@@ -8,7 +8,8 @@
 
   <ItemGroup>
     <PackageReference Include="AntDesign.Charts" Version="0.4.0" />
-    <PackageReference Include="AntDesign.ProLayout" Version="0.16.2" />
+    <PackageReference Include="AntDesign.Extensions.Localization" Version="0.19.0" />
+    <PackageReference Include="AntDesign.ProLayout" Version="0.19.0" />
     <PackageReference Include="System.Net.Http.Json" Version="8.0.0" />
   </ItemGroup>
 

diff --git a/.template.config/templates/server/Layouts/BasicLayout.razor b/.template.config/templates/server/Layouts/BasicLayout.razor
diff --git a/.template.config/templates/server/Program.cs b/.template.config/templates/server/Program.cs
@@ -15,6 +15,8 @@
     BaseAddress = new Uri(sp.GetService<NavigationManager>()!.BaseUri)
 });
 builder.Services.Configure<ProSettings>(builder.Configuration.GetSection("ProSettings"));
+builder.Services.AddInteractiveStringLocalizer();
+builder.Services.AddLocalization(options => options.ResourcesPath = "Resources");
 //#if (full)
 builder.Services.AddScoped<IChartService, ChartService>();
 builder.Services.AddScoped<IProjectService, ProjectService>();

diff --git a/.template.config/templates/server/_Imports.razor b/.template.config/templates/server/_Imports.razor
@@ -8,6 +8,8 @@
 @using Microsoft.AspNetCore.Components.Web
 @using Microsoft.JSInterop
 @using AntDesign.Pro.Template
+@using AntDesign.Extensions.Localization
+@using System.Globalization
 //#if (full)
 @using AntDesign.Pro.Template.Models
 @using AntDesign.Pro.Template.Services

diff --git a/.template.config/templates/wasm/AntDesign.Pro.Template.csproj b/.template.config/templates/wasm/AntDesign.Pro.Template.csproj
@@ -7,7 +7,8 @@
 
   <ItemGroup>
     <PackageReference Include="AntDesign.Charts" Version="0.4.0" />
-    <PackageReference Include="AntDesign.ProLayout" Version="0.16.2" />
+    <PackageReference Include="AntDesign.Extensions.Localization" Version="0.19.0" />
+    <PackageReference Include="AntDesign.ProLayout" Version="0.19.0" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0" PrivateAssets="all" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />

diff --git a/.template.config/templates/wasm/Layouts/BasicLayout.razor b/.template.config/templates/wasm/Layouts/BasicLayout.razor
diff --git a/.template.config/templates/wasm/Program.cs b/.template.config/templates/wasm/Program.cs
@@ -21,6 +21,9 @@ public static async Task Main(string[] args)
             builder.Services.AddAntDesign();
             builder.Services.Configure<ProSettings>(builder.Configuration.GetSection("ProSettings"));
             //#if (full)
+            builder.Services.AddInteractiveStringLocalizer();
+            builder.Services.AddLocalization(options => options.ResourcesPath = "Resources");
+
             builder.Services.AddScoped<IChartService, ChartService>();
             builder.Services.AddScoped<IProjectService, ProjectService>();
             builder.Services.AddScoped<IUserService, UserService>();

diff --git a/.template.config/templates/wasm/_Imports.razor b/.template.config/templates/wasm/_Imports.razor
@@ -9,6 +9,8 @@
 @using Microsoft.AspNetCore.Components.WebAssembly.Http
 @using Microsoft.JSInterop
 @using AntDesign.Pro.Template
+@using AntDesign.Extensions.Localization
+@using System.Globalization
 //#if (full)
 @using AntDesign.Pro.Template.Models
 @using AntDesign.Pro.Template.Services

diff --git a/...AntDesign.Pro.Template/AntDesign.Pro.Template.Client/AntDesign.Pro.Template.Client.csproj b/...AntDesign.Pro.Template/AntDesign.Pro.Template.Client/AntDesign.Pro.Template.Client.csproj
@@ -10,7 +10,8 @@
 
   <ItemGroup>
     <PackageReference Include="AntDesign.Charts" Version="0.4.0" />
-    <PackageReference Include="AntDesign.ProLayout" Version="0.16.2" />
+    <PackageReference Include="AntDesign.Extensions.Localization" Version="0.19.0" />
+    <PackageReference Include="AntDesign.ProLayout" Version="0.19.0" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0" PrivateAssets="all" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />

diff --git a/...onfig/templates/webapp/AntDesign.Pro.Template/AntDesign.Pro.Template/Components/App.razor b/...onfig/templates/webapp/AntDesign.Pro.Template/AntDesign.Pro.Template/Components/App.razor
@@ -5,12 +5,10 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <base href="/" />
-    <link rel="stylesheet" href="bootstrap/bootstrap.min.css" />
     <link href="_content/AntDesign/css/ant-design-blazor.css" rel="stylesheet" />
     <link href="_content/AntDesign.ProLayout/css/ant-design-pro-layout-blazor.css" rel="stylesheet" />
+    <link rel="stylesheet" href="AntDesign.Pro.Template.bundle.scp.css" />
     <link href="./css/site.css" rel="stylesheet" />
-    <link rel="stylesheet" href="app.css" />
-    <link rel="stylesheet" href="AntDesign.Pro.Template.styles.css" />
     <link rel="icon" type="image/png" href="favicon.png" />
     <HeadOutlet @rendermode="InteractiveAuto" />
 </head>

diff --git a/.../webapp/AntDesign.Pro.Template/AntDesign.Pro.Template/wwwroot/bootstrap/bootstrap.min.css b/.../webapp/AntDesign.Pro.Template/AntDesign.Pro.Template/wwwroot/bootstrap/bootstrap.min.css
diff --git a/...app/AntDesign.Pro.Template/AntDesign.Pro.Template/wwwroot/bootstrap/bootstrap.min.css.map b/...app/AntDesign.Pro.Template/AntDesign.Pro.Template/wwwroot/bootstrap/bootstrap.min.css.map
diff --git a/...plates/webapp/AntDesign.Pro.Template/AntDesign.Pro.Template/wwwroot/favicon.png b/...plates/webapp/AntDesign.Pro.Template/AntDesign.Pro.Template/wwwroot/favicon.png
diff --git a/src/AntDesign.Pro.WebApp/AntDesign.Pro.WebApp.csproj b/src/AntDesign.Pro.WebApp/AntDesign.Pro.WebApp.csproj
@@ -14,4 +14,8 @@
     <ProjectReference Include="..\AntDesign.Pro\AntDesign.Pro.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="wwwroot\" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/AntDesign.Pro.WebApp/Components/App.razor b/src/AntDesign.Pro.WebApp/Components/App.razor
@@ -5,10 +5,11 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <base href="/" />
-    <link rel="stylesheet" href="bootstrap/bootstrap.min.css" />
     <link rel="stylesheet" href="app.css" />
+    <link rel="stylesheet" href="AntDesign.Pro.Template.bundle.scp.css" />
+    <link href="./css/site.css" rel="stylesheet" />
     <link rel="stylesheet" href="AntDesign.Pro.WebApp.styles.css" />
-    <link rel="icon" type="image/png" href="favicon.png" />
+    <link rel="icon" type="image/png" href="favicon.ico" />
     <HeadOutlet @rendermode="InteractiveAuto" />
 </head>
 

diff --git a/src/AntDesign.Pro.WebApp/appsettings.json b/src/AntDesign.Pro.WebApp/appsettings.json
@@ -5,5 +5,21 @@
       "Microsoft.AspNetCore": "Warning"
     }
   },
-  "AllowedHosts": "*"
+  "AllowedHosts": "*",
+  "ProSettings": {
+    "NavTheme": "dark",
+    "Layout": "side",
+    "ContentWidth": "Fluid",
+    "FixedHeader": false,
+    "FixSiderbar": true,
+    "Title": "Ant Design Pro",
+    "PrimaryColor": "daybreak",
+    "ColorWeak": false,
+    "SplitMenus": false,
+    "HeaderRender": true,
+    "FooterRender": true,
+    "MenuRender": true,
+    "MenuHeaderRender": true,
+    "HeaderHeight": 48
+  }
 }
diff --git a/src/AntDesign.Pro.WebApp/wwwroot/app.css b/src/AntDesign.Pro.WebApp/wwwroot/app.css
diff --git a/src/AntDesign.Pro.WebApp/wwwroot/bootstrap/bootstrap.min.css b/src/AntDesign.Pro.WebApp/wwwroot/bootstrap/bootstrap.min.css
diff --git a/src/AntDesign.Pro.WebApp/wwwroot/bootstrap/bootstrap.min.css.map b/src/AntDesign.Pro.WebApp/wwwroot/bootstrap/bootstrap.min.css.map
diff --git a/src/AntDesign.Pro.WebApp/wwwroot/favicon.png b/src/AntDesign.Pro.WebApp/wwwroot/favicon.png
diff --git a/src/AntDesign.Pro/AntDesign.Pro.csproj b/src/AntDesign.Pro/AntDesign.Pro.csproj
@@ -12,6 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="AntDesign.Charts" Version="0.5.1" />
+    <PackageReference Include="AntDesign.Extensions.Localization" Version="0.19.0" />
     <PackageReference Include="AntDesign.ProLayout" Version="0.19.0" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0" PrivateAssets="all" />

diff --git a/src/AntDesign.Pro/App.razor b/src/AntDesign.Pro/App.razor
@@ -1 +1,3 @@
+@namespace AntDesign.Pro.Template
+
 <Routes />
diff --git a/src/AntDesign.Pro/Components/GlobalHeader/RightContent.razor.cs b/src/AntDesign.Pro/Components/GlobalHeader/RightContent.razor.cs
@@ -5,6 +5,10 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Localization;
+using AntDesign.Extensions.Localization;
+using System.Globalization;
+using System;
 using AntDesign;
 
 namespace AntDesign.Pro.Template.Components
@@ -36,20 +40,23 @@ public partial class RightContent
             }
         };
 
-        public AvatarMenuItem[] AvatarMenuItems { get; set; } = new AvatarMenuItem[]
-        {
-            new() { Key = "center", IconType = "user", Option = "个人中心"},
-            new() { Key = "setting", IconType = "setting", Option = "个人设置"},
-            new() { IsDivider = true },
-            new() { Key = "logout", IconType = "logout", Option = "退出登录"}
-        };
+        private AvatarMenuItem[] AvatarMenuItems =>
+            [
+                new() { Key = "center", IconType = "user", Option = L["menu.account.center"]},
+                new() { Key = "setting", IconType = "setting", Option = L["menu.account.settings"] },
+                new() { IsDivider = true },
+                new() { Key = "logout", IconType = "logout", Option = L["menu.account.logout"]}
+            ];
 
         [Inject] protected NavigationManager NavigationManager { get; set; }
 
         [Inject] protected IUserService UserService { get; set; }
         [Inject] protected IProjectService ProjectService { get; set; }
         [Inject] protected MessageService MessageService { get; set; }
 
+        [Inject] private IStringLocalizer<App> L { get; set; }
+        [Inject] private ILocalizationService LocalizationService { get; set; }
+
         protected override async Task OnInitializedAsync()
         {
             await base.OnInitializedAsync();
@@ -87,6 +94,7 @@ public void HandleSelectUser(MenuItem item)
 
         public void HandleSelectLang(MenuItem item)
         {
+            LocalizationService.SetLanguage(CultureInfo.GetCultureInfo(item.Key));
         }
 
         public async Task HandleClear(string key)