From bce96b3872017087da81b4b25285e795178d2d1b Mon Sep 17 00:00:00 2001 From: kichik Date: Tue, 5 Jun 2007 18:37:41 +0000 Subject: [PATCH] renamed MUI_LANGDLL_SHOW_ALL_LANGUAGES to MUI_LANGDLL_ALLLANGUAGES to match the style of other defines git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5160 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/Modern UI/Readme.html | 2 +- Contrib/Modern UI/System.nsh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Contrib/Modern UI/Readme.html b/Contrib/Modern UI/Readme.html index 1f4bf7b0..ab72408e 100644 --- a/Contrib/Modern UI/Readme.html +++ b/Contrib/Modern UI/Readme.html @@ -978,7 +978,7 @@ The text to display on the language selection dialog.

Always show the language selection dialog, even if a language has been stored in the registry. The language stored in the registry will be selected by default.

-

MUI_LANGDLL_SHOW_ALL_LANGUAGES
+

MUI_LANGDLL_ALLLANGUAGES
Always show all available languages and don't filter according to their codepage.

diff --git a/Contrib/Modern UI/System.nsh b/Contrib/Modern UI/System.nsh index 74ee173a..f0225b0f 100644 --- a/Contrib/Modern UI/System.nsh +++ b/Contrib/Modern UI/System.nsh @@ -2066,7 +2066,7 @@ Var /GLOBAL MUI_TEMP2 !endif - !ifdef MUI_LANGDLL_SHOW_ALL_LANGUAGES + !ifdef MUI_LANGDLL_ALLLANGUAGES LangDLL::LangDialog "${MUI_LANGDLL_WINDOWTITLE}" "${MUI_LANGDLL_INFO}" A ${MUI_LANGDLL_PUSHLIST} "" !else LangDLL::LangDialog "${MUI_LANGDLL_WINDOWTITLE}" "${MUI_LANGDLL_INFO}" AC ${MUI_LANGDLL_PUSHLIST} "" @@ -2250,7 +2250,7 @@ Var /GLOBAL MUI_TEMP2 !insertmacro MUI_LANGUAGEFILE_DEFINE "MUI_${LANGUAGE}_LANGNAME" "MUI_LANGNAME" !ifndef MUI_LANGDLL_PUSHLIST - !ifdef MUI_LANGDLL_SHOW_ALL_LANGUAGES + !ifdef MUI_LANGDLL_ALLLANGUAGES !define MUI_LANGDLL_PUSHLIST "'${MUI_${LANGUAGE}_LANGNAME}' '${LANG_${LANGUAGE}}' " !else !define MUI_LANGDLL_PUSHLIST "'${MUI_${LANGUAGE}_LANGNAME}' '${LANG_${LANGUAGE}}' '${LANG_${LANGUAGE}_CP}' " @@ -2262,7 +2262,7 @@ Var /GLOBAL MUI_TEMP2 !define MUI_LANGDLL_PUSHLIST_TEMP "${MUI_LANGDLL_PUSHLIST}" !undef MUI_LANGDLL_PUSHLIST - !ifdef MUI_LANGDLL_SHOW_ALL_LANGUAGES + !ifdef MUI_LANGDLL_ALLLANGUAGES !define MUI_LANGDLL_PUSHLIST "'${MUI_${LANGUAGE}_LANGNAME}' '${LANG_${LANGUAGE}}' ${MUI_LANGDLL_PUSHLIST_TEMP}" !else !define MUI_LANGDLL_PUSHLIST "'${MUI_${LANGUAGE}_LANGNAME}' '${LANG_${LANGUAGE}}' '${LANG_${LANGUAGE}_CP}' ${MUI_LANGDLL_PUSHLIST_TEMP}"