Monotone-Parent: 755524b00e9b962e6240a95f6bfdd559ca240f5a

Monotone-Revision: b37f3f6ae0b2c8936fa170defaec8e6b7c107b85

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2006-08-14T20:43:55
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2006-08-14 20:43:55 +00:00
parent 55b39d214d
commit 6b539e8e15
8 changed files with 57 additions and 31 deletions
+13 -13
View File
@@ -91,20 +91,20 @@
}
- (NSString *)weekLabel {
NSString *label;
NSString *label, *le;
label = [self localizedNameForMonthOfYear:[self->startDate monthOfYear]];
label = [NSString stringWithFormat:@"%@ %d",
label,
[self->startDate yearOfCommonEra]];
if ([self->startDate monthOfYear] != [self->endDate monthOfYear]) {
NSString *le;
le = [self localizedNameForMonthOfYear:[self->endDate monthOfYear]];
label = [NSString stringWithFormat:@"<nobr>%@ / %@ %d</nobr>",
label, le,
[self->endDate yearOfCommonEra]];
}
if ([self->startDate monthOfYear] == [self->endDate monthOfYear])
label = [NSString stringWithFormat:@"%@ %d",
[self localizedNameForMonthOfYear: [self->startDate monthOfYear]],
[self->startDate yearOfCommonEra]];
else
{
le = [self localizedNameForMonthOfYear:[self->endDate monthOfYear]];
label = [NSString stringWithFormat:@"<nobr>%@ / %@ %d</nobr>",
label, le,
[self->endDate yearOfCommonEra]];
}
return label;
}