docs-xml: Remove nested calls to translate()

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/docs-xml/smbdotconf/generate-context.xsl b/docs-xml/smbdotconf/generate-context.xsl
index 6204ddbd3a412539e99f9a188b45911779d58002..690d1039bf316e3086de15b1d74bc4bb98760929 100644 (file)
--- a/docs-xml/smbdotconf/generate-context.xsl
+++ b/docs-xml/smbdotconf/generate-context.xsl
@@ -24,8 +24,8 @@
 </xsl:template>
 
 <xsl:template match="//samba:parameter">
-  <xsl:variable name="name"><xsl:value-of select="translate(translate(string(@name),' ',''),
-                  'abcdefghijklmnopqrstuvwxyz','ABCDEFGHIJKLMNOPQRSTUVWXYZ')"/>
+  <xsl:variable name="name"><xsl:value-of select="translate(string(@name),
+                  'abcdefghijklmnopqrstuvwxyz ','ABCDEFGHIJKLMNOPQRSTUVWXYZ')"/>
   </xsl:variable>
   
   <xsl:if test="contains(@context,$smb.context) or $smb.context='ALL'">

diff --git a/docs-xml/xslt/expand-sambadoc.xsl b/docs-xml/xslt/expand-sambadoc.xsl
index 97aaafbb027003d45f2d5dfeaaa76a44c25b0d46..65b22fc125cfa760ba6e316a6372527f7ab8c7e4 100644 (file)
--- a/docs-xml/xslt/expand-sambadoc.xsl
+++ b/docs-xml/xslt/expand-sambadoc.xsl
@@ -48,7 +48,7 @@
                                <xsl:value-of select="$linkcontent"/>
                        </xsl:when>
                        <xsl:otherwise>
-                               <xsl:variable name="newid"><xsl:value-of select="translate(translate(string($name),' ',''),'abcdefghijklmnopqrstuvwxyz','ABCDEFGHIJKLMNOPQRSTUVWXYZ')"/></xsl:variable>
+                               <xsl:variable name="newid"><xsl:value-of select="translate(string($name),'abcdefghijklmnopqrstuvwxyz ','ABCDEFGHIJKLMNOPQRSTUVWXYZ')"/></xsl:variable>
                                <xsl:element name="link">
                                        <xsl:attribute name="linkend">
                                                <xsl:value-of select="$newid"/>

diff --git a/docs-xml/xslt/expand-smbconfdoc.xsl b/docs-xml/xslt/expand-smbconfdoc.xsl
index 778b80c0cc5246ffd7dc0a8d4ffdbba681329292..4e788ff9241c23b4683a5832f2af4109b2474ab8 100644 (file)
--- a/docs-xml/xslt/expand-smbconfdoc.xsl
+++ b/docs-xml/xslt/expand-smbconfdoc.xsl
@@ -32,8 +32,8 @@
        </xsl:template>
 
        <xsl:template match="samba:parameter">
-               <xsl:variable name="cname"><xsl:value-of select="translate(translate(string(@name),' ',''),
-                               'abcdefghijklmnopqrstuvwxyz','ABCDEFGHIJKLMNOPQRSTUVWXYZ')"/>
+               <xsl:variable name="cname"><xsl:value-of select="translate(string(@name),
+                               'abcdefghijklmnopqrstuvwxyz ','ABCDEFGHIJKLMNOPQRSTUVWXYZ')"/>
                </xsl:variable>
 
                <xsl:variable name="name"><xsl:value-of select="@name"/></xsl:variable>
@@ -140,7 +140,7 @@
                                <xsl:text>&#10;</xsl:text>
                                        <xsl:element name="anchor">
                                                <xsl:attribute name="id">
-                                                       <xsl:value-of select="translate(translate(string(.),' ',''), 'abcdefghijklmnopqrstuvwxyz','ABCDEFGHIJKLMNOPQRSTUVWXYZ')"/>
+                                                       <xsl:value-of select="translate(string(.), 'abcdefghijklmnopqrstuvwxyz ','ABCDEFGHIJKLMNOPQRSTUVWXYZ')"/>
                                                </xsl:attribute>
                                        </xsl:element>
                                        <xsl:value-of select="."/>
@@ -153,7 +153,7 @@
                                                                <xsl:text>This parameter is a synonym for </xsl:text>
                                                                <xsl:element name="link">
                                                                        <xsl:attribute name="linkend">
-                                                                               <xsl:value-of select="translate(translate(string($name),' ',''), 'abcdefghijklmnopqrstuvwxyz','ABCDEFGHIJKLMNOPQRSTUVWXYZ')"/>
+                                                                               <xsl:value-of select="translate(string($name), 'abcdefghijklmnopqrstuvwxyz ','ABCDEFGHIJKLMNOPQRSTUVWXYZ')"/>
                                                                        </xsl:attribute>
                                                                        <xsl:value-of select="$name"/>
                                                                </xsl:element>