[Libreoffice-commits] .: instsetoo_native/inc_openoffice solenv/bin

[Andras Timar]

 instsetoo_native/inc_openoffice/windows/msi_languages/SIS.ulf |    2 +-
 solenv/bin/modules/installer/windows/msiglobal.pm             |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 1b31d5fb52ebdf9c32ec50dd5521724bc1b1c73e
Author: Andras Timar <atimar at suse.com>
Date:   Sun Jul 15 17:30:47 2012 +0200

    fdo#52088 use [ProductName] placeholder instead of LibreOffice
    
    Change-Id: I560139949c89798581ed7631eb5d0b3124c83002

diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/SIS.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/SIS.ulf
index 3376c3d..46e84bf 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/SIS.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/SIS.ulf
@@ -2,7 +2,7 @@
 en-US = "Installation database"
 
 [OOO_SIS_COMMENT]
-en-US = "This installer database contains the logic and data required to install LibreOffice."
+en-US = "This installer database contains the logic and data required to install [ProductName]."
 
 [OOO_SIS_KEYWORDS]
 en-US = "Install,MSI"
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm b/solenv/bin/modules/installer/windows/msiglobal.pm
index c6a70ff..d4b626d 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -940,6 +940,7 @@ sub write_summary_into_msi_database
     my $author = get_author_for_sis();
     my $subject = get_subject_for_sis($allvariableshashref);
     my $comment = get_comment_for_sis($sislanguage,$languagefile, "OOO_SIS_COMMENT");
+    $comment =~ s/\[ProductName\]/$allvariableshashref->{'PRODUCTNAME'}/;
     my $keywords = get_keywords_for_sis($sislanguage,$languagefile, "OOO_SIS_KEYWORDS");
     my $appname = get_appname_for_sis($sislanguage,$languagefile, "OOO_SIS_APPNAME");
     my $security = get_security_for_sis();