1.1 --- a/src/main/webapp/WEB-INF/jsp/site.jsp Sat May 23 13:34:41 2020 +0200
1.2 +++ b/src/main/webapp/WEB-INF/jsp/site.jsp Sat May 23 13:52:04 2020 +0200
1.3 @@ -52,8 +52,8 @@
1.4 <%-- Define an alias for the additional stylesheet --%>
1.5 <c:set scope="page" var="extraCss" value="${requestScope[Constants.REQ_ATTR_STYLESHEET]}"/>
1.6
1.7 -<%-- Define an alias for the module info --%>
1.8 -<c:set scope="page" var="moduleInfo" value="${requestScope[Constants.REQ_ATTR_MODULE_INFO]}"/>
1.9 +<%-- Define an alias for the bundle name --%>
1.10 +<c:set scope="page" var="bundleName" value="${requestScope[Constants.REQ_ATTR_RESOURCE_BUNDLE]}"/>
1.11
1.12 <%-- Apply the session locale (should always be present, but check nevertheless) --%>
1.13 <c:if test="${not empty sessionScope[Constants.SESSION_ATTR_LANGUAGE]}">
1.14 @@ -63,15 +63,15 @@
1.15 <%-- Selected project, if any --%>
1.16 <c:set scope="page" var="selectedProject" value="${sessionScope[ProjectsModule.SESSION_ATTR_SELECTED_PROJECT]}"/>
1.17
1.18 +<%-- Load resource bundles --%>
1.19 +<fmt:setBundle scope="request" basename="${bundleName}"/>
1.20 +<fmt:setBundle scope="request" var="lightpit_bundle" basename="localization.lightpit"/>
1.21 +
1.22 <!DOCTYPE html>
1.23 <html>
1.24 <head>
1.25 <base href="${baseHref}">
1.26 - <title>LightPIT -
1.27 - <fmt:bundle basename="${moduleInfo.bundleBaseName}">
1.28 - <fmt:message key="pageTitle"/>
1.29 - </fmt:bundle>
1.30 - </title>
1.31 + <title>LightPIT - <fmt:message key="pageTitle"/></title>
1.32 <meta charset="UTF-8">
1.33 <c:if test="${not empty redirectLocation}">
1.34 <meta http-equiv="refresh" content="0; URL=${redirectLocation}">
1.35 @@ -96,8 +96,6 @@
1.36 </c:if>
1.37 <div id="content-area">
1.38 <c:if test="${not empty contentPage}">
1.39 - <fmt:setBundle scope="request" basename="${moduleInfo.bundleBaseName}"/>
1.40 - <fmt:setBundle scope="request" var="lightpit_bundle" basename="localization.lightpit"/>
1.41 <c:import url="${contentPage}"/>
1.42 </c:if>
1.43 </div>
