From 043b8eab51782022c90a1d2b017f95a5dce17c1d Mon Sep 17 00:00:00 2001 From: Seong Min Park Date: Sat, 18 Jun 2022 22:40:16 -0400 Subject: [PATCH] fix: ar meridiem function implementation is wrong --- src/locale/ar-dz.js | 2 +- src/locale/ar-iq.js | 2 +- src/locale/ar-kw.js | 2 +- src/locale/ar-ly.js | 2 +- src/locale/ar-ma.js | 2 +- src/locale/ar-sa.js | 2 +- src/locale/ar-tn.js | 2 +- test/locale/ar-dz.test.js | 23 +++++++++++++++++++++++ test/locale/ar-iq.test.js | 23 +++++++++++++++++++++++ test/locale/ar-kw.test.js | 23 +++++++++++++++++++++++ test/locale/ar-ly.test.js | 23 +++++++++++++++++++++++ test/locale/ar-ma.test.js | 23 +++++++++++++++++++++++ test/locale/ar-sa.test.js | 23 +++++++++++++++++++++++ test/locale/ar-tn.test.js | 23 +++++++++++++++++++++++ 14 files changed, 168 insertions(+), 7 deletions(-) create mode 100644 test/locale/ar-dz.test.js create mode 100644 test/locale/ar-iq.test.js create mode 100644 test/locale/ar-kw.test.js create mode 100644 test/locale/ar-ly.test.js create mode 100644 test/locale/ar-ma.test.js create mode 100644 test/locale/ar-sa.test.js create mode 100644 test/locale/ar-tn.test.js diff --git a/src/locale/ar-dz.js b/src/locale/ar-dz.js index fdc5e0b86..cd076f7d7 100644 --- a/src/locale/ar-dz.js +++ b/src/locale/ar-dz.js @@ -17,7 +17,7 @@ const locale = { LLL: 'D MMMM YYYY HH:mm', LLLL: 'dddd D MMMM YYYY HH:mm' }, - meridiem: hour => (hour > 12 ? 'ص' : 'م'), + meridiem: hour => (hour > 12 ? 'م' : 'ص'), relativeTime: { future: 'في %s', past: 'منذ %s', diff --git a/src/locale/ar-iq.js b/src/locale/ar-iq.js index 1040db80d..7878f6481 100644 --- a/src/locale/ar-iq.js +++ b/src/locale/ar-iq.js @@ -18,7 +18,7 @@ const locale = { LLL: 'D MMMM YYYY HH:mm', LLLL: 'dddd D MMMM YYYY HH:mm' }, - meridiem: hour => (hour > 12 ? 'ص' : 'م'), + meridiem: hour => (hour > 12 ? 'م' : 'ص'), relativeTime: { future: 'في %s', past: 'منذ %s', diff --git a/src/locale/ar-kw.js b/src/locale/ar-kw.js index 23ad4be6c..465ff9936 100644 --- a/src/locale/ar-kw.js +++ b/src/locale/ar-kw.js @@ -17,7 +17,7 @@ const locale = { LLL: 'D MMMM YYYY HH:mm', LLLL: 'dddd D MMMM YYYY HH:mm' }, - meridiem: hour => (hour > 12 ? 'ص' : 'م'), + meridiem: hour => (hour > 12 ? 'م' : 'ص'), relativeTime: { future: 'في %s', past: 'منذ %s', diff --git a/src/locale/ar-ly.js b/src/locale/ar-ly.js index 6db397056..316627099 100644 --- a/src/locale/ar-ly.js +++ b/src/locale/ar-ly.js @@ -10,7 +10,7 @@ const locale = { monthsShort: 'يناير_فبراير_مارس_أبريل_مايو_يونيو_يوليو_أغسطس_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'), weekdaysMin: 'ح_ن_ث_ر_خ_ج_س'.split('_'), ordinal: n => n, - meridiem: hour => (hour > 12 ? 'ص' : 'م'), + meridiem: hour => (hour > 12 ? 'م' : 'ص'), formats: { LT: 'HH:mm', LTS: 'HH:mm:ss', diff --git a/src/locale/ar-ma.js b/src/locale/ar-ma.js index 802b71684..5b1e70aed 100644 --- a/src/locale/ar-ma.js +++ b/src/locale/ar-ma.js @@ -18,7 +18,7 @@ const locale = { LLL: 'D MMMM YYYY HH:mm', LLLL: 'dddd D MMMM YYYY HH:mm' }, - meridiem: hour => (hour > 12 ? 'ص' : 'م'), + meridiem: hour => (hour > 12 ? 'م' : 'ص'), relativeTime: { future: 'في %s', past: 'منذ %s', diff --git a/src/locale/ar-sa.js b/src/locale/ar-sa.js index 9f908ade1..f543bac22 100644 --- a/src/locale/ar-sa.js +++ b/src/locale/ar-sa.js @@ -17,7 +17,7 @@ const locale = { LLL: 'D MMMM YYYY HH:mm', LLLL: 'dddd D MMMM YYYY HH:mm' }, - meridiem: hour => (hour > 12 ? 'ص' : 'م'), + meridiem: hour => (hour > 12 ? 'م' : 'ص'), relativeTime: { future: 'في %s', past: 'منذ %s', diff --git a/src/locale/ar-tn.js b/src/locale/ar-tn.js index 54c4e3e2d..c44cf66c1 100644 --- a/src/locale/ar-tn.js +++ b/src/locale/ar-tn.js @@ -18,7 +18,7 @@ const locale = { LLL: 'D MMMM YYYY HH:mm', LLLL: 'dddd D MMMM YYYY HH:mm' }, - meridiem: hour => (hour > 12 ? 'ص' : 'م'), + meridiem: hour => (hour > 12 ? 'م' : 'ص'), relativeTime: { future: 'في %s', past: 'منذ %s', diff --git a/test/locale/ar-dz.test.js b/test/locale/ar-dz.test.js new file mode 100644 index 000000000..532e5f8eb --- /dev/null +++ b/test/locale/ar-dz.test.js @@ -0,0 +1,23 @@ +import MockDate from 'mockdate' +import dayjs from '../../src' +import relativeTime from '../../src/plugin/relativeTime' +import '../../src/locale/ru' +import locale from '../../src/locale/ar-dz' + +dayjs.extend(relativeTime) + +beforeEach(() => { + MockDate.set(new Date()) +}) + +afterEach(() => { + MockDate.reset() +}) + +it('Meridiem', () => { + dayjs.locale(locale) + expect(dayjs('2020-01-01 03:00:00').locale('ar-dz').format('A')).toEqual('ص') + expect(dayjs('2020-01-01 11:00:00').locale('ar-dz').format('A')).toEqual('ص') + expect(dayjs('2020-01-01 16:00:00').locale('ar-dz').format('A')).toEqual('م') + expect(dayjs('2020-01-01 20:00:00').locale('ar-dz').format('A')).toEqual('م') +}) diff --git a/test/locale/ar-iq.test.js b/test/locale/ar-iq.test.js new file mode 100644 index 000000000..810723da3 --- /dev/null +++ b/test/locale/ar-iq.test.js @@ -0,0 +1,23 @@ +import MockDate from 'mockdate' +import dayjs from '../../src' +import relativeTime from '../../src/plugin/relativeTime' +import '../../src/locale/ru' +import locale from '../../src/locale/ar-iq' + +dayjs.extend(relativeTime) + +beforeEach(() => { + MockDate.set(new Date()) +}) + +afterEach(() => { + MockDate.reset() +}) + +it('Meridiem', () => { + dayjs.locale(locale) + expect(dayjs('2020-01-01 03:00:00').locale('ar-iq').format('A')).toEqual('ص') + expect(dayjs('2020-01-01 11:00:00').locale('ar-iq').format('A')).toEqual('ص') + expect(dayjs('2020-01-01 16:00:00').locale('ar-iq').format('A')).toEqual('م') + expect(dayjs('2020-01-01 20:00:00').locale('ar-iq').format('A')).toEqual('م') +}) diff --git a/test/locale/ar-kw.test.js b/test/locale/ar-kw.test.js new file mode 100644 index 000000000..8a8e14933 --- /dev/null +++ b/test/locale/ar-kw.test.js @@ -0,0 +1,23 @@ +import MockDate from 'mockdate' +import dayjs from '../../src' +import relativeTime from '../../src/plugin/relativeTime' +import '../../src/locale/ru' +import locale from '../../src/locale/ar-kw' + +dayjs.extend(relativeTime) + +beforeEach(() => { + MockDate.set(new Date()) +}) + +afterEach(() => { + MockDate.reset() +}) + +it('Meridiem', () => { + dayjs.locale(locale) + expect(dayjs('2020-01-01 03:00:00').locale('ar-kw').format('A')).toEqual('ص') + expect(dayjs('2020-01-01 11:00:00').locale('ar-kw').format('A')).toEqual('ص') + expect(dayjs('2020-01-01 16:00:00').locale('ar-kw').format('A')).toEqual('م') + expect(dayjs('2020-01-01 20:00:00').locale('ar-kw').format('A')).toEqual('م') +}) diff --git a/test/locale/ar-ly.test.js b/test/locale/ar-ly.test.js new file mode 100644 index 000000000..927675136 --- /dev/null +++ b/test/locale/ar-ly.test.js @@ -0,0 +1,23 @@ +import MockDate from 'mockdate' +import dayjs from '../../src' +import relativeTime from '../../src/plugin/relativeTime' +import '../../src/locale/ru' +import locale from '../../src/locale/ar-ly' + +dayjs.extend(relativeTime) + +beforeEach(() => { + MockDate.set(new Date()) +}) + +afterEach(() => { + MockDate.reset() +}) + +it('Meridiem', () => { + dayjs.locale(locale) + expect(dayjs('2020-01-01 03:00:00').locale('ar-ly').format('A')).toEqual('ص') + expect(dayjs('2020-01-01 11:00:00').locale('ar-ly').format('A')).toEqual('ص') + expect(dayjs('2020-01-01 16:00:00').locale('ar-ly').format('A')).toEqual('م') + expect(dayjs('2020-01-01 20:00:00').locale('ar-ly').format('A')).toEqual('م') +}) diff --git a/test/locale/ar-ma.test.js b/test/locale/ar-ma.test.js new file mode 100644 index 000000000..e08ab86d1 --- /dev/null +++ b/test/locale/ar-ma.test.js @@ -0,0 +1,23 @@ +import MockDate from 'mockdate' +import dayjs from '../../src' +import relativeTime from '../../src/plugin/relativeTime' +import '../../src/locale/ru' +import locale from '../../src/locale/ar-ma' + +dayjs.extend(relativeTime) + +beforeEach(() => { + MockDate.set(new Date()) +}) + +afterEach(() => { + MockDate.reset() +}) + +it('Meridiem', () => { + dayjs.locale(locale) + expect(dayjs('2020-01-01 03:00:00').locale('ar-ma').format('A')).toEqual('ص') + expect(dayjs('2020-01-01 11:00:00').locale('ar-ma').format('A')).toEqual('ص') + expect(dayjs('2020-01-01 16:00:00').locale('ar-ma').format('A')).toEqual('م') + expect(dayjs('2020-01-01 20:00:00').locale('ar-ma').format('A')).toEqual('م') +}) diff --git a/test/locale/ar-sa.test.js b/test/locale/ar-sa.test.js new file mode 100644 index 000000000..1936f5086 --- /dev/null +++ b/test/locale/ar-sa.test.js @@ -0,0 +1,23 @@ +import MockDate from 'mockdate' +import dayjs from '../../src' +import relativeTime from '../../src/plugin/relativeTime' +import '../../src/locale/ru' +import locale from '../../src/locale/ar-sa' + +dayjs.extend(relativeTime) + +beforeEach(() => { + MockDate.set(new Date()) +}) + +afterEach(() => { + MockDate.reset() +}) + +it('Meridiem', () => { + dayjs.locale(locale) + expect(dayjs('2020-01-01 03:00:00').locale('ar-sa').format('A')).toEqual('ص') + expect(dayjs('2020-01-01 11:00:00').locale('ar-sa').format('A')).toEqual('ص') + expect(dayjs('2020-01-01 16:00:00').locale('ar-sa').format('A')).toEqual('م') + expect(dayjs('2020-01-01 20:00:00').locale('ar-sa').format('A')).toEqual('م') +}) diff --git a/test/locale/ar-tn.test.js b/test/locale/ar-tn.test.js new file mode 100644 index 000000000..7c73dfcd9 --- /dev/null +++ b/test/locale/ar-tn.test.js @@ -0,0 +1,23 @@ +import MockDate from 'mockdate' +import dayjs from '../../src' +import relativeTime from '../../src/plugin/relativeTime' +import '../../src/locale/ru' +import locale from '../../src/locale/ar-tn' + +dayjs.extend(relativeTime) + +beforeEach(() => { + MockDate.set(new Date()) +}) + +afterEach(() => { + MockDate.reset() +}) + +it('Meridiem', () => { + dayjs.locale(locale) + expect(dayjs('2020-01-01 03:00:00').locale('ar-tn').format('A')).toEqual('ص') + expect(dayjs('2020-01-01 11:00:00').locale('ar-tn').format('A')).toEqual('ص') + expect(dayjs('2020-01-01 16:00:00').locale('ar-tn').format('A')).toEqual('م') + expect(dayjs('2020-01-01 20:00:00').locale('ar-tn').format('A')).toEqual('م') +})