Added support for IStringLocalizer

dyatlov-a · Oct 18, 2024 · 8dad95b · 8dad95b
1 parent fd20ae8
commit 8dad95b
Show file tree

Hide file tree

Showing 13 changed files with 193 additions and 9 deletions.
diff --git a/src/Inc.TeamAssistant.Gateway/Apps/MainApp.razor b/src/Inc.TeamAssistant.Gateway/Apps/MainApp.razor
@@ -71,7 +71,8 @@
 
         Blazor.start({
             webAssembly: {
-                environment: "@HostEnvironment.EnvironmentName"
+                environment: "@HostEnvironment.EnvironmentName",
+                applicationCulture: "@_lang"
             }
         });
     </script>
@@ -86,7 +87,10 @@
     protected override void OnInitialized()
     {
         var languageContext = RenderContext.GetLanguageContext();
+        var culture = new CultureInfo(languageContext.CurrentLanguage.Value);
 
-        _lang = languageContext.CurrentLanguage.Value;
+        CultureInfo.DefaultThreadCurrentCulture = culture;
+        CultureInfo.DefaultThreadCurrentUICulture = culture;
+        _lang = culture.Name;
     }
 }
diff --git a/src/Inc.TeamAssistant.Gateway/Apps/_Imports.razor b/src/Inc.TeamAssistant.Gateway/Apps/_Imports.razor
@@ -2,4 +2,5 @@
 @using Inc.TeamAssistant.Primitives.Languages
 @using Inc.TeamAssistant.WebUI.Contracts
 @using Microsoft.AspNetCore.Components.Web
+@using System.Globalization
 @using Inc.TeamAssistant.WebUI.Features
diff --git a/src/Inc.TeamAssistant.Gateway/wwwroot/langs/en.json b/src/Inc.TeamAssistant.Gateway/wwwroot/langs/en.json
@@ -90,7 +90,6 @@
   "GUI_VideoNotSupported": "Your browser does not support HTML5 video.",
   "GUI_DataRefreshed": "Successfully updated",
 
-  "Navigation_Login": "Login",
   "Navigation_Logout": "Logout",
 
   "CheckIn_GetStarted": "To get started, please add the bot to your chat room",

diff --git a/src/Inc.TeamAssistant.Gateway/wwwroot/langs/ru.json b/src/Inc.TeamAssistant.Gateway/wwwroot/langs/ru.json
@@ -89,8 +89,7 @@
   "GUI_CreateBotLink": "Создать бота",
   "GUI_VideoNotSupported": "Ваш браузер не поддерживает видео в формате HTML5.",
   "GUI_DataRefreshed": "Успешно обновлено",
-
-  "Navigation_Login": "Войти",
+
   "Navigation_Logout": "Выйти",
 
   "CheckIn_GetStarted": "Добавьте бота в чат для начала работы",

diff --git a/src/Inc.TeamAssistant.WebUI/Features/Layouts/LayoutResources.Designer.cs b/src/Inc.TeamAssistant.WebUI/Features/Layouts/LayoutResources.Designer.cs
diff --git a/src/Inc.TeamAssistant.WebUI/Features/Layouts/LayoutResources.resx b/src/Inc.TeamAssistant.WebUI/Features/Layouts/LayoutResources.resx
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<root>
+    <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+        <xsd:element name="root" msdata:IsDataSet="true">
+
+        </xsd:element>
+    </xsd:schema>
+    <resheader name="resmimetype">
+        <value>text/microsoft-resx</value>
+    </resheader>
+    <resheader name="version">
+        <value>1.3</value>
+    </resheader>
+    <resheader name="reader">
+        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <resheader name="writer">
+        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <data name="Login" xml:space="preserve">
+        <value>Login</value>
+    </data>
+</root>
diff --git a/src/Inc.TeamAssistant.WebUI/Features/Layouts/LayoutResources.ru.Designer.cs b/src/Inc.TeamAssistant.WebUI/Features/Layouts/LayoutResources.ru.Designer.cs
diff --git a/src/Inc.TeamAssistant.WebUI/Features/Layouts/LayoutResources.ru.resx b/src/Inc.TeamAssistant.WebUI/Features/Layouts/LayoutResources.ru.resx
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<root>
+    <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+        <xsd:element name="root" msdata:IsDataSet="true">
+
+        </xsd:element>
+    </xsd:schema>
+    <resheader name="resmimetype">
+        <value>text/microsoft-resx</value>
+    </resheader>
+    <resheader name="version">
+        <value>1.3</value>
+    </resheader>
+    <resheader name="reader">
+        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <resheader name="writer">
+        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <data name="Login" xml:space="preserve">
+        <value>Войти</value>
+    </data>
+</root>
diff --git a/src/Inc.TeamAssistant.WebUI/Features/Layouts/MainNavbar.razor b/src/Inc.TeamAssistant.WebUI/Features/Layouts/MainNavbar.razor
@@ -3,6 +3,7 @@
 @inject IRenderContext RenderContext
 @inject ResourcesManager Resources
 @inject NavRouter NavRouter
