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

Fix use of locale for numeric sort/comparison

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@39668 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2016-04-14 15:00:50 +00:00
parent 53e2ded50a
commit e3c429dfee
1 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Source/NSString.m
View file

@ -2653,9 +2653,16 @@ GSICUCollatorOpen(NSStringCompareOptions mask, NSLocale *locale)
}
#if GS_USE_ICU == 1
if (nil != locale && ![locale isKindOfClass: [NSLocale class]])
if (NO == [locale isKindOfClass: [NSLocale class]])
{
locale = [NSLocale currentLocale];
if (nil == locale)
{
locale = [NSLocale systemLocale];
}
else
{
locale = [NSLocale currentLocale];
}
}
{
UCollator *coll = GSICUCollatorOpen(mask, locale);
@ -5619,9 +5626,16 @@ static NSFileManager *fm = nil;
[NSException raise: NSInvalidArgumentException format: @"compare with nil"];
#if GS_USE_ICU == 1
if (nil != locale && ![locale isKindOfClass: [NSLocale class]])
if (NO == [locale isKindOfClass: [NSLocale class]])
{
locale = [NSLocale currentLocale];
if (nil == locale)
{
locale = [NSLocale systemLocale];
}
else
{
locale = [NSLocale currentLocale];
}
}
{
UCollator *coll = GSICUCollatorOpen(mask, locale);