i18n-js 3.4.1 → 3.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e97276215fc1d53677d4a73d8fa078d476fbb6400047e43b42ea723eb0df22d
-  data.tar.gz: 496f8b37aeaceed790124ddbe359ac11831aa83b9b61a39ae1634ecff2187837
+  metadata.gz: dbf33a6af551aff2ea13db6c39e84c568f426aaaacd78b1a27524917a05cc580
+  data.tar.gz: a7ba15b0084e0eed0eb8a9f3692131c8786401a3ed257217d0d6ba43cdefd3d3
 SHA512:
-  metadata.gz: 7ee645b6b5040548d97df6dbccdbcb90f3f8093ed361c5e83abd822de102bbcf963778b60bc7c76a31f6ada69afe20c1422a420ff052f37eb816d1ef3a22155e
-  data.tar.gz: 395386008e73365635030bddb34a6211d0bc7914fd1822184b3a14a92097d3693ee5834a4cca85f41d584f2b7e46ec528b0fc285d63a9fd93925ee3ffe7c5ab5
+  metadata.gz: f5bb0487ef02b35454d86e92c9d1634cee3ac9eaa302fcc19044e22c80491682fe4e5c44eef2d6aa90ff91ff0f15db4f2bd7539b4de8e66773be54ba880b193d
+  data.tar.gz: f6d56fb7550b4cce0d02e25cf98b38be75cfc3d0cb9cfe3ac0ba050621a08363b7ff49abc4ddc5803d8ac3be3f864bbb3187bb3476e18e91479484f8accd0622

data/.travis.yml

@@ -12,6 +12,7 @@ rvm:
   - 2.4
   - 2.5
   - 2.6
+  - 2.7
   - ruby-head
 before_install:
 # Needed to test JS
@@ -29,6 +30,7 @@ gemfile:
   - gemfiles/i18n_1_5.gemfile
   - gemfiles/i18n_1_6.gemfile
   - gemfiles/i18n_1_7.gemfile
+  - gemfiles/i18n_1_8.gemfile
 matrix:
   fast_finish: true
   allow_failures:

data/Appraisals

@@ -38,3 +38,7 @@ end
 appraise "i18n_1_7" do
   gem "i18n", "~> 1.7.0"
 end
+
+appraise "i18n_1_8" do
+  gem "i18n", "~> 1.8.0"
+end

data/CHANGELOG.md

