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

Bug autoDetect + Drapeau sélectionné

Browse Source
This commit is contained in:
fredtempez 2020-11-26 12:42:47 +01:00
parent 39f7421569
commit 2abcc365ae
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
core/core.php
View File

@ -239,10 +239,11 @@ class common {
} }
// Traduction du site avec le script Google // Traduction du site avec le script Google
// Lire la langue du navigateur // Lire la langue du navigateur si non positionnée
if ( $this->getData(['config','translate','scriptGoogle']) === true
AND $this->getData(['config','translate','autoDetect']) === true) {
if ( $this->getData(['config','translate','scriptGoogle']) === 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());
@ -3038,8 +3039,21 @@ class layout extends common {
AND $this->getData(['config','translate',$key]) === 'script' AND $this->getData(['config','translate',$key]) === 'script'
) )
) { ) {
if (
(isset($_COOKIE['googtrans'] )
AND substr($_COOKIE['googtrans'],4,2) === $key
)
OR
( isset($_COOKIE['ZWII_I18N_SITE'])
AND $_COOKIE['ZWII_I18N_SITE'] === $key
) ) {
$select = ' id="i18nFlagSelected" ';
} else {
$select = ' id="i18nFlag" ';
}
echo '<li>'; echo '<li>';
echo '<a href="' . helper::baseUrl() . 'translate/language/' . $key . '/' . $this->getData(['config','translate',$key]) . '"><img class= "flag" src="' . helper::baseUrl(false) . 'core/vendor/i18n/png/' . $key . '.png" /></a>'; echo '<a href="' . helper::baseUrl() . 'translate/language/' . $key . '/' . $this->getData(['config','translate',$key]) . '"><img ' . $select . ' class="flag" src="' . helper::baseUrl(false) . 'core/vendor/i18n/png/' . $key . '.png" /></a>';
echo '</li>'; echo '</li>';
} }
} }

8
core/layout/common.css
View File

@ -727,8 +727,12 @@ li .menuSideChild {
} }
#i18nContainer img { #i18nFlag {
width: 80%; width: 70%;
}
#i18nFlagSelected {
width: 90%;
} }