From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Thu, 12 Apr 2012 13:30:59 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=c97a3ed06e2c0e05e1d4a7604eb843bb71aee30c;p=cubeextranet.git

---

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index 97f3de3c6..9afd1f3b6 100644
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -1066,18 +1066,26 @@ class wsDAOBook extends commonDAO {
 		}
 
 		// Multilang
-		if ($book->parametres->multilang) {
-			$langs = explode("\n", $book->parametres->multilang);
+		if (trim($book->parametres->multilang) != '') {
+			$m = str_replace("\r", "\n", trim($book->parametres->multilang));
+			$langs = explode("\n", $m);
 			$langNames = array();
 			$iso = l10n::getISOcodes();
 			$chars = '';
 			foreach ($langs as $l) {
-				list($lang, $flag, $url) = explode(',', trim($l), 3);
+				list($mlang, $flag, $url) = explode(',', trim($l), 3);
 				$flex->addBitmap(cubeMedia::getFlagFile($flag), 'flag_' . $flag);
-				$langNames[$lang] = $iso[$lang];
-				$chars.=$iso[$lang];
+				$n = cubeText::ucfirst($iso[$mlang]);
+				$langNames[$mlang] = $n;
+				$chars.=$n;
 			}
+
+			$chars = preg_split('/(?<!^)(?!$)/u', $chars);
+			$chars = array_unique($chars);
+
+			$flex->addFont(WS_FILES . '/fonts/FluidbookMultilang.ttf', 'MultilangFont', $chars);
 			$flex->addVariable('langNames', $langNames, false, true, 'JSONObject');
+			$flex->addVariable('lang', $book->lang);
 		}
 
 		// Basket
diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index 79801c0e7..01dfb3eec 100644
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -47,8 +47,8 @@ class wsBookParametres extends wsParametres {
 		// .
 		// .
 		$this->fields['friend'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Envoyer à un ami'));
-		$this->fields['email_title'] = array('type' => 'text', 'default' => __('%name% vous invite à découvrir %title%'), 'editable' => true, 'label' => __("Titre de l'email") . ' "' . __('Envoyer à un ami') . '"');
-		$this->fields['email_body'] = array('type' => 'textarea', 'default' => __('Veuillez cliquer sur le lien suivant : %link%'), 'editable' => true, 'label' => __("Corps de l'email") . ' "' . __('Envoyer à un ami') . '"');
+		$this->fields['email_title'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __("Titre de l'email") . ' "' . __('Envoyer à un ami') . '"');
+		$this->fields['email_body'] = array('type' => 'textarea', 'default' => '', 'editable' => true, 'label' => __("Corps de l'email") . ' "' . __('Envoyer à un ami') . '"');
 		$this->fields['email_editable'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __("Permettre au lecteur de modifier le corps de l'email"));
 		$this->fields['askAcknowledge'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __("Demander au destinataire un accusé de réception"), 'grade' => 3);
 		$this->fields['facebook'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Facebook'));