From 819eb35f1d8941e94d1ba9e796d6f99f923d425c Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Mon, 9 Jan 2023 20:00:53 +0000 Subject: [PATCH] Bug 31957: (follow-up) Further improve translations With the previous attempt, we ended up with some TT constructs in the po files. This will hopefully avoid that. Signed-off-by: Caroline Cyr La Rose Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi (cherry picked from commit d2a281ad4b80fc74bfeaab8260408bb354f7a9b8) Signed-off-by: Pedro Amorim (cherry picked from commit ce76a551fe012fde66f1c9d893d2a19e424e458e) Signed-off-by: Lucas Gass (cherry picked from commit d49a97768f46a92467ca4fd1fe360b5d7f21c8c3) Signed-off-by: Arthur Suzuki --- .../prog/en/modules/admin/branches.tt | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt index 4683f00b62..a4c093a3b5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt @@ -3,6 +3,7 @@ [% USE Asset %] [% SET footerjs = 1 %] [% USE TablesSettings %] +[%- USE KohaSpan -%] [% INCLUDE 'doc-head-open.inc' %] [% IF op == 'add_form' %] @@ -175,8 +176,8 @@ Libraries › Administration › Koha <input type="text" name="branchillemail" id="branchillemail" class="email" size="80" value="[% library.branchillemail | html %]" /> <div class="hint"> [% IF ( CAN_user_parameters_manage_sysprefs ) %] - [% SET pref_ILLDefaultStaffEmail_link = '<a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=ILLDefaultStaffEmail">ILLDefaultStaffEmail</a>' %] - Default: [% pref_ILLDefaultStaffEmail_link | $raw %] system preference + [% pref_ILLDefaultStaffEmail_link = BLOCK %]<a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=ILLDefaultStaffEmail">ILLDefaultStaffEmail</a>[% END %] + Default: [% pref_ILLDefaultStaffEmail_link | $KohaSpan %] system preference [% ELSE %] Default: ILLDefaultStaffEmail system preference [% END %] @@ -188,8 +189,8 @@ Libraries › Administration › Koha <input type="text" name="branchreplyto" id="branchreplyto" class="email" size="80" value="[% library.branchreplyto | html %]" /> <div class="hint"> [% IF ( CAN_user_parameters_manage_sysprefs ) %] - [% SET pref_ReplyToDefault_link = '<a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=ReplyToDefault">ReplyToDefault</a>' %] - Default: [% pref_ReplyToDefault_link | $raw %] system preference + [% pref_ReplyToDefault_link = BLOCK %]<a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=ReplyToDefault">ReplyToDefault</a>[% END %] + Default: [% pref_ReplyToDefault_link | $KohaSpan %] system preference [% ELSE %] Default: ReplyToDefault system preference [% END %] @@ -200,8 +201,8 @@ Libraries › Administration › Koha <input type="text" name="branchreturnpath" id="branchreturnpath" class="email" size="80" value="[% library.branchreturnpath | html %]" /> <div class="hint"> [% IF ( CAN_user_parameters_manage_sysprefs ) %] - [% SET pref_ReturnpathDefault_link = '<a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=ReturnpathDefault">ReturnpathDefault</a>' %] - Default: [% pref_ReturnpathDefault_link | $raw %] system preference + [% pref_ReturnpathDefault_link = BLOCK %]<a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=ReturnpathDefault">ReturnpathDefault</a>[% END %] + Default: [% pref_ReturnpathDefault_link | $KohaSpan %] system preference [% ELSE %] Default: ReturnpathDefault system preference [% END %] @@ -235,8 +236,8 @@ Libraries › Administration › Koha <input type="text" name="marcorgcode" id="marcorgcode" size="16" maxlength="16" value="[% library.marcorgcode | html %]" /> <div class="hint"> [% IF ( CAN_user_parameters_manage_sysprefs ) %] - [% SET pref_MARCOrgCode_link = '<a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=MARCOrgCode">MARCOrgCode</a>' %] - If not filled in defaults to system preference [% pref_MARCOrgCode_link | $raw %]. + [% pref_MARCOrgCode_link = BLOCK %]<a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=MARCOrgCode">MARCOrgCode</a>[% END %] + If not filled in defaults to system preference [% pref_MARCOrgCode_link | $KohaSpan %]. [% ELSE %] If not filled in defaults to system preference MARCOrgCode. [% END %] -- 2.39.5