diff -r fd8c40ff78c3 -r 824d4042c857 src/main/java/de/uapcore/lightpit/modules/LanguageModule.java --- a/src/main/java/de/uapcore/lightpit/modules/LanguageModule.java Sat May 09 15:19:21 2020 +0200 +++ b/src/main/java/de/uapcore/lightpit/modules/LanguageModule.java Sat May 09 17:01:29 2020 +0200 @@ -1,8 +1,8 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * + * * Copyright 2018 Mike Becker. All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: * @@ -24,7 +24,7 @@ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. - * + * */ package de.uapcore.lightpit.modules; @@ -49,15 +49,15 @@ urlPatterns = "/language/*" ) public final class LanguageModule extends AbstractLightPITServlet { - + private static final Logger LOG = LoggerFactory.getLogger(LanguageModule.class); - + private final List languages = new ArrayList<>(); @Override public void init() throws ServletException { super.init(); - + Optional langs = Functions.availableLanguages(getServletContext()); if (langs.isPresent()) { for (String lang : langs.get()) { @@ -71,7 +71,7 @@ LOG.warn("Specified lanaguge {} in context parameter cannot be mapped to an existing locale - skipping.", lang); } } - + } else { languages.add(Locale.ENGLISH); LOG.warn("Context parameter 'available-languges' not found. Only english will be available."); @@ -83,28 +83,28 @@ super.destroy(); languages.clear(); } - + @RequestMapping(method = HttpMethod.GET) public ResponseType handle(HttpServletRequest req, HttpServletResponse resp) { req.setAttribute("languages", languages); req.setAttribute("browserLanguage", req.getLocale()); - + setStylesheet(req, "language"); setDynamicFragment(req, "language"); return ResponseType.HTML_FULL; } - + @RequestMapping(method = HttpMethod.POST) public ResponseType switchLanguage(HttpServletRequest req, HttpServletResponse resp) { - + Optional chosenLanguage = Optional.ofNullable(req.getParameter("language")) .map(Locale::forLanguageTag) .filter((l) -> !l.getLanguage().isEmpty()); - + chosenLanguage.ifPresent((l) -> req.getSession().setAttribute(Constants.SESSION_ATTR_LANGUAGE, l)); chosenLanguage.ifPresent(resp::setLocale); - + return handle(req, resp); } }