Skip to content

Commit

Permalink
Merge cf0e120 into d54e465
Browse files Browse the repository at this point in the history
  • Loading branch information
Spown committed Feb 16, 2018
2 parents d54e465 + cf0e120 commit 091863c
Show file tree
Hide file tree
Showing 16 changed files with 7,032 additions and 179 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Expand Up @@ -8,3 +8,6 @@ coverage/
defaultlocales
localestowrite
localesmakeplural
.vscode

**/*.log
3 changes: 0 additions & 3 deletions .jshintrc
Expand Up @@ -34,9 +34,6 @@
// Prohibit use of a variable before it is defined.
"latedef": false,

// Enforce line length to 100 characters
"maxlen": 100,

// Require capitalized names for constructor functions.
"newcap": true,

Expand Down
8 changes: 4 additions & 4 deletions .travis.yml
@@ -1,11 +1,11 @@
language: node_js
node_js:
- 0.10
- 0.11
- 0.12
- 4
- 5
- iojs
- 6
- 7
- 8
- 9
branches:
only:
- master
Expand Down
4 changes: 4 additions & 0 deletions README.md
Expand Up @@ -307,6 +307,10 @@ and add it's extra attributes and methods, like so:

Now each _local_ object (ie. res.locals) is setup with _it's own "private"_ locale and methods to get the appropriate translation from the _global_ catalog.

### i18n.disableReload()

Stopps watching for outside changes on the locale files if ```autoReload: true```.

### i18n.__()

Translates a single phrase and adds it to locales if unknown. Returns translated parsed and substituted string.
Expand Down
7 changes: 4 additions & 3 deletions appveyor.yml
@@ -1,10 +1,11 @@
environment:
matrix:
- nodejs_version: "0.10"
- nodejs_version: "0.12"
- nodejs_version: "4"
- nodejs_version: "5"
- nodejs_version: "iojs"
- nodejs_version: "6"
- nodejs_version: "7"
- nodejs_version: "8"
- nodejs_version: "9"
branches:
only:
- master
Expand Down

0 comments on commit 091863c

Please sign in to comment.