gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-23 09:04:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Implemented [NSTimeZone-daylightSavingTimeOffsetForDate:].

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@32027 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Stefan Bidigaray 2011-02-10 03:58:02 +00:00
parent 88e468e8bf
commit 021d3680d7
3 changed files with 57 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2011-02-09 Stefan Bidigaray <stefanbidi@gmail.com>
* Source/NSTimeZone.m: ([-daylightSavingTimeOffsetForDate:]) Implemented.
2011-02-09 Stefan Bidigaray <stefanbidi@gmail.com>
* Source/NSTimeZone.m: ([-localizedName:locale:]) Implemented method.

2
Headers/Foundation/NSTimeZone.h
View file

@ -92,7 +92,7 @@ GS_EXPORT NSString * const NSSystemTimeZoneDidChangeNotification;
- (NSTimeInterval) daylightSavingTimeOffsetForDate: (NSDate *)aDate;
/** Not implemented */
- (NSDate *) nextDaylightSavingTimeTransitionAfterDate: (NSDate *)aDate;
/** Not implemented */
- (NSTimeInterval) daylightSavingTimeOffset;
/** Not implemented */
- (NSDate *) nextDaylightSavingTimeTransition;

72
Source/NSTimeZone.m
View file

@ -157,10 +157,12 @@ NSString * const NSSystemTimeZoneDidChangeNotification
#define POSIX_TZONES @"posix/"
#endif
#define BUFFER_SIZE 512
#if GS_USE_ICU == 1
static inline int
_NSToICUTZDisplayStyle(NSTimeZoneNameStyle style)
{
#if GS_USE_ICU == 1
switch (style)
{
case NSTimeZoneNameStyleStandard:
@ -174,11 +176,32 @@ _NSToICUTZDisplayStyle(NSTimeZoneNameStyle style)
default:
return -1;
}
#else
return -1;
#endif
}
static inline UCalendar *
_UCalendarSetup (NSTimeZone *tz, NSLocale *locale)
{
NSString *tzStr;
int32_t tzLen;
const char *cLocale;
UChar tzName[BUFFER_SIZE];
UCalendar *cal;
UErrorCode err = U_ZERO_ERROR;
tzStr = [tz name];
if ((tzLen = [tzStr length]) > BUFFER_SIZE)
tzLen = BUFFER_SIZE;
[tzStr getCharacters: tzName range: NSMakeRange(0, tzLen)];
cLocale = [[locale localeIdentifier] UTF8String];
cal = ucal_open(tzName, tzLen, cLocale, UCAL_TRADITIONAL, &err);
if (U_FAILURE(err))
return NULL;
return cal;
}
#endif
/* Possible location of system time zone files */
static NSString *tzdir = nil;
@ -2098,7 +2121,25 @@ localZoneString, [zone name], sign, s/3600, (s/60)%60);
- (NSTimeInterval) daylightSavingTimeOffsetForDate: (NSDate *)aDate
{
#if GS_USE_ICU == 1
NSTimeInterval result;
UCalendar *cal;
UErrorCode err = U_ZERO_ERROR;
cal = _UCalendarSetup (self, nil);
if (cal == NULL)
return 0.0;
ucal_setMillis (cal, ([aDate timeIntervalSince1970] * 1000.0), &err);
result = (double)ucal_get (cal, UCAL_DST_OFFSET, &err) / 1000.0;
if (U_FAILURE(err))
result = 0.0;
ucal_close (cal);
return result;
#else
return 0.0; // FIXME
#endif
}
- (NSDate *) nextDaylightSavingTimeTransitionAfterDate: (NSDate *)aDate
@ -2108,38 +2149,29 @@ localZoneString, [zone name], sign, s/3600, (s/60)%60);
- (NSTimeInterval) daylightSavingTimeOffset
{
return 0.0; // FIXME
return [self daylightSavingTimeOffsetForDate: [NSDate date]];
}
- (NSDate *) nextDaylightSavingTimeTransition
{
return nil; // FIXME;
return [self nextDaylightSavingTimeTransitionAfterDate: [NSDate date]];
}
- (NSString *)localizedName: (NSTimeZoneNameStyle)style
locale: (NSLocale *)locale
{
#if GS_USE_ICU == 1
#define BUFFER_SIZE 512
NSString *tzStr;
int32_t tzLen;
int32_t len;
const char *cLocale;
UChar *result;
UChar tzName[BUFFER_SIZE];
const char *cLocale;
int32_t len;
UCalendar *cal;
UErrorCode err = U_ZERO_ERROR;
tzStr = [self name];
if ((tzLen = [tzStr length]) > BUFFER_SIZE)
tzLen = BUFFER_SIZE;
[tzStr getCharacters: tzName range: NSMakeRange(0, tzLen)];
cLocale = [[locale localeIdentifier] UTF8String];
cal = ucal_open(tzName, tzLen, cLocale, UCAL_TRADITIONAL, &err);
if (U_FAILURE(err))
cal = _UCalendarSetup (self, locale);
if (cal == NULL)
return nil;
cLocale = [[locale localeIdentifier] UTF8String];
result = NSZoneMalloc ([self zone], BUFFER_SIZE * sizeof(UChar));
len = ucal_getTimeZoneDisplayName (cal, _NSToICUTZDisplayStyle(style),
cLocale, result, BUFFER_SIZE, &err);