(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index 0df3c4e96da22cfde6ccf06faf0e4b29dd99909e..3c1d6750af9acbde791f27ec6fb05af94fcdbdb3 100644 (file)
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -300,7 +300,7 @@ class wsUrl {
                        $res.='<tr><td class="min nowrap">' . __('Titre') . '</td><td>' . form::field(array('contents[' . $l . '][titre]', 'contents_' . $l . '_titre'), 64, 64, $collection->contents[$l]['titre']) . '</td></tr>';\r
                        $res.='<tr><td class="min nowrap">' . __('A propos') . '</td><td>' . form::textarea(array('contents[' . $l . '][apropos]', 'contents_' . $l . '_apropos'), 60, 10, $collection->contents[$l]['apropos']) . '</td></tr>';\r
                        //'splash' => \r
-                       $res.='<tr><td class="min nowrap">' . __('Ecran de lancement') . ' (2048x2048px)</td><td><input type="file" name="splash_' . $l . '" />' . form::hidden(array('theme[splash' . $l . ']', 'splash_' . $l), $collection->theme['splash_' . $l]) . '</td></tr>';\r
+                       $res.='<tr><td class="min nowrap">' . __('Ecran de lancement') . ' (2048x2048px)</td><td><input type="file" name="splash_' . $l . '" />' . form::hidden(array('theme[splash_' . $l . ']', 'splash_' . $l), $collection->theme['splash_' . $l]) . '</td></tr>';\r
                        $res.='</table>';\r
                }\r
 \r

diff --git a/inc/ws/Util/class.ws.exporter.php b/inc/ws/Util/class.ws.exporter.php
index 577b38486a09cbc8b23cee7f6d821220efbcb469..3381b6ba73e1175ec40355f5943bf5829760ac42 100644 (file)
--- a/inc/ws/Util/class.ws.exporter.php
+++ b/inc/ws/Util/class.ws.exporter.php
@@ -54,7 +54,7 @@ class wsExporter {
                        // splashs
                        $splashs = array('320x480' => 'Default~iphone', '640x960' => 'Default@2x~iphone', '1024x748' => 'Default-Landscape~ipad', '768x1004' => 'Default-Portrait~ipad', '2048x1496' => 'Default-Landscape@2x~ipad', '1536x2008' => 'Default-Portrait@2x~ipad', '640x1136' => 'Default-568h@2x~iphone');
 
-                       $langs = array();
+                       $langs = $compiler->langs;
 
                        foreach ($langs as $l) {
                                $src = $compiler->wdir . '/' . $collection->theme['splash_' . $l];

diff --git a/inc/ws/Util/html5/app/class.ws.html5.app.compiler.php b/inc/ws/Util/html5/app/class.ws.html5.app.compiler.php
index 280048217afd2109efbe9a1e367a739f67e0eb9e..6139340a643f058e9f4d2b654f7e49a22989d59e 100644 (file)
--- a/inc/ws/Util/html5/app/class.ws.html5.app.compiler.php
+++ b/inc/ws/Util/html5/app/class.ws.html5.app.compiler.php
@@ -7,6 +7,7 @@ class wsHTML5AppCompiler {
        public $dir, $vdir, $wdir, $sdir;
        public $os;
        public $phonegapVersion;
+       public $langs;
 
        public function __construct($collectionId) {
 
@@ -15,6 +16,22 @@ class wsHTML5AppCompiler {
                $this->collectionId = $collectionId;
                $dao = new wsDAOCollection($core->con);
                $this->collection = $dao->selectById($this->collectionId);
+
+               foreach ($this->collection->datas as $group) {
+                       foreach ($group['publications'] as $p) {
+                               $books[] = $p['id'];
+                       }
+               }
+
+               $daoBook = new wsDAOBook($core->con);
+               $allbooks = $daoBook->selectByIds($books);
+
+               $this->langs = array();
+               foreach ($allbooks as $b) {
+                       $this->langs[] = $b->lang;
+               }
+
+               $this->langs = array_unique($this->langs);
        }
 
        public function createVersion() {

diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php
index 38ea387368d9eaf80646878856b659cd78d2b2f9..80348ea320f9235f816241238da2bff03f37241b 100644 (file)
--- a/inc/ws/Util/html5/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/class.ws.html5.compiler.php
@@ -643,6 +643,7 @@ class wsHTML5Compiler {
 
                                $this->copy(cubeMedia::getFlagFile($flag), $flagsDir . '/' . $flag . '.png');
                                $l[3] = cubeText::ucfirst($iso[$l[0]]);
+                               $l[4] = cubeCountry::getCountryName($flag, $l[0]);
                                $m[] = implode(',', $l);
                        }