Commit cc731e52 by Tuomas Riihimäki

Merge branch 'localefix' into 'master'

Localefix

fixes default locale to fi

Mergeä eka edellinen ,mul näköjään on se tässä pohjana.

See merge request !150
2 parents 6cb01619 6215ba43
......@@ -9,10 +9,6 @@
<f:event type="preRenderView" listener="#{pageOutputView.initIndexView}" />
</f:metadata>
<ui:define name="content">
<h:outputLabel rendered="#{sessionHandler.isInDevelopmentMode()}">
Development-tilassa.
Täällä voit huoletta rikkoa.
</h:outputLabel>
<ui:fragment rendered="#{layoutView.manageContent}">
<h:link value="#{i18n['layout.editContent']}" outcome="/pages/manage">
<f:param name="pagename" value="#{layoutView.pagepath}" />
......
......@@ -47,7 +47,7 @@ public class SessionStore implements Serializable {
public Locale getLocale() {
Locale ret = locale;
if (ret == null)
if (ret == null || ret.toString().equals(""))
{
String retStr = eventbean.getCurrentEvent().getOrganiser().getBundleCountry();
......@@ -60,11 +60,13 @@ public class SessionStore implements Serializable {
}
}
if (ret == null) {
if (ret == null || ret.toString().equals("")) {
ret = DEFAULT_LOCALE;
}
locale = ret;
}
logger.info("Using locale {}",ret);
return ret;
}
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!