From 0ec75d5e9f95ff6184e8e0716e1df158472bfc67 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 6 Jun 2023 15:10:37 +0000 Subject: [PATCH] Bug 33911: Improve translation of title tags: Catalog, basket, and lists This patch updates catalog, basket, and lists 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: - Advanced search - Search results - Bibliographic details - MARC preview - Image viewer (with local cover images) - MARC details - Labeled MARC details - ISBD details - Items - Checkout history - Rota - Add titles to the cart and view the cart - Send cart - Item search - Lists - View list - New list - Edit list - Send list --- .../prog/en/modules/basket/basket.tt | 7 +++++- .../prog/en/modules/basket/downloadcart.tt | 7 +++++- .../prog/en/modules/basket/sendbasketform.tt | 7 +++++- .../prog/en/modules/catalogue/ISBDdetail.tt | 17 ++++++++------ .../prog/en/modules/catalogue/MARCdetail.tt | 17 ++++++++------ .../prog/en/modules/catalogue/advsearch.tt | 7 +++++- .../prog/en/modules/catalogue/detail.tt | 16 ++++++++------ .../prog/en/modules/catalogue/imageviewer.tt | 8 ++++++- .../prog/en/modules/catalogue/issuehistory.tt | 7 +++++- .../prog/en/modules/catalogue/itemsearch.tt | 8 +++++-- .../en/modules/catalogue/labeledMARCdetail.tt | 17 ++++++++------ .../prog/en/modules/catalogue/moredetail.tt | 7 +++++- .../prog/en/modules/catalogue/results.tt | 22 ++++++++++++++++++- .../en/modules/catalogue/search-history.tt | 11 +++++++--- .../prog/en/modules/catalogue/showelastic.tt | 6 ++++- .../prog/en/modules/catalogue/showmarc.tt | 8 ++++++- .../en/modules/catalogue/stockrotation.tt | 7 +++++- .../virtualshelves/addbybiblionumber.tt | 8 ++++++- .../modules/virtualshelves/downloadshelf.tt | 8 ++++++- .../modules/virtualshelves/sendshelfform.tt | 8 ++++++- .../prog/en/modules/virtualshelves/shelves.tt | 19 +++++++++------- 21 files changed, 167 insertions(+), 55 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt index 761e441c34..59c605b720 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt @@ -2,6 +2,7 @@ [% USE Asset %] [% USE AuthorisedValues %] [% USE Branches %] +[% PROCESS 'i18n.inc' %] [% SET footerjs = 1 %] [% BLOCK controls %]

@@ -27,7 +28,11 @@

