From 19c119e66c1ebddb2a1f9e9bedd8a10c3b61f3c5 Mon Sep 17 00:00:00 2001
From: joostverburg <joostverburg@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Tue, 29 Jan 2008 15:36:09 +0000
Subject: [PATCH] set default language file for MUI without changing the user
 setting

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5501 212acab6-be3b-0410-9dea-997c60f758d6
---
 Contrib/Modern UI 2/Localization.nsh | 18 +++++++++++++++++-
 Contrib/Modern UI 2/MUI2.nsh         |  2 --
 Contrib/Modern UI/System.nsh         | 18 ++++++++++++++++--
 3 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/Contrib/Modern UI 2/Localization.nsh b/Contrib/Modern UI 2/Localization.nsh
index ec8d1326..caf35d2e 100644
--- a/Contrib/Modern UI 2/Localization.nsh	
+++ b/Contrib/Modern UI 2/Localization.nsh	
@@ -35,9 +35,25 @@ Localization
 
   !insertmacro MUI_INSERT
 
-  LoadLanguageFile "${NSISDIR}\Contrib\Language files\${LANGUAGE}.nlf"  
+  LoadLanguageFile "${NSISDIR}\Contrib\Language files\${LANGUAGE}.nlf"
+
+  ;Set default language file for MUI and backup user setting
+  !ifdef LANGFILE_DEFAULT
+    !define MUI_LANGFILE_DEFAULT_TEMP "${LANGFILE_DEFAULT}"
+    !undef LANGFILE_DEFAULT
+  !endif
+  !define LANGFILE_DEFAULT "${NSISDIR}\Contrib\Language files\English.nsh"
+
+  ;Include language file
   !insertmacro LANGFILE_INCLUDE "${NSISDIR}\Contrib\Language files\${LANGUAGE}.nsh"
 
+  ;Restore user setting for default language file
+  !undef LANGFILE_DEFAULT
+  !ifdef MUI_LANGFILE_DEFAULT_TEMP
+    !define LANGFILE_DEFAULT "${MUI_LANGFILE_DEFAULT}"
+  !endif
+
+  ;Add language to list of languages for selection dialog
   !ifndef MUI_LANGDLL_LANGUAGES
     !define MUI_LANGDLL_LANGUAGES "'${LANGFILE_${LANGUAGE}_NAME}' '${LANG_${LANGUAGE}}' "
     !define MUI_LANGDLL_LANGUAGES_CP "'${LANGFILE_${LANGUAGE}_NAME}' '${LANG_${LANGUAGE}}' '${LANG_${LANGUAGE}_CP}' "
diff --git a/Contrib/Modern UI 2/MUI2.nsh b/Contrib/Modern UI 2/MUI2.nsh
index 196964bf..914bb713 100644
--- a/Contrib/Modern UI 2/MUI2.nsh	
+++ b/Contrib/Modern UI 2/MUI2.nsh	
@@ -32,8 +32,6 @@ Copyright 
 !include nsDialogs.nsh
 !include LangFile.nsh
 
-!define LANGFILE_DEFAULT "${NSISDIR}\Contrib\Language files\English.nsh"
-
 
 ;--------------------------------
 ;Macros for compile-time defines
diff --git a/Contrib/Modern UI/System.nsh b/Contrib/Modern UI/System.nsh
index 8c3a2b27..cde25a0f 100644
--- a/Contrib/Modern UI/System.nsh	
+++ b/Contrib/Modern UI/System.nsh	
@@ -29,8 +29,6 @@ Copyright 
 !include LangFile.nsh
 !include WinMessages.nsh
 
-!define LANGFILE_DEFAULT "${NSISDIR}\Contrib\Language files\English.nsh"
-
 Var MUI_TEMP1
 Var MUI_TEMP2
 
@@ -2078,8 +2076,24 @@ Var MUI_TEMP2
   !insertmacro MUI_INSERT
 
   LoadLanguageFile "${NSISDIR}\Contrib\Language files\${LANGUAGE}.nlf"
+
+  ;Set default language file for MUI and backup user setting
+  !ifdef LANGFILE_DEFAULT
+    !define MUI_LANGFILE_DEFAULT_TEMP "${LANGFILE_DEFAULT}"
+    !undef LANGFILE_DEFAULT
+  !endif
+  !define LANGFILE_DEFAULT "${NSISDIR}\Contrib\Language files\English.nsh"
+
+  ;Include language file
   !insertmacro LANGFILE_INCLUDE "${NSISDIR}\Contrib\Language files\${LANGUAGE}.nsh"
 
+  ;Restore user setting for default language file
+  !undef LANGFILE_DEFAULT
+  !ifdef MUI_LANGFILE_DEFAULT_TEMP
+    !define LANGFILE_DEFAULT "${MUI_LANGFILE_DEFAULT}"
+  !endif
+
+  ;Add language to list of languages for selection dialog  
   !ifndef MUI_LANGDLL_LANGUAGES
     !define MUI_LANGDLL_LANGUAGES "'${LANGFILE_${LANGUAGE}_NAME}' '${LANG_${LANGUAGE}}' "
     !define MUI_LANGDLL_LANGUAGES_CP "'${LANGFILE_${LANGUAGE}_NAME}' '${LANG_${LANGUAGE}}' '${LANG_${LANGUAGE}_CP}' "