commit 414e3d9e3a8b0695a83f8e60751c76c9d5b2cd5c
author Steven R. Loomis <srl@icu-project.org> Fri May 30 01:54:12 2008 +0000
committer Steven R. Loomis <srl@icu-project.org> Fri May 30 01:54:12 2008 +0000
tree faed78090792cb36a101dbe0362329e4b826e03d
parent 050bd5c923e9b01f03a01074c1f051ebe170e018

ICU-6098 patch: merge -c 24083 svn+ssh://source.icu-project.org/repos/icu/icu/trunk/source/i18n/dtitvinf.cpp

X-SVN-Rev: 24084

source/i18n/dtitvinf.cpp

diff --git a/source/i18n/dtitvinf.cpp b/source/i18n/dtitvinf.cpp
index b69c757..896b293 100644
--- a/source/i18n/dtitvinf.cpp
+++ b/source/i18n/dtitvinf.cpp
@@ -386,6 +386,8 @@
     const int32_t DIFFERENT_FIELD = 0x1000;
     const int32_t STRING_NUMERIC_DIFFERENCE = 0x100;
     const int32_t BASE = 0x41;
+    const UChar CHAR_V = 0x0076;
+    const UChar CHAR_Z = 0x007A;
 
     // hack for 'v' and 'z'.
     // resource bundle only have time skeletons ending with 'v',
@@ -393,9 +395,15 @@
     UBool replaceZWithV = false;
     const UnicodeString* inputSkeleton = &skeleton; 
     UnicodeString copySkeleton;
-    if ( skeleton.indexOf('z') != -1 ) {
+    if ( skeleton.indexOf(CHAR_Z) != -1 ) {
+        UChar zstr[2];
+        UChar vstr[2]; 
+        zstr[0]=CHAR_Z;
+        vstr[0]=CHAR_V;
+        zstr[1]=0;
+        vstr[1]=0;
         copySkeleton = skeleton;
-        copySkeleton.findAndReplace("z", "v");
+        copySkeleton.findAndReplace(zstr, vstr);
         inputSkeleton = &copySkeleton;
         replaceZWithV = true;
     }