From 36dddcf30b3f40f6d7a1ece7e4bd2e53d80c69da Mon Sep 17 00:00:00 2001 From: fredtempez Date: Thu, 26 Nov 2020 16:38:34 +0100 Subject: [PATCH] Bug fix --- core/core.php | 6 +++--- core/module/translate/translate.php | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/core/core.php b/core/core.php index 4c130d8a..edfd1f76 100755 --- a/core/core.php +++ b/core/core.php @@ -242,11 +242,11 @@ class common { // Lire la langue du navigateur si non positionnée if ( $this->getData(['config','translate','scriptGoogle']) === true - AND $this->getData(['config','translate','autoDetect']) === true - AND !isset($_COOKIE['googtrans'])) { + AND $this->getData(['config','translate','autoDetect']) === true ) { // Langue du navigateur 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']; } } diff --git a/core/module/translate/translate.php b/core/module/translate/translate.php index fec4fef9..d8a2a86a 100755 --- a/core/module/translate/translate.php +++ b/core/module/translate/translate.php @@ -36,6 +36,7 @@ class translate extends common { // Désactivation du script Google if ($this->getInput('translateScriptGoogle', helper::FILTER_BOOLEAN) === false) { setrawcookie('googtrans', '/fr/fr', time() + 3600, helper::baseUrl()); + $_SESSION['googtrans'] = '/fr/fr'; } // Edition des langues foreach (self::$i18nList as $keyi18n => $value) {