From 558af376988278948989fad1376fdf6ee0359297 Mon Sep 17 00:00:00 2001
From: Garry Collum <gcollum@gmail.com>
Date: Wed, 3 Aug 2022 18:00:02 +0000
Subject: [PATCH] lp1983129-Bootstrap Opac: Inconsistent wording in My Account

Removes the word "Current" and "Currently" from the holds and items checked out
menus and pages in My Account, and fixes capitalization in the summary screen.

Also removes 'Current' from the menus and screens for E-items out, and E-items
on hold.

Signed-off-by: Garry Collum <gcollum@gmail.com>
Signed-off-by: Gina Monti <gmonti@biblio.org>
Signed-off-by: Jane Sandberg <sandbergja@gmail.com>
---
 Open-ILS/src/templates-bootstrap/opac/myopac/circs.tt2       |  2 +-
 Open-ILS/src/templates-bootstrap/opac/myopac/ebook_circs.tt2 |  4 ++--
 Open-ILS/src/templates-bootstrap/opac/myopac/holds.tt2       |  2 +-
 Open-ILS/src/templates-bootstrap/opac/myopac/main.tt2        | 12 ++++++------
 Open-ILS/src/templates-bootstrap/opac/parts/myopac/base.tt2  |  4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/circs.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/circs.tt2
index 2997c38807..6d68fd8dde 100755
--- a/Open-ILS/src/templates-bootstrap/opac/myopac/circs.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/myopac/circs.tt2
@@ -5,7 +5,7 @@
     myopac_page = "circs";
     parent="circs";
 %]
-<h3>[% l('Current Items Checked Out') %]</h3>
+<h3>[% l('Items Checked Out') %]</h3>
 <div id='myopac_checked_div'>
 
     <div>
diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/ebook_circs.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/ebook_circs.tt2
index cd53f5089f..48c64e6381 100755
--- a/Open-ILS/src/templates-bootstrap/opac/myopac/ebook_circs.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/myopac/ebook_circs.tt2
@@ -5,13 +5,13 @@
     myopac_page = "ebook_circs";
     parent="circs";
 %]
-<h3>[% l('E-Items Currently Checked Out') %]</h3>
+<h3>[% l('E-Items Checked Out') %]</h3>
 <div id='myopac_checked_div'>
     <div id="no_ebook_circs" class="warning_box hidden">[% l('You have no e-items checked out.') %]</div>
     <div id="ebook_spinner"><img src="[% ctx.media_prefix %]/opac/images/progressbar_green.gif[% ctx.cache_key %]" alt="[% l("Loading...") %]"/></div>
     <div id='ebook_circs_main' class="hidden">
         <table id="ebook_circs_main_table"
-            title="[% l('E-Items Currently Checked Out') %]"
+            title="[% l('E-Items Checked Out') %]"
             class="table table-hover table-bordered miniTable w-100 ecircsTable">
             <thead>
             <tr>
diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/holds.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/holds.tt2
index 590253e901..f9dbbc38a1 100755
--- a/Open-ILS/src/templates-bootstrap/opac/myopac/holds.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/myopac/holds.tt2
@@ -13,7 +13,7 @@
 <h3> [%  IF CGI.param("available");
                     l("Items Ready for Pickup");
                 ELSE;
-                    l("Current Items on Hold");
+                    l("Items on Hold");
                 END
             %]</h3>
 <div>
diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/main.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/main.tt2
index 29b8198538..87dae3f4d8 100755
--- a/Open-ILS/src/templates-bootstrap/opac/myopac/main.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/myopac/main.tt2
@@ -33,19 +33,19 @@
                     <div class="col-12">
                      <a href="[% mkurl(ctx.opac_root _ '/myopac/circs') %]"
                             title="[% l('View My Checked Out Items') %]">
-                            [% l("Items Currently Checked out ([_1])", ctx.user_stats.checkouts.total_out) %]
+                            [% l("Items Checked out ([_1])", ctx.user_stats.checkouts.total_out) %]
                         </a>
                     </div>
                      <div class="col-12">
                      <a href="[% mkurl(ctx.opac_root _ '/myopac/holds') %]"
                             title="[% l('View My Holds') %]">
