colby/cappuccino
1
0 Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-10-10 02:40:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2048 from mrcarlberg/cpdateformatter_relative_dont_work_in_jan

Browse Source 
Fixed: RelativeDateFormating didn't work in January
This commit is contained in:
Antoine Mercadal committed 2014-01-14 15:01:28 -08:00
2 parents b6bd132066 acd5442246
commit 35f3987803
1 file changed
+8 -8
Download Patch File Download Diff File Expand all files Collapse all files
Foundation/CPDateFormatter.j
+8 -8
View File
@@ -79,8 +79,8 @@ var defaultDateFormatterBehavior = CPDateFormatterBehavior10_4,
return;
relativeDateFormating = @{
@"fr" : [@"demain", 1440, @"apr" + String.fromCharCode(233) + @"s-demain", 2880, @"apr" + String.fromCharCode(233) + @"s-apr" + String.fromCharCode(233) + @"s-demain", 4320, @"hier", -1440, @"avant-hier", -2880, @"avant-avant-hier", -4320],
@"en" : [@"tomorrow", 1440, @"yesterday", -1440],
@"fr" : [@"demain", 1, @"apr" + String.fromCharCode(233) + @"s-demain", 2, @"apr" + String.fromCharCode(233) + @"s-apr" + String.fromCharCode(233) + @"s-demain", 3, @"hier", -1, @"avant-hier", -2, @"avant-avant-hier", -3],
@"en" : [@"tomorrow", 1, @"yesterday", -1],
@"de" : [],
@"es" : []
};
@@ -552,13 +552,13 @@ var defaultDateFormatterBehavior = CPDateFormatterBehavior10_4,
var date = [CPDate date];
[date _dateWithTimeZone:_timeZone];
date.setHours(aDate.getHours());
date.setMinutes(aDate.getMinutes());
date.setSeconds(aDate.getSeconds());
date.setHours(12);
date.setMinutes(0);
date.setSeconds(0);
date.setMinutes([relativeWords objectAtIndex:i]);
date.setDate([relativeWords objectAtIndex:i] + date.getDate());
if (date.getDate() == aDate.getDate() && date.getMonth() && aDate.getMonth() && date.getFullYear() == aDate.getFullYear())
if (date.getDate() == aDate.getDate() && date.getMonth() == aDate.getMonth() && date.getFullYear() == aDate.getFullYear())
{
relativeWord = [relativeWords objectAtIndex:(i - 1)];
format = @"";
@@ -2123,4 +2123,4 @@ var CPDateFormatterDateStyleKey = @"CPDateFormatterDateStyle",
self.setSeconds(self.getSeconds() + [aTimeZone secondsFromGMT]);
}
@end
@end