Merge pull request #2933 from SCADA-LTS/fix/#2896_Fixed_alert_languag…

…e_in_watchlist_view #2896 Fixed alert language in watchlist view
SCADA-LTS · Jul 3, 2024 · 598c89b · 598c89b
2 parents ac392df + fe6ad07
commit 598c89b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/WebContent/WEB-INF/jsp/include/tech.jsp b/WebContent/WEB-INF/jsp/include/tech.jsp
@@ -19,6 +19,7 @@
 --%><%@ taglib prefix="c" uri="http://java.sun.com/jstl/core_rt" %><%--
 --%><%@ taglib prefix="fmt" uri="http://java.sun.com/jstl/fmt_rt" %><%--
 --%><fmt:setBundle basename="messages" /><%--
+--%><fmt:setLocale scope='session' value="${sessionScope.get('org.springframework.web.servlet.i18n.SessionLocaleResolver.LOCALE')}"/><%--
 --%><%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %><%--
 --%><%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %><%--
 --%><%@ taglib prefix="mango" uri="/WEB-INF/tld/mango.tld" %><%--

diff --git a/src/com/serotonin/mango/web/dwr/BaseDwr.java b/src/com/serotonin/mango/web/dwr/BaseDwr.java
@@ -18,11 +18,7 @@
  */
 package com.serotonin.mango.web.dwr;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.ResourceBundle;
+import java.util.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.jsp.jstl.core.Config;
@@ -302,10 +298,7 @@ protected String getMessage(LocalizableMessage message) {
     }
 
     protected ResourceBundle getResourceBundle() {
-        WebContext webContext = WebContextFactory.get();
-        LocalizationContext localizationContext = (LocalizationContext) Config.get(webContext.getHttpServletRequest(),
-                Config.FMT_LOCALIZATION_CONTEXT);
-        return localizationContext.getResourceBundle();
+        return Common.getBundle();
     }
 
     public static String generateContent(HttpServletRequest request, String snippet, Map<String, Object> model) {