i18n-js 3.2.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d31e5a96a37e60b0fddf00af9f9bad30a93b66adde3d85e3ad9b9b2771c31bdc
-  data.tar.gz: e615279399a220d76c6678d63e797b2abd5b843ae92078fab95b1bfc220b2b16
+  metadata.gz: ceb49e2e527b6abd26c72eb57d2489197ed2d3991b24bc79acef35869a171232
+  data.tar.gz: 40f6a0b8c6c9d312db6a859123f22f7a8a46e7ef92f495b7ea024d6885e88b85
 SHA512:
-  metadata.gz: f43b695fba0788ca02c5a36776b1f197895cc639640f4fc96a1bb5a8cd236229991f69ab83c08e1a2d0163cc77f68832ba45b34c0f61903b28b76305e590ff94
-  data.tar.gz: 387b2be62ae991d415c9c599cf9b56c4162654bbb2ee5cd5e11b8b264f6d79f2f14b007d16051c4a9d1c5a0b50d15f8f94cbe2b9dea2623a9daf1fe6b92c67bf
+  metadata.gz: 030147ab7bb566fcadadb31090480fbcf233850ec9ea0468e8b4d7d984d8a5a77c7e9a7366e8babb40139313c2306774d10e8812869c0a6c083d66b9a4312224
+  data.tar.gz: 388552233bb2a66c6c899d28daca4a9ca49aa115b19cc765ba2cbe00308f9c4b3840fb92c0ca4fc71a78e5a2bed5a780e8cc7431348a7d53f5b11dc806d741ed

data/.travis.yml

@@ -8,23 +8,25 @@ cache:
   directories:
   - node_modules
 rvm:
-  - 2.1
-  - 2.2
   - 2.3
   - 2.4
   - 2.5
+  - 2.6
   - ruby-head
 before_install:
-# Need to install something extra to test JS
+# Needed to test JS
 - yarn install
-# Bundler 1.16.1 and rubygems 2.7.3 got issue
-# https://github.com/travis-ci/travis-ci/issues/8978#issuecomment-354036443
-- gem update --system
 gemfile:
+  - gemfiles/i18n_0_6.gemfile
+  - gemfiles/i18n_0_7.gemfile
   - gemfiles/i18n_0_8.gemfile
   - gemfiles/i18n_0_9.gemfile
   - gemfiles/i18n_1_0.gemfile
   - gemfiles/i18n_1_1.gemfile
+  - gemfiles/i18n_1_2.gemfile
+  - gemfiles/i18n_1_3.gemfile
+  - gemfiles/i18n_1_4.gemfile
+  - gemfiles/i18n_1_5.gemfile
 matrix:
   fast_finish: true
   allow_failures:

data/Appraisals

@@ -14,3 +14,19 @@ end
 appraise "i18n_1_1" do
   gem "i18n", "~> 1.1.0"
 end
+
+appraise "i18n_1_2" do
+  gem "i18n", "~> 1.2.0"
+end
+
+appraise "i18n_1_3" do
+  gem "i18n", "~> 1.3.0"
+end
+
+appraise "i18n_1_4" do
+  gem "i18n", "~> 1.4.0"
+end
+
+appraise "i18n_1_5" do
+  gem "i18n", "~> 1.5.1"
+end

data/CHANGELOG.md

