From 342df0487924d83f706ee5c71a191e8d64fe4fba Mon Sep 17 00:00:00 2001
From: fredtempez <frederic.tempez@outlook.com>
Date: Fri, 4 Jun 2021 13:41:21 +0200
Subject: [PATCH] translate devient i18n

---
 core/module/install/ressource/defaultdata.php |  2 +-
 core/module/translate/translate.php           |  2 +-
 core/module/translate/view/index/index.php    | 32 +++++++++----------
 module/search/search.php                      |  8 ++---
 4 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/core/module/install/ressource/defaultdata.php b/core/module/install/ressource/defaultdata.php
index d399bb2c..6d8ebf58 100644
--- a/core/module/install/ressource/defaultdata.php
+++ b/core/module/install/ressource/defaultdata.php
@@ -83,7 +83,7 @@ class init extends common {
 		],
 		'module' => [],
 		'user' => [],
-		'translate' => [
+		'i18n' => [
 			'scriptGoogle' => false,
 			'showCredits' => false,
 			'autoDetect' => false,
diff --git a/core/module/translate/translate.php b/core/module/translate/translate.php
index 65aa7dd8..35c75b2a 100644
--- a/core/module/translate/translate.php
+++ b/core/module/translate/translate.php
@@ -61,7 +61,7 @@ class translate extends common {
 			}
 
 			// Enregistrement des données
-			$this->setData(['config','translate', [
+			$this->setData(['config','i18n', [
 				'scriptGoogle'      => $this->getInput('translateScriptGoogle', 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 1dd188b6..0982bad0 100644
--- a/core/module/translate/view/index/index.php
+++ b/core/module/translate/view/index/index.php
@@ -21,37 +21,37 @@
 						<b>Traduction automatique :</b>
 						<div class="col12">
 						<?php echo template::checkbox('translateScriptFlagDE', true, 'Allemand', [
-							'checked' => $this->getData(['config','translate', 'scriptDE'])
+							'checked' => $this->getData(['config','i18n', 'scriptDE'])
 						]); ?>
 						</div>
 						<div class="col12">
 							<?php echo template::checkbox('translateScriptFlagEN', true, 'Anglais', [
-								'checked' => $this->getData(['config','translate', 'scriptEN'])
+								'checked' => $this->getData(['config','i18n', 'scriptEN'])
 							]); ?>
 						</div>
 						<div class="col12">
 							<?php echo template::checkbox('translateScriptFlagES', true, 'Espagnol', [
-								'checked' => $this->getData(['config','translate', 'scriptES'])
+								'checked' => $this->getData(['config','i18n', 'scriptES'])
 								]); ?>
 						</div>
 						<div class="col12">
 							<?php echo template::checkbox('translateScriptFlagIT', true, 'Italien', [
-								'checked' => $this->getData(['config','translate', 'scriptIT'])
+								'checked' => $this->getData(['config','i18n', 'scriptIT'])
 							]); ?>
 						</div>
 						<div class="col12">
 							<?php echo template::checkbox('translateScriptFlagNL', true, 'Néerlandais', [
-								'checked' => $this->getData(['config','translate', 'scriptNL'])
+								'checked' => $this->getData(['config','i18n', 'scriptNL'])
 							]); ?>
 						</div>
 						<div class="col12">
 							<?php echo template::checkbox('translateScriptFlagPT', true, 'Portugais', [
-								'checked' => $this->getData(['config','translate', 'scriptPT'])
+								'checked' => $this->getData(['config','i18n', 'scriptPT'])
 							]); ?>
 						</div>
 						<div class="col12">
 							<?php echo template::checkbox('translateAutoDetect', true, 'Détection automatique', [
-								'checked' => $this->getData(['config','translate', 'autoDetect']),
+								'checked' => $this->getData(['config','i18n', 'autoDetect']),
 								'help'   => 'Détecte la langue du navigateur.'
 							]); ?>
 
@@ -61,32 +61,32 @@
 					<b>Traduction rédigée :</b>
 						<div class="col12">
 							<?php echo template::checkbox('translateSiteFlagEN', true, 'Anglais', [
-								'checked' => $this->getData(['config', 'translate', 'siteEN'])
+								'checked' => $this->getData(['config', 'i18n', 'siteEN'])
 							]); ?>
 						</div>
 						<div class="col12">
 								<?php echo template::checkbox('translateSiteFlagDE', true, 'Allemand', [
-									'checked' => $this->getData(['config', 'translate', 'siteDE'])
+									'checked' => $this->getData(['config', 'i18n', 'siteDE'])
 								]); ?>
 						</div>
 						<div class="col12">
 							<?php echo template::checkbox('translateSiteFlagES', true, 'Espagnol', [
-								'checked' => $this->getData(['config', 'translate', 'siteES'])
+								'checked' => $this->getData(['config', 'i18n', 'siteES'])
 								]); ?>
 						</div>
 						<div class="col12">
 							<?php echo template::checkbox('translateSiteFlagIT', true, 'Italien', [
-								'checked' => $this->getData(['config', 'translate', 'siteIT'])
+								'checked' => $this->getData(['config', 'i18n', 'siteIT'])
 							]); ?>
 						</div>
 						<div class="col12">
 							<?php echo template::checkbox('translateSiteFlagNL', true, 'Néerlandais', [
-								'checked' => $this->getData(['config', 'translate', 'siteNL'])
+								'checked' => $this->getData(['config', 'i18n', 'siteNL'])
 							]); ?>
 						</div>
 						<div class="col12">
 							<?php echo template::checkbox('translateSiteFlagPT', true, 'Portugais', [
-								'checked' => $this->getData(['config', 'translate', 'sitePT'])
+								'checked' => $this->getData(['config', 'i18n', 'sitePT'])
 							]); ?>
 						</div>
 					</div>
@@ -101,18 +101,18 @@
 					<div class="row">
 						<div class="col4">
 							<?php echo template::checkbox('translateScriptGoogle', true, 'Active le script de traduction automatique', [
-									'checked' => $this->getData(['config','translate', 'scriptGoogle'])
+									'checked' => $this->getData(['config','i18n', 'scriptGoogle'])
 								]); ?>
 						</div>
 						<div class="col4">
 							<?php echo template::checkbox('translateAdmin', true, 'Mode connexion', [
-									'checked' => $this->getData(['config','translate', 'admin']),
+									'checked' => $this->getData(['config','i18n', 'admin']),
 									'help' => 'Traduction automatique du site et de l\'interface du CMS'
 								]); ?>
 						</div>
 						<div class="col4">
 							<?php echo template::checkbox('translateCredits', true, 'Afficher les crédits du script Google', [
-								'checked' => $this->getData(['config','translate', 'showCredits']),
+								'checked' => $this->getData(['config','i18n', 'showCredits']),
 								'help' => 'Option vivement recommandée pour le respect du droit d\'auteur'
 							]); ?>
 						</div>
diff --git a/module/search/search.php b/module/search/search.php
index e336de2a..3b6c6665 100644
--- a/module/search/search.php
+++ b/module/search/search.php
@@ -199,20 +199,20 @@ class search extends common {
 
 			// Traduction du mot clé si le script Google Trad est actif
 			// Le multi langue est sélectionné
-			if (  $this->getData(['config','translate','scriptGoogle']) === true
+			if (  $this->getData(['config','i18n','scriptGoogle']) === true
 			AND
 				// et la traduction de la langue courante est automatique
 				(   isset($_COOKIE['googtrans'])
-					AND ( $this->getData(['config','translate', substr($_COOKIE['googtrans'],4,2)]) === 'script'
+					AND ( $this->getData(['config','i18n', substr($_COOKIE['googtrans'],4,2)]) === 'script'
 					// Ou traduction automatique
-						OR 	$this->getData(['config','translate','autoDetect']) === true )
+						OR 	$this->getData(['config','i18n','autoDetect']) === true )
 				)
 			// Cas des pages d'administration
 			// Pas connecté
 			AND ( $this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD')
 				// Ou connecté avec option active
 				OR ($this->getUser('password') === $this->getInput('ZWII_USER_PASSWORD')
-					AND $this->getData(['config','translate','admin']) === true
+					AND $this->getData(['config','i18n','admin']) === true
 					)
 				)
 			AND !isset($_COOKIE['ZWII_I18N_SITE'])