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

Bug fix

Browse Source
This commit is contained in:
fredtempez 2020-11-26 16:38:34 +01:00
parent 33e1ac75a6
commit 36dddcf30b
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/core.php
View File

@ -242,11 +242,11 @@ class common {
// Lire la langue du navigateur si non positionnée // Lire la langue du navigateur si non positionnée
if ( $this->getData(['config','translate','scriptGoogle']) === true if ( $this->getData(['config','translate','scriptGoogle']) === true
AND $this->getData(['config','translate','autoDetect']) === true AND $this->getData(['config','translate','autoDetect']) === true ) {
AND !isset($_COOKIE['googtrans'])) {
// Langue du navigateur // Langue du navigateur
if(!empty($_SERVER['HTTP_ACCEPT_LANGUAGE'])) { if(!empty($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
setrawcookie("googtrans", '/fr/'. $_SERVER['HTTP_ACCEPT_LANGUAGE'], time() + 3600, helper::baseUrl()); setrawcookie('googtrans', '/fr/'. $_SERVER['HTTP_ACCEPT_LANGUAGE'], time() + 3600, helper::baseUrl());
//$_SESSION['googtrans'] = '/fr/'. $_SERVER['HTTP_ACCEPT_LANGUAGE'];
} }
} }

1
core/module/translate/translate.php
View File

@ -36,6 +36,7 @@ class translate extends common {
// Désactivation du script Google // Désactivation du script Google
if ($this->getInput('translateScriptGoogle', helper::FILTER_BOOLEAN) === false) { if ($this->getInput('translateScriptGoogle', helper::FILTER_BOOLEAN) === false) {
setrawcookie('googtrans', '/fr/fr', time() + 3600, helper::baseUrl()); setrawcookie('googtrans', '/fr/fr', time() + 3600, helper::baseUrl());
$_SESSION['googtrans'] = '/fr/fr';
} }
// Edition des langues // Edition des langues
foreach (self::$i18nList as $keyi18n => $value) { foreach (self::$i18nList as $keyi18n => $value) {