From 0b836046d6c03eceef19ae0f427d57763bc78de3 Mon Sep 17 00:00:00 2001 From: lebeaulato Date: Thu, 30 Jan 2025 14:39:19 +0100 Subject: [PATCH] les langues marchent --- .../Controllers/CultureController.cs | 45 ++++--- .../WF-WebAdmin/Pages/DeleteUser.razor.cs | 1 + WF-WebAdmin/WF-WebAdmin/Pages/Login.razor | 2 +- WF-WebAdmin/WF-WebAdmin/Pages/Login.razor.cs | 3 + WF-WebAdmin/WF-WebAdmin/Program.cs | 12 +- .../Resources/Pages.DeleteUser.Designer.cs | 72 ---------- ...er.en.resx => Pages.DeleteUser.en-US.resx} | 3 +- ...er.fr.resx => Pages.DeleteUser.fr-FR.resx} | 3 +- ...DeleteUser.resx => Pages.Login.en-US.resx} | 5 +- .../Resources/Pages.Login.fr-FR.resx | 124 ++++++++++++++++++ WF-WebAdmin/WF-WebAdmin/WF-WebAdmin.csproj | 22 +--- 11 files changed, 169 insertions(+), 123 deletions(-) delete mode 100644 WF-WebAdmin/WF-WebAdmin/Resources/Pages.DeleteUser.Designer.cs rename WF-WebAdmin/WF-WebAdmin/Resources/{Pages.DeleteUser.en.resx => Pages.DeleteUser.en-US.resx} (96%) rename WF-WebAdmin/WF-WebAdmin/Resources/{Pages.DeleteUser.fr.resx => Pages.DeleteUser.fr-FR.resx} (96%) rename WF-WebAdmin/WF-WebAdmin/Resources/{Pages.DeleteUser.resx => Pages.Login.en-US.resx} (96%) create mode 100644 WF-WebAdmin/WF-WebAdmin/Resources/Pages.Login.fr-FR.resx diff --git a/WF-WebAdmin/WF-WebAdmin/Controllers/CultureController.cs b/WF-WebAdmin/WF-WebAdmin/Controllers/CultureController.cs index 8f8cfec..834b808 100644 --- a/WF-WebAdmin/WF-WebAdmin/Controllers/CultureController.cs +++ b/WF-WebAdmin/WF-WebAdmin/Controllers/CultureController.cs @@ -1,31 +1,34 @@ using Microsoft.AspNetCore.Localization; using Microsoft.AspNetCore.Mvc; -/// -/// The culture controller. -/// -[Route("[controller]/[action]")] -public class CultureController : Controller +namespace WF_WebAdmin.Controllers { /// - /// Sets the culture. + /// The culture controller. /// - /// The culture. - /// The redirect URI. - /// - /// The action result. - /// - public IActionResult SetCulture(string culture, string redirectUri) + [Route("[controller]/[action]")] + public class CultureController : Controller { - if (culture != null) + /// + /// Sets the culture. + /// + /// The culture. + /// The redirect URI. + /// + /// The action result. + /// + public IActionResult SetCulture(string culture, string redirectUri) { - // Define a cookie with the selected culture - this.HttpContext.Response.Cookies.Append( - CookieRequestCultureProvider.DefaultCookieName, - CookieRequestCultureProvider.MakeCookieValue( - new RequestCulture(culture))); - } + if (culture != null) + { + // Define a cookie with the selected culture + this.HttpContext.Response.Cookies.Append( + CookieRequestCultureProvider.DefaultCookieName, + CookieRequestCultureProvider.MakeCookieValue( + new RequestCulture(culture))); + } - return this.LocalRedirect(redirectUri); + return this.LocalRedirect(redirectUri); + } } -} \ No newline at end of file +} diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/DeleteUser.razor.cs b/WF-WebAdmin/WF-WebAdmin/Pages/DeleteUser.razor.cs index 112e305..0903099 100644 --- a/WF-WebAdmin/WF-WebAdmin/Pages/DeleteUser.razor.cs +++ b/WF-WebAdmin/WF-WebAdmin/Pages/DeleteUser.razor.cs @@ -3,6 +3,7 @@ using Microsoft.Extensions.Configuration.UserSecrets; using Microsoft.Extensions.Localization; using System.Collections.Generic; using WF_WebAdmin.Model; +using WF_WebAdmin.Service; namespace WF_WebAdmin.Pages { diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/Login.razor b/WF-WebAdmin/WF-WebAdmin/Pages/Login.razor index d035565..f82fe75 100644 --- a/WF-WebAdmin/WF-WebAdmin/Pages/Login.razor +++ b/WF-WebAdmin/WF-WebAdmin/Pages/Login.razor @@ -2,7 +2,7 @@ @using WF_WebAdmin.Model @using System.Globalization -

