gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-23 00:41:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix issue with name parser

Browse source
This commit is contained in:
Gregory John Casamento 2019-09-27 00:00:59 -04:00
parent 7debdb8d1f
commit ced9f127e9
2 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Source/NSPersonNameComponentsFormatter.m
View file

@ -142,14 +142,14 @@
[first isEqualToString: @"dr"])
{
[pnc setNamePrefix: [nameArray objectAtIndex: 0]];
[pnc setGivenName: [nameArray objectAtIndex: 1]];
[pnc setGivenName: [nameArray objectAtIndex: 1]];
[pnc setFamilyName: [nameArray objectAtIndex: 2]];
}
else
{
[pnc setGivenName: [nameArray objectAtIndex: 0]];
[pnc setFamilyName: [nameArray objectAtIndex: 1]];
[pnc setNameSuffix: [nameArray objectAtIndex: 2]];
[pnc setGivenName: [nameArray objectAtIndex: 0]];
[pnc setMiddleName: [nameArray objectAtIndex: 1]];
[pnc setFamilyName: [nameArray objectAtIndex: 2]];
}
}
break;
@ -162,13 +162,13 @@
[first isEqualToString: @"dr."])
{
[pnc setNamePrefix: [nameArray objectAtIndex: 0]];
[pnc setGivenName: [nameArray objectAtIndex: 1]];
[pnc setGivenName: [nameArray objectAtIndex: 1]];
[pnc setMiddleName: [nameArray objectAtIndex: 2]];
[pnc setFamilyName: [nameArray objectAtIndex: 3]];
}
else
{
[pnc setGivenName: [nameArray objectAtIndex: 0]];
[pnc setGivenName: [nameArray objectAtIndex: 0]];
[pnc setMiddleName: [nameArray objectAtIndex: 1]];
[pnc setFamilyName: [nameArray objectAtIndex: 2]];
[pnc setNameSuffix: [nameArray objectAtIndex: 3]];

10
Tests/base/NSPersonNameComponentsFormatter/basic.m
View file

@ -39,6 +39,16 @@ int main()
PASS([[pnc nameSuffix] isEqualToString:
[pnc2 nameSuffix]], "Suffix name matches");
fmt = [[NSPersonNameComponentsFormatter alloc] init];
pnc2 = [fmt personNameComponentsFromString:
@"Gregory John Casamento"];
PASS([[pnc givenName] isEqualToString:
[pnc2 givenName]], "First name matches");
PASS([[pnc middleName] isEqualToString:
[pnc2 middleName]], "Middle name matches");
PASS([[pnc familyName] isEqualToString:
[pnc2 familyName]], "Family name matches");
END_SET("NSPersonNameComponentsFormatter base");
return 0;
}