gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-31 00:30:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Warn about use of an abbreviation as if it was a name.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@30557 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2010-06-03 09:07:58 +00:00
parent 9817550e07
commit 909c5b4248
1 changed files with 39 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

47
Source/NSTimeZone.m
View file

@ -1516,18 +1516,49 @@ static NSMapTable *absolutes = 0;
zone = [defaultPlaceholderTimeZone initWithName: localZoneString]; zone = [defaultPlaceholderTimeZone initWithName: localZoneString];
if (zone == nil) if (zone == nil)
{ {
zone = [[self timeZoneWithAbbreviation: localZoneString] retain]; if (zone == nil)
} {
if (zone == nil) GSPrintf(stderr,
{ @"\nUnable to create time zone for name: '%@'\n"
NSLog(@"Unable to create time zone for name: '%@' (source '%@').", @"(source '%@').\n", localZoneString, localZoneSource);
localZoneString, localZoneSource); }
if ([localZoneSource hasPrefix: @"file"] if ([localZoneSource hasPrefix: @"file"]
|| [localZoneSource hasPrefix: @"function"]) || [localZoneSource hasPrefix: @"function"])
{ {
NSLog(@"It seems that your operating system does not have a valid timezone name configured (it could be that some other software has set a, possibly ambiguous, timezone abbreviation rather than a name) ... please correct that or override by setting a timezone name (such as 'Europe/London' or 'America/Chicago')."); GSPrintf(stderr,
@"\nIt seems that your operating system does not have a valid timezone name\n"
@"configured (it could be that some other software has set a, possibly\n"
@"ambiguous, timezone abbreviation rather than a name) ... please correct\n"
@"that or override by setting a timezone name (such as 'Europe/London'\n"
@"or 'America/Chicago').\n");
}
GSPrintf(stderr,
@"\nYou can override the timezone name by setting the '%@'\n"
@"NSUserDefault via the 'defaults' command line utility, a Preferences\n"
@"application, or some other utility.\n"
@"eg \"defaults write NSGlobalDomain '%@' 'Africa/Nairobi'\"\n"
@"See '%@'\n"
@"for the standard timezones such as 'GB-Eire' or 'America/Chicago'.\n",
LOCALDBKEY, LOCALDBKEY, _time_zone_path (ZONES_DIR, nil));
zone = [[self timeZoneWithAbbreviation: localZoneString] retain];
if (zone != nil)
{
NSInteger s;
char sign = '+';
s = [zone secondsFromGMT];
if (s < 0)
{
sign = '-';
s = -s;
}
GSPrintf(stderr,
@"\nSucceeded in treating '%@' as a timezone abbreviation,\n"
@"but abbreviations do not uniquely represent timezones, so this may\n"
@"not have found the timezone you were expecting. The timezone found\n"
@"was '%@' (currently UTC%c%02d%02d)\n\n",
localZoneString, [zone name], sign, s/3600, (s/60)%60);
} }
NSLog(@"You can override the timezone name by setting the '%@' user default. See '%@' for the standard timezones such as 'GB-Eire' or 'Africa/Nairobi'.", LOCALDBKEY, _time_zone_path (ZONES_DIR, nil));
} }
} }
else else