▶ Connexion ◀

+

▶@Localizer["LoginTitle"]◀

diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/Login.razor.cs b/WF-WebAdmin/WF-WebAdmin/Pages/Login.razor.cs index 06177e7..2317ada 100644 --- a/WF-WebAdmin/WF-WebAdmin/Pages/Login.razor.cs +++ b/WF-WebAdmin/WF-WebAdmin/Pages/Login.razor.cs @@ -1,5 +1,6 @@ using Microsoft.AspNetCore.Components; using Microsoft.Extensions.Configuration.UserSecrets; +using Microsoft.Extensions.Localization; using WF_WebAdmin.Model; @@ -8,6 +9,8 @@ namespace WF_WebAdmin.Pages { public partial class Login { + [Inject] + public IStringLocalizer Localizer { get; set; } private UserLogin userLogin = new UserLogin(); diff --git a/WF-WebAdmin/WF-WebAdmin/Program.cs b/WF-WebAdmin/WF-WebAdmin/Program.cs index 2e00bd1..7316058 100644 --- a/WF-WebAdmin/WF-WebAdmin/Program.cs +++ b/WF-WebAdmin/WF-WebAdmin/Program.cs @@ -10,6 +10,10 @@ using WF_WebAdmin.Model; using Microsoft.Extensions.Localization; using Microsoft.Extensions.Options; using Blazored.Modal; +using WF_WebAdmin.Service; + +[assembly: RootNamespace("WF_WebAdmin")] + var builder = WebApplication.CreateBuilder(args); // Add services to the container. @@ -37,12 +41,12 @@ builder.Services.AddLocalization(opts => { opts.ResourcesPath = "Resources"; }); // Configure the localtization builder.Services.Configure(options => { - // Set the default culture of the web site + + var supportedCultures = new[] { "en-US", "fr-FR" }; options.DefaultRequestCulture = new RequestCulture(new CultureInfo("en-US")); + options.SupportedCultures = supportedCultures.Select(c=>new CultureInfo(c)).ToList(); + options.SupportedUICultures = supportedCultures.Select(c => new CultureInfo(c)).ToList(); - // Declare the supported culture - options.SupportedCultures = new List { new CultureInfo("en-US"), new CultureInfo("fr-FR") }; - options.SupportedUICultures = new List { new CultureInfo("en-US"), new CultureInfo("fr-FR") }; }); var app = builder.Build(); diff --git a/WF-WebAdmin/WF-WebAdmin/Resources/Pages.DeleteUser.Designer.cs b/WF-WebAdmin/WF-WebAdmin/Resources/Pages.DeleteUser.Designer.cs deleted file mode 100644 index a00ee47..0000000 --- a/WF-WebAdmin/WF-WebAdmin/Resources/Pages.DeleteUser.Designer.cs +++ /dev/null @@ -1,72 +0,0 @@ -//------------------------------------------------------------------------------ -// -// Ce code a été généré par un outil. -// Version du runtime :4.0.30319.42000 -// -// Les modifications apportées à ce fichier peuvent provoquer un comportement incorrect et seront perdues si -// le code est régénéré. -// -//------------------------------------------------------------------------------ - -namespace WF_WebAdmin.Resources { - using System; - - - /// - /// Une classe de ressource fortement typée destinée, entre autres, à la consultation des chaînes localisées. - /// - // Cette classe a été générée automatiquement par la classe StronglyTypedResourceBuilder - // à l'aide d'un outil, tel que ResGen ou Visual Studio. - // Pour ajouter ou supprimer un membre, modifiez votre fichier .ResX, puis réexécutez ResGen - // avec l'option /str ou régénérez votre projet VS. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - public class Pages_DeleteUser { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Pages_DeleteUser() { - } - - /// - /// Retourne l'instance ResourceManager mise en cache utilisée par cette classe. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - public static global::System.Resources.ResourceManager ResourceManager { - get { - if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("WF_WebAdmin.Resources.Pages.DeleteUser", typeof(Pages_DeleteUser).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// Remplace la propriété CurrentUICulture du thread actuel pour toutes - /// les recherches de ressources à l'aide de cette classe de ressource fortement typée. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - public static global::System.Globalization.CultureInfo Culture { - get { - return resourceCulture; - } - set { - resourceCulture = value; - } - } - - /// - /// Recherche une chaîne localisée semblable à Titre par défaut. - /// - public static string Title { - get { - return ResourceManager.GetString("Title", resourceCulture); - } - } - } -} diff --git a/WF-WebAdmin/WF-WebAdmin/Resources/Pages.DeleteUser.en.resx b/WF-WebAdmin/WF-WebAdmin/Resources/Pages.DeleteUser.en-US.resx similarity index 96% rename from WF-WebAdmin/WF-WebAdmin/Resources/Pages.DeleteUser.en.resx rename to WF-WebAdmin/WF-WebAdmin/Resources/Pages.DeleteUser.en-US.resx index edd17b0..095c714 100644 --- a/WF-WebAdmin/WF-WebAdmin/Resources/Pages.DeleteUser.en.resx +++ b/WF-WebAdmin/WF-WebAdmin/Resources/Pages.DeleteUser.en-US.resx @@ -118,6 +118,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - User management + User Management + gestionaire user \ No newline at end of file diff --git a/WF-WebAdmin/WF-WebAdmin/Resources/Pages.DeleteUser.fr.resx b/WF-WebAdmin/WF-WebAdmin/Resources/Pages.DeleteUser.fr-FR.resx similarity index 96% rename from WF-WebAdmin/WF-WebAdmin/Resources/Pages.DeleteUser.fr.resx rename to WF-WebAdmin/WF-WebAdmin/Resources/Pages.DeleteUser.fr-FR.resx index 8b7d899..de52c05 100644 --- a/WF-WebAdmin/WF-WebAdmin/Resources/Pages.DeleteUser.fr.resx +++ b/WF-WebAdmin/WF-WebAdmin/Resources/Pages.DeleteUser.fr-FR.resx @@ -118,6 +118,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - Gestion des utilisateurs + Gestionnaire des utilisateurs + gestion user \ No newline at end of file diff --git a/WF-WebAdmin/WF-WebAdmin/Resources/Pages.DeleteUser.resx b/WF-WebAdmin/WF-WebAdmin/Resources/Pages.Login.en-US.resx similarity index 96% rename from WF-WebAdmin/WF-WebAdmin/Resources/Pages.DeleteUser.resx rename to WF-WebAdmin/WF-WebAdmin/Resources/Pages.Login.en-US.resx index 2e9bfff..b485dca 100644 --- a/WF-WebAdmin/WF-WebAdmin/Resources/Pages.DeleteUser.resx +++ b/WF-WebAdmin/WF-WebAdmin/Resources/Pages.Login.en-US.resx @@ -117,7 +117,8 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Titre par défaut + + Login + connexion \ No newline at end of file diff --git a/WF-WebAdmin/WF-WebAdmin/Resources/Pages.Login.fr-FR.resx b/WF-WebAdmin/WF-WebAdmin/Resources/Pages.Login.fr-FR.resx new file mode 100644 index 0000000..9e7752e --- /dev/null +++ b/WF-WebAdmin/WF-WebAdmin/Resources/Pages.Login.fr-FR.resx @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Connexion + connexion + + \ No newline at end of file diff --git a/WF-WebAdmin/WF-WebAdmin/WF-WebAdmin.csproj b/WF-WebAdmin/WF-WebAdmin/WF-WebAdmin.csproj index 82f2810..f29f827 100644 --- a/WF-WebAdmin/WF-WebAdmin/WF-WebAdmin.csproj +++ b/WF-WebAdmin/WF-WebAdmin/WF-WebAdmin.csproj @@ -14,29 +14,9 @@ + - - - True - True - Pages.DeleteUser.resx - - - - - - PublicResXFileCodeGenerator - - - PublicResXFileCodeGenerator - - - PublicResXFileCodeGenerator - Pages.DeleteUser.Designer.cs - - -