ooo-build r12302 - in branches/sled-10-sp1-ooo-build-2-4: . patches/src680

[tml svn gnome org]

Author: tml
Date: Wed Apr 23 08:23:35 2008
New Revision: 12302
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12302&view=rev

Log:
2008-04-23  Tor Lillqvist  <tml novell com>

	* patches/dev300/win32-multi-lang-installer.diff
	(solenv/bin/modules/installer/download.pm): Fix problem where the
	NSIS wrapper was created with its English messages replaced by
	those for the last language for which there is no NSIS
	localisation, for us usually Zulu. Still need to file upstream
	issue about this.



Modified:
   branches/sled-10-sp1-ooo-build-2-4/ChangeLog
   branches/sled-10-sp1-ooo-build-2-4/patches/src680/win32-multi-lang-installer.diff

Modified: branches/sled-10-sp1-ooo-build-2-4/patches/src680/win32-multi-lang-installer.diff
==============================================================================
--- branches/sled-10-sp1-ooo-build-2-4/patches/src680/win32-multi-lang-installer.diff	(original)
+++ branches/sled-10-sp1-ooo-build-2-4/patches/src680/win32-multi-lang-installer.diff	Wed Apr 23 08:23:35 2008
@@ -490,6 +490,29 @@
  	
  	replace_one_variable($templatefile, "PRODUCTPATHPLACEHOLDER", $productpath);
  }
+@@ -1140,11 +1140,12 @@
+ 
+ sub translate_nsh_nlf_file
+ {
+-	my ($nshfile, $nlffile, $mlffile, $onelanguage, $nshfilename, $nlffilename) = @_;
++	my ($nshfile, $nlffile, $mlffile, $onelanguage, $nshfilename, $nlffilename, $nsislanguage) = @_;
+ 
+ 	# Analyzing the mlf file, collecting all Identifier
+ 	my $allidentifier = get_identifier($mlffile);
+ 	
++	$onelanguage = 'en-US' if ($nsislanguage eq 'English' && $onelanguage ne 'en-US');
+ 	for ( my $i = 0; $i <= $#{$allidentifier}; $i++ )
+ 	{
+ 		my $identifier = ${$allidentifier}[$i];
+@@ -1195,7 +1196,7 @@
+ 		
+ 		# Translate the files
+ 		my $nlffile = installer::files::read_file($nlffilename);
+-		translate_nsh_nlf_file($nshfile, $nlffile, $mlffile, $onelanguage, $nshfilename, $nlffilename);
++		translate_nsh_nlf_file($nshfile, $nlffile, $mlffile, $onelanguage, $nshfilename, $nlffilename, $nsislanguage);
+ 		
+ 		installer::files::save_file($nshfilename, $nshfile);
+ 		installer::files::save_file($nlffilename, $nlffile);
 --- instsetoo_native/util/makefile.mk
 +++ instsetoo_native/util/makefile.mk
 @@ -222,7 +222,7 @@