i18n-js 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1ebec2528bae57b4e38d4fbf4fe2241197dfc36d
-  data.tar.gz: 5b5cc7647e6dabbd1fe607a438737f156b6e9e54
+SHA256:
+  metadata.gz: cf663bf5df9a67831d1c4990bbe6dfe643ee3295032e0acb3daf3da73848206b
+  data.tar.gz: 3a7b7747572c76a3917c2ea93d327d8018bd53b038fbb0df57e5ce7ef8c5918d
 SHA512:
-  metadata.gz: 1e9b528236405cf0d44016d62ecbc892bd9ffec07e8266bd2cbd5760c17a852f95d38dd230779b1eab7a9db25c80394d4aa36231522227c51e5b28e2222a7ce0
-  data.tar.gz: 2fd596c5e48d2e570a930bf714278571c49944251247217b93f65a192338bbb3f72cf41d1f80bc8136a173792f2af705f1a97887a3ea1f182809c9f8d134f362
+  metadata.gz: 8a57c84a20c207670352bad0f45fcaf206eff8c698fc5ad03d1f75931dac7c6ab8da7dce677a75414c85120a9f448546451cd710107342aab26337080d606dc7
+  data.tar.gz: fbd08b7587afb1271e5ba9217ebeab00be5f1ad8df87a32ded2ac51a3d7e82eddc8e1f05fbd4c0c83280c9aac22b9d6cc1569ee01a39b9f3c564fcf87002b79f

data/CHANGELOG.md

@@ -18,11 +18,15 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Nothing
 
 
-## [3.0.2] - 2017-10-26
+## [3.0.3] - 2018-01-02
 
-### Added
+### Fixed
+
+- [Ruby] Fix extend method when translations has array values  
+  (PR: https://github.com/fnando/i18n-js/pull/487)
 
-- Nothing
+
+## [3.0.2] - 2017-10-26
 
 ### Changed
 
@@ -32,10 +36,6 @@ This project adheres to [Semantic Versioning](http://semver.org/).
   It was falling back to `zh` first instead of `zh-Hant` (see new test case added)  
   (PR: https://github.com/fnando/i18n-js/pull/475)
 
-### Fixed
-
-- Nothing
-
 
 ## [3.0.1] - 2017-08-02
 
@@ -270,7 +270,8 @@ And today is not April Fools' Day
 
 
 
-[Unreleased]: https://github.com/fnando/i18n-js/compare/v3.0.2...HEAD
+[Unreleased]: https://github.com/fnando/i18n-js/compare/v3.0.3...HEAD
+[3.0.3]:      https://github.com/fnando/i18n-js/compare/v3.0.2...v3.0.3
 [3.0.2]:      https://github.com/fnando/i18n-js/compare/v3.0.1...v3.0.2
 [3.0.1]:      https://github.com/fnando/i18n-js/compare/v3.0.0...v3.0.1
 [3.0.0]:      https://github.com/fnando/i18n-js/compare/v3.0.0.rc16...v3.0.0

data/README.md

@@ -61,7 +61,7 @@ Then get the JS files following the instructions below.
 <%# This is just an example, you can put `i18n.js` and `translations.js` anywhere you like %>
 <%# Unlike the Asset Pipeline example, you need to require both **in order** %>
 <%= javascript_include_tag "i18n" %>
-<%= javascript_include_tag "translations" %>
+<%= javascript_include_tag "translations", skip_pipeline: true %>
 ```
 
 **There are two ways to get `translations.js`.**

data/app/assets/javascripts/i18n.js

@@ -117,7 +117,7 @@
     var key, value;
     for (key in obj) if (obj.hasOwnProperty(key)) {
       value = obj[key];
-      if (isString(value) || isNumber(value) || isBoolean(value)) {
+      if (isString(value) || isNumber(value) || isBoolean(value) || isArray(value)) {
         dest[key] = value;
       } else {
         if (dest[key] == null) dest[key] = {};

data/lib/i18n/js/version.rb

@@ -1,5 +1,5 @@
 module I18n
   module JS
-    VERSION = "3.0.2"
+    VERSION = "3.0.3"
   end
 end

data/spec/js/extend.spec.js

@@ -82,4 +82,27 @@ describe("Extend", function () {
 
     expect(I18n.extend(obj1, obj2)).toEqual(expected);
   });
+
+  it("should merge array values", function() {
+    var obj1 = {
+      array1: [1, 2]
+    },
+    obj2 = {
+      array2: [1, 2],
+      obj3: {
+        array3: [1, 2],
+        array4: [{obj4: 1}, 2]
+      }
+    },
+    expected = {
+      array1: [1, 2],
+      array2: [1, 2],
+      obj3: {
+        array3: [1, 2],
+        array4: [{obj4: 1}, 2]
+      }
+    }
+
+    expect(JSON.stringify(I18n.extend(obj1, obj2))).toEqual(JSON.stringify(expected));
+  });
 });

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-js
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Nando Vieira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-26 00:00:00.000000000 Z
+date: 2018-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -198,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: It's a small library to provide the Rails I18n translations on the Javascript.