From f662f55f91ac32611abf7e27f61505d7aad1d295 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 6 Jun 2023 14:59:36 +0000 Subject: [PATCH] Bug 33908: Improve translation of title tags: Acquisitions This patch updates acquisitions, suggestions, and ERM templates so that title tags can be more easily translated. To test, apply the patch and confirm that the following pages have the correct title tags: - Acquisitions -> Acquisitions home - Ordered - Spent - Vendors: Search, new, edit - Baskets: New, edit - New order - From an empty record - From an existing record - From existing orders (copy) - From a suggestion - From a subscription - From an external source - From a staged file - Basket groups - Receive shipments - Uncertain prices - Late orders - Suggestions - Invoices - Invoice details - Invoice files - Receive orders - Transfer order - Cancel order - EDIFACT messages - Order search - ERM --- .../prog/en/modules/acqui/acqui-home.tt | 6 +- .../prog/en/modules/acqui/addorder.tt | 8 ++- .../prog/en/modules/acqui/addorderiso2709.tt | 62 ++++++++++--------- .../prog/en/modules/acqui/basket.tt | 6 +- .../prog/en/modules/acqui/basketgroup.tt | 6 +- .../prog/en/modules/acqui/basketheader.tt | 15 +++-- .../prog/en/modules/acqui/booksellers.tt | 8 ++- .../prog/en/modules/acqui/cancelorder.tt | 7 ++- .../prog/en/modules/acqui/duplicate_orders.tt | 14 +++-- .../prog/en/modules/acqui/edi_ean.tt | 7 ++- .../prog/en/modules/acqui/edifactmsgs.tt | 7 ++- .../prog/en/modules/acqui/edimsg.tt | 7 ++- .../prog/en/modules/acqui/histsearch.tt | 12 +++- .../prog/en/modules/acqui/invoice-files.tt | 8 ++- .../prog/en/modules/acqui/invoice.tt | 8 ++- .../prog/en/modules/acqui/invoices.tt | 7 ++- .../prog/en/modules/acqui/lateorders.tt | 7 ++- .../prog/en/modules/acqui/moddeliverydate.tt | 7 ++- .../prog/en/modules/acqui/modordernotes.tt | 16 +++-- .../prog/en/modules/acqui/neworderempty.tt | 12 +++- .../modules/acqui/neworderempty_duplicate.tt | 8 ++- .../en/modules/acqui/newordersubscription.tt | 6 +- .../en/modules/acqui/newordersuggestion.tt | 6 +- .../prog/en/modules/acqui/ordered.tt | 6 +- .../prog/en/modules/acqui/orderreceive.tt | 11 +++- .../prog/en/modules/acqui/parcel.tt | 17 +++-- .../prog/en/modules/acqui/parcels.tt | 7 ++- .../prog/en/modules/acqui/showorder.tt | 8 ++- .../prog/en/modules/acqui/spent.tt | 6 +- .../prog/en/modules/acqui/supplier.tt | 6 +- .../prog/en/modules/acqui/transferorder.tt | 7 ++- .../prog/en/modules/acqui/uncertainprice.tt | 10 ++- .../prog/en/modules/acqui/z3950_search.tt | 11 +++- .../intranet-tmpl/prog/en/modules/erm/erm.tt | 9 +-- .../prog/en/modules/suggestion/suggestion.tt | 21 +++---- 35 files changed, 273 insertions(+), 96 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt index 6fa7008a90..de4aedbcd2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt @@ -4,8 +4,12 @@ [% USE Branches %] [% USE TablesSettings %] [% SET footerjs = 1 %] +[% PROCESS 'i18n.inc' %] [% INCLUDE 'doc-head-open.inc' %] -Acquisitions › Koha +[% FILTER collapse %] + [% t("Acquisitions") | html %] › + [% t("Koha") | html %] +[% END %] [% INCLUDE 'doc-head-close.inc' %] [% Asset.css("lib/jquery/plugins/treetable/stylesheets/jquery.treetable.css") | $raw %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorder.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorder.tt index 6dc6ba94a8..12d9ca774f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorder.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorder.tt @@ -1,5 +1,11 @@ +[% USE raw %] +[% PROCESS 'i18n.inc' %] [% INCLUDE "doc-head-open.inc" %] -Add order › Acquisition › Koha +[% FILTER collapse %] + [% t("Add order") | html %] › + [% t("Acquisition") | html %] › + [% t("Koha") | html %] +[% END %] [% INCLUDE "doc-head-close.inc" %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt index d8d5b484f9..ac9379da30 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt @@ -2,38 +2,44 @@ [% USE Asset %] [% USE KohaDates %] [% USE Branches %] +[% PROCESS 'i18n.inc' %] [% INCLUDE 'doc-head-open.inc' %] - -[% IF ( batch_details ) %] - Batch [% import_batch_id | html %] -[% ELSE %] - Batch list -[% END %] › Order staged MARC records › Acquisitions › Koha - - + @media (max-width: 767px) { + #dataPreview { + margin: 0; + width : auto; + } + } + +[% END %] [% INCLUDE 'doc-head-close.inc' %] [% Asset.css("css/addbiblio.css") | $raw %] [%# As long as cataloging plugins rely on 'script' tags added inline, JS must be in the header %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt index e7d4cbfaa0..bca83a0a25 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -23,7 +23,11 @@ [% USE TablesSettings %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -[% UNLESS ( basketno ) %]New [% END %]Basket [% basketname | html %] ([% basketno | html %]) for [% booksellername | html %] › Acquisitions › Koha +[% FILTER collapse %] + [% tx("Basket {basketname} ({basketnumber}) for {vendor}", { basketname = basketname, basketnumber = basketno, vendor = booksellername }) | html %] › + [% t("Acquisitions") | html %] › + [% t("Koha") | html %] +[% END %] [% INCLUDE 'doc-head-close.inc' %]