From ae21f41f4840182f7812f03d3d70ee2d7ae637f7 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
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 <oleonard@myacpl.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit 4491cdd803226c22c585f3a23f6aa77000841bed)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
(cherry picked from commit 054428a57d4b810bc3278d625de573a66cb5d076)

Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com>
---
 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 e53a339a27..9b6165b595 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 a57be3cd48..1aeb3a0766 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' %]
 <title>Koha &rsaquo; Administration &rsaquo;
-[% IF ( add_form ) %]MARC frameworks &rsaquo; [% action | html %] [% searchfield | html %][% END %]
+[% IF ( add_form ) %]MARC frameworks &rsaquo; [% IF heading_add_tag_p %]Add tag[% ELSE %]Modify tag[% END %] [% searchfield | html %][% END %]
 [% IF ( delete_confirm ) %]MARC frameworks &rsaquo; Confirm deletion of tag '[% searchfield | html %]'[% END %]
 [% IF ( delete_confirmed ) %]MARC frameworks &rsaquo;  Data deleted[% END %]
 [% IF ( else ) %]MARC frameworks[% END %]</title>
@@ -21,7 +21,7 @@
 &rsaquo; <a href="/cgi-bin/koha/admin/biblio_framework.pl">MARC frameworks</a>
 [% IF ( add_form ) %]
 &rsaquo; <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=[% framework.frameworkcode | uri %]">[% IF framework %][% framework.frameworktext | html %] ([% framework.frameworkcode | html %])[% ELSE %]Default MARC framework[% END%]</a>
-&rsaquo; [% action | html %] [% searchfield | html %]
+&rsaquo; [% IF heading_add_tag_p %]Add tag[% ELSE %]Modify tag[% END %] [% searchfield | html %]
 [% ELSIF ( else ) %]
 &rsaquo; <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=[% framework.frameworkcode | uri %]">[% IF framework %][% framework.frameworktext | html %] ([% framework.frameworkcode | html %])[% ELSE %]Default MARC framework[% END %]</a>
 [% ELSIF ( delete_confirm ) %]
@@ -49,9 +49,16 @@
 
     <form action="[% script_name | html %]" name="Aform" method="post" class="validated">
 
-      <fieldset class="rows"><legend>[% IF ( use_heading_flags_p ) %][% IF ( heading_modify_tag_p ) %]Modify tag <input type="hidden" name="modif" value="1" />[% searchfield | html %][% END %][% IF ( heading_add_tag_p ) %]Add tag[% END %][% ELSE %][% action | html %][% END %]</legend>  <input type="hidden" name="op" value="add_validate" />
-        <input type="hidden" name="frameworkcode" value="[% framework.frameworkcode | html %]" />
-
+      <fieldset class="rows">
+            <legend>
+                [% IF heading_add_tag_p %]
+                    Add tag
+                [% ELSE %]
+                    Modify tag <input type="hidden" name="modif" value="1" />[% searchfield | html %]
+                [% END %]
+            </legend>
+            <input type="hidden" name="op" value="add_validate" />
+            <input type="hidden" name="frameworkcode" value="[% framework.frameworkcode | html %]" />
         <ol>
             <li>
                 [% IF ( heading_modify_tag_p ) %]
-- 
2.39.5