From d64afea6f5297f553d1cc45230039d839404e5c9 Mon Sep 17 00:00:00 2001
From: Hector Castro <hector.hecaxmmx@gmail.com>
Date: Sat, 7 Nov 2015 23:59:23 -0600
Subject: [PATCH] Bug 15102: Fix capitalization for some strings on XSLT detail
 pages

To test:
-Search records with 336, 337, 338, 700$i, and 7XXind=2
-Search records with 508, 264Ind=4, 246, 856, and LDR/6 and
LDR/7 (BK, VM, CR, CF)
-Notice the capitalization (Contained Works, Related Works, Media Type,
Content Type, and Carrier Type, Production Credits, Copyright Date,
Other Title, Online Access, Continuing Resource, Mixed Materials,
Computer File, Visual Material) in both OPAC and Intranet for
records detail pages and results pages
-Apply this patch
-Search again and get notice about the capitalization following
Koha coding guidelines

Signed-off-by: Frederic Demians <f.demians@tamil.fr>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 .../prog/en/xslt/MARC21slim2intranetDetail.xsl       | 12 ++++++------
 .../prog/en/xslt/MARC21slim2intranetResults.xsl      | 12 ++++++------
 .../intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl   |  2 +-
 .../bootstrap/en/xslt/MARC21slim2OPACDetail.xsl      | 12 ++++++------
 .../bootstrap/en/xslt/MARC21slim2OPACResults.xsl     | 10 +++++-----
 .../opac-tmpl/bootstrap/en/xslt/MARC21slimUtils.xsl  |  2 +-
 6 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
index 8ad6047bf9..a2f7a0c659 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
@@ -400,7 +400,7 @@
         <xsl:if test="marc:datafield[@tag=336] or marc:datafield[@tag=337] or marc:datafield[@tag=338]">
             <span class="results_summary" id="content_type">
                 <xsl:if test="marc:datafield[@tag=336]">
-                    <span class="label">Content Type: </span>
+                    <span class="label">Content type: </span>
                     <xsl:for-each select="marc:datafield[@tag=336]">
                         <xsl:call-template name="subfieldSelect">
                             <xsl:with-param name="codes">a</xsl:with-param>
@@ -412,7 +412,7 @@
                 <xsl:text> </xsl:text>
                 <!-- Media Type -->
                 <xsl:if test="marc:datafield[@tag=337]">
-                    <span class="label">Media Type: </span>
+                    <span class="label">Media type: </span>
                     <xsl:for-each select="marc:datafield[@tag=337]">
                         <xsl:call-template name="subfieldSelect">
                             <xsl:with-param name="codes">a</xsl:with-param>
@@ -424,7 +424,7 @@
                 <xsl:text> </xsl:text>
                 <!-- Media Type -->
                 <xsl:if test="marc:datafield[@tag=338]">
-                    <span class="label">Carrier Type: </span>
+                    <span class="label">Carrier type: </span>
                     <xsl:for-each select="marc:datafield[@tag=338]">
                         <xsl:call-template name="subfieldSelect">
                             <xsl:with-param name="codes">a</xsl:with-param>
@@ -585,7 +585,7 @@
 
         <!-- #13382 Added Related works 700$i -->
         <xsl:if test="marc:datafield[@tag=700][marc:subfield[@code='i']] or marc:datafield[@tag=710][marc:subfield[@code='i']] or marc:datafield[@tag=711][marc:subfield[@code='i']]">
-            <span class="results_summary related_works"><span class="label">Related Works: </span>
+            <span class="results_summary related_works"><span class="label">Related works: </span>
                 <xsl:for-each select="marc:datafield[@tag=700][marc:subfield[@code='i']] | marc:datafield[@tag=710][marc:subfield[@code='i']] | marc:datafield[@tag=711][marc:subfield[@code='i']]">
                     <xsl:variable name="str">
                         <xsl:call-template name="subfieldSelect">
@@ -627,7 +627,7 @@
 
         <!-- #13382 Added Contained Works 7xx@ind2=2 -->
         <xsl:if test="marc:datafield[@tag=700][@ind2=2 and not(marc:subfield[@code='i'])] or marc:datafield[@tag=710][@ind2=2 and not(marc:subfield[@code='i'])] or marc:datafield[@tag=711][@ind2=2 and not(marc:subfield[@code='i'])]">
-            <span class="results_summary contained_works"><span class="label">Contained Works: </span>
+            <span class="results_summary contained_works"><span class="label">Contained works: </span>
                 <xsl:for-each select="marc:datafield[@tag=700][@ind2=2][not(marc:subfield[@code='i'])] | marc:datafield[@tag=710][@ind2=2][not(marc:subfield[@code='i'])] | marc:datafield[@tag=711][@ind2=2][not(marc:subfield[@code='i'])]">
                     <xsl:variable name="str">
                         <xsl:call-template name="subfieldSelect">
