ooo-build r12802 - in trunk: . patches/dev300

[jiaojh svn gnome org]

Author: jiaojh
Date: Thu Jun  5 04:25:58 2008
New Revision: 12802
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12802&view=rev

Log:
    * patches/dev300/win32-multi-lang-installer.diff:
      update for win32 dev300-m14.


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/win32-multi-lang-installer.diff

Modified: trunk/patches/dev300/win32-multi-lang-installer.diff
==============================================================================
--- trunk/patches/dev300/win32-multi-lang-installer.diff	(original)
+++ trunk/patches/dev300/win32-multi-lang-installer.diff	Thu Jun  5 04:25:58 2008
@@ -477,42 +477,22 @@
 +
 +	return ERROR_SUCCESS;
 +}
---- solenv/bin/modules/installer/download.pm
-+++ solenv/bin/modules/installer/download.pm
-@@ -807,9 +807,7 @@
+--- solenv/bin/modules/installer/download.pm.orig	2008-06-05 12:22:33.000000000 +0800
++++ solenv/bin/modules/installer/download.pm	2008-06-05 12:23:44.000000000 +0800
+@@ -827,12 +827,9 @@ sub put_windows_productpath_into_templat
  	
  	my $productpath = $variableshashref->{'PROPERTYTABLEPRODUCTNAME'};
  	
 -	my $locallangs = $$languagestringref;
 -	$locallangs =~ s/_/ /g;
--	if ( ! $installer::globals::languagepack ) { $productpath = $productpath . " (" . $locallangs . ")"; }
+ 	if (length($locallangs) > $installer::globals::max_lang_length) { $locallangs = "multi lingual"; }
+ 
+-	if ( ! $installer::globals::languagepack ) { $productpath = $productpath . " (" . $locallangs . ")"; } 		
+-	
 +	if ( ! $installer::globals::languagepack ) { $productpath = $productpath . " (" . sprintf('%x', time()) . ")"; }
- 	
  	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);
 --- solenv/bin/modules/installer/windows/file.pm
 +++ solenv/bin/modules/installer/windows/file.pm
 @@ -242,6 +242,10 @@