[Libreoffice-commits] .: Branch 'libreoffice-3-3' - setup_native/source

[Michael Meeks]

 setup_native/source/win32/nsis/downloadtemplate.nsi |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 70b0313d28bda1b3c594809eba15c7369a2484ec
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Tue Dec 14 16:33:28 2010 +0000

    Use BrOffice branding on Windows keyed to locale/country-code not exename

diff --git a/setup_native/source/win32/nsis/downloadtemplate.nsi b/setup_native/source/win32/nsis/downloadtemplate.nsi
index 30ee215..226c3ca 100644
--- a/setup_native/source/win32/nsis/downloadtemplate.nsi
+++ b/setup_native/source/win32/nsis/downloadtemplate.nsi
@@ -278,10 +278,9 @@ Function SetupBranding
 	File "/oname=$PLUGINSDIR\modern-wizard.bmp" WELCOMEBMPPLACEHOLDER
 	File "/oname=$PLUGINSDIR\modern-wizard-br.bmp" WELCOMEBMPPLACEHOLDER_BR
 
-	; use broffice specific branding if executable name begins BrOffice
-	StrCpy $0 $EXEFILE 8
-;	messageBox MB_OK "ExeName: $0 - chopped $EXEFILE"
-	StrCmp $0 "BrOffice" BrOfficeSplash DefaultSplash
+	; use broffice specific branding if we are in Brazil
+;	messageBox MB_OK "Language: $LANGUAGE"
+	StrCmp $LANGUAGE "1046" BrOfficeSplash DefaultSplash
 	DefaultSplash:
 ;		messageBox MB_OK "LibreOffice"
 		SetBrandingImage /IMGID=1046 "$PLUGINSDIR\modern-header.bmp"