Skip to content

Commit

Permalink
Merge pull request #985 from aralroca/canary
Browse files Browse the repository at this point in the history
Release 2.0
  • Loading branch information
aralroca authored Feb 19, 2023
2 parents 321016c + 715fe1d commit ae0e6fc
Show file tree
Hide file tree
Showing 79 changed files with 5,779 additions and 29,359 deletions.
29 changes: 24 additions & 5 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -405,6 +405,15 @@
"code"
]
},
{
"login": "Dragate",
"name": "Dragate",
"avatar_url": "https://avatars.githubusercontent.com/u/28112929?v=4",
"profile": "https://github.com/Dragate",
"contributions": [
"code"
]
},
{
"login": "marcesengel",
"name": "Marces Engel",
Expand All @@ -415,10 +424,19 @@
]
},
{
"login": "Dragate",
"name": "Dragate",
"avatar_url": "https://avatars.githubusercontent.com/u/28112929?v=4",
"profile": "https://github.com/Dragate",
"login": "vascosilvaa",
"name": "Vasco Silva",
"avatar_url": "https://avatars.githubusercontent.com/u/16561642?v=4",
"profile": "https://github.com/vascosilvaa",
"contributions": [
"code"
]
},
{
"login": "StLyn4",
"name": "Vsevolod Volkov",
"avatar_url": "https://avatars.githubusercontent.com/u/73965070?v=4",
"profile": "https://github.com/StLyn4",
"contributions": [
"code"
]
Expand All @@ -429,5 +447,6 @@
"projectOwner": "aralroca",
"repoType": "github",
"repoHost": "https://github.com",
"skipCi": true
"skipCi": true,
"commitConvention": "angular"
}
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, windows-latest]
node-version: [12.x, 14.x, 15.x]
node-version: [14.15.x, 16.10.x, 18.x]
steps:
- uses: actions/checkout@v1
- name: Use Node.js ${{ matrix.node-version }}
Expand Down
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
!*.ts
*.d.ts
!*.tsx
!src/plugin
!src/app-dir
!examples
!examples/**/*
!src
Expand All @@ -17,6 +17,8 @@
!.husky/*
!.prettierignore

.DS_Store

# dependencies
/node_modules
/examples/*/node_modules
Expand Down
194 changes: 126 additions & 68 deletions README.md

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions __tests__/Trans.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,11 @@ describe('Trans', () => {
})

test('should work the same way than useTranslate with default value', () => {
console.warn = jest.fn()
const i18nKey = 'ns:number'
const expected = 'The number is 42'
const expectedWarning =
'[next-translate] "ns:number" is missing in current namespace configuration. Try adding "number" to the namespace "ns".'

const { container } = render(
<TestEnglish
Expand All @@ -123,6 +126,7 @@ describe('Trans', () => {
/>
)
expect(container.textContent).toContain(expected)
expect(console.warn).toBeCalledWith(expectedWarning)
})
})

Expand Down
Loading

0 comments on commit ae0e6fc

Please sign in to comment.