i18n-js 3.0.11 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7710293eab5e7adff0b04ffe9183dd61ab18c70e93d75a4680570e8da83deb81
-  data.tar.gz: 8111e523870314db2f1aa49c305797ad1876523fccb9276fc8bd98c2b1a3bff5
+  metadata.gz: 1ddbdc40f7c45b3d6f6efd89f7e38ce602e06309280cf4b23a0c66fbbb465a6f
+  data.tar.gz: 820b05a44bcff8eb060d53a007b9d61342bfaf9d49a1286c69f9dfe2d6cf60dd
 SHA512:
-  metadata.gz: a7f2f4b3b52dbd1528b5dde88292a4b44401c58d59d7a41da253961948ae9c7d2c1233bac4fba8208d5391e9ea6397ed019f1dda3034c89eab9774b9a86b8c3b
-  data.tar.gz: 11be532db0104cec86932f67776754ba7f885c3f00f0335d130ebd8844abcb6fb30703b96e6e9a9827099548166963b642d5bee0f9f687ebd5e24c5598ce6971
+  metadata.gz: 2b9ff1a4f87ba0d8e69e0b2719a2a32ae605a96953a76e443052f7a622b6735aa5e5c0c1a7b3af50e98558c3ab9e1d04d7a32d67c5acd4cb328cd99f10092531
+  data.tar.gz: 76d742dd79d8af3e6d689487096efe318cd7e4eabd3b2c8c67157b90357ca8eeea106c820d3ef832ec802daefdb28e6a7081c14d9a66128c0bf3bb8fcdb031cd

data/CHANGELOG.md

