Author: rfm
Date: Thu Apr 14 17:56:08 2016
New Revision: 39669
URL: http://svn.gna.org/viewcvs/gnustep?rev=39669&view=rev
Log:
partial revert
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=39669&r1=39668&r2=39669&view=diff
==============================================================================
--- libs/base/trunk/Source/NSString.m (original)
+++ libs/base/trunk/Source/NSString.m Thu Apr 14 17:56:08 2016
@@ -2653,16 +2653,9 @@
}
#if GS_USE_ICU == 1
- if (NO == [locale isKindOfClass: [NSLocale class]])
- {
- if (nil == locale)
- {
- locale = [NSLocale systemLocale];
- }
- else
- {
- locale = [NSLocale currentLocale];
- }
+ if (nil != locale && NO == [locale isKindOfClass: [NSLocale class]])
+ {
+ locale = [NSLocale currentLocale];
}
{
UCollator *coll = GSICUCollatorOpen(mask, locale);
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
