3.8

RevoIDE · Apr 17, 2023 · 6a6ef5e · 6a6ef5e
1 parent 7f4ddc0
commit 6a6ef5e
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 145 deletions.
diff --git a/en_flora.cpp_avx2.bat b/en_flora.cpp_avx2.bat
diff --git a/flora.cpp_avx2_uni.bat b/flora.cpp_avx2_uni.bat
@@ -10,6 +10,7 @@ if not exist "settings.json" (
         echo downloading...
         powershell -Command "Invoke-WebRequest 'http://view.florahub.fr/models/settings.json' -OutFile 'settings.json'"
 	    echo download complete
+        echo -----------------------------------------
     )
 
     set "json_file=settings.json"
@@ -19,16 +20,28 @@ if not exist "settings.json" (
     for /f "tokens=2 delims=:," %%a in ('type "%json_file%" ^| findstr /c:"lang"') do set "lang=%%a"
 
     if %lang%=="en" (
-        echo  the selected language is English
+        echo the selected language is English
         set json_lang_file=lang\en.json
     ) else if %lang%=="fr" (
-        echo  la langue sélectionnée est le français
+        echo la langue sélectionnée est le français
         set json_lang_file=lang\fr.json
     ) else (
-        echo  an error occurred
+        echo an error occurred
         set json_lang_file=lang\en.json
     )
 
+    set "lang_folder=lang"
+
+    if not exist "%cd%\%lang_folder%" (
+        mkdir %lang_folder%
+        cd %lang_folder%
+        powershell -Command "Invoke-WebRequest 'http://view.florahub.fr/models/lang/en.json' -OutFile 'en.json'"
+        powershell -Command "Invoke-WebRequest 'http://view.florahub.fr/models/lang/fr.json' -OutFile 'fr.json'"
+        echo download complete
+        cd ../
+        echo -----------------------------------------
+    )
+
     for /f "tokens=2 delims=:," %%a in ('type "%json_lang_file%" ^| findstr /c:sourcefiles') do set "lang_sourcefiles=%%~a"
     for /f "tokens=2 delims=:," %%a in ('type "%json_lang_file%" ^| findstr /c:download') do set "lang_download=%%a"
     for /f "tokens=2 delims=:," %%a in ('type "%json_lang_file%" ^| findstr /c:dezipping') do set "lang_dezipping=%%a"
@@ -64,7 +77,7 @@ if not exist "settings.json" (
         echo %lang_dezipping%
         powershell -command "Expand-Archive llama-master-3173a62-bin-win-avx2-x64.zip ."
         echo %lang_completed%
-        echo .
+        echo -----------------------------------------
     )
 
     echo %lang_model%
@@ -79,7 +92,7 @@ if not exist "settings.json" (
         echo %invalid_c%
         goto start
     )
-    cls
+    echo -----------------------------------------
 
     REM vérifie si le fichier existe déjà
     if not exist %MODEL% (

diff --git a/fr_flora.cpp_avx2.bat b/fr_flora.cpp_avx2.bat
diff --git a/lang/en.json b/lang/en.json
@@ -1,15 +1,15 @@
 {
-    "sourcefiles": "Source files do not exist",
-    "download":"Download...",
-    "dezipping": "decompressing...",
-    "completed": "finished",
-    "error": "An error has occurred", 
-    "model":"Please choose a model:",
-    "choice":"Choice",
-    "invalid_c" : "invalid",
-    "model_d": "The model is not present on your computer, downloading...",
-    "downloading_m":"Downloading the model...",
-    "download_c": "Download completed",
-    "sett_down": "'settings.json' is not present on your computer, Download...",
-    "download_sett":"Download settings..."
+    "sourcefiles" :"Source files do not exist",
+    "download" :"Download...",
+    "dezipping" :"decompressing...",
+    "completed" :"finished",
+    "error" :"An error has occurred", 
+    "model" :"Please choose a model:",
+    "choice" :"Choice ",
+    "invalid_c" :"invalid",
+    "model_d" :"The model is not present on your computer, downloading...",
+    "downloading_m" :"Downloading the model...",
+    "download_c" :"Download completed",
+    "sett_down" :"'settings.json' is not present on your computer, Download...",
+    "download_sett" :"Download settings..."
 }
diff --git a/lang/fr.json b/lang/fr.json
@@ -1,15 +1,15 @@
 {
-    "sourcefiles" : "Les fichiers sources n'existent pas",
-    "download" : "Téléchargement...",
-    "dezipping" : "Décompréssion...",
-    "completed" : "Terminé",
-    "error" : "Une erreur s'est produite",
-    "model" : "Veuillez choisir un modèle :",
-    "choice" : "Choix ",
-    "invalid_c" : "invalide",
-    "model_d" : "Le modèle n'est pas présent sur votre ordinateur, Téléchargement...",
-    "downloading_m" : "Téléchargement du modèle...",
-    "download_c" : "Téléchargement terminé",
-    "sett_down" : "'settings.json' n'est pas présent sur votre ordinateur, Téléchargement...",
-    "download_sett" : "Téléchargement des parametres..."
+    "sourcefiles" :"Les fichiers sources n'existent pas",
+    "download" :"Téléchargement...",
+    "dezipping" :"Décompréssion...",
+    "completed" :"Terminé",
+    "error" :"Une erreur s'est produite",
+    "model" :"Veuillez choisir un modèle :",
+    "choice" :"Choix ",
+    "invalid_c" :"invalide",
+    "model_d" :"Le modèle n'est pas présent sur votre ordinateur, Téléchargement...",
+    "downloading_m" :"Téléchargement du modèle...",
+    "download_c" :"Téléchargement terminé",
+    "sett_down" :"'settings.json' n'est pas présent sur votre ordinateur, Téléchargement...",
+    "download_sett" :"Téléchargement des parametres..."
 }