Commit 8834b2dd authored by Effy Elden's avatar Effy Elden

CRM-19581 Change default third gender to 'Other'

parent 5e86614d
......@@ -117,7 +117,7 @@
<item>
<path>civicrm/admin/options/gender</path>
<title>Gender Options</title>
<desc>Options for assigning gender to individual contacts (e.g. Male, Female, Transgender).</desc>
<desc>Options for assigning gender to individual contacts (e.g. Male, Female, Other).</desc>
<page_callback>CRM_Admin_Page_Options</page_callback>
<adminGroup>Customize Data and Screens</adminGroup>
<icon>admin/small/01.png</icon>
......
......@@ -4,7 +4,7 @@ The list below are enums from the database (except the last 2).
private $preferred_communication_method = array('Phone', 'Email', 'Post');
private $greeting_type = array('Formal', 'Informal', 'Honorific', 'Custom', 'Other');
private $contact_type = array('Individual', 'Household', 'Organization');
private $gender = array('Female', 'Male', 'Transgender');
private $gender = array('Female', 'Male', 'Other');
private $phone_type = array('Phone', 'Mobile', 'Fax', 'Pager');
// almost enums
......
This diff is collapsed.
......@@ -36,7 +36,7 @@
{else}
<div class="help">
{if $gName eq "gender"}
{ts}CiviCRM is pre-configured with standard options for individual gender (Male, Female, Transgender). Modify these options as needed for your installation.{/ts}
{ts}CiviCRM is pre-configured with standard options for individual gender (Male, Female, Other). Modify these options as needed for your installation.{/ts}
{elseif $gName eq "individual_prefix"}
{ts}CiviCRM is pre-configured with standard options for individual contact prefixes (Ms., Mr., Dr. etc.). Customize these options and add new ones as needed for your installation.{/ts}
{elseif $gName eq "mobile_provider"}
......
......@@ -125,7 +125,7 @@ class WebTest_Contact_AdvancedSearchTest extends CiviSeleniumTestCase {
$searchBlockValues = array(
'basic' => array('', 'addBasicSearchDetail'),
'location' => array('state_province', 'addAddressSearchDetail'),
'demographics' => array('civicrm_gender_Transgender_3', 'addDemographicSearchDetail'),
'demographics' => array('civicrm_gender_Other_3', 'addDemographicSearchDetail'),
'notes' => array('note', ''),
'activity' => array('activity_type_id', 'addActivitySearchDetail'),
'CiviContribute' => array('contribution_currency_type', 'addContributionSearchDetail'),
......
......@@ -436,7 +436,7 @@ class WebTest_Export_ContactTest extends ExportCiviSeleniumTestCase {
$genderLabelArray = array(
1 => 'Female',
2 => 'Male',
3 => 'Transgender',
3 => 'Other',
);
$prefix = rand(1, 4);
$suffix = rand(1, 8);
......
Title,First Name,Middle Name,Last Name,Nick Name,Email,Street,City,State,Zip,Zip + 4,ID,Web Site,Gender,D.O.B.,Last Voted Date,Do Not Call,Preferred Comm,Important Issue,District,Suffix,External ID,Location Name,Employer MS,Paula,A,Smarts,,psmarts@gmail.com,20 Main St.,Portland,OR,97092,4112,23,http://www.foobar.org/psmarts.htm,Transgender,19560511,20041111,1,EMAIL,Education,District 1,JR,N101,Main Home,CiviCRM LLC Mr,Peter,William,Smarts,Pete,petesmarts@gmail.com,20 Main St.,Portland,OR,97092,4112,34,http://www.foobar.org/psmarts.htm,MALE,19511010,20041003,1,email,Edu,1,sr,N102,Main Home,Tahoe Donner DR,Dan,,Foobar,,dan.foobar@foo.org,,San Mateo,CA,90192-1449,,45,,male,19721105,20041003,1,Postal Mail,Environment,2,SR,N103,College Address,Northstar Mrs,Pat,April,Foobar,Petunia,pat.foobar@sos.org,,San Mateo,CA,90192,1611,56,,Female,19510927,20041003,1,phone,Env,District 2,,N105,Summer Home, ms,Jackie,,Johnson,,jackie@example.org,10 Main #3,Newton,MA,1924,,66,,Female,19650102,20041003,0,Phone,Env,1,Jr,N110,,
\ No newline at end of file
Title,First Name,Middle Name,Last Name,Nick Name,Email,Street,City,State,Zip,Zip + 4,ID,Web Site,Gender,D.O.B.,Last Voted Date,Do Not Call,Preferred Comm,Important Issue,District,Suffix,External ID,Location Name,Employer MS,Paula,A,Smarts,,psmarts@gmail.com,20 Main St.,Portland,OR,97092,4112,23,http://www.foobar.org/psmarts.htm,Other,19560511,20041111,1,EMAIL,Education,District 1,JR,N101,Main Home,CiviCRM LLC Mr,Peter,William,Smarts,Pete,petesmarts@gmail.com,20 Main St.,Portland,OR,97092,4112,34,http://www.foobar.org/psmarts.htm,MALE,19511010,20041003,1,email,Edu,1,sr,N102,Main Home,Tahoe Donner DR,Dan,,Foobar,,dan.foobar@foo.org,,San Mateo,CA,90192-1449,,45,,male,19721105,20041003,1,Postal Mail,Environment,2,SR,N103,College Address,Northstar Mrs,Pat,April,Foobar,Petunia,pat.foobar@sos.org,,San Mateo,CA,90192,1611,56,,Female,19510927,20041003,1,phone,Env,District 2,,N105,Summer Home, ms,Jackie,,Johnson,,jackie@example.org,10 Main #3,Newton,MA,1924,,66,,Female,19650102,20041003,0,Phone,Env,1,Jr,N110,,
\ No newline at end of file
......
......@@ -78,7 +78,7 @@
<name>gender</name>
<type>enum</type>
<import>true</import>
<values>Female, Male, Transgender</values>
<values>Female, Male, Other</values>
<add>1.1</add>
<drop>1.2</drop>
</field>
......
......@@ -389,9 +389,9 @@ VALUES
-- Activity Type for Close Accounting Period
(@option_group_id_act, '{ts escape="sql"}Close Accounting Period{/ts}', 54, 'Close Accounting Period', NULL, 1, 0, 54, '{ts escape="sql"}Close Accounting Period{/ts}', 0, 1, 1, @contributeCompId, NULL),
(@option_group_id_gender, '{ts escape="sql"}Female{/ts}', 1, 'Female', NULL, 0, NULL, 1, NULL, 0, 0, 1, NULL, NULL),
(@option_group_id_gender, '{ts escape="sql"}Male{/ts}', 2, 'Male', NULL, 0, NULL, 2, NULL, 0, 0, 1, NULL, NULL),
(@option_group_id_gender, '{ts escape="sql"}Transgender{/ts}', 3, 'Transgender', NULL, 0, NULL, 3, NULL, 0, 0, 1, NULL, NULL),
(@option_group_id_gender, '{ts escape="sql"}Female{/ts}', 1, 'Female', NULL, 0, NULL, 1, NULL, 0, 0, 1, NULL, NULL),
(@option_group_id_gender, '{ts escape="sql"}Male{/ts}', 2, 'Male', NULL, 0, NULL, 2, NULL, 0, 0, 1, NULL, NULL),
(@option_group_id_gender, '{ts escape="sql"}Other{/ts}', 3, 'Other', NULL, 0, NULL, 3, NULL, 0, 0, 1, NULL, NULL),
(@option_group_id_IMProvider, 'Yahoo', 1, 'Yahoo', NULL, 0, NULL, 1, NULL, 0, 0, 1, NULL, NULL),
(@option_group_id_IMProvider, 'MSN', 2, 'Msn', NULL, 0, NULL, 2, NULL, 0, 0, 1, NULL, NULL),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment