Add language parameter to links

git-svn-id: https://svn.libreccm.org/ccm/trunk@4897 8810af33-2d31-482b-a856-94f89814c4df

ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items.xsl

@@ -991,7 +991,14 @@
     <xsl:function name="foundry:generate-contentitem-link">
         <xsl:param name="oid"/>
 
-        <xsl:sequence select="concat($context-prefix, '/redirect/?oid=', $oid)"/>
+        <xsl:choose>
+            <xsl:when test="foundry:get-setting('appendLanguageParameter', '') = 'true'">
+                <xsl:sequence select="concat($context-prefix, '/redirect/?oid=', $oid, '&amp;lang=', $negotiated-language)"/>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:sequence select="concat($context-prefix, '/redirect/?oid=', $oid)"/>
+            </xsl:otherwise>
+        </xsl:choose>
     </xsl:function>
 
 

ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/assets/related-links.xsl

@@ -123,6 +123,9 @@
                                                        '/redirect/?oid=', 
                                                        ./targetItem/@oid, 
                                                        $params)"/>
+                        <xsl:with-param name="append-language-parameter"
+                                        tunnel="yes"
+                                        select="'true'"/>
                         <xsl:with-param name="target-item-title" 
                                         tunnel="yes" 
                                         select="./targetItem/title"/>

ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/scipublications.xsl

@@ -359,6 +359,9 @@
                                                ./formatKey, 
                                                '&publication=', 
                                                 ./publicationId)"/>
+                <xsl:with-param name="append-language-parameter"
+                                tunnel="yes"
+                                select="'true'" />
                 <xsl:with-param name="export-formatkey" 
                                 tunnel="yes"
                                 select="./formatKey"/>

ccm-core/web/themes/foundry/foundry/lib/template-tags/html-tags.xsl

@@ -143,7 +143,8 @@
         <xsl:param name="href" select="''" tunnel="yes"/>
         <xsl:param name="hreflang" select="''" tunnel="yes"/>
         <xsl:param name="title" select="''" tunnel="yes"/>
-        <xsl:param name="type" select="''" tunnel="yes"/>
+        <xsl:param name="type" select="''" tunnel="yes"
+        <xsl:param name="append-language-parameter" select='false'/>
          
         <a>
             <xsl:if test="./@href-property">
@@ -165,7 +166,21 @@
             </xsl:if>
             <xsl:if test="$href != ''">
                 <xsl:attribute name="href">
-                    <xsl:value-of select="$href"/>
+                    <xsl:choose>
+                        <xsl:when test="$append-language-parameter = 'true' and foundry:get-setting('append-language-parameter', '') = 'true'">                                
+                            <xsl:choose>
+                                <xsl:when test="contains($href, '?')">
+                                    <xsl:value-of select="concat($href, &lang=', $negotiated-language)"/>
+                                </xsl:when>
+                                <xsl:otherwise>
+                                    <xsl:value-of select="concat($href, '?lang=', $negotiated-language)" />
+                                </xsl:otherwise>
+                            </xsl:choose>
+                        </xsl:when>
+                        <xsl:otherwise>
+                            <xsl:value-of select="$href"/>
+                        </xsl:otherwise>
+                    </xsl:choose>
                 </xsl:attribute>
             </xsl:if>
             <xsl:if test="string-length($hreflang) &gt; 0">

ccm-core/web/themes/foundry/foundry/lib/template-tags/navigation.xsl

@@ -80,6 +80,9 @@
                 <xsl:with-param name="breadcrumb-label" 
                                 tunnel="yes"
                                 select="foundry:get-static-text('breadcrumbs', 'root')"/>
+                <xsl:with-param name="append-language-parameter"
+                                tunnel="yes"
+                                select="'true'" /> 
             </xsl:apply-templates>
             <xsl:if test="count($data-tree//nav:categoryPath/nav:category) &gt; 1">
                 <xsl:copy-of select="$breadcrumb-separator/*"/>
