From 9cdab4335caba5b92a5d5683334228879ff3807e Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Fri, 1 Sep 2017 12:17:15 +0000
Subject: [PATCH] Removed append-language-parameter from Foundry (introduced in
 revsion r4897) because that did not work. Better solution was added in the
 last revisions.

git-svn-id: https://svn.libreccm.org/ccm/trunk@4974 8810af33-2d31-482b-a856-94f89814c4df
---
 .../lib/template-tags/content-items.xsl       | 11 ++------
 .../content-items/assets/related-links.xsl    |  3 ---
 .../content-items/scipublications.xsl         |  3 ---
 .../foundry/lib/template-tags/html-tags.xsl   | 27 +++++--------------
 .../foundry/lib/template-tags/navigation.xsl  | 27 -------------------
 5 files changed, 8 insertions(+), 63 deletions(-)

diff --git a/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items.xsl b/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items.xsl
index 4e029725b..ddefb3baa 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items.xsl
@@ -250,7 +250,7 @@
                 </xsl:call-template>
             </xsl:when>
 
-             <xsl:when test="$template-map/content-item[@content-section = $content-section
+            <xsl:when test="$template-map/content-item[@content-section = $content-section
                                                        and @category = $category
                                                        and not(@style)
                                                        and not(@content-type)]">
@@ -991,14 +991,7 @@
     <xsl:function name="foundry:generate-contentitem-link">
         <xsl:param name="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:sequence select="concat($context-prefix, '/redirect/?oid=', $oid)"/>
     </xsl:function>
 
 
diff --git a/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/assets/related-links.xsl b/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/assets/related-links.xsl
index f93cb331d..1d34a667f 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/assets/related-links.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/assets/related-links.xsl
@@ -123,9 +123,6 @@
                                                        '/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"/>
diff --git a/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/scipublications.xsl b/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/scipublications.xsl
index a88985089..e60cb9e63 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/scipublications.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/scipublications.xsl
@@ -359,9 +359,6 @@
                                                ./formatKey, 
                                                '&amp;publication=', 
                                                 ./publicationId)"/>
-                <xsl:with-param name="append-language-parameter"
-                                tunnel="yes"
-                                select="'true'" />
                 <xsl:with-param name="export-formatkey" 
                                 tunnel="yes"
                                 select="./formatKey"/>
diff --git a/ccm-core/web/themes/foundry/foundry/lib/template-tags/html-tags.xsl b/ccm-core/web/themes/foundry/foundry/lib/template-tags/html-tags.xsl
index 1d8848aa1..e7f7d8269 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/template-tags/html-tags.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/template-tags/html-tags.xsl
@@ -144,7 +144,6 @@
         <xsl:param name="hreflang" select="''" tunnel="yes"/>
         <xsl:param name="title" select="''" tunnel="yes"/>
         <xsl:param name="type" select="''" tunnel="yes"/>
-        <xsl:param name="append-language-parameter" select="false"/>
          
         <a>
             <xsl:if test="./@href-property">
@@ -166,21 +165,7 @@
             </xsl:if>
             <xsl:if test="$href != ''">
                 <xsl:attribute name="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, '&amp;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:value-of select="$href"/>
                 </xsl:attribute>
             </xsl:if>
             <xsl:if test="string-length($hreflang) &gt; 0">
@@ -1688,12 +1673,12 @@
     </foundry:doc>
     <xsl:template match="head/link">
         <link>
-             <xsl:call-template name="foundry:process-layouttree-attributes">   
+            <xsl:call-template name="foundry:process-layouttree-attributes">   
                 <xsl:with-param name="copy-attributes" select="'crossorigin rel rev media hreflang type sizes'" />                
-             </xsl:call-template>
-             <xsl:if test="./@href">
-                 <xsl:attribute name="href" select="foundry:gen-path(./@href)" />
-             </xsl:if>
+            </xsl:call-template>
+            <xsl:if test="./@href">
+                <xsl:attribute name="href" select="foundry:gen-path(./@href)" />
+            </xsl:if>
         </link>
     </xsl:template>
 
diff --git a/ccm-core/web/themes/foundry/foundry/lib/template-tags/navigation.xsl b/ccm-core/web/themes/foundry/foundry/lib/template-tags/navigation.xsl
index 2444ef916..19134e45d 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/template-tags/navigation.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/template-tags/navigation.xsl
@@ -80,9 +80,6 @@
                 <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/*"/>
@@ -102,9 +99,6 @@
                     </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/*"/>
@@ -154,9 +148,6 @@
                     <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>
@@ -165,9 +156,6 @@
                         <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>
@@ -220,9 +208,6 @@
                     </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>
@@ -465,9 +450,6 @@
                                         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">
@@ -508,9 +490,6 @@
                                         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">
@@ -594,9 +573,6 @@
                 <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"/>
@@ -698,9 +674,6 @@
                                 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">