From fe0339ae9e969efef7f1294630a623921767252a Mon Sep 17 00:00:00 2001 From: Lucas Gass Date: Thu, 6 Aug 2020 17:29:54 +0000 Subject: [PATCH] Bug 25744: Replace with in staff interface Signed-off-by: Owen Leonard Signed-off-by: Julian Maurice --- .../prog/en/includes/borrower_debarments.inc | 2 +- .../intranet-tmpl/prog/en/includes/holds_table.inc | 8 ++++---- .../prog/en/includes/patron-article-requests.inc | 2 +- .../intranet-tmpl/prog/en/includes/permissions.inc | 2 +- .../prog/en/modules/acqui/lateorders.tt | 6 +++--- .../prog/en/modules/acqui/newordersuggestion.tt | 10 +++++----- .../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 10 +++++----- .../prog/en/modules/admin/aqbudgetperiods.tt | 2 +- .../prog/en/modules/admin/aqcontract.tt | 2 +- .../en/modules/admin/auth_subfields_structure.tt | 4 ++-- .../prog/en/modules/admin/categories.tt | 4 ++-- .../en/modules/admin/marc_subfields_structure.tt | 4 ++-- .../en/modules/admin/preferences/cataloguing.pref | 2 +- .../en/modules/admin/preferences/searching.pref | 2 +- .../prog/en/modules/catalogue/MARCdetail.tt | 2 +- .../prog/en/modules/catalogue/detail.tt | 6 +++--- .../prog/en/modules/catalogue/imageviewer.tt | 4 ++-- .../prog/en/modules/catalogue/issuehistory.tt | 2 +- .../prog/en/modules/catalogue/labeledMARCdetail.tt | 2 +- .../prog/en/modules/catalogue/moredetail.tt | 2 +- .../prog/en/modules/catalogue/stockrotation.tt | 2 +- .../prog/en/modules/cataloguing/addbooks.tt | 2 +- .../prog/en/modules/cataloguing/linkitem.tt | 4 ++-- .../prog/en/modules/cataloguing/moveitem.tt | 6 +++--- .../prog/en/modules/circ/circulation.tt | 14 +++++++------- .../prog/en/modules/circ/pendingreserves.tt | 4 ++-- .../prog/en/modules/clubs/club-enrollments.tt | 2 +- .../prog/en/modules/clubs/clubs-add-modify.tt | 8 ++++---- .../intranet-tmpl/prog/en/modules/clubs/clubs.tt | 8 ++++---- .../prog/en/modules/clubs/patron-enroll.tt | 2 +- .../prog/en/modules/clubs/templates-add-modify.tt | 4 ++-- .../en/modules/course_reserves/add_items-step1.tt | 2 +- .../en/modules/course_reserves/add_items-step2.tt | 6 +++--- .../en/modules/course_reserves/batch_add_items.tt | 4 ++-- .../en/modules/course_reserves/course-details.tt | 12 ++++++------ .../prog/en/modules/course_reserves/course.tt | 2 +- .../prog/en/modules/members/memberentrygen.tt | 2 +- .../prog/en/modules/members/moremember.tt | 6 +++--- .../prog/en/modules/plugins/plugins-home.tt | 2 +- .../prog/en/modules/reserve/request.tt | 2 +- .../en/modules/rotating_collections/addItems.tt | 12 ++++++------ .../rotating_collections/editCollections.tt | 12 ++++++------ .../rotating_collections/transferCollection.tt | 4 ++-- .../prog/en/modules/serials/routing-preview.tt | 4 ++-- .../prog/en/modules/serials/routing.tt | 6 +++--- .../prog/en/modules/serials/serials-collection.tt | 4 ++-- .../prog/en/modules/serials/serials-edit.tt | 4 ++-- .../prog/en/modules/serials/subscription-add.tt | 4 ++-- .../prog/en/modules/serials/subscription-detail.tt | 8 ++++---- .../prog/en/modules/serials/viewalerts.tt | 4 ++-- .../prog/en/modules/suggestion/suggestion.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/tags/list.tt | 6 +++--- .../modules/tools/marc_modification_templates.tt | 4 ++-- .../prog/en/modules/virtualshelves/shelves.tt | 6 +++--- 54 files changed, 127 insertions(+), 127 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc index 8a0efadaa1..511a6b88a5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc @@ -37,7 +37,7 @@ [% d.comment | $raw %] [% END %] - [% IF d.expiration %] [% d.expiration | $KohaDates %] [% ELSE %] Indefinite [% END %] + [% IF d.expiration %] [% d.expiration | $KohaDates %] [% ELSE %] Indefinite [% END %] [% d.created | $KohaDates %] [% IF CAN_user_borrowers_edit_borrowers && CAN_user_circulate_manage_restrictions %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc index f3aed75062..fa8c1f6d3f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc @@ -151,7 +151,7 @@ [% ELSE %] [% IF ( hold.item_level_hold ) %] - + Only item [% IF ( hold.barcodenumber ) %] @@ -161,12 +161,12 @@ No barcode [% END %] - + [% ELSE %] [% IF hold.itemtype %] - Next available [% ItemTypes.GetDescription( hold.itemtype ) | html %] item + Next available [% ItemTypes.GetDescription( hold.itemtype ) | html %] item [% ELSE %] - Next available + Next available [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-article-requests.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-article-requests.inc index dca996ef96..25279adfc8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-article-requests.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-article-requests.inc @@ -27,7 +27,7 @@ [% ar.item.enumchron | html %] [% ar.biblio.author | html %] - [% IF ar.itemnumber %] (only [% ar.item.barcode | html %])[% END %] + [% IF ar.itemnumber %] (only [% ar.item.barcode | html %])[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc index b8beb111ee..1d6f60be4e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc @@ -662,7 +662,7 @@ ([% name | html %]) [%- CASE 'upload_manage' -%] - Manage uploaded files (Useless without upload_general_files) + Manage uploaded files (Useless without upload_general_files) ([% name | html %]) [%- CASE 'access_files' -%] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt index 1c81debcab..30dcef50b4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt @@ -99,11 +99,11 @@ [% lateorder.biblio.title | html %] - [% IF ( lateorder.biblio.author ) %]
Author: [% lateorder.biblio.author | html %][% END %] + [% IF ( lateorder.biblio.author ) %]
Author: [% lateorder.biblio.author | html %][% END %] [% IF ( lateorder.biblio.biblioitem.publishercode ) %] -
Published by: [% lateorder.biblio.biblioitem.publishercode | html %] +
Published by: [% lateorder.biblio.biblioitem.publishercode | html %] [% IF ( lateorder.biblio.biblioitem.publicationyear ) %] - in [% lateorder.biblio.biblioitem.publicationyear | html %] + in [% lateorder.biblio.biblioitem.publicationyear | html %] [% END %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt index ec64d8120c..aefe8865e4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt @@ -46,12 +46,12 @@

[% suggestions_loo.title | html %] - [% suggestions_loo.author | html %]

[% IF ( suggestions_loo.copyrightdate ) %]© [% suggestions_loo.copyrightdate | html %] [% END %] - [% IF ( suggestions_loo.volumedesc ) %]volume: [% suggestions_loo.volumedesc | html %] [% END %] - [% IF ( suggestions_loo.isbn ) %]ISBN: [% suggestions_loo.isbn | html %] [% END %] + [% IF ( suggestions_loo.volumedesc ) %]volume: [% suggestions_loo.volumedesc | html %] [% END %] + [% IF ( suggestions_loo.isbn ) %]ISBN: [% suggestions_loo.isbn | html %] [% END %] [% IF ( suggestions_loo.publishercode ) %]
published by: [% suggestions_loo.publishercode | html %] [% END %] - [% IF ( suggestions_loo.publicationyear ) %] in [% suggestions_loo.publicationyear | html %] [% END %] - [% IF ( suggestions_loo.place ) %] in [% suggestions_loo.place | html %] [% END %] - [% IF ( suggestions_loo.note ) %]

([% suggestions_loo.note | html %])

[% END %] + [% IF ( suggestions_loo.publicationyear ) %] in [% suggestions_loo.publicationyear | html %] [% END %] + [% IF ( suggestions_loo.place ) %] in [% suggestions_loo.place | html %] [% END %] + [% IF ( suggestions_loo.note ) %]

([% suggestions_loo.note | html %])

[% END %]

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 36798c3a47..f454b6b662 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt @@ -18,11 +18,11 @@