From 8c81690d449ae0c68c71e65cb770f77a2eb60444 Mon Sep 17 00:00:00 2001
From: Katrin Fischer <katrin.fischer.83@web.de>
Date: Sat, 28 Mar 2020 01:05:14 +0100
Subject: [PATCH] Bug 25014: Fix capitalization for "Call Number" in staff and
 OPAC sort options

There are some ocurrences of "Call Number" in the sort option lists in
staff and OPAC. The patch changes them to "Call number".

To test:
- Check the sort option list in staff and OPAC for the typo
- Apply patch
- Verify it's now all corrected

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Joy Nelson <joy@bywatersolutions.com>
(cherry picked from commit b85e53dccb76e2a462255b01c6e37f2f040b7ff2)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
---
 koha-tmpl/intranet-tmpl/prog/en/includes/resort_form.inc     | 4 ++--
 koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt | 4 ++--
 koha-tmpl/opac-tmpl/bootstrap/en/includes/resort_form.inc    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/resort_form.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/resort_form.inc
index 4326bea4fa..2cc9d2281c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/resort_form.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/resort_form.inc
@@ -30,10 +30,10 @@
 
 </optgroup>
 
-<optgroup label="Call Number">
+<optgroup label="Call number">
 	
 	[% IF ( sort_by == "call_number_asc" ) %]
-<option value="call_number_asc" selected="selected">Call Number (0-9 to A-Z)</option>
+<option value="call_number_asc" selected="selected">Call number (0-9 to A-Z)</option>
 [% ELSE %]
     <option value="call_number_asc">Call number (0-9 to A-Z)</option>
 [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
index 54a04feab7..9d975c2cec 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
@@ -206,9 +206,9 @@
                                     <li class="dropdown-header">Call number</li>
 
                                     [% IF ( sort_by == "call_number_asc" ) %]
-                                        <li><a href="/cgi-bin/koha/catalogue/search.pl?sort_by=call_number_asc[% PROCESS sort_search_query %]"><i class="fa fa-check"></i> Call Number (0-9 to A-Z)</a></li>
+                                        <li><a href="/cgi-bin/koha/catalogue/search.pl?count=[% results_per_page | uri %]&sort_by=call_number_asc[% PROCESS sort_search_query %]"><i class="fa fa-check"></i> Call number (0-9 to A-Z)</a></li>
                                     [% ELSE %]
-                                        <li><a href="/cgi-bin/koha/catalogue/search.pl?sort_by=call_number_asc[% PROCESS sort_search_query %]">Call Number (0-9 to A-Z)</a></li>
+                                        <li><a href="/cgi-bin/koha/catalogue/search.pl?count=[% results_per_page | uri %]&sort_by=call_number_asc[% PROCESS sort_search_query %]">Call number (0-9 to A-Z)</a></li>
                                     [% END %]
 
                                     [% IF ( sort_by == "call_number_dsc" ) %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/resort_form.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/resort_form.inc
index c5a30f6e6b..1d25106b05 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/resort_form.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/resort_form.inc
@@ -23,7 +23,7 @@
         <option value="author_za">Author (Z-A)</option>
     [% END %]
 </optgroup>
-<optgroup label="Call Number">
+<optgroup label="Call number">
     [% IF ( sort_by == "call_number_asc" ) %]
         <option value="call_number_asc" selected="selected">Call number (0-9 to A-Z)</option>
     [% ELSE %]
-- 
2.39.5