Skip to content

Commit

Permalink
fix: Fix monthsShort for locale fr (#862)
Browse files Browse the repository at this point in the history
  • Loading branch information
PierrickGT committed Apr 8, 2020
1 parent fc08ab6 commit d2de9a0
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/locale/fr.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const locale = {
weekdaysShort: 'dim._lun._mar._mer._jeu._ven._sam.'.split('_'),
weekdaysMin: 'di_lu_ma_me_je_ve_sa'.split('_'),
months: 'janvier_février_mars_avril_mai_juin_juillet_août_septembre_octobre_novembre_décembre'.split('_'),
monthsShort: 'janv_févr_mars_avril_mai_juin_juil_août_sept_oct_nov_déc'.split('_'),
monthsShort: 'janv._févr._mars_avr._mai_juin_juil._août_sept._oct._nov._déc.'.split('_'),
weekStart: 1,
formats: {
LT: 'HH:mm',
Expand Down
5 changes: 3 additions & 2 deletions test/plugin/localeData.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import moment from 'moment'
import dayjs from '../../src'
import localeData from '../../src/plugin/localeData'
import localizedFormat from '../../src/plugin/localizedFormat'
import '../../src/locale/fr'
import '../../src/locale/zh-cn'

dayjs.extend(localizedFormat)
Expand Down Expand Up @@ -38,7 +39,7 @@ it('Instance localeData', () => {


it('Global localeData', () => {
['zh-cn', 'en'].forEach((lo) => {
['zh-cn', 'en', 'fr'].forEach((lo) => {
dayjs.locale(lo)
moment.locale(lo)
const dayjsLocaleData = dayjs.localeData()
Expand All @@ -54,7 +55,7 @@ it('Global localeData', () => {


it('Listing the months and weekdays', () => {
['zh-cn', 'en'].forEach((lo) => {
['zh-cn', 'en', 'fr'].forEach((lo) => {
dayjs.locale(lo)
moment.locale(lo)
expect(dayjs.months()).toEqual(moment.months())
Expand Down

0 comments on commit d2de9a0

Please sign in to comment.