remijean/ZwiiCMS
2
1
Fork 0
forked from ZwiiCMS-Team/ZwiiCMS
Code Pull Requests Activity

Merge branch '10303' into data_engine

Browse Source
This commit is contained in:
Prof Langues 2020-10-20 09:29:50 +02:00
commit 00ad2cc3a4
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/module/config/view/index/index.php
View File

@ -95,14 +95,14 @@
]); ?>
</div>
<div class="col4 verticalAlignBottom">
<?php echo template::checkbox('configCookieConsent', true, 'Message de consentement aux cookies', [
<?php echo template::checkbox('configCookieConsent', true, 'Consentement aux cookies', [
'checked' => $this->getData(['config', 'cookieConsent'])
]); ?>
</div>
<div class="col4 verticalAlignBottom">
<?php echo template::checkbox('configCaptchaStrong', true, 'Captcha simple', [
'checked' => $this->getData(['config', 'captchaStrong']),
'help' => 'Addition de nombres de 0 à 20.'
<?php echo template::checkbox('configConnectCaptcha10', true, 'Captcha simple', [
'checked' => $this->getData(['config', 'connect','captcha10']),
'help' => 'Addition limitée aux chiffres de 0 à 9. S\'applique à tous les captchas du site.'
]); ?>
</div>
</div>
@ -119,7 +119,7 @@
]); ?>
</div>
<div class="col4">
<?php echo template::checkbox('configAutoBackup', true, 'Sauvegarde automatique quotidienne', [
<?php echo template::checkbox('configAutoBackup', true, 'Sauvegarde quotidienne', [
'checked' => $this->getData(['config', 'autoBackup']),
'help' => '<p>Une archive contenant le dossier /site/data est copiée dans le dossier \'site/backup\'. La sauvegarde est conservée pendant 30 jours.</p><p>Les fichiers du site ne sont pas sauvegardés automatiquement.</p>'
]); ?>

2
index.php
View File

@ -21,7 +21,7 @@ if(version_compare(PHP_VERSION, '5.6.0', '<')) {
exit('PHP 5.6+ required.');
}
/* Set locale to French */
/* Localisation */
date_default_timezone_set('Europe/Paris');
setlocale (LC_ALL, 'fr_FR.utf8','fra');