1.1 --- a/src/main/webapp/WEB-INF/jsp/language.jsp Sat May 30 18:12:38 2020 +0200
1.2 +++ b/src/main/webapp/WEB-INF/jsp/language.jsp Mon Jun 01 14:46:58 2020 +0200
1.3 @@ -25,23 +25,19 @@
1.4 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1.5 --%>
1.6 <%@page pageEncoding="UTF-8" %>
1.7 -<%@page import="de.uapcore.lightpit.Constants" %>
1.8 <%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
1.9 <%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
1.10
1.11 -<jsp:useBean id="languages" type="java.util.List<java.util.Locale>" scope="request"/>
1.12 -<jsp:useBean id="browserLanguage" type="java.util.Locale" scope="request"/>
1.13 -
1.14 -<c:set scope="page" var="currentLanguage" value="${sessionScope[Constants.SESSION_ATTR_LANGUAGE]}"/>
1.15 +<jsp:useBean id="viewmodel" type="de.uapcore.lightpit.viewmodel.LanguageView" scope="request"/>
1.16
1.17 <form method="POST" id="lang-selector">
1.18 - <c:forEach items="${languages}" var="l">
1.19 + <c:forEach items="${viewmodel.languages}" var="l">
1.20 <label>
1.21 <input type="radio" name="language" value="${l.language}"
1.22 - <c:if test="${l.language eq currentLanguage.language}">checked</c:if>/>
1.23 + <c:if test="${l.language eq viewmodel.currentLanguage.language}">checked</c:if>/>
1.24 ${l.displayLanguage}
1.25 - (${l.getDisplayLanguage(currentLanguage)}
1.26 - <c:if test="${not empty browserLanguage and l.language eq browserLanguage.language}"><c:set
1.27 + (${l.getDisplayLanguage(viewmodel.currentLanguage)}
1.28 + <c:if test="${not empty viewmodel.browserLanguage and l.language eq viewmodel.browserLanguage.language}"><c:set
1.29 var="browserLanguagePresent" value="true"/> - <fmt:message key="browserLanguage"/></c:if>)
1.30 </label>
1.31 </c:forEach>
