Skip to content

Commit fd7e34b

Browse files
committed
1.0.84 release
1 parent e85c027 commit fd7e34b

File tree

5 files changed

+23
-10
lines changed

5 files changed

+23
-10
lines changed

.github/ISSUE_TEMPLATE/issue_template.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ body:
2121
attributes:
2222
label: Ventoy Version
2323
description: What version of ventoy are you running?
24-
placeholder: 1.0.83
24+
placeholder: 1.0.84
2525
validations:
2626
required: true
2727
- type: dropdown

GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_cmd.c

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6177,12 +6177,21 @@ static grub_err_t ventoy_cmd_fs_ignore_case(grub_extcmd_context_t ctxt, int argc
61776177
return 0;
61786178
}
61796179

6180+
static grub_err_t ventoy_cmd_init_menu_lang(grub_extcmd_context_t ctxt, int argc, char **args)
6181+
{
6182+
(void)ctxt;
6183+
(void)argc;
6184+
6185+
ventoy_plugin_load_menu_lang(1, args[0]);
6186+
VENTOY_CMD_RETURN(0);
6187+
}
6188+
61806189
static grub_err_t ventoy_cmd_load_menu_lang(grub_extcmd_context_t ctxt, int argc, char **args)
61816190
{
61826191
(void)ctxt;
61836192
(void)argc;
61846193

6185-
ventoy_plugin_load_menu_lang(args[0]);
6194+
ventoy_plugin_load_menu_lang(0, args[0]);
61866195
VENTOY_CMD_RETURN(0);
61876196
}
61886197

@@ -6399,6 +6408,7 @@ static cmd_para ventoy_cmds[] =
63996408
{ "vt_limine_menu", ventoy_cmd_linux_limine_menu, 0, NULL, "", "", NULL },
64006409
{ "vt_secondary_recover_mode", ventoy_cmd_secondary_recover_mode, 0, NULL, "", "", NULL },
64016410
{ "vt_load_menu_lang", ventoy_cmd_load_menu_lang, 0, NULL, "", "", NULL },
6411+
{ "vt_init_menu_lang", ventoy_cmd_init_menu_lang, 0, NULL, "", "", NULL },
64026412
{ "vt_cur_menu_lang", ventoy_cmd_cur_menu_lang, 0, NULL, "", "", NULL },
64036413
};
64046414

GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_def.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1261,7 +1261,7 @@ grub_err_t ventoy_cmd_browser_disk(grub_extcmd_context_t ctxt, int argc, char **
12611261
int ventoy_get_fs_type(const char *fs);
12621262
int ventoy_img_name_valid(const char *filename, grub_size_t namelen);
12631263
void * ventoy_alloc_chain(grub_size_t size);
1264-
int ventoy_plugin_load_menu_lang(const char *lang);
1264+
int ventoy_plugin_load_menu_lang(int init, const char *lang);
12651265
const char *ventoy_get_vmenu_title(const char *vMenu);
12661266
grub_err_t ventoy_cmd_cur_menu_lang(grub_extcmd_context_t ctxt, int argc, char **args);
12671267
extern int ventoy_menu_push_key(int code);

GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_plugin.c

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3474,7 +3474,7 @@ const char *ventoy_get_vmenu_title(const char *vMenu)
34743474
return vtoy_json_get_string_ex(g_menu_lang_json->pstChild, vMenu);
34753475
}
34763476

3477-
int ventoy_plugin_load_menu_lang(const char *lang)
3477+
int ventoy_plugin_load_menu_lang(int init, const char *lang)
34783478
{
34793479
int ret = 1;
34803480
grub_file_t file = NULL;
@@ -3528,9 +3528,12 @@ int ventoy_plugin_load_menu_lang(const char *lang)
35283528
grub_snprintf(g_ventoy_hotkey_tip, sizeof(g_ventoy_hotkey_tip), "%s", ventoy_get_vmenu_title("VTMENU_STR_HOTKEY_LIST"));
35293529
}
35303530

3531-
ventoy_menu_push_key(GRUB_TERM_ESC);
3532-
ventoy_menu_push_key(GRUB_TERM_ESC);
3533-
g_ventoy_menu_refresh = 1;
3531+
if (init == 0)
3532+
{
3533+
ventoy_menu_push_key(GRUB_TERM_ESC);
3534+
ventoy_menu_push_key(GRUB_TERM_ESC);
3535+
g_ventoy_menu_refresh = 1;
3536+
}
35343537
ret = 0;
35353538

35363539
end:

INSTALL/grub/grub.cfg

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2354,7 +2354,7 @@ function img_unsupport_menuentry {
23542354
#############################################################
23552355
#############################################################
23562356

2357-
set VENTOY_VERSION="1.0.83"
2357+
set VENTOY_VERSION="1.0.84"
23582358

23592359
#ACPI not compatible with Window7/8, so disable by default
23602360
set VTOY_PARAM_NO_ACPI=1
@@ -2457,9 +2457,9 @@ else
24572457
fi
24582458

24592459
if [ -n "$VTOY_MENU_LANGUAGE" ]; then
2460-
vt_load_menu_lang "$VTOY_MENU_LANGUAGE"
2460+
vt_init_menu_lang "$VTOY_MENU_LANGUAGE"
24612461
else
2462-
vt_load_menu_lang en_US
2462+
vt_init_menu_lang en_US
24632463
fi
24642464

24652465
if [ -n "$VTOY_MENU_TIMEOUT" ]; then

0 commit comments

Comments
 (0)