1.1 --- a/web/WEB-INF/jsp/html_full.jsp Tue Dec 26 19:18:32 2017 +0100 1.2 +++ b/web/WEB-INF/jsp/html_full.jsp Tue Dec 26 19:45:31 2017 +0100 1.3 @@ -42,6 +42,11 @@ 1.4 <%-- Define an alias for the module info --%> 1.5 <c:set scope="page" var="moduleInfo" value="${requestScope[Constants.REQ_ATTR_MODULE_INFO]}"/> 1.6 1.7 +<%-- Apply the session locale (should always be present, but check nevertheless) --%> 1.8 +<c:if test="${not empty sessionScope[Constants.SESSION_ATTR_LANGUAGE]}"> 1.9 +<fmt:setLocale scope="request" value="${sessionScope[Constants.SESSION_ATTR_LANGUAGE]}"/> 1.10 +</c:if> 1.11 + 1.12 <!DOCTYPE html> 1.13 <html> 1.14 <head> 1.15 @@ -78,7 +83,8 @@ 1.16 </div> 1.17 <div id="content-area"> 1.18 <c:if test="${not empty fragment}"> 1.19 - <c:import url="${fragment}" /> 1.20 + <fmt:setBundle scope="request" basename="${moduleInfo.bundleBaseName}"/> 1.21 + <c:import url="${fragment}" /> 1.22 </c:if> 1.23 </div> 1.24 </body>