@@ -842,7 +842,7 @@
         <!-- 508 -->
         <xsl:if test="marc:datafield[@tag=508]">
             <div class="results_summary prod_credits">
-                <span class="label">Production Credits: </span>
+                <span class="label">Production credits: </span>
                 <xsl:for-each select="marc:datafield[@tag=508]">
                     <xsl:call-template name="subfieldSelectSpan">
                         <xsl:with-param name="codes">a</xsl:with-param>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl
index 51af8ddbd4..0d40cab382 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl
@@ -430,16 +430,16 @@
                 <xsl:when test="$leader6='a'">
                     <xsl:choose>
                         <xsl:when test="$leader7='c' or $leader7='d' or $leader7='m'"><img src="/intranet-tmpl/prog/img/famfamfam/silk/book.png" alt="book" title="book" class="materialtype"/> Book</xsl:when>
-                        <xsl:when test="$leader7='i' or $leader7='s'"><img src="/intranet-tmpl/prog/img/famfamfam/silk/newspaper.png" alt="serial" title="serial" class="materialtype"/> Continuing Resource</xsl:when>
+                        <xsl:when test="$leader7='i' or $leader7='s'"><img src="/intranet-tmpl/prog/img/famfamfam/silk/newspaper.png" alt="serial" title="serial" class="materialtype"/> Continuing resource</xsl:when>
                         <xsl:when test="$leader7='a' or $leader7='b'"><img src="/intranet-tmpl/prog/img/famfamfam/silk/book_open.png" alt="article" title="article" class="materialtype"/> Article</xsl:when>
                     </xsl:choose>
                 </xsl:when>
                 <xsl:when test="$leader6='t'"><img src="/intranet-tmpl/prog/img/famfamfam/silk/book.png" alt="book" title="book" class="materialtype"/> Book</xsl:when>
                 <xsl:when test="$leader6='o'"><img src="/intranet-tmpl/prog/img/famfamfam/silk/report_disk.png" alt="kit" title="kit" class="materialtype"/> Kit</xsl:when>
-                <xsl:when test="$leader6='p'"><img src="/intranet-tmpl/prog/img/famfamfam/silk/report_disk.png" alt="mixed materials" title="mixed materials" class="materialtype"/>Mixed Materials</xsl:when>
-                <xsl:when test="$leader6='m'"><img src="/intranet-tmpl/prog/img/famfamfam/silk/computer_link.png" alt="computer file" title="computer file" class="materialtype"/> Computer File</xsl:when>
+                <xsl:when test="$leader6='p'"><img src="/intranet-tmpl/prog/img/famfamfam/silk/report_disk.png" alt="mixed materials" title="mixed materials" class="materialtype"/>Mixed materials</xsl:when>
+                <xsl:when test="$leader6='m'"><img src="/intranet-tmpl/prog/img/famfamfam/silk/computer_link.png" alt="computer file" title="computer file" class="materialtype"/> Computer file</xsl:when>
                 <xsl:when test="$leader6='e' or $leader6='f'"><img src="/intranet-tmpl/prog/img/famfamfam/silk/map.png" alt="map" title="map" class="materialtype"/> Map</xsl:when>
-                <xsl:when test="$leader6='g' or $leader6='k' or $leader6='r'"><img src="/intranet-tmpl/prog/img/famfamfam/silk/film.png" alt="visual material" title="visual material" class="materialtype"/> Visual Material</xsl:when>
+                <xsl:when test="$leader6='g' or $leader6='k' or $leader6='r'"><img src="/intranet-tmpl/prog/img/famfamfam/silk/film.png" alt="visual material" title="visual material" class="materialtype"/> Visual material</xsl:when>
                 <xsl:when test="$leader6='c' or $leader6='d'"><img src="/intranet-tmpl/prog/img/famfamfam/silk/music.png" alt="score" title="score" class="materialtype"/> Score</xsl:when>
                 <xsl:when test="$leader6='i'"><img src="/intranet-tmpl/prog/img/famfamfam/silk/sound.png" alt="sound" title="sound" class="materialtype"/> Sound</xsl:when>
                 <xsl:when test="$leader6='j'"><img src="/intranet-tmpl/prog/img/famfamfam/silk/sound.png" alt="music" title="music" class="materialtype"/> Music</xsl:when>
@@ -880,7 +880,7 @@
          <xsl:with-param name="basetags">246</xsl:with-param>
          <xsl:with-param name="codes">ab</xsl:with-param>
          <xsl:with-param name="class">results_summary</xsl:with-param>
-         <xsl:with-param name="label">Other Title: </xsl:with-param>
+         <xsl:with-param name="label">Other title: </xsl:with-param>
        </xsl:call-template>
     </xsl:if>
 
