Bug 35157: Remove spans from patronfields.inc

To test:
1. Run any page that contains the "Search patrons" search bar through an HTML validator and you will see a lot of:

        Stray start tag span.
        Stray end tag span.

2. Apply patch
3. Try step 1 again, no more errors from the HTML validator.
4. Make sure the patron searches still work when limiting by 'Search field'.

Signed-off-by: Brendan Lawlor <blawlor@clamsnet.org>
Signed-off-by: Victor Grousset/tuxayo <victor@tuxayo.net>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>

koha-tmpl/intranet-tmpl/prog/en/includes/patronfields.inc

@@ -1,82 +1,82 @@
 [%- BLOCK patron_fields -%]
-     [%- SWITCH name -%]
+    [%- SWITCH name -%]
-     [%- CASE 'standard' -%]<span>Standard</span>
+    [%- CASE 'standard' -%][% t("Standard") | html %]
-     [%- CASE 'full_address' -%]<span>Full address</span>
+    [%- CASE 'full_address' -%][% t("Full address") | html %]
-     [%- CASE 'all_emails' -%]<span>All emails</span>
+    [%- CASE 'all_emails' -%][% t("All emails") | html %]
-     [%- CASE 'all_phones' -%]<span>All phones</span>
+    [%- CASE 'all_phones' -%][% t("All phones") | html %]
-     [%- CASE 'borrowernumber' -%]<span>Borrowernumber</span>
+    [%- CASE 'borrowernumber' -%][% t("Borrowernumber") | html %]
-     [%- CASE 'cardnumber' -%]<span>Card number</span>
+    [%- CASE 'cardnumber' -%][% t("Card number") | html %]
-     [%- CASE 'surname' -%]<span>Surname</span>
+    [%- CASE 'surname' -%][% t("Surname") | html %]
-     [%- CASE 'firstname' -%]<span>First name</span>
+    [%- CASE 'firstname' -%][% t("First name") | html %]
-     [%- CASE 'middle_name' -%]<span>Middle name</span>
+    [%- CASE 'middle_name' -%][% t("Middle name") | html %]
-     [%- CASE 'title' -%]<span>Salutation</span>
+    [%- CASE 'title' -%][% t("Salutation") | html %]
-     [%- CASE 'othernames' -%]<span>Other name</span>
+    [%- CASE 'othernames' -%][% t("Other name") | html %]
-     [%- CASE 'initials' -%]<span>Initials</span>
+    [%- CASE 'initials' -%][% t("Initials") | html %]
-     [%- CASE 'pronouns' -%]<span>Pronouns</span>
+    [%- CASE 'pronouns' -%][% t("Pronouns") | html %]
-     [%- CASE 'streetnumber' -%]<span>Street number</span>
+    [%- CASE 'streetnumber' -%][% t("Street number") | html %]
-     [%- CASE 'streettype' -%]<span>Street type</span>
+    [%- CASE 'streettype' -%][% t("Street type") | html %]
-     [%- CASE 'address' -%]<span>Address</span>
+    [%- CASE 'address' -%][% t("Address") | html %]
-     [%- CASE 'address2' -%]<span>Address 2</span>
+    [%- CASE 'address2' -%][% t("Address 2") | html %]
-     [%- CASE 'city' -%]<span>City</span>
+    [%- CASE 'city' -%][% t("City") | html %]
-     [%- CASE 'state' -%]<span>State</span>
+    [%- CASE 'state' -%][% t("State") | html %]
-     [%- CASE 'zipcode' -%]<span>ZIP/Postal code</span>
+    [%- CASE 'zipcode' -%][% t("ZIP/Postal code") | html %]
-     [%- CASE 'country' -%]<span>Country</span>
+    [%- CASE 'country' -%][% t("Country") | html %]
-     [%- CASE 'email' -%]<span>Primary email</span>
+    [%- CASE 'email' -%][% t("Primary email") | html %]
-     [%- CASE 'phone' -%]<span>Primary phone</span>
+    [%- CASE 'phone' -%][% t("Primary phone") | html %]
-     [%- CASE 'mobile' -%]<span>Mobile phone</span>
+    [%- CASE 'mobile' -%][% t("Mobile phone") | html %]
-     [%- CASE 'fax' -%]<span>Fax</span>
+    [%- CASE 'fax' -%][% t("Fax") | html %]
-     [%- CASE 'emailpro' -%]<span>Secondary email</span>
+    [%- CASE 'emailpro' -%][% t("Secondary email") | html %]
-     [%- CASE 'phonepro' -%]<span>Secondary phone</span>
+    [%- CASE 'phonepro' -%][% t("Secondary phone") | html %]
-     [%- CASE 'B_streetnumber' -%]<span>Alternate street number</span>
+    [%- CASE 'B_streetnumber' -%][% t("Alternate street number") | html %]
-     [%- CASE 'B_streettype' -%]<span>Alternate street type</span>
+    [%- CASE 'B_streettype' -%][% t("Alternate street type") | html %]
-     [%- CASE 'B_address' -%]<span>Alternate address</span>
+    [%- CASE 'B_address' -%][% t("Alternate address") | html %]
-     [%- CASE 'B_address2' -%]<span>Alternate address line 2</span>
+    [%- CASE 'B_address2' -%][% t("Alternate address line 2") | html %]
-     [%- CASE 'B_city' -%]<span>Alternate city</span>
+    [%- CASE 'B_city' -%][% t("Alternate city") | html %]
-     [%- CASE 'B_state' -%]<span>Alternate state</span>
+    [%- CASE 'B_state' -%][% t("Alternate state") | html %]
-     [%- CASE 'B_zipcode' -%]<span>Alternate zip code</span>
+    [%- CASE 'B_zipcode' -%][% t("Alternate zip code") | html %]
-     [%- CASE 'B_country' -%]<span>Alternate country</span>
+    [%- CASE 'B_country' -%][% t("Alternate country") | html %]
-     [%- CASE 'B_email' -%]<span>Alternate email</span>
+    [%- CASE 'B_email' -%][% t("Alternate email") | html %]
-     [%- CASE 'B_phone' -%]<span>Alternate phone</span>
+    [%- CASE 'B_phone' -%][% t("Alternate phone") | html %]
-     [%- CASE 'dateofbirth' -%]<span>Date of birth</span>
+    [%- CASE 'dateofbirth' -%][% t("Date of birth") | html %]
-     [%- CASE 'branchcode' -%]<span>Library (code)</span>
+    [%- CASE 'branchcode' -%][% t("Library (code)") | html %]
-     [%- CASE 'categorycode' -%]<span>Category (code)</span>
+    [%- CASE 'categorycode' -%][% t("Category (code)") | html %]
-     [%- CASE 'dateenrolled' -%]<span>Registration date</span>
+    [%- CASE 'dateenrolled' -%][% t("Registration date") | html %]
-     [%- CASE 'dateexpiry' -%]<span>Expiry date</span>
+    [%- CASE 'dateexpiry' -%][% t("Expiry date") | html %]
-     [%- CASE 'gonenoaddress' -%]<span>Gone no address</span>
+    [%- CASE 'gonenoaddress' -%][% t("Gone no address") | html %]
-     [%- CASE 'lost' -%]<span>Lost card</span>
+    [%- CASE 'lost' -%][% t("Lost card") | html %]
-     [%- CASE 'debarred' -%]<span>Restricted</span>
+    [%- CASE 'debarred' -%][% t("Restricted") | html %]
-     [%- CASE 'debarredcomment' -%]<span>Restriction reason</span>
+    [%- CASE 'debarredcomment' -%][% t("Restriction reason") | html %]
-     [%- CASE 'contactname' -%]<span>Guarantor surname</span>
+    [%- CASE 'contactname' -%][% t("Guarantor surname") | html %]
-     [%- CASE 'contactfirstname' -%]<span>Guarantor firstname</span>
+    [%- CASE 'contactfirstname' -%][% t("Guarantor firstname") | html %]
-     [%- CASE 'contacttitle' -%]<span>Guarantor title</span>
+    [%- CASE 'contacttitle' -%][% t("Guarantor title") | html %]
-     [%- CASE 'guarantorid' -%]<span>Guarantor ID</span>
+    [%- CASE 'guarantorid' -%][% t("Guarantor ID") | html %]
-     [%- CASE 'borrowernotes' -%]<span>Circulation note</span>
+    [%- CASE 'borrowernotes' -%][% t("Circulation note") | html %]
-     [%- CASE 'relationship' -%]<span>Guarantor relationship</span>
+    [%- CASE 'relationship' -%][% t("Guarantor relationship") | html %]
-     [%- CASE 'sex' -%]<span>Gender</span>
+    [%- CASE 'sex' -%][% t("Gender") | html %]
-     [%- CASE 'flags' -%]<span>Permissions (code)</span>
+    [%- CASE 'flags' -%][% t("Permissions (code)") | html %]
-     [%- CASE 'userid' -%]<span>Username</span>
+    [%- CASE 'userid' -%][% t("Username") | html %]
-     [%- CASE 'opacnote' -%]<span>OPAC note</span>
+    [%- CASE 'opacnote' -%][% t("OPAC note") | html %]
-     [%- CASE 'contactnote' -%]<span>Contact note</span>
+    [%- CASE 'contactnote' -%][% t("Contact note") | html %]
-     [%- CASE 'sort1' -%]<span>Sort 1</span>
+    [%- CASE 'sort1' -%][% t("Sort 1") | html %]
-     [%- CASE 'sort2' -%]<span>Sort 2</span>
+    [%- CASE 'sort2' -%][% t("Sort 2") | html %]
-     [%- CASE 'altcontactfirstname' -%]<span>Alternate contact first name</span>
+    [%- CASE 'altcontactfirstname' -%][% t("Alternate contact first name") | html %]
-     [%- CASE 'altcontactsurname' -%]<span>Alternate contact surname</span>
+    [%- CASE 'altcontactsurname' -%][% t("Alternate contact surname") | html %]
-     [%- CASE 'altcontactaddress1' -%]<span>Alternate contact address</span>
+    [%- CASE 'altcontactaddress1' -%][% t("Alternate contact address") | html %]
-     [%- CASE 'altcontactaddress2' -%]<span>Alternate contact address 2</span>
+    [%- CASE 'altcontactaddress2' -%][% t("Alternate contact address 2") | html %]
-     [%- CASE 'altcontactaddress3' -%]<span>Alternate contact city</span>
+    [%- CASE 'altcontactaddress3' -%][% t("Alternate contact city") | html %]
-     [%- CASE 'altcontactstate' -%]<span>Alternate contact state</span>
+    [%- CASE 'altcontactstate' -%][% t("Alternate contact state") | html %]
-     [%- CASE 'altcontactzipcode' -%]<span>Alternate contact ZIP/postal code</span>
+    [%- CASE 'altcontactzipcode' -%][% t("Alternate contact ZIP/postal code") | html %]
-     [%- CASE 'altcontactcountry' -%]<span>Alternate contact country</span>
+    [%- CASE 'altcontactcountry' -%][% t("Alternate contact country") | html %]
-     [%- CASE 'altcontactphone' -%]<span>Alternate contact phone</span>
+    [%- CASE 'altcontactphone' -%][% t("Alternate contact phone") | html %]
-     [%- CASE 'smsalertnumber' -%]<span>SMS alert number</span>
+    [%- CASE 'smsalertnumber' -%][% t("SMS alert number") | html %]
-     [%- CASE 'sms_provider_id' -%]<span>SMS provider</span>
+    [%- CASE 'sms_provider_id' -%][% t("SMS provider") | html %]
-     [%- CASE 'privacy' -%]<span>Privacy (code)</span>
+    [%- CASE 'privacy' -%][% t("Privacy (code)") | html %]
-     [%- CASE 'privacy_guarantor_checkouts' -%]<span>Guarantor can view checkouts</span>
+    [%- CASE 'privacy_guarantor_checkouts' -%][% t("Guarantor can view checkouts") | html %]
-     [%- CASE 'updated_on' -%]<span>Last updated</span>
+    [%- CASE 'updated_on' -%][% t("Last updated") | html %]
-     [%- CASE 'lastseen' -%]<span>Last seen</span>
+    [%- CASE 'lastseen' -%][% t("Last seen") | html %]
-     [%- CASE 'checkprevcheckout' -%]<span>Check previous checkout</span>
+    [%- CASE 'checkprevcheckout' -%][% t("Check previous checkout") | html %]
-     [%- CASE DEFAULT -%]
+    [%- CASE DEFAULT -%]
-     [%- END -%]
+    [%- END -%]
 [%- END -%]
 [%- BLOCK patron_fields_dropdown -%]
     [% IF search_box %]

koha-tmpl/intranet-tmpl/prog/en/modules/members/alert-subscriptions.tt

@@ -2,6 +2,7 @@
 [% USE Asset %]
 [% USE AuthorisedValues  %]
 [% USE Branches %]
+[% PROCESS 'i18n.inc' %]
 [% SET footerjs = 1 %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Alert subscriptions for [% INCLUDE 'patron-title.inc' no_html = 1 %] &rsaquo; Patrons &rsaquo; Koha</title>