Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 384691 - Bookmarks from Apple Address Book should display company / organization where Company option is selected and Bug 462785 - Address Book smart folder builds 'Name' field in non-localized way. Patch by Chris Lawson <cl-bugs-new@chrislawson.net>, r=hendy, sr=smorgan

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@255503 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
alqahira%ardisson.org
2008-12-12 03:15:07 +00:00
parent 3fa889c187
commit b1ded04912
2 changed files with 46 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mozilla/camino/resources/localized/English.lproj/Localizable.strings.in
View File

@@ -360,6 +360,12 @@
"Updated Bookmarks" = "Updated Bookmarks";
"Rendezvous" = "Bonjour";
"Address Book" = "Address Book";
/* Used when no person name is found for an Address Book smart bookmark */
"<No Name>" = "<No Name>";
/* Used when no company name is found for an Address Book smart bookmark based on a Company card */
"<No Company Name>" = "<No Company Name>";
/* Used for a Company card that has a person's name associated with it (e.g. "Google (John Doe)") */
"CompanyCardWithPersonNameFormat" = "%1$@ (%2$@)";
/*Bookmark context menus*/
"Open in New Window" = "Open in New Window";

52
mozilla/camino/src/bookmarks/AddressBookManager.m
View File

@@ -76,33 +76,61 @@
[mAddressBookFolder deleteChild:[mAddressBookFolder objectAtIndex:0]];
// fill address book with people. could probably do this smarter,
// but it's a start for now.
ABAddressBook *ab = [ABAddressBook sharedAddressBook];
NSEnumerator *peopleEnumerator = [[ab people] objectEnumerator];
ABAddressBook* ab = [ABAddressBook sharedAddressBook];
NSEnumerator* peopleEnumerator = [[ab people] objectEnumerator];
ABPerson* person;
NSString *name = nil, *homepage = nil;
while ((person = [peopleEnumerator nextObject])) {
// |kABHomePageProperty| is depricated on Tiger, look for the new property first and then
// the old one (as the old one is present but no longer updated by ABook).
// |kABHomePageProperty| is deprecated on Tiger. Look for the new property first and then
// the old one (as the old one is still present, just no longer updated).
ABMultiValue* urls = [person valueForProperty:kABURLsProperty];
homepage = [urls valueAtIndex:[urls indexForIdentifier:[urls primaryIdentifier]]];
NSString* homepage = [urls valueAtIndex:[urls indexForIdentifier:[urls primaryIdentifier]]];
if (!homepage)
homepage = [person valueForProperty:kABHomePageProperty];
if ([homepage length] > 0) {
NSString* name = nil;
NSString* firstName = [person valueForProperty:kABFirstNameProperty];
NSString* lastName = [person valueForProperty:kABLastNameProperty];
if (firstName || lastName) {
if (!firstName)
name = lastName;
else if (!lastName)
name = firstName;
else
name = [NSString stringWithFormat:@"%@ %@", firstName, lastName];
else {
// Build the name string in a l10n-friendly manner: respect the name ordering flag if present,
// or use the Address Book's default pref otherwise.
int nameOrderFlag = [[person valueForProperty:kABPersonFlags] intValue] & kABNameOrderingMask;
if (nameOrderFlag == kABDefaultNameOrdering)
nameOrderFlag = [ab defaultNameOrdering];
if (nameOrderFlag == kABLastNameFirst)
name = [NSString stringWithFormat:@"%@ %@", lastName, firstName];
else // Default to the standard in the English-speaking world.
name = [NSString stringWithFormat:@"%@ %@", firstName, lastName];
}
}
else {
name = [person valueForProperty:kABOrganizationProperty];
if (!name)
name = NSLocalizedString(@"<No Name>", nil);
int personShowAsFlag = [[person valueForProperty:kABPersonFlags] intValue] & kABShowAsMask;
if (personShowAsFlag == kABShowAsCompany) {
NSString* company = [person valueForProperty:kABOrganizationProperty];
if (!company)
company = NSLocalizedString(@"<No Company Name>", nil);
if (name) {
name = [NSString stringWithFormat:NSLocalizedString(@"CompanyCardWithPersonNameFormat", @""),
company,
name];
}
else {
name = [NSString stringWithFormat:@"%@", company];
}
}
// We ought to have something by now, but if not, use the placeholder.
if (!name)
name = NSLocalizedString(@"<No Name>", nil);
[mAddressBookFolder appendChild:[Bookmark bookmarkWithTitle:name
url:homepage
lastVisit:nil]];