From b17412da1b14dca4d42ed534482abdeff1c2fd2f Mon Sep 17 00:00:00 2001
From: =?utf8?q?Marc=20V=C3=A9ron?= <veron@veron.ch>
Date: Sun, 11 Jun 2017 20:16:46 +0200
Subject: [PATCH] Bug 18777: Translatability: Get rid of exposed tt directives
 in opac-memberentry.tt

The file opac-memberentry.tt exposes template directives to translation where
translators should not be confronted with.

Example from po file:
"%s [%% UNLESS hidden.defined('B_address') && hidden.defined('B_address2') && "
"hidden.defined('B_city') && hidden.defined('B_state') && hidden."
"defined('B_zipcode') && hidden.defined('B_country') && hidden."
"defined('B_phone') && hidden.defined('B_email') && hidden."
"defined('contactnote') %%] "

To test:
- Apply patch
- Verify that advanced search in OPAC the page 'your personal details'
  behaves as before
- Verify that you can change values and submit an update request
- Create a new translation for a 'language' aa-AA (perl translate create aa-AA)
- Verify that template directives ar no longer exposed in aa-AA-opac-bootstrap.p

NOTE: Followed test plan similar to bug 18776 comment 3.

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit 9ed4bdc87e92506ba4a51f92cc198f3c5ce282eb)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
---
 .../bootstrap/en/modules/opac-memberentry.tt  | 244 +++++++-----------
 1 file changed, 94 insertions(+), 150 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt
index 62308eee53..94277db6d5 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt
@@ -72,7 +72,7 @@
                                 [% END %]
                             [% END %]
                         </ul>
-                        Please correct the errors and resubmit.
+                        <span>Please correct and resubmit.</span>
                     </div>
                 [% END %]
 
@@ -83,7 +83,7 @@
                         [% ELSIF cardnumber_already_exists %]
                         <a href="#borrower_cardnumber"><strong>The entered card number is already in use.</strong></a>
                         [% END %]
-                        Please correct this and resubmit.
+                        <span>Please correct and resubmit.</span>
                     </div>
                 [% END %]
 
@@ -117,15 +117,13 @@
                     </fieldset>
                 [% END %]
                 [% IF ( extended_unique_id_failed_code ) %]
-                    <div class="alert" id="extended_unique_id_failed"><a href="#patron-attr-start-[% extended_unique_id_failed_code %]">[% extended_unique_id_failed_description %]</a> value <i>[% extended_unique_id_failed_value %]</i> is already in use.</div>
+                    <div class="alert" id="extended_unique_id_failed"><a href="#patron-attr-start-[% extended_unique_id_failed_code %]">[% extended_unique_id_failed_description _ ': ' %]</a> Value is already in use ([% extended_unique_id_failed_value %])</div>
                 [% END %]
 
                 <form method="post" action="/cgi-bin/koha/opac-memberentry.pl" id="memberentry-form">
 
