1
1
/*
2
- * Copyright (c) 2008-2011 Brent Fulgham <bfulgham@gmail.org>. All rights reserved.
2
+ * Copyright (c) 2008-2012 Brent Fulgham <bfulgham@gmail.org>. All rights reserved.
3
3
*
4
4
* This source code is a modified version of the CoreFoundation sources released by Apple Inc. under
5
5
* the terms of the APSL version 2.0 (see below).
@@ -107,7 +107,7 @@ __private_extern__ UCalendar *__CFCalendarCreateUCalendar(CFStringRef calendarID
107
107
if (calendarID ) {
108
108
CFDictionaryRef components = CFLocaleCreateComponentsFromLocaleIdentifier (kCFAllocatorSystemDefault , localeID );
109
109
CFMutableDictionaryRef mcomponents = CFDictionaryCreateMutableCopy (kCFAllocatorSystemDefault , 0 , components );
110
- CFDictionarySetValue (mcomponents , kCFLocaleCalendarIdentifierKey , calendarID );
110
+ CFDictionarySetValue (mcomponents , kCFLocaleCalendarIdentifier , calendarID );
111
111
localeID = CFLocaleCreateLocaleIdentifierFromComponents (kCFAllocatorSystemDefault , mcomponents );
112
112
CFRelease (mcomponents );
113
113
CFRelease (components );
@@ -146,7 +146,7 @@ static void __CFCalendarZapCal(CFCalendarRef calendar) {
146
146
147
147
CFCalendarRef CFCalendarCopyCurrent (void ) {
148
148
CFLocaleRef locale = CFLocaleCopyCurrent ();
149
- CFCalendarRef calID = (CFCalendarRef )CFLocaleGetValue (locale , kCFLocaleCalendarIdentifierKey );
149
+ CFCalendarRef calID = (CFCalendarRef )CFLocaleGetValue (locale , kCFLocaleCalendarIdentifier );
150
150
if (calID ) {
151
151
CFCalendarRef calendar = CFCalendarCreateWithIdentifier (kCFAllocatorSystemDefault , (CFStringRef )calID );
152
152
CFCalendarSetLocale (calendar , locale );
@@ -162,7 +162,7 @@ CFCalendarRef CFCalendarCreateWithIdentifier(CFAllocatorRef allocator, CFStringR
162
162
__CFGenericValidateType (identifier , CFStringGetTypeID ());
163
163
// return NULL until Chinese calendar is available
164
164
if (identifier != kCFCalendarIdentifierGregorian && identifier != kCFCalendarIdentifierBuddhist && identifier != kCFCalendarIdentifierJapanese && identifier != kCFCalendarIdentifierIslamic && identifier != kCFCalendarIdentifierIslamicCivil && identifier != kCFCalendarIdentifierHebrew ) {
165
- // if (identifier != kCFCalendarIdentifierGregorian && identifier != kCFCalendarIdentifierBuddhist && identifier != kCFCalendarIdentifierJapanese && identifier != kCFCalendarIdentifierIslamic && identifier != kCFCalendarIdentifierIslamicCivil && identifier != kCFCalendarIdentifierHebrew && identifier != kCFCalendarIdentifierChinese) {
165
+ // if (identifier != kCFCalendarIdentifierGregorian && identifier != kCFCalendarIdentifierBuddhist && identifier != kCFCalendarIdentifierJapanese && identifier != kCFCalendarIdentifierIslamicCivil && identifier != kCFIslamicCivilCalendar && identifier != kCFCalendarIdentifierHebrew && identifier != kCFCalendarIdentifierChinese) {
166
166
if (CFEqual (kCFCalendarIdentifierGregorian , identifier )) identifier = kCFCalendarIdentifierGregorian ;
167
167
else if (CFEqual (kCFCalendarIdentifierBuddhist , identifier )) identifier = kCFCalendarIdentifierBuddhist ;
168
168
else if (CFEqual (kCFCalendarIdentifierJapanese , identifier )) identifier = kCFCalendarIdentifierJapanese ;
0 commit comments