Changeset 26336 for main/trunk


Ignore:
Timestamp:
10/18/12 10:12:58 (8 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:
2 edited

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/web/interfaces/default/transform/config_format.xsl

    r26326 r26336  
    286286    <xsl:template match="gsf:collectionText" name="gsf:collectionText">
    287287    <!--<xslt:variable name="collName" select="/page/pageResponse/collection/@name"/>-->
    288         <xslt:value-of select="util:getCollectionText($collName, $site_name, /page/@lang, '{@name}')"/>
     288        <xslt:value-of select="util:getCollectionText($collName, $site_name, /page/@lang, '{@name}', '{@args}')"/>
    289289    </xsl:template>
    290290
  • main/trunk/greenstone3/web/interfaces/default/transform/text_fragment_format.xsl

    r26326 r26336  
    1111    <xsl:param name="site_name"/>
    1212    <xsl:param name="collName"/>
     13    <xsl:param name="lang"/>
    1314 
    1415    <xsl:output method="xml"/>
     
    1718    <!-- With gsf:interfaceText, a user can request a string from the interface dictionaries in the current lang -->
    1819    <xsl:template match="gsf:interfaceText" name="gsf:interfaceText">
    19         <xsl:value-of disable-output-escaping="yes" select="util:getInterfaceText($interface_name, /page/@lang, @name)"/>
     20        <xsl:value-of disable-output-escaping="yes" select="util:getInterfaceText($interface_name, $lang, @name)"/>
    2021    </xsl:template>
    2122
    2223    <!-- With gsf:collectionText, a user can request a string from the collection's dictionary in the current lang -->
    2324    <xsl:template match="gsf:collectionText" name="gsf:collectionText">
    24         <xsl:copy-of select="util:getCollectionText($collName, $site_name, /page/@lang, @name)"/>
     25        <xsl:copy-of select="util:getCollectionText($collName, $site_name, $lang, @name, @args)"/>
    2526    </xsl:template>
    2627
Note: See TracChangeset for help on using the changeset viewer.