Index: source/i18n/unicode/calendar.h |
diff --git a/source/i18n/unicode/calendar.h b/source/i18n/unicode/calendar.h |
index e8ebaae0acb34da1e6360e7581f2f80b0dbcfd28..bc7f05492defddabd4a47117962265267ae664d8 100644 |
--- a/source/i18n/unicode/calendar.h |
+++ b/source/i18n/unicode/calendar.h |
@@ -127,9 +127,9 @@ class BasicTimeZone; |
* |
* <p> |
* <strong>Ambiguous Wall Clock Time.</strong> When time offset from UTC has |
- * changed, it produces ambiguous time slot around the transition. For example, |
+ * changed, it produces an ambiguous time slot around the transition. For example, |
* many US locations observe daylight saving time. On the date switching to daylight |
- * saving time in US, wall clock time jumps from 1:00 AM (standard) to 2:00 AM |
+ * saving time in US, wall clock time jumps from 12:59 AM (standard) to 2:00 AM |
* (daylight). Therefore, wall clock time from 1:00 AM to 1:59 AM do not exist on |
* the date. When the input wall time fall into this missing time slot, the ICU |
* Calendar resolves the time using the UTC offset before the transition by default. |
@@ -2461,6 +2461,36 @@ private: |
* @return TRUE if a transition is found. |
*/ |
UBool getImmediatePreviousZoneTransition(UDate base, UDate *transitionTime, UErrorCode& status) const; |
+ |
+public: |
+#ifndef U_HIDE_INTERNAL_API |
+ /** |
+ * Creates a new Calendar from a Locale for the cache. |
+ * This method does not set the time or timezone in returned calendar. |
+ * @param locale the locale. |
+ * @param status any error returned here. |
+ * @return the new Calendar object with no time or timezone set. |
+ * @internal For ICU use only. |
+ */ |
+ static Calendar * U_EXPORT2 makeInstance( |
+ const Locale &locale, UErrorCode &status); |
+ |
+ /** |
+ * Get the calendar type for given locale. |
+ * @param locale the locale |
+ * @param typeBuffer calendar type returned here |
+ * @param typeBufferSize The size of typeBuffer in bytes. If the type |
+ * can't fit in the buffer, this method sets status to |
+ * U_BUFFER_OVERFLOW_ERROR |
+ * @param status error, if any, returned here. |
+ * @internal For ICU use only. |
+ */ |
+ static void U_EXPORT2 getCalendarTypeFromLocale( |
+ const Locale &locale, |
+ char *typeBuffer, |
+ int32_t typeBufferSize, |
+ UErrorCode &status); |
+#endif /* U_HIDE_INTERNAL_API */ |
}; |
// ------------------------------------- |