Mercurial > hg > LightPIT / file diff

     1.1 --- a/src/main/java/de/uapcore/lightpit/modules/LanguageModule.java	Sat Oct 31 10:54:20 2020 +0100
     1.2 +++ b/src/main/java/de/uapcore/lightpit/modules/LanguageModule.java	Thu Nov 05 13:37:48 2020 +0100
     1.3 @@ -37,6 +37,7 @@
     1.4  import javax.servlet.annotation.WebServlet;
     1.5  import javax.servlet.http.HttpServletRequest;
     1.6  import javax.servlet.http.HttpServletResponse;
     1.7 +import java.io.IOException;
     1.8  import java.util.*;
     1.9  
    1.10  @WebServlet(
    1.11 @@ -85,7 +86,7 @@
    1.12      }
    1.13  
    1.14      @RequestMapping(method = HttpMethod.GET)
    1.15 -    public ResponseType handle(HttpServletRequest req) {
    1.16 +    public void handle(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
    1.17  
    1.18          final var viewModel = new LanguageView();
    1.19          viewModel.setLanguages(languages);
    1.20 @@ -95,11 +96,12 @@
    1.21          setViewModel(req, viewModel);
    1.22          setStylesheet(req, "language");
    1.23          setContentPage(req, "language");
    1.24 -        return ResponseType.HTML;
    1.25 +
    1.26 +        renderSite(req, resp);
    1.27      }
    1.28  
    1.29      @RequestMapping(method = HttpMethod.POST)
    1.30 -    public ResponseType switchLanguage(HttpServletRequest req, HttpServletResponse resp) {
    1.31 +    public void switchLanguage(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
    1.32  
    1.33          Optional<Locale> chosenLanguage = Optional.ofNullable(req.getParameter("language"))
    1.34                  .map(Locale::forLanguageTag)
    1.35 @@ -108,6 +110,6 @@
    1.36          chosenLanguage.ifPresent((l) -> req.getSession().setAttribute(Constants.SESSION_ATTR_LANGUAGE, l));
    1.37          chosenLanguage.ifPresent(resp::setLocale);
    1.38  
    1.39 -        return handle(req);
    1.40 +        handle(req, resp);
    1.41      }
    1.42  }