From 7bdee0715ba2265ab76a87cb3559c6d8257f6351 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 4 Oct 2023 11:12:14 +0000 Subject: [PATCH] Bug 34393: (follow-up) QA fixes and further refinement This patch addresses issues discovered during testing and fixes a couple of issues which were missed. Signed-off-by: Katrin Fischer --- .../en/modules/admin/marc_subfields_structure.tt | 6 +++--- .../prog/en/modules/admin/marctagstructure.tt | 12 ++++++++---- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt index 4dbce11ad0..1812f10b66 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt @@ -5,7 +5,7 @@ [% INCLUDE 'doc-head-open.inc' %] [% FILTER collapse %] [% IF ( add_form ) %] - [% t("Edit subfields constraints") | html %] › + [% t("Edit subfield constraints") | html %] › [% END %] [% IF ( delete_confirm ) %] @@ -60,7 +60,7 @@ <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=[% tagfield | uri %]&frameworkcode=[% frameworkcode | uri %]">[% tx("Tag {tag}", { tag = tagfield}) | html %]</a> [% END %] [% WRAPPER breadcrumb_item bc_active= 1 %] - <span>Edit subfields constraints</span> + <span>Edit subfield constraints</span> [% END %] [% END %] @@ -340,7 +340,7 @@ [% IF ( frameworkcode ) %] <h1>[% tx("Tag {tag} subfield structure (framework {frameworkcode})", { tag = tagfield, frameworkcode = frameworkcode }) | html %]</h1> [% ELSE %] - <h1>MARC subfield structure admin for [% tagfield | html %] (default framework)</h1> + <h1>[% tx("Tag {tag} subfield structure (default framework)", { tag = tagfield}) | html %]</h1> [% END %] <p>This screen shows the subfields associated with the selected tag. You can edit subfields or add a new one by clicking on edit.</p> 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 f09ea32f5a..8d3c390c51 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt @@ -18,7 +18,11 @@ [% IF ( delete_confirmed ) %] [% t("Data deleted") | html %] › [% END %] - [% framework.frameworktext | html %] ([% framework.frameworkcode | html %]) › + [% IF framework %] + [% framework.frameworktext | html %] ([% framework.frameworkcode | html %]) › + [% ELSE %] + [% t("Default framework") | html %] › + [% END %] [% t("MARC bibliographic frameworks") | html %] › [% t("Administration") | html %] › [% t("Koha") | html %] @@ -63,7 +67,7 @@ [% IF framework %] <span>[% framework.frameworktext | html %] ([% framework.frameworkcode | html %])</span> [% ELSE %] - <span>Default MARC bibliographic framework</span> + <span>Default framework</span> [% END %] [% END %] @@ -73,7 +77,7 @@ [% IF framework %] <span>[% framework.frameworktext | html %] ([% framework.frameworkcode | html %])</span> [% ELSE %] - <span>Default MARC bibliographic framework</span> + <span>Default framework</span> [% END %] </a> [% END %] @@ -87,7 +91,7 @@ [% IF framework %] <span>[% framework.frameworktext | html %] ([% framework.frameworkcode | html %])</span> [% ELSE %] - <span>Default MARC bibliographic framework</span> + <span>Default framework</span> [% END %] </a> [% END %] -- 2.30.2