dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

* New LangFile.nsh macro LANGFILE_INCLUDE_WITHDEFAULT to load language file with defaults being obtained from a default file. This replaces the LANGFILE_DEFAULT setting and makes it easier to use LangFile.nsh for multiple sets of languages file without having to care about the different LANGFILE_DEFAULT settings.

Browse source 
* Allow LangFile.nsh to be included multiple times.

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5577 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
joostverburg 2008-03-29 15:35:08 +00:00
parent 0d820475ae
commit f655226380
3 changed files with 48 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Contrib/Modern UI/System.nsh
View file

@ -2077,21 +2077,8 @@ Var MUI_TEMP2
LoadLanguageFile "${NSISDIR}\Contrib\Language files\${LANGUAGE}.nlf"
;Set default language file for MUI and backup user setting
!ifdef LANGFILE_DEFAULT
!define MUI_LANGFILE_DEFAULT_TEMP "${LANGFILE_DEFAULT}"
!undef LANGFILE_DEFAULT
!endif
!define LANGFILE_DEFAULT "${NSISDIR}\Contrib\Language files\English.nsh"
;Include language file
!insertmacro LANGFILE_INCLUDE "${NSISDIR}\Contrib\Language files\${LANGUAGE}.nsh"
;Restore user setting for default language file
!undef LANGFILE_DEFAULT
!ifdef MUI_LANGFILE_DEFAULT_TEMP
!define LANGFILE_DEFAULT "${MUI_LANGFILE_DEFAULT}"
!endif
!insertmacro LANGFILE_INCLUDE_WITHDEFAULT "${NSISDIR}\Contrib\Language files\${LANGUAGE}.nsh" "${NSISDIR}\Contrib\Language files\English.nsh"
;Add language to list of languages for selection dialog
!ifndef MUI_LANGDLL_LANGUAGES