update

fanslead · Feb 20, 2023 · 9f63aa4 · 9f63aa4
1 parent c5943f4
commit 9f63aa4
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 10 deletions.
diff --git a/apps/angular/src/app/home/home.component.html b/apps/angular/src/app/home/home.component.html
@@ -11,7 +11,7 @@ <h1>{{ '::Welcome' | abpLocalization }}</h1>
     <p class="lead px-lg-5 mx-lg-5">{{ '::LongWelcomeMessage' | abpLocalization }}</p>
 
     <a *ngIf="!hasLoggedIn" (click)="login()" class="px-4 btn btn-primary ms-1" role="button"
-    ><i class="fa fa-sign-in"></i> {{ 'AbpAccount::Login' | abpLocalization }}</a
+    ><i class="fa fa-sign-in"></i> {{ '::Login' | abpLocalization }}</a
     >
   </div>
   <div class="card">

diff --git a/...nShow.AdministrationService.Domain.Shared/Localization/AdministrationService/zh-Hans.json b/...nShow.AdministrationService.Domain.Shared/Localization/AdministrationService/zh-Hans.json
@@ -1,7 +1,8 @@
 {
   "culture": "zh-Hans",
   "texts": {
-    "MyAccount": "我的账户",
-    "SamplePageMessage": "AdministrationService模块的示例页面"
+    "Menu:Home": "首页",
+    "Welcome": "欢迎",
+    "LongWelcomeMessage": "欢迎来到该应用程序. 这是一个基于ABP框架的启动项目. 有关更多信息, 请访问 abp.io."
   }
 }
diff --git a/...tity/src/FunShow.IdentityService.HttpApi.Host/FunShow.IdentityService.HttpApi.Host.csproj b/...tity/src/FunShow.IdentityService.HttpApi.Host/FunShow.IdentityService.HttpApi.Host.csproj
@@ -18,7 +18,6 @@
 		<ProjectReference Include="..\..\src\FunShow.IdentityService.HttpApi\FunShow.IdentityService.HttpApi.csproj" />
 		<ProjectReference Include="..\..\src\FunShow.IdentityService.Application\FunShow.IdentityService.Application.csproj" />
 		<ProjectReference Include="..\..\src\FunShow.IdentityService.EntityFrameworkCore\FunShow.IdentityService.EntityFrameworkCore.csproj" />
-		<ProjectReference Include="..\..\..\..\shared\FunShow.Shared.Localization\FunShow.Shared.Localization.csproj" />
 		<ProjectReference Include="..\..\..\..\shared\FunShow.Shared.Hosting.Microservices\FunShow.Shared.Hosting.Microservices.csproj" />
 	</ItemGroup>
 

diff --git a/...ces/identity/src/FunShow.IdentityService.HttpApi.Host/IdentityServiceHttpApiHostModule.cs b/...ces/identity/src/FunShow.IdentityService.HttpApi.Host/IdentityServiceHttpApiHostModule.cs
@@ -15,12 +15,10 @@
 using Volo.Abp.Account;
 using Volo.Abp.Modularity;
 using Prometheus;
-using FunShow.Shared.Localization;
 
 namespace FunShow.IdentityService;
 
 [DependsOn(
-    typeof(FunShowSharedLocalizationModule),
     typeof(FunShowSharedHostingMicroservicesModule),
     typeof(IdentityServiceApplicationModule),
     typeof(IdentityServiceEntityFrameworkCoreModule),

diff --git a/...ogging/src/FunShow.LoggingService.HttpApi.Host/FunShow.LoggingService.HttpApi.Host.csproj b/...ogging/src/FunShow.LoggingService.HttpApi.Host/FunShow.LoggingService.HttpApi.Host.csproj
@@ -15,7 +15,6 @@
     </ItemGroup>
 
     <ItemGroup>        
-		<ProjectReference Include="..\..\..\..\shared\FunShow.Shared.Localization\FunShow.Shared.Localization.csproj" />
         <ProjectReference Include="..\..\..\..\shared\FunShow.Shared.Hosting.Microservices\FunShow.Shared.Hosting.Microservices.csproj" />
         <ProjectReference Include="..\FunShow.LoggingService.Application\FunShow.LoggingService.Application.csproj" />
         <ProjectReference Include="..\FunShow.LoggingService.EntityFrameworkCore\FunShow.LoggingService.EntityFrameworkCore.csproj" />

diff --git a/services/logging/src/FunShow.LoggingService.HttpApi.Host/LoggingServiceHttpApiHostModule.cs b/services/logging/src/FunShow.LoggingService.HttpApi.Host/LoggingServiceHttpApiHostModule.cs
@@ -14,12 +14,10 @@
 using Prometheus;
 using Volo.Abp;
 using Volo.Abp.Modularity;
-using FunShow.Shared.Localization;
 
 namespace FunShow.LoggingService;
 
 [DependsOn(
-    typeof(FunShowSharedLocalizationModule),
     typeof(FunShowSharedHostingMicroservicesModule),
     typeof(LoggingServiceApplicationModule),
     typeof(LoggingServiceHttpApiModule),

diff --git a/shared/FunShow.Shared.Localization/FunShow.Shared.Localization.csproj b/shared/FunShow.Shared.Localization/FunShow.Shared.Localization.csproj
@@ -1,10 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
+		<LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
     <RootNamespace>FunShow</RootNamespace>
+    <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
   </PropertyGroup>
 
     <ItemGroup>

diff --git a/shared/FunShow.Shared.Localization/Localization/FunShow/zh-Hans.json b/shared/FunShow.Shared.Localization/Localization/FunShow/zh-Hans.json
@@ -3,6 +3,7 @@
     "texts": {
       "Menu:Home": "首页",
       "Welcome": "欢迎",
+      "Login": "登录",
       "LongWelcomeMessage": "欢迎来到该应用程序. 这是一个基于ABP框架的启动项目. 有关更多信息, 请访问 abp.io."
     }
   }