From 0d43527923d51b982094250cb9dd9a137602c5cb Mon Sep 17 00:00:00 2001 From: kichik Date: Sun, 16 Nov 2003 15:16:13 +0000 Subject: [PATCH] fixed a harmless typo and made MUI_LANGUAGE only warn once if a language file is out of date git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3147 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/Modern UI/System.nsh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Contrib/Modern UI/System.nsh b/Contrib/Modern UI/System.nsh index 44ee8304..c21c7b99 100644 --- a/Contrib/Modern UI/System.nsh +++ b/Contrib/Modern UI/System.nsh @@ -315,7 +315,7 @@ Var MUI_TEMP2 !macro MUI_GUIINIT_BASIC GetDlgItem $MUI_TEMP1 $HWNDPARENT 1037 - CreateFont $MUI_TEMP2 "$(^Font)" "$(^FontSize))" "700" + CreateFont $MUI_TEMP2 "$(^Font)" "$(^FontSize)" "700" SendMessage $MUI_TEMP1 ${WM_SETFONT} $MUI_TEMP2 0 SetCtlColors $MUI_TEMP1 "" "${MUI_BGCOLOR}" @@ -1380,7 +1380,7 @@ Var MUI_TEMP2 !else !define MUI_FINISHPAGE_CURFIELD_TOP 100 !define MUI_FINISHPAGE_CURFIELD_BOTTOM 110 - !endif + !endif !else !define MUI_FINISHPAGE_CURFIELD_NO 5 !ifndef MUI_${MUI_PAGE_UNINSTALLER_PREFIX}WELCOMEFINISHPAGE_3LINES @@ -1905,7 +1905,9 @@ Var MUI_TEMP2 !ifndef "${NAME}" !define "${NAME}" "${VALUE}" - !warning "${LANGUAGE} Modern UI language file version doesn't match. Using default English texts for missing strings." + !ifndef MUI_LANGUAGEFILE_DEFAULT_USED + !define MUI_LANGUAGEFILE_DEFAULT_USED + !endif !endif !macroend @@ -1972,6 +1974,10 @@ Var MUI_TEMP2 !macro MUI_LANGUAGEFILE_END !include "${NSISDIR}\Contrib\Modern UI\Language files\Default.nsh" + !ifdef MUI_LANGUAGEFILE_DEFAULT_USED + !undef MUI_LANGUAGEFILE_DEFAULT_USED + !warning "${LANGUAGE} Modern UI language file version doesn't match. Using default English texts for missing strings." + !endif !insertmacro MUI_LANGUAGEFILE_DEFINE "MUI_${LANGUAGE}_LANGNAME" "MUI_LANGNAME"