[Libreoffice-commits] .: Branch 'feature/killsdf' - solenv/bin

[Libreoffice Gerrit user]

 solenv/bin/uilangfilter.xslt |   20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

New commits:
commit 50d6578f2cf1747d0471e1b6f9585c216ebfa7fe
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Nov 14 13:02:29 2012 +0000

    Resolves: fdo#57107 processing translatable child nodes twice
    
    I'm rubbish with xslt.
    
    Change-Id: Idc92a602aca7dc2a96cf185b1904e1373435a8a9

diff --git a/solenv/bin/uilangfilter.xslt b/solenv/bin/uilangfilter.xslt
index 42d066f..90abf11 100644
--- a/solenv/bin/uilangfilter.xslt
+++ b/solenv/bin/uilangfilter.xslt
@@ -13,19 +13,33 @@
 
 <xsl:template match="/">
   <l><xsl:text>
</xsl:text>
-  <xsl:apply-templates select="//*[*[not(self::col)]/@translatable='yes']" />
+  <!--
+      What I want to do here is to extract all nodes that are translatable
+      except the columns of list and tree stores
+  -->
+  <xsl:apply-templates select="//*[not(self::col)][@translatable='yes']" />
+  <!--
+      What I want to do here is to extract just the list and tree store
+      columns that that are translatable
+  -->
   <xsl:apply-templates select="interface/object[data/row/col[@id='0'][@translatable='yes']]" />
   </l>
 </xsl:template>
 
-<xsl:template match="*/*[not(self::col)][@translatable]">
+<!--
+    Normal nodes
+-->
+<xsl:template match="*/*[not(self::col)][@translatable='yes']">
   <xsl:text> </xsl:text>
   <t r="string" g="{str:tokenize(../@id,':')[1]}" l="{@name}">
   <xsl:copy-of select="text()" />
   </t><xsl:text>
</xsl:text>
 </xsl:template>
 
-<xsl:template match="col[@id='0']">
+<!--
+    Column nodes
+-->
+<xsl:template match="col[@id='0'][@translatable='yes']">
   <xsl:text> </xsl:text>
   <xsl:variable name="groupid" select="../../../@id"/>
   <t r="stringlist" g="{str:tokenize($groupid,':')[1]}" l="{count(preceding::col[@id='0'][../../../@id=$groupid])}">