From 09f43462b3a5d11afcdfaeb7181cad5d7f112a89 Mon Sep 17 00:00:00 2001 From: zhangdd_ewan Date: Fri, 17 Jan 2025 11:01:59 +0800 Subject: [PATCH 1/6] =?UTF-8?q?icu=E5=8D=87=E7=BA=A774.2=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangdd_ewan --- frameworks/intl/src/i18n_calendar.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frameworks/intl/src/i18n_calendar.cpp b/frameworks/intl/src/i18n_calendar.cpp index a2d36874..bfee6390 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: { -- Gitee From d2d9d1deb6524a27127000cd615bfcbccf94843c Mon Sep 17 00:00:00 2001 From: zhangdd_ewan Date: Sat, 18 Jan 2025 18:36:00 +0800 Subject: [PATCH 2/6] =?UTF-8?q?icu=E5=8D=87=E7=BA=A7=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangdd_ewan --- frameworks/intl/include/number_format.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frameworks/intl/include/number_format.h b/frameworks/intl/include/number_format.h index f2c6620a..f6679da8 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; -- Gitee From 812c6ecf3c1f5e487e9d17bb0f9cb12c15423b7d Mon Sep 17 00:00:00 2001 From: zhangdd_ewan Date: Tue, 21 Jan 2025 09:52:35 +0800 Subject: [PATCH 3/6] =?UTF-8?q?icu=E5=8D=87=E7=BA=A774.2=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangdd_ewan --- frameworks/intl/src/measure_data.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frameworks/intl/src/measure_data.cpp b/frameworks/intl/src/measure_data.cpp index 3955ab5a..99fb16d4 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 { -- Gitee From af298cbd631b643e69f33d47d772d3ced9a73b95 Mon Sep 17 00:00:00 2001 From: zhangdd_ewan Date: Tue, 21 Jan 2025 17:40:12 +0800 Subject: [PATCH 4/6] =?UTF-8?q?icu=E5=8D=87=E7=BA=A774.2=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangdd_ewan --- frameworks/intl/test/unittest/intl_test.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frameworks/intl/test/unittest/intl_test.cpp b/frameworks/intl/test/unittest/intl_test.cpp index c86162b6..d68b2229 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 at 18:17\xE2\x80\x89\xE2\x80\x93\xE2\x80\x8912 January 1970 at 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\xE2\x80\x89\xE2\x80\x93\xE2\x80\x891/12/70"); delete formatter; } -- Gitee From c56dc8e94834d1ec749c3122e02d6c44cc6247cb Mon Sep 17 00:00:00 2001 From: zhangdd_ewan Date: Tue, 21 Jan 2025 18:03:39 +0800 Subject: [PATCH 5/6] =?UTF-8?q?icu=E5=8D=87=E7=BA=A774.2=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangdd_ewan --- frameworks/intl/test/unittest/intl_test.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frameworks/intl/test/unittest/intl_test.cpp b/frameworks/intl/test/unittest/intl_test.cpp index d68b2229..c2d57b3f 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 at 18:17\xE2\x80\x89\xE2\x80\x93\xE2\x80\x8912 January 1970 at 18:20"; + string expects = "2 January 1970 at 18:17 – 12 January 1970 at 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\x89\xE2\x80\x93\xE2\x80\x891/12/70"); + EXPECT_EQ(res, "1/2/70 – 1/12/70"); delete formatter; } -- Gitee From 1b99b9937a49744e68ce4947ad3792770fa58e91 Mon Sep 17 00:00:00 2001 From: zhangdd_ewan Date: Wed, 12 Feb 2025 17:23:25 +0800 Subject: [PATCH 6/6] =?UTF-8?q?icu=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangdd_ewan --- frameworks/intl/test/unittest/intl_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frameworks/intl/test/unittest/intl_test.cpp b/frameworks/intl/test/unittest/intl_test.cpp index c2d57b3f..6a81eb60 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 at 18:17 – 12 January 1970 at 18:20"; + string expects = "2 January 1970, 18:17 – 12 January 1970, 18:20"; vector locales; locales.push_back(locale); string dateStyle = "long"; -- Gitee