+@inject IStringLocalizer<LayoutResources> Localizer
 
 <div class="navbar">
     <div class="navbar-container">
@@ -59,7 +60,7 @@
                     <div class="navbar__item">
                         <RouterLink Href="@NavRouter.CreateRoute($"login?returnUrl={NavRouter.CurrentUrl}")">
                             <Content>
-                                @Resources[Messages.Navigation_Login]
+                                @Localizer["Login"].Value
                             </Content>
                         </RouterLink>
                     </div>

diff --git a/src/Inc.TeamAssistant.WebUI/Inc.TeamAssistant.WebUI.csproj b/src/Inc.TeamAssistant.WebUI/Inc.TeamAssistant.WebUI.csproj
@@ -12,6 +12,7 @@
         <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="8.0.8" />
         <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.8" />
         <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.8" />
+        <PackageReference Include="Microsoft.Extensions.Localization" Version="8.0.10" />
     </ItemGroup>
     <ItemGroup>
       <ProjectReference Include="..\Inc.TeamAssistant.Appraiser.Model\Inc.TeamAssistant.Appraiser.Model.csproj" />
@@ -39,4 +40,26 @@
       <AdditionalFiles Include="Icons\TrashIcon.razor" />
       <AdditionalFiles Include="Icons\UnknownIcon.razor" />
     </ItemGroup>
+    <ItemGroup>
+      <EmbeddedResource Update="Features\Layouts\LayoutResources.resx">
+        <Generator>ResXFileCodeGenerator</Generator>
+        <LastGenOutput>LayoutResources.Designer.cs</LastGenOutput>
+      </EmbeddedResource>
+      <EmbeddedResource Update="Features\Layouts\LayoutResources.ru.resx">
+        <Generator>ResXFileCodeGenerator</Generator>
+        <LastGenOutput>LayoutResources.ru.Designer.cs</LastGenOutput>
+      </EmbeddedResource>
+    </ItemGroup>
+    <ItemGroup>
+      <Compile Update="Features\Layouts\LayoutResources.Designer.cs">
+        <DesignTime>True</DesignTime>
+        <AutoGen>True</AutoGen>
+        <DependentUpon>LayoutResources.resx</DependentUpon>
+      </Compile>
+      <Compile Update="Features\Layouts\LayoutResources.ru.Designer.cs">
+        <DesignTime>True</DesignTime>
+        <AutoGen>True</AutoGen>
+        <DependentUpon>LayoutResources.ru.resx</DependentUpon>
+      </Compile>
+    </ItemGroup>
 </Project>
diff --git a/src/Inc.TeamAssistant.WebUI/Messages.cs b/src/Inc.TeamAssistant.WebUI/Messages.cs
@@ -34,8 +34,7 @@ internal static class Messages
     public static readonly MessageId GUI_CreateBotLink = new(nameof(GUI_CreateBotLink));
     public static readonly MessageId GUI_VideoNotSupported = new(nameof(GUI_VideoNotSupported));
     public static readonly MessageId GUI_DataRefreshed = new(nameof(GUI_DataRefreshed));
-
-    public static readonly MessageId Navigation_Login = new(nameof(Navigation_Login));
+
     public static readonly MessageId Navigation_Logout = new(nameof(Navigation_Logout));
 
     public static readonly MessageId Constructor_NewBot = new(nameof(Constructor_NewBot));

diff --git a/src/Inc.TeamAssistant.WebUI/Services/ServiceCollectionExtensions.cs b/src/Inc.TeamAssistant.WebUI/Services/ServiceCollectionExtensions.cs
@@ -47,6 +47,7 @@ public static IServiceCollection AddIsomorphicServices(this IServiceCollection s
         services
             .AddOptions()
             .AddAuthorizationCore()
+            .AddLocalization()
             .AddScoped<AuthenticationStateProvider, AuthStateProvider>()
             .AddScoped<ResourcesManager>()
             .AddScoped<FeaturesFactory>()

diff --git a/src/Inc.TeamAssistant.WebUI/_Imports.razor b/src/Inc.TeamAssistant.WebUI/_Imports.razor
@@ -9,4 +9,5 @@
 @using Blazored.FluentValidation
 @using Microsoft.AspNetCore.Components.QuickGrid
 @using ApexCharts
-@using System.Text
+@using System.Text
+@using Microsoft.Extensions.Localization