From: Vincent Vanwaelscappel Date: Wed, 29 Nov 2023 14:35:19 +0000 (+0100) Subject: wait #6525 @0:20 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=bbd9e246dc62ee84f824019c9f65dcccb08524b3;p=fluidbook-toolbox.git wait #6525 @0:20 --- diff --git a/app/Jobs/FluidbookCollectionDownload.php b/app/Jobs/FluidbookCollectionDownload.php index 5c8a97172..1c982762d 100644 --- a/app/Jobs/FluidbookCollectionDownload.php +++ b/app/Jobs/FluidbookCollectionDownload.php @@ -172,7 +172,7 @@ class FluidbookCollectionDownload extends DownloadBase if ($data->locale_switch) { if (!$multipleDevices) { - $options['multilang'] = $this->_getMultilangOptions($this->fluidbooks); + $options['multilang'] = $this->_getMultilangOptions($this->fluidbooks, $version); } else { if ($data->redirection_algorithm === 'language') { foreach ($this->fluidbooks as $fbid => $publication) { @@ -277,9 +277,10 @@ class FluidbookCollectionDownload extends DownloadBase return $this->_getMultilangOptions($fluidbooks); } - protected function _getMultilangOptions($fluidbooks) + protected function _getMultilangOptions($fluidbooks, $version = 'online') { $defaultFlags = ['en' => 'gb', 'sv' => 'se', 'zh' => 'cn', 'el' => 'gr', 'ja' => 'jp', 'ko' => 'kr', 'vi' => 'vn', 'cs' => 'cz']; + $ext = $version === 'sharepoint' ? 'aspx' : 'html'; $multilang = []; foreach ($fluidbooks as $fbid => $publication) { @@ -295,7 +296,7 @@ class FluidbookCollectionDownload extends DownloadBase $flag = $lang; } } - $multilang[] = $lang . ',' . strtolower($flag) . ',../' . $this->dirs[$fbid] . '/index.html'; + $multilang[] = $lang . ',' . strtolower($flag) . ',../' . $this->dirs[$fbid] . '/index.' . $ext; } if (count($multilang) <= 1) { return '';