fix for collation alone being set

This commit is contained in:
Richard Frith-Macdonald 2018-02-04 10:51:01 +00:00
parent 5277bf7043
commit 113867e9e6
2 changed files with 3 additions and 1 deletions

View file

@ -3,6 +3,8 @@
* Source/GSFileHandle.m: keep checker happy by usingn return value of
setsockopt.
* Source/Additions/Unicode.m: ensure iconv handle is closed
* Source/NSLocale.m: localeIdentifierFromComponents should cope with
collation alone beng set.
2018-01-26 Richard Frith-Macdonald <rfm@gnu.org>

View file

@ -637,7 +637,7 @@ static NSRecursiveLock *classLock = nil;
// I'm not using uloc_setKeywordValue() here because the format is easy
// enough to reproduce and has the added advatange that we doesn't need ICU.
if (calendar || calendar || currency)
if (calendar || collation || currency)
[string appendString: @"@"];
if (calendar)
[string appendFormat: @"calendar=%s", calendar];