i18n-js 3.0.7 → 3.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2750b5bafd7ceaefcf74278810f3cc126ab11d943b3bb44373d8d839ac2ff715
-  data.tar.gz: 4fd313c8447e68f57fae8488680339bd46f475371646280324865b4b4d6437d6
+  metadata.gz: 820d6beeaa53ffbe74afc97313260ee0a77412a7ff576e906a1c4291a50970d0
+  data.tar.gz: e7a97db0d132db4de65bb1ae5c37b1ca47670f6ce76ea02e356d4bc8906343c5
 SHA512:
-  metadata.gz: 8bccb10c908add935804e7b640a3b0fcb1b656e11f8e034791c5261103fc790272c179cd976a40ff225fc7a3eb5abc2a76e53ec7c0e421193d854e48b16313a8
-  data.tar.gz: efacce778c4a6350eb7fca8887bdc7603afcaad0d50bf9471b14ad7df920f880f1533b3b5a94650908119daf6d0c81b306a14e077edde08a1507f2bbb7d79784
+  metadata.gz: c7657ce121aba975ba1b1d0acad226786ef867494e9fc1d1ec3d118f499f475ab27567cb121433f9af54c0080ac2b899edfdd1079de5497da7b936c18afe4bbb
+  data.tar.gz: 38a12230b043fb9f014bb33a056498071b1871155f77e27ed062a8678409a550db346c31a4264cc07bea6494601f1cc43643c0b47afad328f3aba05d0b2b8cbc

data/CHANGELOG.md

@@ -18,6 +18,14 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Nothing
 
 
+## [3.0.8] - 2018-06-06
+
+### Changed
+
+- [JS] Interpolate translation array too
+  (PR: https://github.com/fnando/i18n-js/pull/498)
+
+
 ## [3.0.7] - 2018-05-30
 
 ### Fixed
@@ -301,7 +309,8 @@ And today is not April Fools' Day
 
 
 
-[Unreleased]: https://github.com/fnando/i18n-js/compare/v3.0.7...HEAD
+[Unreleased]: https://github.com/fnando/i18n-js/compare/v3.0.8...HEAD
+[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
 [3.0.6]:      https://github.com/fnando/i18n-js/compare/v3.0.5...v3.0.6
 [3.0.5]:      https://github.com/fnando/i18n-js/compare/v3.0.4...v3.0.5

data/app/assets/javascripts/i18n.js

@@ -598,6 +598,10 @@
 
     if (typeof(translation) === "string") {
       translation = this.interpolate(translation, options);
+    } else if (isArray(translation)) {
+      translation = translation.map(function(t) {
+        return this.interpolate(t, options);
+      }, this);
     } else if (isObject(translation) && isSet(options.count)) {
       translation = this.pluralize(options.count, scope, options);
     }

data/app/assets/javascripts/i18n/shims.js

@@ -117,3 +117,92 @@ if (!Array.prototype.some)
     return false;
   };
 }
+
+// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/map
+if (!Array.prototype.map) {
+
+  Array.prototype.map = function(callback/*, thisArg*/) {
+
+    var T, A, k;
+
+    if (this == null) {
+      throw new TypeError('this is null or not defined');
+    }
+
+    // 1. Let O be the result of calling ToObject passing the |this| 
+    //    value as the argument.
+    var O = Object(this);
+
+    // 2. Let lenValue be the result of calling the Get internal 
+    //    method of O with the argument "length".
+    // 3. Let len be ToUint32(lenValue).
+    var len = O.length >>> 0;
+
+    // 4. If IsCallable(callback) is false, throw a TypeError exception.
+    // See: http://es5.github.com/#x9.11
+    if (typeof callback !== 'function') {
+      throw new TypeError(callback + ' is not a function');
+    }
+
+    // 5. If thisArg was supplied, let T be thisArg; else let T be undefined.
+    if (arguments.length > 1) {
+      T = arguments[1];
+    }
+
+    // 6. Let A be a new array created as if by the expression new Array(len) 
+    //    where Array is the standard built-in constructor with that name and 
+    //    len is the value of len.
+    A = new Array(len);
+
+    // 7. Let k be 0
+    k = 0;
+
+    // 8. Repeat, while k < len
+    while (k < len) {
+
+      var kValue, mappedValue;
+
+      // a. Let Pk be ToString(k).
+      //   This is implicit for LHS operands of the in operator
+      // b. Let kPresent be the result of calling the HasProperty internal 
+      //    method of O with argument Pk.
+      //   This step can be combined with c
+      // c. If kPresent is true, then
+      if (k in O) {
+
+        // i. Let kValue be the result of calling the Get internal 
+        //    method of O with argument Pk.
+        kValue = O[k];
+
+        // ii. Let mappedValue be the result of calling the Call internal 
+        //     method of callback with T as the this value and argument 
+        //     list containing kValue, k, and O.
+        mappedValue = callback.call(T, kValue, k, O);
+
+        // iii. Call the DefineOwnProperty internal method of A with arguments
+        // Pk, Property Descriptor
+        // { Value: mappedValue,
+        //   Writable: true,
+        //   Enumerable: true,
+        //   Configurable: true },
+        // and false.
+
+        // In browsers that support Object.defineProperty, use the following:
+        // Object.defineProperty(A, k, {
+        //   value: mappedValue,
+        //   writable: true,
+        //   enumerable: true,
+        //   configurable: true
+        // });
+
+        // For best browser support, use the following:
+        A[k] = mappedValue;
+      }
+      // d. Increase k by 1.
+      k++;
+    }
+
+    // 9. return A
+    return A;
+  };
+}

data/lib/i18n/js/version.rb

@@ -2,6 +2,6 @@
 
 module I18n
   module JS
-    VERSION = "3.0.7"
+    VERSION = "3.0.8"
   end
 end

data/spec/js/translate.spec.js

@@ -256,4 +256,13 @@ describe("Translate", function(){
   it("accepts the scope as an array using a base scope", function(){
     expect(I18n.t(["stranger"], {scope: "greetings"})).toEqual("Hello stranger!");
   });
+
+  it("returns an array with values interpolated", function(){
+    var options = {value: 314};
+    expect(I18n.t("arrayWithParams", options)).toEqual([
+      `An item with a param of ${options.value}`,
+      `Another item with a param of ${options.value}`,
+      `A last item with a param of ${options.value}`,
+    ]);
+  });
 });

data/spec/js/translations.js

@@ -58,6 +58,12 @@ var DEBUG = false;
             }
           }
         }
+
+      , arrayWithParams: [
+        "An item with a param of {{value}}",
+        "Another item with a param of {{value}}",
+        "A last item with a param of {{value}}",
+      ]
     };
 
     Translations["en-US"] = {

metadata

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