AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-8342 A minor fix for EBCDIC platforms - replacing '/' with ':' for resource bundle key.

Browse Source 
X-SVN-Rev: 30010
This commit is contained in:
Yoshito Umaoka 2011-05-04 02:35:20 +00:00
parent 0f8827be69
commit a0b723bb79
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
icu4c/source/i18n/tznames_impl.cpp
View File

@ -1255,16 +1255,6 @@ TimeZoneNamesImpl::loadMetaZoneNames(const UnicodeString& mzID) {
return znames;
}
static void convertTzToCLDRFomat(const UnicodeString& tzID, char* result) {
int32_t len = tzID.length();
for (int32_t i = 0; i < len; i++) {
char c = (char)tzID.charAt(i);
if (c == '/') c = ':'; // Reaplce '/' with ':'
result[i] = c;
}
result[len] = '\0';
}
/*
* This method updates the cache and must be called with a lock
*/
@ -1287,7 +1277,13 @@ TimeZoneNamesImpl::loadTimeZoneNames(const UnicodeString& tzID) {
char key[ZID_KEY_MAX + 1];
UErrorCode status = U_ZERO_ERROR;
// Replace "/" with ":".
convertTzToCLDRFomat(tzID, key);
UnicodeString uKey(tzID);
for (int32_t i = 0; i < uKey.length(); i++) {
if (uKey.charAt(i) == (UChar)0x2F) {
uKey.setCharAt(i, (UChar)0x3A);
}
}
uKey.extract(0, uKey.length(), key, sizeof(key), US_INV);
tznames = TZNames::createInstance(fZoneStrings, key);
if (tznames == NULL) {