organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-13 08:53:20 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 2

ICU-6830 getDateTimeSkeleton() should not normalize 'H' to 'h'

Browse source 
X-SVN-Rev: 27567
This commit is contained in:
Peter Edberg 2010-02-15 19:30:33 +00:00
parent d35f302566
commit ba9061c635
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
icu4j/main/classes/core/src/com/ibm/icu/text/DateIntervalFormat.java
View file

@ -903,7 +903,7 @@ public class DateIntervalFormat extends UFormat {
StringBuilder normalizedTime = new StringBuilder(skeleton.length());
/* the difference between time skeleton and normalizedTimeSkeleton are:
* 1. both 'H' and 'h' are normalized as 'h' in normalized time skeleton,
* 1. (Formerly, normalized time skeleton folded 'H' to 'h'; no longer true)
* 2. 'a' is omitted in normalized time skeleton.
* 3. there is only one appearance for 'h', 'm','v', 'z' in normalized
* time skeleton
@ -1121,6 +1121,7 @@ public class DateIntervalFormat extends UFormat {
int MCount = 0;
int yCount = 0;
int hCount = 0;
int HCount = 0;
int mCount = 0;
int vCount = 0;
int zCount = 0;
@ -1166,10 +1167,13 @@ public class DateIntervalFormat extends UFormat {
timeSkeleton.append(ch);
break;
case 'h':
case 'H':
timeSkeleton.append(ch);
++hCount;
break;
case 'H':
timeSkeleton.append(ch);
++HCount;
break;
case 'm':
timeSkeleton.append(ch);
++mCount;
@ -1223,7 +1227,10 @@ public class DateIntervalFormat extends UFormat {
}
/* generate normalized form for time */
if ( hCount != 0 ) {
if ( HCount != 0 ) {
normalizedTimeSkeleton.append('H');
}
else if ( hCount != 0 ) {
normalizedTimeSkeleton.append('h');
}
if ( mCount != 0 ) {