partial revert

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@39669 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2016-04-14 15:56:08 +00:00
parent 0fc67ba329
commit 37564e8948

View file

@ -2653,16 +2653,9 @@ GSICUCollatorOpen(NSStringCompareOptions mask, NSLocale *locale)
}
#if GS_USE_ICU == 1
if (NO == [locale isKindOfClass: [NSLocale class]])
if (nil != locale && NO == [locale isKindOfClass: [NSLocale class]])
{
if (nil == locale)
{
locale = [NSLocale systemLocale];
}
else
{
locale = [NSLocale currentLocale];
}
locale = [NSLocale currentLocale];
}
{
UCollator *coll = GSICUCollatorOpen(mask, locale);