Merge f06678c into 50c994e

mashpie · Mar 18, 2019 · ae4bd60 · ae4bd60
2 parents 50c994e + f06678c
commit ae4bd60
Show file tree

Hide file tree

Showing 5 changed files with 4,014 additions and 14 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,10 +1,7 @@
 language: node_js
 node_js:
-  - 0.10
-  - 0.11
-  - 0.12
-  - 4
-  - 5
+  - node
+  - lts/*
   - iojs
 branches:
   only:
@@ -21,4 +18,4 @@ after_script:
   - "cat ./coverage/lcov.info | CODECLIMATE_REPO_TOKEN=8f4183adc84cb07c9609004de2f43c60e2a54a09c89d99f055919267f5246409 codeclimate-test-reporter"
 addons:
   code_climate:
-    repo_token: 8f4183adc84cb07c9609004de2f43c60e2a54a09c89d99f055919267f5246409
+    repo_token: 8f4183adc84cb07c9609004de2f43c60e2a54a09c89d99f055919267f5246409
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 test:
-	mocha
+	mocha --exit
 
 cover:
 	istanbul cover ./node_modules/mocha/bin/_mocha
@@ -14,4 +14,4 @@ examples:
 
 all: test examples hint
 
-.PHONY: test examples
+.PHONY: test examples
diff --git a/i18n.js b/i18n.js
@@ -486,7 +486,7 @@ module.exports = (function() {
       locale === undefined &&
       typeof this.locale === 'string'
     ) {
-      if (register && register.GLOBAL) {
+      if (register && register.global) {
         targetLocale = '';
       } else {
         targetLocale = this.locale;