1.0.83 release

e85c0275 · longpanda · c1d68bd7 · e85c0275 · e85c0275 · e85c0275
Commit e85c0275 authored Dec 04, 2022 by longpanda
12 changed files
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_plugin.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_plugin.c
@@ -2448,7 +2448,6 @@ grub_err_t ventoy_cmd_load_plugin(grub_extcmd_context_t ctxt, int argc, char **a
    int ret = 0;
    int offset = 0;
    char *buf = NULL;
-    const char *env = NULL;
    grub_uint8_t *code = NULL;
    grub_file_t file;
    VTOY_JSON *json = NULL;
@@ -2542,9 +2541,6 @@ grub_err_t ventoy_cmd_load_plugin(grub_extcmd_context_t ctxt, int argc, char **a
        grub_env_unset("VTOY_MENU_TIP_ENABLE");
    }

-    env = grub_env_get("VTOY_MENU_LANGUAGE");
-    ventoy_plugin_load_menu_lang(env ? env : "en_US");
-
    VENTOY_CMD_RETURN(GRUB_ERR_NONE);
 }


--- a/INSTALL/EFI/BOOT/BOOTIA32.EFI
+++ b/INSTALL/EFI/BOOT/BOOTIA32.EFI
--- a/INSTALL/EFI/BOOT/BOOTX64.EFI
+++ b/INSTALL/EFI/BOOT/BOOTX64.EFI
--- a/INSTALL/EFI/BOOT/MokManager.efi
+++ b/INSTALL/EFI/BOOT/MokManager.efi
--- a/INSTALL/EFI/BOOT/grub.efi
+++ b/INSTALL/EFI/BOOT/grub.efi
--- a/INSTALL/EFI/BOOT/mmx64.efi
+++ b/INSTALL/EFI/BOOT/mmx64.efi
--- a/INSTALL/grub/grub.cfg
+++ b/INSTALL/grub/grub.cfg
@@ -2456,6 +2456,11 @@ else
    vt_check_json_path_case $vtoy_iso_part
 fi

+if [ -n "$VTOY_MENU_LANGUAGE" ]; then
+    vt_load_menu_lang "$VTOY_MENU_LANGUAGE"
+else
+    vt_load_menu_lang en_US
+fi

 if [ -n "$VTOY_MENU_TIMEOUT" ]; then
    set timeout=$VTOY_MENU_TIMEOUT

--- a/INSTALL/ventoy_pack.sh
+++ b/INSTALL/ventoy_pack.sh
@@ -91,7 +91,8 @@ cd ../../
 #tar menu txt & update menulang.cfg
 cd $tmpmnt/grub/

-echo "menuentry \"zh_CN  -  Chinese Simplified ()\" --class=menu_lang_item --class=debug_menu_lang --class=F5tool {" >> menulang.cfg
+vtlangtitle=$(grep VTMENU_LANGUAGE_NAME menu/zh_CN.json | awk -F\" '{print $4}')
+echo "menuentry \"zh_CN  -  $vtlangtitle\" --class=menu_lang_item --class=debug_menu_lang --class=F5tool {" >> menulang.cfg
 echo "    vt_load_menu_lang zh_CN"  >> menulang.cfg
 echo "}"  >> menulang.cfg


--- a/Plugson/www/buildtime
+++ b/Plugson/www/buildtime
-20221117 18:12:12
\ No newline at end of file
+20221204 12:35:33
\ No newline at end of file
--- a/Plugson/www/helplist
+++ b/Plugson/www/helplist
-de_DEen_USfr_FRhi_HIhr_HRid_IDja_JPko_KRpt_PTsr_RStr_TRzh_CN
\ No newline at end of file
+bn_BNde_DEen_USfr_FRhi_HIhr_HRid_IDja_JPko_KRpt_PTru_RUsr_RStr_TRzh_CN
\ No newline at end of file
--- a/Plugson/www/index.html
+++ b/Plugson/www/index.html
@@ -757,7 +757,7 @@

        <footer class="main-footer">
            <div class="pull-right hidden-xs">
-                <b id="plugson_build_date">20221117 18:12:12</b>
+                <b id="plugson_build_date">20221204 12:35:33</b>
            </div>
            <strong><a href="https://www.ventoy.net" target="_blank">https://www.ventoy.net</a></strong>
        </footer>

--- a/Plugson/www/menulist
+++ b/Plugson/www/menulist
-de_DEen_USfr_FRhi_HIhr_HRid_IDja_JPko_KRpt_PTsr_RStr_TRzh_CN
\ No newline at end of file
+bn_BNde_DEen_USfr_FRhi_HIhr_HRid_IDja_JPko_KRpt_PTru_RUsr_RStr_TRzh_CN
\ No newline at end of file