Bug install foreign language

This commit is contained in:
Fred Tempez 2023-02-25 19:43:44 +01:00
parent 137e839a91
commit 4fb4d17210
3 changed files with 61 additions and 54 deletions

View File

@ -70,6 +70,7 @@ A l'occasion de l'installation d'une verion majeure, il est recommandé de réal
[R] site Contenu du site [R] site Contenu du site
[R] backup Sauvegardes automatiques [R] backup Sauvegardes automatiques
[R] i18N Langues de l'interface de Zwii
[R] data Répertoire des données [R] data Répertoire des données
[R] fr Dossier localisé [R] fr Dossier localisé
[F] page.json Données des pages [F] page.json Données des pages
@ -90,6 +91,7 @@ A l'occasion de l'installation d'une verion majeure, il est recommandé de réal
[F] custom.css Feuille de style de la personnalisation avancée [F] custom.css Feuille de style de la personnalisation avancée
[F] fonts.json Descripteur des fontes personnalisées [F] fonts.json Descripteur des fontes personnalisées
[F] journal.log Journalisation des actions [F] journal.log Journalisation des actions
[F] languages.json Configuration des langues de l'interface
[F] theme.css Thème du site [F] theme.css Thème du site
[F] theme.json Données du site [F] theme.json Données du site
[F] user.json Données des utilisateurs [F] user.json Données des utilisateurs

View File

@ -50,59 +50,61 @@ When installing a major version, it is recommended to make a backup copy.
## General tree structure ## General tree structure
*Legend: [R] Directory - [F] File *Legend: [D] Directory - [FILE] File
```` ````
text text
[R] core Core of the system [DIR] core Core of the system
[R] class Classes [DIR] class Classes
[R] layout Layout [DIR] layout Layout
[R] module Core modules [DIR] module Core modules
[R] vendor External libraries [DIR] vendor External libraries
[F] core.js.php Javascript core [FILE] core.js.php Javascript core
[F] core.php PHP core [FILE] core.php PHP core
[R] module Page modules [DIR] module Page modules
[R] blog Blog [DIR] blog Blog
[R] form Form manager [DIR] form Form manager
[R] gallery Gallery [DIR] gallery Gallery
[R] news News [DIR] news News
[R] redirection Redirection [DIR] redirection Redirection
[R] site Site content [DIR] site Site content
[R] backup Automatic backups [DIR] backup Automatic backups
[R] data Data directory [DIR] i18N Zwii Interface languages
[R] en Localized folder [DIR] data Data directory
[F] page.json Page data [DIR] en Localized folder
[F] module.json Page module data [FILE] page.json Page data
[F] local.json Language-specific site data [FILE] module.json Page module data
[R] content Folder of page contents [FILE] local.json Language-specific site data
[F] home.html Sample home page content [DIR] content Folder of page contents
[R] fonts Folder containing the installed fonts [FILE] home.html Sample home page content
[F] fonts.html File containing the fonts calls to load on cdnFonts [DIR] fonts Folder containing the installed fonts
[F] fonts.css File containing the style sheet linked to the local fonts [FILE] fonts.html File containing the fonts calls to load on cdnFonts
[F] fonts.woff Local font files (woff, etc..) [FILE] fonts.css File containing the style sheet linked to the local fonts
[R] modules Customization of modules or own data [FILE] fonts.woff Local font files (woff, etc..)
[F] admin.css Theme of administration pages [DIR] modules Customization of modules or own data
[F] admin.json Theme data for administration pages [FILE] admin.css Theme of administration pages
[F] blacklist.json Logging of login attempts with unknown accounts [FILE] admin.json Theme data for administration pages
[F] config.json Site configuration [FILE] blacklist.json Logging of login attempts with unknown accounts
[F] core.json Core configuration [FILE] config.json Site configuration
[F] custom.css Advanced customization stylesheet [FILE] core.json Core configuration
[F] fonts.json Custom font descriptor [FILE] custom.css Advanced customization stylesheet
[F] journal.log Action logging [FILE] fonts.json Custom font descriptor
[F] theme.css Site theme [FILE] journal.log Action logging
[F] theme.json Site data [FILE] languages.json Interface database languages
[F] user.json User data [FILE] theme.css Site theme
[F] .backup Marker for file backup if present [FILE] theme.json Site data
[R] file File manager upload directory [FILE] user.json User data
[R] source Various resources [FILE] .backup Marker for file backup if present
[R] thumb Image thumbnails [DIR] file File manager upload directory
[R] tmp Temporary directory [DIR] source Various resources
[DIR] thumb Image thumbnails
[DIR] tmp Temporary directory
[F] index.php ZwiiCMS initialization file [FILE] index.php ZwiiCMS initialization file
[F] robots.txt Filtering of directories accessible to search engine robots [FILE] robots.txt Filtering of directories accessible to search engine robots
[F] sitemap.xml Sitemap [FILE] sitemap.xml Sitemap
[F] sitemap.xml.gz Compressed version [FILE] sitemap.xml.gz Compressed version
The .htaccess files contribute to security by filtering access to sensitive directories. The .htaccess files contribute to security by filtering access to sensitive directories.

View File

@ -173,6 +173,15 @@ class install extends common
$this->removeDir(self::DATA_DIR . 'fr_FR'); $this->removeDir(self::DATA_DIR . 'fr_FR');
} }
// Création de la liste des pages et du sitemap uniquement en FR, autres sites sont vides.
if (self::$i18nContent === 'fr_FR') {
// Mise à jour de la liste des pages pour TinyMCE
$this->listPages();
// Créer sitemap
$this->createSitemap();
}
// Sauvegarder la configuration du Proxy // Sauvegarder la configuration du Proxy
$this->setData(['config', 'proxyType', $this->getInput('installProxyType')]); $this->setData(['config', 'proxyType', $this->getInput('installProxyType')]);
$this->setData(['config', 'proxyUrl', $this->getInput('installProxyUrl')]); $this->setData(['config', 'proxyUrl', $this->getInput('installProxyUrl')]);
@ -234,12 +243,6 @@ class install extends common
// Fixe l'adresse from pour les envois d'email // Fixe l'adresse from pour les envois d'email
$this->setData(['config', 'smtp', 'from', 'no-reply@' . str_replace('www.', '', $_SERVER['HTTP_HOST'])]); $this->setData(['config', 'smtp', 'from', 'no-reply@' . str_replace('www.', '', $_SERVER['HTTP_HOST'])]);
// Créer sitemap
$this->createSitemap();
// Mise à jour de la liste des pages pour TinyMCE
$this->listPages();
// Valeurs en sortie // Valeurs en sortie
$this->addOutput([ $this->addOutput([
'redirect' => helper::baseUrl(true) . $this->getData(['locale', 'homePageId']), 'redirect' => helper::baseUrl(true) . $this->getData(['locale', 'homePageId']),