[Libreoffice-commits] help.git: help3xsl/online_transform.xsl

[Olivier Hallot (via logerrit)]

 help3xsl/online_transform.xsl |   15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

New commits:
commit 19c60db20e019c3fad935f5d9a9500585c3b82ae
Author:     Olivier Hallot <olivier.hallot at libreoffice.org>
AuthorDate: Thu Nov 7 21:13:04 2019 -0300
Commit:     Olivier Hallot <olivier.hallot at libreoffice.org>
CommitDate: Fri Nov 8 01:18:45 2019 +0100

    Fix missing %PRODUCTNAME replacements
    
    Some contents were still carrying %PRODUCTNAME variable
    Apply template brand on
    <bascode>,
    <meta itemprop../> and
    <title>
    
    Change-Id: Ia93204cba63ba72d1df6014e3de37d7322c68029
    Reviewed-on: https://gerrit.libreoffice.org/82256
    Tested-by: Jenkins
    Reviewed-by: Olivier Hallot <olivier.hallot at libreoffice.org>

diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl
index 14fc99c8e..12d0807de 100644
--- a/help3xsl/online_transform.xsl
+++ b/help3xsl/online_transform.xsl
@@ -280,9 +280,14 @@
 
 <!-- BOOKMARK_VALUE -->
 <xsl:template match="bookmark_value">
+    <xsl:variable name="aux1">
+        <xsl:call-template name="brand">
+            <xsl:with-param name="string" select="."/>
+        </xsl:call-template>
+    </xsl:variable>
     <xsl:element name="meta">
         <xsl:attribute name="itemprop">keywords</xsl:attribute>
-        <xsl:attribute name="content"><xsl:value-of select="translate(.,';',',')"/></xsl:attribute>
+        <xsl:attribute name="content"><xsl:value-of select="translate($aux1,';',',')"/></xsl:attribute>
     </xsl:element>
 </xsl:template>
 
@@ -495,7 +500,9 @@
         </xsl:when>
 
         <xsl:when test="@role='bascode' or @role='pycode'">
-            <xsl:value-of select="." />
+            <xsl:call-template name="brand">
+                <xsl:with-param name="string" select="."/>
+            </xsl:call-template>
         </xsl:when>
 
         <xsl:when test="@role='smathcode'">
@@ -540,7 +547,9 @@
         </xsl:when>
 
         <xsl:when test="@role='bascode' or @role='pycode'">
-            <xsl:value-of select="." />
+            <xsl:call-template name="brand">
+                <xsl:with-param name="string" select="."/>
+            </xsl:call-template>
         </xsl:when>
 
         <xsl:when test="@role='smathcode'">