(no commit message)

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index 97f3de3c6807b862d4731aaa1957bf3a6716c6fb..9afd1f3b6776770d73cfbb0924de421234612a15 100644 (file)
--- 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 {
                }\r
 \r
                // Multilang\r
-               if ($book->parametres->multilang) {\r
-                       $langs = explode("\n", $book->parametres->multilang);\r
+               if (trim($book->parametres->multilang) != '') {\r
+                       $m = str_replace("\r", "\n", trim($book->parametres->multilang));\r
+                       $langs = explode("\n", $m);\r
                        $langNames = array();\r
                        $iso = l10n::getISOcodes();\r
                        $chars = '';\r
                        foreach ($langs as $l) {\r
-                               list($lang, $flag, $url) = explode(',', trim($l), 3);\r
+                               list($mlang, $flag, $url) = explode(',', trim($l), 3);\r
                                $flex->addBitmap(cubeMedia::getFlagFile($flag), 'flag_' . $flag);\r
-                               $langNames[$lang] = $iso[$lang];\r
-                               $chars.=$iso[$lang];\r
+                               $n = cubeText::ucfirst($iso[$mlang]);\r
+                               $langNames[$mlang] = $n;\r
+                               $chars.=$n;\r
                        }\r
+\r
+                       $chars = preg_split('/(?<!^)(?!$)/u', $chars);\r
+                       $chars = array_unique($chars);\r
+\r
+                       $flex->addFont(WS_FILES . '/fonts/FluidbookMultilang.ttf', 'MultilangFont', $chars);\r
                        $flex->addVariable('langNames', $langNames, false, true, 'JSONObject');\r
+                       $flex->addVariable('lang', $book->lang);\r
                }\r
 \r
                // Basket\r

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index 79801c0e7348d1b7551356b0e6cefce694cea9d6..01dfb3eec75d794b9bfa9f6a99f53f644dc945ce 100644 (file)
--- 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 {
                // .\r
                // .\r
                $this->fields['friend'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Envoyer à un ami'));\r
-               $this->fields['email_title'] = array('type' => 'text', 'default' => __('%name% vous invite à découvrir %title%'), 'editable' => true, 'label' => __("Titre de l'email") . ' "' . __('Envoyer à un ami') . '"');\r
-               $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') . '"');\r
+               $this->fields['email_title'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __("Titre de l'email") . ' "' . __('Envoyer à un ami') . '"');\r
+               $this->fields['email_body'] = array('type' => 'textarea', 'default' => '', 'editable' => true, 'label' => __("Corps de l'email") . ' "' . __('Envoyer à un ami') . '"');\r
                $this->fields['email_editable'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __("Permettre au lecteur de modifier le corps de l'email"));\r
                $this->fields['askAcknowledge'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __("Demander au destinataire un accusé de réception"), 'grade' => 3);\r
                $this->fields['facebook'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Facebook'));\r