organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-15 01:42:37 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-2202 make getLocale not return @calendar=gregorian for actual

Browse source 
X-SVN-Rev: 14373
This commit is contained in:
Alan Liu 2004-01-22 00:15:12 +00:00
parent 2aef935bfd
commit 4734da91e9
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
icu4c/source/i18n/calendar.cpp
View file

@ -611,7 +611,7 @@ Calendar::createInstance(TimeZone* zone, const Locale& aLocale, UErrorCode& succ
}
return NULL;
}
if(u->getDynamicClassID() == UnicodeString::getStaticClassID()) {
// It's a unicode string telling us what type of calendar to load ("gregorian", etc)
char tmp[200];
@ -630,12 +630,15 @@ Calendar::createInstance(TimeZone* zone, const Locale& aLocale, UErrorCode& succ
#endif
// Create a Locale over this string
Locale l(tmp);
Locale l(tmp), actualLoc2;
delete u;
u = NULL;
c = (Calendar*)getService()->get(l, LocaleKey::KIND_ANY, &actualLoc, success);
// Don't overwrite actualLoc, since the actual loc from this call
// may be something like "@calendar=gregorian" -- TODO investigate
// further...
c = (Calendar*)getService()->get(l, LocaleKey::KIND_ANY, &actualLoc2, success);
if(U_FAILURE(success) || !c) {
delete zone;
@ -668,6 +671,7 @@ Calendar::createInstance(TimeZone* zone, const Locale& aLocale, UErrorCode& succ
// Now, reset calendar to default state:
c->adoptTimeZone(zone); // Set the correct time zone
c->setTimeInMillis(getNow(), success); // let the new calendar have the current time.
// pull up actual locale from registration
U_LOCALE_BASED(locBased, *c);
locBased.setLocaleIDs(0, actualLoc.getName());