upgrade y18n to 3.1.0 so splicing lang from locale is unnecessary

yargs · Aug 19, 2015 · b43406c · b43406c
1 parent db5af49
commit b43406c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/index.js b/index.js
@@ -536,7 +536,7 @@ function Argv (processArgs, cwd) {
   }
 
   function guessLocale () {
-    return osLocale.sync().split('_')[0]
+    return osLocale.sync()
   }
 
   sigletonify(self)

diff --git a/package.json b/package.json
@@ -16,7 +16,7 @@
     "decamelize": "^1.0.0",
     "os-locale": "^1.2.0",
     "window-size": "^0.1.1",
-    "y18n": "^3.0.0"
+    "y18n": "^3.1.0"
   },
   "devDependencies": {
     "chai": "^3.0.0",

diff --git a/test/yargs.js b/test/yargs.js
@@ -311,21 +311,17 @@ describe('yargs dsl tests', function () {
   })
 
   describe('locale', function () {
-    it('returns locale if locale is called with no arguments', function () {
-      yargs.locale().should.equal('en')
-    })
-
     it("detects the operating system's locale", function () {
       loadLocale('es_ES.UTF-8')
-      yargs.locale().should.equal('es')
-      loadLocale('en_EN.UTF-8')
+      yargs.locale().should.equal('es_ES')
+      loadLocale('en_US.UTF-8')
     })
 
     it("it allows the operating system's locale to be overridden", function () {
       loadLocale('es_ES.UTF-8')
       yargs.locale('en')
       yargs.locale().should.equal('en')
-      loadLocale('en_EN.UTF-8')
+      loadLocale('en_US.UTF-8')
     })
 
     function loadLocale (locale) {
@@ -359,8 +355,8 @@ describe('yargs dsl tests', function () {
           .argv
       })
 
-      yargs.locale().should.equal('zz')
-      loadLocale('en_EN.UTF-8')
+      yargs.locale().should.equal('zz_ZZ')
+      loadLocale('en_US.UTF-8')
       r.logs.join(' ').should.match(/Commands:/)
     })