@@ -18,6 +18,46 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Nothing
 
 
+## [3.7.0] - 2020-05-29
+
+### Added
+
+- [JS] Allow options to be passed in when calling `I18n.localize`/`I18n.l`  
+  (PR: https://github.com/fnando/i18n-js/pull/570)
+
+
+## [3.6.0] - 2020-02-14
+
+### Added
+
+- [Ruby] Allow `suffix` to be added to generated translations files  
+  (PR: https://github.com/fnando/i18n-js/pull/561)
+
+
+## [3.5.1] - 2019-12-21
+
+### Changed
+
+- [JS] Bound shortcut functions  
+  (PR: https://github.com/fnando/i18n-js/pull/560)
+
+
+## [3.5.0] - 2019-11-12
+
+### Added
+
+- [JS] Support for `%k` strftime format to match Ruby strftime  
+  (PR: https://github.com/fnando/i18n-js/pull/554)
+
+
+## [3.4.2] - 2019-11-11
+
+### Fixed
+
+- [Ruby] Fix regression introduced in PR #551  
+  (PR: https://github.com/fnando/i18n-js/pull/555)
+
+
 ## [3.4.1] - 2019-11-01
 
 ### Fixed
@@ -417,7 +457,12 @@ And today is not April Fools' Day
 
 
 
-[Unreleased]: https://github.com/fnando/i18n-js/compare/v3.4.1...HEAD
+[Unreleased]: https://github.com/fnando/i18n-js/compare/v3.7.0...HEAD
+[3.6.0]:      https://github.com/fnando/i18n-js/compare/v3.6.0...v3.7.0
+[3.6.0]:      https://github.com/fnando/i18n-js/compare/v3.5.1...v3.6.0
+[3.5.1]:      https://github.com/fnando/i18n-js/compare/v3.5.0...v3.5.1
+[3.5.0]:      https://github.com/fnando/i18n-js/compare/v3.4.2...v3.5.0
+[3.4.2]:      https://github.com/fnando/i18n-js/compare/v3.4.1...v3.4.2
 [3.4.1]:      https://github.com/fnando/i18n-js/compare/v3.4.0...v3.4.1
 [3.4.0]:      https://github.com/fnando/i18n-js/compare/v3.3.0...v3.4.0
 [3.3.0]:      https://github.com/fnando/i18n-js/compare/v3.2.3...v3.3.0

data/README.md

@@ -248,9 +248,9 @@ MyNamespace.translations["en"] = { ... }
 ```
 
 
-### Adding a line at the beginning of the translations file (useful for imports)
+### Adding prefix & suffix to the translations file(s)
 
-Setting the `prefix: "import I18n from 'i18n-js';\n"` option will add the line at the beggining of the resultant translation file.
+Setting the `prefix: "import I18n from 'i18n-js';\n"` option will add the line at the beginning of the resultant translation file.
 This can be useful to use this gem with the [i18n-js](https://www.npmjs.com/package/i18n-js) npm package, which is quite useful to use it with webpack.
 The user should provide the semi-colon and the newline character if needed.
 
@@ -267,6 +267,11 @@ will create:
 ```
 import I18n from 'i18n-js';
 I18n.translations || (I18n.translations = {});
+```
+
+
+`suffix` option is added in https://github.com/fnando/i18n-js/pull/561.  
+It's similar to `prefix` so won't explain it in details.
 
 
 #### Pretty Print
@@ -623,7 +628,7 @@ The accepted formats for `I18n.strftime` are:
     %d     - Day of the month (01..31)
     %-d    - Day of the month (1..31)
     %H     - Hour of the day, 24-hour clock (00..23)
-    %-H    - Hour of the day, 24-hour clock (0..23)
+    %-H/%k - Hour of the day, 24-hour clock (0..23)
     %I     - Hour of the day, 12-hour clock (01..12)
     %-I/%l - Hour of the day, 12-hour clock (1..12)
     %m     - Month of the year (01..12)

data/app/assets/javascripts/i18n.js

@@ -779,8 +779,8 @@
   I18n.toCurrency = function(number, options) {
     options = this.prepareOptions(
         options
-      , this.lookup("number.currency.format")
-      , this.lookup("number.format")
+      , this.lookup("number.currency.format", options)
+      , this.lookup("number.format", options)
       , CURRENCY_FORMAT
     );
 
@@ -799,17 +799,17 @@
 
     switch (scope) {
       case "currency":
-        return this.toCurrency(value);
+        return this.toCurrency(value, options);
       case "number":
-        scope = this.lookup("number.format");
+        scope = this.lookup("number.format", options);
         return this.toNumber(value, scope);
       case "percentage":
-        return this.toPercentage(value);
+        return this.toPercentage(value, options);
       default:
         var localizedValue;
 
         if (scope.match(/^(date|time)/)) {
-          localizedValue = this.toTime(scope, value);
+          localizedValue = this.toTime(scope, value, options);
         } else {
           localizedValue = value.toString();
         }
@@ -897,7 +897,7 @@
   //     %d     - Day of the month (01..31)
   //     %-d    - Day of the month (1..31)
   //     %H     - Hour of the day, 24-hour clock (00..23)
-  //     %-H    - Hour of the day, 24-hour clock (0..23)
+  //     %-H/%k - Hour of the day, 24-hour clock (0..23)
   //     %I     - Hour of the day, 12-hour clock (01..12)
   //     %-I/%l - Hour of the day, 12-hour clock (1..12)
   //     %m     - Month of the year (01..12)
@@ -914,8 +914,8 @@
   //     %Y     - Year with century
   //     %z/%Z  - Timezone offset (+0545)
   //
-  I18n.strftime = function(date, format) {
-    var options = this.lookup("date")
+  I18n.strftime = function(date, format, options) {
+    var options = this.lookup("date", options)
       , meridianOptions = I18n.meridian()
     ;
 
@@ -961,6 +961,7 @@
     format = format.replace("%-d", day);
     format = format.replace("%H", padding(hour));
     format = format.replace("%-H", hour);
+    format = format.replace("%k", hour);
     format = format.replace("%I", padding(hour12));
     format = format.replace("%-I", hour12);
     format = format.replace("%l", hour12);
@@ -983,9 +984,9 @@
   };
 
   // Convert the given dateString into a formatted date.
-  I18n.toTime = function(scope, dateString) {
+  I18n.toTime = function(scope, dateString, options) {
     var date = this.parseDate(dateString)
-      , format = this.lookup(scope)
+      , format = this.lookup(scope, options)
     ;
 
     // A date input of `null` or `undefined` will be returned as-is
@@ -1002,15 +1003,15 @@
       return date_string;
     }
 
-    return this.strftime(date, format);
+    return this.strftime(date, format, options);
   };
 
   // Convert a number into a formatted percentage value.
   I18n.toPercentage = function(number, options) {
     options = this.prepareOptions(
         options
-      , this.lookup("number.percentage.format")
-      , this.lookup("number.format")
+      , this.lookup("number.percentage.format", options)
+      , this.lookup("number.format", options)
       , PERCENTAGE_FORMAT
     );
 
@@ -1083,9 +1084,9 @@
   };
 
   // Set aliases, so we can save some typing.
-  I18n.t = I18n.translate;
-  I18n.l = I18n.localize;
-  I18n.p = I18n.pluralize;
+  I18n.t = I18n.translate.bind(I18n);
+  I18n.l = I18n.localize.bind(I18n);
+  I18n.p = I18n.pluralize.bind(I18n);
 
   return I18n;
 }));

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

@@ -206,3 +206,35 @@ if (!Array.prototype.map) {
     return A;
   };
 }
+
+// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_objects/Function/bind
+if (!Function.prototype.bind) (function(){
+  var ArrayPrototypeSlice = Array.prototype.slice;
+  Function.prototype.bind = function(otherThis) {
+    if (typeof this !== 'function') {
+      // closest thing possible to the ECMAScript 5
+      // internal IsCallable function
+      throw new TypeError('Function.prototype.bind - what is trying to be bound is not callable');
+    }
+
+    var baseArgs= ArrayPrototypeSlice .call(arguments, 1),
+        baseArgsLength = baseArgs.length,
+        fToBind = this,
+        fNOP    = function() {},
+        fBound  = function() {
+          baseArgs.length = baseArgsLength; // reset to default base arguments
+          baseArgs.push.apply(baseArgs, arguments);
+          return fToBind.apply(
+                 fNOP.prototype.isPrototypeOf(this) ? this : otherThis, baseArgs
+          );
+        };
+
+    if (this.prototype) {
+      // Function.prototype doesn't have a prototype property
+      fNOP.prototype = this.prototype; 
+    }
+    fBound.prototype = new fNOP();
+
+    return fBound;
+  };
+})();

data/gemfiles/i18n_1_8.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "i18n", "~> 1.8.0"
+
+gemspec path: "../"

data/lib/i18n/js/formatters/base.rb

@@ -2,11 +2,12 @@ module I18n
   module JS
     module Formatters
       class Base
-        def initialize(js_extend: false, namespace: nil, pretty_print: false, prefix: nil)
+        def initialize(js_extend: false, namespace: nil, pretty_print: false, prefix: nil, suffix: nil)
           @js_extend    = js_extend
           @namespace    = namespace
           @pretty_print = pretty_print
           @prefix = prefix
+          @suffix = suffix
         end
 
         protected

data/lib/i18n/js/formatters/js.rb

@@ -9,7 +9,7 @@ module I18n
           translations.each do |locale, translations_for_locale|
             contents << line(locale, format_json(translations_for_locale))
           end
-          contents
+          contents << (@suffix || '')
         end
 
         protected

data/lib/i18n/js/segment.rb

@@ -7,7 +7,7 @@ module I18n
 
     # Class which enscapulates a translations hash and outputs a single JSON translation file
     class Segment
-      OPTIONS = [:namespace, :pretty_print, :js_extend, :prefix, :sort_translation_keys, :json_only].freeze
+      OPTIONS = [:namespace, :pretty_print, :js_extend, :prefix, :suffix, :sort_translation_keys, :json_only].freeze
       LOCALE_INTERPOLATOR = /%\{locale\}/
 
       attr_reader *([:file, :translations] | OPTIONS)
@@ -25,6 +25,7 @@ module I18n
         @pretty_print = !!options[:pretty_print]
         @js_extend    = options.key?(:js_extend) ? !!options[:js_extend] : true
         @prefix       = options.key?(:prefix) ? options[:prefix] : nil
+        @suffix       = options.key?(:suffix) ? options[:suffix] : nil
         @sort_translation_keys = options.key?(:sort_translation_keys) ? !!options[:sort_translation_keys] : true
         @json_only = options.key?(:json_only) ? !!options[:json_only] : false
       end
@@ -70,7 +71,9 @@ module I18n
         { js_extend: @js_extend,
           namespace: @namespace,
           pretty_print: @pretty_print,
-          prefix: @prefix }
+          prefix: @prefix,
+          suffix: @suffix
+        }
       end
     end
   end

data/lib/i18n/js/utils.rb

@@ -14,10 +14,12 @@ module I18n
         v1 || v2
       end
       MERGER = proc do |_key, v1, v2|
-        if Hash === v2 && (v2.keys - PLURAL_KEYS).empty?
-          slice(v2.merge(v1, &PLURAL_MERGER), v2.keys)
-        elsif Hash === v1 && Hash === v2
-          v1.merge(v2, &MERGER)
+        if Hash === v1 && Hash === v2
+          if (v2.keys - PLURAL_KEYS).empty?
+            slice(v2.merge(v1, &PLURAL_MERGER), v2.keys)
+          else
+            v1.merge(v2, &MERGER)
+          end
         else
           v2 || v1
         end

data/lib/i18n/js/version.rb

@@ -2,6 +2,6 @@
 
 module I18n
   module JS
-    VERSION = "3.4.1"
+    VERSION = "3.7.0"
   end
 end

data/package.json

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

data/spec/fixtures/js_file_with_namespace_prefix_and_pretty_print.yml

@@ -6,3 +6,4 @@ translations:
     namespace: "Foo"
     pretty_print: true
     prefix: "import random from 'random-library';\n"
+    suffix: "//test"

data/spec/fixtures/locales.yml

@@ -1,5 +1,9 @@
 en:
   number:
+    human:
+      decimal_units:
+        units:
+          million: Million
     format:
       separator: "."
       delimiter: ","
@@ -48,6 +52,15 @@ en:
     one: Cat
     other: Cats
 
+es:
+  number:
+    human:
+      decimal_units:
+        units:
+          million:
+            one: millón
+            other: millones
+
 ru:
   merge_plurals_with_no_overrides:
     one: кот

data/spec/fixtures/millions.yml

@@ -0,0 +1,4 @@
+translations:
+  - file: "tmp/i18n-js/millions.js"
+    only:
+      - "*.number.human.decimal_units.units"

data/spec/js/dates.spec.js

@@ -132,6 +132,7 @@ describe("Dates", function(){
 
     // 24-hour without padding
     expect(I18n.strftime(date, "%-H")).toEqual("7");
+    expect(I18n.strftime(date, "%k")).toEqual("7");
 
     // 12-hour without padding
     expect(I18n.strftime(date, "%-I")).toEqual("7");

data/spec/js/localization.spec.js

@@ -10,45 +10,69 @@ describe("Localization", function(){
     I18n.translations = Translations();
   });
 
+  it("sets bound alias", function() {
+    expect(I18n.l).toEqual(jasmine.any(Function));
+    expect(I18n.l).not.toBe(I18n.localize);
+  });
+
   it("localizes number", function(){
-    expect(I18n.l("number", 1234567)).toEqual("1,234,567.000");
+    expect(I18n.localize("number", 1234567)).toEqual("1,234,567.000");
+  });
+
+  it("localizes number with 'l' shortcut", function(){
+    var l = I18n.l;
+    expect(l("number", 1234567)).toEqual("1,234,567.000");
   });
 
   it("localizes currency", function(){
-    expect(I18n.l("currency", 1234567)).toEqual("$1,234,567.00");
+    expect(I18n.localize("currency", 1234567)).toEqual("$1,234,567.00");
   });
 
   it("localizes date strings", function(){
     I18n.locale = "pt-BR";
 
-    expect(I18n.l("date.formats.default", "2009-11-29")).toEqual("29/11/2009");
-    expect(I18n.l("date.formats.short", "2009-01-07")).toEqual("07 de Janeiro");
-    expect(I18n.l("date.formats.long", "2009-01-07")).toEqual("07 de Janeiro de 2009");
+    expect(I18n.localize("date.formats.default", "2009-11-29")).toEqual("29/11/2009");
+    expect(I18n.localize("date.formats.short", "2009-01-07")).toEqual("07 de Janeiro");
+    expect(I18n.localize("date.formats.long", "2009-01-07")).toEqual("07 de Janeiro de 2009");
+  });
+
+  it("localizes strings with locale from options", function(){
+    I18n.locale = "en";
+
+    expect(I18n.localize("date.formats.default", "2009-11-29", { locale: "pt-BR" })).toEqual("29/11/2009");
+    expect(I18n.localize("date.formats.short", "2009-01-07", { locale: "pt-BR" })).toEqual("07 de Janeiro");
+    expect(I18n.localize("date.formats.long", "2009-01-07", { locale: "pt-BR" })).toEqual("07 de Janeiro de 2009");
+    expect(I18n.localize("time.formats.default", "2009-11-29 15:07:59", { locale: "pt-BR" })).toEqual("Domingo, 29 de Novembro de 2009, 15:07 h");
+    expect(I18n.localize("time.formats.short", "2009-01-07 09:12:35", { locale: "pt-BR" })).toEqual("07/01, 09:12 h");
+    expect(I18n.localize("time.formats.long", "2009-11-29 15:07:59", { locale: "pt-BR" })).toEqual("Domingo, 29 de Novembro de 2009, 15:07 h");
+    expect(I18n.localize("number", 1234567, { locale: "pt-BR" })).toEqual("1,234,567.000");
+    expect(I18n.localize("currency", 1234567, { locale: "pt-BR" })).toEqual("R$ 1.234.567,00");
+    expect(I18n.localize("percentage", 123.45, { locale: "pt-BR" })).toEqual("123,45%");
   });
 
   it("localizes time strings", function(){
     I18n.locale = "pt-BR";
 
-    expect(I18n.l("time.formats.default", "2009-11-29 15:07:59")).toEqual("Domingo, 29 de Novembro de 2009, 15:07 h");
-    expect(I18n.l("time.formats.short", "2009-01-07 09:12:35")).toEqual("07/01, 09:12 h");
-    expect(I18n.l("time.formats.long", "2009-11-29 15:07:59")).toEqual("Domingo, 29 de Novembro de 2009, 15:07 h");
+    expect(I18n.localize("time.formats.default", "2009-11-29 15:07:59")).toEqual("Domingo, 29 de Novembro de 2009, 15:07 h");
+    expect(I18n.localize("time.formats.short", "2009-01-07 09:12:35")).toEqual("07/01, 09:12 h");
+    expect(I18n.localize("time.formats.long", "2009-11-29 15:07:59")).toEqual("Domingo, 29 de Novembro de 2009, 15:07 h");
   });
 
   it("return 'Invalid Date' or original value for invalid input", function(){
-    expect(I18n.l("time.formats.default", "")).toEqual("Invalid Date");
-    expect(I18n.l("time.formats.default", null)).toEqual(null);
-    expect(I18n.l("time.formats.default", undefined)).toEqual(undefined);
+    expect(I18n.localize("time.formats.default", "")).toEqual("Invalid Date");
+    expect(I18n.localize("time.formats.default", null)).toEqual(null);
+    expect(I18n.localize("time.formats.default", undefined)).toEqual(undefined);
   });
 
   it("localizes date/time strings with placeholders", function(){
     I18n.locale = "pt-BR";
 
-    expect(I18n.l("date.formats.short_with_placeholders", "2009-01-07", { p1: "!", p2: "?" })).toEqual("07 de Janeiro ! ?");
-    expect(I18n.l("time.formats.short_with_placeholders", "2009-01-07 09:12:35", { p1: "!" })).toEqual("07/01, 09:12 h !");
+    expect(I18n.localize("date.formats.short_with_placeholders", "2009-01-07", { p1: "!", p2: "?" })).toEqual("07 de Janeiro ! ?");
+    expect(I18n.localize("time.formats.short_with_placeholders", "2009-01-07 09:12:35", { p1: "!" })).toEqual("07/01, 09:12 h !");
   });
 
   it("localizes percentage", function(){
     I18n.locale = "pt-BR";
-    expect(I18n.l("percentage", 123.45)).toEqual("123,45%");
+    expect(I18n.localize("percentage", 123.45)).toEqual("123,45%");
   });
 });

data/spec/js/pluralization.spec.js

@@ -10,8 +10,9 @@ describe("Pluralization", function(){
     I18n.translations = Translations();
   });
 
-  it("sets alias", function() {
-    expect(I18n.p).toEqual(I18n.pluralize);
+  it("sets bound alias", function() {
+    expect(I18n.p).toEqual(jasmine.any(Function));
+    expect(I18n.p).not.toBe(I18n.pluralize);
   });
 
   it("pluralizes scope", function(){
@@ -20,6 +21,13 @@ describe("Pluralization", function(){
     expect(I18n.p(5, "inbox")).toEqual("You have 5 messages");
   });
 
+  it("pluralizes scope with 'p' shortcut", function(){
+    var p = I18n.p;
+    expect(p(0, "inbox")).toEqual("You have no messages");
+    expect(p(1, "inbox")).toEqual("You have 1 message");
+    expect(p(5, "inbox")).toEqual("You have 5 messages");
+  });
+
   it("pluralizes using the 'other' scope", function(){
     I18n.translations["en"]["inbox"]["zero"] = null;
     expect(I18n.p(0, "inbox")).toEqual("You have 0 messages");

data/spec/js/translate.spec.js

@@ -10,35 +10,45 @@ describe("Translate", function(){
     I18n.translations = Translations();
   });
 
+  it("sets bound alias", function() {
+    expect(I18n.t).toEqual(jasmine.any(Function));
+    expect(I18n.t).not.toBe(I18n.translate);
+  });
+
   it("returns translation for single scope", function(){
-    expect(I18n.t("hello")).toEqual("Hello World!");
+    expect(I18n.translate("hello")).toEqual("Hello World!");
+  });
+
+  it("returns translation with 't' shortcut", function(){
+    var t = I18n.t;
+    expect(t("hello")).toEqual("Hello World!");
   });
 
   it("returns translation as object", function(){
-    expect(I18n.t("greetings")).toEqual(I18n.translations.en.greetings);
+    expect(I18n.translate("greetings")).toEqual(I18n.translations.en.greetings);
   });
 
   it("returns missing message translation for valid scope with null", function(){
-    actual = I18n.t("null_key");
+    actual = I18n.translate("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");
+    actual = I18n.translate("invalid.scope");
     expected = '[missing "en.invalid.scope" translation]';
     expect(actual).toEqual(expected);
   });
 
   it("returns missing message translation with provided locale for invalid scope", function(){
-    actual = I18n.t("invalid.scope", { locale: "ja" });
+    actual = I18n.translate("invalid.scope", { locale: "ja" });
     expected = '[missing "ja.invalid.scope" translation]';
     expect(actual).toEqual(expected);
   });
 
   it("returns guessed translation if missingBehaviour is set to guess", function(){
     I18n.missingBehaviour = 'guess'
-    actual = I18n.t("invalid.thisIsAutomaticallyGeneratedTranslation");
+    actual = I18n.translate("invalid.thisIsAutomaticallyGeneratedTranslation");
     expected = 'this is automatically generated translation';
     expect(actual).toEqual(expected);
   });
@@ -46,47 +56,47 @@ describe("Translate", function(){
   it("returns guessed translation with prefix if missingBehaviour is set to guess and prefix is also provided", function(){
     I18n.missingBehaviour = 'guess'
     I18n.missingTranslationPrefix = 'EE: '
-    actual = I18n.t("invalid.thisIsAutomaticallyGeneratedTranslation");
+    actual = I18n.translate("invalid.thisIsAutomaticallyGeneratedTranslation");
     expected = 'EE: this is automatically generated translation';
     expect(actual).toEqual(expected);
   });
 
   it("returns missing message translation for valid scope with scope", function(){
-    actual = I18n.t("monster", {scope: "greetings"});
+    actual = I18n.translate("monster", {scope: "greetings"});
     expected = '[missing "en.greetings.monster" translation]';
     expect(actual).toEqual(expected);
   });
 
   it("returns translation for single scope on a custom locale", function(){
     I18n.locale = "pt-BR";
-    expect(I18n.t("hello")).toEqual("Olá Mundo!");
+    expect(I18n.translate("hello")).toEqual("Olá Mundo!");
   });
 
   it("returns translation for multiple scopes", function(){
-    expect(I18n.t("greetings.stranger")).toEqual("Hello stranger!");
+    expect(I18n.translate("greetings.stranger")).toEqual("Hello stranger!");
   });
 
   it("returns translation with default locale option", function(){
-    expect(I18n.t("hello", {locale: "en"})).toEqual("Hello World!");
-    expect(I18n.t("hello", {locale: "pt-BR"})).toEqual("Olá Mundo!");
+    expect(I18n.translate("hello", {locale: "en"})).toEqual("Hello World!");
+    expect(I18n.translate("hello", {locale: "pt-BR"})).toEqual("Olá Mundo!");
   });
 
   it("fallbacks to the default locale when I18n.fallbacks is enabled", function(){
     I18n.locale = "pt-BR";
     I18n.fallbacks = true;
-    expect(I18n.t("greetings.stranger")).toEqual("Hello stranger!");
+    expect(I18n.translate("greetings.stranger")).toEqual("Hello stranger!");
   });
 
   it("fallbacks to default locale when providing an unknown locale", function(){
     I18n.locale = "fr";
     I18n.fallbacks = true;
-    expect(I18n.t("greetings.stranger")).toEqual("Hello stranger!");
+    expect(I18n.translate("greetings.stranger")).toEqual("Hello stranger!");
   });
 
   it("fallbacks to less specific locale", function(){
     I18n.locale = "de-DE";
     I18n.fallbacks = true;
-    expect(I18n.t("hello")).toEqual("Hallo Welt!");
+    expect(I18n.translate("hello")).toEqual("Hallo Welt!");
   });
 
   describe("when a 3-part locale is used", function(){
@@ -96,15 +106,15 @@ describe("Translate", function(){
     });
 
     it("fallbacks to 2-part locale when absent", function(){
-      expect(I18n.t("cat")).toEqual("貓");
+      expect(I18n.translate("cat")).toEqual("貓");
     });
 
     it("fallbacks to 1-part locale when 2-part missing requested translation", function(){
-      expect(I18n.t("dog")).toEqual("狗");
+      expect(I18n.translate("dog")).toEqual("狗");
     });
 
     it("fallbacks to 2-part for the first time", function(){
-      expect(I18n.t("dragon")).toEqual("龍");
+      expect(I18n.translate("dragon")).toEqual("龍");
     });
   });
 
@@ -115,7 +125,7 @@ describe("Translate", function(){
       return ["nb"];
     };
 
-    expect(I18n.t("hello")).toEqual("Hei Verden!");
+    expect(I18n.translate("hello")).toEqual("Hei Verden!");
   });
 
   it("fallbacks using custom rules (array)", function() {
@@ -123,7 +133,7 @@ describe("Translate", function(){
     I18n.fallbacks = true;
     I18n.locales["no"] = ["no", "nb"];
 
-    expect(I18n.t("hello")).toEqual("Hei Verden!");
+    expect(I18n.translate("hello")).toEqual("Hei Verden!");
   });
 
   it("fallbacks using custom rules (string)", function() {
@@ -131,25 +141,25 @@ describe("Translate", function(){
     I18n.fallbacks = true;
     I18n.locales["no"] = "nb";
 
-    expect(I18n.t("hello")).toEqual("Hei Verden!");
+    expect(I18n.translate("hello")).toEqual("Hei Verden!");
   });
 
   describe("when provided default values", function() {
     it("uses scope provided in defaults if scope doesn't exist", function() {
-      actual = I18n.t("Hello!", {defaults: [{scope: "greetings.stranger"}]});
+      actual = I18n.translate("Hello!", {defaults: [{scope: "greetings.stranger"}]});
       expect(actual).toEqual("Hello stranger!");
     });
 
     it("continues to fallback until a scope is found", function() {
       var defaults = [{scope: "foo"}, {scope: "hello"}];
 
-      actual = I18n.t("foo", {defaults: defaults});
+      actual = I18n.translate("foo", {defaults: defaults});
       expect(actual).toEqual("Hello World!");
     });
 
     it("uses message if specified as a default", function() {
       var defaults = [{message: "Hello all!"}];
-      actual = I18n.t("foo", {defaults: defaults});
+      actual = I18n.translate("foo", {defaults: defaults});
       expect(actual).toEqual("Hello all!");
     });
 
@@ -158,7 +168,7 @@ describe("Translate", function(){
           {scope: "bar"}
         , {message: "Hello all!"}
         , {scope: "hello"}];
-      actual = I18n.t("foo", {defaults: defaults});
+      actual = I18n.translate("foo", {defaults: defaults});
       expect(actual).toEqual("Hello all!");
     });
 
@@ -167,7 +177,7 @@ describe("Translate", function(){
           defaults: [{scope: "bar"}]
         , defaultValue: "Hello all!"
       };
-      actual = I18n.t("foo", options);
+      actual = I18n.translate("foo", options);
       expect(actual).toEqual("Hello all!");
     });
 
@@ -176,7 +186,7 @@ describe("Translate", function(){
           defaults: [{scope: "hello"}]
         , defaultValue: "Hello all!"
       };
-      actual = I18n.t("foo", options);
+      actual = I18n.translate("foo", options);
       expect(actual).toEqual("Hello World!");
     })
 
@@ -187,36 +197,36 @@ describe("Translate", function(){
           return scope.toUpperCase();
         }
       };
-      actual = I18n.t("foo", options);
+      actual = I18n.translate("foo", options);
       expect(actual).toEqual("FOO");
     })
 
     it("pluralizes using the correct scope if translation is found within default scope", function() {
       expect(I18n.translations["en"]["mailbox"]).toEqual(undefined);
-      actual = I18n.t("mailbox.inbox", {count: 1, defaults: [{scope: "inbox"}]});
-      expected = I18n.t("inbox", {count: 1})
+      actual = I18n.translate("mailbox.inbox", {count: 1, defaults: [{scope: "inbox"}]});
+      expected = I18n.translate("inbox", {count: 1})
       expect(actual).toEqual(expected)
     })
   });
 
   it("uses default value for simple translation", function(){
-    actual = I18n.t("warning", {defaultValue: "Warning!"});
+    actual = I18n.translate("warning", {defaultValue: "Warning!"});
     expect(actual).toEqual("Warning!");
   });
 
   it("uses default value for plural translation", function(){
-    actual = I18n.t("message", {defaultValue: { one: '%{count} message', other: '%{count} messages'}, count: 1});
+    actual = I18n.translate("message", {defaultValue: { one: '%{count} message', other: '%{count} messages'}, count: 1});
     expect(actual).toEqual("1 message");
   });
 
   it("uses default value for unknown locale", function(){
     I18n.locale = "fr";
-    actual = I18n.t("warning", {defaultValue: "Warning!"});
+    actual = I18n.translate("warning", {defaultValue: "Warning!"});
     expect(actual).toEqual("Warning!");
   });
 
   it("uses default value with interpolation", function(){
-    actual = I18n.t(
+    actual = I18n.translate(
       "alert",
       {defaultValue: "Attention! {{message}}", message: "You're out of quota!"}
     );
@@ -225,33 +235,33 @@ describe("Translate", function(){
   });
 
   it("ignores default value when scope exists", function(){
-    actual = I18n.t("hello", {defaultValue: "What's up?"});
+    actual = I18n.translate("hello", {defaultValue: "What's up?"});
     expect(actual).toEqual("Hello World!");
   });
 
   it("returns translation for custom scope separator", function(){
     I18n.defaultSeparator = "•";
-    actual = I18n.t("greetings•stranger");
+    actual = I18n.translate("greetings•stranger");
     expect(actual).toEqual("Hello stranger!");
   });
 
   it("returns boolean values", function() {
-    expect(I18n.t("booleans.yes")).toEqual(true);
-    expect(I18n.t("booleans.no")).toEqual(false);
+    expect(I18n.translate("booleans.yes")).toEqual(true);
+    expect(I18n.translate("booleans.no")).toEqual(false);
   });
 
   it("escapes $ when doing substitution (IE)", function(){
     I18n.locale = "en";
 
-    expect(I18n.t("paid", {price: "$0"})).toEqual("You were paid $0");
-    expect(I18n.t("paid", {price: "$0.12"})).toEqual("You were paid $0.12");
-    expect(I18n.t("paid", {price: "$1.35"})).toEqual("You were paid $1.35");
+    expect(I18n.translate("paid", {price: "$0"})).toEqual("You were paid $0");
+    expect(I18n.translate("paid", {price: "$0.12"})).toEqual("You were paid $0.12");
+    expect(I18n.translate("paid", {price: "$1.35"})).toEqual("You were paid $1.35");
   });
 
   it("replaces all occurrences of escaped $", function(){
     I18n.locale = "en";
 
-    expect(I18n.t("paid_with_vat", {
+    expect(I18n.translate("paid_with_vat", {
       price: "$0.12",
       vat: "$0.02"}
     )).toEqual("You were paid $0.12 (incl. VAT $0.02)");
@@ -259,20 +269,20 @@ describe("Translate", function(){
 
   it("sets default scope", function(){
     var options = {scope: "greetings"};
-    expect(I18n.t("stranger", options)).toEqual("Hello stranger!");
+    expect(I18n.translate("stranger", options)).toEqual("Hello stranger!");
   });
 
   it("accepts the scope as an array", function(){
-    expect(I18n.t(["greetings", "stranger"])).toEqual("Hello stranger!");
+    expect(I18n.translate(["greetings", "stranger"])).toEqual("Hello stranger!");
   });
 
   it("accepts the scope as an array using a base scope", function(){
-    expect(I18n.t(["stranger"], {scope: "greetings"})).toEqual("Hello stranger!");
+    expect(I18n.translate(["stranger"], {scope: "greetings"})).toEqual("Hello stranger!");
   });
 
   it("returns an array with values interpolated", function(){
     var options = {value: 314};
-    expect(I18n.t("arrayWithParams", options)).toEqual([
+    expect(I18n.translate("arrayWithParams", options)).toEqual([
       null,
       "An item with a param of " + options.value,
       "Another item with a param of " + options.value,

data/spec/js/translations.js

@@ -90,7 +90,16 @@
         hello: "Olá Mundo!"
 
       , number: {
-          percentage: {
+          currency: {
+            format: {
+              delimiter: ".",
+              format: "%u %n",
+              precision: 2,
+              separator: ",",
+              unit: "R$"
+            }
+          }
+          , percentage: {
             format: {
                 delimiter: ""
               , separator: ","

data/spec/ruby/i18n/js_spec.rb

@@ -351,7 +351,7 @@ EOS
     end
   end
 
-  context "namespace, prefix and pretty_print options" do
+  context "namespace, prefix, suffix, and pretty_print options" do
 
     before do
       stub_const('I18n::JS::DEFAULT_EXPORT_DIR_PATH', temp_path)
@@ -379,6 +379,7 @@ EOS
   "foo": "Foo",
   "fallback_test": "Success"
 };
+//test
 EOS
 }$/)
     end
@@ -598,7 +599,7 @@ EOS
         it "exports with the keys sorted" do
           expect(subject).to eq <<EOS
 I18n.translations || (I18n.translations = {});
-I18n.translations["en"] = I18n.extend((I18n.translations["en"] || {}), {"admin":{"edit":{"title":"Edit"},"show":{"note":"more details","title":"Show"}},"date":{"abbr_day_names":["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],"abbr_month_names":[null,"Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],"day_names":["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],"formats":{"default":"%Y-%m-%d","long":"%B %d, %Y","short":"%b %d"},"month_names":[null,"January","February","March","April","May","June","July","August","September","October","November","December"]},"fallback_test":"Success","foo":"Foo","merge_plurals":{"one":"Apple","other":"Apples"},"merge_plurals_with_no_overrides":{"one":"Apple","other":"Apples","zero":"No Apple"},"merge_plurals_with_partial_overrides":{"one":"Cat","other":"Cats"},"null_test":"fallback for null","number":{"currency":{"format":{"delimiter":",","format":"%u%n","precision":2,"separator":".","unit":"$"}},"format":{"delimiter":",","precision":3,"separator":"."}},"time":{"am":"am","formats":{"default":"%a, %d %b %Y %H:%M:%S %z","long":"%B %d, %Y %H:%M","short":"%d %b %H:%M"},"pm":"pm"}});
+I18n.translations["en"] = I18n.extend((I18n.translations["en"] || {}), {"admin":{"edit":{"title":"Edit"},"show":{"note":"more details","title":"Show"}},"date":{"abbr_day_names":["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],"abbr_month_names":[null,"Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],"day_names":["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],"formats":{"default":"%Y-%m-%d","long":"%B %d, %Y","short":"%b %d"},"month_names":[null,"January","February","March","April","May","June","July","August","September","October","November","December"]},"fallback_test":"Success","foo":"Foo","merge_plurals":{"one":"Apple","other":"Apples"},"merge_plurals_with_no_overrides":{"one":"Apple","other":"Apples","zero":"No Apple"},"merge_plurals_with_partial_overrides":{"one":"Cat","other":"Cats"},"null_test":"fallback for null","number":{"currency":{"format":{"delimiter":",","format":"%u%n","precision":2,"separator":".","unit":"$"}},"format":{"delimiter":",","precision":3,"separator":"."},"human":{"decimal_units":{"units":{"million":"Million"}}}},"time":{"am":"am","formats":{"default":"%a, %d %b %Y %H:%M:%S %z","long":"%B %d, %Y %H:%M","short":"%d %b %H:%M"},"pm":"pm"}});
 EOS
         end
       end
@@ -610,6 +611,34 @@ EOS
       stub_const('I18n::JS::DEFAULT_EXPORT_DIR_PATH', temp_path)
     end
 
+    # https://github.com/fnando/i18n-js/issues/553
+    describe "millions" do
+      before do
+        stub_const('I18n::JS::DEFAULT_EXPORT_DIR_PATH', temp_path)
+      end
+
+      subject do
+        File.read(File.join(I18n::JS.export_i18n_js_dir_path, "millions.js"))
+      end
+
+      it "should correctly export millions" do
+        set_config "millions.yml"
+        I18n::JS.export
+        file_should_exist "millions.js"
+
+        expect(subject).to eq <<EOS
+I18n.translations || (I18n.translations = {});
+I18n.translations[\"de\"] = I18n.extend((I18n.translations[\"de\"] || {}), {\"number\":{\"human\":{\"decimal_units\":{\"units\":{\"million\":\"Million\"}}}}});
+I18n.translations[\"en\"] = I18n.extend((I18n.translations[\"en\"] || {}), {\"number\":{\"human\":{\"decimal_units\":{\"units\":{\"million\":\"Million\"}}}}});
+I18n.translations[\"en-US\"] = I18n.extend((I18n.translations[\"en-US\"] || {}), {\"number\":{\"human\":{\"decimal_units\":{\"units\":{\"million\":\"Million\"}}}}});
+I18n.translations[\"es\"] = I18n.extend((I18n.translations[\"es\"] || {}), {\"number\":{\"human\":{\"decimal_units\":{\"units\":{\"million\":{\"one\":\"millón\",\"other\":\"millones\"}}}}}});
+I18n.translations[\"fr\"] = I18n.extend((I18n.translations[\"fr\"] || {}), {\"number\":{\"human\":{\"decimal_units\":{\"units\":{\"million\":\"Million\"}}}}});
+I18n.translations[\"ja\"] = I18n.extend((I18n.translations[\"ja\"] || {}), {\"number\":{\"human\":{\"decimal_units\":{\"units\":{\"million\":\"Million\"}}}}});
+I18n.translations[\"ru\"] = I18n.extend((I18n.translations[\"ru\"] || {}), {\"number\":{\"human\":{\"decimal_units\":{\"units\":{\"million\":\"Million\"}}}}});
+EOS
+      end
+    end
+
     it "exports with js_extend option at parent level" do
       set_config "js_extend_parent.yml"
       I18n::JS.export
@@ -681,6 +710,7 @@ I18n.translations || (I18n.translations = {});
 I18n.translations[\"de\"] = I18n.extend((I18n.translations[\"de\"] || {}), {\"merge_plurals_with_no_overrides\":{\"one\":\"Apple\",\"other\":\"Apples\",\"zero\":\"No Apple\"}});
 I18n.translations[\"en\"] = I18n.extend((I18n.translations[\"en\"] || {}), {\"merge_plurals_with_no_overrides\":{\"one\":\"Apple\",\"other\":\"Apples\",\"zero\":\"No Apple\"}});
 I18n.translations[\"en-US\"] = I18n.extend((I18n.translations[\"en-US\"] || {}), {\"merge_plurals_with_no_overrides\":{\"one\":\"Apple\",\"other\":\"Apples\",\"zero\":\"No Apple\"}});
+I18n.translations[\"es\"] = I18n.extend((I18n.translations[\"es\"] || {}), {\"merge_plurals_with_no_overrides\":{\"one\":\"Apple\",\"other\":\"Apples\",\"zero\":\"No Apple\"}});
 I18n.translations[\"fr\"] = I18n.extend((I18n.translations[\"fr\"] || {}), {\"merge_plurals_with_no_overrides\":{\"one\":\"Apple\",\"other\":\"Apples\",\"zero\":\"No Apple\"}});
 I18n.translations[\"ja\"] = I18n.extend((I18n.translations[\"ja\"] || {}), {\"merge_plurals_with_no_overrides\":{\"one\":\"Apple\",\"other\":\"Apples\",\"zero\":\"No Apple\"}});
 I18n.translations[\"ru\"] = I18n.extend((I18n.translations[\"ru\"] || {}), {\"merge_plurals_with_no_overrides\":{\"few\":\"кошек\",\"many\":\"кошка\",\"one\":\"кот\",\"other\":\"кошек\"}});
@@ -708,6 +738,7 @@ I18n.translations || (I18n.translations = {});
 I18n.translations[\"de\"] = I18n.extend((I18n.translations[\"de\"] || {}), {\"merge_plurals_with_partial_overrides\":{\"one\":\"Cat\",\"other\":\"Cats\"}});
 I18n.translations[\"en\"] = I18n.extend((I18n.translations[\"en\"] || {}), {\"merge_plurals_with_partial_overrides\":{\"one\":\"Cat\",\"other\":\"Cats\"}});
 I18n.translations[\"en-US\"] = I18n.extend((I18n.translations[\"en-US\"] || {}), {\"merge_plurals_with_partial_overrides\":{\"few\":null,\"many\":null,\"one\":\"Cat\",\"other\":\"Cats\"}});
+I18n.translations[\"es\"] = I18n.extend((I18n.translations[\"es\"] || {}), {\"merge_plurals_with_partial_overrides\":{\"one\":\"Cat\",\"other\":\"Cats\"}});
 I18n.translations[\"fr\"] = I18n.extend((I18n.translations[\"fr\"] || {}), {\"merge_plurals_with_partial_overrides\":{\"one\":\"Cat\",\"other\":\"Cats\"}});
 I18n.translations[\"ja\"] = I18n.extend((I18n.translations[\"ja\"] || {}), {\"merge_plurals_with_partial_overrides\":{\"one\":\"Cat\",\"other\":\"Cats\"}});
 I18n.translations[\"ru\"] = I18n.extend((I18n.translations[\"ru\"] || {}), {\"merge_plurals_with_partial_overrides\":{\"one\":\"Cat\",\"other\":\"Cats\"}});

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-js
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 3.7.0
 platform: ruby
 authors:
 - Nando Vieira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-01 00:00:00.000000000 Z
+date: 2020-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -126,6 +126,7 @@ files:
 - gemfiles/i18n_1_5.gemfile
 - gemfiles/i18n_1_6.gemfile
 - gemfiles/i18n_1_7.gemfile
+- gemfiles/i18n_1_8.gemfile
 - i18n-js.gemspec
 - lib/i18n-js.rb
 - lib/i18n/js.rb
@@ -167,6 +168,7 @@ files:
 - spec/fixtures/merge_plurals.yml
 - spec/fixtures/merge_plurals_with_no_overrides.yml
 - spec/fixtures/merge_plurals_with_partial_overrides.yml
+- spec/fixtures/millions.yml
 - spec/fixtures/multiple_conditions.yml
 - spec/fixtures/multiple_conditions_per_locale.yml
 - spec/fixtures/multiple_files.yml
@@ -221,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.3
 signing_key: 
 specification_version: 4
 summary: It's a small library to provide the Rails I18n translations on the Javascript.
@@ -249,6 +251,7 @@ test_files:
 - spec/fixtures/merge_plurals.yml
 - spec/fixtures/merge_plurals_with_no_overrides.yml
 - spec/fixtures/merge_plurals_with_partial_overrides.yml
+- spec/fixtures/millions.yml
 - spec/fixtures/multiple_conditions.yml
 - spec/fixtures/multiple_conditions_per_locale.yml
 - spec/fixtures/multiple_files.yml