From d9b296019a464e9922fd24402fe31425a1b99518 Mon Sep 17 00:00:00 2001 From: kichik Date: Wed, 21 Aug 2002 20:41:11 +0000 Subject: [PATCH] Now uses the default language in .onInit git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@714 212acab6-be3b-0410-9dea-997c60f758d6 --- Source/exehead/Ui.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Source/exehead/Ui.c b/Source/exehead/Ui.c index 4038e435..76d4dfa0 100644 --- a/Source/exehead/Ui.c +++ b/Source/exehead/Ui.c @@ -324,9 +324,6 @@ int NSISCALL ui_doinstall(void) #endif//NSIS_SUPPORT_BGBG #ifdef NSIS_SUPPORT_CODECALLBACKS g_hwnd=h; - wsprintf(state_language, "%u", GetUserDefaultLangID()); - if (ExecuteCodeSegment(g_inst_entry,g_inst_cmnheader->code_onInit,NULL)) return 1; - g_hwnd=NULL; { // Added by Amir Szekely 3rd August 2002 // Multilingual support @@ -343,6 +340,13 @@ int NSISCALL ui_doinstall(void) size=num*sizeof(installer_strings); cur_install_strings_table=install_strings_tables=(char *)GlobalAlloc(GPTR,size); GetCompressedDataFromDataBlockToMemory(g_inst_header->common.inst_str_tables,install_strings_tables,size); + + process_string_from_lang(g_caption,LANGID_CAPTION); + + wsprintf(state_language, "%u", GetUserDefaultLangID()); + if (ExecuteCodeSegment(g_inst_entry,g_inst_cmnheader->code_onInit,NULL)) return 1; + g_hwnd=NULL; + lang_again: for (size = 0; size < num; size++) { if (!((user_lang ^ common_strings_tables[size].lang_id) & lang_mask)) {