default locale fixed

code/moya-web/WebContent/frontpage.xhtml

@@ -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}" />

code/moya-web/src/main/java/fi/codecrew/moya/handler/SessionStore.java

@@ -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;
 	}