mirror of
https://github.com/unicode-org/icu.git
synced 2025-04-07 22:44:49 +00:00
ICU-10615 A quick fix for 2-digit year parsing problem with Japanese calendar. Need more investigation.
X-SVN-Rev: 34830
This commit is contained in:
parent
d6d57e4461
commit
b40d690f2a
1 changed files with 2 additions and 2 deletions
|
@ -1,6 +1,6 @@
|
|||
/*
|
||||
*******************************************************************************
|
||||
* Copyright (C) 1996-2013, International Business Machines Corporation and *
|
||||
* Copyright (C) 1996-2014, International Business Machines Corporation and *
|
||||
* others. All Rights Reserved. *
|
||||
*******************************************************************************
|
||||
*/
|
||||
|
@ -2819,7 +2819,7 @@ public class SimpleDateFormat extends DateFormat {
|
|||
/* Skip this for Chinese calendar, moved from ChineseDateFormat */
|
||||
if ( override != null && (override.compareTo("hebr") == 0 || override.indexOf("y=hebr") >= 0) && value < 1000 ) {
|
||||
value += HEBREW_CAL_CUR_MILLENIUM_START_YEAR;
|
||||
} else if (count == 2 && (pos.getIndex() - start) == 2 && !isChineseCalendar
|
||||
} else if (count == 2 && (pos.getIndex() - start) == 2 && !isChineseCalendar && !cal.getType().equals("japanese")
|
||||
&& UCharacter.isDigit(text.charAt(start))
|
||||
&& UCharacter.isDigit(text.charAt(start+1)))
|
||||
{
|
||||
|
|
Loading…
Add table
Reference in a new issue