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 @@
Traduction automatique :
$this->getData(['config','translate', 'scriptDE'])
+ 'checked' => $this->getData(['config','i18n', 'scriptDE'])
]); ?>
$this->getData(['config','translate', 'scriptEN'])
+ 'checked' => $this->getData(['config','i18n', 'scriptEN'])
]); ?>
$this->getData(['config','translate', 'scriptES'])
+ 'checked' => $this->getData(['config','i18n', 'scriptES'])
]); ?>
$this->getData(['config','translate', 'scriptIT'])
+ 'checked' => $this->getData(['config','i18n', 'scriptIT'])
]); ?>
$this->getData(['config','translate', 'scriptNL'])
+ 'checked' => $this->getData(['config','i18n', 'scriptNL'])
]); ?>
$this->getData(['config','translate', 'scriptPT'])
+ 'checked' => $this->getData(['config','i18n', 'scriptPT'])
]); ?>
$this->getData(['config','translate', 'autoDetect']),
+ 'checked' => $this->getData(['config','i18n', 'autoDetect']),
'help' => 'Détecte la langue du navigateur.'
]); ?>
@@ -61,32 +61,32 @@
Traduction rédigée :
$this->getData(['config', 'translate', 'siteEN'])
+ 'checked' => $this->getData(['config', 'i18n', 'siteEN'])
]); ?>
$this->getData(['config', 'translate', 'siteDE'])
+ 'checked' => $this->getData(['config', 'i18n', 'siteDE'])
]); ?>
$this->getData(['config', 'translate', 'siteES'])
+ 'checked' => $this->getData(['config', 'i18n', 'siteES'])
]); ?>
$this->getData(['config', 'translate', 'siteIT'])
+ 'checked' => $this->getData(['config', 'i18n', 'siteIT'])
]); ?>
$this->getData(['config', 'translate', 'siteNL'])
+ 'checked' => $this->getData(['config', 'i18n', 'siteNL'])
]); ?>
$this->getData(['config', 'translate', 'sitePT'])
+ 'checked' => $this->getData(['config', 'i18n', 'sitePT'])
]); ?>
@@ -101,18 +101,18 @@
$this->getData(['config','translate', 'scriptGoogle'])
+ 'checked' => $this->getData(['config','i18n', 'scriptGoogle'])
]); ?>
$this->getData(['config','translate', 'admin']),
+ 'checked' => $this->getData(['config','i18n', 'admin']),
'help' => 'Traduction automatique du site et de l\'interface du CMS'
]); ?>
$this->getData(['config','translate', 'showCredits']),
+ 'checked' => $this->getData(['config','i18n', 'showCredits']),
'help' => 'Option vivement recommandée pour le respect du droit d\'auteur'
]); ?>
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'])