From d856a1b00f52f8bdb6c96c491fb81948a3614752 Mon Sep 17 00:00:00 2001 From: Victor Grousset/tuxayo Date: Thu, 2 Jun 2022 03:35:23 +0200 Subject: [PATCH] Bug 30733: Fix string context lost due to being in two parts Due to conditions. Things like "Edit batch" need to be keept in one strings. Also removed some capitalization because it wasn't needed and wasn't consistend with and <h1> which had now capitalization. Also fixed patron edit-batch.tt and edit-layout.tt because they were incomplete in regard to their label counterparts. They had the condition on description and batch_id but weren't displaying anything different between the two cases. --- .../intranet-tmpl/prog/en/modules/admin/aqbudgets.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/admin/authtypes.tt | 6 +++--- koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt | 6 +++--- .../intranet-tmpl/prog/en/modules/admin/debit_types.tt | 6 +++--- .../prog/en/modules/patroncards/edit-batch.tt | 5 ++++- .../prog/en/modules/patroncards/edit-layout.tt | 8 ++++++-- 6 files changed, 21 insertions(+), 14 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt index 4b9c51c450..71724c4746 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt @@ -243,9 +243,9 @@ [% IF op == 'add_form' && !error_not_authorised_to_modify %] <form action="/cgi-bin/koha/admin/aqbudgets.pl" id="edit_fund" name="Aform" method="post"> <fieldset class="rows"> - <legend><h1>[% IF ( budget_id ) %]<span>Modify</span>[% ELSE %]<span>Add</span>[% END %] <span>Fund</span> + <legend><h1>[% IF ( budget_id ) %]<span>Modify fund</span>[% ELSE %]<span>Add fund</span>[% END %] [% IF ( budget_period_description ) %] - [% budget_name | html %] <span>for Budget</span> '[% budget_period_description | html %]' + [% budget_name | html %] <span>for budget</span> '[% budget_period_description | html %]' [% END %] </h1> </legend> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt index cabfabbb3d..5df96eda7d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt @@ -35,10 +35,10 @@ Authority types › Administration › Koha <li> <a href="#" aria-current="page"> [% IF authority_type.authtypecode.defined %] - <span>Modify</span> + <span>Modify authority type</span> [% ELSE %] - <span>New</span> - [% END %] <span>Authority type</span> + <span>New authority type</span> + [% END %] </a> </li> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt index 4f039c181d..032f6fe9cb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt @@ -38,10 +38,10 @@ <li> <a href="#" aria-current="page"> [% IF city.cityid %] - <span>Modify</span> + <span>Modify city</span> [% ELSE %] - <span>New</span> - [% END %] <span>City</span> + <span>New city</span> + [% END %] </a> </li> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt index 9ce9b22370..ddd960ed26 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt @@ -36,10 +36,10 @@ <li> <a href="#" aria-current="page"> [% IF debit_type.code %] - <span>Modify</span> + <span>Modify debit type</span> [% ELSE %] - <span>New</span> - [% END %] <span>debit type</span> + <span>New debit type</span> + [% END %] </a> </li> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt index 90a48c4465..554342bed3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt @@ -45,7 +45,10 @@ [% INCLUDE 'patroncards-toolbar.inc' %] - <h1>[% IF description %]<span>Edit</span> [% ELSIF batch_id %]<span>Edit</span> [% ELSE %]<span>New</span> [% END %]<span>patron card batches</span></h1> + <h1>[% IF description %]<span>Edit</span> [% description | html %] + [% ELSIF batch_id %]<span>Edit patron card batch</span> [% batch_id | html %] + [% ELSE %]<span>New patron card batch</span>[% END %] + </h1> [% IF ( duplicate_message ) %] <div class="dialog message"> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt index 2d9c45c5dc..f8e1c2f536 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt @@ -41,7 +41,9 @@ [% INCLUDE 'patroncards-toolbar.inc' %] - <h1>[% IF ( layout_id ) %]<span>Edit</span>[% ELSE %]<span>Create</span>[% END %] <span>patron card layout</span></h1> + <h1>[% IF ( layout_id ) %]<span>Edit patron card layout</span> [% layout_id | html %] + [% ELSE %]<span>Create patron card layout</span>[% END %] + </h1> <!-- NOTE: The order of the elements on this form is crictical to correct processing. You've been warned... --> <form name="input" action="/cgi-bin/koha/patroncards/edit-layout.pl" method="get"> @@ -279,7 +281,9 @@ </div> <div class="col-sm-6"> <fieldset class="rows"> - <legend>[% IF ( layout_id ) %]<span>Edit</span>[% ELSE %]<span>Create</span>[% END %] <span>patron card graphic layout</span></legend> + <legend>[% IF ( layout_id ) %]<span>Edit patron card graphic layout</span> + [% ELSE %]<span>Create patron card graphic layout</span>[% END %] + </legend> <ol> <!-- <li> -- 2.36.1