Author: rfm
Date: Thu Apr 14 17:00:50 2016
New Revision: 39668
URL: http://svn.gna.org/viewcvs/gnustep?rev=39668&view=rev
Log:
Fix use of locale for numeric sort/comparison
Modified:
libs/base/trunk/Source/NSString.m
Modified: libs/base/trunk/Source/NSString.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Source/NSString.m?rev=39668&r1=39667&r2=39668&view=diff
==============================================================================
--- libs/base/trunk/Source/NSString.m (original)
+++ libs/base/trunk/Source/NSString.m Thu Apr 14 17:00:50 2016
@@ -2653,9 +2653,16 @@
}
#if GS_USE_ICU == 1
- if (nil != locale && ![locale isKindOfClass: [NSLocale class]])
- {
- locale = [NSLocale currentLocale];
+ if (NO == [locale isKindOfClass: [NSLocale class]])
+ {
+ if (nil == locale)
+ {
+ locale = [NSLocale systemLocale];
+ }
+ else
+ {
+ locale = [NSLocale currentLocale];
+ }
}
{
UCollator *coll = GSICUCollatorOpen(mask, locale);
@@ -5619,9 +5626,16 @@
[NSException raise: NSInvalidArgumentException format: @"compare with
nil"];
#if GS_USE_ICU == 1
- if (nil != locale && ![locale isKindOfClass: [NSLocale class]])
- {
- locale = [NSLocale currentLocale];
+ if (NO == [locale isKindOfClass: [NSLocale class]])
+ {
+ if (nil == locale)
+ {
+ locale = [NSLocale systemLocale];
+ }
+ else
+ {
+ locale = [NSLocale currentLocale];
+ }
}
{
UCollator *coll = GSICUCollatorOpen(mask, locale);
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
