From 0dca0487ec95719cd7b134f8f56025b12c15a017 Mon Sep 17 00:00:00 2001 From: Fred Tempez Date: Sun, 18 Dec 2022 11:34:06 +0100 Subject: [PATCH] =?UTF-8?q?beta07=20G=C3=A9n=C3=A8re=20un=20content=20vide?= =?UTF-8?q?=20localis=C3=A9=20selon=20la=20langue=20s=C3=A9lectionn=C3=A9e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core.php | 47 ++- core/module/install/install.php | 6 + core/module/install/ressource/defaultdata.php | 324 ++++++++++-------- core/module/translate/translate.php | 33 +- core/module/translate/view/index/index.php | 19 +- 5 files changed, 245 insertions(+), 184 deletions(-) diff --git a/core/core.php b/core/core.php index f0736bf7..d08292d8 100644 --- a/core/core.php +++ b/core/core.php @@ -49,7 +49,7 @@ class common // Numéro de version const ZWII_UPDATE_URL = 'https://forge.chapril.org/ZwiiCMS-Team/update/raw/branch/master/'; - const ZWII_VERSION = '12.0.00-beta06'; + const ZWII_VERSION = '12.0.00-beta07'; const ZWII_UPDATE_CHANNEL = "test"; public static $actions = []; @@ -326,8 +326,10 @@ class common ]; // Convertit les dossiers vers la nouvelle structure foreach ($languages as $key => $value) { - if (is_dir(self::DATA_DIR . $key) && - !is_dir(self::DATA_DIR . $value)) { + if ( + is_dir(self::DATA_DIR . $key) && + !is_dir(self::DATA_DIR . $value) + ) { rename(self::DATA_DIR . $key, self::DATA_DIR . $value); } } @@ -689,31 +691,46 @@ class common } $db = $this->dataFiles[$module]; - if ($sampleSite === true) { + if ($sampleSite === true && $lang === 'fr_FR') { $db->set($module, init::$siteData[$module]); } else { $db->set($module, init::$defaultData[$module]); } $db->save; - - // Dossier des pages - if (!is_dir(self::DATA_DIR . $lang . '/content')) { - mkdir(self::DATA_DIR . $lang . '/content', 0755); - } // Créer le jeu de pages du site de test if ($module === 'page') { + $langFolder = $lang . '/content/'; + // Dossier des pages + if (!is_dir(self::DATA_DIR . $langFolder)) { + mkdir(self::DATA_DIR . $langFolder, 0755); + } // Site de test ou page simple - if ($sampleSite === true) { - foreach (init::$siteContent as $key => $value) { - // Creation du contenu de la page - if (!empty($this->getData(['page', $key, 'content']))) { - file_put_contents(self::DATA_DIR . $lang . '/content/' . $this->getData(['page', $key, 'content']), $value); + if ($lang === 'fr_FR') { + if ($sampleSite === true) { + foreach (init::$siteContent as $key => $value) { + // Creation du contenu de la page + if (!empty($this->getData(['page', $key, 'content']))) { + file_put_contents(self::DATA_DIR . $langFolder . $this->getData(['page', $key, 'content']), $value); + } } + } else { + // Créer la page d'accueil + file_put_contents(self::DATA_DIR .$langFolder . 'accueil.html', '

Contenu de votre nouvelle page.

'); } } else { + // En_EN si le contenu localisé n'est pas traduit + if (!isset(init::$defaultDataI18n[$lang])) { + $lang = 'en_EN'; + } + // Messages localisés + $this->setData(['locale', init::$defaultDataI18n[$lang]['locale']]); + // Page dans une autre langue, page d'accueil + $this->setData(['page', init::$defaultDataI18n[$lang]['page']]); // Créer la page d'accueil - file_put_contents(self::DATA_DIR . $lang . '/content/' . 'accueil.html', '

Contenu de votre nouvelle page.

