diff --git a/frameworks/intl/include/number_format.h b/frameworks/intl/include/number_format.h index f2c6620a2fd2620719783ad1c2fb134250bea572..f6679da87e20d933c812f7c78d215a7bbe566d97 100644 --- a/frameworks/intl/include/number_format.h +++ b/frameworks/intl/include/number_format.h @@ -103,7 +103,7 @@ private: UNumberUnitWidth unitDisplay = UNumberUnitWidth::UNUM_UNIT_WIDTH_SHORT; UNumberUnitWidth currencyDisplay = UNumberUnitWidth::UNUM_UNIT_WIDTH_SHORT; UNumberSignDisplay signDisplay = UNumberSignDisplay::UNUM_SIGN_AUTO; - static const int MAX_UNIT_NUM = 500; + static const int MAX_UNIT_NUM = 502; static const int DEFAULT_FRACTION_DIGITS = 3; static const int DEFAULT_MAX_SIGNIFICANT_DIGITS = 21; static const char *DEVICE_TYPE_NAME; diff --git a/frameworks/intl/src/i18n_calendar.cpp b/frameworks/intl/src/i18n_calendar.cpp index a2d36874787a96e1156b03e40c0666f7f3182110..bfee6390bcdad146651e8bb416d00ef5e887c103 100644 --- a/frameworks/intl/src/i18n_calendar.cpp +++ b/frameworks/intl/src/i18n_calendar.cpp @@ -108,7 +108,7 @@ void I18nCalendar::InitCalendar(const icu::Locale &locale, CalendarType type) break; } case ISLAMIC_CIVIL: { - calendar_ = new icu::IslamicCalendar(locale, status, icu::IslamicCalendar::ECalculationType::CIVIL); + calendar_ = new icu::IslamicCivilCalendar(locale, status); break; } default: { @@ -127,11 +127,11 @@ void I18nCalendar::InitCalendar2(const icu::Locale &locale, CalendarType type, U { switch (type) { case ISLAMIC_TBLA: { - calendar_ = new icu::IslamicCalendar(locale, status, icu::IslamicCalendar::ECalculationType::TBLA); + calendar_ = new icu::IslamicTBLACalendar(locale, status); break; } case ISLAMIC_UMALQURA: { - calendar_ = new icu::IslamicCalendar(locale, status, icu::IslamicCalendar::ECalculationType::UMALQURA); + calendar_ = new icu::IslamicUmalquraCalendar(locale, status); break; } case JAPANESE: { diff --git a/frameworks/intl/src/measure_data.cpp b/frameworks/intl/src/measure_data.cpp index 3955ab5a25bdbe772a1d914dee0240abc12f0e90..99fb16d43d310647e1323e5fa44119ecca4eb7ca 100644 --- a/frameworks/intl/src/measure_data.cpp +++ b/frameworks/intl/src/measure_data.cpp @@ -33,7 +33,7 @@ const int REGION_OFFSET = 7; const int BASE_VALUE_SIZE = 2; const int FACTOR_SIZE = 2; const int CHAR_OFFSET = 48; -const int MAX_UNIT_NUM = 500; +const int MAX_UNIT_NUM = 502; const size_t REGION_SIZE = 2; const std::unordered_map> USAGE_001 { diff --git a/frameworks/intl/test/unittest/intl_test.cpp b/frameworks/intl/test/unittest/intl_test.cpp index c86162b67b4eb7574d7218cefffd57334df22b6f..6a81eb6061fb600ac4692a62de4a5939ee8178a1 100644 --- a/frameworks/intl/test/unittest/intl_test.cpp +++ b/frameworks/intl/test/unittest/intl_test.cpp @@ -236,7 +236,7 @@ HWTEST_F(IntlTest, IntlFuncTest003, TestSize.Level1) HWTEST_F(IntlTest, IntlFuncTest004, TestSize.Level1) { string locale = "en-GB"; - string expects = "2 January 1970, 18:17 – 12 January 1970, 18:20"; + string expects = "2 January 1970, 18:17 – 12 January 1970, 18:20"; vector locales; locales.push_back(locale); string dateStyle = "long"; @@ -1518,7 +1518,7 @@ HWTEST_F(IntlTest, IntlFuncTest0036, TestSize.Level1) int64_t milliseconds2 = 987654321; res = formatter->FormatRange(milliseconds, milliseconds2); - EXPECT_EQ(res, "1/2/70 \xE2\x80\x93 1/12/70"); + EXPECT_EQ(res, "1/2/70 – 1/12/70"); delete formatter; }