diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/LoginServlet.java b/S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/LoginServlet.java index f1e8d03..04ee32d 100644 --- a/S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/LoginServlet.java +++ b/S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/LoginServlet.java @@ -17,6 +17,7 @@ import java.io.PrintWriter; import uppa.project.bean.LoginBean; import uppa.project.json.HttpResponse; import uppa.project.json.HttpResponseCode; +import uppa.project.web.translation.Translator; @WebServlet(name = "loginServlet", value = "/login") public class LoginServlet extends HttpServlet { @@ -33,6 +34,10 @@ public class LoginServlet extends HttpServlet { * @throws ServletException si une erreur de servlet survient */ public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { + if (request.getSession().getAttribute("translator") == null) { + request.getSession().setAttribute("language", "FR"); + request.getSession().setAttribute("translator", Translator.generateTranslator(request.getSession(), request.getServletContext())); + } request.setAttribute("current", "login"); request.getRequestDispatcher("/WEB-INF/pages/login.jsp").forward(request, response); } diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/login.jsp b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/login.jsp index cd4442a..fe18d81 100644 --- a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/login.jsp +++ b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/login.jsp @@ -1,9 +1,11 @@ +<%@ 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"); %> - + @@ -12,10 +14,10 @@
-

Se connecter

+

${translator.translate("login_title")}


-

Vous n'avez pas de compte ? S'inscrire +

${translator.translate("login_not_registered")} ${translator.translate("login_register")}

diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/forms/login.tag b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/forms/login.tag index c8b576b..8278b1e 100644 --- a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/forms/login.tag +++ b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/forms/login.tag @@ -1,9 +1,11 @@ +<%@ tag import="uppa.project.web.translation.Translator" %> +<% Translator translator = (Translator) request.getSession().getAttribute("translator"); %> <%@tag description="form/login" pageEncoding="UTF-8" %>
- +
@@ -13,9 +15,9 @@
- +
- + " class="input is-fullwidth" type="password" required/> @@ -23,8 +25,8 @@

- Mot de passe oubliƩ ? + <%= translator.translate("login_forgotten_password") %>

- + ">