Quickmenu: improve language detection

diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc
index 9dcbbd2a1d6ea2530bfdc857a6f4e411961d067a..d1b49b739280ee8699a689c23d9cff3112c83286 100644 (file)
--- 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 4b07b9935029d6221ab962b1622f3c4b528f1ced..a78611ee740b61f41fe569142e2ccbe302dd225e 100644 (file)
--- 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()
 {