From 5a81cbdcb38657f2ac2d68fea6ce82579b365543 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Tue, 24 May 2011 13:00:29 -0400
Subject: [PATCH] Fix for Bug 5020 - on patron record sex should be gender

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit f1ecfc7669f085c7577100db2902ac0de34b827e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
---
 .../intranet-tmpl/prog/en/modules/members/moremember-brief.tt | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt | 4 +++-
 .../intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt  | 2 +-
 koha-tmpl/opac-tmpl/prog/en/modules/opac-userdetails.tt       | 2 +-
 koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tt        | 4 ++--
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt
index 9ad6dbd501..87c7a1d463 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt
@@ -48,7 +48,7 @@
     [% END %]
     <li><span class="label">Initials: </span>[% initials %]</li>
     <li><span class="label">Date of birth:</span>[% dateofbirth %]</li>
-    <li><span class="label">Sex:</span>[% sex %]</li>[% END %]
+    <li><span class="label">Gender:</span>[% IF ( sex == 'F' ) %]Female[% ELSIF ( sex == 'M' ) %]Male[% ELSE %][% sex %][% END %]</li>[% END %]
     [% IF ( printethnicityline ) %]
     <li><span class="label">Ethnicity:</span>[% ethnicity %]</li>
     <li><span class="label">Ethnicity notes: </span>[% ethnotes %]</li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
index 8384dfb274..275cea6b24 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
@@ -212,7 +212,9 @@ function validate1(date) {
     [% END %]
     <li><span class="label">Initials: </span>[% initials %]</li>
     <li><span class="label">Date of birth:</span>[% dateofbirth %]</li>
-    <li><span class="label">Sex:</span>[% sex %]</li>[% END %]
+    <li><span class="label">Gender:</span>
+    [% IF ( sex == 'F' ) %]Female[% ELSIF ( sex == 'M' ) %]Male[% ELSE %][% sex %][% END %]
+    </li>[% END %]
     [% IF ( printethnicityline ) %]
     <li><span class="label">Ethnicity:</span>[% ethnicity %]</li>
     <li><span class="label">Ethnicity notes: </span>[% ethnotes %]</li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt
index b177838c02..78f927bd5e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt
@@ -209,7 +209,7 @@
                     </td>
                 </tr>
             <tr>
-                <td>Sex</td>
+                <td>Gender</td>
                 <td><input type="radio" name="Line" value="sex" /></td>
                 <td><input type="radio" name="Column" value="sex" /></td>
                 <td>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userdetails.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userdetails.tt
index 6c4f0c3063..cb091843a8 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userdetails.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userdetails.tt
@@ -51,7 +51,7 @@ Card Number:</th><td>[% cardnumber %]</td></tr>
 <caption>Identity Details</caption>
 <tr><th scope="row">DoB:</th><td> [% IF ( dateofbirth ) %][% dateofbirth %][% ELSE %]&nbsp;[% END %]</td></tr>
 
-<tr><th scope="row">Sex:</th><td>[% IF ( sex ) %][% sex %][% ELSE %]&nbsp;[% END %]</td></tr></table>
+<tr><th scope="row">Gender:</th><td>[% IF ( sex ) %][% sex %][% ELSE %]&nbsp;[% END %]</td></tr></table>
 
 [% IF ( contactname ) %]
 <table>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tt
index 12fb53c5ff..9a6885190f 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tt
@@ -66,7 +66,7 @@
 <fieldset class="brief">
 <ol>
 <li><label for="dob">Date of Birth: </label> <input id="dob" type="text" size="10" value="[% BORROWER_INF.dateofbirth %]" name="dateofbirth" /></li>
-<li><label for="sex">Sex: </label> <select name="sex" id="sex"><option></option>
+<li><label for="sex">Gender: </label> <select name="sex" id="sex"><option></option>
 [% IF ( BORROWER_INF.sex == 'F' ) %]<option value="F" selected="selected">Female</option>[% ELSE %]<option value="F">Female</option>[% END %]
 [% IF ( BORROWER_INF.sex == 'M' ) %]<option value="M" selected="selected">Male</option>[% ELSE %]<option value="M">Male</option>[% END %]
 </select></li>
@@ -126,7 +126,7 @@
 <legend>Personal Information</legend>
 <ol>
 <li><span class="label">Date of Birth:</span> [% BORROWER_INF.dateofbirth %]</li>
-<li><span class="label">Sex:</span>
+<li><span class="label">Gender:</span>
 [% IF ( sex == 'F' ) %]Female[% END %]
 [% IF ( sex == 'M' ) %]Male[% END %]
 </li>
-- 
2.39.5