diff --git a/core/core.php b/core/core.php index c9a14972..48149a8f 100755 --- a/core/core.php +++ b/core/core.php @@ -174,7 +174,6 @@ class common { 'theme' => '', 'admin' => '', 'blacklist' => '', - 'translate' => '', 'locale' => '' ]; @@ -229,7 +228,7 @@ class common { } // Auto traduction - if ( $this->getData(['translate','activated'])) { + if ( $this->getData(['config','translate','activated'])) { // Lire la langue du navigateur $lan = substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2); @@ -1559,9 +1558,9 @@ class common { $this->setData(['locale','searchPageId',$this->getData(['config','searchPageId'])]); $this->setData(['locale','metaDescription',$this->getData(['config','metaDescription'])]); $this->setData(['locale','title',$this->getData(['config','title'])]); - $this->setData(['translate','activated',false]); - $this->setData(['translate','showCredits',false]); - $this->setData(['translate','autoDetect',false]); + $this->setData(['config','translate','activated',false]); + $this->setData(['config','translate','showCredits',false]); + $this->setData(['config','translate','autoDetect',false]); $this->setData(['core', 'dataVersion', 10400]); } } @@ -2149,7 +2148,7 @@ class core extends common { // Librairie googtrans ajouté dynamiquement if ( substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2) !== 'fr' - AND $this->getData(['translate','active']) === true + AND $this->getData(['config','translate','active']) === true AND $this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD')) { $this->addOutput([ 'vendor' => array_merge($this->output['vendor'], ['i18n']) @@ -2290,8 +2289,8 @@ class layout extends common { echo $this->core->output['content']; if ( substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2) !== 'fr' - AND $this->getData(['translate','showCredits']) === true - AND $this->getData(['translate','active']) === true ) + AND $this->getData(['config','translate','showCredits']) === true + AND $this->getData(['config','translate','active']) === true ) { echo '
'; } @@ -2978,7 +2977,7 @@ class layout extends common { * Affiche le cadre avec les drapeaux */ public function showi18n() { - if ( $this->getData(['translate','active']) === true + if ( $this->getData(['config','translate','active']) === true AND $this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD')) { echo 'Et eodem impetu Domitianum praecipitem per scalas itidem funibus constrinxerunt, eosque coniunctos per ampla spatia civitatis acri raptavere discursu. iamque artuum et membrorum divulsa conpage superscandentes corpora mortuorum ad ultimam truncata deformitatem velut exsaturati mox abiecerunt in flumen.
Ex his quidam aeternitati se commendari posse per statuas aestimantes eas ardenter adfectant quasi plus praemii de figmentis aereis sensu carentibus adepturi, quam ex conscientia honeste recteque factorum, easque auro curant inbracteari, quod Acilio Glabrioni delatum est primo, cum consiliis armisque regem superasset Antiochum. quam autem sit pulchrum exigua haec spernentem et minima ad ascensus verae gloriae tendere longos et arduos, ut memorat vates Ascraeus, Censorius Cato monstravit. qui interrogatus quam ob rem inter multos... statuam non haberet malo inquit ambigere bonos quam ob rem id non meruerim, quam quod est gravius cur inpetraverim mussitare.
Latius iam disseminata licentia onerosus bonis omnibus Caesar nullum post haec adhibens modum orientis latera cuncta vexabat nec honoratis parcens nec urbium primatibus nec plebeiis.
', diff --git a/core/module/translate/translate.php b/core/module/translate/translate.php index 5231a2de..c45afcc3 100755 --- a/core/module/translate/translate.php +++ b/core/module/translate/translate.php @@ -26,7 +26,7 @@ class translate extends common { public function index() { // Soumission du formulaire if($this->isPost()) { - $this->setData(['translate', [ + $this->setData(['config','translate', [ 'activated' => $this->getInput('translateActivated', helper::FILTER_BOOLEAN), 'showCredits' => $this->getInput('translateCredits', helper::FILTER_BOOLEAN) ? $this->getInput('translateCredits', helper::FILTER_BOOLEAN) : false, 'autoDetect' => $this->getInput('translateAutoDetect', helper::FILTER_BOOLEAN) diff --git a/core/module/translate/view/index/index.php b/core/module/translate/view/index/index.php index 2fe288bc..ee20d4c2 100755 --- a/core/module/translate/view/index/index.php +++ b/core/module/translate/view/index/index.php @@ -19,7 +19,7 @@