lapervenche/ZwiiCMS
1
0
Fork 0
forked from ZwiiCMS-Team/ZwiiCMS
Code Issues Pull Requests Projects Releases Activity

fix merge completed

Browse Source
This commit is contained in:
Fred Tempez 2020-11-24 10:09:03 +01:00
parent bb59346027
commit 89c86300d4
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/core.php
View File

@ -2148,7 +2148,7 @@ class core extends common {
// Librairie googtrans ajouté dynamiquement // Librairie googtrans ajouté dynamiquement
if ( substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2) !== 'fr' if ( substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2) !== 'fr'
AND $this->getData(['config','translate','active']) === true AND $this->getData(['config','translate','activated']) === true
AND $this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD')) { AND $this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD')) {
$this->addOutput([ $this->addOutput([
'vendor' => array_merge($this->output['vendor'], ['i18n']) 'vendor' => array_merge($this->output['vendor'], ['i18n'])
@ -2290,7 +2290,7 @@ class layout extends common {
echo $this->core->output['content']; echo $this->core->output['content'];
if ( substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2) !== 'fr' if ( substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2) !== 'fr'
AND $this->getData(['config','translate','showCredits']) === true AND $this->getData(['config','translate','showCredits']) === true
AND $this->getData(['config','translate','active']) === true ) AND $this->getData(['config','translate','activated']) === true )
{ {
echo '<div id="googTransLogo"><a href="//policies.google.com/terms#toc-content" data-lity><img src="core/module/translate/ressource/googtrans.png" /></a></div>'; echo '<div id="googTransLogo"><a href="//policies.google.com/terms#toc-content" data-lity><img src="core/module/translate/ressource/googtrans.png" /></a></div>';
} }
@ -2977,7 +2977,7 @@ class layout extends common {
* Affiche le cadre avec les drapeaux * Affiche le cadre avec les drapeaux
*/ */
public function showi18n() { public function showi18n() {
if ( $this->getData(['config','translate','active']) === true if ( $this->getData(['config','translate','activated']) === true
AND $this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD')) { AND $this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD')) {
echo '<div id="i18nContainer"><ul>'; echo '<div id="i18nContainer"><ul>';
foreach (self::$i18nList as $key => $value) { foreach (self::$i18nList as $key => $value) {

5
core/module/install/ressource/defaultdata.php
View File

@ -43,8 +43,9 @@ class init extends common {
'captcha' => true 'captcha' => true
], ],
'translate' => [ 'translate' => [
'active' => false, 'activated' => false,
'showCredits' => false 'showCredits' => false,
'autoDetect' => false
], ],
], ],
'core' => [ 'core' => [