Fixed bug #1644881:

* Added curly braces around all $language attribute values.
* Moved declaration of language variable to top level of stylesheet.
Tested with Xalan, Saxon, and xsltproc.

diff --git a/xsl/html/glossary.xsl b/xsl/html/glossary.xsl
index 968198cceedfd3d60aefad6fb8b1e9f874b81968..6ea3f5a848dc8365859c07785c9a3cf1f3a9c6b7 100644 (file)
--- a/xsl/html/glossary.xsl
+++ b/xsl/html/glossary.xsl
@@ -18,12 +18,12 @@
 
 <!-- ==================================================================== -->
 
+<xsl:variable name="language">
+  <xsl:call-template name="l10n.language"/>
+</xsl:variable>
+
 <xsl:template match="glossary">
   <xsl:call-template name="id.warning"/>
-  
-  <xsl:variable name="language">
-    <xsl:call-template name="l10n.language"/>
-  </xsl:variable>
 
   <div>
     <xsl:apply-templates select="." mode="class.attribute"/>
@@ -53,7 +53,7 @@
           <xsl:choose>
             <xsl:when test="$glossary.sort != 0">
               <xsl:apply-templates select="glossentry">
-                <xsl:sort lang="$language"
+                <xsl:sort lang="{$language}"
                           select="translate(glossterm, &lowercase;, 
                                             &uppercase;)"/>
               </xsl:apply-templates>
@@ -91,7 +91,7 @@
       <xsl:choose>
         <xsl:when test="$glossary.sort != 0">
           <xsl:apply-templates select="glossentry">
-            <xsl:sort lang="$language"
+            <xsl:sort lang="{$language}"
                       select="translate(glossterm, &lowercase;, 
                                         &uppercase;)"/>
           </xsl:apply-templates>
@@ -117,7 +117,7 @@
       <xsl:choose>
         <xsl:when test="$glossary.sort != 0">
           <xsl:apply-templates select="glossentry">
-            <xsl:sort lang="$language"
+            <xsl:sort lang="{$language}"
                       select="translate(glossterm, &lowercase;, 
                                         &uppercase;)"/>
           </xsl:apply-templates>
@@ -401,7 +401,7 @@ GlossEntry ::=
           <xsl:choose>
             <xsl:when test="$glossary.sort != 0">
               <xsl:for-each select="$collection//glossentry">
-                <xsl:sort lang="$language"
+                <xsl:sort lang="{$language}"
                           select="translate(glossterm, &lowercase;, 
                                             &uppercase;)"/>
                 <xsl:variable name="cterm" select="glossterm"/>
@@ -445,7 +445,7 @@ GlossEntry ::=
       <xsl:choose>
         <xsl:when test="$glossary.sort != 0">
           <xsl:for-each select="glossentry">
-            <xsl:sort lang="$language"
+            <xsl:sort lang="{$language}"
                       select="translate(glossterm, &lowercase;, 
                                         &uppercase;)"/>
             <xsl:variable name="cterm" select="glossterm"/>