From f78716b8e6d7015de0b94108a29709f02e6e4f76 Mon Sep 17 00:00:00 2001 From: Fridolin Somers Date: Fri, 7 Oct 2022 15:08:44 -1000 Subject: [PATCH] Bug 31718: Others facilitate translation in frameworks administration Some other IF/ELSE/END can be changed to facilitate translation Test plan : Always test with default framework and with another framework and compare with and without patch 1) View subfields of field => Check the h1 in page 2) Perform actions on a field (create, modify, delete) => Check breadcrumbs and h1 in page 3) View the framework table => Check columns Repeatable, Mandatory, Important Signed-off-by: David Nind Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi --- .../modules/admin/marc_subfields_structure.tt | 6 +++- .../prog/en/modules/admin/marctagstructure.tt | 34 +++++++++++-------- 2 files changed, 24 insertions(+), 16 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 c47840ba8e..c33699c945 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 @@ -374,7 +374,11 @@ [% END # /IF ( delete_confirm ) %] [% IF ( else ) %] -

MARC subfield structure admin for [% tagfield | html %] [% IF ( frameworkcode ) %](framework [% frameworkcode | html %])[% ELSE %](default framework)[% END %]

+ [% IF ( frameworkcode ) %] +

MARC subfield structure admin for [% tagfield | html %] (framework [% frameworkcode | html %])

+ [% ELSE %] +

MARC subfield structure admin for [% tagfield | html %] (default framework)

+ [% END %]

This screen shows the subfields associated with the selected tag. You can edit subfields or add a new one by clicking on edit.

The column 'Koha field' shows that the subfield is linked with a Koha field.

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 adee3aec59..e282707b07 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt @@ -43,7 +43,7 @@ MARC frameworks › Administration › Koha
  • [% IF framework %] - [% framework.frameworktext | html %] ([% framework.frameworkcode | html %]) + [% framework.frameworktext | html %] ([% framework.frameworkcode | html %]) [% ELSE %] Default MARC framework [% END%] @@ -52,10 +52,10 @@ MARC frameworks › Administration › Koha
  • [% IF heading_add_tag_p %] - Add tag + Add tag [% searchfield | html %] [% ELSE %] - Modify tag - [% END %] [% searchfield | html %] + Modify tag [% searchfield | html %] + [% END %]
    • @@ -63,9 +63,9 @@ MARC frameworks › Administration › Koha
  • [% IF framework %] - [% framework.frameworktext | html %] ([% framework.frameworkcode | html %]) + [% framework.frameworktext | html %] ([% framework.frameworkcode | html %]) [% ELSE %] - Default MARC framework + Default MARC framework [% END %]
    • @@ -74,15 +74,15 @@ MARC frameworks › Administration › Koha
  • [% IF framework %] - [% framework.frameworktext | html %] ([% framework.frameworkcode | html %]) + [% framework.frameworktext | html %] ([% framework.frameworkcode | html %]) [% ELSE %] - Default MARC framework + Default MARC framework [% END %]
  • - Confirm deletion of tag '[% searchfield | html %]' + Confirm deletion of tag [% searchfield | html %]
    • @@ -90,9 +90,9 @@ MARC frameworks › Administration › Koha
  • [% IF framework %] - [% framework.frameworktext | html %] ([% framework.frameworkcode | html %]) + [% framework.frameworktext | html %] ([% framework.frameworkcode | html %]) [% ELSE %] - Default MARC framework + Default MARC framework [% END %]
    • @@ -116,7 +116,11 @@ MARC frameworks › Administration › Koha New tag [% END %] -

    MARC Framework for [% IF framework %][% framework.frameworktext | html %] ([% framework.frameworkcode | html %])[% ELSE %]default MARC framework[% END %]

    +[% IF framework %] +

    MARC Framework for [% framework.frameworktext | html %] ([% framework.frameworkcode | html %])

    +[% ELSE %] +

    MARC Framework for default MARC framework

    +[% END %] [% IF ( add_form ) %] @@ -285,9 +289,9 @@ MARC frameworks › Administration › Koha [% END %] [% END %] - [% IF ( loo.repeatable ) %]Yes[% ELSE %]No[% END %] - [% IF ( loo.mandatory ) %]Yes[% ELSE %]No[% END %] - [% IF ( loo.important ) %]Yes[% ELSE %]No[% END %] + [% IF ( loo.repeatable ) %]Yes[% ELSE %]No[% END %] + [% IF ( loo.mandatory ) %]Yes[% ELSE %]No[% END %] + [% IF ( loo.important ) %]Yes[% ELSE %]No[% END %] [% loo.authorised_value | html %] [% loo.ind1_defaultvalue | html %] [% loo.ind2_defaultvalue | html %] -- 2.39.2