[% END %] [% INCLUDE 'doc-head-open.inc' %] -Your cart › Catalog › Koha +[% FILTER collapse %] + [% t("Your cart") | html %] › + [% t("Catalog") | html %] › + [% t("Koha") | html %] +[% END %] [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/downloadcart.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/downloadcart.tt index f61355622c..026833d64e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/downloadcart.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/downloadcart.tt @@ -1,5 +1,10 @@ +[% USE raw %] +[% PROCESS 'i18n.inc' %] [% INCLUDE 'doc-head-open.inc' %] -Download cart › Koha +[% FILTER collapse %] + [% t("Download cart") | html %] › + [% t("Koha") | html %] +[% END %] [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasketform.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasketform.tt index 108aa1ea92..7908430f76 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasketform.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasketform.tt @@ -1,5 +1,10 @@ +[% USE raw %] +[% PROCESS 'i18n.inc' %] [% INCLUDE 'doc-head-open.inc' %] -Sending your cart › [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog +[% FILTER collapse %] + [% t("Sending your cart") | html %] › + [% t("Koha") | html %] +[% END %] [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt index 479aad0d43..43d7d79913 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt @@ -1,15 +1,18 @@ [% USE raw %] [% USE Koha %] [% USE Asset %] +[% PROCESS 'i18n.inc' %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] - - [% IF ( unknownbiblionumber ) %] - Unknown record - [% ELSE %] - ISBD details for [% INCLUDE 'biblio-title-head.inc' %] - [% END %] › Catalog › Koha - +[% FILTER collapse %] + [% IF ( unknownbiblionumber ) %] + [% t("Unknown record") | html %] + [% ELSE %] + [% t("ISBD details for") | html %] [% INCLUDE 'biblio-title-head.inc' %] + [% END %] › + [% t("Catalog") | html %] › + [% t("Koha") | html %] +[% END %] [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt index 449b159a87..70d8b09852 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt @@ -1,15 +1,18 @@ [% USE raw %] [% USE Koha %] [% USE Asset %] +[% PROCESS 'i18n.inc' %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] - - [% IF ( unknownbiblionumber ) %] - Unknown record - [% ELSE %] - MARC details for [% INCLUDE 'biblio-title-head.inc' %] - [% END %] › Catalog › Koha - +[% FILTER collapse %] + [% IF ( unknownbiblionumber ) %] + [% t("Unknown record") | html %] + [% ELSE %] + [% t("MARC details for") | html %] [% INCLUDE 'biblio-title-head.inc' %] + [% END %] › + [% t("Catalog") | html %] › + [% t("Koha") | html %] +[% END %] [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt index 5f0a3b60cc..2b13688b29 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt @@ -2,9 +2,14 @@ [% USE Koha %] [% USE Asset %] [% USE Branches %] +[% PROCESS 'i18n.inc' %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -Advanced search › Catalog › Koha +[% FILTER collapse %] + [% t("Advanced search") | html %] › + [% t("Catalog") | html %] › + [% t("Koha") | html %] +[% END %] [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt index cd48d884a0..66892861ab 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -35,13 +35,15 @@ [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] - - [% IF ( unknownbiblionumber ) %] - Unknown record - [% ELSE %] - Details for [% INCLUDE 'biblio-title-head.inc' %] - [% END %] › Catalog › Koha - +[% FILTER collapse %] + [% IF ( unknownbiblionumber ) %] + [% t("Unknown record") | html %] + [% ELSE %] + [% t("Details for") | html %] [% INCLUDE 'biblio-title-head.inc' %] + [% END %] › + [% t("Catalog") | html %] › + [% t("Koha") | html %] +[% END %] [% INCLUDE 'doc-head-close.inc' %] [% Asset.css("lib/Chocolat/css/chocolat.css") | $raw %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt index 2a490dfb99..a38dccf759 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt @@ -1,8 +1,14 @@ [% USE raw %] [% USE Asset %] +[% PROCESS 'i18n.inc' %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -Images › [% INCLUDE 'biblio-title-head.inc' %] › Catalog › Koha +[% FILTER collapse %] + [% t("Images") | html %] › + [% INCLUDE 'biblio-title-head.inc' %] › + [% t("Catalog") | html %] › + [% t("Koha") | html %] +[% END %] [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt index 290224e76f..eaf4151aad 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt @@ -12,7 +12,27 @@ [% USE AuthorisedValues %] [% INCLUDE 'doc-head-open.inc' %] -[% IF ( searchdesc ) %]Results of search [% IF ( query_desc ) %]for '[% query_desc | html %]'[% END %][% IF ( limit_desc ) %] with limit(s): '[% limit_desc | html %]'[% END %][% ELSE %]You did not specify any search criteria[% END %] › Catalog › Koha +[% FILTER collapse %] + [% IF ( searchdesc ) %] + [% IF ( query_desc ) %] + [% IF ( limit_desc ) %] + [% tx("Results of search for {query_desc} with limit(s): '{limit_desc}'", { query_desc = query_desc, limit_desc = limit_desc }) | html %] + [% ELSE %] + [% tx("Results of search for {query_desc}", { query_desc = query_desc }) | html %] + [% END %] + [% ELSE %] + [% IF ( limit_desc ) %] + [% tx("Results of search for {limit_desc}", { limit_desc = limit_desc }) | html %] + [% ELSE %] + [% t("Results of search") | html %] + [% END %] + [% END %] + [% ELSE %] + [% t("You did not specify any search criteria") | html %] + [% END %] › + [% t("Catalog") | html %] › + [% t("Koha") | html %] +[% END %] [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt index 0ca1846784..62336be49c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt @@ -1,10 +1,15 @@ [% USE raw %] [% USE Asset %] -[% SET footerjs = 1 %] -[% INCLUDE 'doc-head-open.inc' %] [% USE Koha %] [% USE KohaDates %] -Search history › Catalog › Koha +[% PROCESS 'i18n.inc' %] +[% SET footerjs = 1 %] +[% INCLUDE 'doc-head-open.inc' %] +[% FILTER collapse %] + [% t("Search history") | html %] › + [% t("Catalog") | html %] › + [% t("Koha") | html %] +[% END %] [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/showelastic.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/showelastic.tt index c90e6d6e3b..5c35945910 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/showelastic.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/showelastic.tt @@ -1,6 +1,10 @@ [% INCLUDE 'doc-head-open.inc' %] [% USE raw %] -Elasticsearch record › Catalog › Koha +[% FILTER collapse %] + Elasticsearch record › + [% t("Catalog") | html %] › + [% t("Koha") | html %] +[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/showmarc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/showmarc.tt index fe001d0fd2..6854391eaf 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/showmarc.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/showmarc.tt @@ -1,5 +1,11 @@ +[% USE raw %] +[% PROCESS 'i18n.inc' %] [% INCLUDE 'doc-head-open.inc' %] -MARC import › Cataloging › Koha +[% FILTER collapse %] + [% t("MARC import") | html %] › + [% t("Cataloging") | html %] › + [% t("Koha") | html %] +[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt index efdd80aa60..d2822e7efd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt @@ -2,9 +2,14 @@ [% USE Koha %] [% USE Asset %] [% USE Branches %] +[% PROCESS 'i18n.inc' %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -Stock rotation details for [% INCLUDE 'biblio-title-head.inc' %] › Catalog › Koha +[% FILTER collapse %] + [% t("Stock rotation details for") | html %] [% INCLUDE 'biblio-title-head.inc' %] › + [% t("Catalog") | html %] › + [% t("Koha") | html %] +[% END %] [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tt index 51b9dde8e6..76631902ba 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tt @@ -1,5 +1,11 @@ +[% USE raw %] +[% PROCESS 'i18n.inc' %] [% INCLUDE 'doc-head-open.inc' %] -Add to list › Koha +[% FILTER collapse %] + [% t("Add to list") | html %] › + [% t("Lists") | html %] › + [% t("Koha") | html %] +[% END %] [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/downloadshelf.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/downloadshelf.tt index ebc7d8d9a1..61fdbd824c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/downloadshelf.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/downloadshelf.tt @@ -1,5 +1,11 @@ +[% USE raw %] +[% PROCESS 'i18n.inc' %] [% INCLUDE 'doc-head-open.inc' %] -Download list › Koha +[% FILTER collapse %] + [% t("Download list") | html %] › + [% t("Lists") | html %] › + [% t("Koha") | html %] +[% END %] [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelfform.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelfform.tt index 3817c57034..92546a120d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelfform.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelfform.tt @@ -1,5 +1,11 @@ +[% USE raw %] +[% PROCESS 'i18n.inc' %] [% INCLUDE 'doc-head-open.inc' %] -Sending your list › Lists › Koha +[% FILTER collapse %] + [% t("Sending your list") | html %] › + [% t("Lists") | html %] › + [% t("Koha") | html %] +[% END %] [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt index 99eb6127c8..8f8e1a6cc8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt @@ -4,19 +4,22 @@ [% USE KohaDates %] [% USE AuthorisedValues %] [% USE Branches %] +[% PROCESS 'i18n.inc' %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] - +<title>[% FILTER collapse %] [% IF op == 'view' %] - Contents of [% shelf.shelfname | html %] › [% END %] - + [% tx("Contents of {list_name}", { list_name = shelf.shelfname }) | html %] › + [% END %] [% IF op == 'add_form' %] - Create new list › [% END %] - + [% t("Create new list") | html %] › + [% END %] [% IF op == 'edit_form' %] - Edit list [% shelf.shelfname | html %] › [% END %] - Lists › Koha - + [% tx("Edit list {list_name}", { list_name = shelf.shelfname }) | html %] › + [% END %] + [% t("Lists") | html %] › + [% t("Koha") | html %] +[% END %] [% INCLUDE 'doc-head-close.inc' %] -- 2.30.2