From b437a86a59c30190948236d7e98c754b9fa262ad Mon Sep 17 00:00:00 2001 From: Googler Date: Wed, 6 Nov 2024 01:14:44 -0800 Subject: [PATCH] No public description PiperOrigin-RevId: 693629300 --- pkgs/intl/lib/date_symbol_data_local.dart | 14 +-- pkgs/intl/lib/date_time_patterns.dart | 14 +-- pkgs/intl/lib/number_symbols_data.dart | 19 ++- pkgs/intl/lib/src/data/dates/patterns/ta.json | 2 +- pkgs/intl/lib/src/data/dates/symbols/ta.json | 2 +- pkgs/intl/lib/src/data/dates/symbols/uk.json | 2 +- .../lib/src/data/dates/symbols/zh_TW.json | 2 +- pkgs/intl/test/compact_number_test_data.dart | 116 +++++++++--------- .../intl/test/number_format_compact_test.dart | 2 +- .../test/number_format_compact_web_test.dart | 9 +- pkgs/intl/test/number_test_data.dart | 2 +- 11 files changed, 90 insertions(+), 94 deletions(-) diff --git a/pkgs/intl/lib/date_symbol_data_local.dart b/pkgs/intl/lib/date_symbol_data_local.dart index 9450375b..a2f16189 100644 --- a/pkgs/intl/lib/date_symbol_data_local.dart +++ b/pkgs/intl/lib/date_symbol_data_local.dart @@ -8,7 +8,7 @@ // DO NOT EDIT. This file is autogenerated by script. See // 'http://go/generate_datetime_constants.py' using the --for_dart // flag. -// File generated from CLDR ver. 44.1 +// File generated from CLDR ver. 45 // // Before checkin, this file could have been manually edited. This is // to incorporate changes before we could correct CLDR. All manual @@ -16381,10 +16381,10 @@ Map dateTimeSymbolMap() => { 'd/M/yy' ], TIMEFORMATS: const [ - 'a h:mm:ss zzzz', - 'a h:mm:ss z', - 'a h:mm:ss', - 'a h:mm' + 'h:mm:ss a zzzz', + 'h:mm:ss a z', + 'h:mm:ss a', + 'h:mm a' ], DATETIMEFORMATS: const [ '{1}, {0}', @@ -17133,7 +17133,7 @@ Map dateTimeSymbolMap() => { ], AMPMS: const ['дп', 'пп'], DATEFORMATS: const [ - 'EEEE, d MMMM y \'р\'.', + 'cccc, d MMMM y \'р\'.', 'd MMMM y \'р\'.', 'd MMM y \'р\'.', 'dd.MM.yy' @@ -18101,7 +18101,7 @@ Map dateTimeSymbolMap() => { ], NARROWWEEKDAYS: const ['日', '一', '二', '三', '四', '五', '六'], STANDALONENARROWWEEKDAYS: const ['日', '一', '二', '三', '四', '五', '六'], - SHORTQUARTERS: const ['1季度', '2季度', '3季度', '4季度'], + SHORTQUARTERS: const ['第1季', '第2季', '第3季', '第4季'], QUARTERS: const ['第1季', '第2季', '第3季', '第4季'], AMPMS: const ['上午', '下午'], DATEFORMATS: const ['y年M月d日 EEEE', 'y年M月d日', 'y年M月d日', 'y/M/d'], diff --git a/pkgs/intl/lib/date_time_patterns.dart b/pkgs/intl/lib/date_time_patterns.dart index 61ff6b76..2abe6051 100644 --- a/pkgs/intl/lib/date_time_patterns.dart +++ b/pkgs/intl/lib/date_time_patterns.dart @@ -5,7 +5,7 @@ /// Date/time formatting symbols for a large subset of locales. // DO NOT EDIT. This file is autogenerated from ICU data. See // 'http://go/generate_datetime_pattern_dart.cc' (Google internal) -// File generated from CLDR ver. 44.1 +// File generated from CLDR ver. 45.0 library; // MANUAL EDIT TO SUPPRESS WARNINGS IN GENERATED CODE @@ -4755,12 +4755,12 @@ Map> dateTimePatternMap() => { 'H': 'HH', // HOUR24 'Hm': 'HH:mm', // HOUR24_MINUTE 'Hms': 'HH:mm:ss', // HOUR24_MINUTE_SECOND - 'j': 'a h', // HOUR - 'jm': 'a h:mm', // HOUR_MINUTE - 'jms': 'a h:mm:ss', // HOUR_MINUTE_SECOND - 'jmv': 'a h:mm v', // HOUR_MINUTE_GENERIC_TZ - 'jmz': 'a h:mm z', // HOUR_MINUTETZ - 'jz': 'a h z', // HOURGENERIC_TZ + 'j': 'h a', // HOUR + 'jm': 'h:mm a', // HOUR_MINUTE + 'jms': 'h:mm:ss a', // HOUR_MINUTE_SECOND + 'jmv': 'h:mm a v', // HOUR_MINUTE_GENERIC_TZ + 'jmz': 'h:mm a z', // HOUR_MINUTETZ + 'jz': 'h a z', // HOURGENERIC_TZ 'm': 'm', // MINUTE 'ms': 'mm:ss', // MINUTE_SECOND 's': 's', // SECOND diff --git a/pkgs/intl/lib/number_symbols_data.dart b/pkgs/intl/lib/number_symbols_data.dart index 2b8c4385..955614d7 100644 --- a/pkgs/intl/lib/number_symbols_data.dart +++ b/pkgs/intl/lib/number_symbols_data.dart @@ -7,7 +7,7 @@ /// Date/time formatting symbols for all locales. // DO NOT EDIT. This file is autogenerated by script. See // http://go/generate_number_constants.py using the --for_dart flag. -// File generated from CLDR ver. 44.1 +// File generated from CLDR ver. 45 // // Before checkin, this file could have been manually edited. This is // to incorporate changes before we could correct CLDR. All manual @@ -17,7 +17,6 @@ library; // MANUAL EDIT TO SUPPRESS WARNINGS IN GENERATED CODE // ignore_for_file: unnecessary_new, prefer_single_quotes, prefer_const_constructors - import "number_symbols.dart"; /// Map from locale to [NumberSymbols] used for that locale. @@ -2969,10 +2968,10 @@ Map compactNumberSymbols = { }), // Compact number symbols for locale en_IN. "en_IN": new CompactNumberSymbols(COMPACT_DECIMAL_SHORT_PATTERN: const { - 3: {'other': '0T'}, + 3: {'other': '0K'}, 5: {'other': '0L'}, 7: {'other': '0Cr'}, - 10: {'other': '0TCr'}, + 10: {'other': '0KCr'}, 12: {'other': '0LCr'}, }, COMPACT_DECIMAL_LONG_PATTERN: const { 3: {'other': '0 thousand'}, @@ -2980,10 +2979,10 @@ Map compactNumberSymbols = { 9: {'other': '0 billion'}, 12: {'other': '0 trillion'}, }, COMPACT_DECIMAL_SHORT_CURRENCY_PATTERN: const { - 3: {'other': '\u00A40T'}, + 3: {'other': '\u00A40K'}, 5: {'other': '\u00A40L'}, 7: {'other': '\u00A40Cr'}, - 10: {'other': '\u00A40TCr'}, + 10: {'other': '\u00A40KCr'}, 12: {'other': '\u00A40LCr'}, }), // Compact number symbols for locale en_MY. @@ -3744,7 +3743,7 @@ Map compactNumberSymbols = { 3: {'other': '0'}, 4: {'other': '0'}, 5: {'other': '0'}, - 6: {'other': '0\u00A0Mio'}, + 6: {'other': '0\u00A0Mln'}, 9: {'other': '0\u00A0Mrd'}, 12: {'other': '0\u00A0Bln'}, }, COMPACT_DECIMAL_LONG_PATTERN: const { @@ -3772,7 +3771,7 @@ Map compactNumberSymbols = { 3: {'other': '0'}, 4: {'other': '0'}, 5: {'other': '0'}, - 6: {'other': '0\u00A0Mio\u00A0\u00A4'}, + 6: {'other': '0\u00A0Mln\u00A0\u00A4'}, 9: {'other': '0\u00A0Mrd\u00A0\u00A4'}, 12: {'other': '0\u00A0Bln\u00A0\u00A4'}, }), @@ -3781,7 +3780,7 @@ Map compactNumberSymbols = { 3: {'other': '0'}, 4: {'other': '0'}, 5: {'other': '0'}, - 6: {'other': '0\u00A0Mio'}, + 6: {'other': '0\u00A0Mln'}, 9: {'other': '0\u00A0Mrd'}, 12: {'other': '0\u00A0Bln'}, }, COMPACT_DECIMAL_LONG_PATTERN: const { @@ -3809,7 +3808,7 @@ Map compactNumberSymbols = { 3: {'other': '0'}, 4: {'other': '0'}, 5: {'other': '0'}, - 6: {'other': '0\u00A0Mio\u00A0\u00A4'}, + 6: {'other': '0\u00A0Mln\u00A0\u00A4'}, 9: {'other': '0\u00A0Mrd\u00A0\u00A4'}, 12: {'other': '0\u00A0Bln\u00A0\u00A4'}, }), diff --git a/pkgs/intl/lib/src/data/dates/patterns/ta.json b/pkgs/intl/lib/src/data/dates/patterns/ta.json index 42e048df..c914fb66 100644 --- a/pkgs/intl/lib/src/data/dates/patterns/ta.json +++ b/pkgs/intl/lib/src/data/dates/patterns/ta.json @@ -1 +1 @@ -{"d":"d","E":"ccc","EEEE":"cccc","LLL":"LLL","LLLL":"LLLL","M":"L","Md":"d/M","MEd":"dd-MM, EEE","MMM":"LLL","MMMd":"MMM d","MMMEd":"MMM d, EEE","MMMM":"LLLL","MMMMd":"d MMMM","MMMMEEEEd":"MMMM d, EEEE","QQQ":"QQQ","QQQQ":"QQQQ","y":"y","yM":"M/y","yMd":"d/M/y","yMEd":"EEE, d/M/y","yMMM":"MMM y","yMMMd":"d MMM, y","yMMMEd":"EEE, d MMM, y","yMMMM":"MMMM y","yMMMMd":"d MMMM, y","yMMMMEEEEd":"EEEE, d MMMM, y","yQQQ":"QQQ y","yQQQQ":"QQQQ y","H":"HH","Hm":"HH:mm","Hms":"HH:mm:ss","j":"a h","jm":"a h:mm","jms":"a h:mm:ss","jmv":"a h:mm v","jmz":"a h:mm z","jz":"a h z","m":"m","ms":"mm:ss","s":"s","v":"v","z":"z","zzzz":"zzzz","ZZZZ":"ZZZZ"} \ No newline at end of file +{"d":"d","E":"ccc","EEEE":"cccc","LLL":"LLL","LLLL":"LLLL","M":"L","Md":"d/M","MEd":"dd-MM, EEE","MMM":"LLL","MMMd":"MMM d","MMMEd":"MMM d, EEE","MMMM":"LLLL","MMMMd":"d MMMM","MMMMEEEEd":"MMMM d, EEEE","QQQ":"QQQ","QQQQ":"QQQQ","y":"y","yM":"M/y","yMd":"d/M/y","yMEd":"EEE, d/M/y","yMMM":"MMM y","yMMMd":"d MMM, y","yMMMEd":"EEE, d MMM, y","yMMMM":"MMMM y","yMMMMd":"d MMMM, y","yMMMMEEEEd":"EEEE, d MMMM, y","yQQQ":"QQQ y","yQQQQ":"QQQQ y","H":"HH","Hm":"HH:mm","Hms":"HH:mm:ss","j":"h a","jm":"h:mm a","jms":"h:mm:ss a","jmv":"h:mm a v","jmz":"h:mm a z","jz":"h a z","m":"m","ms":"mm:ss","s":"s","v":"v","z":"z","zzzz":"zzzz","ZZZZ":"ZZZZ"} \ No newline at end of file diff --git a/pkgs/intl/lib/src/data/dates/symbols/ta.json b/pkgs/intl/lib/src/data/dates/symbols/ta.json index 59e63848..1393b755 100644 --- a/pkgs/intl/lib/src/data/dates/symbols/ta.json +++ b/pkgs/intl/lib/src/data/dates/symbols/ta.json @@ -1 +1 @@ -{"NAME":"ta","ERAS":["கி.மு.","கி.பி."],"ERANAMES":["கிறிஸ்துவுக்கு முன்","அன்னோ டோமினி"],"NARROWMONTHS":["ஜ","பி","மா","ஏ","மே","ஜூ","ஜூ","ஆ","செ","அ","ந","டி"],"STANDALONENARROWMONTHS":["ஜ","பி","மா","ஏ","மே","ஜூ","ஜூ","ஆ","செ","அ","ந","டி"],"MONTHS":["ஜனவரி","பிப்ரவரி","மார்ச்","ஏப்ரல்","மே","ஜூன்","ஜூலை","ஆகஸ்ட்","செப்டம்பர்","அக்டோபர்","நவம்பர்","டிசம்பர்"],"STANDALONEMONTHS":["ஜனவரி","பிப்ரவரி","மார்ச்","ஏப்ரல்","மே","ஜூன்","ஜூலை","ஆகஸ்ட்","செப்டம்பர்","அக்டோபர்","நவம்பர்","டிசம்பர்"],"SHORTMONTHS":["ஜன.","பிப்.","மார்.","ஏப்.","மே","ஜூன்","ஜூலை","ஆக.","செப்.","அக்.","நவ.","டிச."],"STANDALONESHORTMONTHS":["ஜன.","பிப்.","மார்.","ஏப்.","மே","ஜூன்","ஜூலை","ஆக.","செப்.","அக்.","நவ.","டிச."],"WEEKDAYS":["ஞாயிறு","திங்கள்","செவ்வாய்","புதன்","வியாழன்","வெள்ளி","சனி"],"STANDALONEWEEKDAYS":["ஞாயிறு","திங்கள்","செவ்வாய்","புதன்","வியாழன்","வெள்ளி","சனி"],"SHORTWEEKDAYS":["ஞாயி.","திங்.","செவ்.","புத.","வியா.","வெள்.","சனி"],"STANDALONESHORTWEEKDAYS":["ஞாயி.","திங்.","செவ்.","புத.","வியா.","வெள்.","சனி"],"NARROWWEEKDAYS":["ஞா","தி","செ","பு","வி","வெ","ச"],"STANDALONENARROWWEEKDAYS":["ஞா","தி","செ","பு","வி","வெ","ச"],"SHORTQUARTERS":["காலா.1","காலா.2","காலா.3","காலா.4"],"QUARTERS":["ஒன்றாம் காலாண்டு","இரண்டாம் காலாண்டு","மூன்றாம் காலாண்டு","நான்காம் காலாண்டு"],"AMPMS":["AM","PM"],"DATEFORMATS":["EEEE, d MMMM, y","d MMMM, y","d MMM, y","d/M/yy"],"TIMEFORMATS":["a h:mm:ss zzzz","a h:mm:ss z","a h:mm:ss","a h:mm"],"AVAILABLEFORMATS":null,"FIRSTDAYOFWEEK":6,"WEEKENDRANGE":[6,6],"FIRSTWEEKCUTOFFDAY":5,"DATETIMEFORMATS":["{1}, {0}","{1}, {0}","{1}, {0}","{1}, {0}"]} \ No newline at end of file +{"NAME":"ta","ERAS":["கி.மு.","கி.பி."],"ERANAMES":["கிறிஸ்துவுக்கு முன்","அன்னோ டோமினி"],"NARROWMONTHS":["ஜ","பி","மா","ஏ","மே","ஜூ","ஜூ","ஆ","செ","அ","ந","டி"],"STANDALONENARROWMONTHS":["ஜ","பி","மா","ஏ","மே","ஜூ","ஜூ","ஆ","செ","அ","ந","டி"],"MONTHS":["ஜனவரி","பிப்ரவரி","மார்ச்","ஏப்ரல்","மே","ஜூன்","ஜூலை","ஆகஸ்ட்","செப்டம்பர்","அக்டோபர்","நவம்பர்","டிசம்பர்"],"STANDALONEMONTHS":["ஜனவரி","பிப்ரவரி","மார்ச்","ஏப்ரல்","மே","ஜூன்","ஜூலை","ஆகஸ்ட்","செப்டம்பர்","அக்டோபர்","நவம்பர்","டிசம்பர்"],"SHORTMONTHS":["ஜன.","பிப்.","மார்.","ஏப்.","மே","ஜூன்","ஜூலை","ஆக.","செப்.","அக்.","நவ.","டிச."],"STANDALONESHORTMONTHS":["ஜன.","பிப்.","மார்.","ஏப்.","மே","ஜூன்","ஜூலை","ஆக.","செப்.","அக்.","நவ.","டிச."],"WEEKDAYS":["ஞாயிறு","திங்கள்","செவ்வாய்","புதன்","வியாழன்","வெள்ளி","சனி"],"STANDALONEWEEKDAYS":["ஞாயிறு","திங்கள்","செவ்வாய்","புதன்","வியாழன்","வெள்ளி","சனி"],"SHORTWEEKDAYS":["ஞாயி.","திங்.","செவ்.","புத.","வியா.","வெள்.","சனி"],"STANDALONESHORTWEEKDAYS":["ஞாயி.","திங்.","செவ்.","புத.","வியா.","வெள்.","சனி"],"NARROWWEEKDAYS":["ஞா","தி","செ","பு","வி","வெ","ச"],"STANDALONENARROWWEEKDAYS":["ஞா","தி","செ","பு","வி","வெ","ச"],"SHORTQUARTERS":["காலா.1","காலா.2","காலா.3","காலா.4"],"QUARTERS":["ஒன்றாம் காலாண்டு","இரண்டாம் காலாண்டு","மூன்றாம் காலாண்டு","நான்காம் காலாண்டு"],"AMPMS":["AM","PM"],"DATEFORMATS":["EEEE, d MMMM, y","d MMMM, y","d MMM, y","d/M/yy"],"TIMEFORMATS":["h:mm:ss a zzzz","h:mm:ss a z","h:mm:ss a","h:mm a"],"AVAILABLEFORMATS":null,"FIRSTDAYOFWEEK":6,"WEEKENDRANGE":[6,6],"FIRSTWEEKCUTOFFDAY":5,"DATETIMEFORMATS":["{1}, {0}","{1}, {0}","{1}, {0}","{1}, {0}"]} \ No newline at end of file diff --git a/pkgs/intl/lib/src/data/dates/symbols/uk.json b/pkgs/intl/lib/src/data/dates/symbols/uk.json index 846ec1ce..01134801 100644 --- a/pkgs/intl/lib/src/data/dates/symbols/uk.json +++ b/pkgs/intl/lib/src/data/dates/symbols/uk.json @@ -1 +1 @@ -{"NAME":"uk","ERAS":["до н. е.","н. е."],"ERANAMES":["до нашої ери","нашої ери"],"NARROWMONTHS":["с","л","б","к","т","ч","л","с","в","ж","л","г"],"STANDALONENARROWMONTHS":["С","Л","Б","К","Т","Ч","Л","С","В","Ж","Л","Г"],"MONTHS":["січня","лютого","березня","квітня","травня","червня","липня","серпня","вересня","жовтня","листопада","грудня"],"STANDALONEMONTHS":["січень","лютий","березень","квітень","травень","червень","липень","серпень","вересень","жовтень","листопад","грудень"],"SHORTMONTHS":["січ.","лют.","бер.","квіт.","трав.","черв.","лип.","серп.","вер.","жовт.","лист.","груд."],"STANDALONESHORTMONTHS":["січ.","лют.","бер.","квіт.","трав.","черв.","лип.","серп.","вер.","жовт.","лист.","груд."],"WEEKDAYS":["неділю","понеділок","вівторок","середу","четвер","пʼятницю","суботу"],"STANDALONEWEEKDAYS":["неділя","понеділок","вівторок","середа","четвер","пʼятниця","субота"],"SHORTWEEKDAYS":["нд","пн","вт","ср","чт","пт","сб"],"STANDALONESHORTWEEKDAYS":["нд","пн","вт","ср","чт","пт","сб"],"NARROWWEEKDAYS":["Н","П","В","С","Ч","П","С"],"STANDALONENARROWWEEKDAYS":["Н","П","В","С","Ч","П","С"],"SHORTQUARTERS":["1-й кв.","2-й кв.","3-й кв.","4-й кв."],"QUARTERS":["1-й квартал","2-й квартал","3-й квартал","4-й квартал"],"AMPMS":["дп","пп"],"DATEFORMATS":["EEEE, d MMMM y 'р'.","d MMMM y 'р'.","d MMM y 'р'.","dd.MM.yy"],"TIMEFORMATS":["HH:mm:ss zzzz","HH:mm:ss z","HH:mm:ss","HH:mm"],"AVAILABLEFORMATS":null,"FIRSTDAYOFWEEK":0,"WEEKENDRANGE":[5,6],"FIRSTWEEKCUTOFFDAY":6,"DATETIMEFORMATS":["{1}, {0}","{1}, {0}","{1}, {0}","{1}, {0}"]} \ No newline at end of file +{"NAME":"uk","ERAS":["до н. е.","н. е."],"ERANAMES":["до нашої ери","нашої ери"],"NARROWMONTHS":["с","л","б","к","т","ч","л","с","в","ж","л","г"],"STANDALONENARROWMONTHS":["С","Л","Б","К","Т","Ч","Л","С","В","Ж","Л","Г"],"MONTHS":["січня","лютого","березня","квітня","травня","червня","липня","серпня","вересня","жовтня","листопада","грудня"],"STANDALONEMONTHS":["січень","лютий","березень","квітень","травень","червень","липень","серпень","вересень","жовтень","листопад","грудень"],"SHORTMONTHS":["січ.","лют.","бер.","квіт.","трав.","черв.","лип.","серп.","вер.","жовт.","лист.","груд."],"STANDALONESHORTMONTHS":["січ.","лют.","бер.","квіт.","трав.","черв.","лип.","серп.","вер.","жовт.","лист.","груд."],"WEEKDAYS":["неділю","понеділок","вівторок","середу","четвер","пʼятницю","суботу"],"STANDALONEWEEKDAYS":["неділя","понеділок","вівторок","середа","четвер","пʼятниця","субота"],"SHORTWEEKDAYS":["нд","пн","вт","ср","чт","пт","сб"],"STANDALONESHORTWEEKDAYS":["нд","пн","вт","ср","чт","пт","сб"],"NARROWWEEKDAYS":["Н","П","В","С","Ч","П","С"],"STANDALONENARROWWEEKDAYS":["Н","П","В","С","Ч","П","С"],"SHORTQUARTERS":["1-й кв.","2-й кв.","3-й кв.","4-й кв."],"QUARTERS":["1-й квартал","2-й квартал","3-й квартал","4-й квартал"],"AMPMS":["дп","пп"],"DATEFORMATS":["cccc, d MMMM y 'р'.","d MMMM y 'р'.","d MMM y 'р'.","dd.MM.yy"],"TIMEFORMATS":["HH:mm:ss zzzz","HH:mm:ss z","HH:mm:ss","HH:mm"],"AVAILABLEFORMATS":null,"FIRSTDAYOFWEEK":0,"WEEKENDRANGE":[5,6],"FIRSTWEEKCUTOFFDAY":6,"DATETIMEFORMATS":["{1}, {0}","{1}, {0}","{1}, {0}","{1}, {0}"]} \ No newline at end of file diff --git a/pkgs/intl/lib/src/data/dates/symbols/zh_TW.json b/pkgs/intl/lib/src/data/dates/symbols/zh_TW.json index 79cdc965..22cfda9d 100644 --- a/pkgs/intl/lib/src/data/dates/symbols/zh_TW.json +++ b/pkgs/intl/lib/src/data/dates/symbols/zh_TW.json @@ -1 +1 @@ -{"NAME":"zh_TW","ERAS":["西元前","西元"],"ERANAMES":["西元前","西元"],"NARROWMONTHS":["1","2","3","4","5","6","7","8","9","10","11","12"],"STANDALONENARROWMONTHS":["1","2","3","4","5","6","7","8","9","10","11","12"],"MONTHS":["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"],"STANDALONEMONTHS":["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"],"SHORTMONTHS":["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"],"STANDALONESHORTMONTHS":["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"],"WEEKDAYS":["星期日","星期一","星期二","星期三","星期四","星期五","星期六"],"STANDALONEWEEKDAYS":["星期日","星期一","星期二","星期三","星期四","星期五","星期六"],"SHORTWEEKDAYS":["週日","週一","週二","週三","週四","週五","週六"],"STANDALONESHORTWEEKDAYS":["週日","週一","週二","週三","週四","週五","週六"],"NARROWWEEKDAYS":["日","一","二","三","四","五","六"],"STANDALONENARROWWEEKDAYS":["日","一","二","三","四","五","六"],"SHORTQUARTERS":["1季度","2季度","3季度","4季度"],"QUARTERS":["第1季","第2季","第3季","第4季"],"AMPMS":["上午","下午"],"DATEFORMATS":["y年M月d日 EEEE","y年M月d日","y年M月d日","y/M/d"],"TIMEFORMATS":["Bh:mm:ss [zzzz]","Bh:mm:ss [z]","Bh:mm:ss","Bh:mm"],"AVAILABLEFORMATS":null,"FIRSTDAYOFWEEK":6,"WEEKENDRANGE":[5,6],"FIRSTWEEKCUTOFFDAY":5,"DATETIMEFORMATS":["{1} {0}","{1} {0}","{1} {0}","{1} {0}"]} \ No newline at end of file +{"NAME":"zh_TW","ERAS":["西元前","西元"],"ERANAMES":["西元前","西元"],"NARROWMONTHS":["1","2","3","4","5","6","7","8","9","10","11","12"],"STANDALONENARROWMONTHS":["1","2","3","4","5","6","7","8","9","10","11","12"],"MONTHS":["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"],"STANDALONEMONTHS":["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"],"SHORTMONTHS":["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"],"STANDALONESHORTMONTHS":["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"],"WEEKDAYS":["星期日","星期一","星期二","星期三","星期四","星期五","星期六"],"STANDALONEWEEKDAYS":["星期日","星期一","星期二","星期三","星期四","星期五","星期六"],"SHORTWEEKDAYS":["週日","週一","週二","週三","週四","週五","週六"],"STANDALONESHORTWEEKDAYS":["週日","週一","週二","週三","週四","週五","週六"],"NARROWWEEKDAYS":["日","一","二","三","四","五","六"],"STANDALONENARROWWEEKDAYS":["日","一","二","三","四","五","六"],"SHORTQUARTERS":["第1季","第2季","第3季","第4季"],"QUARTERS":["第1季","第2季","第3季","第4季"],"AMPMS":["上午","下午"],"DATEFORMATS":["y年M月d日 EEEE","y年M月d日","y年M月d日","y/M/d"],"TIMEFORMATS":["Bh:mm:ss [zzzz]","Bh:mm:ss [z]","Bh:mm:ss","Bh:mm"],"AVAILABLEFORMATS":null,"FIRSTDAYOFWEEK":6,"WEEKENDRANGE":[5,6],"FIRSTWEEKCUTOFFDAY":5,"DATETIMEFORMATS":["{1} {0}","{1} {0}","{1} {0}","{1} {0}"]} \ No newline at end of file diff --git a/pkgs/intl/test/compact_number_test_data.dart b/pkgs/intl/test/compact_number_test_data.dart index 3e6e4505..f9b5a579 100644 --- a/pkgs/intl/test/compact_number_test_data.dart +++ b/pkgs/intl/test/compact_number_test_data.dart @@ -7,7 +7,7 @@ /// Test data for compact number formatting. // DO NOT EDIT. This file is autogenerated by script. See // i18n/tools:dart_compact_number_test_data -// File generated from CLDR ver. 44.1 +// File generated from CLDR ver. 45 // // WARNING: These tests are NOT consistent with ICU. Compact number formatting // has changed, needing some more involved Dart code changes to determine @@ -2563,27 +2563,27 @@ Map>> compactNumberTestData = { ["1", "1", "1"], ["21", "21", "21"], ["321", "321", "321"], - ["4321", "4.3T", "4.3 thousand"], - ["54321", "54T", "54 thousand"], + ["4321", "4.3K", "4.3 thousand"], + ["54321", "54K", "54 thousand"], ["654321", "6.5L", "654 thousand"], ["7654321", "77L", "7.7 million"], ["87654321", "8.8Cr", "88 million"], ["987654321", "99Cr", "988 million"], ["1087654321", "109Cr", "1.1 billion"], - ["11987654321", "1.2TCr", "12 billion"], - ["129987654321", "13TCr", "130 billion"], + ["11987654321", "1.2KCr", "12 billion"], + ["129987654321", "13KCr", "130 billion"], ["1398987654321", "1.4LCr", "1.4 trillion"], ["14987987654321", "15LCr", "15 trillion"], ["159876987654321", "160LCr", "160 trillion"], ["9", "9", "9"], ["99", "99", "99"], ["999", "999", "999"], - ["9999", "10T", "10 thousand"], + ["9999", "10K", "10 thousand"], ["99999", "1L", "100 thousand"], ["999999", "10L", "1 million"], ["9999999", "1Cr", "10 million"], ["99999999", "10Cr", "100 million"], - ["9994", "10T", "10 thousand"], + ["9994", "10K", "10 thousand"], ["99944", "1L", "100 thousand"], ["999444", "10L", "999 thousand"], ["9994444", "1Cr", "10 million"], @@ -2595,42 +2595,42 @@ Map>> compactNumberTestData = { ["-1", "-1", "-1"], ["-2", "-2", "-2"], ["-3", "-3", "-3"], - ["-1000", "-1T", "-1 thousand"], - ["-1001", "-1T", "-1 thousand"], - ["-1010", "-1T", "-1 thousand"], - ["-1100", "-1.1T", "-1.1 thousand"], - ["-2000", "-2T", "-2 thousand"], - ["-2001", "-2T", "-2 thousand"], - ["-2010", "-2T", "-2 thousand"], - ["-2100", "-2.1T", "-2.1 thousand"], + ["-1000", "-1K", "-1 thousand"], + ["-1001", "-1K", "-1 thousand"], + ["-1010", "-1K", "-1 thousand"], + ["-1100", "-1.1K", "-1.1 thousand"], + ["-2000", "-2K", "-2 thousand"], + ["-2001", "-2K", "-2 thousand"], + ["-2010", "-2K", "-2 thousand"], + ["-2100", "-2.1K", "-2.1 thousand"], ["-9", "-9", "-9"], ["-99", "-99", "-99"], ["-999", "-999", "-999"], - ["-9999", "-10T", "-10 thousand"], + ["-9999", "-10K", "-10 thousand"], ["-99999", "-1L", "-100 thousand"], ["-999999", "-10L", "-1 million"], ["-9999999", "-1Cr", "-10 million"], ["-9999999999999999", "-10000LCr", "-10000 trillion"], - ["1000", "1T", "1 thousand"], - ["1001", "1T", "1 thousand"], - ["1010", "1T", "1 thousand"], - ["1100", "1.1T", "1.1 thousand"], - ["2000", "2T", "2 thousand"], - ["2001", "2T", "2 thousand"], - ["2010", "2T", "2 thousand"], - ["2100", "2.1T", "2.1 thousand"], - ["3000", "3T", "3 thousand"], - ["3001", "3T", "3 thousand"], - ["3010", "3T", "3 thousand"], - ["3100", "3.1T", "3.1 thousand"], - ["4000", "4T", "4 thousand"], - ["4001", "4T", "4 thousand"], - ["4010", "4T", "4 thousand"], - ["4100", "4.1T", "4.1 thousand"], - ["5000", "5T", "5 thousand"], - ["5001", "5T", "5 thousand"], - ["5010", "5T", "5 thousand"], - ["5100", "5.1T", "5.1 thousand"], + ["1000", "1K", "1 thousand"], + ["1001", "1K", "1 thousand"], + ["1010", "1K", "1 thousand"], + ["1100", "1.1K", "1.1 thousand"], + ["2000", "2K", "2 thousand"], + ["2001", "2K", "2 thousand"], + ["2010", "2K", "2 thousand"], + ["2100", "2.1K", "2.1 thousand"], + ["3000", "3K", "3 thousand"], + ["3001", "3K", "3 thousand"], + ["3010", "3K", "3 thousand"], + ["3100", "3.1K", "3.1 thousand"], + ["4000", "4K", "4 thousand"], + ["4001", "4K", "4 thousand"], + ["4010", "4K", "4 thousand"], + ["4100", "4.1K", "4.1 thousand"], + ["5000", "5K", "5 thousand"], + ["5001", "5K", "5 thousand"], + ["5010", "5K", "5 thousand"], + ["5100", "5.1K", "5.1 thousand"], ["0.001234", "0.0012", "0.0012"], ["0.01234", "0.012", "0.012"], ["0.1234", "0.12", "0.12"], @@ -2641,17 +2641,17 @@ Map>> compactNumberTestData = { ["99.12", "99", "99"], ["99.99", "100", "100"], ["999.12", "999", "999"], - ["999.99", "1T", "1 thousand"], - ["9999.12", "10T", "10 thousand"], - ["9999.99", "10T", "10 thousand"], + ["999.99", "1K", "1 thousand"], + ["9999.12", "10K", "10 thousand"], + ["9999.99", "10K", "10 thousand"], ["-0.12", "-0.12", "-0.12"], ["-0.99", "-0.99", "-0.99"], ["-9.12", "-9.1", "-9.1"], ["-9.99", "-10", "-10"], ["-999.12", "-999", "-999"], - ["-999.99", "-1T", "-1 thousand"], - ["-9999.12", "-10T", "-10 thousand"], - ["-9999.99", "-10T", "-10 thousand"], + ["-999.99", "-1K", "-1 thousand"], + ["-9999.12", "-10K", "-10 thousand"], + ["-9999.99", "-10K", "-10 thousand"], ], "en_MY": [ ["1", "1", "1"], @@ -5668,9 +5668,9 @@ Map>> compactNumberTestData = { ["4321", "4321", "4,3 mila"], ["54321", "54321", "54 mila"], ["654321", "654321", "654 mila"], - ["7654321", "7,7 Mio", "7,7 milioni"], - ["87654321", "88 Mio", "88 milioni"], - ["987654321", "988 Mio", "988 milioni"], + ["7654321", "7,7 Mln", "7,7 milioni"], + ["87654321", "88 Mln", "88 milioni"], + ["987654321", "988 Mln", "988 milioni"], ["1087654321", "1,1 Mrd", "1,1 miliardi"], ["11987654321", "12 Mrd", "12 miliardi"], ["129987654321", "130 Mrd", "130 miliardi"], @@ -5683,13 +5683,13 @@ Map>> compactNumberTestData = { ["9999", "9999", "10 mila"], ["99999", "99999", "100 mila"], ["999999", "999999", "1 milione"], - ["9999999", "10 Mio", "10 milioni"], - ["99999999", "100 Mio", "100 milioni"], + ["9999999", "10 Mln", "10 milioni"], + ["99999999", "100 Mln", "100 milioni"], ["9994", "9994", "10 mila"], ["99944", "99944", "100 mila"], ["999444", "999444", "999 mila"], - ["9994444", "10 Mio", "10 milioni"], - ["999444444", "999 Mio", "999 milioni"], + ["9994444", "10 Mln", "10 milioni"], + ["999444444", "999 Mln", "999 milioni"], ["9994444444", "10 Mrd", "10 miliardi"], ["1000000000000000", "1000 Bln", "1000 mila miliardi"], ["10000000000000000", "10000 Bln", "10000 mila miliardi"], @@ -5711,7 +5711,7 @@ Map>> compactNumberTestData = { ["-9999", "-9999", "-10 mila"], ["-99999", "-99999", "-100 mila"], ["-999999", "-999999", "-1 milione"], - ["-9999999", "-10 Mio", "-10 milioni"], + ["-9999999", "-10 Mln", "-10 milioni"], ["-9999999999999999", "-10000 Bln", "-10000 mila miliardi"], ["1000", "1000", "mille"], ["1001", "1001", "mille"], @@ -5762,9 +5762,9 @@ Map>> compactNumberTestData = { ["4321", "4321", "4.3 mila"], ["54321", "54321", "54 mila"], ["654321", "654321", "654 mila"], - ["7654321", "7.7 Mio", "7.7 milioni"], - ["87654321", "88 Mio", "88 milioni"], - ["987654321", "988 Mio", "988 milioni"], + ["7654321", "7.7 Mln", "7.7 milioni"], + ["87654321", "88 Mln", "88 milioni"], + ["987654321", "988 Mln", "988 milioni"], ["1087654321", "1.1 Mrd", "1.1 miliardi"], ["11987654321", "12 Mrd", "12 miliardi"], ["129987654321", "130 Mrd", "130 miliardi"], @@ -5777,13 +5777,13 @@ Map>> compactNumberTestData = { ["9999", "9999", "10 mila"], ["99999", "99999", "100 mila"], ["999999", "999999", "1 milione"], - ["9999999", "10 Mio", "10 milioni"], - ["99999999", "100 Mio", "100 milioni"], + ["9999999", "10 Mln", "10 milioni"], + ["99999999", "100 Mln", "100 milioni"], ["9994", "9994", "10 mila"], ["99944", "99944", "100 mila"], ["999444", "999444", "999 mila"], - ["9994444", "10 Mio", "10 milioni"], - ["999444444", "999 Mio", "999 milioni"], + ["9994444", "10 Mln", "10 milioni"], + ["999444444", "999 Mln", "999 milioni"], ["9994444444", "10 Mrd", "10 miliardi"], ["1000000000000000", "1000 Bln", "1000 mila miliardi"], ["10000000000000000", "10000 Bln", "10000 mila miliardi"], @@ -5805,7 +5805,7 @@ Map>> compactNumberTestData = { ["-9999", "-9999", "-10 mila"], ["-99999", "-99999", "-100 mila"], ["-999999", "-999999", "-1 milione"], - ["-9999999", "-10 Mio", "-10 milioni"], + ["-9999999", "-10 Mln", "-10 milioni"], ["-9999999999999999", "-10000 Bln", "-10000 mila miliardi"], ["1000", "1000", "mille"], ["1001", "1001", "mille"], diff --git a/pkgs/intl/test/number_format_compact_test.dart b/pkgs/intl/test/number_format_compact_test.dart index 2a7352c3..dc0d3311 100644 --- a/pkgs/intl/test/number_format_compact_test.dart +++ b/pkgs/intl/test/number_format_compact_test.dart @@ -211,7 +211,7 @@ void main() { // Locales which don't have a suffix for thousands. testCurrency('it', 442, '442\u00A0€', '442\u00A0€'); testCurrency('it', 4420, '4420\u00A0\$', '4420\u00A0\$', currency: 'CAD'); - testCurrency('it', 4420000, '4,42\u00A0Mio\u00A0\$', '4\u00A0Mio\u00A0\$', + testCurrency('it', 4420000, '4,42\u00A0Mln\u00A0\$', '4\u00A0Mln\u00A0\$', currency: 'USD'); testCurrency('he', 335, '\u200F335\u00A0\u200F₪', '\u200F335\u00A0\u200F₪'); diff --git a/pkgs/intl/test/number_format_compact_web_test.dart b/pkgs/intl/test/number_format_compact_web_test.dart index d8996038..7e4c60e9 100644 --- a/pkgs/intl/test/number_format_compact_web_test.dart +++ b/pkgs/intl/test/number_format_compact_web_test.dart @@ -13,6 +13,7 @@ library; import 'dart:js_interop'; import 'dart:js_interop_unsafe'; + import 'package:intl/intl.dart' as intl; import 'package:test/test.dart'; @@ -99,15 +100,11 @@ var _unsupportedChromeLocales = [ var _skipLocalesShort = [ 'it', // Expected: '7,7 Mio', actual: '7,7 Mln' 'it-CH', // Expected: '7.7 Mio', actual: '7.7 Mln' - 'en-ZA', // Expected: '4.3K', actual: '4,3K'. + 'en-IN', // Expected: '4.3K', actual: '4,3T'. ..._unsupportedChromeLocales ]; -var _skipLocalesLong = [ - 'en-ZA', // Expected: '4.3 thousand', actual: '4,3 thousand'. - 'zh-HK', // Expected: '4.3K', actual: '4321'. - ..._unsupportedChromeLocales -]; +var _skipLocalesLong = [..._unsupportedChromeLocales]; String _fixLocale(String locale) { return locale.replaceAll('_', '-'); diff --git a/pkgs/intl/test/number_test_data.dart b/pkgs/intl/test/number_test_data.dart index 5ef1f823..1005c704 100644 --- a/pkgs/intl/test/number_test_data.dart +++ b/pkgs/intl/test/number_test_data.dart @@ -4,7 +4,7 @@ /// Test data for numeric formatting from a large set of locales. // DO NOT EDIT. This file is autogenerated from ICU data. -// File generated from CLDR ver. 44.1 +// File generated from CLDR ver. 45.0 // MANUAL EDIT TO SUPPRESS WARNINGS IN GENERATED CODE // ignore_for_file: prefer_single_quotes library;