From 9dcfa320f50466ddd75eb90697e9ff3bb12722de Mon Sep 17 00:00:00 2001 From: Victor Grousset/tuxayo Date: Sat, 5 Feb 2022 21:43:04 +0100 Subject: [PATCH] Bug 29602: (follow-up) fix duplicate, missing or mismatching Signed-off-by: Martin Renvoize Signed-off-by: Fridolin Somers --- koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt | 2 +- .../intranet-tmpl/prog/en/modules/suggestion/suggestion.tt | 2 +- .../prog/en/modules/tools/additional-contents.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt | 4 ++-- koha-tmpl/opac-tmpl/bootstrap/en/includes/xslt-handler.inc | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc index 2ec1cd6ec8..e047700963 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc @@ -71,7 +71,7 @@ [%- data.cardnumber | html -%] [%- END -%] [%- ELSE -%] - A patron from library [% Branches.GetName( patron.branchcode ) | html -%] + A patron from library [% Branches.GetName( patron.branchcode ) | html -%] [%- END -%] [%- IF hide_patron_infos_if_needed AND ( display_patron_name OR display_cardnumber ) -%] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt index 2b3f4c1499..bbc9b3dc63 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt @@ -66,7 +66,7 @@ [% END %]

[% IF ( invoiceclosedate ) %] - Receipt summary for [% name | html %] [% IF ( invoice ) %] [ [% invoice | html %] ] [% END %] + Receipt summary for [% name | html %] [% IF ( invoice ) %] [ [% invoice | html %] ] [% END %] [% ELSE %] Receive orders from [% name | html %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt index dd6206780f..7582f6d18b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt @@ -7,7 +7,7 @@ [% IF (server.servertype||type) == 'sru' %] SRU [% ELSIF (server.servertype||type) == 'zed' %] - Z39.50 + Z39.50 [% END %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt index 5d45ddc190..14f7d18188 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt @@ -87,7 +87,7 @@ [% QUEUED_MESSAGE.time_queued | $KohaDates with_hours => 1 %] [% IF ( QUEUED_MESSAGE.failure_code ) %] - [% IF ( QUEUED_MESSAGE.failure_code == "INVALID_BORNUMBER" ) %]Invalid borrowernumber [% borrowernumber | html %] + [% IF ( QUEUED_MESSAGE.failure_code == "INVALID_BORNUMBER" ) %]Invalid borrowernumber [% borrowernumber | html %] [% ELSIF ( QUEUED_MESSAGE.failure_code == 'NO_EMAIL' ) %]Unable to find an email address for this borrower [% ELSIF (matches = QUEUED_MESSAGE.failure_code.match('INVALID_EMAIL:(\w+)') ) %]Invalid [% matches.0 | html %] email address found [% borrowernumber | html %] [% ELSIF ( QUEUED_MESSAGE.failure_code == 'NO_FROM' ) %]Missing from email address diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt index 438a85cea1..22f161aea8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt @@ -198,7 +198,7 @@ Pending [% SET status_found = 1 %] [% ELSIF ( STATUS == 'ACCEPTED' ) %] - Accepted + Accepted [% SET status_found = 1 %] [% ELSIF ( STATUS == 'CHECKED' ) %] Checked diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt index 0313ced75e..fed0a8864e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt @@ -86,7 +86,7 @@ [% CASE 'error_on_update' %] An error occurred when updating this content. Perhaps it already exists [% CASE 'error_on_insert' %] - An error occurred when adding this content. Check the logs + An error occurred when adding this content. Check the logs [% CASE 'error_on_delete' %] An error occurred when deleting this content. Check the logs [% CASE 'success_on_update' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt index 1ce6001c70..9aacf152de 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt @@ -314,9 +314,9 @@ [% FOREACH problem IN result.problems %] [% IF problem.key == 'wrongplace' %] - Found in wrong place
+ Found in wrong place
[% ELSIF problem.key == 'changestatus' %] - Unknown not-for-loan status
+ Unknown not-for-loan status
[% ELSIF problem.key == 'not_scanned' %] Missing (not scanned)
[% ELSIF problem.key == 'checkedout' %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/xslt-handler.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/xslt-handler.inc index 42862057e9..bfe0f15138 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/xslt-handler.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/xslt-handler.inc @@ -2,7 +2,7 @@ [% CASE 'XSLTH_ERR_NO_FILE' %] No XSLT file passed. [% CASE 'XSLTH_ERR_FILE_NOT_FOUND' %] - XSLT file not found. + XSLT file not found. [% CASE 'XSLTH_ERR_LOADING' %] Error while loading stylesheet. [% CASE 'XSLTH_ERR_PARSING_CODE' %] -- 2.39.5