From faf8ebe382159ccbe93bbc59ec2edb5aa4bae96b Mon Sep 17 00:00:00 2001
From: Tomas Cohen Arazi <tomascohen@theke.io>
Date: Fri, 9 Jun 2023 14:40:48 -0300
Subject: [PATCH] Revert "Bug 30352: Allow translation of Not for loan in OPAC
 XSLT results"

This reverts commit 98a575fcff1d1d689dcbf2462adc4ca70086f0ec.

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 .../en/xslt/MARC21slim2OPACResults.xsl        | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl
index 8224194060..59a2caba55 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl
@@ -1310,10 +1310,7 @@
                                 <xsl:call-template name="listCallNumbers">
                                     <xsl:with-param name="items" select="$reference_items[items:resultbranch=$currentbranch and items:substatus=$current_substatus]"/>
                                     <xsl:with-param name="max" select="$OPACResultsMaxItems"/>
-                                    <xsl:with-param name="status_text">
-                                        <xsl:value-of select="concat($currentbranch,': ')"/>
-                                        <xsl:value-of select="exsl:node-set($item_status_list)/status[@english=$current_substatus]|$current_substatus"/>
-                                    </xsl:with-param>
+                                    <xsl:with-param name="status_text" select="concat($currentbranch,': ',$current_substatus)"/>
                                     <xsl:with-param name="class_block" select="concat('notforloandesc_',$current_substatus)"/>
                                     <xsl:with-param name="class_status" select="'ItemBranch'"/>
                                     <xsl:with-param name="OPACItemLocation" select="$OPACItemLocation"/>
@@ -1334,7 +1331,6 @@
                             <status english="Pending hold">Pending hold</status>
                             <status english="In transit">In transit</status>
                             <status english="Waiting">On hold</status>
-			    <status english="Not for loan">Not for loan</status>
                         </xsl:variable>
                         <xsl:variable name="unavailable_items" select="key('item-by-status', 'reallynotforloan')|key('item-by-status', 'other')"/>
                         <xsl:choose>
@@ -1354,7 +1350,12 @@
                                                 <xsl:with-param name="status_text">
                                                     <xsl:value-of select="$currentbranch"/>
                                                     <xsl:text>: </xsl:text>
-                                                    <xsl:value-of select="exsl:node-set($item_status_list)/status[@english=$current_substatus]|$current_substatus"/>
+                                                    <xsl:if test="items:status='other'">
+                                                        <xsl:value-of select="exsl:node-set($other_status_list)/status[@english=$current_substatus]"/>
+                                                    </xsl:if>
+                                                    <xsl:if test="items:status='reallynotforloan'">
+                                                        <xsl:value-of select="$current_substatus"/>
+                                                    </xsl:if>
                                                 </xsl:with-param>
                                                 <xsl:with-param name="class_block" select="concat('unavailable_',items:substatus)"/>
                                                 <xsl:with-param name="class_status" select="'ItemBranch'"/>
@@ -1373,7 +1374,12 @@
                                         <xsl:with-param name="items" select="$unavailable_items[items:substatus=$current_substatus]"/>
                                         <xsl:with-param name="max" select="0"/>
                                         <xsl:with-param name="status_text">
-                                            <xsl:value-of select="exsl:node-set($item_status_list)/status[@english=$current_substatus]|$current_substatus"/>
+                                            <xsl:if test="items:status='other'">
+                                                <xsl:value-of select="exsl:node-set($other_status_list)/status[@english=$current_substatus]"/>
+                                            </xsl:if>
+                                            <xsl:if test="items:status='reallynotforloan'">
+                                                <xsl:value-of select="$current_substatus"/>
+                                            </xsl:if>
                                         </xsl:with-param>
                                         <xsl:with-param name="class_block" select="concat('unavailable_',$current_substatus)"/>
                                         <xsl:with-param name="class_status" select="UnavailableSubstatus"/>
-- 
2.39.5