From e33bcec68855397ca16f352ff63c85e3789bea36 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Marc=20V=C3=A9ron?= <veron@veron.ch>
Date: Wed, 9 Dec 2015 16:10:10 +0100
Subject: [PATCH]  Bug 15340: Translatability: fix issue with 'or choose'
 splitted by <strong> tag
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

This patch fixes a translatability issue due to <trong> tags.

To verify:
- Make sure that you have some entries in 'Cities and Towns'
  ( Home > Administration > Cities )
- Edit the main address of a patron's details
- Locate field "City", at the right you have the text 'or choose'
  followed by a drop-down ('choose' is bold)
- change language e.g. to German, the text reads 'or auswählen'
  (instead of 'oder auswählen')
- This is due to the <strong> tags around 'choose'

To test:
- Apply patch
- Verify that the <strong> tags around 'choose' are removed in:
    koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-de.inc
    koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-us.inc

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
  Obvious issue/solution

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit a85fd85545a885e8ebbcc417b7f180baede70304)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
---
 .../prog/en/includes/member-main-address-style-de.inc           | 2 +-
 .../prog/en/includes/member-main-address-style-us.inc           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-de.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-de.inc
index 9cfe1ec87f..e2ef537da4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-de.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-de.inc
@@ -80,7 +80,7 @@
       [% END %]
       City: </label>
         <input type="text" id="city" name="city" size="20" value="[% city %]" />
-        [% IF ( city_cgipopup ) %]or <strong>choose</strong>
+        [% IF ( city_cgipopup ) %]or choose
         <select id="select_city" name="select_city">
         [% FOREACH city_loo IN city_loop %]
             [% IF ( city_loo.selected ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-us.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-us.inc
index ac0a174c30..48844f9535 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-us.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-us.inc
@@ -68,7 +68,7 @@
       [% END %]
       City: </label>
         <input type="text" id="city" name="city" size="20" value="[% city %]" />
-        [% IF ( city_cgipopup ) %]or <strong>choose</strong>
+        [% IF ( city_cgipopup ) %]or choose
         <select id="select_city" name="select_city">
         [% FOREACH city_loo IN city_loop %]
             [% IF ( city_loo.selected ) %]
-- 
2.39.5