github
/
OpenID-Connect-Java-Spring-Server
mirror of https://github.com/mitreid-connect/OpenID-Connect-Java-Spring-Server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into uma

pull/708/merge
Justin Richer 2015-03-20 18:15:27 -04:00
parent 332cb22a99 ba0c679e60
commit 06ae8545ae
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openid-connect-common/src/main/java/org/mitre/openid/connect/config/ConfigurationPropertiesBean.java
View File

@ -50,9 +50,9 @@ public class ConfigurationPropertiesBean {
private Long regTokenLifeTime; private Long regTokenLifeTime;
private boolean forceHttps = false; private boolean forceHttps = false; // by default we just log a warning for HTTPS deployment
private Locale locale = Locale.getDefault(); private Locale locale = Locale.ENGLISH; // we default to the english translation
public ConfigurationPropertiesBean() { public ConfigurationPropertiesBean() {

4
openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/header.tag
View File

@ -39,10 +39,10 @@
<script type="text/javascript"> <script type="text/javascript">
$.i18n.init({ $.i18n.init({
fallbackLng: "en", fallbackLng: "en",
lng: "${pageContext.response.locale}", lng: "${config.locale}",
resGetPath: "resources/js/locale/__lng__/messages.json" resGetPath: "resources/js/locale/__lng__/messages.json"
}); });
moment.locale("${pageContext.response.locale}"); moment.locale("${config.locale}");
// safely set the title of the application // safely set the title of the application
function setPageTitle(title) { function setPageTitle(title) {
document.title = "${config.topbarTitle} - " + title; document.title = "${config.topbarTitle} - " + title;