From 9c1ce18c17c435cd01338b7c398f63674e6946db Mon Sep 17 00:00:00 2001 From: Pedro Amorim Date: Mon, 21 Oct 2024 11:07:15 +0000 Subject: [PATCH] Bug 36118: (QA follow-up): Make labels translatable Also move the space+colon from 'Patron notice sent: ' label to ill-request-log.inc template Adjust status_change.tt 'From' capitalized because for status changed this is now: $ Status changed: From "New request" to "Requested" Instead of the previous: $ Status changed from "New request" to "Requested" Signed-off-by: Katrin Fischer --- koha-tmpl/intranet-tmpl/prog/en/includes/ill-request-log.inc | 2 +- .../intranet-tmpl/prog/en/modules/ill/log/patron_notice.tt | 3 ++- .../intranet-tmpl/prog/en/modules/ill/log/status_change.tt | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-request-log.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/ill-request-log.inc index 8a4d96c042..965792be3d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-request-log.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/ill-request-log.inc @@ -8,7 +8,7 @@ [% PROCESS 'action-logs.inc' %] [% PROCESS translate_log_interface log_interface = log.interface %] [% END %] - - [% action_label | html %] + - [% action_label | html %]: [% content | $raw %]

[% END %] \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/log/patron_notice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/log/patron_notice.tt index 2d29747363..5e067552bb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/log/patron_notice.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/log/patron_notice.tt @@ -1,6 +1,7 @@ [% USE KohaDates %] +[% PROCESS 'i18n.inc' %] [% PROCESS 'ill-request-log.inc' %] -[% WRAPPER ill_request_log action_label = "Patron notice sent: " %] +[% WRAPPER ill_request_log action_label = t("Patron notice sent") %] [% SET notice_code = log.info.notice_code %] "[% log.notice_types.$notice_code.name | html %]" [% END %] \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/log/status_change.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/log/status_change.tt index ae6621117b..e207703f2d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/log/status_change.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/log/status_change.tt @@ -1,10 +1,11 @@ [% USE KohaDates %] +[% PROCESS 'i18n.inc' %] [% PROCESS 'ill-request-log.inc' %] -[% WRAPPER ill_request_log action_label = "Status changed" %] +[% WRAPPER ill_request_log action_label = t("Status changed") %] [% IF log.info.status_before %] [% before = log.info.status_before %] [% display_before = log.aliases.$before ? log.aliases.$before.lib : request.capabilities.$before.name %] - from "[% display_before | html %]" + From "[% display_before | html %]" [% END %] [% SET after = log.info.status_after %] [% SET display_after = log.aliases.$after ? log.aliases.$after.lib : request.capabilities.$after.name %] -- 2.39.5