diff --git a/YACOSWeb/WebContent/WEB-INF/classes/messages.properties b/YACOSWeb/WebContent/WEB-INF/classes/messages.properties index 3a97226..cb740e8 100644 --- a/YACOSWeb/WebContent/WEB-INF/classes/messages.properties +++ b/YACOSWeb/WebContent/WEB-INF/classes/messages.properties @@ -9,6 +9,7 @@ disclaimer.link.about=About ################### # LOGIN FORM +login.title=Login and/or create a new user login.btn.connexion=Connexion login.btn.logout=Logout login.field.login=Login @@ -28,6 +29,7 @@ login.message.error=Your login attempt was not successful, try again. ################### # USER INFORMATION HEADER user.information.editaccount=Edit my account +user.information.followconference={0,choice, 0#You doesn t have any conference | 1#You currently follow {0} conference | 1 -<%@ taglib prefix="fmt" uri="http://java.sun.com/jstl/fmt" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> <%@ taglib prefix="authz" uri="http://acegisecurity.org/authz" %> diff --git a/YACOSWeb/WebContent/WEB-INF/decorators/usermenu.jsp b/YACOSWeb/WebContent/WEB-INF/decorators/usermenu.jsp index c4bd10e..418cf7e 100644 --- a/YACOSWeb/WebContent/WEB-INF/decorators/usermenu.jsp +++ b/YACOSWeb/WebContent/WEB-INF/decorators/usermenu.jsp @@ -12,7 +12,7 @@ - + - + - + - + - - + +