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 6a40f20..c74005e 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 @@ -17,9 +17,16 @@
<% Date date = game.getCreatedAt(); - - SimpleDateFormat sdfDay = new SimpleDateFormat("dd/MM/yyyy"); - SimpleDateFormat sdfHour = new SimpleDateFormat("HH:mm"); + String language = translator.getLanguage(); + SimpleDateFormat sdfDay; + SimpleDateFormat sdfHour; + if (language.equals("EN")) { + sdfDay = new SimpleDateFormat("MM/dd/yyyy"); + sdfHour = new SimpleDateFormat("HH:mm"); + } else { + sdfDay = new SimpleDateFormat("dd/MM/yyyy"); + sdfHour = new SimpleDateFormat("HH:mm"); + } String day = sdfDay.format(date); String hour = sdfHour.format(date); diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/components/statistics.tag b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/components/statistics.tag index b0abb6b..437408d 100644 --- a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/components/statistics.tag +++ b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/components/statistics.tag @@ -1,5 +1,7 @@ <%@ tag import="uppa.project.database.pojo.Player" %> <%@ tag import="uppa.project.web.translation.Translator" %> +<%@ tag import="java.util.Date" %> +<%@ tag import="java.text.SimpleDateFormat" %> <%@tag description="component/statistics" pageEncoding="UTF-8" %> <% Translator translator = (Translator) request.getSession().getAttribute("translator"); %> @@ -47,7 +49,22 @@ Player player = user.getPlayedGames().get(i); %> - <%= player.getGame().getCreatedAt().toLocaleString() %> + <% Date date = player.getGame().getCreatedAt(); + String language = translator.getLanguage(); + SimpleDateFormat sdfDay; + SimpleDateFormat sdfHour; + if (language.equals("EN")) { + sdfDay = new SimpleDateFormat("MM/dd/yyyy"); + sdfHour = new SimpleDateFormat("HH:mm"); + } else { + sdfDay = new SimpleDateFormat("dd/MM/yyyy"); + sdfHour = new SimpleDateFormat("HH:mm"); + } + + String day = sdfDay.format(date); + String hour = sdfHour.format(date); + %> + <%=day%>, <%=hour%> <%= player.getScore() %> <%= player.getGame().getWinner().getUser().getUsername() %> ${translator.translate("statistics_game_show")} diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/forms/profile.tag b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/forms/profile.tag index 8c6a299..af8986e 100644 --- a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/forms/profile.tag +++ b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/forms/profile.tag @@ -1,6 +1,8 @@ <%@ tag import="uppa.project.database.pojo.User" %> <%@tag description="form/profile" pageEncoding="UTF-8" %> <%@ tag import="uppa.project.web.translation.Translator" %> +<%@ tag import="java.util.Date" %> +<%@ tag import="java.text.SimpleDateFormat" %> <% Translator translator = (Translator) request.getSession().getAttribute("translator"); %>
@@ -44,7 +46,19 @@
- + <% Date date = user.getBirth(); + String language = translator.getLanguage(); + SimpleDateFormat sdfDay; + SimpleDateFormat sdfHour; + if (language.equals("EN")) { + sdfDay = new SimpleDateFormat("MM/dd/yyyy"); + } else { + sdfDay = new SimpleDateFormat("dd/MM/yyyy"); + } + + String day = sdfDay.format(date); + %> +