-                            [% l('Items Currently on Hold ([_1])', ctx.user_stats.holds.total) %]
+                            [% l('Items on Hold ([_1])', ctx.user_stats.holds.total) %]
                         </a>
                     </div>
                     <div class="col-12">
                      <a href="[% mkurl(ctx.opac_root _ '/myopac/holds', {available => 1}) %]"
                             title="[% l('View My Holds Ready for Pickup') %]">
-                            [% l('Items ready for pickup ([_1])', ctx.user_stats.holds.ready) %]
+                            [% l('Items Ready for Pickup ([_1])', ctx.user_stats.holds.ready) %]
                         </a>
                     </div>
                     <br><br>
@@ -54,21 +54,21 @@
                     <div class="col-12">
                      <a href="[% mkurl(ctx.opac_root _ '/myopac/ebook_circs') %]"
                             title="[% l('View My Checked Out E-Items') %]">
-                            [% l("E-Items Currently Checked out") %] (<span id="acct_sum_ebook_circ_total">-</span>)
+                            [% l("E-Items Checked out") %] (<span id="acct_sum_ebook_circ_total">-</span>)
                         </a>
                     </div>
                    
                     <div class="col-12">
                      <a href="[% mkurl(ctx.opac_root _ '/myopac/ebook_holds') %]"
                             title="[% l('View My E-Items On Hold') %]">
-                            [% l("E-Items Currently on Hold") %] (<span id="acct_sum_ebook_hold_total">-</span>)
+                            [% l("E-Items on Hold") %] (<span id="acct_sum_ebook_hold_total">-</span>)
                         </a>
                     </div>
                     
                     <div class="col-12">
                      <a href="[% mkurl(ctx.opac_root _ '/myopac/ebook_holds_ready') %]"
                             title="[% l('View My E-Items Ready for Pickup') %]">
-                            [% l("E-Items ready for pickup") %] (<span id="acct_sum_ebook_hold_ready_total">-</span>)
+                            [% l("E-Items Ready for Pickup") %] (<span id="acct_sum_ebook_hold_ready_total">-</span>)
                         </a>
                     </div>
                     [% END %]
diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/myopac/base.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/myopac/base.tt2
index 646440dd96..1cf7185823 100755
--- a/Open-ILS/src/templates-bootstrap/opac/parts/myopac/base.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/myopac/base.tt2
@@ -10,8 +10,8 @@
         {children => 0, parent => "parent", url => "messages", text => l("<i class='fas fa-envelope' aria-hidden='true'></i> <span class='sumNum'>[_1]</span>Messages",  ctx.user_stats.messages.unread), name => l("Messages")},
 
         {children => 3, parent => "parent",url => "circs", text => l("<i class='fas fa-book' aria-hidden='true'></i> <span class='sumNum'>[_1]</span>Items Checked Out", ctx.user_stats.checkouts.total_out), name = l("Circulations")},
-        {children => 0, parent => "circs", url => "circs", text => l("<i class='fas fa-book-reader' aria-hidden='true'></i> Current Items Checked Out"), name=> l("Circulations")},
-        {children => 0, parent => "circs", url => "ebook_circs", text => l("<i class='fas fa-desktop' aria-hidden='true'></i> E-Items Currently Checked Out"), name => l("E-Items Currently Checked Out")},
+        {children => 0, parent => "circs", url => "circs", text => l("<i class='fas fa-book-reader' aria-hidden='true'></i> Items Checked Out"), name=> l("Circulations")},
+        {children => 0, parent => "circs", url => "ebook_circs", text => l("<i class='fas fa-desktop' aria-hidden='true'></i> E-Items Checked Out"), name => l("E-Items Checked Out")},
         {children => 0, parent => "circs", url => "circ_history", text => l("<i class='fas fa-history' aria-hidden='true'></i> Check Out History"), name => l("Check Out History")},
 
         {children => 5, parent => "parent",url => "holds", text => l("<i class='fas fa-clock' aria-hidden='true'></i> <span class='sumNum'>[_1]</span>Holds / <span class='sumNum'>[_2]</span> Ready", ctx.user_stats.holds.total, ctx.user_stats.holds.ready), name => l("Holds")},
-- 
2.11.0