From 068d0c43c1e59e8165945fe379568b66b389aee4 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Tue, 6 Jun 2023 15:29:12 +0000
Subject: [PATCH] Bug 33925: Improve translation of title tags: Serials
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

This patch updates serials templates so that title tags can be more
easily translated. Some templates have been updated for consistency as
well: Harmonizing page title, breaddrumb navigation, and page headers;
Adding "page-section" <div> where it was lacking.

To test, apply the patch and confirm that the following pages have the
correct title tags:

- Serials home
  - Serials search results
    - Subscription details
      - Subscription edit
        - Search for vendor
        - Search for bibliographic record
      - Subscription renew
      - Serial collection
      - Create and modify routing list
        - Preview routing list
          - View routing slip
      - Claims
      - Check expiration
      - With a subscription which has manual history enabled, click the
        "Edit history" link under the "Planning" tab.
     - Select multiple serial search results and batch edit
  - New subscription
  - Manage frequencies: Create and edit
  - Manage numbering patterns: Create and edit

Signed-off-by: Loïc Vassaux-Artur <loic.vassaux-artur@outlook.fr>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
---
 .../en/modules/serials/acqui-search-result.tt |  8 +-
 .../prog/en/modules/serials/acqui-search.tt   |  8 +-
 .../en/modules/serials/checkexpiration.tt     | 24 +++---
 .../prog/en/modules/serials/claims.tt         | 10 ++-
 .../prog/en/modules/serials/result.tt         |  8 +-
 .../modules/serials/routing-preview-slip.tt   | 10 ++-
 .../en/modules/serials/routing-preview.tt     |  8 +-
 .../prog/en/modules/serials/routing.tt        | 20 +++--
 .../en/modules/serials/serials-collection.tt  |  8 +-
 .../prog/en/modules/serials/serials-edit.tt   | 15 +++-
 .../prog/en/modules/serials/serials-home.tt   |  6 +-
 .../prog/en/modules/serials/serials-search.tt |  7 +-
 .../en/modules/serials/subscription-add.tt    | 12 ++-
 .../modules/serials/subscription-batchedit.tt |  7 +-
 .../serials/subscription-bib-search.tt        |  8 +-
 .../en/modules/serials/subscription-detail.tt | 11 ++-
 .../serials/subscription-frequencies.tt       | 35 +++++++-
 .../modules/serials/subscription-history.tt   | 80 +++++++++++--------
 .../serials/subscription-numberpatterns.tt    | 16 +++-
 .../en/modules/serials/subscription-renew.tt  | 17 ++--
 .../prog/en/modules/serials/viewalerts.tt     |  8 +-
 21 files changed, 245 insertions(+), 81 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tt
