From f662f55f91ac32611abf7e27f61505d7aad1d295 Mon Sep 17 00:00:00 2001 From: Owen Leonard <oleonard@myacpl.org> 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' %] -<title>Acquisitions › Koha</title> +<title>[% FILTER collapse %] + [% t("Acquisitions") | html %] › + [% t("Koha") | html %] +[% END %]</title> [% INCLUDE 'doc-head-close.inc' %] [% Asset.css("lib/jquery/plugins/treetable/stylesheets/jquery.treetable.css") | $raw %] </head> 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" %] -<title>Add order › Acquisition › Koha</title> +<title>[% FILTER collapse %] + [% t("Add order") | html %] › + [% t("Acquisition") | html %] › + [% t("Koha") | html %] +[% END %]</title> [% INCLUDE "doc-head-close.inc" %] </head> 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' %] -<title> -[% IF ( batch_details ) %] - Batch [% import_batch_id | html %] -[% ELSE %] - Batch list -[% END %] › Order staged MARC records › Acquisitions › Koha -</title> -<style> - .biblio { - padding: 0 .5em; - margin:0; - } - .order_details { - display: flex; - justify-content: space-between; - } - .biblio .actions { - float: right; - } - @media (max-width: 992px) { +<title>[% FILTER collapse %] + [% IF ( batch_details ) %] + [% tx('Batch {batch_id}', { batch_id = import_batch_id } ) | html %] + [% ELSE %] + [% t("Batch list") | html %] + [% END %] › + [% t("Order staged MARC records") | html %] › + [% t("Acquisitions") | html %] › + [% t("Koha") | html %] +[% END %]</title> +[% FILTER collapse %] + <style> + .biblio { + padding: 0 .5em; + margin:0; + } .order_details { - display: block; + display: flex; + justify-content: space-between; + } + .biblio .actions { + float: right; } - } - @media (max-width: 767px) { - #dataPreview { - margin: 0; - width : auto; + @media (max-width: 992px) { + .order_details { + display: block; + } } - } -</style> + @media (max-width: 767px) { + #dataPreview { + margin: 0; + width : auto; + } + } + </style> +[% 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' %] -<title>[% UNLESS ( basketno ) %]New [% END %]Basket [% basketname | html %] ([% basketno | html %]) for [% booksellername | html %] › Acquisitions › Koha</title> +<title>[% FILTER collapse %] + [% tx("Basket {basketname} ({basketnumber}) for {vendor}", { basketname = basketname, basketnumber = basketno, vendor = booksellername }) | html %] › + [% t("Acquisitions") | html %] › + [% t("Koha") | html %] +[% END %]</title> [% INCLUDE 'doc-head-close.inc' %] <style> .sortmsg {font-size: 80%;} diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt index ec285960f9..1854c294b2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt @@ -3,8 +3,12 @@ [% USE Branches %] [% USE Price %] [% USE Koha %] +[% PROCESS 'i18n.inc' %] [% INCLUDE 'doc-head-open.inc' %] -<title>Basket grouping for [% booksellername | html %] › Koha</title> +<title>[% FILTER collapse %] + [% tx("Basket grouping for '{vendor}'", { vendor = booksellername }) %] › + [% t("Koha") | html %] +[% END %]</title> [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'datatables.inc' %] <script> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt index 88dd4cb354..adfbeff164 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt @@ -3,14 +3,19 @@ [% USE Branches %] [% USE Koha %] [% SET footerjs = 1 %] +[% PROCESS 'i18n.inc' %] [% INCLUDE 'doc-head-open.inc' %] -<title> +<title>[% FILTER collapse %] [% IF ( add_form ) %] - [% IF ( basketno ) %]Edit basket '[% basketname | html %]' - [% ELSE %]Add a basket to [% booksellername | html %] + [% IF ( basketno ) %] + [% tx("Edit basket '{basketname}'", { basketname = basketname }) | html %] + [% ELSE %] + [% tx("Add basket to {vendor}", { vendor = booksellername }) | html %] [% END %] - [% END %] › Acquisitions › Koha -</title> + [% END %] › + [% t("Acquisitions") | html %] › + [% t("Koha") | html %] +[% END %]</title> [% INCLUDE 'doc-head-close.inc' %] </head> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt index 1297f7b423..f90c69f903 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt @@ -1,13 +1,15 @@ - -[% PROCESS 'i18n.inc' %] [% USE raw %] [% USE Asset %] [% USE AuthorisedValues %] [% USE KohaDates %] [% USE HtmlTags %] +[% PROCESS 'i18n.inc' %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -<title>Search for vendor [% supplier | html %] › Koha</title> +<title>[% FILTER collapse %] + [% tx("Search for vendor {vendor}", { vendor = supplier }) | html %] › + [% t("Koha") | html %] +[% END %]</title> [% INCLUDE 'doc-head-close.inc' %] <style> #vendors td{ diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt index 65899cc0ac..dce089ad01 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt @@ -1,6 +1,11 @@ [% USE raw %] +[% PROCESS 'i18n.inc' %] [% INCLUDE 'doc-head-open.inc' %] -<title>Cancel order › Acquisition › Koha</title> +<title>[% FILTER collapse %] + [% t("Cancel order") | html %] › + [% t("Acquisition") | html %] › + [% t("Koha") | html %] +[% END %]</title> [% INCLUDE 'doc-head-close.inc' %] </head> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt index 721c0d4a9e..e33213aa1c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt @@ -3,12 +3,16 @@ [% USE Koha %] [% USE KohaDates %] [% SET footerjs = 1 %] +[% PROCESS 'i18n.inc' %] [% INCLUDE 'doc-head-open.inc' %] -<title> -[% UNLESS blocking_error %] -Basket [% basket.basketno | html %] › Duplicate existing orders › [% END %] -Acquisitions › Koha -</title> +<title>[% FILTER collapse %] + [% UNLESS blocking_error %] + [% tx("Basket {basketnumber}", { basketnumber = basket.basketno }) | html %] › + [% t("Duplicate existing orders") | html %] › + [% END %] + [% t("Acquisitions") | html %] › + [% t("Koha") | html %] +[% END %]</title> [% INCLUDE 'doc-head-close.inc' %] <style> .picked_to_duplicate > td { background-color: #bcdb89 !important; } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt index 6423e20968..77bb4d3609 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt @@ -1,6 +1,11 @@ [% USE raw %] +[% PROCESS 'i18n.inc' %] [% INCLUDE 'doc-head-open.inc' %] -<title>Basket ([% basketno | html %]) › Acquisitions › Koha</title> +<title>[% FILTER collapse %] + [% tx("Basket {basketnumber}", { basketnumber = basketno }) | html %] › + [% t("Acquisitions") | html %] › + [% t("Koha") | html %] +[% END %]</title> [% INCLUDE 'doc-head-close.inc' %] </head> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt index 6b6f8900d1..d3443842e3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt @@ -1,9 +1,14 @@ [% USE raw %] [% USE Asset %] [% USE KohaDates %] +[% PROCESS 'i18n.inc' %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -<title>EDIFACT messages › Acquisitions › Koha</title> +<title>[% FILTER collapse %] + [% t("EDIFACT messages") | html %] › + [% t("Acquisitions") | html %] › + [% t("Koha") | html %] +[% END %]</title> [% INCLUDE 'doc-head-close.inc' %] <style> #EDI_modal { width : 80%; } @media (max-width: 767px) { #EDI_modal { margin: 0; width : auto; } } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt index 05c7a165f5..edbf8228e5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt @@ -1,6 +1,11 @@ [% USE raw %] +[% PROCESS 'i18n.inc' %] [% INCLUDE 'doc-head-open.inc' %] -<title>EDIFACT message display › Acquisitions › Koha</title> +<title>[% FILTER collapse %] + [% t("EDIFACT message display") | html %] › + [% t("Acquisitions") | html %] › + [% t("Koha") | html %] +[% END %]</title> [% INCLUDE 'doc-head-close.inc' %] </head> <body id="acq_edifactmsgs" class="acq"> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt index 3ee9d7dc3b..72813d2b2b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt @@ -4,8 +4,18 @@ [% USE TablesSettings %] [% USE Branches %] [% SET footerjs = 1 %] +[% PROCESS 'i18n.inc' %] [% INCLUDE 'doc-head-open.inc' %] -<title>[% IF ( order_loop ) %]Orders search › Search results[% ELSE %]Order search[% END %] › Acquisitions › Koha</title> +<title>[% FILTER collapse %] + [% IF ( order_loop ) %] + [% t("Orders search") | html %] › + [% t("Search results") | html %] + [% ELSE %] + [% t("Order search") | html %] + [% END %] › + [% t("Acquisitions") | html %] › + [% t("Koha") | html %] +[% END %]</title> [% INCLUDE 'doc-head-close.inc' %] </head> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt index c86109b326..7411687e6f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt @@ -2,8 +2,14 @@ [% USE Asset %] [% USE KohaDates %] [% SET footerjs = 1 %] +[% PROCESS 'i18n.inc' %] [% INCLUDE 'doc-head-open.inc' %] -<title>Files › Invoice › Acquisitions › Koha</title> +<title>[% FILTER collapse %] + [% t("Files") | html %] › + [% t("Invoice") | html %] › + [% t("Acquisitions") | html %] › + [% t("Koha") | html %] +[% END %]</title> [% INCLUDE 'doc-head-close.inc' %] </head> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt index 4b7632ab82..18e1d07cb6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt @@ -5,7 +5,7 @@ [% USE Price %] [% SET footerjs = 1 %] [% USE AuthorisedValues %] - +[% PROCESS 'i18n.inc' %] [% BLOCK fund_dropdown %] <label for="[% form_name | html %]">Shipping fund: </label> <select id="[% form_id | html %]" name="[% form_name | html %]" class="fund_dropdown" data-selected="[% selected | html %]"> @@ -15,7 +15,11 @@ [% END %] [% INCLUDE 'doc-head-open.inc' %] -<title>Invoice › Acquisitions › Koha</title> +<title>[% FILTER collapse %] + [% t("Invoice") | html %] › + [% t("Acquisitions") | html %] › + [% t("Koha") | html %] +[% END %]</title> [% INCLUDE 'doc-head-close.inc' %] [% Asset.css("css/humanmsg.css") | $raw %] </head> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt index 2429dd5f19..3a9af0b8a2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt @@ -4,8 +4,13 @@ [% USE KohaDates %] [% USE Branches %] [% SET footerjs = 1 %] +[% PROCESS 'i18n.inc' %] [% INCLUDE 'doc-head-open.inc' %] -<title>Invoices › Acquisitions › Koha</title> +<title>[% FILTER collapse %] + [% t("Invoices") | html %] › + [% t("Acquisitions") | html %] › + [% t("Koha") | html %] +[% END %]</title> [% INCLUDE 'doc-head-close.inc' %] </head> 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 1a502c41e7..e3d8dc1057 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt @@ -5,8 +5,13 @@ [% USE TablesSettings %] [% USE Price %] [% SET footerjs = 1 %] +[% PROCESS 'i18n.inc' %] [% INCLUDE 'doc-head-open.inc' %] -<title>Late orders › Acquisitions › Koha</title> +<title>[% FILTER collapse %] + [% t("Late orders") | html %] › + [% t("Acquisitions") | html %] › + [% t("Koha") | html %] +[% END %]</title> [% INCLUDE 'doc-head-close.inc' %] </head> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/moddeliverydate.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/moddeliverydate.tt index 812e28b1bb..b33e4fb4d7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/moddeliverydate.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/moddeliverydate.tt @@ -1,8 +1,13 @@ [% USE raw %] [% USE KohaDates %] [% SET footerjs = 1 %] +[% PROCESS 'i18n.inc' %] [% INCLUDE 'doc-head-open.inc' %] -<title>Change estimated delivery date › Acquisitions › Koha</title> +<title>[% FILTER collapse %] + [% t("Change estimated delivery date") | html %] › + [% t("Acquisitions") | html %] › + [% t("Koha") | html %] +[% END %]</title> [% INCLUDE 'doc-head-close.inc' %] </head> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt index 6feb14b9a6..dada233a8a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt @@ -1,11 +1,15 @@ [% USE raw %] +[% PROCESS 'i18n.inc' %] [% INCLUDE 'doc-head-open.inc' %] -<title>[%- IF (type == "vendor") -%] - Change order vendor note -[%- ELSE -%] - Change order internal note -[%- END -%] › Acquisition › Koha -</title> +<title>[% FILTER collapse %] + [% IF (type == "vendor") %] + [% t("Change order vendor note") | html %] + [% ELSE %] + [% t("Change order internal note") | html %] + [% END %] › + [% t("Acquisition") | html %] › + [% t("Koha") | html %] +[% END %]</title> [% INCLUDE 'doc-head-close.inc' %] </head> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt index 42f537a592..c699c9c1ae 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt @@ -5,8 +5,18 @@ [% USE Price %] [% USE ItemTypes %] [% USE AuthorisedValues %] +[% PROCESS 'i18n.inc' %] [% INCLUDE 'doc-head-open.inc' %] -<title>[% IF ( ordernumber ) %]Modify order details (line #[% ordernumber | html %])[% ELSE %]New order[% END %] › Basket [% basketno | html %] › Acquisitions › Koha</title> +<title>[% FILTER collapse %] + [% IF ( ordernumber ) %] + [% tx("Modify order details (line #{ordernumber})", { ordernumber = ordernumber }) | html %] + [% ELSE %] + [% t("New order") | html %] + [% END %] › + [% tx("Basket {basketnumber}", { basketnumber = basketno }) | html %] › + [% t("Acquisitions") | html %] › + [% t("Koha") | html %] +[% END %]</title> [% INCLUDE 'doc-head-close.inc' %] [% FILTER collapse %] <style> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty_duplicate.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty_duplicate.tt index 39833a96c6..44e9f96fcb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty_duplicate.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty_duplicate.tt @@ -1,6 +1,12 @@ [% USE raw %] +[% PROCESS 'i18n.inc' %] [% INCLUDE 'doc-head-open.inc' %] -<title>Duplicate warning › Basket [% basketno | html %] › Acquisitions › Koha</title> +<title>[% FILTER collapse %] + [% t("Duplicate warning") | html %] › + [% tx("Basket {basketnumber}", { basketnumber = basketno }) | html %] › + [% t("Acquisitions") | html %] › + [% t("Koha") | html %] +[% END %]</title> [% INCLUDE 'doc-head-close.inc' %] </head> <body id="acq_neworderempty_duplicate" class="acq"> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt index e2558595fd..530035deb2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt @@ -6,7 +6,11 @@ [% PROCESS 'i18n.inc' %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -<title>Serials [% biblionumber | html %] › Koha</title> +<title>[% FILTER collapse %] + [% t("Add order from a subscription") | html %] › + [% t("Acquisitions") | html %] › + [% t("Koha") | html %] +[% END %]</title> [% INCLUDE 'doc-head-close.inc' %] </head> 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 631698a61a..84c6037dad 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt @@ -6,7 +6,11 @@ [% PROCESS 'i18n.inc' %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -<title>Add order from a suggestion › Acquisitions › Koha</title> +<title>[% FILTER collapse %] + [% t("Add order from a suggestion") | html %] › + [% t("Acquisitions") | html %] › + [% t("Koha") | html %] +[% END %]</title> [% INCLUDE 'doc-head-close.inc' %] </head> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt index 891002ad20..8651691965 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt @@ -6,7 +6,11 @@ [% PROCESS 'i18n.inc' %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -<title>Ordered › Acquisitions › Koha</title> +<title>[% FILTER collapse %] + [% t("Ordered") | html %] › + [% t("Acquisitions") | html %] › + [% t("Koha") | html %] +[% END %]</title> [% INCLUDE 'doc-head-close.inc' %] </head> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt index 4dca002ae4..41ec9b19d9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt @@ -7,8 +7,17 @@ [% USE ItemTypes %] [% USE Price %] [% SET footerjs = 1 %] +[% PROCESS 'i18n.inc' %] [% INCLUDE 'doc-head-open.inc' %] -<title>Receipt summary for : [% name | html %] [% IF ( invoice ) %]invoice, [% invoice | html %][% END %] › Acquisitions › Koha</title> +<title>[% FILTER collapse %] + [% IF ( invoice ) %] + [% tx("Receipt summary for {vendor}, invoice {invoice_number}", { vendor = name, invoice_number = invoice }) | html %] + [% ELSE %] + [% tx("Receipt summary for {vendor}", { vendor = name }) | html %] + [% END %] › + [% t("Acquisitions") | html %] › + [% t("Koha") | html %] +[% END %]</title> [% INCLUDE 'doc-head-close.inc' %] <style> @media (min-width: 1200px) { 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 4b09a4d8f2..437257d336 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt @@ -6,14 +6,19 @@ [% PROCESS 'i18n.inc' %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -<title> +<title>[% FILTER collapse %] [% IF ( invoiceclosedate ) %] - Receipt summary for [% name | html %] [% IF ( invoice ) %]invoice [ - % invoice | html %][% END %] + [% IF ( invoice ) %] + [% tx("Receipt summary for {vendor}, invoice {invoice_number}", { vendor = name, invoice_number = invoice }) | html %] + [% ELSE %] + [% tx("Receipt summary for {vendor}", { vendor = name }) | html %] + [% END %] [% ELSE %] - Receive orders from [% name | html %] - [% END %] › Acquisitions › Koha -</title> + [% tx("Receive orders from {vendor}", { vendor = name }) | html %] + [% END %] › + [% t("Acquisitions") | html %] › + [% t("Koha") | html %] +[% END %]</title> [% INCLUDE 'doc-head-close.inc' %] </head> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt index 1139e4ad99..ef06b9ee7a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt @@ -2,8 +2,13 @@ [% USE Asset %] [% USE KohaDates %] [% SET footerjs = 1 %] +[% PROCESS 'i18n.inc' %] [% INCLUDE 'doc-head-open.inc' %] -<title>Receive shipment from vendor [% name | html %] › Acquisitions › Koha</title> +<title>[% FILTER collapse %] + [% tx("Receive shipment from vendor {vendor}", { vendor = name }) | html %] › + [% t("Acquisitions") | html %] › + [% t("Koha") | html %] +[% END %]</title> [% INCLUDE 'doc-head-close.inc' %] </head> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/showorder.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/showorder.tt index f79e805910..4b71185f3a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/showorder.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/showorder.tt @@ -1,5 +1,11 @@ +[% USE raw %] +[% PROCESS 'i18n.inc' %] [% INCLUDE 'doc-head-open.inc' %] -<title>Order details › Acquisitions › Koha</title> +<title>[% FILTER collapse %] + [% t("Order details") | html %] › + [% t("Acquisitions") | html %] › + [% t("Koha") | html %] +[% END %]</title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> </head> <body id="acq_showorder" class="acq"> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt index 158e0077e0..abb5b941dd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt @@ -6,7 +6,11 @@ [% PROCESS 'i18n.inc' %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -<title>Spent › Acquisitions › Koha</title> +<title>[% FILTER collapse %] + [% t("Spent") | html %] › + [% t("Acquisitions") | html %] › + [% t("Koha") | html %] +[% END %]</title> [% INCLUDE 'doc-head-close.inc' %] </head> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt index 173089cc6f..2430d84f25 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt @@ -3,6 +3,7 @@ [% USE Asset %] [% USE KohaDates %] [% USE AuthorisedValues %] +[% PROCESS 'i18n.inc' %] [% BLOCK edit_contact %] <ol id="contact-form"> <input type="hidden" name="contact_id" value="[% contact.id | html %]" /> @@ -91,7 +92,10 @@ [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -<title>Vendor [% name | html %] › Koha</title> +<title>[% FILTER collapse %] + [% tx("Vendor {vendor}", { vendor = name }) | html %] › + [% t("Koha") | html %] +[% END %]</title> [% INCLUDE 'doc-head-close.inc' %] </head> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt index 483886e817..d2314473f4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt @@ -1,7 +1,12 @@ +[% USE raw %] [% PROCESS 'i18n.inc' %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -<title>Transfer order › Acquisitions › Koha</title> +<title>[% FILTER collapse %] + [% t("Transfer order") | html %] › + [% t("Acquisitions") | html %] › + [% t("Koha") | html %] +[% END %]</title> [%- USE KohaDates -%] [% INCLUDE 'doc-head-close.inc' %] </head> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt index e840846a76..bc8ee0bca1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt @@ -4,7 +4,15 @@ [% PROCESS 'i18n.inc' %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -<title>[% IF ( booksellername ) %]Orders with uncertain prices for vendor [% booksellername | html %][% ELSE %]Orders with uncertain prices[% END %] › Acquisitions › Koha</title> +<title>[% FILTER collapse %] + [% IF ( booksellername ) %] + [% tx("Orders with uncertain prices for vendor {vendor}", { vendor = booksellername }) | html %] + [% ELSE %] + [% t("Orders with uncertain prices") | html %] + [% END %] › + [% t("Acquisitions") | html %] › + [% t("Koha") | html %] +[% END %]</title> [% INCLUDE 'doc-head-close.inc' %] </head> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt index bb7d80c53a..77abdd806b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt @@ -3,7 +3,16 @@ [% PROCESS 'i18n.inc' %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -<title>[% IF ( opsearch ) %]Order from external source[% ELSE %]Search results › Acquisitions › Order from external source[% END %] › Koha</title> +<title>[% FILTER collapse %] + [% IF ( opsearch ) %] + [% t("Order from external source") | html %] + [% ELSE %] + [% t("Search results") | html %] › + [% t("Order from external source") | html %] + [% t("Acquisitions") | html %] › + [% END %] › + [% t("Koha") | html %] +[% END %]</title> [% INCLUDE 'doc-head-close.inc' %] [% USE Koha %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/erm/erm.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/erm/erm.tt index 98c0a4294b..6b229bc18d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/erm/erm.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/erm/erm.tt @@ -3,12 +3,13 @@ [% USE Asset %] [% USE KohaDates %] [% USE TablesSettings %] -[% SET footerjs = 1 %] [% PROCESS 'i18n.inc' %] +[% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -<title> - E-resource management › Koha -</title> +<title>[% FILTER collapse %] + [% t("E-resource management") | html %] › + [% t("Koha") | html %] +[% END %]</title> [% INCLUDE 'doc-head-close.inc' %] </head> 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 3d0372d537..745c3ed910 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt @@ -1,4 +1,3 @@ -[% PROCESS 'i18n.inc' %] [% USE raw %] [% USE Asset %] [% USE Branches %] @@ -6,23 +5,23 @@ [% USE KohaDates %] [% USE Price %] [% USE TablesSettings %] +[% PROCESS 'i18n.inc' %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -<title> +<title>[% FILTER collapse %] [% IF op == 'save' %] [% IF ( suggestionid ) %] - Edit suggestion #[% suggestionid | html %] › Suggestions + [% tx("Edit suggestion #{suggestion_number}", { suggestion_number = suggestionid }) | html %] › [% ELSE %] - Add suggestion › Suggestions + Add suggestion › [% END %] - [% ELSIF ( op == 'show' ) %] - Show suggestion #[% suggestionid | html %] › Suggestions - - [% ELSE %] - Suggestions management - [% END %] › Acquisitions › Koha -</title> + [% tx("Show suggestion #{suggestion_number}", { suggestion_number = suggestionid }) | html %] › + [% END %] + [% t("Suggestions") | html %] › + [% t("Acquisitions") | html %] › + [% t("Koha") | html %] +[% END %]</title> [% INCLUDE 'doc-head-close.inc' %] [% IF op == 'else' %] [% FILTER collapse %] -- 2.30.2