Skip to content

Commit

Permalink
Merge branch 'dev' into fix/issue1596
Browse files Browse the repository at this point in the history
  • Loading branch information
iamkun authored Jun 11, 2022
2 parents 2f49389 + 526f0ae commit ac2e77f
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 5 deletions.
26 changes: 26 additions & 0 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Lint & Unit Test
on:
push:
branches: [ master, dev ]
pull_request:
branches: [dev]
jobs:
check:
runs-on: ubuntu-latest
strategy:
matrix:
node: [ 12, 14, 16, 18 ]
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Setup node
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: 'npm'
- name: Install dependencies
run: npm install -g codecov && npm install
- name: Run Lint
run: npm run lint
- name: Run tests
run: npm test && codecov
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ cache:
- ~/.npm
- node_modules
node_js:
- '18'
- '16'
- '14'
- '12'
- '10'
- '8'
install:
- npm install -g codecov
- npm install
Expand All @@ -20,5 +20,5 @@ after_success:
npx travis-deploy-once --pro && npm run build && npm run babel && npm install -g @semantic-release/changelog @semantic-release/git semantic-release && semantic-release && echo release success && curl ${TriggerUrl} && npm run test:sauce;
fi
branches:
except:
- /^v\d+\.\d+\.\d+$/
only:
- master
2 changes: 1 addition & 1 deletion src/locale/fr.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ const locale = {
yy: '%d ans'
},
ordinal: (n) => {
const o = n === 1 ? 'er' : ''
const o = n === 1 ? 'er' : 'e'
return `${n}${o}`
}
}
Expand Down
2 changes: 2 additions & 0 deletions types/plugin/localeData.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ declare module 'dayjs' {
monthsShort(instance?: Dayjs): MonthNames;
longDateFormat(format: string): string;
meridiem(hour?: number, minute?: number, isLower?: boolean): string;
ordinal(n: number): string
}

interface GlobalLocaleDataReturn {
Expand All @@ -27,6 +28,7 @@ declare module 'dayjs' {
monthsShort(): MonthNames;
longDateFormat(format: string): string;
meridiem(hour?: number, minute?: number, isLower?: boolean): string;
ordinal(n: number): string
}

interface Dayjs {
Expand Down

0 comments on commit ac2e77f

Please sign in to comment.