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

Added MUI_LANGUAGEEX macro so language files in other folders can be used (during testing)

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6785 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2016-10-06 20:31:13 +00:00
parent a525a42a04
commit b4d51b196a
1 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Contrib/Modern UI 2/Localization.nsh
View file

@ -26,24 +26,22 @@ Localization
;-------------------------------- ;--------------------------------
;Include langauge files ;Include langauge files
!macro MUI_LANGUAGE NLFID !macro MUI_LANGUAGEEX LangDir NLFID
;Include a language !verbose push ${MUI_VERBOSE}
!verbose push
!verbose ${MUI_VERBOSE}
!ifndef MUI_PAGE_UNINSTALLER_PREFIX !ifndef MUI_PAGE_UNINSTALLER_PREFIX
!warning "MUI_LANGUAGE should be inserted after the MUI_[UN]PAGE_* macros" !warning "MUI_LANGUAGE[EX] should be inserted after the MUI_[UN]PAGE_* macros"
!endif !endif
!insertmacro MUI_INSERT !insertmacro MUI_INSERT
LoadLanguageFile "${NSISDIR}\Contrib\Language files\${NLFID}.nlf" ;Include a language
LoadLanguageFile "${LangDir}\${NLFID}.nlf"
;Include language file ;Include MUI language file
!insertmacro LANGFILE_INCLUDE_WITHDEFAULT \ !insertmacro LANGFILE_INCLUDE_WITHDEFAULT \
"${NSISDIR}\Contrib\Language files\${NLFID}.nsh" "${NSISDIR}\Contrib\Language files\English.nsh" "${LangDir}\${NLFID}.nsh" "${NSISDIR}\Contrib\Language files\English.nsh"
;Add language to list of languages for selection dialog ;Add language to list of languages for selection dialog
!define /ifndef MUI_LANGDLL_LANGUAGES "" !define /ifndef MUI_LANGDLL_LANGUAGES ""
@ -57,6 +55,16 @@ Localization
!macroend !macroend
!macro MUI_LANGUAGE NLFID
!verbose push ${MUI_VERBOSE}
!insertmacro MUI_LANGUAGEEX "${NSISDIR}\Contrib\Language files" "${NLFID}"
!verbose pop
!macroend
;-------------------------------- ;--------------------------------
;Language selection ;Language selection