diff --git a/ChangeLog b/ChangeLog index ab3d02f3b..d8dd6df66 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2011-08-05 Francis Lachapelle + + * UI/Contacts/UIxContactView.m (-contactCardTitle): removed this + method since we no longer prefix the contact name by a label + ("Card For"). + (-_cardStringWithLabel:value:url:): new method that wraps the + value with an link with the specified URL type. Used for + telephone numbers. + 2011-08-05 Wolfgang Sourdeau * OpenChange/MAPIStoreAppointmentWrapper.m diff --git a/UI/Contacts/English.lproj/Localizable.strings b/UI/Contacts/English.lproj/Localizable.strings index 61a9fd4e4..4e310e2a9 100644 --- a/UI/Contacts/English.lproj/Localizable.strings +++ b/UI/Contacts/English.lproj/Localizable.strings @@ -76,7 +76,6 @@ "No possible subscription" = "No possible subscription"; "Preferred" = "Preferred"; -"Card for %@" = "Card for %@"; "Display:" = "Display:"; "Display Name:" = "Display Name:"; "Email:" = "Email:"; diff --git a/UI/Contacts/UIxContactView.m b/UI/Contacts/UIxContactView.m index ba7360a9d..d6e75d23a 100644 --- a/UI/Contacts/UIxContactView.m +++ b/UI/Contacts/UIxContactView.m @@ -60,6 +60,15 @@ - (NSString *) _cardStringWithLabel: (NSString *) label value: (NSString *) value +{ + return [self _cardStringWithLabel: label + value: value + url: nil]; +} + +- (NSString *) _cardStringWithLabel: (NSString *) label + value: (NSString *) value + url: (NSString *) url { NSMutableString *cardString; @@ -67,6 +76,9 @@ value = [value stringByReplacingString: @"\r" withString: @""]; if ([value length] > 0) { + if ([url length] > 0) + value = [NSString stringWithFormat: @"%@", url, value, value]; + if (label) [cardString appendFormat: @"%@ %@
\n", [self labelForKey: label], value]; @@ -77,13 +89,6 @@ return cardString; } -- (NSString *) contactCardTitle -{ - return [NSString stringWithFormat: - [self labelForKey: @"Card for %@"], - [self fullName]]; -} - - (NSString *) displayName { return [self _cardStringWithLabel: @"Display Name:" @@ -200,7 +205,7 @@ - (NSString *) preferredTel { return [self _cardStringWithLabel: @"Phone Number:" - value: [card preferredTel]]; + value: [card preferredTel] url: @"tel"]; } - (NSString *) preferredAddress @@ -257,7 +262,7 @@ } } - return [self _cardStringWithLabel: aLabel value: phone]; + return [self _cardStringWithLabel: aLabel value: phone url: @"tel"]; } - (NSString *) workPhone diff --git a/UI/Templates/ContactsUI/UIxContactView.wox b/UI/Templates/ContactsUI/UIxContactView.wox index 867e80f86..0da0abf72 100644 --- a/UI/Templates/ContactsUI/UIxContactView.wox +++ b/UI/Templates/ContactsUI/UIxContactView.wox @@ -7,7 +7,7 @@ xmlns:label="OGo:label" xmlns:uix="OGo:uix"> -