Mercurial > pidgin.yaz
changeset 28451:18e361e0a3ec
merge of 'b09ff62192fe7c44793b7aebbae3814fb649671d'
and 'f1167f906624ca218b6fd2a39b10be205ca99892'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Wed, 26 Aug 2009 05:56:20 +0000 |
| parents | 7a211be81a6b (current diff) 1b534812157d (diff) |
| children | 336d03cdced6 c9c038529f38 268b821de5c5 |
| files | |
| diffstat | 1 files changed, 15 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/win32/nsis/pidgin-installer.nsi Wed Aug 26 05:55:25 2009 +0000 +++ b/pidgin/win32/nsis/pidgin-installer.nsi Wed Aug 26 05:56:20 2009 +0000 @@ -12,6 +12,7 @@ Var ISSILENT Var STARTUP_RUN_KEY Var SPELLCHECK_SEL +Var LANGUAGE_SET ;-------------------------------- ;Configuration @@ -74,7 +75,7 @@ !define PERL_REG_KEY "SOFTWARE\Perl" !define PERL_DLL "perl510.dll" !define GTK_DEFAULT_INSTALL_PATH "$COMMONFILES\GTK\2.0" -!define GTK_RUNTIME_INSTALLER "..\..\..\..\gtk_installer\gtk-runtime*.exe" +!define GTK_RUNTIME_INSTALLER "..\..\..\..\gtk_installer\gtk-runtime-${GTK_INSTALL_VERSION}*.exe" !define ASPELL_REG_KEY "SOFTWARE\Aspell" !define DOWNLOADER_URL "http://pidgin.im/win32/download_redir.php" @@ -1341,10 +1342,12 @@ IfSilent 0 +2 StrCpy $ISSILENT "/NOUI" + StrCpy $LANGUAGE_SET "0" ClearErrors ${GetOptions} "$R3" "/L=" $R1 IfErrors +3 StrCpy $LANGUAGE $R1 + StrCpy $LANGUAGE_SET "1" Goto skip_lang ; Select Language @@ -1407,6 +1410,17 @@ Pop $R0 FunctionEnd +Function .onInstSuccess + ; NSIS doesn't appear to save the language when in Silent Mode, so we do so manually + IfSilent 0 done + + StrCmp $LANGUAGE_SET "0" done + + WriteRegStr "${MUI_LANGDLL_REGISTRY_ROOT}" "${MUI_LANGDLL_REGISTRY_KEY}" "${MUI_LANGDLL_REGISTRY_VALUENAME}" $LANGUAGE + + done: +FunctionEnd + Function un.onInit Call un.RunCheck StrCpy $name "Pidgin ${PIDGIN_VERSION}"