From 58db7a75fa1b40a52581335f35456cd1467d639d Mon Sep 17 00:00:00 2001
From: fredtempez <frederic.tempez@outlook.com>
Date: Sun, 6 Aug 2023 11:17:36 +0200
Subject: [PATCH] Language : branche v13

---
 core/core.php                     |  3 ---
 core/module/language/language.php | 18 ++++++++++++------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/core/core.php b/core/core.php
index e027c4a9..55af70f2 100644
--- a/core/core.php
+++ b/core/core.php
@@ -57,9 +57,6 @@ class common
 	const ZWII_UPDATE_URL = 'https://forge.chapril.org/ZwiiCMS-Team/update/raw/branch/master/';
 	const ZWII_UPDATE_CHANNEL = 'v13';
 
-	// URL langues de l'UI en ligne
-	const ZWII_UI_URL = 'https://forge.chapril.org/ZwiiCMS-Team/zwiicms-translations/raw/branch/master/';
-
 	// Valeurs possibles multiple de 10, 10 autorise 9 profils, 100 autorise 99 profils
 	const MAX_PROFILS = 10;
 
diff --git a/core/module/language/language.php b/core/module/language/language.php
index c4abf7f5..a0b8c29e 100644
--- a/core/module/language/language.php
+++ b/core/module/language/language.php
@@ -16,6 +16,11 @@
 class language extends common
 {
 
+		// URL langues de l'UI en ligne
+		const ZWII_UI_URL = 'https://forge.chapril.org/ZwiiCMS-Team/zwiicms-translations/raw/branch/master/';
+
+		const ZWII_UI_BRANCH = 'v13';
+
 	public static $actions = [
 		'index' => self::GROUP_ADMIN,
 		'copy' => self::GROUP_ADMIN,
@@ -88,14 +93,14 @@ class language extends common
 			}
 
 			// Télécharger le descripteur en ligne
-			$languageData = json_decode(helper::getUrlContents(common::ZWII_UI_URL . $lang . '.json'), true);
-			$descripteur = json_decode(helper::getUrlContents(common::ZWII_UI_URL . 'languages.json'), true);
+			$languageData = json_decode(helper::getUrlContents(self::ZWII_UI_URL . self::ZWII_UI_BRANCH . '/' . $lang . '.json'), true);
+			$descripteur = json_decode(helper::getUrlContents(self::ZWII_UI_URL . self::ZWII_UI_BRANCH . '/' . 'language.json'), true);
 			$response = false;
 			if (
 				is_array($languageData) &&
-				is_array($descripteur['languages'][$lang])
+				is_array($descripteur['language'][$lang])
 			) {
-				$response = $this->setData(['language', $lang, $descripteur['languages'][$lang]]);
+				$response = $this->setData(['language', $lang, $descripteur['language'][$lang]]);
 				$response = $response || file_put_contents(self::I18N_DIR . $lang . '.json', json_encode($response, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT));
 			}
 
@@ -239,8 +244,9 @@ class language extends common
 		}
 
 		// Langues disponibles en ligne
-		$storeUI = json_decode(helper::getUrlContents(common::ZWII_UI_URL . 'languages.json'), true);
-		$storeUI = $storeUI['languages'];
+		echo self::ZWII_UI_URL . self::ZWII_UI_BRANCH . '/language.json';
+		$storeUI = json_decode(helper::getUrlContents(self::ZWII_UI_URL . self::ZWII_UI_BRANCH . '/language.json'), true);
+		$storeUI = $storeUI['language'];
 
 		// Construction du tableau à partir des langues disponibles dans le store
 		foreach ($installedUI as $file => $value) {