From 4fb4d17210b8c73a0d0e550a849175113933aae4 Mon Sep 17 00:00:00 2001 From: Fred Tempez Date: Sat, 25 Feb 2023 19:43:44 +0100 Subject: [PATCH] Bug install foreign language --- LISEZMOI.md | 2 + README.md | 98 +++++++++++++++++---------------- core/module/install/install.php | 15 +++-- 3 files changed, 61 insertions(+), 54 deletions(-) diff --git a/LISEZMOI.md b/LISEZMOI.md index f21bf71d..cecf64e5 100644 --- a/LISEZMOI.md +++ b/LISEZMOI.md @@ -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] backup Sauvegardes automatiques + [R] i18N Langues de l'interface de Zwii [R] data Répertoire des données [R] fr Dossier localisé [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] fonts.json Descripteur des fontes personnalisées [F] journal.log Journalisation des actions + [F] languages.json Configuration des langues de l'interface [F] theme.css Thème du site [F] theme.json Données du site [F] user.json Données des utilisateurs diff --git a/README.md b/README.md index f152acfb..4d4b26ab 100755 --- a/README.md +++ b/README.md @@ -50,59 +50,61 @@ When installing a major version, it is recommended to make a backup copy. ## General tree structure -*Legend: [R] Directory - [F] File +*Legend: [D] Directory - [FILE] File ```` text -[R] core Core of the system - [R] class Classes - [R] layout Layout - [R] module Core modules - [R] vendor External libraries - [F] core.js.php Javascript core - [F] core.php PHP core +[DIR] core Core of the system + [DIR] class Classes + [DIR] layout Layout + [DIR] module Core modules + [DIR] vendor External libraries + [FILE] core.js.php Javascript core + [FILE] core.php PHP core -[R] module Page modules - [R] blog Blog - [R] form Form manager - [R] gallery Gallery - [R] news News - [R] redirection Redirection +[DIR] module Page modules + [DIR] blog Blog + [DIR] form Form manager + [DIR] gallery Gallery + [DIR] news News + [DIR] redirection Redirection -[R] site Site content - [R] backup Automatic backups - [R] data Data directory - [R] en Localized folder - [F] page.json Page data - [F] module.json Page module data - [F] local.json Language-specific site data - [R] content Folder of page contents - [F] home.html Sample home page content - [R] fonts Folder containing the installed fonts - [F] fonts.html File containing the fonts calls to load on cdnFonts - [F] fonts.css File containing the style sheet linked to the local fonts - [F] fonts.woff Local font files (woff, etc..) - [R] modules Customization of modules or own data - [F] admin.css Theme of administration pages - [F] admin.json Theme data for administration pages - [F] blacklist.json Logging of login attempts with unknown accounts - [F] config.json Site configuration - [F] core.json Core configuration - [F] custom.css Advanced customization stylesheet - [F] fonts.json Custom font descriptor - [F] journal.log Action logging - [F] theme.css Site theme - [F] theme.json Site data - [F] user.json User data - [F] .backup Marker for file backup if present - [R] file File manager upload directory - [R] source Various resources - [R] thumb Image thumbnails - [R] tmp Temporary directory +[DIR] site Site content + [DIR] backup Automatic backups + [DIR] i18N Zwii Interface languages + [DIR] data Data directory + [DIR] en Localized folder + [FILE] page.json Page data + [FILE] module.json Page module data + [FILE] local.json Language-specific site data + [DIR] content Folder of page contents + [FILE] home.html Sample home page content + [DIR] fonts Folder containing the installed fonts + [FILE] fonts.html File containing the fonts calls to load on cdnFonts + [FILE] fonts.css File containing the style sheet linked to the local fonts + [FILE] fonts.woff Local font files (woff, etc..) + [DIR] modules Customization of modules or own data + [FILE] admin.css Theme of administration pages + [FILE] admin.json Theme data for administration pages + [FILE] blacklist.json Logging of login attempts with unknown accounts + [FILE] config.json Site configuration + [FILE] core.json Core configuration + [FILE] custom.css Advanced customization stylesheet + [FILE] fonts.json Custom font descriptor + [FILE] journal.log Action logging + [FILE] languages.json Interface database languages + [FILE] theme.css Site theme + [FILE] theme.json Site data + [FILE] user.json User data + [FILE] .backup Marker for file backup if present + [DIR] file File manager upload directory + [DIR] source Various resources + [DIR] thumb Image thumbnails + [DIR] tmp Temporary directory -[F] index.php ZwiiCMS initialization file -[F] robots.txt Filtering of directories accessible to search engine robots -[F] sitemap.xml Sitemap -[F] sitemap.xml.gz Compressed version +[FILE] index.php ZwiiCMS initialization file +[FILE] robots.txt Filtering of directories accessible to search engine robots +[FILE] sitemap.xml Sitemap +[FILE] sitemap.xml.gz Compressed version The .htaccess files contribute to security by filtering access to sensitive directories. diff --git a/core/module/install/install.php b/core/module/install/install.php index a5a77d2c..eae48c99 100644 --- a/core/module/install/install.php +++ b/core/module/install/install.php @@ -173,6 +173,15 @@ class install extends common $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 $this->setData(['config', 'proxyType', $this->getInput('installProxyType')]); $this->setData(['config', 'proxyUrl', $this->getInput('installProxyUrl')]); @@ -234,12 +243,6 @@ class install extends common // Fixe l'adresse from pour les envois d'email $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 $this->addOutput([ 'redirect' => helper::baseUrl(true) . $this->getData(['locale', 'homePageId']),