i18n-js 3.0.9 → 3.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39b2813fcbbec8bbb3dc23712043e5bbb9c34ad5a6a91c617f8fb7c43a6012df
-  data.tar.gz: 209aed0138760420e27694a6b18747aaae0ba38cc81856cb25a5d00a1e88e100
+  metadata.gz: d881382110db91a98e8af030855cebf2636194145c9c67203391ecc6823d34ab
+  data.tar.gz: 4918d0712878f819a2c90a24e624ab1fe601fffbdd6abd5c6184c53838e2bef6
 SHA512:
-  metadata.gz: 3a3e2a7b297f31c95064f81603623206f1e43b9d384858c56d8127243f121753ca0c441a6c5027a3e074f030211d737b8b34d15fe95c911c9367a9720b55d34e
-  data.tar.gz: c94a433c6c4a720f454ff4fbd920d86c3605934c3b79c38d4e5935c60ae38a4f885e6b60cb338fb1a71d3cd93c1555af2df1d379daa8764607292d1ddbc5f2fa
+  metadata.gz: e6616ef9bf22c95974b742ce3f85177e50f13a4887d005865de1f8fe6f7e81f8bffc54c46df38311c6f22e8c37d0392d9ecf671185764edc6e87cc9b0f592503
+  data.tar.gz: cc7e6115c6fa710941512235e27fa241f9206bb366455cbc209a02ca587d3c9116ab2a67270591c408d8ac7f8136186487a200bb2d2bfa7a617a379374d96418

data/CHANGELOG.md

@@ -18,6 +18,16 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Nothing
 
 
+## [3.0.10] - 2018-06-21
+
+### Fixed
+
+- [JS] Fix extend method changing keys with `null` to empty objects
+  (PR: https://github.com/fnando/i18n-js/pull/503)
+- [JS] Fix variable name in an internal method
+  (PR: https://github.com/fnando/i18n-js/pull/501)
+
+
 ## [3.0.9] - 2018-06-21
 
 ### Fixed
@@ -316,7 +326,8 @@ And today is not April Fools' Day
 
 
 
-[Unreleased]: https://github.com/fnando/i18n-js/compare/v3.0.9...HEAD
+[Unreleased]: https://github.com/fnando/i18n-js/compare/v3.0.10...HEAD
+[3.0.10]:     https://github.com/fnando/i18n-js/compare/v3.0.9...v3.0.10
 [3.0.9]:      https://github.com/fnando/i18n-js/compare/v3.0.8...v3.0.9
 [3.0.8]:      https://github.com/fnando/i18n-js/compare/v3.0.7...v3.0.8
 [3.0.7]:      https://github.com/fnando/i18n-js/compare/v3.0.6...v3.0.7

data/app/assets/javascripts/i18n.js

@@ -70,22 +70,26 @@
   var isArray = function(val) {
     if (Array.isArray) {
       return Array.isArray(val);
-    };
+    }
     return Object.prototype.toString.call(val) === '[object Array]';
   };
 
   var isString = function(val) {
-    return typeof value == 'string' || Object.prototype.toString.call(val) === '[object String]';
+    return typeof val === 'string' || Object.prototype.toString.call(val) === '[object String]';
   };
 
   var isNumber = function(val) {
-    return typeof val == 'number' || Object.prototype.toString.call(val) === '[object Number]';
+    return typeof val === 'number' || Object.prototype.toString.call(val) === '[object Number]';
   };
 
   var isBoolean = function(val) {
     return val === true || val === false;
   };
 
+  var isNull = function(val) {
+    return val === null;
+  };
+
   var decimalAdjust = function(type, value, exp) {
     // If the exp is undefined or zero...
     if (typeof exp === 'undefined' || +exp === 0) {
@@ -117,7 +121,7 @@
     var key, value;
     for (key in obj) if (obj.hasOwnProperty(key)) {
       value = obj[key];
-      if (isString(value) || isNumber(value) || isBoolean(value) || isArray(value)) {
+      if (isString(value) || isNumber(value) || isBoolean(value) || isArray(value) || isNull(value)) {
         dest[key] = value;
       } else {
         if (dest[key] == null) dest[key] = {};

data/lib/i18n/js/version.rb

@@ -2,6 +2,6 @@
 
 module I18n
   module JS
-    VERSION = "3.0.9"
+    VERSION = "3.0.10"
   end
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "i18n-js",
-  "version": "3.0.9",
+  "version": "3.0.10",
   "description": "A javascript library similar to Ruby on Rails i18n gem",
   "author": "Nando Vieira",
   "license": "MIT",

data/spec/js/extend.spec.js

@@ -60,7 +60,7 @@ describe("Extend", function () {
     expect(I18n.extend(obj1, obj2)).toEqual(expected);
   });
 
-  it("should correctly merge string, numberic and boolean values", function() {
+  it("should correctly merge string, numberic, boolean, and null values", function() {
     var obj1 = {
       test1: {
         test2: false
@@ -69,7 +69,8 @@ describe("Extend", function () {
     , obj2 = {
       test1: {
         test3: 23,
-        test4: 'abc'
+        test4: 'abc',
+        test5: null
       }
     }
     , expected = {
@@ -77,6 +78,7 @@ describe("Extend", function () {
         test2: false
         , test3: 23
         , test4: 'abc'
+        , test5: null
       }
     }
 

data/spec/js/translate.spec.js

@@ -18,6 +18,12 @@ describe("Translate", function(){
     expect(I18n.t("greetings")).toEqual(I18n.translations.en.greetings);
   });
 
+  it("returns missing message translation for valid scope with null", function(){
+    actual = I18n.t("null_key");
+    expected = '[missing "en.null_key" translation]';
+    expect(actual).toEqual(expected);
+  });
+
   it("returns missing message translation for invalid scope", function(){
     actual = I18n.t("invalid.scope");
     expected = '[missing "en.invalid.scope" translation]';

data/spec/js/translations.js

@@ -65,6 +65,8 @@ var DEBUG = false;
         "Another item with a param of {{value}}",
         "A last item with a param of {{value}}"
       ]
+
+      , null_key: null
     };
 
     Translations["en-US"] = {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-js
 version: !ruby/object:Gem::Version
-  version: 3.0.9
+  version: 3.0.10
 platform: ruby
 authors:
 - Nando Vieira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-21 00:00:00.000000000 Z
+date: 2018-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n