From dd247cbad58d7e740e2568f9ac9f5ee1d30f00d7 Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Fri, 22 Jun 2007 20:31:22 +0000
Subject: "Merged" over from release-candidate - addition of Japanese and
 German options in Installer language menu

Add German option to the language menu in the installer.
https://jira.lindenlab.com/browse/SL-45054

Addition of Japanese language option to the installer.
https://jira.lindenlab.com/browse/SL-45907
---
 .../installers/windows/installer_template.nsi      | 27 ++++++++++++----------
 1 file changed, 15 insertions(+), 12 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi
index 1b5226c210..7a225fa163 100644
--- a/indra/newview/installers/windows/installer_template.nsi
+++ b/indra/newview/installers/windows/installer_template.nsi
@@ -37,9 +37,9 @@ XPStyle on                  ; add an XP manifest to the installer
 ;; (these files are in the same place as the nsi template but the python script generates a new nsi file in the 
 ;; application directory so we have to add a path to these include files)
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-#!include "installers\windows\lang_de.nsi"
+!include "installers\windows\lang_de.nsi"
 !include "installers\windows\lang_en-us.nsi"
-#!include "installers\windows\lang_ja.nsi"
+!include "installers\windows\lang_ja.nsi"
 !include "installers\windows\lang_ko.nsi"
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -890,10 +890,10 @@ Function .onInit
 	Push ""
 	Push ${LANG_ENGLISH}
 	Push English
-#	Push ${LANG_GERMAN}
-#	Push German
-#	Push ${LANG_JAPANESE}
-#	Push Japanese
+	Push ${LANG_GERMAN}
+	Push German
+	Push ${LANG_JAPANESE}
+	Push Japanese
 	Push ${LANG_KOREAN}
 	Push Korean
 	Push A ; A means auto count languages for the auto count to work the first empty push (Push "") must remain
@@ -909,12 +909,15 @@ Function .onInit
 	StrCmp $LANGUAGE "1042" 0 +3
 	StrCpy $LANGFLAGS " -set SystemLanguage ko"
 	Goto EndOfFunc
-#	StrCmp $LANGUAGE "1041" 0 +3
-#	StrCpy $LANGFLAGS " -set SystemLanguage ja"
-#	Goto EndOfFunc
-#	StrCmp $LANGUAGE "1031" 0 +3
-#	StrCpy $LANGFLAGS " -set SystemLanguage de"
-#	Goto EndOfFunc
+
+	StrCmp $LANGUAGE "1041" 0 +3
+	StrCpy $LANGFLAGS " -set SystemLanguage ja"
+	Goto EndOfFunc
+
+	StrCmp $LANGUAGE "1031" 0 +3
+	StrCpy $LANGFLAGS " -set SystemLanguage de"
+	Goto EndOfFunc
+
 	StrCmp $LANGUAGE "1033" 0 +3
 	StrCpy $LANGFLAGS " -set SystemLanguage en-us"
 	Goto EndOfFunc
-- 
cgit v1.2.3