From 07f93a958f884ddf4947dacfc4d504454f252f40 Mon Sep 17 00:00:00 2001 From: terencehill Date: Tue, 21 Jan 2014 11:27:18 +0100 Subject: [PATCH] Quickmenu: improve language detection --- qcsrc/client/Main.qc | 2 +- qcsrc/client/hud.qc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc index 9dcbbd2a1..d1b49b739 100644 --- a/qcsrc/client/Main.qc +++ b/qcsrc/client/Main.qc @@ -37,7 +37,7 @@ void WaypointSprite_Load(); void ConsoleCommand_macro_init(); void CSQC_Init(void) { - prvm_language = cvar_string("prvm_language"); + prvm_language = strzone(cvar_string("prvm_language")); #ifdef USE_FTE #pragma target ID __engine_check = checkextension("DP_SV_WRITEPICTURE"); diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index 4b07b9935..a78611ee7 100644 --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@ -4907,12 +4907,12 @@ void HUD_QuickMenu(void) // useful to Translate a string inside the Command #define QUICKMENU_ENTRY_TC(title,command,text,translated_text) \ - if(cvar_string("prvm_language") == "en") \ + if(prvm_language == "en") \ QUICKMENU_ENTRY(title, sprintf(command, text)) \ else if(!autocvar_hud_panel_quickmenu_translatecommands || translated_text == text) \ QUICKMENU_ENTRY(strcat("(en)", title), sprintf(command, text)) \ else \ - QUICKMENU_ENTRY(strcat("(", cvar_string("prvm_language"), ")", title), sprintf(command, translated_text)) + QUICKMENU_ENTRY(strcat("(", prvm_language, ")", title), sprintf(command, translated_text)) void HUD_QuickMenu_Load_DefaultEntries() { -- 2.39.2