Commit 49d30780 authored by Gaston Dombiak's avatar Gaston Dombiak Committed by gato

Small fix related to locales.

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@4153 b35dd754-fafc-0310-a699-88a17e54d16e
parent fd4ad3fe
...@@ -11,17 +11,10 @@ ...@@ -11,17 +11,10 @@
package org.jivesoftware.util; package org.jivesoftware.util;
import javax.servlet.Filter; import javax.servlet.*;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.jsp.jstl.core.Config; import javax.servlet.jsp.jstl.core.Config;
import javax.servlet.jsp.jstl.fmt.LocalizationContext; import javax.servlet.jsp.jstl.fmt.LocalizationContext;
import java.io.IOException; import java.io.IOException;
import java.util.ResourceBundle; import java.util.ResourceBundle;
...@@ -56,7 +49,7 @@ public class LocaleFilter implements Filter { ...@@ -56,7 +49,7 @@ public class LocaleFilter implements Filter {
String[] parts = pathInfo.split("/"); String[] parts = pathInfo.split("/");
String pluginName = parts[1]; String pluginName = parts[1];
ResourceBundle bundle = LocaleUtils.getPluginResourceBundle(pluginName); ResourceBundle bundle = LocaleUtils.getPluginResourceBundle(pluginName);
LocalizationContext ctx = new LocalizationContext(bundle); LocalizationContext ctx = new LocalizationContext(bundle, JiveGlobals.getLocale());
Config.set(request, Config.FMT_LOCALIZATION_CONTEXT, ctx); Config.set(request, Config.FMT_LOCALIZATION_CONTEXT, ctx);
} }
catch (Exception e) { catch (Exception e) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment