[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - solenv/bin

[Fridrich Strba]

 solenv/bin/modules/installer/windows/msiglobal.pm |   13 +++++++++++++
 1 file changed, 13 insertions(+)

New commits:
commit 62c6863bc037e7ea3f44852c51cf3cafd75cebf1
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Fri Mar 2 11:58:19 2012 +0100

    tabs -> spaces

diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm b/solenv/bin/modules/installer/windows/msiglobal.pm
index 03b31a3..64b2bb0 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -1111,19 +1111,19 @@ sub create_transforms
         chdir($installdir);
         $systemcall = $msidb . " " . " -d " . $basedbname . " -r " . $windowslanguage;
         system($systemcall);
-		# fdo#46181 - zh-HK and zh-MO should have fallen back to zh-TW not to zh-CN
-		# we need to hack zh-HK and zh-MO LCIDs directly into the MSI
-		if($windowslanguage eq '1028')
+        # fdo#46181 - zh-HK and zh-MO should have fallen back to zh-TW not to zh-CN
+        # we need to hack zh-HK and zh-MO LCIDs directly into the MSI
+        if($windowslanguage eq '1028')
         {
             rename 1028,3076;
-		    $systemcall = $msidb . " " . " -d " . $basedbname . " -r " . 3076;
+            $systemcall = $msidb . " " . " -d " . $basedbname . " -r " . 3076;
             system($systemcall);
             rename 3076,5124;
-		    $systemcall = $msidb . " " . " -d " . $basedbname . " -r " . 5124;
+            $systemcall = $msidb . " " . " -d " . $basedbname . " -r " . 5124;
             system($systemcall);
             $templatevalue = $templatevalue . "," . 3076 . "," . 5124;
             rename 5124,1028;
-		}
+        }
         chdir($from);
         unlink($transformfile);
 
commit e90465a5316f65972bc3c6520106be0d5e5205ac
Author: Andras Timar <atimar at suse.com>
Date:   Fri Mar 2 10:46:17 2012 +0100

    fdo#46181 Use Traditional Chinese installer for zh-HK and zh-MO locales
    
    Microsoft Installer thinks that it is a good idea to fall back to zh-CN
    from zh-HK and zh-MO. It is wrong, because zh-CN uses Simplified Chinese
    zh-HK and zh-MO use Traditional Chinese. So we need to fall back to zh-TW.
    
    Signed-off-by: Fridrich Å trba <fridrich.strba at bluewin.ch>

diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm b/solenv/bin/modules/installer/windows/msiglobal.pm
index 96c9606..03b31a3 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -1111,6 +1111,19 @@ sub create_transforms
         chdir($installdir);
         $systemcall = $msidb . " " . " -d " . $basedbname . " -r " . $windowslanguage;
         system($systemcall);
+		# fdo#46181 - zh-HK and zh-MO should have fallen back to zh-TW not to zh-CN
+		# we need to hack zh-HK and zh-MO LCIDs directly into the MSI
+		if($windowslanguage eq '1028')
+        {
+            rename 1028,3076;
+		    $systemcall = $msidb . " " . " -d " . $basedbname . " -r " . 3076;
+            system($systemcall);
+            rename 3076,5124;
+		    $systemcall = $msidb . " " . " -d " . $basedbname . " -r " . 5124;
+            system($systemcall);
+            $templatevalue = $templatevalue . "," . 3076 . "," . 5124;
+            rename 5124,1028;
+		}
         chdir($from);
         unlink($transformfile);