From b71ee66dd7c62c6dbb39e5d24a16a37b2183288b Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Thu, 16 May 2024 12:03:11 +0000
Subject: [PATCH] Bug 36876: Correct <span>s around translatable strings in
 table settings

This patch corrects the way translatable strings are handled in the
table settings template. The switch to Bootstrap WRAPPERs for the
accordion widget included several errors.

To test, apply the patch and go to Administration -> Table settings.

- Confirm that the sections expand and collapse correctly.
- Test the translation process with a language, e.g. fr-FR:
  - In KTD, run: gulp po:update --lang fr-FR
  - Check fr-FR-staff-prog.po for the line referring to
    koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt:298
  - It should show the whole string "Interlibrary loans"

Signed-off-by: Roman Dolny <roman.dolny@jezuici.pl>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
---
 .../prog/en/modules/admin/columns_settings.tt             | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt
index efb664fc91..14210dfe2b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt
@@ -275,7 +275,7 @@
 
                                 [% WRAPPER accordion_item %]
                                     [% WRAPPER accordion_heading panel_id="coursereserves" %]
-                                        Course <span>reserves</span>
+                                        <span>Course reserves</span>
                                     [% END %]
                                     [%  WRAPPER accordion_panel panel_id="coursereserves" %]
                                         <h3>Course reserves tables</h3>
@@ -285,7 +285,7 @@
 
                                 [% WRAPPER accordion_item %]
                                     [% WRAPPER accordion_heading panel_id="erm" %]
-                                            E-resource <span>management</span>
+                                        <span>E-resource management</span>
                                     [% END %]
                                     [%  WRAPPER accordion_panel panel_id="erm" %]
                                         <h3>E-resource management tables</h3>
@@ -295,7 +295,7 @@
 
                                 [% WRAPPER accordion_item %]
                                     [% WRAPPER accordion_heading panel_id="illrequests" %]
-                                        Interlibrary <span>loans</span>
+                                        <span>Interlibrary loans</span>
                                     [% END %]
                                     [%  WRAPPER accordion_panel panel_id="illrequests" %]
                                         <h3>Interlibrary loans tables</h3>
@@ -315,7 +315,7 @@
 
                                 [% WRAPPER accordion_item %]
                                     [% WRAPPER accordion_heading panel_id="pos" %]
-                                        Point of <span>sale</span>
+                                        <span>Point of sale</span>
                                     [% END %]
                                     [%  WRAPPER accordion_panel panel_id="pos" %]
                                         <h3>Point of sale tables</h3>
-- 
2.39.5