From b8baf7d7b1d2ae1a95d545e80a9a475d202a8c9f Mon Sep 17 00:00:00 2001
From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Tue, 1 Oct 2013 11:22:47 +0000
Subject: [PATCH]

---
 js/libs/fluidbook/fluidbook.l10n.js | 10 ++++++++--
 js/libs/fluidbook/fluidbook.nav.js  |  4 ++--
 js/main.js                          |  2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/js/libs/fluidbook/fluidbook.l10n.js b/js/libs/fluidbook/fluidbook.l10n.js
index 811c3674..d86b7d43 100644
--- a/js/libs/fluidbook/fluidbook.l10n.js
+++ b/js/libs/fluidbook/fluidbook.l10n.js
@@ -36,7 +36,9 @@ FluidbookL10N.prototype = {
 		var forceLocales = window.sessionStorage.getItem('locales');
 		console.log('force Locales ' + forceLocales);
 		var force = false;
-		if (forceLocales) {
+		if (forceLocales === null) {
+			force = false;
+		} else {
 			force = true;
 			forceLocales = JSON.parse(forceLocales);
 		}
@@ -64,7 +66,11 @@ FluidbookL10N.prototype = {
 
 			var url = l[2];
 			if (force) {
-				url = '../' + forceLocales[l[0]] + '/index.html';
+				try {
+					url = '../' + forceLocales[l[0]] + '/index.html';
+				} catch (err) {
+					url = '';
+				}
 			}
 
 			var o = {lang: l[0], flag: l[1], url: l[2], langName: l[3], countryName: l[4]};
diff --git a/js/libs/fluidbook/fluidbook.nav.js b/js/libs/fluidbook/fluidbook.nav.js
index 446fe6fc..96c95c3e 100644
--- a/js/libs/fluidbook/fluidbook.nav.js
+++ b/js/libs/fluidbook/fluidbook.nav.js
@@ -126,8 +126,8 @@ FluidbookNav.prototype = {
 					});
 				}
 			} else if (icon == 'lang') {
-				if (this.fluidbook.l10n.multilangEnabled || forceLocales) {
-					this.addMultilangLink(forceLocales);
+				if (this.fluidbook.l10n.multilangEnabled) {
+					this.addMultilangLink();
 				}
 			} else if (icon == 'archives') {
 				if (this.fluidbook.datas.archivesLink != '') {
diff --git a/js/main.js b/js/main.js
index 6c32b80e..e5541756 100644
--- a/js/main.js
+++ b/js/main.js
@@ -91,7 +91,6 @@ function onDeviceReady() {
 		});
 
 		gal.onLoaded(function(info) {
-			console.log('loaded ' + info.bundleName);
 			$(window).trigger('GALBundleLoaded', [info]);
 		});
 
@@ -177,6 +176,7 @@ function init() {
 	fluidbook.loadPlugins();
 	fluidbook.loader.preloadPages();
 
+
 	desktopScale = 1;
 	desktopScaleAmount = 1.5;
 
-- 
2.39.5