@@ -18,6 +18,19 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Nothing
 
 
+## [3.1.0] - 2018-11-01
+
+### Added
+
+- [Ruby] Add option to allow setting a different I18n backend
+  (PR: https://github.com/fnando/i18n-js/pull/519)
+
+### Fixed
+
+- [JS] Fix missing translation when pluralizing with default scopes
+  (PR: https://github.com/fnando/i18n-js/pull/516)
+
+
 ## [3.0.11] - 2018-07-06
 
 ### Fixed
@@ -334,7 +347,8 @@ And today is not April Fools' Day
 
 
 
-[Unreleased]: https://github.com/fnando/i18n-js/compare/v3.0.11...HEAD
+[Unreleased]: https://github.com/fnando/i18n-js/compare/v3.1.0...HEAD
+[3.1.0]:     https://github.com/fnando/i18n-js/compare/v3.0.11...v3.1.0
 [3.0.11]:     https://github.com/fnando/i18n-js/compare/v3.0.10...v3.0.11
 [3.0.10]:     https://github.com/fnando/i18n-js/compare/v3.0.9...v3.0.10
 [3.0.9]:      https://github.com/fnando/i18n-js/compare/v3.0.8...v3.0.9

data/README.md

@@ -339,7 +339,12 @@ I18n.t("some.scoped.translation", {locale: "fr"});
 You can also interpolate values:
 
 ```javascript
-I18n.t("hello", {name: "John Doe"});
+// You need the `translations` object setup first
+I18n.translations["en"] = {
+  greeting: "Hello %{name}"
+}
+
+I18n.t("greeting", {name: "John Doe"});
 ```
 You can set default values for missing scopes:
 ```javascript
@@ -576,14 +581,16 @@ I18n.translations["en"] = {
 I18n.l("date.formats.ordinal_day", "2009-09-18", { day: '18th' }); // Sep 18th
 ```
 
-If you prefer, you can use the `I18n.strftime` function to format dates.
+If you prefer, you can use the `I18n.toTime` and `I18n.strftime` functions to format dates.
 
 ```javascript
 var date = new Date();
+I18n.toTime("date.formats.short", "2009-09-18");
+I18n.toTime("date.formats.short", date);
 I18n.strftime(date, "%d/%m/%Y");
 ```
 
-The accepted formats are:
+The accepted formats for `I18n.strftime` are:
 
     %a  - The abbreviated weekday name (Sun)
     %A  - The full weekday name (Sunday)
@@ -813,6 +820,13 @@ So ensure sprockets is loaded before this gem like moving entry of sprockets in
 
 **Note:** See issue [#404](https://github.com/fnando/i18n-js/issues/404) for more details and discussion of this issue.
 
+### JS `I18n.toCurrency` & `I18n.toNumber` cannot handle large integers
+
+The above methods use `toFixed` and it only supports 53 bit integers.  
+Ref: http://2ality.com/2012/07/large-integers.html
+
+Feel free to find & discuss possible solution(s) at issue [#511](https://github.com/fnando/i18n-js/issues/511)
+
 
 ## Maintainer
 

data/app/assets/javascripts/i18n.js

@@ -575,6 +575,7 @@
     var translationOptions = this.createTranslationOptions(scope, options);
 
     var translation;
+    var usedScope = scope;
 
     var optionsWithoutDefault = this.prepareOptions(options)
     delete optionsWithoutDefault.defaultValue
@@ -584,7 +585,8 @@
     var translationFound =
       translationOptions.some(function(translationOption) {
         if (isSet(translationOption.scope)) {
-          translation = this.lookup(translationOption.scope, optionsWithoutDefault);
+          usedScope = translationOption.scope;
+          translation = this.lookup(usedScope, optionsWithoutDefault);
         } else if (isSet(translationOption.message)) {
           translation = lazyEvaluate(translationOption.message, scope);
         }
@@ -605,7 +607,7 @@
         return (typeof(t) === "string" ? this.interpolate(t, options) : t);
       }, this);
     } else if (isObject(translation) && isSet(options.count)) {
-      translation = this.pluralize(options.count, scope, options);
+      translation = this.pluralize(options.count, usedScope, options);
     }
 
     return translation;

data/lib/i18n/js.rb

@@ -28,6 +28,15 @@ module I18n
       @config_file_path = new_path
     end
 
+    # Allow using a different backend than the one globally configured
+    def self.backend
+      @backend ||= I18n.backend
+    end
+
+    def self.backend=(alternative_backend)
+      @backend = alternative_backend
+    end
+
     # Export translations to JavaScript, considering settings
     # from configuration file
     def self.export
@@ -161,7 +170,7 @@ module I18n
 
     # Initialize and return translations
     def self.translations
-      ::I18n.backend.instance_eval do
+      self.backend.instance_eval do
         init_translations unless initialized?
         # When activesupport is absent,
         # the core extension (`#slice`) from `i18n` gem will be used instead

data/lib/i18n/js/fallback_locales.rb

@@ -57,7 +57,7 @@ module I18n
       #
       #   Maybe this should be fixed within I18n.
       def using_i18n_fallbacks_module?
-        I18n.backend.class.included_modules.include?(I18n::Backend::Fallbacks)
+        I18n::JS.backend.class.included_modules.include?(I18n::Backend::Fallbacks)
       end
 
       def ensure_valid_fallbacks_as_array!

data/lib/i18n/js/version.rb

@@ -2,6 +2,6 @@
 
 module I18n
   module JS
-    VERSION = "3.0.11"
+    VERSION = "3.1.0"
   end
 end

data/package.json

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

data/spec/js/translate.spec.js

@@ -190,6 +190,13 @@ describe("Translate", function(){
       actual = I18n.t("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})
+      expect(actual).toEqual(expected)
+    })
   });
 
   it("uses default value for simple translation", function(){

data/spec/ruby/i18n/js/fallback_locales_spec.rb

@@ -55,10 +55,10 @@ describe I18n::JS::FallbackLocales do
       let(:backend_with_fallbacks) { backend_class_with_fallbacks.new }
 
       before do
-        I18n.backend = backend_with_fallbacks
+        I18n::JS.backend = backend_with_fallbacks
         I18n.fallbacks[:fr] = [:de, :en]
       end
-      after { I18n.backend = I18n::Backend::Simple.new }
+      after { I18n::JS.backend = I18n::Backend::Simple.new }
 
       context "given true as fallbacks" do
         let(:fallbacks) { true }

data/spec/ruby/i18n/js_spec.rb

@@ -313,10 +313,10 @@ EOS
       let!(:old_backebad) { I18n.backend }
 
       before do
-        I18n.backend = backend_with_fallbacks
+        I18n::JS.backend = backend_with_fallbacks
         I18n.fallbacks[:fr] = [:de, :en]
       end
-      after { I18n.backend = old_backebad }
+      after { I18n::JS.backend = old_backebad }
 
       it "exports with defined locale as fallback when enabled" do
         set_config "js_file_per_locale_with_fallbacks_enabled.yml"

metadata

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