Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: ar-* meridiem function implementation is wrong #1954

Merged
merged 1 commit into from
Jun 27, 2022
Merged

fix: ar-* meridiem function implementation is wrong #1954

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/locale/ar-dz.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion src/locale/ar-iq.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion src/locale/ar-kw.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion src/locale/ar-ly.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion src/locale/ar-ma.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion src/locale/ar-sa.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion src/locale/ar-tn.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
23 changes: 23 additions & 0 deletions test/locale/ar-dz.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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('م')
})
23 changes: 23 additions & 0 deletions test/locale/ar-iq.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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('م')
})
23 changes: 23 additions & 0 deletions test/locale/ar-kw.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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('م')
})
23 changes: 23 additions & 0 deletions test/locale/ar-ly.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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('م')
})
23 changes: 23 additions & 0 deletions test/locale/ar-ma.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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('م')
})
23 changes: 23 additions & 0 deletions test/locale/ar-sa.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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('م')
})
23 changes: 23 additions & 0 deletions test/locale/ar-tn.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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('م')
})