@@ -18,6 +18,24 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Nothing
 
 
+## [3.2.1] - 2019-01-22
+
+### Changed
+
+- [Ruby] `json_only` option should allow multiple locales.  
+  (PR: https://github.com/fnando/i18n-js/pull/531)
+- [Ruby] Simplified and cleaned code related to JS/JSON formatting.  
+  (PR: https://github.com/fnando/i18n-js/pull/531)
+- [JS] Use strict value comparison
+
+### Fixed
+
+- [Ruby] Relax `i18n` version requirement back to  `>= 0.6.6`  
+  (PR: https://github.com/fnando/i18n-js/pull/530)
+- [Ruby] Fix merging of plural keys across locales.  
+  (PR: https://github.com/fnando/i18n-js/pull/472)
+
+
 ## [3.2.0] - 2018-11-16
 
 ### Added
@@ -359,7 +377,8 @@ And today is not April Fools' Day
 
 
 
-[Unreleased]: https://github.com/fnando/i18n-js/compare/v3.2.0...HEAD
+[Unreleased]: https://github.com/fnando/i18n-js/compare/v3.2.1...HEAD
+[3.2.1]:      https://github.com/fnando/i18n-js/compare/v3.2.0...v3.2.1
 [3.2.0]:      https://github.com/fnando/i18n-js/compare/v3.1.0...v3.2.0
 [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

data/app/assets/javascripts/i18n.js

@@ -107,7 +107,7 @@
     // Shift back
     value = value.toString().split('e');
     return +(value[0] + 'e' + (value[1] ? (+value[1] + exp) : exp));
-  }
+  };
 
   var lazyEvaluate = function(message, scope) {
     if (isFunction(message)) {
@@ -115,7 +115,7 @@
     } else {
       return message;
     }
-  }
+  };
 
   var merge = function (dest, obj) {
     var key, value;
@@ -389,7 +389,7 @@
   // This is used internally by some functions and should not be used as an
   // public API.
   I18n.lookup = function(scope, options) {
-    options = options || {}
+    options = options || {};
 
     var locales = this.locales.get(options.locale).slice()
       , locale
@@ -448,7 +448,7 @@
 
   // Lookup dedicated to pluralization
   I18n.pluralizationLookup = function(count, scope, options) {
-    options = options || {}
+    options = options || {};
     var locales = this.locales.get(options.locale).slice()
       , locale
       , scopes
@@ -471,16 +471,16 @@
         if (!isObject(translations)) {
           break;
         }
-        if (scopes.length == 0) {
+        if (scopes.length === 0) {
           message = this.pluralizationLookupWithoutFallback(count, locale, translations);
         }
       }
-      if (message != null && message != undefined) {
+      if (typeof message !== "undefined" && message !== null) {
         break;
       }
     }
 
-    if (message == null || message == undefined) {
+    if (typeof message === "undefined" || message === null) {
       if (isSet(options.defaultValue)) {
         if (isObject(options.defaultValue)) {
           message = this.pluralizationLookupWithoutFallback(count, options.locale, options.defaultValue);
@@ -570,7 +570,7 @@
 
   // Translate the given scope with the provided options.
   I18n.translate = function(scope, options) {
-    options = options || {}
+    options = options || {};
 
     var translationOptions = this.createTranslationOptions(scope, options);
 
@@ -619,7 +619,7 @@
       return message;
     }
 
-    options = options || {}
+    options = options || {};
     var matches = message.match(this.placeholder)
       , placeholder
       , value
@@ -631,8 +631,6 @@
       return message;
     }
 
-    var value;
-
     while (matches.length) {
       placeholder = matches.shift();
       name = placeholder.replace(this.placeholder, "$1");
@@ -645,7 +643,7 @@
         value = this.missingPlaceholder(placeholder, message, options);
       }
 
-      regex = new RegExp(placeholder.replace(/\{/gm, "\\{").replace(/\}/gm, "\\}"));
+      regex = new RegExp(placeholder.replace(/{/gm, "\\{").replace(/}/gm, "\\}"));
       message = message.replace(regex, value);
     }
 
@@ -657,14 +655,14 @@
   // which will be retrieved from `options`.
   I18n.pluralize = function(count, scope, options) {
     options = this.prepareOptions({count: String(count)}, options)
-    var pluralizer, message, result;
+    var pluralizer, result;
 
     result = this.pluralizationLookup(count, scope, options);
-    if (result.translations == undefined || result.translations == null) {
+    if (typeof result.translations === "undefined" || result.translations == null) {
       return this.missingTranslation(scope, options);
     }
 
-    if (result.message != undefined && result.message != null) {
+    if (typeof result.message !== "undefined" && result.message != null) {
       return this.interpolate(result.message, options);
     }
     else {
@@ -676,7 +674,7 @@
   // Return a missing translation message for the given parameters.
   I18n.missingTranslation = function(scope, options) {
     //guess intended string
-    if(this.missingBehaviour == 'guess'){
+    if(this.missingBehaviour === 'guess'){
       //get only the last portion of the scope
       var s = scope.split('.').slice(-1)[0];
       //replace underscore with space && camelcase with space and lowercase letter
@@ -838,7 +836,7 @@
     // we have a date, so just return it.
     if (typeof(date) == "object") {
       return date;
-    };
+    }
 
     matches = date.toString().match(/(\d{4})-(\d{2})-(\d{2})(?:[ T](\d{2}):(\d{2}):(\d{2})([\.,]\d{1,3})?)?(Z|\+00:?00)?/);
 
@@ -1036,7 +1034,7 @@
   };
 
   I18n.getFullScope = function(scope, options) {
-    options = options || {}
+    options = options || {};
 
     // Deal with the scope as an array.
     if (isArray(scope)) {

data/gemfiles/i18n_0_6.gemfile

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

data/gemfiles/i18n_0_7.gemfile

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

data/gemfiles/i18n_1_2.gemfile

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

data/gemfiles/i18n_1_3.gemfile

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

data/gemfiles/i18n_1_4.gemfile

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

data/gemfiles/i18n_1_5.gemfile

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

data/i18n-js.gemspec

@@ -18,9 +18,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  # CVE-2014-10077 which is fixed for >= 0.8.0
-  # https://nvd.nist.gov/vuln/detail/CVE-2014-10077
-  s.add_dependency "i18n", ">= 0.8.0", "< 2"
+  s.add_dependency "i18n", ">= 0.6.6"
 
   s.add_development_dependency "appraisal", "~> 2.0"
   s.add_development_dependency "rspec", "~> 3.0"

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

@@ -0,0 +1,23 @@
+module I18n
+  module JS
+    module Formatters
+      class Base
+        def initialize(js_extend: false, namespace: nil, pretty_print: false)
+          @js_extend    = js_extend
+          @namespace    = namespace
+          @pretty_print = pretty_print
+        end
+
+        protected
+
+        def format_json(translations)
+          if @pretty_print
+            ::JSON.pretty_generate(translations)
+          else
+            translations.to_json
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,31 @@
+require "i18n/js/formatters/base"
+
+module I18n
+  module JS
+    module Formatters
+      class JS < Base
+        def format(translations)
+          contents = header
+          translations.each do |locale, translations_for_locale|
+            contents << line(locale, format_json(translations_for_locale))
+          end
+          contents
+        end
+
+        protected
+
+        def header
+          %(#{@namespace}.translations || (#{@namespace}.translations = {});\n)
+        end
+
+        def line(locale, translations)
+          if @js_extend
+            %(#{@namespace}.translations["#{locale}"] = I18n.extend((#{@namespace}.translations["#{locale}"] || {}), #{translations});\n)
+          else
+            %(#{@namespace}.translations["#{locale}"] = #{translations};\n)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+require "i18n/js/formatters/base"
+
+module I18n
+  module JS
+    module Formatters
+      class JSON < Base
+        def format(translations)
+          format_json(translations)
+        end
+      end
+    end
+  end
+end

data/lib/i18n/js/segment.rb

@@ -1,5 +1,6 @@
 require "i18n/js/private/hash_with_symbol_keys"
-require "i18n/js/errors"
+require "i18n/js/formatters/js"
+require "i18n/js/formatters/json"
 
 module I18n
   module JS
@@ -34,21 +35,20 @@ module I18n
             write_file(file_for_locale(locale), @translations.slice(locale))
           end
         else
-          if @json_only
-            raise I18n::JS::JsonOnlyLocaleRequiredError
-          end
           write_file
         end
       end
 
       protected
 
+      def file_for_locale(locale)
+        @file.gsub(LOCALE_INTERPOLATOR, locale.to_s)
+      end
+
       def write_file(_file = @file, _translations = @translations)
         FileUtils.mkdir_p File.dirname(_file)
-        contents = js_header
-        _translations.each do |locale, translations_for_locale|
-          contents << js_translations(locale, translations_for_locale)
-        end
+        _translations = Utils.deep_key_sort(_translations) if @sort_translation_keys
+        contents = formatter.format(_translations)
 
         return if File.exist?(_file) && File.read(_file) == contents
 
@@ -57,42 +57,18 @@ module I18n
         end
       end
 
-      def js_header
+      def formatter
         if @json_only
-          ''
+          Formatters::JSON.new(**formatter_options)
         else
-          %(#{@namespace}.translations || (#{@namespace}.translations = {});\n)
+          Formatters::JS.new(**formatter_options)
         end
       end
 
-      def js_translations(locale, translations)
-        translations = Utils.deep_key_sort(translations) if @sort_translation_keys
-        translations = print_json(translations)
-        js_translations_line(locale, translations)
-      end
-
-      def js_translations_line(locale, translations)
-        if @json_only
-          %({"#{locale}":#{translations}})
-        elsif @js_extend
-          %(#{@namespace}.translations["#{locale}"] = I18n.extend((#{@namespace}.translations["#{locale}"] || {}), #{translations});\n)
-        else
-          %(#{@namespace}.translations["#{locale}"] = #{translations};\n)
-        end
-      end
-
-      # Outputs pretty or ugly JSON depending on :pretty_print option
-      def print_json(translations)
-        if @pretty_print
-          JSON.pretty_generate(translations)
-        else
-          translations.to_json
-        end
-      end
-
-      # interpolates filename
-      def file_for_locale(locale)
-        @file.gsub(LOCALE_INTERPOLATOR, locale.to_s)
+      def formatter_options
+        { js_extend: @js_extend,
+          namespace: @namespace,
+          pretty_print: @pretty_print }
       end
     end
   end

data/lib/i18n/js/utils.rb

@@ -1,10 +1,23 @@
 module I18n
   module JS
     module Utils
-      # deep_merge by Stefan Rusterholz, see <http://www.ruby-forum.com/topic/142809>.
-      # The last result is modified to treat `nil` as missing key
+      PLURAL_KEYS = %i[zero one two few many other].freeze
+
+      # Based on deep_merge by Stefan Rusterholz, see <http://www.ruby-forum.com/topic/142809>.
+      # This method is used to handle I18n fallbacks. Given two equivalent path nodes in two locale trees:
+      # 1. If the node in the current locale appears to be an I18n pluralization (:one, :other, etc.),
+      #    use the node as-is without merging. This prevents mixing locales with different pluralization schemes.
+      # 2. Else if both nodes are Hashes, combine (merge) the key-value pairs of the two nodes into one, 
+      #    prioritizing the current locale.
+      # 3. Else if either node is nil, use the other node.
       MERGER = proc do |_key, v1, v2|
-        Hash === v1 && Hash === v2 ? v1.merge(v2, &MERGER) : (v2.nil? ? v1 : v2)
+        if Hash === v2 && (v2.keys - PLURAL_KEYS).empty?
+          v2
+        elsif Hash === v1 && Hash === v2
+          v1.merge(v2, &MERGER)
+        else
+          v2.nil? ? v1 : v2
+        end
       end
 
       HASH_NIL_VALUE_CLEANER_PROC = proc do |k, v|

data/lib/i18n/js/version.rb

@@ -2,6 +2,6 @@
 
 module I18n
   module JS
-    VERSION = "3.2.0"
+    VERSION = "3.2.1"
   end
 end

data/package.json

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

data/spec/fixtures/json_only.yml

@@ -6,3 +6,13 @@ translations:
     only:
       - "*.date.formats.*"
       - "*.number.currency.*"
+
+  - file: "tmp/i18n-js/json_only_multi.js"
+    only:
+      - "*.date.formats.*"
+      - "*.number.currency.*"
+
+  - file: "tmp/i18n-js/json_only_multi_pretty.js"
+    only:
+      - "*.date.formats.*"
+      - "*.number.currency.*"

data/spec/fixtures/locales.yml

@@ -37,6 +37,9 @@ en:
   foo: "Foo"
   fallback_test: "Success"
   null_test: "fallback for null"
+  merge_plurals:
+    one: Apple
+    other: Apples
 
 de:
   fallback_test: "Erfolg"
@@ -81,6 +84,10 @@ fr:
       note: "plus de détails"
     edit:
       title: "Editer"
+  merge_plurals:
+    zero: Pomme
+    one: Pomme
+    other: Pommes
 
 ja:
   admin:

data/spec/fixtures/merge_plurals.yml

@@ -0,0 +1,6 @@
+fallbacks: false
+
+translations:
+  - file: "tmp/i18n-js/merge_plurals.js"
+    only:
+      - "*.merge_plurals"

data/spec/js/translations.js

@@ -1,4 +1,3 @@
-var DEBUG = false;
 
 ;(function(){
   var generator = function() {

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

@@ -19,22 +19,22 @@ describe I18n::JS::Segment do
   describe ".new" do
 
     it "should persist the file path variable" do
-      subject.file.should eql("tmp/i18n-js/segment.js")
+      expect(subject.file).to eql("tmp/i18n-js/segment.js")
     end
 
     it "should persist the translations variable" do
-      subject.translations.should eql(translations)
+      expect(subject.translations).to eql(translations)
     end
 
     it "should persist the namespace variable" do
-      subject.namespace.should eql("MyNamespace")
+      expect(subject.namespace).to eql("MyNamespace")
     end
 
     context "when namespace is nil" do
       let(:namespace){ nil }
 
       it "should default namespace to `I18n`" do
-        subject.namespace.should eql("I18n")
+        expect(subject.namespace).to eql("I18n")
       end
     end
 
@@ -42,13 +42,13 @@ describe I18n::JS::Segment do
       subject { I18n::JS::Segment.new(file, translations) }
 
       it "should default namespace to `I18n`" do
-        subject.namespace.should eql("I18n")
+        expect(subject.namespace).to eql("I18n")
       end
     end
 
     context "when pretty_print is nil" do
       it "should set pretty_print to false" do
-        subject.pretty_print.should be false
+        expect(subject.pretty_print).to be false
       end
     end
 
@@ -56,7 +56,7 @@ describe I18n::JS::Segment do
       let(:pretty_print){ 1 }
 
       it "should set pretty_print to true" do
-        subject.pretty_print.should be true
+        expect(subject.pretty_print).to be true
       end
     end
   end
@@ -64,19 +64,20 @@ describe I18n::JS::Segment do
   describe "#saving!" do
     before { allow(I18n::JS).to receive(:export_i18n_js_dir_path).and_return(temp_path) }
 
-    context "when json_only is true" do
+    context "when json_only is true with locale" do
       let(:file){ "tmp/i18n-js/%{locale}.js" }
       let(:json_only){ true }
-      it 'should output the keys as sorted' do
+
+      it 'should output JSON files per locale' do
         subject.save!
         file_should_exist "en.js"
         file_should_exist "fr.js"
 
-        File.open(File.join(temp_path, "en.js")){|f| f.read}.should eql(
+        expect(File.read(File.join(temp_path, "en.js"))).to eql(
           %Q({"en":{"test":"Test"}})
         )
 
-        File.open(File.join(temp_path, "fr.js")){|f| f.read}.should eql(
+        expect(File.read(File.join(temp_path, "fr.js"))).to eql(
           %Q({"fr":{"test":"Test2"}})
         )
       end
@@ -85,8 +86,37 @@ describe I18n::JS::Segment do
     context "when json_only is true without locale" do
       let(:file){ "tmp/i18n-js/segment.js" }
       let(:json_only){ true }
-      it 'should output the keys as sorted' do
-        expect { subject.save! }.to raise_error(I18n::JS::JsonOnlyLocaleRequiredError)
+
+      it 'should output one JSON file for all locales' do
+        subject.save!
+        file_should_exist "segment.js"
+
+        expect(File.read(File.join(temp_path, "segment.js"))).to eql(
+          %Q({"en":{"test":"Test"},"fr":{"test":"Test2"}})
+        )
+      end
+    end
+
+    context "when json_only and pretty print are true" do
+      let(:file){ "tmp/i18n-js/segment.js" }
+      let(:json_only){ true }
+      let(:pretty_print){ true }
+
+      it 'should output one JSON file for all locales' do
+        subject.save!
+        file_should_exist "segment.js"
+
+        expect(File.read(File.join(temp_path, "segment.js"))).to eql <<-EOS
+{
+  "en": {
+    "test": "Test"
+  },
+  "fr": {
+    "test": "Test2"
+  }
+}
+EOS
+.chomp
       end
     end
   end
@@ -99,7 +129,7 @@ describe I18n::JS::Segment do
       it "should write the file" do
         file_should_exist "segment.js"
 
-        File.open(File.join(temp_path, "segment.js")){|f| f.read}.should eql <<-EOF
+        expect(File.open(File.join(temp_path, "segment.js")){|f| f.read}).to eql <<-EOF
 MyNamespace.translations || (MyNamespace.translations = {});
 MyNamespace.translations["en"] = I18n.extend((MyNamespace.translations["en"] || {}), {"test":"Test"});
 MyNamespace.translations["fr"] = I18n.extend((MyNamespace.translations["fr"] || {}), {"test":"Test2"});
@@ -114,12 +144,12 @@ MyNamespace.translations["fr"] = I18n.extend((MyNamespace.translations["fr"] ||
         file_should_exist "en.js"
         file_should_exist "fr.js"
 
-        File.open(File.join(temp_path, "en.js")){|f| f.read}.should eql <<-EOF
+        expect(File.open(File.join(temp_path, "en.js")){|f| f.read}).to eql <<-EOF
 MyNamespace.translations || (MyNamespace.translations = {});
 MyNamespace.translations["en"] = I18n.extend((MyNamespace.translations["en"] || {}), {"test":"Test"});
         EOF
 
-        File.open(File.join(temp_path, "fr.js")){|f| f.read}.should eql <<-EOF
+        expect(File.open(File.join(temp_path, "fr.js")){|f| f.read}).to eql <<-EOF
 MyNamespace.translations || (MyNamespace.translations = {});
 MyNamespace.translations["fr"] = I18n.extend((MyNamespace.translations["fr"] || {}), {"test":"Test2"});
         EOF
@@ -134,7 +164,7 @@ MyNamespace.translations["fr"] = I18n.extend((MyNamespace.translations["fr"] ||
       it 'should output the keys as sorted' do
         file_should_exist "segment.js"
 
-        File.open(File.join(temp_path, "segment.js")){|f| f.read}.should eql <<-EOF
+        expect(File.open(File.join(temp_path, "segment.js")){|f| f.read}).to eql <<-EOF
 MyNamespace.translations || (MyNamespace.translations = {});
 MyNamespace.translations["en"] = I18n.extend((MyNamespace.translations["en"] || {}), {"a":"Test","b":"Test"});
         EOF
@@ -149,7 +179,7 @@ MyNamespace.translations["en"] = I18n.extend((MyNamespace.translations["en"] ||
       it 'should output the keys as sorted' do
         file_should_exist "segment.js"
 
-        File.open(File.join(temp_path, "segment.js")){|f| f.read}.should eql <<-EOF
+        expect(File.open(File.join(temp_path, "segment.js")){|f| f.read}).to eql <<-EOF
 MyNamespace.translations || (MyNamespace.translations = {});
 MyNamespace.translations["en"] = {"a":"Test","b":"Test"};
         EOF
@@ -164,7 +194,7 @@ MyNamespace.translations["en"] = {"a":"Test","b":"Test"};
       it 'should output the keys as sorted' do
         file_should_exist "segment.js"
 
-        File.open(File.join(temp_path, "segment.js")){|f| f.read}.should eql <<-EOF
+        expect(File.open(File.join(temp_path, "segment.js")){|f| f.read}).to eql <<-EOF
 MyNamespace.translations || (MyNamespace.translations = {});
 MyNamespace.translations["en"] = I18n.extend((MyNamespace.translations["en"] || {}), {"a":"Test","b":"Test"});
         EOF
@@ -179,7 +209,7 @@ MyNamespace.translations["en"] = I18n.extend((MyNamespace.translations["en"] ||
       it 'should output the keys as sorted' do
         file_should_exist "segment.js"
 
-        File.open(File.join(temp_path, "segment.js")){|f| f.read}.should eql <<-EOF
+        expect(File.open(File.join(temp_path, "segment.js")){|f| f.read}).to eql <<-EOF
 MyNamespace.translations || (MyNamespace.translations = {});
 MyNamespace.translations["en"] = I18n.extend((MyNamespace.translations["en"] || {}), {"b":"Test","a":"Test"});
         EOF

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

@@ -28,14 +28,14 @@ describe I18n::JS::Utils do
       target = {:a => {:b => 1}}
       result = described_class.deep_merge(target, {:a => {:c => 2}})
 
-      result[:a].should eql({:b => 1, :c => 2})
+      expect(result[:a]).to eql({:b => 1, :c => 2})
     end
 
     it "performs a banged deep merge" do
       target = {:a => {:b => 1}}
       described_class.deep_merge!(target, {:a => {:c => 2}})
 
-      target[:a].should eql({:b => 1, :c => 2})
+      expect(target[:a]).to eql({:b => 1, :c => 2})
     end
   end
 
@@ -45,7 +45,7 @@ describe I18n::JS::Utils do
 
       result = described_class.deep_reject(hash) { |k, v| k == :b }
 
-      result.should eql({:a => {}})
+      expect(result).to eql({:a => {}})
     end
 
     it "performs a deep keys rejection prunning the whole tree if necessary" do
@@ -53,7 +53,7 @@ describe I18n::JS::Utils do
 
       result = described_class.deep_reject(hash) { |k, v| k == :b }
 
-      result.should eql({:a => {}})
+      expect(result).to eql({:a => {}})
     end
 
 
@@ -62,8 +62,8 @@ describe I18n::JS::Utils do
 
       result = described_class.deep_reject(hash) { |k, v| k == :b }
 
-      result.should eql({:a => {:c => 2}})
-      hash.should eql({:a => {:b => 1, :c => 2}})
+      expect(result).to eql({:a => {:c => 2}})
+      expect(hash).to eql({:a => {:b => 1, :c => 2}})
     end
   end
 
@@ -73,7 +73,7 @@ describe I18n::JS::Utils do
 
     it "performs a deep keys sort without changing the original hash" do
       should eql({:y => 3, :z => {:a => 2, :b => 1}})
-      unsorted_hash.should eql({:z => {:b => 1, :a => 2}, :y => 3})
+      expect(unsorted_hash).to eql({:z => {:b => 1, :a => 2}, :y => 3})
     end
 
     # Idea from gem `rails_admin`
@@ -91,16 +91,16 @@ describe I18n::JS::Utils do
 
   describe ".scopes_match?" do
     it "performs a comparison of literal scopes" do
-      described_class.scopes_match?([:a, :b], [:a, :b, :c]).should_not eql true
-      described_class.scopes_match?([:a, :b, :c], [:a, :b, :c]).should eql true
-      described_class.scopes_match?([:a, :b, :c], [:a, :b, :d]).should_not eql true
+      expect(described_class.scopes_match?([:a, :b], [:a, :b, :c])).to_not eql true
+      expect(described_class.scopes_match?([:a, :b, :c], [:a, :b, :c])).to eql true
+      expect(described_class.scopes_match?([:a, :b, :c], [:a, :b, :d])).to_not eql true
     end
 
     it "performs a comparison of wildcard scopes" do
-      described_class.scopes_match?([:a, '*'], [:a, :b, :c]).should_not eql true
-      described_class.scopes_match?([:a, '*', :c], [:a, :b, :c]).should eql true
-      described_class.scopes_match?([:a, :b, :c], [:a, '*', :c]).should eql true
-      described_class.scopes_match?([:a, :b, :c], [:a, '*', '*']).should eql true
+      expect(described_class.scopes_match?([:a, '*'], [:a, :b, :c])).to_not eql true
+      expect(described_class.scopes_match?([:a, '*', :c], [:a, :b, :c])).to eql true
+      expect(described_class.scopes_match?([:a, :b, :c], [:a, '*', :c])).to eql true
+      expect(described_class.scopes_match?([:a, :b, :c], [:a, '*', '*'])).to eql true
     end
   end
 end

data/spec/ruby/i18n/js_spec.rb

@@ -30,15 +30,15 @@ describe I18n::JS do
 
     it "exports messages using custom output path" do
       set_config "custom_path.yml"
-      I18n::JS::Segment.should_receive(:new).with("tmp/i18n-js/all.js", translations, {js_extend: true, sort_translation_keys: true, json_only: false}).and_call_original
-      I18n::JS::Segment.any_instance.should_receive(:save!).with(no_args)
+      allow(I18n::JS::Segment).to receive(:new).with("tmp/i18n-js/all.js", translations, {js_extend: true, sort_translation_keys: true, json_only: false}).and_call_original
+      allow_any_instance_of(I18n::JS::Segment).to receive(:save!).with(no_args)
       I18n::JS.export
     end
 
     it "sets default scope to * when not specified" do
       set_config "no_scope.yml"
-      I18n::JS::Segment.should_receive(:new).with("tmp/i18n-js/no_scope.js", translations, {js_extend: true, sort_translation_keys: true, json_only: false}).and_call_original
-      I18n::JS::Segment.any_instance.should_receive(:save!).with(no_args)
+      allow(I18n::JS::Segment).to receive(:new).with("tmp/i18n-js/no_scope.js", translations, {js_extend: true, sort_translation_keys: true, json_only: false}).and_call_original
+      allow_any_instance_of(I18n::JS::Segment).to receive(:save!).with(no_args)
       I18n::JS.export
     end
 
@@ -91,7 +91,7 @@ EOS
       set_config "multiple_conditions_per_locale.yml"
 
       result = I18n::JS.translation_segments
-      result.map(&:file).should eql(["tmp/i18n-js/bits.%{locale}.js"])
+      expect(result.map(&:file)).to eql(["tmp/i18n-js/bits.%{locale}.js"])
 
       result.map(&:save!)
 
@@ -142,40 +142,40 @@ EOS
   context "filters" do
     it "filters translations using scope *.date.formats" do
       result = I18n::JS.filter(translations, "*.date.formats")
-      result[:en][:date].keys.should eql([:formats])
-      result[:fr][:date].keys.should eql([:formats])
+      expect(result[:en][:date].keys).to eql([:formats])
+      expect(result[:fr][:date].keys).to eql([:formats])
     end
 
     it "filters translations using scope [*.date.formats, *.number.currency.format]" do
       result = I18n::JS.scoped_translations(["*.date.formats", "*.number.currency.format"])
-      result[:en].keys.collect(&:to_s).sort.should eql(%w[ date number ])
-      result[:fr].keys.collect(&:to_s).sort.should eql(%w[ date number ])
+      expect(result[:en].keys.collect(&:to_s).sort).to eql(%w[ date number ])
+      expect(result[:fr].keys.collect(&:to_s).sort).to eql(%w[ date number ])
     end
 
     it "filters translations using multi-star scope" do
       result = I18n::JS.scoped_translations("*.*.formats")
 
-      result[:en].keys.collect(&:to_s).sort.should eql(%w[ date time ])
-      result[:fr].keys.collect(&:to_s).sort.should eql(%w[ date time ])
+      expect(result[:en].keys.collect(&:to_s).sort).to eql(%w[ date time ])
+      expect(result[:fr].keys.collect(&:to_s).sort).to eql(%w[ date time ])
 
-      result[:en][:date].keys.should eql([:formats])
-      result[:en][:time].keys.should eql([:formats])
+      expect(result[:en][:date].keys).to eql([:formats])
+      expect(result[:en][:time].keys).to eql([:formats])
 
-      result[:fr][:date].keys.should eql([:formats])
-      result[:fr][:time].keys.should eql([:formats])
+      expect(result[:fr][:date].keys).to eql([:formats])
+      expect(result[:fr][:time].keys).to eql([:formats])
     end
 
     it "filters translations using alternated stars" do
       result = I18n::JS.scoped_translations("*.admin.*.title")
 
-      result[:en][:admin].keys.collect(&:to_s).sort.should eql(%w[ edit show ])
-      result[:fr][:admin].keys.collect(&:to_s).sort.should eql(%w[ edit show ])
+      expect(result[:en][:admin].keys.collect(&:to_s).sort).to eql(%w[ edit show ])
+      expect(result[:fr][:admin].keys.collect(&:to_s).sort).to eql(%w[ edit show ])
 
-      result[:en][:admin][:show][:title].should eql("Show")
-      result[:fr][:admin][:show][:title].should eql("Visualiser")
+      expect(result[:en][:admin][:show][:title]).to eql("Show")
+      expect(result[:fr][:admin][:show][:title]).to eql("Visualiser")
 
-      result[:en][:admin][:edit][:title].should eql("Edit")
-      result[:fr][:admin][:edit][:title].should eql("Editer")
+      expect(result[:en][:admin][:edit][:title]).to eql("Edit")
+      expect(result[:fr][:admin][:edit][:title]).to eql("Editer")
     end
 
     describe ".filtered_translations" do
@@ -227,50 +227,50 @@ EOS
     it "does not include scopes listed in the exceptions list" do
       result = I18n::JS.scoped_translations("*", ['de.*', '*.admin', '*.*.currency'])
 
-      result[:de].should be_empty
+      expect(result[:de]).to be_empty
 
-      result[:en][:admin].should be_nil
-      result[:fr][:admin].should be_nil
-      result[:ja][:admin].should be_nil
+      expect(result[:en][:admin]).to be_nil
+      expect(result[:fr][:admin]).to be_nil
+      expect(result[:ja][:admin]).to be_nil
 
-      result[:en][:number][:currency].should be_nil
-      result[:fr][:number][:currency].should be_nil
+      expect(result[:en][:number][:currency]).to be_nil
+      expect(result[:fr][:number][:currency]).to be_nil
     end
 
     it "does not include scopes listed in the exceptions list and respects the 'only' option" do
       result = I18n::JS.scoped_translations("fr.*", ['*.admin', '*.*.currency'])
 
-      result[:en].should be_nil
-      result[:de].should be_nil
-      result[:ja].should be_nil
+      expect(result[:en]).to be_nil
+      expect(result[:de]).to be_nil
+      expect(result[:ja]).to be_nil
 
-      result[:fr][:admin].should be_nil
-      result[:fr][:number][:currency].should be_nil
+      expect(result[:fr][:admin]).to be_nil
+      expect(result[:fr][:number][:currency]).to be_nil
 
-      result[:fr][:time][:am].should be_a(String)
+      expect(result[:fr][:time][:am]).to be_a(String)
     end
 
     it "does exclude absolute scopes listed in the exceptions list" do
       result = I18n::JS.scoped_translations("*", ['de', 'en.admin', 'fr.number.currency'])
 
-      result[:de].should be_nil
+      expect(result[:de]).to be_nil
 
-      result[:en].should be_a(Hash)
-      result[:en][:admin].should be_nil
+      expect(result[:en]).to be_a(Hash)
+      expect(result[:en][:admin]).to be_nil
 
-      result[:fr][:number].should be_a(Hash)
-      result[:fr][:number][:currency].should be_nil
+      expect(result[:fr][:number]).to be_a(Hash)
+      expect(result[:fr][:number][:currency]).to be_nil
     end
 
     it "does not exclude non-absolute scopes listed in the exceptions list" do
       result = I18n::JS.scoped_translations("*", ['admin', 'currency'])
 
-      result[:en][:admin].should be_a(Hash)
-      result[:fr][:admin].should be_a(Hash)
-      result[:ja][:admin].should be_a(Hash)
+      expect(result[:en][:admin]).to be_a(Hash)
+      expect(result[:fr][:admin]).to be_a(Hash)
+      expect(result[:ja][:admin]).to be_a(Hash)
 
-      result[:en][:number][:currency].should be_a(Hash)
-      result[:fr][:number][:currency].should be_a(Hash)
+      expect(result[:en][:number][:currency]).to be_a(Hash)
+      expect(result[:fr][:number][:currency]).to be_a(Hash)
     end
   end
 
@@ -281,30 +281,30 @@ EOS
 
     it "exports without fallback when disabled" do
       set_config "js_file_per_locale_without_fallbacks.yml"
-      subject[:fr][:fallback_test].should eql(nil)
-      subject[:fr][:null_test].should eql(nil)
-      subject[:de][:null_test].should eql(nil)
+      expect(subject[:fr][:fallback_test]).to eql(nil)
+      expect(subject[:fr][:null_test]).to eql(nil)
+      expect(subject[:de][:null_test]).to eql(nil)
     end
 
     it "exports with default_locale as fallback when enabled" do
       set_config "js_file_per_locale_with_fallbacks_enabled.yml"
-      subject[:fr][:fallback_test].should eql("Success")
-      subject[:fr][:null_test].should eql("fallback for null")
-      subject[:de][:null_test].should eql("fallback for null")
+      expect(subject[:fr][:fallback_test]).to eql("Success")
+      expect(subject[:fr][:null_test]).to eql("fallback for null")
+      expect(subject[:de][:null_test]).to eql("fallback for null")
     end
 
     it "exports with default_locale as fallback when enabled with :default_locale" do
       set_config "js_file_per_locale_with_fallbacks_as_default_locale_symbol.yml"
-      subject[:fr][:fallback_test].should eql("Success")
-      subject[:fr][:null_test].should eql("fallback for null")
-      subject[:de][:null_test].should eql("fallback for null")
+      expect(subject[:fr][:fallback_test]).to eql("Success")
+      expect(subject[:fr][:null_test]).to eql("fallback for null")
+      expect(subject[:de][:null_test]).to eql("fallback for null")
     end
 
     it "exports with given locale as fallback" do
       set_config "js_file_per_locale_with_fallbacks_as_locale.yml"
-      subject[:fr][:fallback_test].should eql("Erfolg")
-      subject[:fr][:null_test].should eql(nil)
-      subject[:de][:null_test].should eql(nil)
+      expect(subject[:fr][:fallback_test]).to eql("Erfolg")
+      expect(subject[:fr][:null_test]).to eql(nil)
+      expect(subject[:de][:null_test]).to eql(nil)
     end
 
     context "when given locale is in `I18n.available_locales` but its translation is missing" do
@@ -336,17 +336,17 @@ EOS
 
       it "exports with defined locale as fallback when enabled" do
         set_config "js_file_per_locale_with_fallbacks_enabled.yml"
-        subject[:fr][:fallback_test].should eql("Erfolg")
+        expect(subject[:fr][:fallback_test]).to eql("Erfolg")
       end
 
       it "exports with defined locale as fallback when enabled with :default_locale" do
         set_config "js_file_per_locale_with_fallbacks_as_default_locale_symbol.yml"
-        subject[:fr][:fallback_test].should eql("Success")
+        expect(subject[:fr][:fallback_test]).to eql("Success")
       end
 
       it "exports with Fallbacks as Hash" do
         set_config "js_file_per_locale_with_fallbacks_as_hash.yml"
-        subject[:fr][:fallback_test].should eql("Erfolg")
+        expect(subject[:fr][:fallback_test]).to eql("Erfolg")
       end
     end
   end
@@ -389,9 +389,9 @@ EOS
       it "should allow all locales" do
         result = I18n::JS.scoped_translations("*.admin.*.title")
 
-        result[:en][:admin][:show][:title].should eql("Show")
-        result[:fr][:admin][:show][:title].should eql("Visualiser")
-        result[:ja][:admin][:show][:title].should eql("Ignore me")
+        expect(result[:en][:admin][:show][:title]).to eql("Show")
+        expect(result[:fr][:admin][:show][:title]).to eql("Visualiser")
+        expect(result[:ja][:admin][:show][:title]).to eql("Ignore me")
       end
     end
 
@@ -401,28 +401,28 @@ EOS
       it "should ignore non-valid locales" do
         result = I18n::JS.scoped_translations("*.admin.*.title")
 
-        result[:en][:admin][:show][:title].should eql("Show")
-        result[:fr][:admin][:show][:title].should eql("Visualiser")
-        result.keys.include?(:ja).should eql(false)
+        expect(result[:en][:admin][:show][:title]).to eql("Show")
+        expect(result[:fr][:admin][:show][:title]).to eql("Visualiser")
+        expect(result.keys.include?(:ja)).to eql(false)
       end
     end
   end
 
   context "general" do
     it "sets export directory" do
-      I18n::JS::DEFAULT_EXPORT_DIR_PATH.should eql("public/javascripts")
+      expect(I18n::JS::DEFAULT_EXPORT_DIR_PATH).to eql("public/javascripts")
     end
 
     it "sets empty hash as configuration when no file is found" do
-      I18n::JS.config_file_exists?.should eql(false)
-      I18n::JS.config.should eql({})
+      expect(I18n::JS.config_file_exists?).to eql(false)
+      expect(I18n::JS.config).to eql({})
     end
 
     it "executes erb in config file" do
       set_config "erb.yml"
 
       config_entry = I18n::JS.config[:translations].first
-      config_entry["only"].should eq("*.date.formats")
+      expect(config_entry["only"]).to eq("*.date.formats")
     end
   end
 
@@ -434,7 +434,7 @@ EOS
         allow(FileUtils).to receive(:mkdir_p).and_call_original
         allow(FileUtils).to receive(:cp).and_call_original
 
-        described_class.stub(:export_i18n_js_dir_path).and_return(export_i18n_js_dir_path)
+        allow(described_class).to receive(:export_i18n_js_dir_path).and_return(export_i18n_js_dir_path)
         I18n::JS.export_i18n_js
       end
 
@@ -448,7 +448,7 @@ EOS
           expect(FileUtils).to have_received(:cp).once
         end
         it "exports the file" do
-          File.should be_file(File.join(I18n::JS.export_i18n_js_dir_path, "i18n.js"))
+          expect(File).to be_file(File.join(I18n::JS.export_i18n_js_dir_path, "i18n.js"))
         end
       end
 
@@ -484,7 +484,7 @@ EOS
           expect(FileUtils).to have_received(:cp).once
         end
         it "exports the file" do
-          File.should be_file(File.join(config_export_path, "i18n.js"))
+          expect(File).to be_file(File.join(config_export_path, "i18n.js"))
         end
       end
 
@@ -595,11 +595,10 @@ EOS
         end
 
         it "exports with the keys sorted" do
-          expect(subject).to eq(<<EOS
+          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","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"},"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"}});
 EOS
-)
         end
       end
     end
@@ -640,4 +639,25 @@ EOS
 )
     end
   end
+
+  describe "merging plural keys" 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, "merge_plurals.js"))
+    end
+
+    it "should correctly merge the plural keys" do
+      set_config "merge_plurals.yml"
+      I18n::JS.export
+      file_should_exist "merge_plurals.js"
+
+      expect(subject).to eq <<EOS
+I18n.translations || (I18n.translations = {});
+I18n.translations[\"en\"] = I18n.extend((I18n.translations[\"en\"] || {}), {\"merge_plurals\":{\"one\":\"Apple\",\"other\":\"Apples\"}});\nI18n.translations[\"fr\"] = I18n.extend((I18n.translations[\"fr\"] || {}), {\"merge_plurals\":{\"one\":\"Pomme\",\"other\":\"Pommes\",\"zero\":\"Pomme\"}});
+EOS
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -70,10 +70,10 @@ RSpec.configure do |config|
 
   # Remove deprecation warnings
   config.expect_with :rspec do |c|
-    c.syntax = [:should, :expect]
+    c.syntax = [:expect]
   end
   config.mock_with :rspec do |c|
-    c.syntax = [:should, :expect]
+    c.syntax = [:expect]
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-js
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.1
 platform: ruby
 authors:
 - Nando Vieira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-16 00:00:00.000000000 Z
+date: 2019-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -16,20 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2'
+        version: 0.6.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2'
+        version: 0.6.6
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -120,17 +114,25 @@ files:
 - app/assets/javascripts/i18n/filtered.js.erb
 - app/assets/javascripts/i18n/shims.js
 - app/assets/javascripts/i18n/translations.js
+- gemfiles/i18n_0_6.gemfile
+- gemfiles/i18n_0_7.gemfile
 - gemfiles/i18n_0_8.gemfile
 - gemfiles/i18n_0_9.gemfile
 - gemfiles/i18n_1_0.gemfile
 - gemfiles/i18n_1_1.gemfile
+- gemfiles/i18n_1_2.gemfile
+- gemfiles/i18n_1_3.gemfile
+- gemfiles/i18n_1_4.gemfile
+- gemfiles/i18n_1_5.gemfile
 - i18n-js.gemspec
 - lib/i18n-js.rb
 - lib/i18n/js.rb
 - lib/i18n/js/dependencies.rb
 - lib/i18n/js/engine.rb
-- lib/i18n/js/errors.rb
 - lib/i18n/js/fallback_locales.rb
+- lib/i18n/js/formatters/base.rb
+- lib/i18n/js/formatters/js.rb
+- lib/i18n/js/formatters/json.rb
 - lib/i18n/js/middleware.rb
 - lib/i18n/js/private/hash_with_symbol_keys.rb
 - lib/i18n/js/segment.rb
@@ -160,6 +162,7 @@ files:
 - spec/fixtures/js_sort_translation_keys_true.yml
 - spec/fixtures/json_only.yml
 - spec/fixtures/locales.yml
+- spec/fixtures/merge_plurals.yml
 - spec/fixtures/multiple_conditions.yml
 - spec/fixtures/multiple_conditions_per_locale.yml
 - spec/fixtures/multiple_files.yml
@@ -214,8 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: It's a small library to provide the Rails I18n translations on the Javascript.
@@ -240,6 +242,7 @@ test_files:
 - spec/fixtures/js_sort_translation_keys_true.yml
 - spec/fixtures/json_only.yml
 - spec/fixtures/locales.yml
+- spec/fixtures/merge_plurals.yml
 - spec/fixtures/multiple_conditions.yml
 - spec/fixtures/multiple_conditions_per_locale.yml
 - spec/fixtures/multiple_files.yml

data/lib/i18n/js/errors.rb

@@ -1,9 +0,0 @@
-module I18n
-  module JS
-    class JsonOnlyLocaleRequiredError < StandardError
-      def message
-        'The json_only option requires %{locale} in the file name.'
-      end
-    end
-  end
-end