Bug 31672: Remove 'Your' from tab descriptions in OPAC patron account

I'll try to keep the test plan simple:
* Go to patron account in OPAC
* Verify that the your from the beginning of the tab
  descriptions has been removed

Bonus: This moves the Recalls history tab below the Holds history
as this is the more logical place for it.

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc
index 1c23e01..f81b58f 100644 (file)
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc
@@ -7,14 +7,14 @@
             [% ELSE %]
                 <li>
             [% END %]
-                <a href="/cgi-bin/koha/opac-user.pl">your summary</a></li>
+                <a href="/cgi-bin/koha/opac-user.pl">Summary</a></li>
             [% IF ( OPACFinesTab ) %]
                 [% IF ( accountview ) %]
                     <li class="active">
                 [% ELSE %]
                     <li>
                 [% END %]
-                <a href="/cgi-bin/koha/opac-account.pl">your charges</a></li>
+                <a href="/cgi-bin/koha/opac-account.pl">Charges</a></li>
             [% END %]
 
             [% IF ( userupdateview ) %]
@@ -22,11 +22,11 @@
             [% ELSE %]
                 <li>
             [% END %]
-                <a href="/cgi-bin/koha/opac-memberentry.pl">your personal details</a></li>
+                <a href="/cgi-bin/koha/opac-memberentry.pl">Personal details</a></li>
 
             [% IF Koha.Preference('GDPR_Policy') # remove when extending %]
                 [% IF consentview %]<li class="active">[% ELSE %]<li>[% END %]
-                    <a href="/cgi-bin/koha/opac-patron-consent.pl">your consents</a>
+                    <a href="/cgi-bin/koha/opac-patron-consent.pl">Consents</a>
                 </li>
             [% END %]
 
@@ -36,7 +36,7 @@
                 [% ELSE %]
                     <li>
                 [% END %]
-                <a href="/cgi-bin/koha/opac-tags.pl?mine=1">your tags</a></li>
+                <a href="/cgi-bin/koha/opac-tags.pl?mine=1">Tags</a></li>
             [% END %]
 
             [% IF logged_in_user.category.effective_change_password %]
@@ -45,7 +45,7 @@
                 [% ELSE %]
                     <li>
                 [% END %]
-                <a href="/cgi-bin/koha/opac-passwd.pl">change your password</a></li>
+                <a href="/cgi-bin/koha/opac-passwd.pl">Change password</a></li>
             [% END %]
 
             [% IF EnableOpacSearchHistory %]
@@ -54,7 +54,7 @@
                 [% ELSE %]
                     <li>
                 [% END %]
-                <a href="/cgi-bin/koha/opac-search-history.pl">your search history</a></li>
+                <a href="/cgi-bin/koha/opac-search-history.pl">Search history</a></li>
             [% END %]
 
             [% IF ( opacreadinghistory ) %]
@@ -63,14 +63,14 @@
                 [% ELSE %]
                     <li>
                 [% END %]
-                <a href="/cgi-bin/koha/opac-readingrecord.pl">your checkout history</a></li>
+                <a href="/cgi-bin/koha/opac-readingrecord.pl">Checkout history</a></li>
                 [% IF ( OPACPrivacy ) %]
                     [% IF ( privacyview ) %]
                         <li class="active">
                     [% ELSE %]
                         <li>
                     [% END %]
-                    <a href="/cgi-bin/koha/opac-privacy.pl">your privacy</a></li>
+                    <a href="/cgi-bin/koha/opac-privacy.pl">Privacy</a></li>
                 [% END %]
             [% END # / opacreadinghistory %]
 
@@ -80,7 +80,16 @@
                 [% ELSE %]
                     <li>
                 [% END %]
-                <a href="/cgi-bin/koha/opac-holdshistory.pl">your holds history</a></li>
+                <a href="/cgi-bin/koha/opac-holdshistory.pl">Holds history</a></li>
+            [% END %]
+
+            [% IF Koha.Preference('UseRecalls') %]
+                [% IF ( recallsview ) %]
+                    <li class="active">
+                [% ELSE %]
+                    <li>
+                [% END %]
+                <a href="/cgi-bin/koha/opac-recalls.pl">Recalls history</a>
             [% END %]
 
             [% IF ( suggestion ) %]
@@ -89,7 +98,7 @@
                 [% ELSE %]
                     <li>
                 [% END %]
-                <a href="/cgi-bin/koha/opac-suggestions.pl">your purchase suggestions</a></li>
+                <a href="/cgi-bin/koha/opac-suggestions.pl">Purchase suggestions</a></li>
             [% END %]
 
             [% IF ( EnhancedMessagingPreferences ) %]
@@ -99,7 +108,7 @@
                     [% ELSE %]
                         <li>
                     [% END %]
-                    <a href="/cgi-bin/koha/opac-messaging.pl">your messaging</a></li>
+                    <a href="/cgi-bin/koha/opac-messaging.pl">Messaging</a></li>
                  [% END %]
             [% END %]
 
@@ -109,7 +118,7 @@
                 [% ELSE %]
                     <li>
                 [% END %]
-                <a href="/cgi-bin/koha/opac-shelves.pl?op=list">your lists</a></li>
+                <a href="/cgi-bin/koha/opac-shelves.pl?op=list">Lists</a></li>
             [% END %]
 
             [% IF Koha.Preference( 'RoutingSerials' ) && logged_in_user && logged_in_user.get_routing_lists.count %]
@@ -118,7 +127,7 @@
                 [% ELSE %]
                     <li>
                 [% END %]
-                <a href="/cgi-bin/koha/opac-routing-lists.pl">your routing lists</a></li>
+                <a href="/cgi-bin/koha/opac-routing-lists.pl">Routing lists</a></li>
             [% END %]
 
             [% IF Koha.Preference( 'useDischarge' ) == 1 %]
@@ -127,7 +136,7 @@
                 [% ELSE %]
                     <li>
                 [% END %]
-                <a href="/cgi-bin/koha/opac-discharge.pl">ask for a discharge</a></li>
+                <a href="/cgi-bin/koha/opac-discharge.pl">Ask for discharge</a></li>
             [% END %]
 
             [% IF Koha.Preference( 'ILLModule' ) == 1 %]
@@ -136,7 +145,7 @@
                 [% ELSE %]
                     <li>
                 [% END %]
-                <a href="/cgi-bin/koha/opac-illrequests.pl">your interlibrary loan requests</a></li>
+                <a href="/cgi-bin/koha/opac-illrequests.pl">Interlibrary loan requests</a></li>
             [% END %]
 
             [% IF Koha.Preference( 'CurbsidePickup' ) %]
@@ -145,16 +154,7 @@
                 [% ELSE %]
                     <li>
                 [% END %]
-                <a href="/cgi-bin/koha/opac-curbside-pickups.pl">your curbside pickups</a></li>
-            [% END %]
-
-            [% IF Koha.Preference('UseRecalls') %]
-                [% IF ( recallsview ) %]
-                    <li class="active">
-                [% ELSE %]
-                    <li>
-                [% END %]
-                <a href="/cgi-bin/koha/opac-recalls.pl">your recalls history</a>
+                <a href="/cgi-bin/koha/opac-curbside-pickups.pl">Curbside pickups</a></li>
             [% END %]
 
         </ul>