Attachment 141557 Details for Bug 31718 – Bug 31718: Others facilitate translation in frameworks administration

[patch] Bug 31718: Others facilitate translation in frameworks administration

Bug-31718-Others-facilitate-translation-in-framewo.patch (text/plain), 7.26 KB, created by David Nind on 2022-10-09 21:00:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Nind

Created: 2022-10-09 21:00:51 UTC

Size: 7.26 KB

patch

obsolete

>From 086e29c6baa050f3c63810c62fa62e25b1c5db96 Mon Sep 17 00:00:00 2001
>From: Fridolin Somers <fridolin.somers@biblibre.com>
>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 <david@davidnind.com>
>---
> .../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 9d84dd2c97..1af75cc897 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
>@@ -371,7 +371,11 @@
>                     [% END # /IF ( delete_confirm ) %]
> 
>                     [% IF ( else ) %]
>-                        <h1>MARC subfield structure admin for [% tagfield | html %] [% IF ( frameworkcode ) %](framework [% frameworkcode | html %])[% ELSE %](default framework)[% END %]</h1>
>+                        [% IF ( frameworkcode ) %]
>+                            <h1>MARC subfield structure admin for [% tagfield | html %] (framework [% frameworkcode | html %])</h1>
>+                        [% ELSE %]
>+                            <h1>MARC subfield structure admin for [% tagfield | html %] (default framework)</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>
>                         <p>The column 'Koha field' shows that the subfield is linked with a Koha field.</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 94dd186424..92bfe7516a 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt
>@@ -41,7 +41,7 @@ MARC frameworks &rsaquo; Administration &rsaquo; Koha
>             <li>
>                 <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=[% framework.frameworkcode | uri %]">
>                     [% IF framework %]
>-                        [% framework.frameworktext | html %] ([% framework.frameworkcode | html %])
>+                        <span>[% framework.frameworktext | html %] ([% framework.frameworkcode | html %])</span>
>                     [% ELSE %]
>                         <span>Default MARC framework</span>
>                     [% END%]
>@@ -50,10 +50,10 @@ MARC frameworks &rsaquo; Administration &rsaquo; Koha
>             <li>
>                 <a href="#" aria-current="page">
>                     [% IF heading_add_tag_p %]
>-                        <span>Add tag</span>
>+                        <span>Add tag [% searchfield | html %]</span>
>                     [% ELSE %]
>-                        <span>Modify tag</span>
>-                    [% END %] [% searchfield | html %]
>+                        <span>Modify tag [% searchfield | html %]</span>
>+                    [% END %]
>                 </a>
>             </li>
> 
>@@ -61,9 +61,9 @@ MARC frameworks &rsaquo; Administration &rsaquo; Koha
>             <li>
>                 <a href="#" aria-current="page">
>                     [% IF framework %]
>-                        [% framework.frameworktext | html %] ([% framework.frameworkcode | html %])
>+                        <span>[% framework.frameworktext | html %] ([% framework.frameworkcode | html %])</span>
>                     [% ELSE %]
>-                        Default MARC framework
>+                        <span>Default MARC framework</span>
>                     [% END %]
>                 </a>
>             </li>
>@@ -72,15 +72,15 @@ MARC frameworks &rsaquo; Administration &rsaquo; Koha
>             <li>
>                 <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=[% framework.frameworkcode | uri %]">
>                     [% IF framework %]
>-                        [% framework.frameworktext | html %] ([% framework.frameworkcode | html %])
>+                        <span>[% framework.frameworktext | html %] ([% framework.frameworkcode | html %])</span>
>                     [% ELSE %]
>-                        Default MARC framework
>+                        <span>Default MARC framework</span>
>                     [% END %]
>                 </a>
>             </li>
>             <li>
>                 <a href="#" aria-current="page">
>-                    Confirm deletion of tag '[% searchfield | html %]'
>+                    Confirm deletion of tag [% searchfield | html %]
>                 </a>
>             </li>
> 
>@@ -88,9 +88,9 @@ MARC frameworks &rsaquo; Administration &rsaquo; Koha
>             <li>
>                 <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=[% framework.frameworkcode | uri %]">
>                     [% IF framework %]
>-                        [% framework.frameworktext | html %] ([% framework.frameworkcode | html %])
>+                        <span>[% framework.frameworktext | html %] ([% framework.frameworkcode | html %])</span>
>                     [% ELSE %]
>-                        Default MARC framework
>+                        <span>Default MARC framework</span>
>                     [% END %]
>                 </a>
>             </li>
>@@ -113,7 +113,11 @@ MARC frameworks &rsaquo; Administration &rsaquo; Koha
>     <a class="btn btn-default" id="addtag" href="/cgi-bin/koha/admin/marctagstructure.pl?op=add_form&amp;frameworkcode=[% framework.frameworkcode | uri %]"><i class="fa fa-plus"></i> New tag</a>
> </div>[% END %]
> 
>-<h1>MARC Framework for [% IF framework %][% framework.frameworktext | html %] ([% framework.frameworkcode | html %])[% ELSE %]default MARC framework[% END %]</h1>
>+[% IF framework %]
>+    <h1>MARC Framework for [% framework.frameworktext | html %] ([% framework.frameworkcode | html %])</h1>
>+[% ELSE %]
>+    <h1>MARC Framework for default MARC framework</h1>
>+[% END %]
> 
> [% IF ( add_form ) %]
> 
>@@ -282,9 +286,9 @@ MARC frameworks &rsaquo; Administration &rsaquo; Koha
>                 [% END %]
>             [% END %]
>             </td>
>-            <td>[% IF ( loo.repeatable ) %]Yes[% ELSE %]No[% END %]</td>
>-            <td>[% IF ( loo.mandatory ) %]Yes[% ELSE %]No[% END %]</td>
>-            <td>[% IF ( loo.important ) %]Yes[% ELSE %]No[% END %]</td>
>+            <td>[% IF ( loo.repeatable ) %]<span>Yes</span>[% ELSE %]<span>No</span>[% END %]</td>
>+            <td>[% IF ( loo.mandatory ) %]<span>Yes</span>[% ELSE %]<span>No</span>[% END %]</td>
>+            <td>[% IF ( loo.important ) %]<span>Yes</span>[% ELSE %]<span>No</span>[% END %]</td>
>             <td>[% loo.authorised_value | html %]</td>
>             <td>[% loo.ind1_defaultvalue | html %]</td>
>             <td>[% loo.ind2_defaultvalue | html %]</td>
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 31718: 141526 | 141536 | 141556 | 141557 | 141924 | 141925