From 43021f62a528db86426787978952f269d90957f6 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 13 Jan 2021 11:11:36 +0100 Subject: [PATCH] Bug 27416: Make "Modify tag" and "Add tag" translatable Those two strings are not translatable as they are passed from the controller. Signed-off-by: Owen Leonard Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart (cherry picked from commit 4491cdd803226c22c585f3a23f6aa77000841bed) Signed-off-by: Fridolin Somers (cherry picked from commit 054428a57d4b810bc3278d625de573a66cb5d076) Signed-off-by: Andrew Fuerste-Henry (cherry picked from commit ae21f41f4840182f7812f03d3d70ee2d7ae637f7) Signed-off-by: Victor Grousset/tuxayo --- admin/marctagstructure.pl | 2 -- .../prog/en/modules/admin/marctagstructure.tt | 17 ++++++++++++----- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/admin/marctagstructure.pl b/admin/marctagstructure.pl index e8a6a7bc78..a24b6e025b 100755 --- a/admin/marctagstructure.pl +++ b/admin/marctagstructure.pl @@ -95,10 +95,8 @@ if ($op eq 'add_form') { if ($searchfield) { $template->param(searchfield => $searchfield); - $template->param(action => "Modify tag"); $template->param('heading_modify_tag_p' => 1); } else { - $template->param(action => "Add tag"); $template->param('heading_add_tag_p' => 1); } $template->param('use_heading_flags_p' => 1); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt index a9984985df..95a03d639a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt @@ -4,7 +4,7 @@ [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] Koha › Administration › -[% IF ( add_form ) %]MARC frameworks › [% action | html %] [% searchfield | html %][% END %] +[% IF ( add_form ) %]MARC frameworks › [% IF heading_add_tag_p %]Add tag[% ELSE %]Modify tag[% END %] [% searchfield | html %][% END %] [% IF ( delete_confirm ) %]MARC frameworks › Confirm deletion of tag '[% searchfield | html %]'[% END %] [% IF ( delete_confirmed ) %]MARC frameworks › Data deleted[% END %] [% IF ( else ) %]MARC frameworks[% END %] @@ -21,7 +21,7 @@ › MARC frameworks [% IF ( add_form ) %] › [% IF framework %][% framework.frameworktext | html %] ([% framework.frameworkcode | html %])[% ELSE %]Default MARC framework[% END%] -› [% action | html %] [% searchfield | html %] +› [% IF heading_add_tag_p %]Add tag[% ELSE %]Modify tag[% END %] [% searchfield | html %] [% ELSIF ( else ) %] › [% IF framework %][% framework.frameworktext | html %] ([% framework.frameworkcode | html %])[% ELSE %]Default MARC framework[% END %] [% ELSIF ( delete_confirm ) %] @@ -49,9 +49,16 @@
-
[% IF ( use_heading_flags_p ) %][% IF ( heading_modify_tag_p ) %]Modify tag [% searchfield | html %][% END %][% IF ( heading_add_tag_p ) %]Add tag[% END %][% ELSE %][% action | html %][% END %] - - +
+ + [% IF heading_add_tag_p %] + Add tag + [% ELSE %] + Modify tag [% searchfield | html %] + [% END %] + + +
  1. [% IF ( heading_modify_tag_p ) %] -- 2.39.5