updated behavior for prefixes related to gender

When the gender is not 'Male' or 'Female' for a contact without a prefix, no assumptions are made. If the greeting token that needs "Mr. " or "Dr." or "Ms." is used in this case, the unknown prefix will be "UNKNOWN PREFIX"
This commit is contained in:
Sarah Poger Gladstone 2019-05-27 09:37:25 -04:00 committed by GitHub
parent ec1e8314c7
commit e72264f058
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -194,15 +194,19 @@ function process_spouses(&$suffixes, &$prefixes, &$values, &$contactIDs, $greeti
$gender_id = $contact_dao->gender_id; $gender_id = $contact_dao->gender_id;
if ($gender_id == 1){ if ($gender_id == 1){
$gender_label = "Female"; $gender_label = "Female";
}else{ }else if ($gender_id == 2 ) {
$gender_label = "Male"; $gender_label = "Male";
}else{
$gender_label = "";
} }
$spouse_gender_id = $contact_dao->spouse_gender_id; $spouse_gender_id = $contact_dao->spouse_gender_id;
if ($spouse_gender_id == 1){ if ($spouse_gender_id == 1){
$spouse_gender_label = "Female"; $spouse_gender_label = "Female";
}else{ }else if ($gender_id == 2 )
$spouse_gender_label = "Male"; $spouse_gender_label = "Male";
else{
$gender_label = "";
} }
@ -699,8 +703,10 @@ function determine_title($prefix, $gender, $uses_spouses_name){
$prefix = "Mrs."; $prefix = "Mrs.";
}else if($gender == 'Female'){ }else if($gender == 'Female'){
$prefix = "Ms."; $prefix = "Ms.";
}else if($gender == 'Male'){
$prefix = "Mr."
}else{ }else{
$prefix = "Mr."; $prefix = "UNKNOWN PREFIX";
} }
}else if( $prefix == 'Mr' or $prefix == 'Mr.' or $prefix == 'Mrs' or $prefix == 'Mrs.' or $prefix == 'Ms' or $prefix == 'Ms.' or $prefix == 'Miss'){ }else if( $prefix == 'Mr' or $prefix == 'Mr.' or $prefix == 'Mrs' or $prefix == 'Mrs.' or $prefix == 'Ms' or $prefix == 'Ms.' or $prefix == 'Miss'){
$prefix_info['real_title'] = false; $prefix_info['real_title'] = false;
@ -1131,4 +1137,4 @@ where og.name = 'individual_suffix' ";
} }
} }