INTEGRATION: CWS native149 (1.38.28); FILE MERGED

2008/04/24 15:01:53 is 1.38.28.1: #i88638# patch for nsis translation

1 files changed, 4 insertions, 3 deletions

diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm
index f91bbb148cc1..3db346f88d91 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -8,7 +8,7 @@
 #
 # $RCSfile: download.pm,v $
 #
-# $Revision: 1.38 $
+# $Revision: 1.39 $
 #
 # This file is part of OpenOffice.org.
 #
@@ -1167,11 +1167,12 @@ sub replace_identifier_in_nlffile
 
 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];
@@ -1232,7 +1233,7 @@ sub copy_and_translate_nsis_language_files
 
         # 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);