Changeset 26336 for main/trunk/greenstone3/web

Timestamp:

2012-10-18T10:12:58+13:00 (12 years ago)

Author:

sjm84

Message:

Readded the args argument that was accidentally deleted. Also making the language a parameter to the text_fragment_format.xsl

Location:

main/trunk/greenstone3/web/interfaces/default/transform

Files:

• config_format.xsl (modified) (1 diff)
• text_fragment_format.xsl (modified) (2 diffs)

main/trunk/greenstone3/web/interfaces/default/transform/config_format.xsl

@@ -286 +286 @@
     <xsl:template match="gsf:collectionText" name="gsf:collectionText">
     <!--<xslt:variable name="collName" select="/page/pageResponse/collection/@name"/>-->
-        <xslt:value-of select="util:getCollectionText($collName, $site_name, /page/@lang, '{@name}')"/>
+        <xslt:value-of select="util:getCollectionText($collName, $site_name, /page/@lang, '{@name}', '{@args}')"/>
     </xsl:template>
 

main/trunk/greenstone3/web/interfaces/default/transform/text_fragment_format.xsl

@@ -11 +11 @@
     <xsl:param name="site_name"/>
     <xsl:param name="collName"/>
+    <xsl:param name="lang"/>
   
     <xsl:output method="xml"/>
@@ -17 +18 @@
     <!-- With gsf:interfaceText, a user can request a string from the interface dictionaries in the current lang -->
     <xsl:template match="gsf:interfaceText" name="gsf:interfaceText">
-        <xsl:value-of disable-output-escaping="yes" select="util:getInterfaceText($interface_name, /page/@lang, @name)"/>
+        <xsl:value-of disable-output-escaping="yes" select="util:getInterfaceText($interface_name, $lang, @name)"/>
     </xsl:template>
 
     <!-- With gsf:collectionText, a user can request a string from the collection's dictionary in the current lang -->
     <xsl:template match="gsf:collectionText" name="gsf:collectionText">
-        <xsl:copy-of select="util:getCollectionText($collName, $site_name, /page/@lang, @name)"/>
+        <xsl:copy-of select="util:getCollectionText($collName, $site_name, $lang, @name, @args)"/>
     </xsl:template>