From cd1f593dbd3fae41a31d9af0956c8d75b56c9a72 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 6 Jun 2023 15:15:11 +0000 Subject: [PATCH] Bug 33914: Improve translation of title tags: Course reserves This patch updates course reserves templates so that title tags can be more easily translated. To test you should have the UseCourseReserves system preference enabled. Apply the patch and confirm that the following course reserves pages have the correct title tags: - Course reserves - New course - Course details - Edit course - Add reserves (step 1 and 2) - Batch add reserves (step 1 and 2) - Batch remove reserves - Invalid course (/cgi-bin/koha/course_reserves/course-details.pl?course_id=) Signed-off-by: David Nind Signed-off-by: Jonathan Druart --- .../en/modules/course_reserves/add_items-step1.tt | 8 +++++++- .../en/modules/course_reserves/add_items-step2.tt | 13 +++++++++++-- .../en/modules/course_reserves/batch_add_items.tt | 9 +++++++-- .../en/modules/course_reserves/batch_rm_items.tt | 7 ++++++- .../en/modules/course_reserves/course-details.tt | 6 +++++- .../en/modules/course_reserves/course-reserves.tt | 7 +++++-- .../prog/en/modules/course_reserves/course.tt | 10 +++++++++- .../en/modules/course_reserves/invalid-course.tt | 7 ++++++- 8 files changed, 56 insertions(+), 11 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt index 751c89ac1c4..4be78f6873a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt @@ -1,7 +1,13 @@ [% USE raw %] +[% PROCESS 'i18n.inc' %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -Add reserves › [% course.course_name | html %] › Course reserves › Koha +[% FILTER collapse %] + [% t("Add reserves") | html %] › + [% course.course_name | html %] › + [% t("Course reserves") | html %] › + [% t("Koha") | html %] +[% END %] [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt index ba14d8f2d93..284fd5acd6d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt @@ -1,10 +1,19 @@ [% USE raw %] [% USE HtmlTags %] [% USE Branches %] +[% PROCESS 'i18n.inc' %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -[% PROCESS 'i18n.inc' %] -[% IF is_edit || course_reserve %]Edit reserve[% ELSE %]Add reserves[% END %] › [% course.course_name | html %] › Course reserves › Koha +[% FILTER collapse %] + [% IF is_edit || course_reserve %] + [% t("Edit reserve") | html %] + [% ELSE %] + [% t("Add reserves") | html %] + [% END %] › + [% course.course_name | html %] › + [% t("Course reserves") | html %] › + [% t("Koha") | html %] +[% END %] [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_add_items.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_add_items.tt index eb4e674a247..5527b8b76db 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_add_items.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_add_items.tt @@ -2,11 +2,16 @@ [% USE AuthorisedValues %] [% USE Branches %] [% USE ItemTypes %] - +[% PROCESS 'i18n.inc' %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -Add reserves › [% course.course_name | html %] › Course reserves › Koha +[% FILTER collapse %] + [% t("Add reserves") | html %] › + [% course.course_name | html %] › + [% t("Course reserves") | html %] › + [% t("Koha") | html %] +[% END %] [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_rm_items.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_rm_items.tt index 7f3f657a2af..b390d5e755a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_rm_items.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_rm_items.tt @@ -1,8 +1,13 @@ +[% USE raw %] [% PROCESS 'i18n.inc' %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -Remove reserves › Course reserves › Koha +[% FILTER collapse %] + [% t("Remove reserves") | html %] › + [% t("Course reserves") | html %] › + [% t("Koha") | html %] +[% END %] [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt index 591452fa63f..12d52116322 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt @@ -8,7 +8,11 @@ [% PROCESS 'i18n.inc' %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -Course details for [% course.course_name | html %] › Course reserves › Koha +[% FILTER collapse %] + [% tx("Course details for {course_name}", { course_name = course.course_name }) | html %] › + [% t("Course reserves") | html %] › + [% t("Koha") | html %] +[% END %] [% INCLUDE 'doc-head-close.inc' %] [% FILTER collapse %]