'); + $pageId = init::$defaultDataI18n[$lang]['locale']['homePageId']; + $content = init::$defaultDataI18n[$lang]['html']; + file_put_contents(self::DATA_DIR . $langFolder . init::$defaultDataI18n[$lang]['page'][$pageId]['content'], $content); } } } diff --git a/core/module/install/install.php b/core/module/install/install.php index 7193e0c0..16768029 100644 --- a/core/module/install/install.php +++ b/core/module/install/install.php @@ -173,6 +173,12 @@ class install extends common $this->setData(['module', 'blog', 'posts', 'mon-troisieme-article', 'userId', $userId]); } + // Jeu réduit pour les pages étrangères + if ( $lang !== 'fr_FR') { + $this->initData('page', self::$i18nContent, false); + $this->initData('module', self::$i18nContent, false); + } + // Sauvegarder la configuration du Proxy $this->setData(['config', 'proxyType', $this->getInput('installProxyType')]); $this->setData(['config', 'proxyUrl', $this->getInput('installProxyUrl')]); diff --git a/core/module/install/ressource/defaultdata.php b/core/module/install/ressource/defaultdata.php index 59e0adc2..b0b3a1fe 100644 --- a/core/module/install/ressource/defaultdata.php +++ b/core/module/install/ressource/defaultdata.php @@ -1,5 +1,6 @@ [ 'autoBackup' => true, @@ -71,13 +72,13 @@ class init extends common { ], 'fonts' => [ 'files' => [], - 'imported'=> [ - 'arimo'=> [ + 'imported' => [ + 'arimo' => [ 'name' => 'Arimo', 'font-family' => 'Arimo, sans-serif', 'resource' => 'https://fonts.cdnfonts.com/css/arimo' ], - 'arvo'=> [ + 'arvo' => [ 'name' => 'Arvo', 'font-family' => 'Arvo, sans-serif', 'resource' => 'https://fonts.cdnfonts.com/css/arvo' @@ -87,47 +88,47 @@ class init extends common { 'font-family' => '\'Dancing Script\', sans-serif', 'resource' => 'https://fonts.cdnfonts.com/css/dancing-script' ], - 'droid-sans-2'=> [ + 'droid-sans-2' => [ 'name' => 'Droid Sans', 'font-family' => '\'Droid Sans\', sans-serif', 'resource' => 'https://fonts.cdnfonts.com/css/droid-sans-2' ], - 'droid-serif-2'=> [ + 'droid-serif-2' => [ 'name' => 'Droid Serif', 'font-family' => '\'Droid Serif\', serif', 'resource' => 'https://fonts.cdnfonts.com/css/droid-serif-2' ], - 'indie-flower'=> [ + 'indie-flower' => [ 'name' => 'Indie Flower', 'font-family' => '\'Indie Flower\', sans-serif', 'resource' => 'https://fonts.cdnfonts.com/css/indie-flower' ], - 'liberation-sans'=> [ + 'liberation-sans' => [ 'name' => 'Liberation Sans', 'font-family' => '\'Liberation Sans\', sans-serif', 'resource' => 'https://fonts.cdnfonts.com/css/liberation-sans' ], - 'liberation-serif'=> [ + 'liberation-serif' => [ 'name' => 'Liberation Serif', 'font-family' => '\'Liberation Serif\', serif', 'resource' => 'https://fonts.cdnfonts.com/css/liberation-serif' ], - 'lobster-2'=> [ + 'lobster-2' => [ 'name' => 'Lobster', 'font-family' => 'Lobster, sans-serif', 'resource' => 'https://fonts.cdnfonts.com/css/lobster-2' ], - 'lato'=> [ + 'lato' => [ 'name' => 'lato', 'font-family' => 'Lato, sans-serif', 'resource' => 'https://fonts.cdnfonts.com/css/lato' ], - 'lora'=> [ + 'lora' => [ 'name' => 'Lora', 'font-family' => 'Lora, serif', 'resource' => 'https://fonts.cdnfonts.com/css/lora' ], - 'old-standard-tt-3'=> [ + 'old-standard-tt-3' => [ 'name' => 'Old Standard TT', 'font-family' => '\'Old Standard TT\', serif', 'resource' => 'https://fonts.cdnfonts.com/css/old-standard-tt-3' @@ -137,37 +138,37 @@ class init extends common { 'font-family' => '\'Open Sans\', sans-serif', 'resource' => 'https://fonts.cdnfonts.com/css/open-sans' ], - 'oswald-4'=> [ + 'oswald-4' => [ 'name' => 'Oswald', 'font-family' => 'Oswald, sans-serif', 'resource' => 'https://fonts.cdnfonts.com/css/oswald-4' ], - 'pt-mono'=> [ + 'pt-mono' => [ 'name' => 'PT Mono', 'font-family' => '\'PT Mono\', monospace', 'resource' => 'https://fonts.cdnfonts.com/css/pt-mono' ], - 'pt-serif'=> [ + 'pt-serif' => [ 'name' => 'PR Serif', 'font-family' => '\'PT Serif\', serif', 'resource' => 'https://fonts.cdnfonts.com/css/pt-serif' ], - 'rancho'=> [ + 'rancho' => [ 'name' => 'Rancho', 'font-family' => 'Rancho, sans-serif', 'resource' => 'https://fonts.cdnfonts.com/css/rancho' ], - 'roboto'=> [ + 'roboto' => [ 'name' => 'Roboto', 'font-family' => 'Roboto, sans-serif', 'resource' => 'https://fonts.cdnfonts.com/css/roboto' ], - 'ubuntu'=> [ + 'ubuntu' => [ 'name' => 'Ubuntu', 'font-family' => 'Ubuntu, sans-serif', 'resource' => 'https://fonts.cdnfonts.com/css/ubuntu' ], - 'vollkorn'=> [ + 'vollkorn' => [ 'name' => 'Vollkorn', 'font-family' => 'Vollkorn, serif', 'resource' => 'https://fonts.cdnfonts.com/css/vollkorn' @@ -176,32 +177,32 @@ class init extends common { ], 'page' => [ 'accueil' => [ - 'typeMenu' => 'text', - 'iconUrl' => '', - 'disable' => false, - 'content' => 'accueil.html', - 'hideTitle' => false, - 'homePageId' => true, - 'breadCrumb' => false, - 'metaDescription' => '', - 'metaTitle' => '', - 'moduleId' => '', - 'modulePosition' => 'bottom', - 'parentPageId' => '', - 'position' => 1, - 'group' => self::GROUP_VISITOR, - 'targetBlank' => false, - 'title' => 'Accueil', - 'shortTitle' => 'Accueil', - 'block' => '12', - 'barLeft' => '', - 'barRight' => '', - 'displayMenu' => 'none', - 'hideMenuSide' => false, - 'hideMenuChildren' =>false, - 'extraPosition' => false, - 'css' => '', - 'js' => '' + 'typeMenu' => 'text', + 'iconUrl' => '', + 'disable' => false, + 'content' => 'accueil.html', + 'hideTitle' => false, + 'homePageId' => true, + 'breadCrumb' => false, + 'metaDescription' => '', + 'metaTitle' => '', + 'moduleId' => '', + 'modulePosition' => 'bottom', + 'parentPageId' => '', + 'position' => 1, + 'group' => self::GROUP_VISITOR, + 'targetBlank' => false, + 'title' => 'Accueil', + 'shortTitle' => 'Accueil', + 'block' => '12', + 'barLeft' => '', + 'barRight' => '', + 'displayMenu' => 'none', + 'hideMenuSide' => false, + 'hideMenuChildren' => false, + 'extraPosition' => false, + 'css' => '', + 'js' => '' ] ], 'module' => [], @@ -332,43 +333,98 @@ class init extends common { 'borderBlockColor' => 'rgba(190, 202, 209, 1)' ], 'blacklist' => [] - ]; + ]; + public static $defaultDataI18n = [ + 'en_EN' => [ + 'locale' => [ + 'homePageId' => 'home', + 'page302' => 'none', + 'page403' => 'none', + 'page404' => 'none', + 'legalPageId' => 'none', + 'searchPageId' => 'none', + 'searchPageLabel' => 'none', + 'sitemapPageLabel' => 'none', + 'legalPageLabel' => 'legals', + 'metaDescription' => 'Zwii is a database-free CMS that makes it easy to create and manage a website without any programming knowledge.', + 'title' => 'Your site in a few clicks!', + 'cookies' => [ + 'mainLabel' => 'This site uses cookies necessary for its operation, they make it possible to streamline its operation for example by memorizing the connection data, the language you have chosen or the validation of this message.', + 'titleLabel' => 'Essential cookies', + 'linkLegalLabel' => 'Consult the legal notice', + 'cookiesFooterText' => 'Cookies', + 'buttonValidLabel' => 'Ok' + ] + ], + 'page' => [ + 'home' => [ + 'typeMenu' => 'text', + 'iconUrl' => '', + 'disable' => false, + 'content' => 'home.html', + 'hideTitle' => false, + 'homePageId' => true, + 'breadCrumb' => false, + 'metaDescription' => '', + 'metaTitle' => '', + 'moduleId' => '', + 'modulePosition' => 'bottom', + 'parentPageId' => '', + 'position' => 1, + 'group' => self::GROUP_VISITOR, + 'targetBlank' => false, + 'title' => 'HomePage', + 'shortTitle' => 'Home', + 'block' => '12', + 'barLeft' => '', + 'barRight' => '', + 'displayMenu' => 'none', + 'hideMenuSide' => false, + 'hideMenuChildren' => false, + 'extraPosition' => false, + 'css' => '', + 'js' => '' + ] + ], + 'html' => 'Welcome in this ZiiCMS, this is you first page !' + ] + ]; - public static $siteData = [ + public static $siteData = [ 'page' => [ 'accueil' => [ - 'typeMenu' => 'text', - 'iconUrl' => '', - 'disable' => false, - 'content' => 'accueil.html', - 'hideTitle' => false, - 'homePageId' => true, - 'breadCrumb' => false, - 'metaDescription' => '', - 'metaTitle' => '', - 'moduleId' => '', - 'modulePosition' => 'bottom', - 'parentPageId' => '', - 'position' => 1, - 'group' => self::GROUP_VISITOR, - 'targetBlank' => false, - 'title' => 'Accueil', - 'shortTitle' => 'Accueil', - 'block' => '12', - 'barLeft' => '', - 'barRight' => '', - 'displayMenu' => 'none', - 'hideMenuSide' => false, - 'hideMenuChildren' =>false, - 'extraPosition' => false, - 'css' => '', - 'js' => '' + 'typeMenu' => 'text', + 'iconUrl' => '', + 'disable' => false, + 'content' => 'accueil.html', + 'hideTitle' => false, + 'homePageId' => true, + 'breadCrumb' => false, + 'metaDescription' => '', + 'metaTitle' => '', + 'moduleId' => '', + 'modulePosition' => 'bottom', + 'parentPageId' => '', + 'position' => 1, + 'group' => self::GROUP_VISITOR, + 'targetBlank' => false, + 'title' => 'Accueil', + 'shortTitle' => 'Accueil', + 'block' => '12', + 'barLeft' => '', + 'barRight' => '', + 'displayMenu' => 'none', + 'hideMenuSide' => false, + 'hideMenuChildren' => false, + 'extraPosition' => false, + 'css' => '', + 'js' => '' ], 'enfant' => [ - 'typeMenu' => 'text', - 'iconUrl' => '', - 'disable' => false, + 'typeMenu' => 'text', + 'iconUrl' => '', + 'disable' => false, 'content' => 'enfant.html', 'hideTitle' => false, 'breadCrumb' => true, @@ -387,15 +443,15 @@ class init extends common { 'barRight' => '', 'displayMenu' => 'none', 'hideMenuSide' => false, - 'hideMenuChildren' =>false, + 'hideMenuChildren' => false, 'extraPosition' => false, 'css' => '', 'js' => '' ], 'privee' => [ - 'typeMenu' => 'text', - 'iconUrl' => '', - 'disable' => false, + 'typeMenu' => 'text', + 'iconUrl' => '', + 'disable' => false, 'content' => 'privee.html', 'hideTitle' => false, 'breadCrumb' => true, @@ -414,15 +470,15 @@ class init extends common { 'barRight' => '', 'displayMenu' => 'none', 'hideMenuSide' => false, - 'hideMenuChildren' =>false, + 'hideMenuChildren' => false, 'extraPosition' => false, 'css' => '', 'js' => '' ], 'mise-en-page' => [ 'typeMenu' => 'text', - 'iconUrl' => '', - 'disable' => false, + 'iconUrl' => '', + 'disable' => false, 'content' => 'mise-en-page.html', 'hideTitle' => false, 'breadCrumb' => true, @@ -441,15 +497,15 @@ class init extends common { 'barRight' => '', 'displayMenu' => 'none', 'hideMenuSide' => false, - 'hideMenuChildren' =>false, + 'hideMenuChildren' => false, 'extraPosition' => false, 'css' => '', 'js' => '' ], 'menu-lateral' => [ 'typeMenu' => 'text', - 'iconUrl' => '', - 'disable' => false, + 'iconUrl' => '', + 'disable' => false, 'content' => 'menu-lateral.html', 'hideTitle' => false, 'breadCrumb' => true, @@ -468,15 +524,15 @@ class init extends common { 'barRight' => 'barrelateraleavecmenu', 'displayMenu' => 'none', 'hideMenuSide' => false, - 'hideMenuChildren' =>false, + 'hideMenuChildren' => false, 'extraPosition' => false, 'css' => '', 'js' => '' - ], + ], 'blog' => [ 'typeMenu' => 'text', - 'iconUrl' => '', - 'disable' => false, + 'iconUrl' => '', + 'disable' => false, 'content' => 'blog.html', 'hideTitle' => false, 'breadCrumb' => false, @@ -495,15 +551,15 @@ class init extends common { 'barRight' => '', 'displayMenu' => 'none', 'hideMenuSide' => false, - 'hideMenuChildren' =>false, + 'hideMenuChildren' => false, 'extraPosition' => false, 'css' => '', 'js' => '' ], 'galeries' => [ 'typeMenu' => 'text', - 'iconUrl' => '', - 'disable' => false, + 'iconUrl' => '', + 'disable' => false, 'content' => 'galeries.html', 'hideTitle' => false, 'breadCrumb' => false, @@ -522,38 +578,38 @@ class init extends common { 'barRight' => '', 'displayMenu' => 'none', 'hideMenuSide' => false, - 'hideMenuChildren' =>false, + 'hideMenuChildren' => false, 'extraPosition' => false, 'css' => '', 'js' => '' ], 'site-de-zwii' => [ - 'typeMenu' => 'text', - 'iconUrl' => '', - 'disable' => false, - 'content' => '', - 'hideTitle' => false, - 'homePageId' => false, - 'breadCrumb' => false, - 'metaDescription' => '', - 'metaTitle' => '', - 'moduleId' => 'redirection', - 'modulePosition' => 'bottom', - 'parentPageId' => '', - 'position' => 5, - 'group' => self::GROUP_VISITOR, - 'targetBlank' => true, - 'title' => 'Site de Zwii', - 'shortTitle' => 'Site de Zwii', - 'block' => '12', - 'barLeft' => '', - 'barRight' => '', - 'displayMenu' => 'none', - 'hideMenuSide' => false, - 'hideMenuChildren' =>false, - 'extraPosition' => false, - 'css' => '', - 'js' => '' + 'typeMenu' => 'text', + 'iconUrl' => '', + 'disable' => false, + 'content' => '', + 'hideTitle' => false, + 'homePageId' => false, + 'breadCrumb' => false, + 'metaDescription' => '', + 'metaTitle' => '', + 'moduleId' => 'redirection', + 'modulePosition' => 'bottom', + 'parentPageId' => '', + 'position' => 5, + 'group' => self::GROUP_VISITOR, + 'targetBlank' => true, + 'title' => 'Site de Zwii', + 'shortTitle' => 'Site de Zwii', + 'block' => '12', + 'barLeft' => '', + 'barRight' => '', + 'displayMenu' => 'none', + 'hideMenuSide' => false, + 'hideMenuChildren' => false, + 'extraPosition' => false, + 'css' => '', + 'js' => '' ], 'contact' => [ 'typeMenu' => 'text', @@ -577,7 +633,7 @@ class init extends common { 'barRight' => '', 'displayMenu' => 'none', 'hideMenuSide' => false, - 'hideMenuChildren' =>false, + 'hideMenuChildren' => false, 'extraPosition' => false, 'css' => '', 'js' => '' @@ -594,7 +650,7 @@ class init extends common { 'moduleId' => '', 'modulePosition' => 'bottom', 'parentPageId' => '', - 'position' => 0 , + 'position' => 0, 'group' => self::GROUP_VISITOR, 'targetBlank' => false, 'title' => 'Barre latérale', @@ -604,7 +660,7 @@ class init extends common { 'barRight' => '', 'displayMenu' => 'none', 'hideMenuSide' => false, - 'hideMenuChildren' =>false, + 'hideMenuChildren' => false, 'extraPosition' => false, 'css' => '', 'js' => '' @@ -621,7 +677,7 @@ class init extends common { 'moduleId' => '', 'modulePosition' => 'bottom', 'parentPageId' => '', - 'position' => 0 , + 'position' => 0, 'group' => self::GROUP_VISITOR, 'targetBlank' => false, 'title' => 'Barre latérale avec menu', @@ -631,7 +687,7 @@ class init extends common { 'barRight' => '', 'displayMenu' => 'parents', 'hideMenuSide' => false, - 'hideMenuChildren' =>false, + 'hideMenuChildren' => false, 'extraPosition' => false, 'css' => '', 'js' => '' @@ -691,7 +747,7 @@ class init extends common { 'extraPosition' => false, 'css' => '', 'js' => '' - ], + ], 'erreur403' => [ 'typeMenu' => 'text', 'iconUrl' => '', @@ -741,7 +797,7 @@ class init extends common { 'barRight' => '', 'displayMenu' => 'none', 'hideMenuSide' => false, - 'hideMenuChildren' =>false, + 'hideMenuChildren' => false, 'extraPosition' => false, 'css' => '', 'js' => '' @@ -857,7 +913,7 @@ class init extends common { 'beaux-paysages' => [ 'config' => [ 'name' => 'Beaux paysages', - 'directory' => self::FILE_DIR.'source/galerie/landscape', + 'directory' => self::FILE_DIR . 'source/galerie/landscape', 'homePicture' => 'iceberg.jpg', 'sort' => 'SORT_ASC', 'position' => 1 @@ -876,7 +932,7 @@ class init extends common { 'espace' => [ 'config' => [ 'name' => 'Espace', - 'directory' => self::FILE_DIR.'source/galerie/space', + 'directory' => self::FILE_DIR . 'source/galerie/space', 'homePicture' => 'nebula.jpg', 'sort' => 'SORT_ASC', 'position' => 2 @@ -903,7 +959,7 @@ class init extends common { 'thumbBorderColor' => 'rgba(221, 221, 221, 1)', 'thumbRadius' => '.3em', 'thumbShadows' => '1px 1px 10px', - 'thumbShadowsColor'=> 'rgba(125, 125, 125, 1)', + 'thumbShadowsColor' => 'rgba(125, 125, 125, 1)', 'legendHeight' => '.375em', 'legendAlign' => 'center', 'legendTextColor' => 'rgba(255, 255, 255, 1)', @@ -962,7 +1018,7 @@ class init extends common { 'metaDescription' => 'Zwii est un CMS sans base de données qui permet de créer et gérer facilement un site web sans aucune connaissance en programmation.', 'title' => 'Votre site en quelques clics !' ] - ]; + ]; public static $siteContent = [ 'accueil' => [ @@ -979,7 +1035,7 @@ class init extends common {

