diff --git a/.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md b/.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md index b015cc8a41d6595ee0660ab04a09489b2b77f7d5..86dd358d3c204cd20eb207d5b1db7582f3632eea 100644 --- a/.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md +++ b/.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md @@ -10,6 +10,3 @@ ### 测试用例(新增、改动、可能影响的功能) -### L0新增用例自检结果 -- [ ] 是,有新增L0用例,且完成自检 -- [ ] 否 diff --git a/frameworks/i18n/i18n.dat b/frameworks/i18n/i18n.dat index 31a20b7e18298a46bdbf24ae2e3eea1d1690760c..67cac7439e9d5e6debf391283157db2e47ba5a4f 100644 Binary files a/frameworks/i18n/i18n.dat and b/frameworks/i18n/i18n.dat differ diff --git a/frameworks/i18n/test/unittest/lite/common/i18n_test.cpp b/frameworks/i18n/test/unittest/lite/common/i18n_test.cpp index 6f407ea8bbe70c786c24cf0e1d254cf07abeb291..3796aecf233e5fc93082464b1239e7b8282826f7 100644 --- a/frameworks/i18n/test/unittest/lite/common/i18n_test.cpp +++ b/frameworks/i18n/test/unittest/lite/common/i18n_test.cpp @@ -1424,7 +1424,7 @@ HWTEST_F(I18NTest, I18NFuncTest065, TestSize.Level1) DateTimeFormat formatter(pattern, locale); string out; formatter.Format(0, "", out, status); - EXPECT_EQ(out, "1 қаң., бс"); + EXPECT_EQ(out, "1 Қаң., Бс"); } /** @@ -1506,7 +1506,7 @@ HWTEST_F(I18NTest, I18NFuncTest069, TestSize.Level1) AvailableDateTimeFormatPattern pattern = AvailableDateTimeFormatPattern::FULL; DateTimeFormat formatter(pattern, locale); formatter.Format(now, "-1:45", out, status); - std::string expect = "серда, 7 студзеня 1970 г."; + std::string expect = "серада, 7 студзеня 1970 г."; EXPECT_EQ(expect, out); } @@ -1525,7 +1525,7 @@ HWTEST_F(I18NTest, I18NFuncTest070, TestSize.Level1) AvailableDateTimeFormatPattern pattern = AvailableDateTimeFormatPattern::MEDIUM; DateTimeFormat formatter(pattern, locale); formatter.Format(now, "-1:45", out, status); - std::string expect = "1970 ж. 7 қаң."; + std::string expect = "1970 ж. 7 Қаң."; EXPECT_EQ(expect, out); } diff --git a/tools/i18n-dat-tool/src/main/resource/calendar-gregorian-dayNames-format-abbreviated.json b/tools/i18n-dat-tool/src/main/resource/calendar-gregorian-dayNames-format-abbreviated.json index d06ebafcc42820559b944f309e1ca8b173117e66..56be817a71dc5f46bbddf69fb4eb41f0e98e2dfc 100644 --- a/tools/i18n-dat-tool/src/main/resource/calendar-gregorian-dayNames-format-abbreviated.json +++ b/tools/i18n-dat-tool/src/main/resource/calendar-gregorian-dayNames-format-abbreviated.json @@ -378,13 +378,13 @@ "შაბ" ], "kk": [ - "жс", - "дс", - "сс", - "ср", - "бс", - "жм", - "сб" + "Жс", + "Дс", + "Сс", + "Ср", + "Бс", + "Жм", + "Сб" ], "km": [ "អាទិត្យ", diff --git a/tools/i18n-dat-tool/src/main/resource/calendar-gregorian-monthNames-format-abbreviated.json b/tools/i18n-dat-tool/src/main/resource/calendar-gregorian-monthNames-format-abbreviated.json index 4cf35063308cef959b22a3442ab4ad7bdcf088c5..1cee6476d0fb7bdcc9758d7902798aa018af901e 100644 --- a/tools/i18n-dat-tool/src/main/resource/calendar-gregorian-monthNames-format-abbreviated.json +++ b/tools/i18n-dat-tool/src/main/resource/calendar-gregorian-monthNames-format-abbreviated.json @@ -1064,18 +1064,18 @@ "დეკ" ], "kk": [ - "қаң.", - "ақп.", - "нау.", - "сәу.", - "мам.", - "мау.", - "шіл.", - "там.", - "қыр.", - "қаз.", - "қар.", - "жел." + "Қаң.", + "Ақп.", + "Нау.", + "Сәу.", + "Мам.", + "Мау.", + "Шіл.", + "Там.", + "Қыр.", + "Қаз.", + "Қар.", + "Жел." ], "km": [ "មករា", diff --git a/tools/i18n-dat-tool/src/main/resource/date-patterns.json b/tools/i18n-dat-tool/src/main/resource/date-patterns.json index fe924f2f5691a4932837005f846554a468ac3228..da8ee715d3c69d7dfa7e8c83049036f5352513c4 100644 --- a/tools/i18n-dat-tool/src/main/resource/date-patterns.json +++ b/tools/i18n-dat-tool/src/main/resource/date-patterns.json @@ -2108,12 +2108,12 @@ "kk": [ "d MMM, EEE", "d MMM", - "y 'ж'. d MMM, EEE", - "y 'ж'. d MMMM, EEE", + "y 'ж'. d MMM, EEE", + "y 'ж'. d MMMM, EEE", "dd.MM.y, EEEE", "dd.MM.y, EEE", - "y 'ж'. d MMM, EEEE", - "y 'ж'. d MMMM", + "y 'ж'. d MMM, EEEE", + "y 'ж'. d MMMM", "d, EEE", "dd.MM, EEE", "dd.MM" diff --git a/tools/i18n-dat-tool/src/main/resource/format-wide-month-names.json b/tools/i18n-dat-tool/src/main/resource/format-wide-month-names.json index 136fb427c481179bbe936994944ab3e74e65560c..89e829e7d8583f213528d1d47c3e2065d2a19a4b 100644 --- a/tools/i18n-dat-tool/src/main/resource/format-wide-month-names.json +++ b/tools/i18n-dat-tool/src/main/resource/format-wide-month-names.json @@ -770,18 +770,18 @@ "დეკემბერი" ], "kk": [ - "қаңтар", - "ақпан", - "наурыз", - "сәуір", - "мамыр", - "маусым", - "шілде", - "тамыз", - "қыркүйек", - "қазан", - "қараша", - "желтоқсан" + "Қаңтар", + "Ақпан", + "Наурыз", + "Сәуір", + "Мамыр", + "Маусым", + "Шілде", + "Тамыз", + "Қыркүйек", + "Қазан", + "Қараша", + "Желтоқсан" ], "km": [ "ខែមករា", diff --git a/tools/i18n-dat-tool/src/main/resource/format-wide-weeday-names.json b/tools/i18n-dat-tool/src/main/resource/format-wide-weeday-names.json index 35701183c89de8e3628d35ac59d320f8d88ac859..ebfcda9ad4fa3bd072fe407fd792db411c1b0c29 100644 --- a/tools/i18n-dat-tool/src/main/resource/format-wide-weeday-names.json +++ b/tools/i18n-dat-tool/src/main/resource/format-wide-weeday-names.json @@ -369,13 +369,13 @@ "შაბათი" ], "kk": [ - "жексенбі", - "дүйсенбі", - "сейсенбі", - "сәрсенбі", - "бейсенбі", - "жұма", - "сенбі" + "Жексенбі", + "Дүйсенбі", + "Сейсенбі", + "Сәрсенбі", + "Бейсенбі", + "Жұма", + "Сенбі" ], "km": [ "ថ្ងៃអាទិត្យ", diff --git a/tools/i18n-dat-tool/src/main/resource/hour-minute-secons-pattern.json b/tools/i18n-dat-tool/src/main/resource/hour-minute-secons-pattern.json index 466bdeaa437a41b4054f19117cc795ec5588c7b1..c11dc05ff00e121f7f62a42018dc8f20c7d4c6e8 100644 Binary files a/tools/i18n-dat-tool/src/main/resource/hour-minute-secons-pattern.json and b/tools/i18n-dat-tool/src/main/resource/hour-minute-secons-pattern.json differ diff --git a/tools/i18n-dat-tool/src/main/resource/standalone-abbr-weekday-names.json b/tools/i18n-dat-tool/src/main/resource/standalone-abbr-weekday-names.json index 16974705c3e62a5e0a0314b0e3df48c6f6049e50..e981e7a4a8dff707fbe8e7e7e68bb9dcc3c53f41 100644 --- a/tools/i18n-dat-tool/src/main/resource/standalone-abbr-weekday-names.json +++ b/tools/i18n-dat-tool/src/main/resource/standalone-abbr-weekday-names.json @@ -369,13 +369,13 @@ "შაბ" ], "kk": [ - "жс", - "дс", - "сс", - "ср", - "бс", - "жм", - "сб" + "Жс", + "Дс", + "Сс", + "Ср", + "Бс", + "Жм", + "Сб" ], "km": [ "អាទិត្យ", diff --git a/tools/i18n-dat-tool/src/main/resource/standalone-wide-weekday-names.json b/tools/i18n-dat-tool/src/main/resource/standalone-wide-weekday-names.json index 5c2fadd756f59d54ab825dd8831f6e88ad44743c..c18661694a723ba9e35bf9608d0db697a9f5e60c 100644 --- a/tools/i18n-dat-tool/src/main/resource/standalone-wide-weekday-names.json +++ b/tools/i18n-dat-tool/src/main/resource/standalone-wide-weekday-names.json @@ -360,13 +360,13 @@ "შაბათი" ], "kk": [ - "жексенбі", - "дүйсенбі", - "сейсенбі", - "сәрсенбі", - "бейсенбі", - "жұма", - "сенбі" + "Жексенбі", + "Дүйсенбі", + "Сейсенбі", + "Сәрсенбі", + "Бейсенбі", + "Жұма", + "Сенбі" ], "km": [ "ថ្ងៃអាទិត្យ", diff --git a/tools/i18n-dat-tool/src/main/resource/time-patterns.json b/tools/i18n-dat-tool/src/main/resource/time-patterns.json index 0ef919e27f8b691ca78c94c0990c6187efb608e3..b13275a0c1e2537d78af011d953f5951739d47a8 100644 Binary files a/tools/i18n-dat-tool/src/main/resource/time-patterns.json and b/tools/i18n-dat-tool/src/main/resource/time-patterns.json differ