lucasvbr/Cards-Rush
1
0
Fork 0
mirror of https://github.com/kmitresse/Cards-Rush.git synced 2026-05-13 17:11:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: devweb - Formatting dates according to the language.

Browse Source
This commit is contained in:
kmitresse
2024-06-12 13:51:08 +02:00
parent 0dd0b106b3
commit 1255af0755
3 changed files with 43 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/components/game-statistics.tag
+10 -3
View File
@@ -17,9 +17,16 @@
<div class="level-item has-text-centered has-text-on-top"> <div class="level-item has-text-centered has-text-on-top">
<div> <div>
<% Date date = game.getCreatedAt(); <% Date date = game.getCreatedAt();
String language = translator.getLanguage();
SimpleDateFormat sdfDay = new SimpleDateFormat("dd/MM/yyyy"); SimpleDateFormat sdfDay;
SimpleDateFormat sdfHour = new SimpleDateFormat("HH:mm"); 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 day = sdfDay.format(date);
String hour = sdfHour.format(date); String hour = sdfHour.format(date);
S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/components/statistics.tag
+18 -1
View File
@@ -1,5 +1,7 @@
<%@ tag import="uppa.project.database.pojo.Player" %> <%@ tag import="uppa.project.database.pojo.Player" %>
<%@ tag import="uppa.project.web.translation.Translator" %> <%@ tag import="uppa.project.web.translation.Translator" %>
<%@ tag import="java.util.Date" %>
<%@ tag import="java.text.SimpleDateFormat" %>
<%@tag description="component/statistics" pageEncoding="UTF-8" %> <%@tag description="component/statistics" pageEncoding="UTF-8" %>
<% Translator translator = (Translator) request.getSession().getAttribute("translator"); %> <% Translator translator = (Translator) request.getSession().getAttribute("translator"); %>
@@ -47,7 +49,22 @@
Player player = user.getPlayedGames().get(i); Player player = user.getPlayedGames().get(i);
%> %>
<tr> <tr>
<td><%= player.getGame().getCreatedAt().toLocaleString() %></td> <% 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);
%>
<td><%=day%>, <%=hour%> </td>
<td><%= player.getScore() %></td> <td><%= player.getScore() %></td>
<td><%= player.getGame().getWinner().getUser().getUsername() %></td> <td><%= player.getGame().getWinner().getUser().getUsername() %></td>
<td><a href="${pageContext.request.contextPath}/game-statistics?id=<%= player.getGame().getId() %>">${translator.translate("statistics_game_show")}</a></td> <td><a href="${pageContext.request.contextPath}/game-statistics?id=<%= player.getGame().getId() %>">${translator.translate("statistics_game_show")}</a></td>
S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/forms/profile.tag
+15 -1
View File
@@ -1,6 +1,8 @@
<%@ tag import="uppa.project.database.pojo.User" %> <%@ tag import="uppa.project.database.pojo.User" %>
<%@tag description="form/profile" pageEncoding="UTF-8" %> <%@tag description="form/profile" pageEncoding="UTF-8" %>
<%@ tag import="uppa.project.web.translation.Translator" %> <%@ tag import="uppa.project.web.translation.Translator" %>
<%@ tag import="java.util.Date" %>
<%@ tag import="java.text.SimpleDateFormat" %>
<% Translator translator = (Translator) request.getSession().getAttribute("translator"); %> <% Translator translator = (Translator) request.getSession().getAttribute("translator"); %>
<form id="profile-form" action="${pageContext.request.contextPath}/profile" method="post"> <form id="profile-form" action="${pageContext.request.contextPath}/profile" method="post">
@@ -44,7 +46,19 @@
</div> </div>
<div class="field"> <div class="field">
<label class="label">${translator.translate('user_birthdate')}</label> <label class="label">${translator.translate('user_birthdate')}</label>
<input class="input" type="text" value="${user.birth.toLocaleString()}" disabled> <% 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);
%>
<input class="input" type="text" value="<%=day%>" disabled>
</div> </div>
<div class="field"> <div class="field">
<label class="label" for="gender">${translator.translate('user_gender')}</label> <label class="label" for="gender">${translator.translate('user_gender')}</label>