From 8dd510047d26d71ec5948e8d8fcf317f33278920 Mon Sep 17 00:00:00 2001
From: Aleisha <aleishaamohia@hotmail.com>
Date: Fri, 15 Jan 2016 00:25:52 +0000
Subject: [PATCH]  Bug 15274: Putting <span> tags around entire string where
 the originally split the sentence
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

I have only done this where the tags split the sentence.

To test:
1) Go to a borrower's check out page (circulation.pl)
2) Check out a book and specify the due date to a past date (ie, to 2015 etc)
3) Confirm the entire sentence in the error message is styled by the span tags.
4) Create a manual invoice of $100 for the borrower
5) Confirm the entire sentence in the error message styled by span tags.
6) Check the patch and the circulation.tt file and confirm that I haven't missed any tags that split the string and make translation difficult.

I personally do not prefer this patch because the red bold sentences don't look very good and aren't highly readable.

Signed off on this second patch, see screenshots in comment #4.
(Forbidden tab char in line 779 removed)
Signed-off-by: Marc Véron <veron@veron.ch>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
---
 koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
index cf336a2687..78152d11df 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -779,14 +779,14 @@ No patron matched <span class="ex">[% message %]</span>
                </li>
             [% END %]
 
-        	[% IF ( odues ) %]<li>[% IF ( nonreturns ) %]<span class="circ-hlt">Overdues:</span> Patron has <span class="circ-hlt">ITEMS OVERDUE</span>. See highlighted items <a href="#checkouts">below</a>[% END %]</li>
+                [% IF ( odues ) %]<li>[% IF ( nonreturns ) %]<span class="circ-hlt">Overdues: Patron has ITEMS OVERDUE</span>. See highlighted items <a href="#checkouts">below</a>[% END %]</li>
             [% END %]
 
         	[% IF ( charges ) %]
 			    <li>
             <span class="circ-hlt">Fees &amp; Charges:</span> Patron has  <a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% borrowernumber %]">Outstanding fees &amp; charges[% IF ( chargesamount ) %] of [% chargesamount %][% END %]</a>.
                 [% IF ( charges_is_blocker ) %]
-                    Checkouts are <span class="circ-hlt">BLOCKED</span> because fine balance is <span class="circ-hlt">OVER THE LIMIT</span>.
+                    <span class="circ-hlt">Checkouts are BLOCKED because fine balance is OVER THE LIMIT.</span>
                 [% END %]
             <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrowernumber %]">Make payment</a> or
             <a href="/cgi-bin/koha/members/paycollect.pl?borrowernumber=[% borrowernumber %]">Pay all fines</a></li>
-- 
2.39.5