change default behavior of message source, closes #964
parent
70751a3d4a
commit
e255fc1a10
|
@ -200,6 +200,7 @@
|
||||||
<!-- Configure locale information -->
|
<!-- Configure locale information -->
|
||||||
<bean id="messageSource" class="org.mitre.openid.connect.config.JsonMessageSource">
|
<bean id="messageSource" class="org.mitre.openid.connect.config.JsonMessageSource">
|
||||||
<property name="baseDirectory" value="/resources/js/locale/" />
|
<property name="baseDirectory" value="/resources/js/locale/" />
|
||||||
|
<property name="useCodeAsDefaultMessage" value="true" />
|
||||||
</bean>
|
</bean>
|
||||||
|
|
||||||
<!-- user services -->
|
<!-- user services -->
|
||||||
|
|
|
@ -66,12 +66,13 @@ public class JsonMessageSource extends AbstractMessageSource {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (value == null) {
|
if (value == null) {
|
||||||
value = code;
|
// if it's still null, return null
|
||||||
|
return null;
|
||||||
|
} else {
|
||||||
|
// otherwise format the message
|
||||||
|
return new MessageFormat(value, locale);
|
||||||
}
|
}
|
||||||
|
|
||||||
MessageFormat mf = new MessageFormat(value, locale);
|
|
||||||
|
|
||||||
return mf;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue