1.1 --- a/src/main/java/de/uapcore/lightpit/modules/LanguageModule.java Sat May 30 18:12:38 2020 +0200 1.2 +++ b/src/main/java/de/uapcore/lightpit/modules/LanguageModule.java Mon Jun 01 14:46:58 2020 +0200 1.3 @@ -29,6 +29,7 @@ 1.4 package de.uapcore.lightpit.modules; 1.5 1.6 import de.uapcore.lightpit.*; 1.7 +import de.uapcore.lightpit.viewmodel.LanguageView; 1.8 import org.slf4j.Logger; 1.9 import org.slf4j.LoggerFactory; 1.10 1.11 @@ -86,9 +87,12 @@ 1.12 @RequestMapping(method = HttpMethod.GET) 1.13 public ResponseType handle(HttpServletRequest req) { 1.14 1.15 - req.setAttribute("languages", languages); 1.16 - req.setAttribute("browserLanguage", req.getLocale()); 1.17 + final var viewModel = new LanguageView(); 1.18 + viewModel.setLanguages(languages); 1.19 + viewModel.setBrowserLanguage(req.getLocale()); 1.20 + viewModel.setCurrentLanguage((Locale)req.getSession().getAttribute(Constants.SESSION_ATTR_LANGUAGE)); 1.21 1.22 + setViewModel(req, viewModel); 1.23 setStylesheet(req, "language"); 1.24 setContentPage(req, "language"); 1.25 return ResponseType.HTML;