From c2464231b0799ab372b1a54c202f3a7df6077ad4 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

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 .../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 &rsaquo; Koha</title>
+<title>[% FILTER collapse %]
+    [% t("Acquisitions") | html %] &rsaquo;
+    [% 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 90d07cf0ba..46ac8d5714 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 &rsaquo; Acquisition &rsaquo; Koha</title>
+<title>[% FILTER collapse %]
+    [% t("Add order") | html %] &rsaquo;
+    [% t("Acquisition") | html %] &rsaquo;
+    [% 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 4440130df6..e598629e03 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
@@ -3,38 +3,44 @@
 [% USE KohaDates %]
 [% USE Branches %]
 [% USE Price %]
+[% PROCESS 'i18n.inc' %]
 [% INCLUDE 'doc-head-open.inc' %]
-<title>
-[% IF ( batch_details ) %]
-    Batch [% import_batch_id | html %]
-[% ELSE %]
-    Batch list
-[% END %] &rsaquo; Order staged MARC records &rsaquo; Acquisitions &rsaquo; 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 %] &rsaquo;
+    [% t("Order staged MARC records") | html %] &rsaquo;
+    [% t("Acquisitions") | html %] &rsaquo;
+    [% 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 9dc8ccff0c..69acd9f1cc 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 %] &rsaquo; Acquisitions &rsaquo; Koha</title>
+<title>[% FILTER collapse %]
+    [% tx("Basket {basketname} ({basketnumber}) for {vendor}", { basketname = basketname, basketnumber = basketno, vendor = booksellername }) | html %] &rsaquo;
+    [% t("Acquisitions") | html %] &rsaquo;
+    [% 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 83d998fe58..15848daeae 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 %] &rsaquo; Koha</title>
+<title>[% FILTER collapse %]
+    [% tx("Basket grouping for '{vendor}'", { vendor = booksellername }) %] &rsaquo;
+    [% 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 2414e69363..88bda81a43 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 %] &rsaquo; Acquisitions &rsaquo; Koha
-</title>
+    [% END %] &rsaquo;
+    [% t("Acquisitions") | html %] &rsaquo;
+    [% 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 0cc8b5a69c..fbf2d71fbe 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 %] &rsaquo; Koha</title>
+<title>[% FILTER collapse %]
+    [% tx("Search for vendor {vendor}", { vendor = supplier }) | html %] &rsaquo;
+    [% 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 28171a1bdb..4098f2fe17 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 &rsaquo; Acquisition &rsaquo; Koha</title>
+<title>[% FILTER collapse %]
+    [% t("Cancel order") | html %] &rsaquo;
+    [% t("Acquisition") | html %] &rsaquo;
+    [% 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 4e6faad480..e069fe6e60 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 %] &rsaquo; Duplicate existing orders &rsaquo; [% END %]
-Acquisitions &rsaquo; Koha
-</title>
+<title>[% FILTER collapse %]
+    [% UNLESS blocking_error %]
+        [% tx("Basket {basketnumber}", { basketnumber = basket.basketno }) | html %] &rsaquo;
+        [% t("Duplicate existing orders") | html %] &rsaquo;
+    [% END %]
+    [% t("Acquisitions") | html %] &rsaquo;
+    [% 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 %]) &rsaquo; Acquisitions &rsaquo; Koha</title>
+<title>[% FILTER collapse %]
+    [% tx("Basket {basketnumber}", { basketnumber = basketno }) | html %] &rsaquo;
+    [% t("Acquisitions") | html %] &rsaquo;
+    [% 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 0c54298888..7940e17a8a 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 &rsaquo; Acquisitions &rsaquo; Koha</title>
+<title>[% FILTER collapse %]
+    [% t("EDIFACT messages") | html %] &rsaquo;
+    [% t("Acquisitions") | html %] &rsaquo;
+    [% 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 &rsaquo; Acquisitions &rsaquo; Koha</title>
+<title>[% FILTER collapse %]
+    [% t("EDIFACT message display") | html %] &rsaquo;
+    [% t("Acquisitions") | html %] &rsaquo;
+    [% 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 83947d7345..45fb4ff102 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 &rsaquo; Search results[% ELSE %]Order search[% END %] &rsaquo; Acquisitions &rsaquo; Koha</title>
+<title>[% FILTER collapse %]
+    [% IF ( order_loop ) %]
+        [% t("Orders search") | html %] &rsaquo;
+        [% t("Search results") | html %]
+    [% ELSE %]
+        [% t("Order search") | html %]
+    [% END %] &rsaquo;
+    [% t("Acquisitions") | html %] &rsaquo;
+    [% 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 &rsaquo; Invoice &rsaquo; Acquisitions &rsaquo; Koha</title>
+<title>[% FILTER collapse %]
+    [% t("Files") | html %] &rsaquo;
+    [% t("Invoice") | html %] &rsaquo;
+    [% t("Acquisitions") | html %] &rsaquo;
+    [% 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 0fdb63890d..c45df84eb7 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 %]
     <select id="[% form_id | html %]" name="[% form_name | html %]" class="fund_dropdown" data-selected="[% selected | html %]">
     </select>
@@ -14,7 +14,11 @@
 [% END %]
 
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Invoice &rsaquo; Acquisitions &rsaquo; Koha</title>
+<title>[% FILTER collapse %]
+    [% t("Invoice") | html %] &rsaquo;
+    [% t("Acquisitions") | html %] &rsaquo;
+    [% 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 74b9f8d046..7e160a8318 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 &rsaquo; Acquisitions &rsaquo; Koha</title>
+<title>[% FILTER collapse %]
+    [% t("Invoices") | html %] &rsaquo;
+    [% t("Acquisitions") | html %] &rsaquo;
+    [% 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 2de9b35463..aa04abec74 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 &rsaquo; Acquisitions &rsaquo; Koha</title>
+<title>[% FILTER collapse %]
+    [% t("Late orders") | html %] &rsaquo;
+    [% t("Acquisitions") | html %] &rsaquo;
+    [% 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 &rsaquo; Acquisitions &rsaquo; Koha</title>
+<title>[% FILTER collapse %]
+    [% t("Change estimated delivery date") | html %] &rsaquo;
+    [% t("Acquisitions") | html %] &rsaquo;
+    [% 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 -%] &rsaquo; Acquisition &rsaquo; Koha
-</title>
+<title>[% FILTER collapse %]
+    [% IF (type == "vendor") %]
+        [% t("Change order vendor note") | html %]
+    [% ELSE %]
+        [% t("Change order internal note") | html %]
+    [% END %] &rsaquo;
+    [% t("Acquisition") | html %] &rsaquo;
+    [% 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 effff82f58..4523300a8d 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 %] &rsaquo; Basket [% basketno | html %] &rsaquo; Acquisitions &rsaquo; Koha</title>
+<title>[% FILTER collapse %]
+    [% IF ( ordernumber ) %]
+        [% tx("Modify order details (line #{ordernumber})", { ordernumber = ordernumber }) | html %]
+    [% ELSE %]
+        [% t("New order") | html %]
+    [% END %] &rsaquo;
+    [% tx("Basket {basketnumber}", { basketnumber = basketno }) | html %] &rsaquo;
+    [% t("Acquisitions") | html %] &rsaquo;
+    [% 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 b449d5cc1d..157f722cc1 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 &rsaquo; Basket [% basketno | html %] &rsaquo; Acquisitions &rsaquo; Koha</title>
+<title>[% FILTER collapse %]
+    [% t("Duplicate warning") | html %] &rsaquo;
+    [% tx("Basket {basketnumber}", { basketnumber = basketno }) | html %] &rsaquo;
+    [% t("Acquisitions") | html %] &rsaquo;
+    [% 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 %] &rsaquo; Koha</title>
+<title>[% FILTER collapse %]
+    [% t("Add order from a subscription") | html %] &rsaquo;
+    [% t("Acquisitions") | html %] &rsaquo;
+    [% 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 &rsaquo; Acquisitions &rsaquo; Koha</title>
+<title>[% FILTER collapse %]
+    [% t("Add order from a suggestion") | html %] &rsaquo;
+    [% t("Acquisitions") | html %] &rsaquo;
+    [% 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 &rsaquo; Acquisitions &rsaquo; Koha</title>
+<title>[% FILTER collapse %]
+    [% t("Ordered") | html %] &rsaquo;
+    [% t("Acquisitions") | html %] &rsaquo;
+    [% 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 a7b9db35e4..4f80fae42c 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 %] &rsaquo; Acquisitions &rsaquo; 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 %] &rsaquo;
+    [% t("Acquisitions") | html %] &rsaquo;
+    [% 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 7344dc4c30..c2eaea312e 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 %] &rsaquo; Acquisitions &rsaquo; Koha
-</title>
+        [% tx("Receive orders from {vendor}", { vendor = name }) | html %]
+    [% END %] &rsaquo;
+    [% t("Acquisitions") | html %] &rsaquo;
+    [% 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 45bd57cfe2..915bf002a5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
@@ -3,8 +3,13 @@
 [% USE KohaDates %]
 [% PROCESS 'i18n.inc' %]
 [% SET footerjs = 1 %]
+[% PROCESS 'i18n.inc' %]
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Receive shipment from vendor [% name | html %] &rsaquo; Acquisitions &rsaquo; Koha</title>
+<title>[% FILTER collapse %]
+    [% tx("Receive shipment from vendor {vendor}", { vendor = name }) | html %] &rsaquo;
+    [% t("Acquisitions") | html %] &rsaquo;
+    [% 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 &rsaquo; Acquisitions &rsaquo; Koha</title>
+<title>[% FILTER collapse %]
+    [% t("Order details") | html %] &rsaquo;
+    [% t("Acquisitions") | html %] &rsaquo;
+    [% 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 &rsaquo; Acquisitions &rsaquo; Koha</title>
+<title>[% FILTER collapse %]
+    [% t("Spent") | html %] &rsaquo;
+    [% t("Acquisitions") | html %] &rsaquo;
+    [% 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 8903160adf..6aff9ea0ad 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 %]" />
@@ -144,7 +145,10 @@
 
 [% SET footerjs = 1 %]
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Vendor [% name | html %] &rsaquo; Koha</title>
+<title>[% FILTER collapse %]
+    [% tx("Vendor {vendor}", { vendor = name }) | html %] &rsaquo;
+    [% t("Koha") | html %]
+[% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 <style>
 div.rows p{ margin-left: 1rem; }
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 &rsaquo; Acquisitions &rsaquo; Koha</title>
+<title>[% FILTER collapse %]
+    [% t("Transfer order") | html %] &rsaquo;
+    [% t("Acquisitions") | html %] &rsaquo;
+    [% 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 c3e29e714a..f5ead80507 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt
@@ -5,7 +5,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 %] &rsaquo; Acquisitions &rsaquo; 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 %] &rsaquo;
+    [% t("Acquisitions") | html %] &rsaquo;
+    [% 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 2c2aafc83d..a458291dba 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 &rsaquo; Acquisitions &rsaquo; Order from external source[% END %] &rsaquo; Koha</title>
+<title>[% FILTER collapse %]
+    [% IF ( opsearch ) %]
+        [% t("Order from external source") | html %]
+    [% ELSE %]
+        [% t("Search results") | html %] &rsaquo;
+        [% t("Order from external source") | html %]
+        [% t("Acquisitions") | html %] &rsaquo;
+    [% END %] &rsaquo;
+    [% 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 &rsaquo; Koha
-</title>
+<title>[% FILTER collapse %]
+    [% t("E-resource management") | html %] &rsaquo;
+    [% 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 dad6bd0e8f..1ff0fb6c83 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 %] &rsaquo; Suggestions
+            [% tx("Edit suggestion #{suggestion_number}", { suggestion_number = suggestionid }) | html %] &rsaquo;
         [% ELSE %]
-            Add suggestion &rsaquo; Suggestions
+            Add suggestion &rsaquo;
         [% END %]
-
     [% ELSIF ( op == 'show' ) %]
-           Show suggestion #[% suggestionid | html %] &rsaquo; Suggestions
-
-    [% ELSE %]
-        Suggestions management
-    [% END %] &rsaquo; Acquisitions &rsaquo; Koha
-</title>
+        [% tx("Show suggestion #{suggestion_number}", { suggestion_number = suggestionid }) | html %] &rsaquo;
+    [% END %]
+    [% t("Suggestions") | html %] &rsaquo;
+    [% t("Acquisitions") | html %] &rsaquo;
+    [% t("Koha") | html %]
+[% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 [% IF op == 'else' %]
     [% FILTER collapse %]
-- 
2.20.1