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

no error when unused uninst license/directory page strings do not exist

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2974 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
joostverburg 2003-09-27 22:41:52 +00:00
parent 68ad250c77
commit 2508cbce0c
1 changed files with 27 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

34
Contrib/Modern UI/System.nsh
View file

@ -2129,6 +2129,26 @@ Var MUI_TEMP2
!undef "${NAME}"
!endif
!macroend
!macro MUI_LANGUAGEFILE_UNLANGSTRING_PAGE_NOTREQUIRED PAGE NAME
!ifdef "${NAME}"
!ifdef MUI_UNINSTALLER
!ifdef MUI_UN${PAGE}PAGE
LangString "${NAME}" 0 "${${NAME}}"
!undef "${NAME}"
!else
!undef "${NAME}"
!endif
!else
!undef "${NAME}"
!endif
!else
!ifdef MUI_UN${PAGE}PAGE
!error "The ${LANGUAGE} Modern UI language file does not support the uninstaller ${PAGE} page"
!endif
!endif
!macroend
@ -2247,22 +2267,22 @@ Var MUI_TEMP2
!insertmacro MUI_LANGUAGEFILE_UNLANGSTRING_PAGE CONFIRM "MUI_UNTEXT_CONFIRM_TITLE"
!insertmacro MUI_LANGUAGEFILE_UNLANGSTRING_PAGE CONFIRM "MUI_UNTEXT_CONFIRM_SUBTITLE"
!insertmacro MUI_LANGUAGEFILE_UNLANGSTRING_PAGE LICENSE "MUI_UNTEXT_LICENSE_TITLE"
!insertmacro MUI_LANGUAGEFILE_UNLANGSTRING_PAGE LICENSE "MUI_UNTEXT_LICENSE_SUBTITLE"
!insertmacro MUI_LANGUAGEFILE_UNLANGSTRING_PAGE_NOTREQUIRED LICENSE "MUI_UNTEXT_LICENSE_TITLE"
!insertmacro MUI_LANGUAGEFILE_UNLANGSTRING_PAGE_NOTREQUIRED LICENSE "MUI_UNTEXT_LICENSE_SUBTITLE"
!ifndef MUI_LICENSEPAGE
!insertmacro MUI_LANGUAGEFILE_UNLANGSTRING "MUI_INNERTEXT_LICENSE_TOP"
!else
!undef MUI_INNERTEXT_LICENSE_TOP
!endif
!insertmacro MUI_LANGUAGEFILE_UNLANGSTRING_PAGE LICENSE "MUI_UNINNERTEXT_LICENSE_BOTTOM"
!insertmacro MUI_LANGUAGEFILE_UNLANGSTRING_PAGE LICENSE "MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX"
!insertmacro MUI_LANGUAGEFILE_UNLANGSTRING_PAGE LICENSE "MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS"
!insertmacro MUI_LANGUAGEFILE_UNLANGSTRING_PAGE_NOTREQUIRED LICENSE "MUI_UNINNERTEXT_LICENSE_BOTTOM"
!insertmacro MUI_LANGUAGEFILE_UNLANGSTRING_PAGE_NOTREQUIRED LICENSE "MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX"
!insertmacro MUI_LANGUAGEFILE_UNLANGSTRING_PAGE_NOTREQUIRED LICENSE "MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS"
!insertmacro MUI_LANGUAGEFILE_UNLANGSTRING_PAGE COMPONENTS "MUI_UNTEXT_COMPONENTS_TITLE"
!insertmacro MUI_LANGUAGEFILE_UNLANGSTRING_PAGE COMPONENTS "MUI_UNTEXT_COMPONENTS_SUBTITLE"
!insertmacro MUI_LANGUAGEFILE_UNLANGSTRING_PAGE DIRECTORY "MUI_UNTEXT_DIRECTORY_TITLE"
!insertmacro MUI_LANGUAGEFILE_UNLANGSTRING_PAGE DIRECTORY "MUI_UNTEXT_DIRECTORY_SUBTITLE"
!insertmacro MUI_LANGUAGEFILE_UNLANGSTRING_PAGE_NOTREQUIRED DIRECTORY "MUI_UNTEXT_DIRECTORY_TITLE"
!insertmacro MUI_LANGUAGEFILE_UNLANGSTRING_PAGE_NOTREQUIRED DIRECTORY "MUI_UNTEXT_DIRECTORY_SUBTITLE"
!insertmacro MUI_LANGUAGEFILE_UNLANGSTRING "MUI_UNTEXT_FINISH_TITLE"
!insertmacro MUI_LANGUAGEFILE_UNLANGSTRING "MUI_UNTEXT_FINISH_SUBTITLE"