made "en" the default locale explicitly

pull/803/head
Justin Richer 2015-03-20 10:20:37 -04:00
parent 006a4d1ec6
commit ba0c679e60
2 changed files with 4 additions and 4 deletions

View File

@ -50,9 +50,9 @@ public class ConfigurationPropertiesBean {
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() {

View File

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