From 7861300d72cc491599e435453d9c434700be3315 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20J=C3=B6nsson?= <fjo@kth.se>
Date: Sun, 15 Feb 2015 21:44:48 +0100
Subject: [PATCH] Activate locale change interceptor and make it overrideable.

---
 .../main/webapp/WEB-INF/application-context.xml    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/openid-connect-server-webapp/src/main/webapp/WEB-INF/application-context.xml b/openid-connect-server-webapp/src/main/webapp/WEB-INF/application-context.xml
index f86b0984b..1670b44a9 100644
--- a/openid-connect-server-webapp/src/main/webapp/WEB-INF/application-context.xml
+++ b/openid-connect-server-webapp/src/main/webapp/WEB-INF/application-context.xml
@@ -41,8 +41,15 @@
 		</mvc:message-converters>
 	</mvc:annotation-driven>
 
+    <bean id="localeResolver" class="org.springframework.web.servlet.i18n.FixedLocaleResolver">
+      <property name="defaultLocale" value="en" />
+    </bean>
+
+    <bean id="localeChangeInterceptor" class="org.springframework.web.servlet.i18n.LocaleChangeInterceptor" />
+
 	<mvc:interceptors>
 		<!-- Inject the UserInfo into the current context -->
+		<ref bean="localeChangeInterceptor"/>
 		<bean id="userInfoInterceptor" class="org.mitre.openid.connect.web.UserInfoInterceptor" />
 		<bean id="serverConfigInterceptor" class="org.mitre.openid.connect.web.ServerConfigInterceptor" />
 	</mvc:interceptors>
@@ -201,13 +208,6 @@
 	
 	<bean id="clientAssertionAuthenticationProvider" class="org.mitre.openid.connect.assertion.JwtBearerAuthenticationProvider" />
 
-	<!--	<bean id="localeResolver" class="org.springframework.web.servlet.i18n.AcceptHeaderLocaleResolver"> -->
-	<bean id="localeResolver" class="org.springframework.web.servlet.i18n.FixedLocaleResolver">
-	  <property name="defaultLocale" value="en" />
-	</bean>
-
-	<bean id="localeChangeInterceptor" class="org.springframework.web.servlet.i18n.LocaleChangeInterceptor" />
-	
 	<bean id="messageSource" class="org.springframework.context.support.ReloadableResourceBundleMessageSource">
 	  <property name="basenames">
 	    <list>