From: vincent@cubedesigners.com Date: Tue, 30 Oct 2018 15:36:59 +0000 (+0000) Subject: fix #1637 @1 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=10a363c4a43d91a6efd269de4258ac5e45f72327;p=cubeextranet.git fix #1637 @1 --- diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php index 1bdb53731..8e56ff7be 100644 --- a/inc/ws/Controlleur/class.ws.url.php +++ b/inc/ws/Controlleur/class.ws.url.php @@ -752,12 +752,17 @@ class wsUrl $res .= commonPage::bf(); $res .= commonPage::bh(); - $res .= cubeLang::translationForm(array(__('Version Flash') => PLAYER_SOURCES, __('Version HTML5') => WS_COMPILE_ASSETS . '/player/local', __('Compilateur HTML5') => ROOT . '/inc/ws/Util/html5', __('Application') => WS_COMPILE_ASSETS . '/_html5app'), $lang_id, null, 'liste', array(), '' . $core->typo->Ajouter(__('Enregistrer')) . '', $lang->traductions); + $res .= cubeLang::translationForm(self::getTranslationSources(), $lang_id, null, 'liste', array(), '' . $core->typo->Ajouter(__('Enregistrer')) . '', $lang->traductions); $res .= commonPage::bf(); $res .= ''; return $res; } + public static function getTranslationSources() + { + return array(__('Version Flash') => PLAYER_SOURCES, __('Version HTML5') => WS_COMPILE_ASSETS . '/player/local', __('Compilateur HTML5') => ROOT . '/inc/ws/Util/html5', __('Application') => WS_COMPILE_ASSETS . '/_html5app'); + } + public static function exportLangAsExcel($args) { global $core; @@ -825,7 +830,13 @@ class wsUrl $s->setTitle(cubeText::str2URL($lang_name)); - $tab = cubeLang::getTranslationsList(array(PLAYER_SOURCES, WS_COMPILE_ASSETS . '/_html5/js', ROOT . '/inc/ws/Util/html5'), array('php', 'as', 'js'), array(), $lang->traductions); + $sources = []; + $ts = self::getTranslationSources(); + foreach ($ts as $item) { + $sources = array_merge($sources, $item); + } + + $tab = cubeLang::getTranslationsList(self::getTranslationSources(), array('php', 'as', 'js'), array(), $lang->traductions); $s->setCellValueByColumnAndRow(0, 1, 'ID', true); $s->setCellValueByColumnAndRow(1, 1, $ref_name, true);