From 89c86300d41d3f877e2c526e03f454f9f341018f Mon Sep 17 00:00:00 2001
From: Fred Tempez <ftempez@gmail.com>
Date: Tue, 24 Nov 2020 10:09:03 +0100
Subject: [PATCH] fix merge completed

---
 core/core.php                                 | 6 +++---
 core/module/install/ressource/defaultdata.php | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/core/core.php b/core/core.php
index 48149a8f..b99ff288 100755
--- a/core/core.php
+++ b/core/core.php
@@ -2148,7 +2148,7 @@ class core extends common {
 
 		// Librairie googtrans ajouté dynamiquement
 		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')) {
 				$this->addOutput([
 					'vendor' => array_merge($this->output['vendor'], ['i18n'])
@@ -2290,7 +2290,7 @@ class layout extends common {
 		echo $this->core->output['content'];
 		if ( substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2) !== 'fr'
 			 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>';
 		}
@@ -2977,7 +2977,7 @@ class layout extends common {
 	 * Affiche le cadre avec les drapeaux
 	 */
 	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')) {
 				echo '<div id="i18nContainer"><ul>';
 				foreach (self::$i18nList as $key => $value) {
diff --git a/core/module/install/ressource/defaultdata.php b/core/module/install/ressource/defaultdata.php
index a34deaf9..b9d9c144 100755
--- a/core/module/install/ressource/defaultdata.php
+++ b/core/module/install/ressource/defaultdata.php
@@ -43,8 +43,9 @@ class init extends common {
 				'captcha' => true
 			],
 			'translate' => [
-				'active' => false,
-				'showCredits' => false
+				'activated' => false,
+				'showCredits' => false,
+				'autoDetect' => false
 			],
 		],
 		'core' => [