From 5597617c48c0b46cfda0b544263bb30c1b52aa24 Mon Sep 17 00:00:00 2001 From: lebeaulato Date: Fri, 7 Feb 2025 17:36:02 +0100 Subject: [PATCH] trad Logs --- .../WF-WebAdmin/Pages/Accueil.razor.cs | 2 +- .../WF-WebAdmin/Pages/AddQuiz.razor.cs | 2 +- .../WF-WebAdmin/Pages/DeleteUser.razor.cs | 8 +- WF-WebAdmin/WF-WebAdmin/Pages/Edit.razor.cs | 2 +- WF-WebAdmin/WF-WebAdmin/Pages/LogsPage.razor | 15 +- .../WF-WebAdmin/Pages/LogsPage.razor.cs | 4 + .../WF-WebAdmin/Pages/ModifQuiz.razor.cs | 4 +- .../WF-WebAdmin/Pages/ModifQuote.razor.cs | 2 +- .../WF-WebAdmin/Pages/ValidQuiz.razor.cs | 2 +- .../Resources/Pages.LogsPage.en-US.resx | 135 ++++++++++++++++++ .../Resources/Pages.LogsPage.fr-FR.resx | 135 ++++++++++++++++++ .../WF-WebAdmin/wwwroot/fake-dataQuote.json | 2 +- .../WF-WebAdmin/wwwroot/fake_data_logs.json | 50 +------ .../WF-WebAdmin/wwwroot/fake_data_users.json | 15 +- 14 files changed, 300 insertions(+), 78 deletions(-) create mode 100644 WF-WebAdmin/WF-WebAdmin/Resources/Pages.LogsPage.en-US.resx create mode 100644 WF-WebAdmin/WF-WebAdmin/Resources/Pages.LogsPage.fr-FR.resx diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/Accueil.razor.cs b/WF-WebAdmin/WF-WebAdmin/Pages/Accueil.razor.cs index 1f04d03..93c7fd9 100644 --- a/WF-WebAdmin/WF-WebAdmin/Pages/Accueil.razor.cs +++ b/WF-WebAdmin/WF-WebAdmin/Pages/Accueil.razor.cs @@ -35,7 +35,7 @@ namespace WF_WebAdmin.Pages private void RandomDailyquote() { //fonction a compléter - LoggerSaveStub.Log(Logger, LogLevel.Information, "Changement aléatoire de la quote du jour"); + LoggerSaveStub.Log(Logger, LogLevel.Information, "Random change of quote of the day"); } } } diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/AddQuiz.razor.cs b/WF-WebAdmin/WF-WebAdmin/Pages/AddQuiz.razor.cs index 172b9ff..8a66ce0 100644 --- a/WF-WebAdmin/WF-WebAdmin/Pages/AddQuiz.razor.cs +++ b/WF-WebAdmin/WF-WebAdmin/Pages/AddQuiz.razor.cs @@ -45,7 +45,7 @@ namespace WF_WebAdmin.Pages id++; // Create a new quiz and add it using the quiz service. - LoggerSaveStub.Log(Logger, LogLevel.Information, $"Création de la question {QuizModel.Question}"); + LoggerSaveStub.Log(Logger, LogLevel.Information, $"Creation of the {QuizModel.Question} question"); await quizService.addQuiz(new Quiz( id, // New quiz ID validateInformation(QuizModel.Question), // Validated question diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/DeleteUser.razor.cs b/WF-WebAdmin/WF-WebAdmin/Pages/DeleteUser.razor.cs index f132410..6d54c06 100644 --- a/WF-WebAdmin/WF-WebAdmin/Pages/DeleteUser.razor.cs +++ b/WF-WebAdmin/WF-WebAdmin/Pages/DeleteUser.razor.cs @@ -125,7 +125,7 @@ namespace WF_WebAdmin.Pages if (userToDelete != null) { // Remove the selected user from the system using the user service - LoggerSaveStub.Log(Logger, LogLevel.Information, $"Supretion de l utilisateur : {userToDelete.Name}"); + LoggerSaveStub.Log(Logger, LogLevel.Information, $"Delete user {userToDelete.Name}"); await userService.removeUser(userToDelete); // Close the confirmation popup after the deletion @@ -148,7 +148,7 @@ namespace WF_WebAdmin.Pages private async Task ModifyUser() { // Update the selected user's information using the user service - LoggerSaveStub.Log(Logger, LogLevel.Information, $"Modification de l utilisateur : {selectedUser.Name}"); + LoggerSaveStub.Log(Logger, LogLevel.Information, $"Modification of user {selectedUser.Name}"); await userService.updateUser(selectedUser); // Close the modification popup after the update is complete @@ -199,7 +199,7 @@ namespace WF_WebAdmin.Pages if (!userToAdmin.IsAdmin) { // Promote the user to admin - LoggerSaveStub.Log(Logger, LogLevel.Information, $"L utilisateur {userToAdmin.Name} a ete mis en administrateur"); + LoggerSaveStub.Log(Logger, LogLevel.Information, $"User {userToAdmin.Name} is now administrator"); userToAdmin.IsAdmin = true; await userService.updateUser(userToAdmin); // Update the user status in the service ClosePopup(); // Close the confirmation popup @@ -207,7 +207,7 @@ namespace WF_WebAdmin.Pages else { // Demote the user from admin to normal user - LoggerSaveStub.Log(Logger, LogLevel.Information, $"L utilisateur {userToAdmin.Name} n'est plus administrateur"); + LoggerSaveStub.Log(Logger, LogLevel.Information, $"User {userToAdmin.Name} is no longer an administator"); userToAdmin.IsAdmin = false; await userService.updateUser(userToAdmin); // Update the user status in the service ClosePopup(); // Close the confirmation popup diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/Edit.razor.cs b/WF-WebAdmin/WF-WebAdmin/Pages/Edit.razor.cs index 0d14666..3f0ab80 100644 --- a/WF-WebAdmin/WF-WebAdmin/Pages/Edit.razor.cs +++ b/WF-WebAdmin/WF-WebAdmin/Pages/Edit.razor.cs @@ -65,7 +65,7 @@ namespace WF_WebAdmin.Pages protected async void HandleValidSubmit() { // Update the properties of the selected quote (`q`) with the data from `quoteModel`. - LoggerSaveStub.Log(Logger, LogLevel.Information, $"Modification de la quote {q.Content}"); + LoggerSaveStub.Log(Logger, LogLevel.Information, $"Editing the quote {q.Content}"); q.Content = quoteModel.Content; q.Langue = quoteModel.Langue; q.TitleSrc = quoteModel.TitleSrc; diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/LogsPage.razor b/WF-WebAdmin/WF-WebAdmin/Pages/LogsPage.razor index 4799da4..2e64415 100644 --- a/WF-WebAdmin/WF-WebAdmin/Pages/LogsPage.razor +++ b/WF-WebAdmin/WF-WebAdmin/Pages/LogsPage.razor @@ -1,24 +1,21 @@ @page "/logs" -

Logs

+

@Localizer["LogTitle"]

@if (logs is null) { -

Aucun Logs

+

@Localizer["NotLog"]

} -@* else if (quotes.Count == 0) -{ -

Aucune citation en attente de validation.

-} *@ + else { -

Citations en attente de validation :

+

@Localizer["Log"]

- - + + diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/LogsPage.razor.cs b/WF-WebAdmin/WF-WebAdmin/Pages/LogsPage.razor.cs index 559df24..87f4eb3 100644 --- a/WF-WebAdmin/WF-WebAdmin/Pages/LogsPage.razor.cs +++ b/WF-WebAdmin/WF-WebAdmin/Pages/LogsPage.razor.cs @@ -1,4 +1,5 @@ using Microsoft.AspNetCore.Components; +using Microsoft.Extensions.Localization; using WF_WebAdmin.Model; namespace WF_WebAdmin.Pages @@ -13,6 +14,9 @@ namespace WF_WebAdmin.Pages [Inject] public NavigationManager NavigationManager { get; set; } + [Inject] + public IStringLocalizer Localizer { get; set; } + protected override async Task OnInitializedAsync() { logs = await Http.GetFromJsonAsync($"{NavigationManager.BaseUri}fake_data_logs.json"); diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/ModifQuiz.razor.cs b/WF-WebAdmin/WF-WebAdmin/Pages/ModifQuiz.razor.cs index 088a41c..170cc53 100644 --- a/WF-WebAdmin/WF-WebAdmin/Pages/ModifQuiz.razor.cs +++ b/WF-WebAdmin/WF-WebAdmin/Pages/ModifQuiz.razor.cs @@ -107,7 +107,7 @@ namespace WF_WebAdmin.Pages private async Task EditQuiz() { // Update the quiz in the service - LoggerSaveStub.Log(Logger, LogLevel.Information, $"Modification de la question {selectedQuiz.Question}"); + LoggerSaveStub.Log(Logger, LogLevel.Information, $"Editing the question {selectedQuiz.Question}"); await QuizService.updateQuiz(selectedQuiz); // Clear the selected quiz after successful update @@ -144,7 +144,7 @@ namespace WF_WebAdmin.Pages if (selectedQuiz != null) { // Remove the selected quiz from the service by its ID - LoggerSaveStub.Log(Logger, LogLevel.Information, $"Supretion de la question {selectedQuiz.Question}"); + LoggerSaveStub.Log(Logger, LogLevel.Information, $"Delete the question {selectedQuiz.Question}"); await QuizService.removeQuiz(selectedQuiz.Id); // Clear the selected quiz after successful removal diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/ModifQuote.razor.cs b/WF-WebAdmin/WF-WebAdmin/Pages/ModifQuote.razor.cs index 373be95..f7b188f 100644 --- a/WF-WebAdmin/WF-WebAdmin/Pages/ModifQuote.razor.cs +++ b/WF-WebAdmin/WF-WebAdmin/Pages/ModifQuote.razor.cs @@ -117,7 +117,7 @@ namespace WF_WebAdmin.Pages if (selectedQuote != null) { // Remove the selected quote using the QuoteService - LoggerSaveStub.Log(Logger, LogLevel.Information, $"La quote {selectedQuote.Content} a ete suprimer"); + LoggerSaveStub.Log(Logger, LogLevel.Information, $"The quote {selectedQuote.Content} has been deleted"); await QuoteService.removeQuote(selectedQuote); // Clear the selected quote after removal diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor.cs b/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor.cs index a809b69..4f4cd90 100644 --- a/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor.cs +++ b/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor.cs @@ -89,7 +89,7 @@ namespace WF_WebAdmin.Pages private void RejectQuiz(Quiz quiz) { // Log the rejection action to the console - LoggerSaveStub.Log(Logger, LogLevel.Information, $"Quiz {quiz.Id} rejected!"); + LoggerSaveStub.Log(Logger, LogLevel.Information, $"Quiz {quiz.Id} rejected"); Console.WriteLine($"Quiz {quiz.Id} rejected!"); diff --git a/WF-WebAdmin/WF-WebAdmin/Resources/Pages.LogsPage.en-US.resx b/WF-WebAdmin/WF-WebAdmin/Resources/Pages.LogsPage.en-US.resx new file mode 100644 index 0000000..1f30fbf --- /dev/null +++ b/WF-WebAdmin/WF-WebAdmin/Resources/Pages.LogsPage.en-US.resx @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + Current Logs + + + Content + + + Type of Logs : + + + Logs + + + No Log + + \ No newline at end of file diff --git a/WF-WebAdmin/WF-WebAdmin/Resources/Pages.LogsPage.fr-FR.resx b/WF-WebAdmin/WF-WebAdmin/Resources/Pages.LogsPage.fr-FR.resx new file mode 100644 index 0000000..a2576e6 --- /dev/null +++ b/WF-WebAdmin/WF-WebAdmin/Resources/Pages.LogsPage.fr-FR.resx @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + Logs actuels + + + Contenu + + + Type de Logs : + + + Logs + + + Aucun Log + + \ No newline at end of file diff --git a/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataQuote.json b/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataQuote.json index 4456a7c..5b71ede 100644 --- a/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataQuote.json +++ b/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataQuote.json @@ -25,7 +25,7 @@ }, { "Id": 3, - "Content": "C\u0027est le choix qui fait l\u0027homme, non le destin.", + "Content": "C\u0027est le choix qui fait l\u0027homme, non le destin", "Like": 90, "Langue": "fr", "Charac": "test", diff --git a/WF-WebAdmin/WF-WebAdmin/wwwroot/fake_data_logs.json b/WF-WebAdmin/WF-WebAdmin/wwwroot/fake_data_logs.json index a62b33e..01ae181 100644 --- a/WF-WebAdmin/WF-WebAdmin/wwwroot/fake_data_logs.json +++ b/WF-WebAdmin/WF-WebAdmin/wwwroot/fake_data_logs.json @@ -5,62 +5,22 @@ }, { "LogLevel": 2, - "Message": "Demande de supretion de l utilisateur : admin" + "Message": "User testeur1 is no longer an administator" }, { "LogLevel": 2, - "Message": "Demande de supretion de l utilisateur : testeur" + "Message": "User dev is now administrator" }, { "LogLevel": 2, - "Message": "Demande de supretion de l utilisateur : dev" + "Message": "Modification of user testeur" }, { "LogLevel": 2, - "Message": "Changement al\u00E9atoire de la quote du jour" + "Message": "Delete user jane_smith" }, { "LogLevel": 2, - "Message": "Quiz 11 validated!" - }, - { - "LogLevel": 2, - "Message": "Quiz 12 rejected!" - }, - { - "LogLevel": 2, - "Message": "Modification de l utilisateur : testeur1" - }, - { - "LogLevel": 2, - "Message": "L utilisateur testeur1 n\u0027est plus administrateur" - }, - { - "LogLevel": 2, - "Message": "L utilisateur testeur1 a ete mis en administrateur" - }, - { - "LogLevel": 2, - "Message": "Supretion de l utilisateur : dev" - }, - { - "LogLevel": 2, - "Message": "Modification de la quote Que la force soit avec toi." - }, - { - "LogLevel": 2, - "Message": "La quote Que la force soit avec toi a ete suprimer" - }, - { - "LogLevel": 2, - "Message": "Cr\u00E9ation de la question coucou" - }, - { - "LogLevel": 2, - "Message": "Modification de la question coucou." - }, - { - "LogLevel": 2, - "Message": "Supretion de la question coucou." + "Message": "Editing the quote C\u0027est le choix qui fait l\u0027homme, non le destin." } ] \ No newline at end of file diff --git a/WF-WebAdmin/WF-WebAdmin/wwwroot/fake_data_users.json b/WF-WebAdmin/WF-WebAdmin/wwwroot/fake_data_users.json index 0cc5319..73edfc2 100644 --- a/WF-WebAdmin/WF-WebAdmin/wwwroot/fake_data_users.json +++ b/WF-WebAdmin/WF-WebAdmin/wwwroot/fake_data_users.json @@ -2,10 +2,10 @@ { "Id": 3, "Image": "https://tse4.mm.bing.net/th/id/OIP.XNQPKwc1OUfvnSO9MsxDYgHaE7?w=202\u0026h=180\u0026c=7\u0026r=0\u0026o=5\u0026pid=1.7", - "Name": "testeur1", + "Name": "testeur", "Email": "testeur@gmail.com", "DateCreation": "2024-08-02T00:00:00", - "IsAdmin": true, + "IsAdmin": false, "Comments": [ { "Text": "Premier test effectu\u00E9, tout semble OK.", @@ -19,7 +19,7 @@ "Name": "dev", "Email": "dev@gmail.com", "DateCreation": "2024-10-10T00:00:00", - "IsAdmin": false, + "IsAdmin": true, "Comments": null }, { @@ -36,15 +36,6 @@ } ] }, - { - "Id": 6, - "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137\u0026h=195\u0026c=7\u0026r=0\u0026o=5\u0026pid=1.7", - "Name": "jane_smith", - "Email": "jane.smith@gmail.com", - "DateCreation": "2024-07-15T00:00:00", - "IsAdmin": false, - "Comments": null - }, { "Id": 7, "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137\u0026h=195\u0026c=7\u0026r=0\u0026o=5\u0026pid=1.7",
LogLevel :Message :@Localizer["LogLvl"]@Localizer["LogContent"]