From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Fri, 16 Aug 2013 13:55:49 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=1c64126265605ec79dac221be9c5570bd7b2a8ff;p=cubeextranet.git

---

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index 0df3c4e96..3c1d6750a 100644
--- 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>';
 			$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>';
 			//'splash' => 
-			$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>';
+			$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>';
 			$res.='</table>';
 		}
 
diff --git a/inc/ws/Util/class.ws.exporter.php b/inc/ws/Util/class.ws.exporter.php
index 577b38486..3381b6ba7 100644
--- 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 280048217..6139340a6 100644
--- 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 38ea38736..80348ea32 100644
--- 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);
 			}