1.1 --- a/src/main/webapp/WEB-INF/jsp/site.jsp Tue Jan 05 19:19:31 2021 +0100
1.2 +++ b/src/main/webapp/WEB-INF/jsp/site.jsp Wed Jan 06 15:39:56 2021 +0100
1.3 @@ -1,7 +1,7 @@
1.4 <%--
1.5 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1.6
1.7 -Copyright 2020 Mike Becker. All rights reserved.
1.8 +Copyright 2021 Mike Becker. All rights reserved.
1.9
1.10 Redistribution and use in source and binary forms, with or without
1.11 modification, are permitted provided that the following conditions are met:
1.12 @@ -48,23 +48,19 @@
1.13 <%-- Define an alias for the additional stylesheet --%>
1.14 <c:set scope="page" var="extraCss" value="${requestScope[Constants.REQ_ATTR_STYLESHEET]}"/>
1.15
1.16 -<%-- Define an alias for the bundle name --%>
1.17 -<c:set scope="page" var="bundleName" value="${requestScope[Constants.REQ_ATTR_RESOURCE_BUNDLE]}"/>
1.18 -
1.19 <%-- Apply the session locale (should always be present, but check nevertheless) --%>
1.20 <c:if test="${not empty sessionScope[Constants.SESSION_ATTR_LANGUAGE]}">
1.21 <fmt:setLocale scope="request" value="${sessionScope[Constants.SESSION_ATTR_LANGUAGE]}"/>
1.22 </c:if>
1.23
1.24 -<%-- Load resource bundles --%>
1.25 -<fmt:setBundle scope="request" basename="${bundleName}"/>
1.26 -<fmt:setBundle scope="request" var="lightpit_bundle" basename="localization.lightpit"/>
1.27 +<%-- Load resource bundle --%>
1.28 +<fmt:setBundle scope="request" basename="localization.strings"/>
1.29
1.30 <!DOCTYPE html>
1.31 <html>
1.32 <head>
1.33 <base href="${baseHref}">
1.34 - <title>LightPIT - <fmt:message key="pageTitle"/></title>
1.35 + <title><fmt:message key="app.title"/></title>
1.36 <meta charset="UTF-8">
1.37 <c:if test="${not empty redirectLocation}">
1.38 <meta http-equiv="refresh" content="0; URL=${redirectLocation}">
1.39 @@ -80,17 +76,17 @@
1.40 <div id="mainMenu">
1.41 <div class="menuEntry" <c:if test="${fn:startsWith(requestPath, '/projects/')}">data-active</c:if> >
1.42 <a href="projects/">
1.43 - <fmt:message bundle="${lightpit_bundle}" key="menu.projects"/>
1.44 + <fmt:message key="menu.projects"/>
1.45 </a>
1.46 </div>
1.47 <div class="menuEntry" <c:if test="${fn:startsWith(requestPath, '/teams/')}">data-active</c:if> >
1.48 <a href="teams/">
1.49 - <fmt:message bundle="${lightpit_bundle}" key="menu.users"/>
1.50 + <fmt:message key="menu.users"/>
1.51 </a>
1.52 </div>
1.53 <div class="menuEntry" <c:if test="${fn:startsWith(requestPath, '/language/')}">data-active</c:if> >
1.54 <a href="language/">
1.55 - <fmt:message bundle="${lightpit_bundle}" key="menu.languages"/>
1.56 + <fmt:message key="menu.languages"/>
1.57 </a>
1.58 </div>
1.59 </div>
