ZwiiCMS-Team/ZwiiCMS
ZwiiCMS-Team
/
ZwiiCMS
3
3
Fork 2
Code Releases 143 Activity

test update language in config

This commit is contained in:
Fred Tempez 2023-08-27 22:56:07 +02:00
parent 49e0379cfd
commit 75ee6d3691
2 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/module/config/config.php
View File

@ -588,6 +588,22 @@ class config extends common
self::$updateButtonText = helper::translate('Mettre à jour');
}
/**
* Met à jour les dictionnaires des langues depuis les nouveaux modèles installés car ne fonctionne pas dans install update
*/
require_once('core/module/install/ressource/defaultdata.php');
$installedLanguages = $this->getData(['language']);
$defaultLanguages = init::$defaultData['language'];
foreach ($installedLanguages as $key => $value) {
if (
isset($defaultLanguages[$key]['version']) &&
$defaultLanguages[$key]['version'] > $value['version']
) {
copy('core/module/install/ressource/i18n/' . $key . '.json', self::I18N_DIR . $key . '.json');
$this->setData(['language', $key, $defaultLanguages[$key]]);
}
}
// Sélecteur de délais, compléter avec la traduction en jours
foreach (self::$updateDelay as $key => $value) {
self::$updateDelay[$key] = $key === 86400 ? $value . ' ' . helper::translate('jour') : $value . ' ' . helper::translate('jours');
@ -616,7 +632,7 @@ class config extends common
$typeMime = 'png';
break;
default:
$typeMime = image_type_to_mime_type($typeMime);
$typeMime = image_type_to_mime_type($typeMime);
}
self::$imageOpenGraph['type'] = $typeMime;
$imageSize = getimagesize($imagePath);

17
core/module/install/install.php
View File

@ -419,23 +419,6 @@ class install extends common
}
}
/**
* Met à jour les dictionnaires des langues depuis les nouveaux modèles installés
*/
require_once('core/module/install/ressource/defaultdata.php');
$installedLanguages = $this->getData(['language']);
$defaultLanguages = init::$defaultData['language'];
foreach ($installedLanguages as $key => $value) {
if (
isset($defaultLanguages[$key]['version']) &&
$defaultLanguages[$key]['version'] > $value['version']
) {
copy('core/module/install/ressource/i18n/' . $key . '.json', self::I18N_DIR . $key . '.json');
$this->setData(['language', $key, $defaultLanguages[$key]]);
}
}
die();
// Valeurs en sortie
$this->addOutput([
'display' => self::DISPLAY_JSON,