i18n-js 3.5.0 → 3.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b0e768392d4f11e954143639a70556e397560dcb9b970b80ffe3082ba288bf2
-  data.tar.gz: f385a60d70b37dc5945692d276aa0fc5ce40b9c4dd61e5123be1a21c859cacb3
+  metadata.gz: b219edefbe002f4d278f6677a3d1b25a313392e9bcef34f5a6c6ac3ac4a2dd90
+  data.tar.gz: 8aa014849035847f081f9ef53f1824d1405feedb5d2eb61a979885bf3d8b4d06
 SHA512:
-  metadata.gz: 6e9a52a4c632031c4f42554da5e67bd2b138ab42c1a65dc6bca2a8a1aa60184e641c895dac95996d48ad2e285811c47152c5b56d82b4dee40a985607f83b4ec4
-  data.tar.gz: 254934f35ead75fde6842038ca2e4c8fee13492814b56da9a7b7ab080848a02446a9320efc92fd47eebe322ea4845bcbcd86d86396b1e9435e4ce1af63995178
+  metadata.gz: e75a5ebff4ca0a1572376a816185c42e21ee343b4a44c8b3a4a2c7831241bc5af77a79522b1ce541e86773bce39ae3088365c67fdd8dfe245af522c808ecebaa
+  data.tar.gz: dceaa789df1e2712849300687afcabbbc73a3f4557d2cb3f08bafda30f357ea9b9d794cf914240398cec8798a102f54d9839bdc92d53327e3124715eddcf1c8f

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.8.0] - 2020-10-15
+
+### Added
+
+- [JS] Add option `scope` for `toHumanSize()`  
+  (PR: https://github.com/fnando/i18n-js/pull/583)
+
+
+## [3.7.1] - 2020-06-30
+
+### Fixed
+
+- [JS] For translation missing behaviour `guess`, replace all underscores to spaces properly  
+  (PR: https://github.com/fnando/i18n-js/pull/574)
+
+
+## [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
@@ -433,7 +473,12 @@ And today is not April Fools' Day
 
 
 
-[Unreleased]: https://github.com/fnando/i18n-js/compare/v3.5.0...HEAD
+[Unreleased]: https://github.com/fnando/i18n-js/compare/v3.8.0...HEAD
+[3.8.0]:      https://github.com/fnando/i18n-js/compare/v3.7.1...v3.8.0
+[3.7.1]:      https://github.com/fnando/i18n-js/compare/v3.7.0...v3.7.1
+[3.7.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

data/README.md

@@ -37,6 +37,18 @@ Add the gem to your Gemfile.
 gem "i18n-js"
 ```
 
+#### Rails with [webpacker](https://github.com/rails/webpacker)
+
+If you're using `webpacker`, you may need to add the dependencies to your client with:
+
+```
+yarn add i18n-js
+# or, if you're using npm,
+npm install i18n-js
+```
+
+For more details, see [this gist](https://gist.github.com/bazzel/ecdff4718962e57c2d5569cf01d332fe).
+
 #### Rails app with [Asset Pipeline](http://guides.rubyonrails.org/asset_pipeline.html)
 
 If you're using the [asset pipeline](http://guides.rubyonrails.org/asset_pipeline.html),
@@ -248,9 +260,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 +279,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
@@ -320,7 +337,7 @@ var i18n = require("i18n-js");
 
 ### Setting up
 
-You **don't** need to set up a thing. The default settings will work just okay. But if you want to split translations into several files or specify specific contexts, you can follow the rest of this setting up section.
+You **don't** need to set up a thing. The default settings will work just okay. But if you want to split translations into several files or specify contexts, you can follow the rest of this setting up section.
 
 Set your locale is easy as
 ```javascript
@@ -388,7 +405,7 @@ I18n.t("some.missing.scope", {defaults: [{scope: "some.existing.scope"}]});
 I18n.t("some.missing.scope", {defaults: [{message: "Some message"}]});
 ```
 
-Default values must be provided as an array of hashs where the key is the
+Default values must be provided as an array of hashes where the key is the
 type of translation desired, a `scope` or a `message`. The translation returned
 will be either the first scope recognized, or the first message defined.
 
@@ -487,7 +504,7 @@ I18n.pluralization["ru"] = function (count) {
 };
 ```
 
-You can find all rules on <http://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html>.
+You can find all rules on <https://unicode-org.github.io/cldr-staging/charts/37/supplemental/language_plural_rules.html>.
 
 If you're using the same scope over and over again, you may use the `scope` option.
 
@@ -569,6 +586,7 @@ The `toHumanSize` function accepts the following options:
 - `delimiter`: defaults to `""`
 - `strip_insignificant_zeros`: defaults to `false`
 - `format`: defaults to `%n%u`
+- `scope`: defaults to `""`
 
 <!---->
 
@@ -723,7 +741,7 @@ This method is useful for very large apps where a single contained translations.
 
 To use this with require.js we are only going to change a few things from above.
 
-1. In your `config/i18n-js.yml` we need to add a better location for the i18n to be exported. You want to use this location so that it can be properly precompiled by r.js.
+1. In your `config/i18n-js.yml` we need to add a better location for the i18n to be exported to. You want to use this location so that it can be properly precompiled by r.js.
 
   ```yaml
   export_i18n_js: "app/assets/javascript/nls"
@@ -767,7 +785,7 @@ To use this with require.js we are only going to change a few things from above.
       // ...
   });
   ```
-4. (optional) As an additional configuration we can make a task to be run before the requirejs optimizer. This will allow any automated scripts that run the requirejs optimizer to export the strings before we run r.js
+4. (optional) As an additional configuration we can make a task to be run before the requirejs optimizer. This will allow any automated scripts that run the requirejs optimizer to export the strings before we run r.js.
 
   ```rake
   # lib/tasks/i18n.rake
@@ -828,7 +846,7 @@ These commands will remove *all* fingerprinted assets, and you will have to reco
 $ rake assets:precompile
 ```
 
-or similar commands.  If you are precompiling assets on the target machine(s), cached pages may be broken by this, so they will need to be refreshed.
+or similar commands. If you are precompiling assets on the target machine(s), cached pages may be broken by this, so they will need to be refreshed.
 
 2. You can change something in a different locale file.
 
@@ -839,9 +857,9 @@ or similar commands.  If you are precompiling assets on the target machine(s), c
 ### Translations in JS are not updated when Sprockets not loaded before this gem
 
 The "rails engine" declaration will try to detect existence of "sprockets" before adding the initailizer
-If sprockets is loaded after this gem, the preprocessor for 
+If sprockets is loaded after this gem, the preprocessor for
 making JS translations file cache to depend on content of locale files will not be hooked.
-So ensure sprockets is loaded before this gem like moving entry of sprockets in Gemfile or adding "require" statements for sprockets somewhere.
+So ensure sprockets is loaded before this gem by moving the entry of sprockets in the Gemfile or adding "require" statements for sprockets somewhere.
 
 **Note:** See issue [#404](https://github.com/fnando/i18n-js/issues/404) for more details and discussion of this issue.
 

data/app/assets/javascripts/i18n.js

@@ -402,7 +402,7 @@
 
     while (locales.length) {
       locale = locales.shift();
-      scopes = fullScope.split(this.defaultSeparator);
+      scopes = fullScope.split(options.separator || this.defaultSeparator);
       translations = this.translations[locale];
 
       if (!translations) {
@@ -459,7 +459,7 @@
 
     while (locales.length) {
       locale = locales.shift();
-      scopes = scope.split(this.defaultSeparator);
+      scopes = scope.split(options.separator || this.defaultSeparator);
       translations = this.translations[locale];
 
       if (!translations) {
@@ -679,13 +679,13 @@
       var s = scope.split('.').slice(-1)[0];
       //replace underscore with space && camelcase with space and lowercase letter
       return (this.missingTranslationPrefix.length > 0 ? this.missingTranslationPrefix : '') +
-          s.replace('_',' ').replace(/([a-z])([A-Z])/g,
+          s.replace(/_/g,' ').replace(/([a-z])([A-Z])/g,
           function(match, p1, p2) {return p1 + ' ' + p2.toLowerCase()} );
     }
 
     var localeForTranslation = (options != null && options.locale != null) ? options.locale : this.currentLocale();
     var fullScope           = this.getFullScope(scope, options);
-    var fullScopeWithLocale = [localeForTranslation, fullScope].join(this.defaultSeparator);
+    var fullScopeWithLocale = [localeForTranslation, fullScope].join(options.separator || this.defaultSeparator);
 
     return '[missing "' + fullScopeWithLocale + '" translation]';
   };
@@ -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();
         }
@@ -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()
     ;
 
@@ -984,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
@@ -1003,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
     );
 
@@ -1025,6 +1025,7 @@
       , iterations = 0
       , unit
       , precision
+      , fullScope
     ;
 
     while (size >= kb && iterations < 4) {
@@ -1033,10 +1034,12 @@
     }
 
     if (iterations === 0) {
-      unit = this.t("number.human.storage_units.units.byte", {count: size});
+      fullScope = this.getFullScope("number.human.storage_units.units.byte", options);
+      unit = this.t(fullScope, {count: size});
       precision = 0;
     } else {
-      unit = this.t("number.human.storage_units.units." + SIZE_UNITS[iterations]);
+      fullScope = this.getFullScope("number.human.storage_units.units." + SIZE_UNITS[iterations], options);
+      unit = this.t(fullScope);
       precision = (size - Math.floor(size) === 0) ? 0 : 1;
     }
 
@@ -1053,7 +1056,7 @@
 
     // Deal with the scope as an array.
     if (isArray(scope)) {
-      scope = scope.join(this.defaultSeparator);
+      scope = scope.join(options.separator || this.defaultSeparator);
     }
 
     // Deal with the scope option provided through the second argument.
@@ -1061,7 +1064,7 @@
     //    I18n.t('hello', {scope: 'greetings'});
     //
     if (options.scope) {
-      scope = [options.scope, scope].join(this.defaultSeparator);
+      scope = [options.scope, scope].join(options.separator || this.defaultSeparator);
     }
 
     return scope;
@@ -1084,9 +1087,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/i18n-js.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "i18n", ">= 0.6.6"
 
-  s.add_development_dependency "appraisal", "~> 2.0"
+  s.add_development_dependency "appraisal", "~> 2.3"
   s.add_development_dependency "rspec", "~> 3.0"
   s.add_development_dependency "rake", "~> 12.0"
   s.add_development_dependency "gem-release", ">= 0.7"

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/version.rb

@@ -2,6 +2,6 @@
 
 module I18n
   module JS
-    VERSION = "3.5.0"
+    VERSION = "3.8.0"
   end
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "i18n-js",
-  "version": "3.5.0",
+  "version": "3.8.0",
   "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/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/numbers.spec.js

@@ -150,6 +150,10 @@ describe("Numbers", function(){
     expect(I18n.toHumanSize(1024 * 1.6, {precision: 0})).toEqual("2KB");
   });
 
+  it("returns number as human size using custom scope", function(){
+    expect(I18n.toHumanSize(1024 * 1024, {scope: "extended"})).toEqual("1Megabyte");
+  });
+
   it("formats numbers with strip insignificant zero", function() {
     options = {separator: ".", delimiter: ",", strip_insignificant_zeros: true};
 

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,83 +10,98 @@ 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");
-    expected = 'this is automatically generated translation';
-    expect(actual).toEqual(expected);
+
+    var actual_1 = I18n.translate("invalid.thisIsAutomaticallyGeneratedTranslation");
+    var expected_1 = 'this is automatically generated translation';
+    expect(actual_1).toEqual(expected_1);
+
+    var actual_2 = I18n.translate("invalid.this_is_automatically_generated_translation");
+    var expected_2 = 'this is automatically generated translation';
+    expect(actual_2).toEqual(expected_2);
   });
 
   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 +111,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 +130,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 +138,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 +146,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 +173,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 +182,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 +191,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 +202,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 +240,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 +274,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,
@@ -281,4 +296,9 @@ describe("Translate", function(){
       {foo: "bar"}
     ]);
   });
+
+
+  it("returns value with key containing dot but different separator specified", function() {
+    expect(I18n.t(["A implies B means something."], {scope: "sentences_with_dots", separator: "|"})).toEqual("A implies B means that when A is true, B must be true.");
+  });
 });

data/spec/js/translations.js

@@ -58,6 +58,18 @@
           }
         }
 
+      , extended: {
+          number: {
+            human: {
+              storage_units: {
+                  units: {
+                    "mb": "Megabyte"
+                }
+              }
+            }
+          }
+        }
+
       , arrayWithParams: [
         null,
         "An item with a param of {{value}}",
@@ -67,7 +79,11 @@
         {foo: "bar"}
       ]
 
-      , null_key: null
+      , null_key: null,
+
+      sentences_with_dots: {
+          "A implies B means something.": "A implies B means that when A is true, B must be true."
+      }
     };
 
     Translations["en-US"] = {
@@ -90,7 +106,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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-js
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.8.0
 platform: ruby
 authors:
 - Nando Vieira
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-11-12 00:00:00.000000000 Z
+date: 2020-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -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
@@ -207,7 +208,7 @@ homepage: http://rubygems.org/gems/i18n-js
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -222,8 +223,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: It's a small library to provide the Rails I18n translations on the Javascript.
 test_files: