From fd5ae4653687d035bb7607a970820fb37b11fd51 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Sun, 10 Mar 2019 12:09:50 +0000 Subject: [PATCH] Driver Install app: fix Russian language git-svn-id: svn://kolibrios.org@7590 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/cmm/drvinst/drvinst.c | 6 +++--- programs/cmm/lib/kolibri.h | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/programs/cmm/drvinst/drvinst.c b/programs/cmm/drvinst/drvinst.c index 7b95cf767c..a6069e221c 100644 --- a/programs/cmm/drvinst/drvinst.c +++ b/programs/cmm/drvinst/drvinst.c @@ -34,6 +34,7 @@ proc_info Form; #define T_ASSEPT_RISK "Ÿ ¯à¨­¨¬ î à¨áª" #define T_README "Readme" #define T_INSTALL "“áâ ­®¢¨âì" + char description_name[] = "description_ru"; #else #define WINDOW_TITLE "Driver Installer" #define T_CAUTION_TITLE "CAUTION" @@ -41,6 +42,7 @@ proc_info Form; #define T_ASSEPT_RISK "I accept the risk" #define T_README "Readme" #define T_INSTALL "Install" + char description_name[] = "description_en"; #endif #define BUTTON_ID_ASSEPT_RISK 10 @@ -180,10 +182,8 @@ void SelectList_LineChanged() void GetCurrentSectionData() { dword section_name = ini_sections.get(select_list.cur_y); - dword description_name; - if (GetSystemLanguage() == SYS_LANG_RUS) description_name = "description_ru"; else description_name = "description_en"; ini_get_str stdcall (#drvinf_path, section_name, "ver", #cur_version, sizeof(cur_version), 0); - ini_get_str stdcall (#drvinf_path, section_name, description_name, #cur_description, sizeof(cur_description), 0); + ini_get_str stdcall (#drvinf_path, section_name, #description_name, #cur_description, sizeof(cur_description), 0); ini_get_str stdcall (#drvinf_path, section_name, "readme", #cur_readme_path, sizeof(cur_readme_path), 0); ini_get_str stdcall (#drvinf_path, section_name, "install", #cur_install_path, sizeof(cur_install_path), 0); } diff --git a/programs/cmm/lib/kolibri.h b/programs/cmm/lib/kolibri.h index 4359bbd198..2ecdd24554 100644 --- a/programs/cmm/lib/kolibri.h +++ b/programs/cmm/lib/kolibri.h @@ -288,6 +288,7 @@ inline fastcall ExitProcess() //------------------------------------------------------------------------------ //eax = ÿçûê ñèñòåìû (1=eng, 2=fi, 3=ger, 4=rus) +///SYSFUNC DOESN'T WORK!!! => https://bit.ly/2XNdiTD #define SYS_LANG_ENG 1 #define SYS_LANG_FIN 2 #define SYS_LANG_GER 3