From cbf29e0c3d820efbf204ce55ca3e3cd707101b9d Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Wed, 30 Sep 2020 14:33:47 +0200
Subject: [PATCH] Bug 24322: Simplify condition to separate elements

---
 .../intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl | 5 +----
 .../opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl    | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
index 23521a1d93..b7dfc99634 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
@@ -834,10 +834,7 @@
                     <xsl:with-param name="codes">a</xsl:with-param>
                     <xsl:with-param name="delimeter"><xsl:text> | </xsl:text></xsl:with-param>
                 </xsl:call-template>
-                <xsl:choose>
-                    <xsl:when test="position()=last()"><xsl:text>  </xsl:text></xsl:when>
-                    <xsl:otherwise> | </xsl:otherwise>
-                </xsl:choose>
+                <xsl:if test="not(position()=last())"><xsl:text> | </xsl:text></xsl:if>
             </xsl:for-each>
         </span>
     </xsl:if>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
index 76ca39c4e4..a0c4439be2 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
@@ -888,10 +888,7 @@
                     <xsl:with-param name="codes">a</xsl:with-param>
                     <xsl:with-param name="delimeter"><xsl:text> | </xsl:text></xsl:with-param>
                 </xsl:call-template>
-                <xsl:choose>
-                    <xsl:when test="position()=last()"><xsl:text>  </xsl:text></xsl:when>
-                    <xsl:otherwise> | </xsl:otherwise>
-                </xsl:choose>
+                <xsl:if test="not(position()=last())"><xsl:text> | </xsl:text></xsl:if>
             </xsl:for-each>
         </span>
     </xsl:if>
-- 
2.20.1