-                [% UNLESS
-                    ( hidden.defined('cardnumber') || ( !borrower && Koha.Preference('autoMemberNum') ) ) &&
-                    hidden.defined('dateexpiry') && hidden.defined('branchcode') && hidden.defined('categorycode')
-                %]
+                [%# Following on one line for translatability %]
+                [% UNLESS ( hidden.defined('cardnumber') || ( !borrower && Koha.Preference('autoMemberNum') ) ) && hidden.defined('dateexpiry') && hidden.defined('branchcode') && hidden.defined('categorycode') %]
                     <fieldset class="rows" id="memberentry_library">
 
                         <legend id="library_legend">Library</legend>
@@ -133,12 +131,10 @@
                                 [% UNLESS hidden.defined('cardnumber') || ( !borrower && Koha.Preference('autoMemberNum') ) %]
                                 <li>
                                     [% IF mandatory.defined('cardnumber') %]
-                                        <label for="borrower_cardnumber" class="required">
+                                        <label for="borrower_cardnumber" class="required">Library card number:</label>
                                     [% ELSE %]
-                                        <label for="borrower_cardnumber">
+                                        <label for="borrower_cardnumber">Library card number:</label>
                                     [% END %]
-                                    Library card number:
-                                    </label>
                                     [% IF borrower && !(cardnumber_wrong_length || cardnumber_already_exists) %]
                                         [% borrower.cardnumber %]
                                     [% ELSE %]
@@ -173,11 +169,10 @@
                                 [% UNLESS hidden.defined('branchcode') %]
                                     <li>
                                         [% IF mandatory.defined('branchcode') %]
-                                            <label for="borrower_branchcode" class="required">
+                                            <label for="borrower_branchcode" class="required">Home library:</label>
                                         [% ELSE %]
-                                            <label for="borrower_branchcode">
+                                            <label for="borrower_branchcode">Home library:</label>
                                         [% END %]
-                                        Home library:</label>
 
                                         <select id="borrower_branchcode" name="borrower_branchcode">
                                             [% FOREACH l IN libraries %]
@@ -216,11 +211,8 @@
                         </fieldset>
                 [% END # / defined 'branchcode' %]
 
-                [% UNLESS
-                    hidden.defined('title') && hidden.defined('surname') && hidden.defined('firstname') &&
-                    hidden.defined('dateofbirth') && hidden.defined('initials') && hidden.defined('othernames') &&
-                    hidden.defined('sex')
-                %]
+                [%# Following on one line for translatability %]
+                [% UNLESS hidden.defined('title') && hidden.defined('surname') && hidden.defined('firstname') && hidden.defined('dateofbirth') && hidden.defined('initials') && hidden.defined('othernames') && hidden.defined('sex') %]
                     <div class="row-fluid">
                         [% IF ( display_patron_image ) %]
                             <div class="span8">
@@ -234,11 +226,10 @@
                                     [% UNLESS hidden.defined('title') || !Koha.Preference('BorrowersTitles') %]
                                         <li>
                                             [% IF mandatory.defined('title') %]
-                                                <label for="borrower_title" class="required">
+                                                <label for="borrower_title" class="required">Salutation:</label>
                                             [% ELSE %]
-                                                <label for="borrower_title">
+                                                <label for="borrower_title">Salutation:</label>
                                             [% END %]
-                                            Salutation:</label>
 
                                             <select id="borrower_title" name="borrower_title">
                                                 <option value=""></option>
@@ -256,11 +247,10 @@
                                     [% UNLESS hidden.defined('surname') %]
                                         <li>
                                             [% IF mandatory.defined('surname') %]
-                                                <label for="borrower_surname" class="required">
+                                                <label for="borrower_surname" class="required">Surname:</label>
                                             [% ELSE %]
-                                                <label for="borrower_surname">
+                                                <label for="borrower_surname">Surname:</label>
                                             [% END %]
-                                            Surname:</label>
 
                                             <input type="text" id="borrower_surname" name="borrower_surname" value="[% borrower.surname %]" />
                                             [% IF mandatory.defined('surname') %]<span class="required">Required</span>[% END %]
@@ -270,11 +260,10 @@
                                     [% UNLESS hidden.defined('firstname') %]
                                         <li>
                                             [% IF mandatory.defined('firstname') %]
-                                                <label for="borrower_firstname" class="required">
+                                                <label for="borrower_firstname" class="required">First name:</label>
                                             [% ELSE %]
-                                                <label for="borrower_firstname">
+                                                <label for="borrower_firstname">First name:</label>
                                             [% END %]
-                                            First name:</label>
 
                                             <input type="text" id="borrower_firstname" name="borrower_firstname" value="[% borrower.firstname %]" />
                                             [% IF mandatory.defined('firstname') %]<span class="required">Required</span>[% END %]
@@ -284,11 +273,10 @@
                                     [% UNLESS hidden.defined('dateofbirth') %]
                                         <li>
                                             [% IF mandatory.defined('dateofbirth') %]
-                                                <label for="borrower_dateofbirth" class="required">
+                                                <label for="borrower_dateofbirth" class="required">Date of birth:</label>
                                             [% ELSE %]
-                                                <label for="borrower_dateofbirth">
+                                                <label for="borrower_dateofbirth">Date of birth:</label>
                                             [% END %]
-                                            Date of birth:</label>
 
                                             <input type="text" id="borrower_dateofbirth" name="borrower_dateofbirth" value="[% borrower.dateofbirth | $KohaDates %]" size="10" />
 
@@ -305,11 +293,10 @@
                                     [% UNLESS hidden.defined('initials') %]
                                         <li>
                                             [% IF mandatory.defined('initials') %]
-                                                <label for="borrower_initials" class="required">
+                                                <label for="borrower_initials" class="required">Initials:</label>
                                             [% ELSE %]
-                                                <label for="borrower_initials">
+                                                <label for="borrower_initials">Initials:</label>
                                             [% END %]
-                                            Initials:</label>
 
                                             <input type="text" id="borrower_initials" name="borrower_initials" value="[% borrower.initials %]" />
                                             [% IF mandatory.defined('initials') %]<span class="required">Required</span>[% END %]
@@ -319,11 +306,10 @@
                                     [% UNLESS hidden.defined('othernames') %]
                                         <li>
                                             [% IF mandatory.defined('othernames') %]
-                                                <label for="borrower_othernames" class="required">
+                                                <label for="borrower_othernames" class="required">Other names:</label>
                                             [% ELSE %]
-                                                <label for="borrower_othernames">
+                                                <label for="borrower_othernames">Other names:</label>
                                             [% END %]
-                                            Other names:</label>
 
                                             <input type="text" id="borrower_othernames" name="borrower_othernames" value="[% borrower.othernames %]" />
                                             [% IF mandatory.defined('othernames') %]<span class="required">Required</span>[% END %]
@@ -369,11 +355,8 @@
                     </div>
                 [% END # /UNLESS fields hidden %]
 
-                [% UNLESS
-                    hidden.defined('streetnumber') && hidden.defined('address') && hidden.defined('address2') &&
-                    hidden.defined('city') && hidden.defined('state') && hidden.defined('zipcode') &&
-                    hidden.defined('country')
-                %]
+                [%# Following on one line for translatability %]
+                [% UNLESS hidden.defined('streetnumber') && hidden.defined('address') && hidden.defined('address2') && hidden.defined('city') && hidden.defined('state') && hidden.defined('zipcode') && hidden.defined('country') %]
                     <fieldset class="rows" id="memberentry_mainaddress">
                         <legend id="mainaddress_legend">Main address</legend>
 
@@ -381,11 +364,10 @@
                             [% UNLESS hidden.defined('streetnumber') %]
                                 <li>
                                     [% IF mandatory.defined('streetnumber') %]
-                                        <label for="borrower_streetnumber" class="required">
+                                        <label for="borrower_streetnumber" class="required">Street number:</label>
                                     [% ELSE %]
-                                        <label for="borrower_streetnumber">
+                                        <label for="borrower_streetnumber">Street number:</label>
                                     [% END %]
-                                    Street number:</label>
 
                                     <input type="text" id="borrower_streetnumber" name="borrower_streetnumber" value="[% borrower.streetnumber %]" />
                                     [% IF mandatory.defined('streetnumber') %]<span class="required">Required</span>[% END %]
@@ -395,11 +377,10 @@
                             [% UNLESS hidden.defined('address') %]
                                 <li>
                                     [% IF mandatory.defined('address') %]
-                                        <label for="borrower_address" class="required">
+                                        <label for="borrower_address" class="required">Address:</label>
                                     [% ELSE %]
-                                        <label for="borrower_address">
+                                        <label for="borrower_address">Address:</label>
                                     [% END %]
-                                    Address:</label>
 
                                     <input type="text" id="borrower_address" name="borrower_address" value="[% borrower.address %]" />
                                     [% IF mandatory.defined('address') %]<span class="required">Required</span>[% END %]
@@ -409,11 +390,10 @@
                             [% UNLESS hidden.defined('address2') %]
                                 <li>
                                     [% IF mandatory.defined('address2') %]
-                                        <label for="borrower_address2" class="required">
+                                        <label for="borrower_address2" class="required">Address 2:</label>
                                     [% ELSE %]
-                                        <label for="borrower_address2">
+                                        <label for="borrower_address2">Address 2:</label>
                                     [% END %]
-                                    Address 2:</label>
 
                                     <input type="text" id="borrower_address2" name="borrower_address2" value="[% borrower.address2 %]" />
                                     [% IF mandatory.defined('address2') %]<span class="required">Required</span>[% END %]
@@ -423,11 +403,10 @@
                             [% UNLESS hidden.defined('city') %]
                                 <li>
                                     [% IF mandatory.defined('city') %]
-                                        <label for="borrower_city" class="required">
+                                        <label for="borrower_city" class="required">City:</label>
                                     [% ELSE %]
-                                        <label for="borrower_city">
+                                        <label for="borrower_city">City:</label>
                                     [% END %]
-                                    City:</label>
 
                                     <input type="text" id="borrower_city" name="borrower_city" value="[% borrower.city %]" />
                                     [% IF mandatory.defined('city') %]<span class="required">Required</span>[% END %]
@@ -437,11 +416,10 @@
                             [% UNLESS hidden.defined('state') %]
                                 <li>
                                     [% IF mandatory.defined('state') %]
-                                        <label for="borrower_state" class="required">
+                                        <label for="borrower_state" class="required">State:</label>
                                     [% ELSE %]
-                                        <label for="borrower_state">
+                                        <label for="borrower_state">State:</label>
                                     [% END %]
-                                    State:</label>
 
                                     <input type="text" id="borrower_state" name="borrower_state" value="[% borrower.state %]" />
                                     [% IF mandatory.defined('state') %]<span class="required">Required</span>[% END %]
@@ -451,11 +429,10 @@
                             [% UNLESS hidden.defined('zipcode') %]
                                 <li>
                                     [% IF mandatory.defined('zipcode') %]
-                                        <label for="borrower_zipcode" class="required">
+                                        <label for="borrower_zipcode" class="required">ZIP/Postal code:</label>
                                     [% ELSE %]
-                                        <label for="borrower_zipcode">
+                                        <label for="borrower_zipcode">ZIP/Postal code:</label>
                                     [% END %]
-                                    ZIP/Postal code:</label>
 
                                     <input type="text" id="borrower_zipcode" name="borrower_zipcode" value="[% borrower.zipcode %]" />
                                     [% IF mandatory.defined('zipcode') %]<span class="required">Required</span>[% END %]
@@ -465,11 +442,10 @@
                             [% UNLESS hidden.defined('country') %]
                                 <li>
                                     [% IF mandatory.defined('country') %]
-                                        <label for="borrower_country" class="required">
+                                        <label for="borrower_country" class="required">Country:</label>
                                     [% ELSE %]
-                                        <label for="borrower_country">
+                                        <label for="borrower_country">Country:</label>
                                     [% END %]
-                                    Country:</label>
 
                                     <input type="text" id="borrower_country" name="borrower_country" value="[% borrower.country %]" />
                                     [% IF mandatory.defined('country') %]<span class="required">Required</span>[% END %]
@@ -480,10 +456,8 @@
                     </fieldset>
                 [% END %]
 
-                [% UNLESS
-                    hidden.defined('phone') && hidden.defined('phonepro') && hidden.defined('mobile') &&
-                    hidden.defined('email') && hidden.defined('emailpro') && hidden.defined('fax')
-                %]
+                [%# Following on one line for translatability %]
+                [% UNLESS hidden.defined('phone') && hidden.defined('phonepro') && hidden.defined('mobile') && hidden.defined('email') && hidden.defined('emailpro') && hidden.defined('fax') %]
                     <fieldset class="rows" id="memberentry_contact">
                         <legend id="contact_legend">Contact information</legend>
 
@@ -491,11 +465,10 @@
                             [% UNLESS hidden.defined('phone') %]
                                 <li>
                                     [% IF mandatory.defined('phone') %]
-                                        <label for="borrower_phone" class="required">
+                                        <label for="borrower_phone" class="required">Primary phone:</label>
                                     [% ELSE %]
-                                        <label for="borrower_phone">
+                                        <label for="borrower_phone">Primary phone:</label>
                                     [% END %]
-                                    Primary phone:</label>
 
                                     <input type="text" id="borrower_phone" name="borrower_phone" value="[% borrower.phone %]" />
                                     [% IF mandatory.defined('phone') %]<span class="required">Required</span>[% END %]
@@ -505,11 +478,10 @@
                             [% UNLESS hidden.defined('phonepro') %]
                                 <li>
                                     [% IF mandatory.defined('phonepro') %]
-                                        <label for="borrower_phonepro" class="required">
+                                        <label for="borrower_phonepro" class="required">Secondary phone:</label>
                                     [% ELSE %]
-                                        <label for="borrower_phonepro">
+                                        <label for="borrower_phonepro">Secondary phone:</label>
                                     [% END %]
-                                    Secondary phone:</label>
 
                                     <input type="text" id="borrower_phonepro" name="borrower_phonepro" value="[% borrower.phonepro %]" />
                                     [% IF mandatory.defined('phonepro') %]<span class="required">Required</span>[% END %]
@@ -519,11 +491,10 @@
                             [% UNLESS hidden.defined('mobile') %]
                                 <li>
                                     [% IF mandatory.defined('mobile') %]
-                                        <label for="borrower_mobile" class="required">
+                                        <label for="borrower_mobile" class="required">Other phone:</label>
                                     [% ELSE %]
-                                        <label for="borrower_mobile">
+                                        <label for="borrower_mobile">Other phone:</label>
                                     [% END %]
-                                    Other phone:</label>
 
                                     <input type="text" id="borrower_mobile" name="borrower_mobile" value="[% borrower.mobile %]" />
                                     [% IF mandatory.defined('mobile') %]<span class="required">Required</span>[% END %]
@@ -533,11 +504,10 @@
                             [% UNLESS hidden.defined('email') %]
                                 <li>
                                     [% IF mandatory.defined('email') %]
-                                        <label for="borrower_email" class="required">
+                                        <label for="borrower_email" class="required">Primary email:</label>
                                     [% ELSE %]
-                                        <label for="borrower_email">
+                                        <label for="borrower_email">Primary email:</label>
                                     [% END %]
-                                    Primary email:</label>
 
                                     <input type="text" id="borrower_email" name="borrower_email" value="[% borrower.email %]" />
                                     [% IF mandatory.defined('email') %]<span class="required">Required</span>[% END %]
@@ -547,11 +517,10 @@
                             [% UNLESS hidden.defined('emailpro') %]
                                 <li>
                                     [% IF mandatory.defined('emailpro') %]
-                                        <label for="borrower_emailpro" class="required">
+                                        <label for="borrower_emailpro" class="required">Secondary email:</label>
                                     [% ELSE %]
-                                        <label for="borrower_emailpro">
+                                        <label for="borrower_emailpro">Secondary email:</label>
                                     [% END %]
-                                    Secondary email:</label>
 
                                     <input type="text" id="borrower_emailpro" name="borrower_emailpro" value="[% borrower.emailpro %]" />
                                     [% IF mandatory.defined('emailpro') %]<span class="required">Required</span>[% END %]
@@ -561,11 +530,10 @@
                             [% UNLESS hidden.defined('fax') %]
                                 <li>
                                     [% IF mandatory.defined('fax') %]
-                                        <label for="borrower_fax" class="required">
+                                        <label for="borrower_fax" class="required">Fax:</label>
                                     [% ELSE %]
-                                        <label for="borrower_fax">
+                                        <label for="borrower_fax">Fax:</label>
                                     [% END %]
-                                    Fax:</label>
 
                                     <input type="text" id="borrower_fax" name="borrower_fax" value="[% borrower.fax %]" />
                                     [% IF mandatory.defined('fax') %]<span class="required">Required</span>[% END %]
@@ -575,11 +543,8 @@
                     </fieldset>
                 [% END %]
 
-                [% UNLESS
-                    hidden.defined('B_address') && hidden.defined('B_address2') && hidden.defined('B_city') &&
-                    hidden.defined('B_state') && hidden.defined('B_zipcode') && hidden.defined('B_country') &&
-                    hidden.defined('B_phone') && hidden.defined('B_email') && hidden.defined('contactnote')
-                %]
+                [%# Following on one line for translatability %]
+                [% UNLESS hidden.defined('B_address') && hidden.defined('B_address2') && hidden.defined('B_city') && hidden.defined('B_state') && hidden.defined('B_zipcode') && hidden.defined('B_country') && hidden.defined('B_phone') && hidden.defined('B_email') && hidden.defined('contactnote') %]
                     <fieldset class="rows" id="memberentry_alternateaddress">
                         <legend id="alternateaddress_legend">Alternate address</legend>
 
@@ -587,11 +552,10 @@
                             [% UNLESS hidden.defined('B_address') %]
                                 <li>
                                     [% IF mandatory.defined('B_address') %]
-                                        <label for="borrower_B_address" class="required">
+                                        <label for="borrower_B_address" class="required">Address:</label>
                                     [% ELSE %]
-                                        <label for="borrower_B_address">
+                                        <label for="borrower_B_address">Address:</label>
                                     [% END %]
-                                    Address:</label>
 
                                     <input type="text" id="borrower_B_address" name="borrower_B_address" value="[% borrower.B_address %]" />
                                     [% IF mandatory.defined('B_address') %]<span class="required">Required</span>[% END %]
@@ -601,11 +565,10 @@
                             [% UNLESS hidden.defined('B_address2') %]
                                 <li>
                                     [% IF mandatory.defined('B_address2') %]
-                                        <label for="borrower_B_address2" class="required">
+                                        <label for="borrower_B_address2" class="required">Address 2:</label>
                                     [% ELSE %]
-                                        <label for="borrower_B_address2">
+                                        <label for="borrower_B_address2">Address 2:</label>
                                     [% END %]
-                                    Address 2:</label>
 
                                     <input type="text" id="borrower_B_address2" name="borrower_B_address2" value="[% borrower.B_address2 %]" />
                                     [% IF mandatory.defined('B_address2') %]<span class="required">Required</span>[% END %]
@@ -615,11 +578,10 @@
                             [% UNLESS hidden.defined('B_city') %]
                                 <li>
                                     [% IF mandatory.defined('B_city') %]
-                                        <label for="borrower_B_city" class="required">
+                                        <label for="borrower_B_city" class="required">City:</label>
                                     [% ELSE %]
-                                        <label for="borrower_B_city">
+                                        <label for="borrower_B_city">City:</label>
                                     [% END %]
-                                    City:</label>
 
                                     <input type="text" id="borrower_B_city" name="borrower_B_city" value="[% borrower.B_city %]" />
                                     [% IF mandatory.defined('B_city') %]<span class="required">Required</span>[% END %]
@@ -629,11 +591,10 @@
                             [% UNLESS hidden.defined('B_state') %]
                                 <li>
                                     [% IF mandatory.defined('B_state') %]
-                                        <label for="borrower_B_state" class="required">
+                                        <label for="borrower_B_state" class="required">State:</label>
                                     [% ELSE %]
-                                        <label for="borrower_B_state">
+                                        <label for="borrower_B_state">State:</label>
                                     [% END %]
-                                    State:</label>
 
                                     <input type="text" id="borrower_B_state" name="borrower_B_state" value="[% borrower.B_state %]" />
                                     [% IF mandatory.defined('B_state') %]<span class="required">Required</span>[% END %]
@@ -643,11 +604,10 @@
                             [% UNLESS hidden.defined('B_zipcode') %]
                                 <li>
                                     [% IF mandatory.defined('B_zipcode') %]
-                                        <label for="borrower_B_zipcode" class="required">
+                                        <label for="borrower_B_zipcode" class="required">ZIP/Postal code:</label>
                                     [% ELSE %]
-                                        <label for="borrower_B_zipcode">
+                                        <label for="borrower_B_zipcode">ZIP/Postal code:</label>
                                     [% END %]
-                                    ZIP/Postal code:</label>
 
                                     <input type="text" id="borrower_B_zipcode" name="borrower_B_zipcode" value="[% borrower.B_zipcode %]" />
                                     [% IF mandatory.defined('B_zipcode') %]<span class="required">Required</span>[% END %]
@@ -657,11 +617,10 @@
                             [% UNLESS hidden.defined('B_country') %]
                                 <li>
                                     [% IF mandatory.defined('B_country') %]
-                                        <label for="borrower_B_country" class="required">
+                                        <label for="borrower_B_country" class="required">Country:</label>
                                     [% ELSE %]
-                                        <label for="borrower_B_country">
+                                        <label for="borrower_B_country">Country:</label>
                                     [% END %]
-                                    Country:</label>
 
                                     <input type="text" id="borrower_B_country" name="borrower_B_country" value="[% borrower.B_country %]" />
                                     [% IF mandatory.defined('B_country') %]<span class="required">Required</span>[% END %]
@@ -671,11 +630,10 @@
                             [% UNLESS hidden.defined('B_phone') %]
                                 <li>
                                     [% IF mandatory.defined('B_phone') %]
-                                        <label for="borrower_B_phone" class="required">
+                                        <label for="borrower_B_phone" class="required">Phone:</label>
                                     [% ELSE %]
-                                        <label for="borrower_B_phone">
+                                        <label for="borrower_B_phone">Phone:</label>
                                     [% END %]
-                                    Phone:</label>
 
                                     <input type="text" id="borrower_B_phone" name="borrower_B_phone" value="[% borrower.B_phone %]" />
                                     [% IF mandatory.defined('B_phone') %]<span class="required">Required</span>[% END %]
@@ -685,11 +643,10 @@
                             [% UNLESS hidden.defined('B_email') %]
                                 <li>
                                     [% IF mandatory.defined('B_email') %]
-                                        <label for="borrower_B_email" class="required">
+                                        <label for="borrower_B_email" class="required">Email:</label>
                                     [% ELSE %]
-                                        <label for="borrower_B_email">
+                                        <label for="borrower_B_email">Email:</label>
                                     [% END %]
-                                    Email:</label>
 
                                     <input type="text" id="borrower_B_email" name="borrower_B_email" value="[% borrower.B_email %]" />
                                     [% IF mandatory.defined('B_email') %]<span class="required">Required</span>[% END %]
@@ -699,11 +656,10 @@
                             [% UNLESS hidden.defined('contactnote') %]
                                 <li>
                                     [% IF mandatory.defined('contactnote') %]
-                                        <label for="borrower_contactnote" class="required">
+                                        <label for="borrower_contactnote" class="required">Contact note:</label>
                                     [% ELSE %]
-                                        <label for="borrower_contactnote">
+                                        <label for="borrower_contactnote">Contact note:</label>
                                     [% END %]
-                                    Contact note:</label>
 
                                     <textarea id="borrower_contactnote" name="borrower_contactnote" cols="30" rows="2">[% borrower.contactnote %]</textarea>
                                     [% IF mandatory.defined('contactnote') %]<span class="required">Required</span>[% END %]
@@ -714,11 +670,8 @@
                     </fieldset>
                 [% END %]
 
-                [% UNLESS
-                    hidden.defined('altcontactsurname') && hidden.defined('altcontactfirstname') && hidden.defined('altcontactaddress1') &&
-                    hidden.defined('altcontactaddress2') && hidden.defined('altcontactaddress3') && hidden.defined('altcontactstate') &&
-                    hidden.defined('altcontactzipcode') && hidden.defined('altcontactcountry') && hidden.defined('altcontactphone')
-                %]
+                [%# Following on one line for translatability %]
+                [% UNLESS hidden.defined('altcontactsurname') && hidden.defined('altcontactfirstname') && hidden.defined('altcontactaddress1') && hidden.defined('altcontactaddress2') && hidden.defined('altcontactaddress3') && hidden.defined('altcontactstate') && hidden.defined('altcontactzipcode') && hidden.defined('altcontactcountry') && hidden.defined('altcontactphone') %]
                     <fieldset class="rows" id="memberentry_alternatecontact">
                         <legend id="alternatecontact_legend">Alternate contact</legend>
 
@@ -726,11 +679,10 @@
                             [% UNLESS hidden.defined('altcontactsurname') %]
                                 <li>
                                     [% IF mandatory.defined('altcontactsurname') %]
-                                        <label for="borrower_altcontactsurname" class="required">
+                                        <label for="borrower_altcontactsurname" class="required">Surname:</label>
                                     [% ELSE %]
-                                        <label for="borrower_altcontactsurname">
+                                        <label for="borrower_altcontactsurname">Surname:</label>
                                     [% END %]
-                                    Surname:</label>
 
                                     <input type="text" id="borrower_altcontactsurname" name="borrower_altcontactsurname" value="[% borrower.altcontactsurname %]" />
                                     [% IF mandatory.defined('altcontactsurname') %]<span class="required">Required</span>[% END %]
@@ -740,11 +692,10 @@
                             [% UNLESS hidden.defined('altcontactfirstname') %]
                                 <li>
                                     [% IF mandatory.defined('altcontactfirstname') %]
-                                        <label for="borrower_altcontactfirstname" class="required">
+                                        <label for="borrower_altcontactfirstname" class="required">First name:</label>
                                     [% ELSE %]
-                                        <label for="borrower_altcontactfirstname">
+                                        <label for="borrower_altcontactfirstname">First name:</label>
                                     [% END %]
-                                    First name:</label>
 
                                     <input type="text" id="borrower_altcontactfirstname" name="borrower_altcontactfirstname" value="[% borrower.altcontactfirstname %]" />
                                     [% IF mandatory.defined('altcontactfirstname') %]<span class="required">Required</span>[% END %]
@@ -754,11 +705,10 @@
                             [% UNLESS hidden.defined('altcontactaddress1') %]
                                 <li>
                                     [% IF mandatory.defined('altcontactaddress1') %]
-                                        <label for="borrower_altcontactaddress1" class="required">
+                                        <label for="borrower_altcontactaddress1" class="required">Address:</label>
                                     [% ELSE %]
-                                        <label for="borrower_altcontactaddress1">
+                                        <label for="borrower_altcontactaddress1">Address:</label>
                                     [% END %]
-                                    Address:</label>
 
                                     <input type="text" id="borrower_altcontactaddress1" name="borrower_altcontactaddress1" value="[% borrower.altcontactaddress1 %]" />
                                     [% IF mandatory.defined('altcontactaddress1') %]<span class="required">Required</span>[% END %]
@@ -768,11 +718,10 @@
                             [% UNLESS hidden.defined('altcontactaddress2') %]
                                 <li>
                                     [% IF mandatory.defined('altcontactaddress2') %]
-                                        <label for="borrower_altcontactaddress2" class="required">
+                                        <label for="borrower_altcontactaddress2" class="required">Address 2:</label>
                                     [% ELSE %]
-                                        <label for="borrower_altcontactaddress2">
+                                        <label for="borrower_altcontactaddress2">Address 2:</label>
                                     [% END %]
-                                    Address 2:</label>
 
                                     <input type="text" id="borrower_altcontactaddress2" name="borrower_altcontactaddress2" value="[% borrower.altcontactaddress2 %]" />
                                     [% IF mandatory.defined('altcontactaddress2') %]<span class="required">Required</span>[% END %]
@@ -782,11 +731,10 @@
                             [% UNLESS hidden.defined('altcontactaddress3') %]
                                 <li>
                                     [% IF mandatory.defined('altcontactaddress3') %]
-                                        <label for="borrower_altcontactaddress3" class="required">
+                                        <label for="borrower_altcontactaddress3" class="required">City:</label>
                                     [% ELSE %]
-                                        <label for="borrower_altcontactaddress3">
+                                        <label for="borrower_altcontactaddress3">City:</label>
                                     [% END %]
-                                    City:</label>
 
                                     <input type="text" id="borrower_altcontactaddress3" name="borrower_altcontactaddress3" value="[% borrower.altcontactaddress3 %]" />
                                     [% IF mandatory.defined('altcontactaddress3') %]<span class="required">Required</span>[% END %]
@@ -796,11 +744,10 @@
                             [% UNLESS hidden.defined('altcontactstate') %]
                                 <li>
                                     [% IF mandatory.defined('altcontactstate') %]
-                                        <label for="borrower_altcontactstate" class="required">
+                                        <label for="borrower_altcontactstate" class="required">State:</label>
                                     [% ELSE %]
-                                        <label for="borrower_altcontactstate">
+                                        <label for="borrower_altcontactstate">State:</label>
                                     [% END %]
-                                    State:</label>
 
                                     <input type="text" id="borrower_altcontactstate" name="borrower_altcontactstate" value="[% borrower.altcontactstate %]" />
                                     [% IF mandatory.defined('altcontactstate') %]<span class="required">Required</span>[% END %]
@@ -810,11 +757,10 @@
                             [% UNLESS hidden.defined('altcontactzipcode') %]
                                 <li>
                                     [% IF mandatory.defined('altcontactzipcode') %]
-                                        <label for="borrower_altcontactzipcode" class="required">
+                                        <label for="borrower_altcontactzipcode" class="required">ZIP/Postal code:</label>
                                     [% ELSE %]
-                                        <label for="borrower_altcontactzipcode">
+                                        <label for="borrower_altcontactzipcode">ZIP/Postal code:</label>
                                     [% END %]
-                                    ZIP/Postal code:</label>
 
                                     <input type="text" id="borrower_altcontactzipcode" name="borrower_altcontactzipcode" value="[% borrower.altcontactzipcode %]" />
                                     [% IF mandatory.defined('altcontactzipcode') %]<span class="required">Required</span>[% END %]
@@ -824,11 +770,10 @@
                             [% UNLESS hidden.defined('altcontactcountry') %]
                                 <li>
                                     [% IF mandatory.defined('altcontactcountry') %]
-                                        <label for="borrower_altcontactcountry" class="required">
+                                        <label for="borrower_altcontactcountry" class="required">Country:</label>
                                     [% ELSE %]
-                                        <label for="borrower_altcontactcountry">
+                                        <label for="borrower_altcontactcountry">Country:</label>
                                     [% END %]
-                                    Country:</label>
 
                                     <input type="text" id="borrower_altcontactcountry" name="borrower_altcontactcountry" value="[% borrower.altcontactcountry %]" />
                                     [% IF mandatory.defined('altcontactcountry') %]<span class="required">Required</span>[% END %]
@@ -838,11 +783,10 @@
                             [% UNLESS hidden.defined('altcontactphone') %]
                                 <li>
                                     [% IF mandatory.defined('altcontactphone') %]
-                                        <label for="borrower_altcontactphone" class="required">
+                                        <label for="borrower_altcontactphone" class="required">Phone:</label>
                                     [% ELSE %]
-                                        <label for="borrower_altcontactphone">
+                                        <label for="borrower_altcontactphone">Phone:</label>
                                     [% END %]
-                                    Phone:</label>
 
                                     <input type="text" id="borrower_altcontactphone" name="borrower_altcontactphone" value="[% borrower.altcontactphone %]" />
                                     [% IF mandatory.defined('altcontactphone') %]<span class="required">Required</span>[% END %]
@@ -861,7 +805,7 @@
                                     <p>Your password must be at least [% Koha.Preference('minPasswordLength') %] characters long.</p>
                                 [% END %]
                                 [% UNLESS mandatory.defined('password') %]
-                                    If you do not enter a password a system generated password will be created.
+                                    <div>If you do not enter a password a system generated password will be created.</div>
                                 [% END %]
                             </div>
                         [% END %]
-- 
2.39.5