Skip to content

Commit

Permalink
feat(@formatjs/intl-datetimeformat): update CLDR to v43
Browse files Browse the repository at this point in the history
  • Loading branch information
Long Ho committed Oct 16, 2023
1 parent cb8d062 commit 55863a8
Show file tree
Hide file tree
Showing 13 changed files with 3,776 additions and 3,520 deletions.
2,777 changes: 1,390 additions & 1,387 deletions packages/intl-datetimeformat/test262-main.ts
View file

Large diffs are not rendered by default.

38 changes: 19 additions & 19 deletions packages/intl-datetimeformat/tests/format-range.test.ts
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import '@formatjs/intl-getcanonicallocales/polyfill'
import '@formatjs/intl-locale/polyfill'
import {DateTimeFormat} from '../src/core'
import * as en from './locale-data/en.json'
import allData from '../src/data/all-tz'
import * as enGB from './locale-data/en-GB.json'
import * as zhHans from './locale-data/zh-Hans.json'
import * as en from './locale-data/en.json'
import * as fa from './locale-data/fa.json'
import allData from '../src/data/all-tz'
import * as zhHans from './locale-data/zh-Hans.json'

// @ts-ignore
DateTimeFormat.__addLocaleData(en, enGB, zhHans, fa)
Expand All @@ -18,7 +18,7 @@ describe('DateTimeFormat range format', function () {
month: 'short',
day: 'numeric',
})
expect(dtf.formatRange(d1, d2)).toBe('Feb 1 – 15')
expect(dtf.formatRange(d1, d2)).toBe('Feb 1 – 15')
})
it('basic parts', function () {
const d1 = new Date(2020, 1, 1)
Expand Down Expand Up @@ -48,7 +48,7 @@ describe('DateTimeFormat range format', function () {
{
source: 'startRange',
type: 'literal',
value: ' – ',
value: ' – ',
},
{
source: 'endRange',
Expand Down Expand Up @@ -108,12 +108,12 @@ test('v8 test/intl/date-format/format-range', function () {
const date4 = new Date('2020-3-4')
var dtf = new DateTimeFormat(['en'])

expect(dtf.formatRange(date1, date2)).toBe('1/3/2019 – 1/5/2019')
expect(dtf.formatRange(date1, date3)).toBe('1/3/2019 – 3/4/2019')
expect(dtf.formatRange(date1, date4)).toBe('1/3/2019 – 3/4/2020')
expect(dtf.formatRange(date2, date3)).toBe('1/5/2019 – 3/4/2019')
expect(dtf.formatRange(date2, date4)).toBe('1/5/2019 – 3/4/2020')
expect(dtf.formatRange(date3, date4)).toBe('3/4/2019 – 3/4/2020')
expect(dtf.formatRange(date1, date2)).toBe('1/3/2019 – 1/5/2019')
expect(dtf.formatRange(date1, date3)).toBe('1/3/2019 – 3/4/2019')
expect(dtf.formatRange(date1, date4)).toBe('1/3/2019 – 3/4/2020')
expect(dtf.formatRange(date2, date3)).toBe('1/5/2019 – 3/4/2019')
expect(dtf.formatRange(date2, date4)).toBe('1/5/2019 – 3/4/2020')
expect(dtf.formatRange(date3, date4)).toBe('3/4/2019 – 3/4/2020')
})

test('v8 test/intl/date-format/format-range 2', function () {
Expand All @@ -126,12 +126,12 @@ test('v8 test/intl/date-format/format-range 2', function () {
month: 'short',
day: 'numeric',
})
expect(dtf.formatRange(date1, date2)).toBe('Jan 3 – 5, 2019')
expect(dtf.formatRange(date1, date3)).toBe('Jan 3 – Mar 4, 2019')
expect(dtf.formatRange(date1, date4)).toBe('Jan 3, 2019 – Mar 4, 2020')
expect(dtf.formatRange(date2, date3)).toBe('Jan 5 – Mar 4, 2019')
expect(dtf.formatRange(date2, date4)).toBe('Jan 5, 2019 – Mar 4, 2020')
expect(dtf.formatRange(date3, date4)).toBe('Mar 4, 2019 – Mar 4, 2020')
expect(dtf.formatRange(date1, date2)).toBe('Jan 3 – 5, 2019')
expect(dtf.formatRange(date1, date3)).toBe('Jan 3 – Mar 4, 2019')
expect(dtf.formatRange(date1, date4)).toBe('Jan 3, 2019 – Mar 4, 2020')
expect(dtf.formatRange(date2, date3)).toBe('Jan 5 – Mar 4, 2019')
expect(dtf.formatRange(date2, date4)).toBe('Jan 5, 2019 – Mar 4, 2020')
expect(dtf.formatRange(date3, date4)).toBe('Mar 4, 2019 – Mar 4, 2020')
})

test('v8 test/intl/date-format/format-range TimeClip', function () {
Expand Down Expand Up @@ -386,7 +386,7 @@ test('default formatRange pattern (short), #2474', function () {
let date1 = new Date(Date.UTC(2021, 0, 10)) // "Jan 10, 2021"
let date2 = new Date(Date.UTC(2021, 0, 20)) // "Jan 20, 2021"
expect(dtf.formatRange(date1, date2)).toBe(
'Jan 10, 2021, 12:00 AM – Jan 20, 2021, 12:00 AM'
'Jan 10, 2021, 12:00 AM – Jan 20, 2021, 12:00 AM'
)
})

Expand All @@ -399,5 +399,5 @@ test.skip('default formatRange pattern (long), #2474', function () {
})
let date1 = new Date(Date.UTC(2021, 0, 10)) // "Jan 10, 2021"
let date2 = new Date(Date.UTC(2021, 0, 20)) // "Jan 20, 2021"
expect(dtf.formatRange(date1, date2)).toBe('January 10 – 20, 2021')
expect(dtf.formatRange(date1, date2)).toBe('January 10 – 20, 2021')
})
46 changes: 23 additions & 23 deletions packages/intl-datetimeformat/tests/format.test.ts
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import * as ko from './locale-data/ko.json'
import * as en from './locale-data/en.json'
import {DateTimeFormat} from '../src/core'
import allData from '../src/data/all-tz'
import {
toLocaleString,
toLocaleDateString,
toLocaleString,
toLocaleTimeString,
} from '../src/to_locale_string'
import {DateTimeFormat} from '../src/core'
import * as en from './locale-data/en.json'
import * as ko from './locale-data/ko.json'

// @ts-ignore
DateTimeFormat.__addLocaleData(en, ko)
Expand All @@ -32,7 +32,7 @@ const tests: Array<{
timeZoneName: 'long',
},
ko: '서기 2020년 6 16일 화요일 AM 4시 48분 20초 협정 세계시',
en: 'Tuesday, 6 16, 2020 Anno Domini, 4:48:20 AM Coordinated Universal Time',
en: 'Tuesday, 6 16, 2020 Anno Domini, 4:48:20 AM Coordinated Universal Time',
},
{
options: {
Expand All @@ -49,7 +49,7 @@ const tests: Array<{
timeZoneName: 'short',
},
ko: '서기 2020년 6 16일 화요일 AM 12시 48분 20초 GMT-4',
en: 'Tuesday, 6 16, 2020 Anno Domini, 12:48:20 AM EDT',
en: 'Tuesday, 6 16, 2020 Anno Domini, 12:48:20 AM EDT',
},
{
options: {
Expand All @@ -66,7 +66,7 @@ const tests: Array<{
timeZoneName: 'short',
},
ko: '서기 2020년 6 16일 화요일 AM 12시 48분 20초 GMT-4',
en: 'Tuesday, 6 16, 2020 Anno Domini, 12:48:20 AM EDT',
en: 'Tuesday, 6 16, 2020 Anno Domini, 12:48:20 AM EDT',
},
{
options: {
Expand All @@ -82,7 +82,7 @@ const tests: Array<{
timeZoneName: 'short',
},
ko: '서기 2020년 6 16일 화요일 AM 12시 48분 20초 GMT-4',
en: 'Tuesday, 6 16, 2020 Anno Domini, 12:48:20 AM EDT',
en: 'Tuesday, 6 16, 2020 Anno Domini, 12:48:20 AM EDT',
},
{
options: {
Expand All @@ -98,7 +98,7 @@ const tests: Array<{
timeZoneName: 'short',
},
ko: '서기 2020년 6 15일 월요일 PM 09시 48분 20초 GMT-7',
en: 'Monday, 6 15, 2020 Anno Domini, 09:48:20 PM PDT',
en: 'Monday, 6 15, 2020 Anno Domini, 09:48:20 PM PDT',
},
{
options: {
Expand All @@ -114,7 +114,7 @@ const tests: Array<{
timeZoneName: 'short',
},
ko: '서기 20년 6월 15일 월요일 PM 09시 48분 20초 GMT-7',
en: 'Monday, June 15, 20 Anno Domini, 09:48:20 PM PDT',
en: 'Monday, June 15, 20 Anno Domini, 09:48:20 PM PDT',
},
{
options: {
Expand All @@ -130,7 +130,7 @@ const tests: Array<{
timeZoneName: 'short',
},
ko: '서기 20년 6월 15일 월요일 PM 09시 48분 20초 GMT-7',
en: 'Monday, Jun 15, 20 Anno Domini, 09:48:20 PM PDT',
en: 'Monday, Jun 15, 20 Anno Domini, 09:48:20 PM PDT',
},
{
options: {
Expand All @@ -146,7 +146,7 @@ const tests: Array<{
timeZoneName: 'short',
},
ko: '서기 20년 6월 15일 월요일 PM 09시 48분 20초 GMT-7',
en: 'Monday, J 15, 20 Anno Domini, 09:48:20 PM PDT',
en: 'Monday, J 15, 20 Anno Domini, 09:48:20 PM PDT',
},
{
options: {
Expand All @@ -162,7 +162,7 @@ const tests: Array<{
timeZoneName: 'short',
},
ko: 'AD 20년 6월 15일 월요일 PM 09시 48분 20초 GMT-7',
en: 'Monday, J 15, 20 AD, 09:48:20 PM PDT',
en: 'Monday, J 15, 20 AD, 09:48:20 PM PDT',
},
{
options: {
Expand All @@ -178,7 +178,7 @@ const tests: Array<{
timeZoneName: 'short',
},
ko: 'AD 20년 6월 15일 (월) PM 09시 48분 20초 GMT-7',
en: 'M, J 15, 20 AD, 09:48:20 PM PDT',
en: 'M, J 15, 20 AD, 09:48:20 PM PDT',
},
{
options: {
Expand All @@ -194,7 +194,7 @@ const tests: Array<{
timeZoneName: 'short',
},
ko: 'AD 20년 6월 15일 (월) PM 09시 48분 20초 GMT-7',
en: 'Mon, J 15, 20 AD, 09:48:20 PM PDT',
en: 'Mon, J 15, 20 AD, 09:48:20 PM PDT',
},
{
options: {dateStyle: 'full', timeZone: 'America/Los_Angeles'},
Expand All @@ -219,22 +219,22 @@ const tests: Array<{
{
options: {timeStyle: 'full', timeZone: 'America/Los_Angeles'},
ko: 'PM 9시 48분 20초 미 태평양 하계 표준시',
en: '9:48:20 PM Pacific Daylight Time',
en: '9:48:20 PM Pacific Daylight Time',
},
{
options: {timeStyle: 'long', timeZone: 'America/Los_Angeles'},
ko: 'PM 9시 48분 20초 GMT-7',
en: '9:48:20 PM PDT',
en: '9:48:20 PM PDT',
},
{
options: {timeStyle: 'medium', timeZone: 'America/Los_Angeles'},
ko: 'PM 9:48:20',
en: '9:48:20 PM',
en: '9:48:20 PM',
},
{
options: {timeStyle: 'short', timeZone: 'America/Los_Angeles'},
ko: 'PM 9:48',
en: '9:48 PM',
en: '9:48 PM',
},
{
options: {
Expand All @@ -243,7 +243,7 @@ const tests: Array<{
timeZone: 'America/Los_Angeles',
},
ko: '2020년 6월 15일 PM 9시 48분 20초 미 태평양 하계 표준시',
en: 'June 15, 2020 at 9:48:20 PM Pacific Daylight Time',
en: 'June 15, 2020, 9:48:20 PM Pacific Daylight Time',
},
{
options: {
Expand All @@ -252,7 +252,7 @@ const tests: Array<{
timeZone: 'America/Los_Angeles',
},
ko: '2020. 6. 15. PM 9시 48분 20초 GMT-7',
en: 'Jun 15, 2020, 9:48:20 PM PDT',
en: 'Jun 15, 2020, 9:48:20 PM PDT',
},
{
options: {
Expand All @@ -261,7 +261,7 @@ const tests: Array<{
timeZone: 'America/Los_Angeles',
},
ko: '20. 6. 15. PM 9:48:20',
en: '6/15/20, 9:48:20 PM',
en: '6/15/20, 9:48:20 PM',
},
{
options: {
Expand All @@ -270,7 +270,7 @@ const tests: Array<{
timeZone: 'America/Los_Angeles',
},
ko: '2020년 6월 15일 월요일 PM 9:48',
en: 'Monday, June 15, 2020 at 9:48 PM',
en: 'Monday, June 15, 2020, 9:48 PM',
},
]

Expand Down
Loading

0 comments on commit 55863a8

Please sign in to comment.