From 539cade6289ae6263a079ab973f737e349b81e78 Mon Sep 17 00:00:00 2001 From: Lucas Gass Date: Wed, 27 May 2020 21:35:16 +0000 Subject: [PATCH] Bug 22672: Change to and to in templates, includes, xslt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This patch attempts to replace with AND with in order to more accessible to screen readers. This patch makes no attempt to change Font Awesome icons which typically use . I found templates, includes and XSLT by using 'git grep ‘’ koha-tmpl/opac-tmpl/bootstrap/en/' and git grep ‘’ koha-tmpl/opac-tmpl/bootstrap/en/ TEST PLAN: There should be no visible difference on the changed pages. The files changed are: koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-note.inc koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/enroll.tt koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-MARCdetail.tt koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authoritiessearchresultlist.tt koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-overdrive-search.tt koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results-grouped.tt koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-review.tt koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslim2OPACResults.xsl koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACResults.xsl Read the changes and make sure everything looks correct, try to visit as many pages as possible and confirm that everything looks as it should. grep around for cases of or that I could have missed. --- koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc | 12 ++++++------ koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-note.inc | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/enroll.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-auth-MARCdetail.tt | 4 ++-- .../bootstrap/en/modules/opac-authoritiessearchresultlist.tt | 4 ++-- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-course-details.tt | 6 +++--- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt | 4 ++-- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt | 4 ++-- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-overdrive-search.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-results-grouped.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-review.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 6 +++--- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt | 2 +- .../opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl | 8 ++++---- .../opac-tmpl/bootstrap/en/xslt/NORMARCslim2OPACResults.xsl | 4 ++-- .../opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACResults.xsl | 4 ++-- 22 files changed, 40 insertions(+), 40 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc index 202311d30d..610c968649 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc @@ -105,7 +105,7 @@ [% IF ( HOLD.is_at_destination ) %] [% IF ( HOLD.found ) %] - Item waiting at [% HOLD.branch.branchname | html %] + Item waiting at [% HOLD.branch.branchname | html %] [% IF ( HOLD.waitingdate ) %] since [% HOLD.waitingdate | $KohaDates %] [% IF HOLD.expirationdate %] @@ -114,15 +114,15 @@ [% END %] [% ELSE %] - Item waiting to be pulled from [% Branches.GetName( HOLD.branchcode ) | html %] + Item waiting to be pulled from [% Branches.GetName( HOLD.branchcode ) | html %] [% END %] [% ELSE %] - Item in transit to [% Branches.GetName( HOLD.branchcode ) | html %] + Item in transit to [% Branches.GetName( HOLD.branchcode ) | html %] [% END %] [% ELSE %] [% IF ( HOLD.is_in_transit ) %] [% SET transfer = HOLD.item.get_transfer %] - Item in transit from [% Branches.GetName( transfer.frombranch ) | html %] since + Item in transit from [% Branches.GetName( transfer.frombranch ) | html %] since [% transfer.datesent | $KohaDates %] [% ELSIF ( HOLD.suspend ) %] Suspended [% IF ( HOLD.suspend_until ) %] until [% HOLD.suspend_until | $KohaDates %] [% END %] @@ -152,9 +152,9 @@