vmario/wisemapping-open-source
1
0
Fork 0
mirror of https://bitbucket.org/wisemapping/wisemapping-open-source.git synced 2024-11-14 18:57:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix change locale.

Browse Source
This commit is contained in:
Paulo Gustavo Veiga 2012-06-30 02:56:18 -03:00
parent dd74a7a63d
commit 43aa3e2aea
5 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
wise-editor/src/main/webapp/css/embedded.less
View File

@ -2,15 +2,16 @@
/* Overwrite some styles */ /* Overwrite some styles */
div#headerInfo{ div#headerInfo {
height:0; height: 0;
}
div#header {
height:35px;
} }
div#headerMapTitle,#headerActions,#headerLogo { div#header {
display:none; height: 35px;
}
div#headerMapTitle, #headerActions, #headerLogo {
display: none;
} }
/* Footer Styles */ /* Footer Styles */

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

@ -43,16 +43,9 @@ public class UserLocaleInterceptor extends HandlerInterceptorAdapter {
if (user != null && session != null) { if (user != null && session != null) {
String userLocale = user.getLocale(); String userLocale = user.getLocale();
final String sessionLocale = (String) session.getAttribute(SessionLocaleResolver.LOCALE_SESSION_ATTRIBUTE_NAME); final Locale sessionLocale = (Locale) session.getAttribute(SessionLocaleResolver.LOCALE_SESSION_ATTRIBUTE_NAME);
if (userLocale != null && !userLocale.equals(sessionLocale)) { if ((userLocale != null) && ((sessionLocale == null) || (!userLocale.equals(sessionLocale.getISO3Language())))) {
// LocaleResolver localeResolver = RequestContextUtils.getLocaleResolver(request); session.setAttribute(SessionLocaleResolver.LOCALE_SESSION_ATTRIBUTE_NAME, new Locale(userLocale));
// if (localeResolver == null) {
// throw new IllegalStateException("No LocaleResolver found: not in a DispatcherServlet request?");
// }
// LocaleEditor localeEditor = new LocaleEditor();
// localeEditor.setAsText(userLocale);
// localeResolver.setLocale(request, response, (Locale) localeEditor.getValue());
session.setAttribute(SessionLocaleResolver.LOCALE_SESSION_ATTRIBUTE_NAME, userLocale);
} }
} }
return true; return true;

1
wise-webapp/src/main/webapp/WEB-INF/classes/messages_es.properties
View File

@ -261,3 +261,4 @@ LAST_UPDATE=Ultima Actualización
LAST_UPDATE_BY=Ultima Actualización Por LAST_UPDATE_BY=Ultima Actualización Por
SIZE=Tamaño SIZE=Tamaño
NO_PRODUCTION_DATABASE_CONFIGURED=COMPLETE NO_PRODUCTION_DATABASE_CONFIGURED=COMPLETE
CHANGE_LANGUAGE=Cambiar Idioma

4
wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml
View File

@ -70,9 +70,7 @@
</bean> </bean>
<bean id="localeResolver" <bean id="localeResolver"
class="org.springframework.web.servlet.i18n.SessionLocaleResolver"> class="org.springframework.web.servlet.i18n.SessionLocaleResolver"/>
<property name="defaultLocale" value="en"/>
</bean>
<bean id="reCaptcha" class="net.tanesha.recaptcha.ReCaptchaImpl"> <bean id="reCaptcha" class="net.tanesha.recaptcha.ReCaptchaImpl">
<property name="privateKey" value="${registration.recaptcha.privateKey}"/> <property name="privateKey" value="${registration.recaptcha.privateKey}"/>

3
wise-webapp/src/main/webapp/jsp/errorTemplate.jsp
View File

@ -1,6 +1,8 @@
<!DOCTYPE HTML> <!DOCTYPE HTML>
<%@ page import="org.apache.log4j.Logger" %> <%@ page import="org.apache.log4j.Logger" %>
<%@ page import="com.wisemapping.security.Utils" %>
<%@ page import="com.wisemapping.model.User" %>
<%@ page autoFlush="true" buffer="none" %> <%@ page autoFlush="true" buffer="none" %>
<%@ include file="/jsp/init.jsp" %> <%@ include file="/jsp/init.jsp" %>
@ -20,6 +22,7 @@
if (exception != null) { if (exception != null) {
exception.printStackTrace(response.getWriter()); exception.printStackTrace(response.getWriter());
String usrMail = "anonymous"; String usrMail = "anonymous";
final User user = Utils.getUser(false);
if(user!=null) if(user!=null)
{ {
usrMail = user.getEmail(); usrMail = user.getEmail();