@@ -898,7 +898,7 @@
     </xsl:if>
     <xsl:if test="marc:datafield[@tag=856]">
          <span class="results_summary">
-			   <span class="label">Online Access: </span>
+			   <span class="label">Online access: </span>
                             <xsl:for-each select="marc:datafield[@tag=856]">
                             <xsl:variable name="SubqText"><xsl:value-of select="marc:subfield[@code='q']"/></xsl:variable>
 				   <a><xsl:attribute name="href"><xsl:value-of select="marc:subfield[@code='u']"/></xsl:attribute>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl
index 38d1acd6ee..9d1264384c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl
@@ -253,7 +253,7 @@
                     <span class="label">Manufacturer: </span>
                 </xsl:when>
                 <xsl:when test="$ind2='4'">
-                    <span class="label">Copyright Date: </span>
+                    <span class="label">Copyright date: </span>
                 </xsl:when>
             </xsl:choose>
             <xsl:call-template name="subfieldSelect">
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
index 466b41f89e..6a92a4e0fc 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
@@ -75,7 +75,7 @@
                         <xsl:when test="$leader7='c' or $leader7='d' or $leader7='m'">Book</xsl:when>
                         <xsl:when test="$leader7='i' or $leader7='s'">
                             <xsl:choose>
-                                <xsl:when test="substring($controlField008,22,1)!='m'">Continuing Resource</xsl:when>
+                                <xsl:when test="substring($controlField008,22,1)!='m'">Continuing resource</xsl:when>
                                 <xsl:otherwise>Series</xsl:otherwise>
                             </xsl:choose>
                         </xsl:when>
@@ -437,7 +437,7 @@
             <xsl:if test="marc:datafield[@tag=336] or marc:datafield[@tag=337] or marc:datafield[@tag=338]">
                 <span class="results_summary" id="content_type">
                     <xsl:if test="marc:datafield[@tag=336]">
-                        <span class="label">Content Type: </span>
+                        <span class="label">Content type: </span>
                         <xsl:for-each select="marc:datafield[@tag=336]">
                             <xsl:call-template name="subfieldSelect">
                                 <xsl:with-param name="codes">a</xsl:with-param>
@@ -449,7 +449,7 @@
                     <xsl:text> </xsl:text>
                     <!-- Media Type -->
                     <xsl:if test="marc:datafield[@tag=337]">
-                        <span class="label">Media Type: </span>
+                        <span class="label">Media type: </span>
                         <xsl:for-each select="marc:datafield[@tag=337]">
                             <xsl:call-template name="subfieldSelect">
                                 <xsl:with-param name="codes">a</xsl:with-param>
@@ -461,7 +461,7 @@
                     <xsl:text> </xsl:text>
                     <!-- Media Type -->
                     <xsl:if test="marc:datafield[@tag=338]">
-                        <span class="label">Carrier Type: </span>
+                        <span class="label">Carrier type: </span>
                         <xsl:for-each select="marc:datafield[@tag=338]">
                             <xsl:call-template name="subfieldSelect">
                                 <xsl:with-param name="codes">a</xsl:with-param>
@@ -632,7 +632,7 @@
 
             <!-- #13382 Added Related works 700$i -->
             <xsl:if test="marc:datafield[@tag=700][marc:subfield[@code='i']] or marc:datafield[@tag=710][marc:subfield[@code='i']] or marc:datafield[@tag=711][marc:subfield[@code='i']]">
-                <span class="results_summary related_works"><span class="label">Related Works: </span>
+                <span class="results_summary related_works"><span class="label">Related works: </span>
                     <xsl:for-each select="marc:datafield[@tag=700][marc:subfield[@code='i']] | marc:datafield[@tag=710][marc:subfield[@code='i']] | marc:datafield[@tag=711][marc:subfield[@code='i']]">
                         <xsl:variable name="str">
                             <xsl:call-template name="subfieldSelect">
@@ -674,7 +674,7 @@
 
             <!-- #13382 Added Contained Works 7xx@ind2=2 -->
             <xsl:if test="marc:datafield[@tag=700][@ind2=2 and not(marc:subfield[@code='i'])] or marc:datafield[@tag=710][@ind2=2 and not(marc:subfield[@code='i'])] or marc:datafield[@tag=711][@ind2=2 and not(marc:subfield[@code='i'])]">
-                <span class="results_summary contained_works"><span class="label">Contained Works: </span>
+                <span class="results_summary contained_works"><span class="label">Contained works: </span>
                     <xsl:for-each select="marc:datafield[@tag=700][@ind2=2][not(marc:subfield[@code='i'])] | marc:datafield[@tag=710][@ind2=2][not(marc:subfield[@code='i'])] | marc:datafield[@tag=711][@ind2=2][not(marc:subfield[@code='i'])]">
                         <xsl:variable name="str">
                             <xsl:call-template name="subfieldSelect">
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl
index 39ac70d5a6..18225acd3f 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl
@@ -559,16 +559,16 @@
                 <xsl:when test="$leader6='a'">
                     <xsl:choose>
                         <xsl:when test="$leader7='c' or $leader7='d' or $leader7='m'"><img src="/opac-tmpl/lib/famfamfam/silk/book.png" alt="book" title="book" class="materialtype"/> Book</xsl:when>
