See ChangeLog.

Monotone-Parent: d63c864a1b3540c00d2825cbeb4a8cdb0a698ea6
Monotone-Revision: a8f2e801b983189f8ed379cd8df342731ccee65d

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2011-08-08T14:20:46
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2011-08-08 14:20:46 +00:00
parent 017ebb901c
commit 055b235b81
4 changed files with 24 additions and 11 deletions
+14 -9
View File
@@ -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: @"<a href=\"%@://%@\">%@</a>", url, value, value];
if (label)
[cardString appendFormat: @"%@&nbsp;%@<br />\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