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

[Michael Meeks]

 solenv/bin/modules/installer/windows/property.pm |   33 ++++++++++++++++-------
 1 file changed, 23 insertions(+), 10 deletions(-)

New commits:
commit 5edc3b2ebb581fa2c91e01124c6a4c8aa0ebcdfd
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Wed Dec 15 17:08:26 2010 +0000

    Use BrOffice branding if present in pt-BR
    
    Signed off by Petr Mladek

diff --git a/solenv/bin/modules/installer/windows/property.pm b/solenv/bin/modules/installer/windows/property.pm
index 56cc8ca..034d82f 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -142,11 +142,25 @@ sub get_english_language_string
     return $langstring;
 }
 
-sub get_productname_for_property_table
+sub get_productname($$)
 {
-    my ( $allvariables ) = @_;
+    my ( $language, $allvariables ) = @_;
 
     my $name = $allvariables->{'PRODUCTNAME'};
+
+    # BrOffice has its own locale-specific name
+    if ($language eq 'pt-BR' && defined $allvariables->{'PRODUCTNAME_BR'}) {
+        $name = $allvariables->{'PRODUCTNAME_BR'};
+    }
+
+    return $name;
+}
+
+sub get_productname_for_property_table($$)
+{
+    my ( $language, $allvariables ) = @_;
+
+    my $name = get_productname ($language, $allvariables);
     my $version = $allvariables->{'PRODUCTVERSION'};
     my $productname = $name . " " . $version;
 
@@ -177,7 +191,7 @@ sub get_productname_for_property_table
         my $patchstring = "Product Update" . " " . $allvariables->{'WINDOWSPATCHLEVEL'};
         $productname = $productname . " " . $patchstring;
     }
-    
+
     # Saving this name in hash $allvariables for further usage
     $allvariables->{'PROPERTYTABLEPRODUCTNAME'} = $productname;
     my $infoline = "Defined variable PROPERTYTABLEPRODUCTNAME: $productname\n"; 
@@ -186,13 +200,12 @@ sub get_productname_for_property_table
     return $productname;
 }
 
-sub get_quickstarterlinkname_for_property_table
+sub get_quickstarterlinkname_for_property_table($$)
 {
-    my ( $allvariables ) = @_;
+    my ( $language, $allvariables ) = @_;
 
     # no usage of POSTVERSIONEXTENSION for Quickstarter link name!
-
-    my $name = $allvariables->{'PRODUCTNAME'};
+    my $name = get_productname ($language, $allvariables);
     my $version = $allvariables->{'PRODUCTVERSION'};
     my $quickstartername = $name . " " . $version;
 
@@ -232,7 +245,7 @@ sub set_featurename_properties_for_patch
 sub set_important_properties
 {
     my ($propertyfile, $allvariables, $languagestringref) = @_;
-    
+
     # Setting new variables with the content of %PRODUCTNAME and %PRODUCTVERSION
     if ( $allvariables->{'PRODUCTNAME'} )
     {
@@ -479,9 +492,9 @@ sub update_property_table
     my $ischeckforproductupdates = get_ischeckforproductupdates_for_property_table();
     my $manufacturer = get_manufacturer_for_property_table();
     my $productlanguage = get_productlanguage_for_property_table($language);
-    my $productname = get_productname_for_property_table($allvariables);
+    my $productname = get_productname_for_property_table($language, $allvariables);
     my $productversion = get_productversion_for_property_table();
-    my $quickstarterlinkname = get_quickstarterlinkname_for_property_table($allvariables);
+    my $quickstarterlinkname = get_quickstarterlinkname_for_property_table($language, $allvariables);
 
     # Updating the values