-                        <xsl:when test="$leader7='i' or $leader7='s'"><img src="/opac-tmpl/lib/famfamfam/silk/newspaper.png" alt="serial" title="serial" class="materialtype"/> Continuing Resource</xsl:when>
+                        <xsl:when test="$leader7='i' or $leader7='s'"><img src="/opac-tmpl/lib/famfamfam/silk/newspaper.png" alt="serial" title="serial" class="materialtype"/> Continuing resource</xsl:when>
                         <xsl:when test="$leader7='a' or $leader7='b'"><img src="/opac-tmpl/lib/famfamfam/silk/book_open.png" alt="article" title="article" class="materialtype"/> Article</xsl:when>
                     </xsl:choose>
                 </xsl:when>
                 <xsl:when test="$leader6='t'"><img src="/opac-tmpl/lib/famfamfam/silk/book.png" alt="book" title="book" class="materialtype"/> Book</xsl:when>
                 <xsl:when test="$leader6='o'"><img src="/opac-tmpl/lib/famfamfam/silk/report_disk.png" alt="kit" title="kit" class="materialtype"/> Kit</xsl:when>
-                <xsl:when test="$leader6='p'"><img src="/opac-tmpl/lib/famfamfam/silk/report_disk.png" alt="mixed materials" title="mixed materials" class="materialtype"/>Mixed Materials</xsl:when>
-                <xsl:when test="$leader6='m'"><img src="/opac-tmpl/lib/famfamfam/silk/computer_link.png" alt="computer file" title="computer file" class="materialtype"/> Computer File</xsl:when>
+                <xsl:when test="$leader6='p'"><img src="/opac-tmpl/lib/famfamfam/silk/report_disk.png" alt="mixed materials" title="mixed materials" class="materialtype"/>Mixed materials</xsl:when>
+                <xsl:when test="$leader6='m'"><img src="/opac-tmpl/lib/famfamfam/silk/computer_link.png" alt="computer file" title="computer file" class="materialtype"/> Computer file</xsl:when>
                 <xsl:when test="$leader6='e' or $leader6='f'"><img src="/opac-tmpl/lib/famfamfam/silk/map.png" alt="map" title="map" class="materialtype"/> Map</xsl:when>
-                <xsl:when test="$leader6='g' or $leader6='k' or $leader6='r'"><img src="/opac-tmpl/lib/famfamfam/silk/film.png" alt="visual material" title="visual material" class="materialtype"/> Visual Material</xsl:when>
+                <xsl:when test="$leader6='g' or $leader6='k' or $leader6='r'"><img src="/opac-tmpl/lib/famfamfam/silk/film.png" alt="visual material" title="visual material" class="materialtype"/> Visual material</xsl:when>
                 <xsl:when test="$leader6='c' or $leader6='d'"><img src="/opac-tmpl/lib/famfamfam/silk/music.png" alt="score" title="score" class="materialtype"/> Score</xsl:when>
                 <xsl:when test="$leader6='i'"><img src="/opac-tmpl/lib/famfamfam/silk/sound.png" alt="sound" title="sound" class="materialtype"/> Sound</xsl:when>
                 <xsl:when test="$leader6='j'"><img src="/opac-tmpl/lib/famfamfam/silk/sound.png" alt="music" title="music" class="materialtype"/> Music</xsl:when>
@@ -1007,7 +1007,7 @@
     </xsl:if>
     <xsl:if test="marc:datafield[@tag=856]">
          <span class="results_summary online_resources">
-			   <span class="label">Online Access: </span>
+			   <span class="label">Online access: </span>
                             <xsl:for-each select="marc:datafield[@tag=856]">
                             <xsl:variable name="SubqText"><xsl:value-of select="marc:subfield[@code='q']"/></xsl:variable>
                             <xsl:if test="$OPACURLOpenInNewWindow='0'">
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slimUtils.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slimUtils.xsl
index bc68f37b38..9ceb9edc0a 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slimUtils.xsl
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slimUtils.xsl
@@ -251,7 +251,7 @@
                     <span class="label">Manufacturer: </span>
                 </xsl:when>
                 <xsl:when test="$ind2='4'">
-                    <span class="label">Copyright Date: </span>
+                    <span class="label">Copyright date: </span>
                 </xsl:when>
             </xsl:choose>
             <xsl:call-template name="subfieldSelect">
-- 
2.39.2