vmario/wisemapping-open-source
1
0
Fork 0
mirror of https://bitbucket.org/wisemapping/wisemapping-open-source.git synced 2024-11-26 15:54:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix locale resolver issue with the languange.

Browse Source
This commit is contained in:
Paulo Gustavo Veiga 2012-08-23 23:55:26 -03:00
parent e2682108e0
commit 46831e110b
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
wise-webapp/src/main/java/com/wisemapping/filter/UserLocaleInterceptor.java
View File

@ -34,8 +34,6 @@ import java.util.Locale;
public class UserLocaleInterceptor extends HandlerInterceptorAdapter { public class UserLocaleInterceptor extends HandlerInterceptorAdapter {
public static final String USER_LOCALE = "user.locale";
public boolean preHandle(@NotNull HttpServletRequest request, @NotNull HttpServletResponse response, Object object) throws Exception { public boolean preHandle(@NotNull HttpServletRequest request, @NotNull HttpServletResponse response, Object object) throws Exception {
final HttpSession session = request.getSession(false); final HttpSession session = request.getSession(false);
@ -45,7 +43,14 @@ public class UserLocaleInterceptor extends HandlerInterceptorAdapter {
String userLocale = user.getLocale(); String userLocale = user.getLocale();
final Locale sessionLocale = (Locale) session.getAttribute(SessionLocaleResolver.LOCALE_SESSION_ATTRIBUTE_NAME); final Locale sessionLocale = (Locale) session.getAttribute(SessionLocaleResolver.LOCALE_SESSION_ATTRIBUTE_NAME);
if ((userLocale != null) && ((sessionLocale == null) || (!userLocale.equals(sessionLocale.toString())))) { if ((userLocale != null) && ((sessionLocale == null) || (!userLocale.equals(sessionLocale.toString())))) {
session.setAttribute(SessionLocaleResolver.LOCALE_SESSION_ATTRIBUTE_NAME, new Locale(userLocale)); Locale locale;
if (userLocale.contains("_")) {
final String[] spit = userLocale.split("_");
locale = new Locale(spit[0], spit[1]);
} else {
locale = new Locale(userLocale);
}
session.setAttribute(SessionLocaleResolver.LOCALE_SESSION_ATTRIBUTE_NAME, locale);
} }
} }
return true; return true;