Skip to content

Commit 9683cc6

Browse files
committed
Merge branch 'release/0.13.4' into npm
2 parents 0c20329 + bdce606 commit 9683cc6

File tree

9 files changed

+2761
-4025
lines changed

9 files changed

+2761
-4025
lines changed

.github/workflows/node.js.yml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# This workflow will do a clean install of node dependencies, cache/restore them, build the source code and run tests across different versions of node
2+
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
3+
4+
name: Node.js CI
5+
6+
on:
7+
push:
8+
branches: [ master ]
9+
pull_request:
10+
branches: [ master ]
11+
12+
jobs:
13+
build:
14+
15+
runs-on: ubuntu-latest
16+
17+
strategy:
18+
matrix:
19+
node-version: [12.x, 14.x, 16.x]
20+
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
21+
22+
steps:
23+
- uses: actions/checkout@v2
24+
25+
- name: Use Node.js ${{ matrix.node-version }}
26+
uses: actions/setup-node@v2
27+
with:
28+
node-version: ${{ matrix.node-version }}
29+
cache: 'npm'
30+
- run: npm ci
31+
- run: npm run test-ci
32+
- run: npm run coverage
33+
34+
- name: Coveralls GitHub Action
35+
uses: coverallsapp/[email protected]
36+
with:
37+
github-token: ${{ secrets.GITHUB_TOKEN }}
38+

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,5 @@ coverage/
99
defaultlocales
1010
localestowrite
1111
localesmakeplural
12+
/locales_traversal/is/not/possible/en.json
13+
/.nyc_output

.travis.yml

Lines changed: 0 additions & 20 deletions
This file was deleted.

README.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Stores language files in json files compatible to [webtranslateit](http://webtra
66
Adds new strings on-the-fly when first used in your app.
77
No extra parsing needed.
88

9-
[![Travis][travis-image]][travis-url]
9+
![Test](https://github.com/mashpie/i18n-node/actions/workflows/node.js.yml/badge.svg)
1010
[![Test Coverage][coveralls-image]][coveralls-url]
1111
[![NPM version][npm-image]][npm-url]
1212
![npm](https://img.shields.io/npm/dw/i18n)
@@ -1131,9 +1131,6 @@ For current release notes see [GitHub Release Notes](https://github.com/mashpie/
11311131
[npm-image]: https://badge.fury.io/js/i18n.svg
11321132
[npm-url]: https://www.npmjs.com/package/i18n
11331133

1134-
[travis-image]: https://travis-ci.org/mashpie/i18n-node.svg?branch=master
1135-
[travis-url]: https://travis-ci.org/mashpie/i18n-node
1136-
11371134
[coveralls-image]: https://coveralls.io/repos/github/mashpie/i18n-node/badge.svg?branch=master
11381135
[coveralls-url]: https://coveralls.io/github/mashpie/i18n-node?branch=master
11391136

examples/node-http/locales/en.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"Hello World": "Hello World",
3-
"Hello": "Hello"
4-
}
3+
"Hello": "Hello"
4+
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
keep me

0 commit comments

Comments
 (0)