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

fr_FR par défaut

Browse Source
This commit is contained in:
Fred Tempez 2022-09-24 18:06:32 +02:00
parent ce60948d8d
commit f1eb8e821a
8 changed files with 20 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/class/template.class.php
View File

@ -482,7 +482,7 @@ class template {
case '':
$lang = 'fr';
break;
case in_array($langId,['fr', 'de', 'en', 'es', 'it', 'nl', 'pt']):
case in_array($langId,['fr_FR', 'de', 'en', 'es', 'it', 'nl', 'pt']):
$lang = $langId;
break;
case 'site':
@ -490,7 +490,7 @@ class template {
) {
$lang = $_COOKIE['ZWII_I18N_SITE'];
} else {
$lang = 'fr';
$lang = 'fr_FR';
}
}
return '<img class="flag" src="' . helper::baseUrl(false) . 'core/vendor/i18n/png/' . $lang . '.png"

2
core/include/update.inc.php
View File

@ -908,7 +908,7 @@ if ($this->getData(['core', 'dataVersion']) < 11600) {
unlink('core/vendor/i18n/translation.js');
}
// Langue de l'interface
$this->setData(['config', 'i18n', 'interface', 'fr']);
$this->setData(['config', 'i18n', 'interface', 'fr_FR']);
// Mise à jour
$this->setData(['core', 'dataVersion', 11600]);

10
core/module/install/ressource/defaultdata.php
View File

@ -42,14 +42,8 @@ class init extends common {
'redirectLogin' => true
],
'i18n' => [
'interface' => 'fr',
'fr'=> 'none',
'de'=> 'none',
'en'=> 'none',
'es'=> 'none',
'it'=> 'none',
'nl'=> 'none',
'pt'=> 'none'
'interface' => 'fr_FR',
'content' => []
]
],
'core' => [

2
core/module/plugin/plugin.php
View File

@ -410,7 +410,7 @@ class plugin extends common {
// Tableau des langues rédigées
foreach (self::$languagesUI as $key => $value) {
if ($this->getData(['config','i18n', $key]) === 'site' ||
$key === 'fr') {
$key === 'fr_FR') {
$i18nSites[$key] = $value;
}
}

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

@ -106,7 +106,7 @@ class translate extends common {
if($this->isPost()) {
// Edition des langues
foreach (self::$languagesUI as $keyi18n => $value) {
if ($keyi18n === 'fr') continue;
if ($keyi18n === 'fr_FR') continue;
// Effacement d'une langue installée
if ( is_dir( self::DATA_DIR . $keyi18n ) === true
@ -125,6 +125,7 @@ class translate extends common {
}
// Enregistrement des données
/*
$this->setData(['config','i18n', [
'fr' => $this->getInput('translateFR'),
'de' => $this->getInput('translateDE'),
@ -133,10 +134,10 @@ class translate extends common {
'it' => $this->getInput('translateIT'),
'nl' => $this->getInput('translateNL'),
'pt' => $this->getInput('translatePT')
]]);
*/
// Coonfiguration dans des langues spécifiques
// Configuration dans des langues spécifiques
// Eviter déconnexion automatique après son activation
if ( $this->getData(['config','connect', 'autoDisconnect']) === false
AND $this->getInput('configAutoDisconnect',helper::FILTER_BOOLEAN) === true ) {
@ -181,14 +182,14 @@ class translate extends common {
]);
// Sauvegarder les langues de contenu
$this->setData(['config', 'i18n', [
'interface' => $this->getInput('translateUI'),
'interface' => $this->getInput('translateUI'),/*
'fr' => $this->getInput('translateFR'),
'de' => $this->getInput('translateDE'),
'en' => $this->getInput('translateEN'),
'es' => $this->getInput('translateES'),
'it' => $this->getInput('translateIT'),
'nl' => $this->getInput('translateNL'),
'pt' => $this->getInput('translatePT')
'pt' => $this->getInput('translatePT')*/
]]);
// Valeurs en sortie
@ -200,7 +201,7 @@ class translate extends common {
}
// Préparation de l'affichage du formulaire
//-----------------------------------------
// Liste des langues disponibles
if (is_dir(self::I18N_DIR)) {
$dir = getcwd();
@ -224,7 +225,7 @@ class translate extends common {
'site' => 'Traduction rédigée',
'delete' => 'Supprimer la traduction'
];
self::$siteTranslate = $key !== 'fr' ? false : true;
self::$siteTranslate = $key !== 'fr_FR' ? false : true;
} else {
self::$translateOptions [$key] = [
'none' => 'Drapeau masqué',

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

@ -31,11 +31,11 @@
<div class="tab">
<?php echo template::button('translateUiButton', [
'value' => 'Interface',
'value' => 'Langue de l\'interface',
'class' => 'buttonTab'
]); ?>
<?php echo template::button('translateContentButton', [
'value' => 'Contenu du site',
'value' => 'Langues du contenu',
'class' => 'buttonTab'
]); ?>

4
site/i18n/es.json
View File

@ -325,8 +325,8 @@
"Gestion": "Administrar",
"Administration": "Administración",
"Multilangues": "",
"Interface": "",
"Contenu du site": "",
"Langue de l'interface": "",
"Langues du contenu": "",
"Traductions installées": "",
"Langue de l'administration": "",
"Langues installées": "",

4
site/i18n/fr_FR.json
View File

@ -325,8 +325,8 @@
"Gestion": "",
"Administration": "",
"Multilangues": "",
"Interface": "",
"Contenu du site": "",
"Langue de l'interface": "",
"Langues du contenu": "",
"Traductions installées": "",
"Langue de l'administration": "",
"Langues installées": "",