mirror of
https://github.com/cappuccino/cappuccino.git
synced 2026-11-18 20:49:22 +00:00
Fixed small bus about timeZone
This commit is contained in:
1 parent
3497e36f23
commit
98a59c4700
3 files changed
+10
-9
No files matched your search
@@ -550,6 +550,8 @@ var defaultDateFormatterBehavior = CPDateFormatterBehavior10_4,
|
||||
for (var i = 1; i < [relativeWords count]; i = i + 2)
|
||||
{
|
||||
var date = [CPDate date];
|
||||
[date _dateWithTimeZone:_timeZone];
|
||||
|
||||
date.setHours(aDate.getHours());
|
||||
date.setMinutes(aDate.getMinutes());
|
||||
date.setSeconds(aDate.getSeconds());
|
||||
@@ -921,6 +923,7 @@ var defaultDateFormatterBehavior = CPDateFormatterBehavior10_4,
|
||||
return [[self veryShortStandaloneWeekdaySymbols] objectAtIndex:day];
|
||||
|
||||
case @"a":
|
||||
|
||||
if (aDate.getHours() > 11)
|
||||
return [self PMSymbol];
|
||||
else
|
||||
@@ -995,7 +998,7 @@ var defaultDateFormatterBehavior = CPDateFormatterBehavior10_4,
|
||||
return [timeZone localizedName:CPTimeZoneNameStyleDaylightSaving locale:_locale];
|
||||
|
||||
case @"Z":
|
||||
var seconds = [timeZone secondsFromGMTForDate:aDate],
|
||||
var seconds = [timeZone secondsFromGMT],
|
||||
minutes = seconds / 60,
|
||||
hours = minutes / 60,
|
||||
result,
|
||||
|
||||
@@ -164,7 +164,7 @@
|
||||
|
||||
- (void)testLocalizedStringFromDate
|
||||
{
|
||||
var result = [CPDateFormatter localizedStringFromDate:_date dateStyle:CPDateFormatterMediumStyle timeStyle:CPDateFormatterNoStyle];
|
||||
var result = [CPDateFormatter localizedStringFromDate:[[CPDate alloc] initWithString:@"2011-10-05 23:59:59 +1200"] dateStyle:CPDateFormatterMediumStyle timeStyle:CPDateFormatterNoStyle];
|
||||
[self assert:result equals:@"5 Oct 2011"];
|
||||
}
|
||||
|
||||
@@ -311,17 +311,14 @@
|
||||
|
||||
var date = [CPDate date];
|
||||
date.setDate(date.getDate() + 1);
|
||||
date.setHours(11);
|
||||
date.setMinutes(10);
|
||||
|
||||
var result = [_dateFormatter editingStringForObjectValue:date];
|
||||
[self assert:result equals:@"tomorrow"];
|
||||
|
||||
date.setDate(date.getDate() - 2);
|
||||
|
||||
[_dateFormatter setTimeStyle:CPDateFormatterShortStyle];
|
||||
result = [_dateFormatter editingStringForObjectValue:date];
|
||||
[self assert:result equals:@"yesterday 11:10 AM"];
|
||||
[self assert:result equals:@"yesterday"];
|
||||
}
|
||||
|
||||
- (void)testStringFromDateTokensYears
|
||||
@@ -386,7 +383,8 @@
|
||||
|
||||
[self assert:result equals:@"PM"];
|
||||
|
||||
_date.setHours(2);
|
||||
_date = [[CPDate alloc] initWithString:@"2011-10-05 05:34:38 -0900"];
|
||||
|
||||
var result = [_dateFormatter stringFromDate:_date];
|
||||
[self assert:result equals:@"AM"];
|
||||
}
|
||||
|
||||
@@ -226,7 +226,7 @@
|
||||
var timeZone = [CPTimeZone localTimeZone],
|
||||
abbreviation = [timeZone abbreviationForDate:_date];
|
||||
|
||||
[self assert:abbreviation equals:@"PDT"];
|
||||
[self assert:abbreviation equals:String(String(_date).split("(")[1]).split(")")[0]];
|
||||
}
|
||||
|
||||
- (void)testAbbreviationWithNilDate
|
||||
@@ -243,7 +243,7 @@
|
||||
var timeZone = [CPTimeZone localTimeZone],
|
||||
seconds = [timeZone secondsFromGMTForDate:_date];
|
||||
|
||||
[self assert:seconds equals:-25200];
|
||||
[self assert:seconds equals:(_date.getTimezoneOffset() * -60)];
|
||||
}
|
||||
|
||||
- (void)testSecondsFromGMTForDateWithNilDate
|
||||
|
||||
Reference in new issue
Block a user