From 0dd0b106b34edc6d3b4ea81dbab1da8eb6756ac4 Mon Sep 17 00:00:00 2001 From: kmitresse Date: Wed, 12 Jun 2024 13:36:33 +0200 Subject: [PATCH] feat: devweb - Make translations on game statistics page --- .../webapp/WEB-INF/pages/game-statistics.jsp | 6 +- .../tags/components/game-statistics.tag | 56 +++++++++---------- .../src/main/webapp/WEB-INF/translations.json | 30 +++++++++- 3 files changed, 61 insertions(+), 31 deletions(-) diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/game-statistics.jsp b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/game-statistics.jsp index cae4c9c..ef60e09 100644 --- a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/game-statistics.jsp +++ b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/game-statistics.jsp @@ -1,14 +1,16 @@ +<%@ page import="uppa.project.web.translation.Translator" %> <%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> <%@taglib prefix="layout" tagdir="/WEB-INF/tags/layouts" %> <%@taglib prefix="component" tagdir="/WEB-INF/tags/components" %> <%@taglib prefix="form" tagdir="/WEB-INF/tags/forms" %> +<% Translator translator = (Translator) request.getSession().getAttribute("translator"); %> - +
- +
diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/components/game-statistics.tag b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/components/game-statistics.tag index c8ef231..6a40f20 100644 --- a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/components/game-statistics.tag +++ b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/components/game-statistics.tag @@ -1,18 +1,18 @@ <%@ tag import="uppa.project.web.translation.Translator" %> -<% Translator translator = (Translator) request.getSession().getAttribute("translator"); %> <%@ tag import="uppa.project.database.pojo.Player" %> <%@ tag import="uppa.project.database.pojo.Game" %> <%@ tag import="java.util.ArrayList" %> <%@ tag import="java.text.SimpleDateFormat" %> <%@ tag import="java.util.Date" %> <%@tag description="component/statistics" pageEncoding="UTF-8" %> +<% Translator translator = (Translator) request.getSession().getAttribute("translator"); %> <% Game game = (Game) request.getAttribute("game"); ArrayList players = (ArrayList) request.getAttribute("players"); %> -

Information sur la partie

+

${translator.translate('game_information_title')}

@@ -24,56 +24,56 @@ String day = sdfDay.format(date); String hour = sdfHour.format(date); %> -

Date de jeu

+

${translator.translate('game_statistics_date')}

<%= day %>

<%= hour %>

-

Difficulté

+

${translator.translate('game_information_difficulty')}

<% if (game.getDifficulty().equals(Game.Difficulty.EASY)){%> -

Facile

+

${translator.translate('difficulty_easy')}

<% } else {%> -

Difficile

+

${translator.translate('difficulty_hard')}

<% } %>
-

Nombre de rounds

+

${translator.translate('game_information_rounds_number')}

<%= game.getNbRounds() %>

-

Nombre de couleurs

+

${translator.translate('game_information_deck_color_number')}

<%= game.getNbColors()%>

-

Nombre de valeurs

+

${translator.translate('game_information_deck_value_number')}

<%= game.getNbValuesPerColor()%>

-

Nombre de joueurs

+

${translator.translate('game_informations_player_number')}

<%= game.getNbPlayers()%>

-

Joueurs

+

${translator.translate('game_room_player')}

- - - - - + + + + + @@ -96,18 +96,18 @@
<% if (request.getParameter("endGame") != null){ %> - - - - - Retour - + + + + + Retour + <% } else {%> - - - - - Retour - + + + + + ${translator.translate('back')} + <%}%>
diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/translations.json b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/translations.json index 08d0efc..7591f95 100644 --- a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/translations.json +++ b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/translations.json @@ -541,7 +541,7 @@ }, "game_information_title" : { "EN": "Game information", - "FR": "Informations de la partie" + "FR": "Informations sur la partie" }, "game_information_created_at" : { "EN": "Created at", @@ -567,6 +567,10 @@ "EN": "Number of values per color", "FR": "Nombre de valeurs par couleur" }, + "game_informations_player_number" : { + "EN": "Number of players", + "FR": "Nombre de joueurs" + }, "timer_unit" : { "EN": "seconds", "FR": "secondes" @@ -594,5 +598,29 @@ "game_timer" : { "EN": "Remaining time:", "FR": "Temps restant :" + }, + "game_statistics_title": { + "EN": "Game statistics", + "FR": "Statistiques de la partie" + }, + "game_statistics_date": { + "EN": "Date of the game", + "FR": "Date de jeu" + }, + "game_statistics_score": { + "EN": "Score", + "FR": "Score" + }, + "game_statistics_correct_clicks": { + "EN": "Correct clicks", + "FR": "Clics corrects" + }, + "game_statistics_rapid_clicks": { + "EN": "Rapid clicks", + "FR": "Clics rapides" + }, + "game_statistics_win": { + "EN": "Win", + "FR": "Victoire" } }
Nom d'utilisateurScoreClics correctsClics rapidesVictoire${translator.translate('user_username')}${translator.translate('game_statistics_score')}${translator.translate('game_statistics_correct_clicks')}${translator.translate('game_statistics_rapid_clicks')}${translator.translate('game_statistics_win')}