[ooo-build-commit] .: scp2/source solenv/bin

[Fridrich Strba]

 scp2/source/ooo/file_library_ooo.scp        |    9 +++++++++
 scp2/source/ooo/windowscustomaction_ooo.scp |    9 +++++++++
 solenv/bin/modules/installer/download.pm    |    6 +-----
 3 files changed, 19 insertions(+), 5 deletions(-)

New commits:
commit 7f43ddb11bf96ced47dc890861d152d4159d794f
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Sep 14 14:51:07 2010 +0200

    win32-multi-lang-installer.diff: Multi-language installer stuff
    
    i#66062, i#88638, i#88639

diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 92759a2..0a57ae5 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1865,3 +1865,12 @@ STD_UNO_LIB_FILE(gid_File_Lib_Unordf, unordf)
 STD_UNO_LIB_FILE( gid_File_Lib_For, for)
 STD_LIB_FILE( gid_File_Lib_Forui, forui)
 
+
+#ifdef WNT
+File gid_File_Lib_sellangmsi
+    TXT_FILE_BODY;
+    Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
+    Dir = gid_Dir_Program;
+    Name = "sellangmsi.dll";
+End
+#endif
diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp
index 7bd6c18..4cae60a 100755
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -468,6 +468,15 @@ WindowsCustomAction gid_Customaction_ShowReleaseNotes2
 	Assignment1 = ("InstallExecuteSequence", "(Not Installed or ISPATCH) and Not REMOVE=\"ALL\"", "end");
 End
 
+WindowsCustomAction gid_Customaction_SelectLanguage
+    Name = "SelectLanguage";
+    Typ = "321";
+    Source = "sellangmsi.dll";
+    Target = "SelectLanguage";
+    Inbinarytable = 1;
+    Assignment1 = ("ControlEvent", "SetupType", "Next", "DoAction", "SelectLanguage", "1", "1");
+End
+
 WindowsCustomAction gid_Customaction_RebaseLibrariesonproperties
 	Name = "RebaseLibrariesOnProperties";
 	Typ = "65";
diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm
index 2d83d8c..0b629fd 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -1139,12 +1139,9 @@ sub put_windows_productpath_into_template
     
     my $productpath = $variableshashref->{'PROPERTYTABLEPRODUCTNAME'};
     
-    my $locallangs = $$languagestringref;
-    $locallangs =~ s/_/ /g;
     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()) . ")"; }
     # if (( $installer::globals::languagepack ) && ( $installer::globals::unicodensis )) { $productpath = convert_textstring_to_utf16($productpath, $localnsisdir, "stringhelper.txt"); }
     
     replace_one_variable($templatefile, "PRODUCTPATHPLACEHOLDER", $productpath);
@@ -1295,7 +1292,6 @@ sub nsis_language_converter
     elsif ( $language eq "ja" ) { $nsislanguage = "Japanese"; }
     elsif ( $language eq "ko" ) { $nsislanguage = "Korean"; }
     elsif ( $language eq "th" ) { $nsislanguage = "Thai"; }
-    elsif ( $language eq "vi" ) { $nsislanguage = "Vietnamese"; }
     elsif ( $language eq "zh-CN" ) { $nsislanguage = "SimpChinese"; }
     elsif ( $language eq "zh-TW" ) { $nsislanguage = "TradChinese"; }
     else {