Author: bleny Date: 2014-06-05 15:39:25 +0200 (Thu, 05 Jun 2014) New Revision: 2002 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2002 Log: fix copyright year in layout Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java 2014-06-05 13:26:56 UTC (rev 2001) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java 2014-06-05 13:39:25 UTC (rev 2002) @@ -111,7 +111,11 @@ } public String getOneYearAgoDatePlaceHolder() { - return formatDate(DateUtils.addYears(new Date(), -1)); + return formatDate(DateUtils.addYears(getNow(), -1)); } + protected Date getNow() { + return new Date(); + } + } Modified: trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-06-05 13:26:56 UTC (rev 2001) +++ trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-06-05 13:39:25 UTC (rev 2002) @@ -235,7 +235,7 @@ </a> </li> <li> - Copyright 2009-${currentYear} + Copyright 2009-2014 <a href="http://www.ifremer.fr" title="Ifremer" target="_blank">Ifremer</a>, <a href="http://www.codelutin.com" title="Code Lutin" target="_blank">Code Lutin</a> </li>