diff --git a/Contrib/Modern UI/Readme.html b/Contrib/Modern UI/Readme.html index 9df3165f..98384614 100644 --- a/Contrib/Modern UI/Readme.html +++ b/Contrib/Modern UI/Readme.html @@ -145,7 +145,7 @@ defines and define them again before you insert a language file.
!define MUI_CUSTOMPAGECOMMANDS ;Use customized pages4. Insert language files
Insert the Modern UI language files for the languages you are using:
-!include "${NSISDIR}\Contrib\Modern UI\Language files\English.nsh"+
!insertmacro MUI_LANGUAGE "English"
Note: The Modern UI language files load the NLF language files, so you should not use LoadLanguageFile.
5. Define interface settings (optional)
diff --git a/Contrib/Modern UI/System.nsh b/Contrib/Modern UI/System.nsh index 1e2dc159..67bf27de 100644 --- a/Contrib/Modern UI/System.nsh +++ b/Contrib/Modern UI/System.nsh @@ -317,6 +317,16 @@ !macroend +!macro MUI_LANGUAGE LANGUAGE + + !verbose 3 + + !include "${NSISDIR}\Contrib\Modern UI\Language files\${LANGUAGE}.nsh" + + !verbose 4 + +!macroend + ;-------------------------------- ;INSTALL OPTIONS diff --git a/Examples/Modern UI/Basic.nsi b/Examples/Modern UI/Basic.nsi index a08f3765..2cd538c0 100644 --- a/Examples/Modern UI/Basic.nsi +++ b/Examples/Modern UI/Basic.nsi @@ -19,7 +19,7 @@ !define MUI_UNINSTALLER ;Language - !include "${NSISDIR}\Contrib\Modern UI\Language files\English.nsh" + !insertmacro MUI_LANGUAGE "English" ;General OutFile "Basic.exe" diff --git a/Examples/Modern UI/InstallOptions.nsi b/Examples/Modern UI/InstallOptions.nsi index f7d3276d..85fcd956 100644 --- a/Examples/Modern UI/InstallOptions.nsi +++ b/Examples/Modern UI/InstallOptions.nsi @@ -26,7 +26,7 @@ !define TEMP2 $R1 ;Language - !include "${NSISDIR}\Contrib\Modern UI\Language files\English.nsh" + !insertmacro MUI_LANGUAGE "English" ;General OutFile "InstallOptions.exe" diff --git a/Examples/Modern UI/MultiLanguage.nsi b/Examples/Modern UI/MultiLanguage.nsi index 227fe253..97476197 100644 --- a/Examples/Modern UI/MultiLanguage.nsi +++ b/Examples/Modern UI/MultiLanguage.nsi @@ -19,20 +19,20 @@ !define MUI_UNINSTALLER ;Languages - !include "${NSISDIR}\Contrib\Modern UI\Language files\English.nsh" - !include "${NSISDIR}\Contrib\Modern UI\Language files\French.nsh" - !include "${NSISDIR}\Contrib\Modern UI\Language files\German.nsh" - !include "${NSISDIR}\Contrib\Modern UI\Language files\Spanish.nsh" - !include "${NSISDIR}\Contrib\Modern UI\Language files\SimpChinese.nsh" - !include "${NSISDIR}\Contrib\Modern UI\Language files\TradChinese.nsh" - !include "${NSISDIR}\Contrib\Modern UI\Language files\Japanese.nsh" - !include "${NSISDIR}\Contrib\Modern UI\Language files\Italian.nsh" - !include "${NSISDIR}\Contrib\Modern UI\Language files\Dutch.nsh" - !include "${NSISDIR}\Contrib\Modern UI\Language files\Polish.nsh" - !include "${NSISDIR}\Contrib\Modern UI\Language files\Greek.nsh" - !include "${NSISDIR}\Contrib\Modern UI\Language files\Russian.nsh" - !include "${NSISDIR}\Contrib\Modern UI\Language files\PortugueseBR.nsh" - !include "${NSISDIR}\Contrib\Modern UI\Language files\Ukrainian.nsh" + !insertmacro MUI_LANGUAGE "English" + !insertmacro MUI_LANGUAGE "French" + !insertmacro MUI_LANGUAGE "German" + !insertmacro MUI_LANGUAGE "Spanish" + !insertmacro MUI_LANGUAGE "SimpChinese" + !insertmacro MUI_LANGUAGE "TradChinese" + !insertmacro MUI_LANGUAGE "Japanese" + !insertmacro MUI_LANGUAGE "Italian" + !insertmacro MUI_LANGUAGE "Dutch" + !insertmacro MUI_LANGUAGE "Polish" + !insertmacro MUI_LANGUAGE "Greek" + !insertmacro MUI_LANGUAGE "Russian" + !insertmacro MUI_LANGUAGE "PortugueseBR" + !insertmacro MUI_LANGUAGE "Ukrainian" OutFile "MultiLanguage.exe"