From d5f385d4e530e7c2de5a4750a4d9b8961d8ffc39 Mon Sep 17 00:00:00 2001 From: Scott Russell Date: Wed, 4 Sep 2013 02:44:27 +0000 Subject: [PATCH] ICU-10249 Implement new Islamic calendar variants tbla, rgsa (fix for broken test) X-SVN-Rev: 34178 --- .../classes/core/src/com/ibm/icu/util/IslamicCalendar.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/icu4j/main/classes/core/src/com/ibm/icu/util/IslamicCalendar.java b/icu4j/main/classes/core/src/com/ibm/icu/util/IslamicCalendar.java index 6e691f5e85f..8f03749d243 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/util/IslamicCalendar.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/util/IslamicCalendar.java @@ -868,8 +868,10 @@ public class IslamicCalendar extends Calendar { setType(CalculationType.ISLAMIC_UMALQURA); else if("islamic-tbla".equals(localeCalType)) setType(CalculationType.ISLAMIC_TBLA); - else - setType(CalculationType.ISLAMIC); // needs to be last so it's always the default + else if(localeCalType.startsWith("islamic")) + setType(CalculationType.ISLAMIC); // needs to be last so it's always the default if it's islamic-something-unhandled + else + setType(CalculationType.ISLAMIC_CIVIL); // default for any non-islamic calendar locale }