OLD | NEW |
1 Index: source/common/locid.cpp | 1 diff --git a/source/common/locid.cpp b/source/common/locid.cpp |
2 =================================================================== | 2 index f073aad..02da988 100644 |
3 --- source/common/locid.cpp» (revision 36834) | 3 --- a/source/common/locid.cpp |
4 +++ source/common/locid.cpp» (working copy) | 4 +++ b/source/common/locid.cpp |
5 @@ -484,6 +484,13 @@ | 5 @@ -509,6 +509,13 @@ Locale& Locale::init(const char* localeID, UBool canonicali
ze) |
6 /* preset all fields to empty */ | 6 /* preset all fields to empty */ |
7 language[0] = script[0] = country[0] = 0; | 7 language[0] = script[0] = country[0] = 0; |
8 | 8 |
9 + // Need to reset baseName. Otherwise, when a Locale object created with | 9 + // Need to reset baseName. Otherwise, when a Locale object created with |
10 + // the default constructor is changed with setFromPOSIXID() later | 10 + // the default constructor is changed with setFromPOSIXID() later |
11 + // (e.g. locales obtained with getAvailableLocales()), | 11 + // (e.g. locales obtained with getAvailableLocales()), |
12 + // baseName will be still that of the default locale instead of one | 12 + // baseName will be still that of the default locale instead of one |
13 + // corresponding to localeID. | 13 + // corresponding to localeID. |
14 + baseName = NULL; | 14 + baseName = NULL; |
15 + | 15 + |
16 // "canonicalize" the locale ID to ICU/Java format | 16 // "canonicalize" the locale ID to ICU/Java format |
17 err = U_ZERO_ERROR; | 17 err = U_ZERO_ERROR; |
18 length = canonicalize ? | 18 length = canonicalize ? |
OLD | NEW |