@@ -99,6 +102,9 @@
                     </xsl:choose>
                 </xsl:with-param>
                 <xsl:with-param name="breadcrumb-label" tunnel="yes" select="./@title"/>
+                <xsl:with-param name="append-language-parameter"
+                                tunnel="yes"
+                                select="'true'" /> 
             </xsl:apply-templates>
             <xsl:if test="position() != last()">
                 <xsl:copy-of select="$breadcrumb-separator/*"/>
@@ -148,6 +154,9 @@
                     <xsl:with-param name="href" 
                                     tunnel="yes"
                                     select="$data-tree//nav:categoryPath/nav:category[position() = 2]/@url"/>
+                    <xsl:with-param name="append-language-parameter"
+                                    tunnel="yes"
+                                    select="'true'" />
                 </xsl:apply-templates>
             </xsl:when>
             <xsl:otherwise>
@@ -156,6 +165,9 @@
                         <xsl:with-param name="href"
                                         tunnel="yes"
                                         select="$data-tree//nav:categoryPath/nav:category[position() = 1]/@url"/>
+                        <xsl:with-param name="append-language-parameter"
+                                        tunnel="yes"
+                                        select="'true'" />
                     </xsl:apply-templates>
                 </xsl:if>
             </xsl:otherwise>
@@ -198,7 +210,7 @@
             select="$data-tree//nav:categoryMenu[@id=$navigation-id]/nav:category/@url"
             tunnel="yes"/>-->
             <xsl:with-param name="href"
-                            tunnel="yes">
+                            tunnel="yes">                              
                 <xsl:choose>
                     <xsl:when test="$data-tree//nav:categoryMenu[@id=$navigation-id]/nav:category/@url">
                         <xsl:value-of select="$data-tree//nav:categoryMenu[@id=$navigation-id]/nav:category/@url"/>
@@ -208,6 +220,9 @@
                     </xsl:when>
                 </xsl:choose>
             </xsl:with-param>
+            <xsl:with-param name="append-language-parameter"
+                            tunnel="yes"
+                            select="'true'" />
             <xsl:with-param name="navigation-id" select="$navigation-id" tunnel="yes"/>
             <xsl:with-param name="title" tunnel="yes">
                 <xsl:choose>
@@ -450,6 +465,9 @@
                                         select="$navigation-links-tree" 
                                         tunnel="yes"/>
                         <xsl:with-param name="href" select="./@url" tunnel="yes"/>
+                        <xsl:with-param name="append-language-parameter"
+                                        tunnel="yes"
+                                        select="'true'"/>
                         <xsl:with-param name="title" tunnel="yes">
                             <xsl:choose>
                                 <xsl:when test="$show-description-text and ./@description">
@@ -490,6 +508,9 @@
                                         select="$navigation-links-tree" 
                                         tunnel="yes"/>
                         <xsl:with-param name="href" select="./@url" tunnel="yes"/>
+                        <xsl:with-param name="append-language-parameter"
+                                        tunnel="yes"
+                                        select="'true'" />
                         <xsl:with-param name="title" tunnel="yes">
                             <xsl:choose>
                                 <xsl:when test="$show-description-text and ./@description">
@@ -573,6 +594,9 @@
                 <xsl:with-param name="href"
                                 tunnel="yes"
                                 select="./nav:url"/>
+                <xsl:with-param name="append-language-parameter"
+                                tunnel="yes"
+                                select="'true'"/>
                 <xsl:with-param name="quicklink-description"
                                 tunnel="yes"
                                 select="./nav:description"/>
@@ -674,6 +698,9 @@
                                 select="$navigation-links-tree" 
                                 tunnel="yes"/>
                 <xsl:with-param name="href" select="./@url" tunnel="yes"/>
+                <xsl:with-param name="append-language-parameter"
+                                tunnel="yes"
+                                select="'true'" />
                 <xsl:with-param name="title" tunnel="yes">
                     <xsl:choose>
                         <xsl:when test="$show-description-text and ./@description">