index 2c1460fa8b..6f03b3a2f8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tt
@@ -1,6 +1,12 @@
+[% USE raw %]
+[% PROCESS 'i18n.inc' %]
 [% SET footerjs = 1 %]
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Select vendor &rsaquo; Serials &rsaquo; Koha</title>
+<title>[% FILTER collapse %]
+    [% t("Vendor search results") | html %] &rsaquo;
+    [% t("Serials") | html %] &rsaquo;
+    [% t("Koha") | html %]
+[% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search.tt
index aa2988f086..6940821358 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search.tt
@@ -1,5 +1,11 @@
+[% USE raw %]
+[% PROCESS 'i18n.inc' %]
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Search for vendor &rsaquo; Serials &rsaquo; Koha</title>
+<title>[% FILTER collapse %]
+    [% t("Search for vendor") | html %] &rsaquo;
+    [% t("Serials") | html %] &rsaquo;
+    [% t("Koha") | html %]
+[% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt
index 32570a6e18..e3a4466818 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt
@@ -1,9 +1,14 @@
 [% USE raw %]
 [% USE Branches %]
 [% USE KohaDates %]
+[% PROCESS 'i18n.inc' %]
 [% SET footerjs = 1 %]
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Check expiration &rsaquo; Serials &rsaquo; Koha</title>
+<title>[% FILTER collapse %]
+    [% t("Check expiration") | html %] &rsaquo;
+    [% t("Serials") | html %] &rsaquo;
+    [% t("Koha") | html %]
+[% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 
@@ -71,18 +76,12 @@
 </form>
 
 [% IF ( subscriptions_loop ) %]
-<p>
-    <strong>[% numsubscription | html %]</strong> subscription(s)
-        [% IF ( title ) %]
-        with title matching <span class="title">[% title | html %]</class>
-        [% IF ( issn ) %]and [% END %]
-    [% END %]
-    [% IF ( issn ) %]
-        with ISSN matching <strong>[% issn | html %]</strong>
-    [% END %]
-        will expire before <strong>[% date | $KohaDates %]</strong>
-</p>
+<h2>
+    [% expirydate = date | $KohaDates %]
+    [% tnx("Your search returned 1 subscription expiring before {date}", "Your search returned {count} subscriptions expiring before {date}", numsubscription, { date = expirydate, count = numsubscription }) %]
+</h2>
 
+<div class="page-section">
 <div class="checkexpiration-table_table_controls">
     <a href="#" class="SelectAll"><i class="fa fa-check"></i> Select all</a> |
     <a href="#" class="ClearAll"><i class="fa fa-times"></i> Clear all</a>
@@ -138,6 +137,7 @@
         </tr>
     [% END %]
     </table>
+    </div> <!-- .page-section -->
 [% ELSIF searched %]
     <p>No results for your query</p>
 [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt
index 8b98eebc7e..56c96de354 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt
@@ -3,9 +3,17 @@
 [% USE AuthorisedValues %]
 [% USE Branches %]
 [% USE KohaDates %]
+[% PROCESS 'i18n.inc' %]
 [% SET footerjs = 1 %]
 [% INCLUDE 'doc-head-open.inc' %]
-    <title>[% IF ( supplierid ) -%] Claims for [% suppliername | html %] &rsaquo; [% END %] Claims &rsaquo; Serials &rsaquo; Koha</title>
+    <title>[% FILTER collapse %]
+        [% IF( supplierid ) %]
+            [% tx("Claims for {vendor}", { vendor = suppliername }) | html %] &rsaquo;
+        [% END %]
+        [% t("Claims") | html %] &rsaquo;
+        [% t("Serials") | html %] &rsaquo;
+        [% t("Koha") | html %]
+    [% END %]</title>
     [% INCLUDE 'doc-head-close.inc' %]
 </head>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tt
index 9f8a77d05b..8292fa5292 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tt
@@ -1,6 +1,12 @@
+[% USE raw %]
+[% PROCESS 'i18n.inc' %]
 [% SET footerjs = 1 %]
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Search results &rsaquo; Serials &rsaquo; Koha</title>
+<title>[% FILTER collapse %]
+    [% t("Search results") | html %] &rsaquo;
+    [% t("Serials") | html %] &rsaquo;
+    [% t("Koha") | html %]
+[% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tt
index 930b1a7868..dbcadf40bc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tt
@@ -1,8 +1,13 @@
-[% USE Koha %]
 [% USE raw %]
+[% USE Koha %]
+[% PROCESS 'i18n.inc' %]
 [% SET footerjs = 1 %]
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Routing slip preview &rsaquo; Serials &rsaquo; Koha</title>
+<title>[% FILTER collapse %]
+    [% tx("Routing slip for {title}", { title = title }) | html %] &rsaquo;
+    [% t("Serials") | html %] &rsaquo;
+    [% t("Koha") | html %]
+[% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 <style media="print">
      #ser_routing-preview-slip { min-width:0; width:auto; }
@@ -11,6 +16,7 @@
 
 <body id="ser_routing-preview-slip" class="ser">
     <div class="container-fluid">
+        <h1>[% tx("Routing slip for {title}", { title = title }) | html %]</h1>
         <div class="page-section">
 <table>
     <tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt
index 091200a5aa..9e03d5e40d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tt
@@ -1,7 +1,13 @@
 [% USE raw %]
+[% PROCESS 'i18n.inc' %]
 [% SET footerjs = 1 %]
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Preview routing list &rsaquo; Serials &rsaquo; Koha</title>
+<title>[% FILTER collapse %]
+    [% t("Preview routing list") | html %] &rsaquo;
+    [% title | html %] &rsaquo;
+    [% t("Serials") | html %] &rsaquo;
+    [% t("Koha") | html %]
+[% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt
index e002e4be1b..941c0177ca 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt
@@ -1,10 +1,20 @@
 [% USE raw %]
 [% USE KohaDates %]
+[% PROCESS 'i18n.inc' %]
 [% SET footerjs = 1 %]
 [% PROCESS 'i18n.inc' %]
 [% PROCESS 'patron-search.inc' %]
 [% INCLUDE 'doc-head-open.inc' %]
-<title>[% IF ( op ) %]Create routing list[% ELSE %]Edit routing list[% END %] &rsaquo; [% title | html %] &rsaquo; Serials &rsaquo; Koha</title>
+<title>[% FILTER collapse %]
+    [% IF( op ) %]
+        [% t("New routing list") | html %]
+    [% ELSE %]
+        [% t("Modify routing list") | html %]
+    [% END %] &rsaquo;
+    [% title | html %] &rsaquo;
+    [% t("Serials") | html %] &rsaquo;
+    [% t("Koha") | html %]
+[% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="ser_routing" class="ser">
@@ -23,9 +33,9 @@
             [% END %]
             [% WRAPPER breadcrumb_item bc_active= 1 %]
                 [% IF ( op ) %]
-                    <span>Create routing list</span>
+                    <span>New routing list</span>
                 [% ELSE %]
-                    <span>Edit routing list</span>
+                    <span>Modify routing list</span>
                 [% END %]
             [% END %]
         [% END # UNLESS blocking_error %]
@@ -39,9 +49,9 @@
                 [% INCLUDE 'messages.inc' %]
 
 [% IF ( op ) %]
-<h1>Create routing list for <em>[% title | html %]</em></h1>
+    <h1>New routing list for <em>[% title | html %]</em></h1>
 [% ELSE %]
-<h1>Edit routing list for <em>[% title | html %]</em></h1>
+    <h1>Modify routing list for <em>[% title | html %]</em></h1>
 [% END %]
 
 <form method="post" action="routing.pl">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt
index fec632e105..7d3b57beee 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt
@@ -4,9 +4,15 @@
 [% USE Branches %]
 [% USE HtmlTags %]
 [% USE KohaDates %]
+[% PROCESS 'i18n.inc' %]
 [% SET footerjs = 1 %]
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Serial collection information for [% bibliotitle | html %] &rsaquo; Serials &rsaquo; Koha</title>
+<title>[% FILTER collapse %]
+    [% t("Serial collection information") | html %] &rsaquo;
+    [% bibliotitle | html %] &rsaquo;
+    [% t("Serials") | html %] &rsaquo;
+    [% t("Koha") | html %]
+[% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt
index d19f691508..644ce9d111 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt
@@ -1,8 +1,17 @@
 [% USE raw %]
 [% USE Asset %]
 [% USE AuthorisedValues %]
+[% PROCESS 'i18n.inc' %]
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Serial edition [% bibliotitle | html %] &rsaquo; Serials &rsaquo; Koha</title>
+<title>[% FILTER collapse %]
+    [% t("Serial edition") | html %]
+    [% IF ( callnumber ) %]
+         ([% callnumber | html %])
+    [% END %] &rsaquo;
+    [% bibliotitle | html %] &rsaquo;
+    [% t("Serials") | html %] &rsaquo;
+    [% t("Koha") | html %]
+[% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 [% Asset.js("js/cataloging.js") | $raw %]
 [% INCLUDE 'calendar.inc' %]
@@ -132,6 +141,8 @@ $(document).ready(function() {
     [% FOREACH subscription IN subscriptions %]
     <input type="hidden" name="subscriptionid" value="[% subscription.subscriptionid | html %]" />
     [% END %]
+
+<div class="page-section">
 	<table>
 	<tr>
 		<th>Numbered</th>
@@ -491,6 +502,8 @@ $(document).ready(function() {
 [% END %]
 
 </table>
+</div> <!-- /.page-section -->
+
     <fieldset class="action">
         <div class="btn-group"><input type="submit" value="Save" class="btn btn-default"  accesskey="w" /></div>
         [% UNLESS ( serialsadditems ) %]&nbsp;&nbsp;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt
index b2804e1294..3153db6fa0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt
@@ -3,9 +3,13 @@
 [% USE Asset %]
 [% USE KohaDates %]
 [% USE Branches %]
+[% PROCESS 'i18n.inc' %]
 [% SET footerjs = 1 %]
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Serials [% biblionumber | html %] &rsaquo; Koha</title>
+<title>[% FILTER collapse %]
+    [% tx("Serials {biblionumber}", { biblionumber = biblionumber }) | html %] &rsaquo;
+    [% t("Koha") | html %]
+[% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="ser_serials-home" class="ser">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt
index b7b3cc62ca..d34828d2e2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt
@@ -5,9 +5,14 @@
 [% USE CGI %]
 [% USE KohaDates %]
 [% USE Koha %]
+[% PROCESS 'i18n.inc' %]
 [% SET footerjs = 1 %]
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Serials [% biblionumber | html %] &rsaquo; Koha</title>
+<title>[% FILTER collapse %]
+    [% t("Search results") | html %] &rsaquo;
+    [% t("Serials") | html %] &rsaquo;
+    [% t("Koha") | html %]
+[% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 <style>input.dt-filter { width : 100%; font-size : 85%; }</style>
 </head>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
index f169a58274..6f6c5a86b3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
@@ -4,9 +4,19 @@
 [% USE KohaDates %]
 [% USE Branches %]
 [% USE Koha %]
+[% PROCESS 'i18n.inc' %]
 [% SET footerjs = 1 %]
 [% INCLUDE 'doc-head-open.inc' %]
-<title>[% IF ( modify ) %][% bibliotitle | html %] &rsaquo; Modify subscription[% ELSE %]New subscription[% END %] &rsaquo; Serials &rsaquo; Koha</title>
+<title>[% FILTER collapse %]
+    [% IF( modify ) %]
+        [% t("Modify subscription") | html %] &rsaquo;
+        [% bibliotitle | html %]
+    [% ELSE %]
+        [% t("New subscription") | html %]
+    [% END %] &rsaquo;
+    [% t("Serials") | html %] &rsaquo;
+    [% t("Koha") | html %]
+[% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 <style>
 fieldset.rows li.radio { width: 100%; } /* override staff-global.css */
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt
index 0d3ab11439..809f8a0133 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt
@@ -4,8 +4,13 @@
 [% USE Branches %]
 [% USE ItemTypes %]
 [% USE KohaDates %]
+[% PROCESS 'i18n.inc' %]
 [% INCLUDE 'doc-head-open.inc' %]
-    <title>Batch edit &rsaquo; Serials &rsaquo; Koha</title>
+    <title>[% FILTER collapse %]
+    [% t("Batch edit") | html %] &rsaquo;
+    [% t("Serials") | html %] &rsaquo;
+    [% t("Koha") | html %]
+[% END %]</title>
     [% INCLUDE 'doc-head-close.inc' %]
     [% INCLUDE 'calendar.inc' %]
 </head>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-bib-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-bib-search.tt
index 2e283fac6e..691f7be272 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-bib-search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-bib-search.tt
@@ -1,5 +1,11 @@
+[% USE raw %]
+[% PROCESS 'i18n.inc' %]
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Catalog search &rsaquo; Serials &rsaquo; Koha</title>
+<title>[% FILTER collapse %]
+    [% t("Catalog search") | html %] &rsaquo;
+    [% t("Serials") | html %] &rsaquo;
+    [% t("Koha") | html %]
+[% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="ser_subscription-bib-search" class="ser">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
index 7785cc4c69..7aed47a977 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
@@ -6,10 +6,17 @@
 [% USE AuthorisedValues %]
 [% USE Price %]
 [% USE TablesSettings %]
+[% USE HtmlTags %]
+[% PROCESS 'i18n.inc' %]
 [% SET footerjs = 1 %]
 [%- PROCESS 'html_helpers.inc' -%]
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Details for subscription #[% subscriptionid | html %] &rsaquo; Serials &rsaquo; Koha</title>
+<title>[% FILTER collapse %]
+    [% t("Subscription details") | html %] &rsaquo;
+    [% bibliotitle | html %] &rsaquo;
+    [% t("Serials") | html %] &rsaquo;
+    [% t("Koha") | html %]
+[% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 [% Asset.css("lib/jquery/plugins/treetable/stylesheets/jquery.treetable.css") | $raw %]
 </head>
@@ -44,7 +51,7 @@
                 [% INCLUDE 'serials-toolbar.inc' %]
                 [% INCLUDE 'mana/mana-comment-status.inc' %]
 
-                <h1>Subscription for [% INCLUDE 'biblio-title.inc' biblio=subscription.biblio link = 0 %] [% IF subscription.closed %](closed)[% END %]</h1>
+                <h1>Subscription for [% INCLUDE 'biblio-title.inc' biblio=subscription.biblio link = 0 | $HtmlTags tag="em" %] [% IF subscription.closed %](closed)[% END %]</h1>
 
                 [% IF ( abouttoexpire ) %]
                     [% UNLESS subscription.closed %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt
index 6e3df31986..ed4b28816a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt
@@ -1,7 +1,19 @@
 [% USE raw %]
+[% PROCESS 'i18n.inc' %]
 [% SET footerjs = 1 %]
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Frequencies &rsaquo; Serials &rsaquo; Koha</title>
+<title>[% FILTER collapse %]
+    [% IF (new or modify) %]
+        [% IF (new) %]
+            [% t("New frequency") | html %]
+        [% ELSE %]
+            [% tx("Modify frequency '{description}'", { description = description }) | html %]
+        [% END %] &rsaquo;
+    [% END %]
+    [% t("Frequencies") | html %] &rsaquo;
+    [% t("Serials") | html %] &rsaquo;
+    [% t("Koha") | html %]
+[% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 
@@ -24,8 +36,23 @@
         [% WRAPPER breadcrumb_item %]
             <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a>
         [% END %]
-        [% WRAPPER breadcrumb_item bc_active= 1 %]
-            <span>Frequencies</span>
+        [% IF (new or modify) %]
+            [% WRAPPER breadcrumb_item %]
+                <a href="/cgi-bin/koha/serials/subscription-frequencies.pl">Frequencies</a>
+            [% END %]
+            [% IF (new) %]
+                [% WRAPPER breadcrumb_item bc_active= 1 %]
+                    <span>New frequency</span>
+                [% END %]
+            [% ELSE %]
+                [% WRAPPER breadcrumb_item bc_active= 1 %]
+                    [% tx("Modify frequency '{description}'", { description = description }) | html %]
+                [% END %]
+            [% END %]
+        [% ELSE %]
+            [% WRAPPER breadcrumb_item bc_active= 1 %]
+                <span>Frequencies</span>
+            [% END %]
         [% END %]
     [% END #/ WRAPPER breadcrumbs %]
 [% END #/ WRAPPER sub-header.inc %]
@@ -40,7 +67,7 @@
         [% IF (new) %]
           <h1>New frequency</h1>
         [% ELSE %]
-          <h1>Edit frequency: [% description | html %]</h1>
+          <h1>[% tx("Modify frequency '{description}'", { description = description }) | html %]</h1>
         [% END %]
         <form action="/cgi-bin/koha/serials/subscription-frequencies.pl" id="add_frequency_form" method="post">
             [% INCLUDE 'csrf-token.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-history.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-history.tt
index 2e214555ae..5066c53c94 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-history.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-history.tt
@@ -1,8 +1,14 @@
 [% USE raw %]
 [% USE KohaDates %]
+[% PROCESS 'i18n.inc' %]
 [% SET footerjs = 1 %]
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Subscription history &rsaquo; Serials &rsaquo; Koha</title>
+<title>[% FILTER collapse %]
+    [% t("Subscription history") | html %] &rsaquo;
+    [% title | html %] &rsaquo;
+    [% t("Serials") | html %] &rsaquo;
+    [% t("Koha") | html %]
+[% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 
@@ -31,7 +37,7 @@
             <main>
                 [% INCLUDE 'messages.inc' %]
 
-      <h1>Subscription history for [% title | html %]</h1>
+      <h1>Subscription history for <em>[% title | html %]</em></h1>
 
         <div id="subscription_form_history">
           <form method="post" action="/cgi-bin/koha/serials/subscription-history.pl">
@@ -39,39 +45,43 @@
             <input type="hidden" name="op" value="cud-mod" />
             <input type="hidden" name="subscriptionid" value="[% subscriptionid | html %]" />
             <p>Hint : you can update the serial history manually. This can be useful for an old subscription or to clean the existing history. Modify those fields with care, as future serial receive will continue to update them automatically.</p>
-            <table>
-              <tr>
-                <td>Subscription start date</td>
-                <td>
-                    <input type="text" size="10" name="histstartdate" value="[% histstartdate | html %]" class="flatpickr" data-date_to="histenddate" /> (start date of the 1st subscription)
-                    <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
-                </td>
-              </tr>
-              <tr>
-                <td>Subscription end date</td>
-                <td>
-                    <input type="text" size="10" id="histenddate" name="histenddate" value="[% histenddate | html %]" class="flatpickr" />(if empty, subscription is still active)
-                    <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
-                </td>
-              </tr>
-              <tr>
-                <td>Received issues</td>
-                <td><textarea name="receivedlist" cols="60" rows="5">[% receivedlist | html %]</textarea></td>
-              </tr>
-              <tr>
-                <td>Missing issues</td>
-                <td><textarea name="missinglist" cols="60" rows="5">[% missinglist | html %]</textarea></td>
-              </tr>
-              <tr>
-                <td>Note for OPAC</td>
-                <td><textarea name="opacnote" cols="60" rows="5">[% opacnote | html %]</textarea></td>
-              </tr>
-              <tr>
-                <td>Note for staff</td>
-                <td><textarea name="librariannote" cols="60" rows="5">[% librariannote | html %]</textarea></td>
-              </tr>
-            </table>
-            <input type="submit" class="btn btn-primary" value="Save subscription history"  />
+            <fieldset class="rows">
+                <table>
+                <tr>
+                    <td>Subscription start date</td>
+                    <td>
+                        <input type="text" size="10" name="histstartdate" value="[% histstartdate | html %]" class="flatpickr" data-date_to="histenddate" /> (start date of the 1st subscription)
+                        <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
+                    </td>
+                </tr>
+                <tr>
+                    <td>Subscription end date</td>
+                    <td>
+                        <input type="text" size="10" id="histenddate" name="histenddate" value="[% histenddate | html %]" class="flatpickr" />(if empty, subscription is still active)
+                        <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
+                    </td>
+                </tr>
+                <tr>
+                    <td>Received issues</td>
+                    <td><textarea name="receivedlist" cols="60" rows="5">[% receivedlist | html %]</textarea></td>
+                </tr>
+                <tr>
+                    <td>Missing issues</td>
+                    <td><textarea name="missinglist" cols="60" rows="5">[% missinglist | html %]</textarea></td>
+                </tr>
+                <tr>
+                    <td>Note for OPAC</td>
+                    <td><textarea name="opacnote" cols="60" rows="5">[% opacnote | html %]</textarea></td>
+                </tr>
+                <tr>
+                    <td>Note for staff</td>
+                    <td><textarea name="librariannote" cols="60" rows="5">[% librariannote | html %]</textarea></td>
+                </tr>
+                </table>
+            </fieldset>
+            <fieldset class="action">
+                <input type="submit" class="btn btn-primary" value="Save subscription history" />
+            </fieldset>
           </form>
         </div>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt
index 25b6f8e94c..34ccce860d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt
@@ -1,8 +1,18 @@
 [% USE raw %]
 [% USE Asset %]
+[% PROCESS 'i18n.inc' %]
 [% SET footerjs = 1 %]
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Numbering patterns &rsaquo; Serials &rsaquo; Koha</title>
+<title>[% FILTER collapse %]
+    [% IF ( new ) %]
+        [% t("New numbering pattern") | html %] &rsaquo;
+    [% ELSIF ( modify ) %]
+        [% tx("Modify numbering pattern '{pattern}'", { pattern = label }) | html %] &rsaquo;
+    [% END %]
+    [% t("Numbering patterns") | html %] &rsaquo;
+    [% t("Serials") | html %] &rsaquo;
+    [% t("Koha") | html %]
+[% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 
@@ -27,7 +37,7 @@
             [% END %]
         [% ELSIF ( modify ) %]
             [% WRAPPER breadcrumb_item bc_active= 1 %]
-                <span>Modifying numbering pattern '[% label | html %]'</span>
+                [% tx("Modify numbering pattern '{pattern}'", { pattern = label }) | html %]
             [% END %]
         [% ELSE %]
             [% WRAPPER breadcrumb_item bc_active= 1 %]
@@ -52,7 +62,7 @@
               </div>
             [% END %]
           [% ELSE %]
-            <h1>Modify pattern: [% label | html %]</h1>
+            <h1>[% tx("Modify numbering pattern '{pattern}'", { pattern = label }) | html %]</h1>
             [% IF (error_existing_numberpattern) %]
               <div class="alert alert-warning">
                 <p>Another pattern with this name already exists.</p>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt
index e13fb4c9cd..ab1122d233 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt
@@ -1,12 +1,19 @@
+[% USE raw %]
 [% USE Koha %]
 [% USE Branches %]
+[% PROCESS 'i18n.inc' %]
 [% SET footerjs = 1 %]
 [% INCLUDE 'doc-head-open.inc' %]
-[% IF subscription %]
-<title>Serials subscription renew #[% subscription.subscriptionid | html %] &rsaquo; Koha</title>
-[% ELSE %]
-<title>Serials subscription renew &rsaquo; Koha</title>
-[% END %]
+<title>[% FILTER collapse %]
+    [% IF subscription %]
+        [% t("Renew subscription") | html %] &rsaquo;
+        [% subscription.bibliotitle | html %] &rsaquo;
+    [% ELSE %]
+        [% t("Renew subscriptions") | html %] &rsaquo;
+    [% END %]
+    [% t("Serials") | html %] &rsaquo;
+    [% t("Koha") | html %]
+[% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tt
index a5d4223d1e..3dcf3ea233 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tt
@@ -1,6 +1,12 @@
 [% USE raw %]
+[% PROCESS 'i18n.inc' %]
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Alert subscribers for [% bibliotitle | html %] &rsaquo; Serials &rsaquo; Koha</title>
+<title>[% FILTER collapse %]
+    [% t("Alert subscribers") | html %] &rsaquo;
+    [% bibliotitle | html %] &rsaquo;
+    [% t("Serials") | html %] &rsaquo;
+    [% t("Koha") | html %]
+[% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="ser_viewalerts" class="ser">
-- 
2.39.5