Principium autem unde latius se funditabat, emersit ex negotio tali. Chilo ex vicario et coniux eius Maxima nomine, questi apud Olybrium ea tempestate urbi praefectum, vitamque suam venenis petitam adseverantes inpetrarunt ut hi, quos suspectati sunt, ilico rapti conpingerentur in vincula, organarius Sericus et Asbolius palaestrita et aruspex Campensis.

' ], - 'privee'=> [ + 'privee' => [ 'content' => '

Cette page n\'est visible que des membres de votre site !

Eius populus ab incunabulis primis ad usque pueritiae tempus extremum, quod annis circumcluditur fere trecentis, circummurana pertulit bella, deinde aetatem ingressus adultam post multiplices bellorum aerumnas Alpes transcendit et fretum, in iuvenem erectus et virum ex omni plaga quam orbis ambit inmensus, reportavit laureas et triumphos, iamque vergens in senium et nomine solo aliquotiens vincens ad tranquilliora vitae discessit.

@@ -1067,7 +1123,7 @@ class init extends common {

Pour toute question relative à l’application des présentes CGU, vous pouvez joindre l’éditeur aux coordonnées inscrites à l’ARTICLE 1.

' ], 'erreur302' => [ - 'content' =>'

Notre site est actuellement en maintenance. Nous sommes désolés pour la gêne occasionnée et faisons notre possible pour être rapidement de retour.

+ 'content' => '

Notre site est actuellement en maintenance. Nous sommes désolés pour la gêne occasionnée et faisons notre possible pour être rapidement de retour.

Administration
' ], 'erreur403' => [ diff --git a/core/module/translate/translate.php b/core/module/translate/translate.php index 13fa7810..4e972af5 100644 --- a/core/module/translate/translate.php +++ b/core/module/translate/translate.php @@ -130,11 +130,11 @@ class translate extends common // tableau des langues installées if (is_dir(self::DATA_DIR . $key)) { if (self::$i18nUI === $key) { - $message = helper::translate('Langue par défaut'); + $message = helper::translate('Langue par défaut'); } elseif (isset($_COOKIE['ZWII_CONTENT']) && $_COOKIE['ZWII_CONTENT'] === $key) { $message = helper::translate('Langue du site sélectionnée'); } else { - $message = ''; + $message = ''; } self::$languagesInstalled[] = [ template::flag($key, '20 %'), @@ -156,7 +156,7 @@ class translate extends common } // Activation du bouton de copie self::$siteCopy = count(self::$languagesInstalled) > 1 ? false : true; - + // Onglet des langues de l'interface if (is_dir(self::I18N_DIR)) { $dir = getcwd(); @@ -164,7 +164,7 @@ class translate extends common $files = glob('*.json'); chdir($dir); } - + // Construit le tableau des langues de l'UI foreach ($files as $file) { // La langue est-elle référencée ? @@ -207,30 +207,11 @@ class translate extends common // Création du contenu $lang = $this->getInput('translateAddContent'); - // Tableau avec les données vierges - require_once('core/module/install/ressource/defaultdata.php'); - - // Créer la structure - foreach (['page', 'module', 'locale'] as $key) { - - // Sus-dossier localisé - if (!file_exists(self::DATA_DIR . $lang)) { - mkdir(self::DATA_DIR . $lang, 0755); - } - - // Initialiser la classe - $db = new \Prowebcraft\JsonDb([ - 'name' => $key . '.json', - 'dir' => self::DATA_DIR . $lang, - 'backup' => file_exists('site/data/.backup') - ]);; - - // Capturer et sauver - $db->set($key, init::$defaultData[$key]); - $db->save; + // Stockage dans un sous-dossier localisé + if (!file_exists(self::DATA_DIR . $lang)) { + mkdir(self::DATA_DIR . $lang, 0755); } - // Valeurs en sortie $this->addOutput([ 'redirect' => helper::baseUrl() . 'translate', diff --git a/core/module/translate/view/index/index.php b/core/module/translate/view/index/index.php index 8c8006f5..0575e60c 100644 --- a/core/module/translate/view/index/index.php +++ b/core/module/translate/view/index/index.php @@ -17,6 +17,15 @@ ]);*/ ?>
+ helper::baseUrl() . 'translate/copy', + 'value' => template::ico('docs'), + 'disabled' => $module::$siteCopy, + 'help' => 'Copie de contenus localisés' + ]); ?> + +
+
helper::baseUrl() . 'translate/add', 'value' => template::ico('plus'), @@ -24,18 +33,10 @@ 'help' => 'Nouveau contenu localisé' ]); ?>
-
- helper::baseUrl() . 'translate/copy', - 'value' => template::ico('docs'), - 'disabled' => $module::$siteCopy, - 'help' => 'Copie de contenus localisés' - ]); ?> -
- 'Site', 'class' => 'buttonTab' ]); ?>