ZwiiCMS-Team/ZwiiCMS
ZwiiCMS-Team/ZwiiCMS
10
9
Fork 3
Code Releases 158 Activity

del trailing spaces

Browse Source
This commit is contained in:
fredtempez 2021-01-13 19:00:32 +01:00
parent 5b2e349726
commit 019a774ddc
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/core.php
View File

@ -623,7 +623,7 @@ class common {
$this->setData(['theme',$tempData['theme']]); $this->setData(['theme',$tempData['theme']]);
// Import des users sauvegardés si option active // Import des users sauvegardés si option active
if ($keepUsers === false if ($keepUsers === false
AND $tempData['user'] !== NULL) { AND $tempData['user'] !== NULL) {
$this->setData(['user',$tempData['user']]); $this->setData(['user',$tempData['user']]);
} }
@ -1569,7 +1569,7 @@ class common {
$this->setData(['config','translate','it',false]); $this->setData(['config','translate','it',false]);
$this->setData(['config','translate','nl',false]); $this->setData(['config','translate','nl',false]);
$this->setData(['config','translate','pt',false]); $this->setData(['config','translate','pt',false]);
// Renommer les fichier de backup // Renommer les fichier de backup
if ($this->getInput('configAdvancedFileBackup', helper::FILTER_BOOLEAN) === false) { if ($this->getInput('configAdvancedFileBackup', helper::FILTER_BOOLEAN) === false) {
$path = realpath('site/data'); $path = realpath('site/data');
@ -2192,7 +2192,7 @@ class core extends common {
// Chargement de la bibliothèque googtrans // Chargement de la bibliothèque googtrans
// Le multi langue est sélectionné // Le multi langue est sélectionné
if ( $this->getData(['config','translate','scriptGoogle']) === true if ( $this->getData(['config','translate','scriptGoogle']) === true
AND AND
// et la traduction de la langue courante est automatique // et la traduction de la langue courante est automatique
@ -2206,7 +2206,7 @@ class core extends common {
AND $this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD') AND $this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD')
// Ou connecté avec option active // Ou connecté avec option active
OR ($this->getUser('password') === $this->getInput('ZWII_USER_PASSWORD') OR ($this->getUser('password') === $this->getInput('ZWII_USER_PASSWORD')
AND $this->getData(['config','translate','admin']) === true AND $this->getData(['config','translate','admin']) === true
) )
) { ) {
$this->addOutput([ $this->addOutput([
@ -3067,11 +3067,11 @@ class layout extends common {
AND $this->getData(['config','translate',$key]) === 'script' AND $this->getData(['config','translate',$key]) === 'script'
) )
) { ) {
if ( if (
(isset($_COOKIE['googtrans'] ) (isset($_COOKIE['googtrans'] )
AND substr($_COOKIE['googtrans'],4,2) === $key AND substr($_COOKIE['googtrans'],4,2) === $key
) )
OR OR
( isset($_COOKIE['ZWII_I18N_SITE']) ( isset($_COOKIE['ZWII_I18N_SITE'])
AND $_COOKIE['ZWII_I18N_SITE'] === $key AND $_COOKIE['ZWII_I18N_SITE'] === $key
) ) { ) ) {

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

@ -24,7 +24,9 @@ class translate extends common {
public static $translateOptions = []; public static $translateOptions = [];
// Liste des langues installées // Liste des langues installées
public static $languagesInstalled = []; public static $languagesInstalled = [
'fr' => 'Français (fr)',
];
// Liste des langues cibles // Liste des langues cibles
public static $languagesTarget = []; public static $languagesTarget = [];