From e45faed6845419be3c0dc39b3866a93dc9642bd4 Mon Sep 17 00:00:00 2001 From: terencehill Date: Wed, 17 Mar 2021 15:11:30 +0100 Subject: [PATCH] Don't translate menu_cmd commands list (uninteresting commands for players and inconsistent with other untranslatable command lists) and a few warning messages --- qcsrc/common/command/generic.qc | 2 +- qcsrc/common/notifications/all.qh | 2 +- qcsrc/common/turrets/all.qh | 2 +- qcsrc/common/weapons/all.qh | 2 +- qcsrc/menu/command/menu_cmd.qc | 15 ++++++++------- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/qcsrc/common/command/generic.qc b/qcsrc/common/command/generic.qc index 5e339e85c..929d37653 100644 --- a/qcsrc/common/command/generic.qc +++ b/qcsrc/common/command/generic.qc @@ -409,7 +409,7 @@ void GenericCommand_restartnotifs(int request) Destroy_All_Notifications(); CALL_ACCUMULATED_FUNCTION(RegisterNotifications); #else - LOG_INFO(_("Notification restart command only works with cl_cmd and sv_cmd.")); + LOG_INFO("Notification restart command only works with cl_cmd and sv_cmd."); #endif return; } diff --git a/qcsrc/common/notifications/all.qh b/qcsrc/common/notifications/all.qh index 0c23677ca..5a7b0af0f 100644 --- a/qcsrc/common/notifications/all.qh +++ b/qcsrc/common/notifications/all.qh @@ -193,7 +193,7 @@ GENERIC_COMMAND(dumpnotifs, "Dump all notifications into " DEFAULT_FILENAME, fal LOG_INFOF("^1Error: ^7Could not open file '%s'!", filename); } #else - LOG_INFO(_("Notification dump command only works with cl_cmd and sv_cmd.")); + LOG_INFO("Notification dump command only works with cl_cmd and sv_cmd."); #endif return; } diff --git a/qcsrc/common/turrets/all.qh b/qcsrc/common/turrets/all.qh index ea3b0e31e..5bebc285d 100644 --- a/qcsrc/common/turrets/all.qh +++ b/qcsrc/common/turrets/all.qh @@ -94,7 +94,7 @@ GENERIC_COMMAND(dumpturrets, "Dump all turrets into " DEFAULT_FILENAME, false) LOG_INFOF("^1Error: ^7Could not open file '%s'!", filename); } #else - LOG_INFO(_("Turrets dump command only works with sv_cmd.")); + LOG_INFO("Turrets dump command only works with sv_cmd."); #endif return; } diff --git a/qcsrc/common/weapons/all.qh b/qcsrc/common/weapons/all.qh index 88a79224f..24057a0b8 100644 --- a/qcsrc/common/weapons/all.qh +++ b/qcsrc/common/weapons/all.qh @@ -76,7 +76,7 @@ GENERIC_COMMAND(dumpweapons, "Dump all turrets into " DEFAULT_FILENAME, false) / LOG_INFOF("^1Error: ^7Could not open file '%s'!", filename); } #else - LOG_INFO(_("Weapons dump command only works with sv_cmd.")); + LOG_INFO("Weapons dump command only works with sv_cmd."); #endif return; } diff --git a/qcsrc/menu/command/menu_cmd.qc b/qcsrc/menu/command/menu_cmd.qc index 4da853bd5..c4593e87a 100644 --- a/qcsrc/menu/command/menu_cmd.qc +++ b/qcsrc/menu/command/menu_cmd.qc @@ -43,13 +43,14 @@ void GameCommand(string theCommand) int argc = tokenize_console(theCommand); string ss = strtolower(argv(0)); + // TODO port these commands to the command system if (argv(0) == "help" || argc == 0) { - LOG_HELP(_("Usage:^3 menu_cmd [], where possible commands are:")); - LOG_HELP(_(" 'sync' reloads all cvars on the current menu page")); - LOG_HELP(_(" 'directmenu' shows the menu window named (or the menu window containing an item named )")); - LOG_HELP(_(" if is not specified it shows the list of available items in the console")); - LOG_HELP(_(" 'dumptree' dumps the state of the menu as a tree to the console")); + LOG_HELP("Usage:^3 menu_cmd [], where possible commands are:"); + LOG_HELP(" 'sync' reloads all cvars on the current menu page"); + LOG_HELP(" 'directmenu' shows the menu window named (or the menu window containing an item named )"); + LOG_HELP(" if is not specified it shows the list of available items in the console"); + LOG_HELP(" 'dumptree' dumps the state of the menu as a tree to the console"); LOG_HELP("\nGeneric commands shared by all programs:"); GenericCommand_macro_help(); @@ -78,7 +79,7 @@ void GameCommand(string theCommand) if (argc == 1) { - LOG_HELP(_("Available items:")); + LOG_HELP("Available items:"); FOREACH_ENTITY_ORDERED(it.name != "", { if (it.classname == "vtbl") continue; @@ -127,5 +128,5 @@ void GameCommand(string theCommand) if(MUTATOR_CALLHOOK(Menu_ConsoleCommand, ss, argc, theCommand)) // handled by a mutator return; - LOG_INFO(_("Invalid command. For a list of supported commands, try menu_cmd help.")); + LOG_INFO("Invalid command. For a list of supported commands, try menu_cmd help."); } -- 2.39.2