From 71008bac19a242e810e3ae5cf1939c979cb639ad Mon Sep 17 00:00:00 2001
From: =?utf8?q?Marc=20V=C3=A9ron?= <veron@veron.ch>
Date: Tue, 21 Jun 2016 09:08:06 +0200
Subject: [PATCH] Bug 16701: Translatability: Fix problem with isolated ' in
 currency.tt
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

This patch moves markup <span class="ex"> into template variables to
avoid sentence splitting.

To test:
- Apply patch
- Verify that currency administration works as before
  (Home > Administration > Currencies & Exchange rates > Currencies)
- Examine code changes

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit a83d75b6f2d59c3c2ac8d1b549b364fa79f52efe)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 538535ba7deb871d252b1afaf2ee4cb515350b98)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
---
 koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt
index 0e204d8138..1c945d1694 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt
@@ -52,7 +52,7 @@
 
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo;  <a href="/cgi-bin/koha/admin/currency.pl">Currencies &amp; Exchange rates</a> &rsaquo; [% IF ( add_form ) %][% IF ( searchfield ) %]Modify currency '[% searchfield %]'[% ELSE %]New currency[% END %][% END %]
-[% IF ( delete_confirm ) %]Confirm deletion of currency '<span class="ex">[% searchfield %]</span>'[% END %]
+[% IF ( delete_confirm ) %]Confirm deletion of currency '[% '<span class="ex">' _ searchfield _ '</span>' %]'[% END %]
 [% IF ( delete_confirmed ) %]Currency deleted[% END %]
 [% IF ( else ) %]Currencies[% END %]
 </div>
@@ -127,7 +127,7 @@
 [% IF ( delete_confirm ) %]
     [% IF ( nb_of_orders or nb_of_vendors ) %]
     <div class="dialog message">
-        <h3>Cannot delete currency <span class="ex">'[% searchfield %]'</span></h3>
+        <h3>Cannot delete currency '[% '<span class="ex">' _ searchfield _ '</span>' %]'</h3>
         <p>
             [% IF nb_of_orders %]
                 This currency is used by [% nb_of_orders %] orders.
@@ -142,7 +142,7 @@
     </div>
     [% ELSE %]
     <div class="dialog alert">
-        <h3>Confirm deletion of currency <span class="ex">'[% searchfield %]'</span></h3>
+        <h3>Confirm deletion of currency '[% '<span class="ex">' _ searchfield _ '</span>' %]'</h3>
         <table>
             <tr><th>Currency</th>
                 <td>[% searchfield %]</td>
-- 
2.39.5