From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Fri, 16 Aug 2013 13:55:37 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=99edd886a47c45f9b1dbcf5c798536d32b55d53e;p=fluidbook-html5.git

---

diff --git a/js/libs/fluidbook/fluidbook.js b/js/libs/fluidbook/fluidbook.js
index a8bd278f..fa709b5a 100644
--- a/js/libs/fluidbook/fluidbook.js
+++ b/js/libs/fluidbook/fluidbook.js
@@ -932,7 +932,21 @@ Fluidbook.prototype = {
 			if (url.substr(0, 3) == '../' && !$this.datas.standalone) {
 				url = '../' + url;
 			}
-			view += '<li data-level="0"><a href="' + url + '" class="level0"><img src="images/flags/' + v.flag + '.png" alt="' + v.name + '" />' + v.name + '</a></li>';
+			/*'datas' => array(__('Langue') => 'lang',
+			 __('Langue') . ' (' . __('Pays') . ')' => 'lang_country',
+			 __('Pays') . ' (' . __('Langue') . ')' => 'country_lang'));*/
+
+			var name = '';
+			if ($this.datas.multilangDisplay == 'lang') {
+				name = v.langName;
+			} else if ($this.datas.multilangDisplay == 'lang_country') {
+				name = v.langName + ' (' + v.countryName + ')';
+			} else if ($this.datas.multilangDisplay == 'country_lang') {
+				name = v.countryName + ' (' + v.langName + ')';
+			}
+
+
+			view += '<li data-level="0"><a href="' + url + '" class="level0"><img src="images/flags/' + v.flag + '.png" alt="' + name + '" />' + name + '</a></li>';
 		});
 		view += '</ul>';
 		view += '</div>';
diff --git a/js/libs/fluidbook/fluidbook.l10n.js b/js/libs/fluidbook/fluidbook.l10n.js
index ce12e333..599666e1 100644
--- a/js/libs/fluidbook/fluidbook.l10n.js
+++ b/js/libs/fluidbook/fluidbook.l10n.js
@@ -1,6 +1,6 @@
 function FluidbookL10N(fluidbook, lang) {
 	this.translations = {};
-	this.multilang = {};
+	this.multilang = [];
 	this.multilangEnabled = false;
 	this.fluidbook = fluidbook;
 
@@ -38,11 +38,43 @@ FluidbookL10N.prototype = {
 
 		var e = ml.split("\n");
 		$.each(e, function(k, v) {
+			if (v == '') {
+				return;
+			}
 			var l = v.split(',');
-			var o = {lang: l[0], flag: l[1], url: l[2], name: l[3]};
-			$this.multilang[l[0]] = o;
+			if (l[0] == '') {
+				return;
+			}
+			var o = {lang: l[0], flag: l[1], url: l[2], langName: l[3], countryName: l[4]};
+
+			$this.multilang[$this.multilang.length] = o;
 		});
 	},
+	getActiveFlag: function() {
+		var active = this.getActiveLang();
+		var res = [];
+		for (var i = 0; i < this.multilang.length; i++) {
+			var l = this.multilang[i];
+			if (l.lang == active) {
+				res.push(l);
+			}
+		}
+
+		if (res.length == 1) {
+			return res[0].flag;
+		} else if (res.length == 0) {
+			return false;
+		} else {
+			if (this.fluidbook.datas.country != '') {
+				for (var i in res) {
+					if (res[i].flag == this.fluidbook.datas.country) {
+						return res[i].flag;
+					}
+				}
+				return res[0].flag;
+			}
+		}
+	},
 	updateTranslations: function() {
 		var $this = this;
 		$("#q").attr('placeholder', this.__('search'));
diff --git a/js/libs/fluidbook/fluidbook.nav.js b/js/libs/fluidbook/fluidbook.nav.js
index bc73e42e..e61180ef 100644
--- a/js/libs/fluidbook/fluidbook.nav.js
+++ b/js/libs/fluidbook/fluidbook.nav.js
@@ -136,7 +136,10 @@ FluidbookNav.prototype = {
 	addMultilangLink: function(langs) {
 		var l = '<a id="locales" help="!Select language" href="#/locales"></a>';
 
-		var flag = this.fluidbook.l10n.multilang[this.fluidbook.l10n.getActiveLang()].flag;
+		var flag = this.fluidbook.l10n.getActiveFlag();
+		if (flag === false) {
+			return;
+		}
 
 		$("#nav").append(l);
 		$("#nav #locales").css('background-image', 'url("images/flags/' + flag + '.png")');