i18n-js 3.3.0 → 3.9.2

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

@@ -131,8 +131,8 @@ EOS
 
         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"});
+MyNamespace.translations["en"] = I18n.extend((MyNamespace.translations["en"] || {}), JSON.parse('{"test":"Test"}'));
+MyNamespace.translations["fr"] = I18n.extend((MyNamespace.translations["fr"] || {}), JSON.parse('{"test":"Test2"}'));
         EOF
       end
     end
@@ -146,12 +146,54 @@ MyNamespace.translations["fr"] = I18n.extend((MyNamespace.translations["fr"] ||
 
         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"});
+MyNamespace.translations["en"] = I18n.extend((MyNamespace.translations["en"] || {}), JSON.parse('{"test":"Test"}'));
         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"});
+MyNamespace.translations["fr"] = I18n.extend((MyNamespace.translations["fr"] || {}), JSON.parse('{"test":"Test2"}'));
+        EOF
+      end
+    end
+
+    context "when file includes single quote" do
+      let(:file){ "tmp/i18n-js/%{locale}.js" }
+      let(:translations){ { en: { "a" => "Test's" } } }
+
+      it "should write files" do
+        file_should_exist "en.js"
+
+        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"] || {}), JSON.parse('{"a":"Test\\'s"}'));
+        EOF
+      end
+    end
+
+    context "when file includes escaped double quote" do
+      let(:file){ "tmp/i18n-js/%{locale}.js" }
+      let(:translations){ { en: { "a" => 'say "hello"' } } }
+
+      it "should escape double quote" do
+        file_should_exist "en.js"
+
+        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"] || {}), JSON.parse('{"a":"say \\\\"hello\\\\""}'));
+        EOF
+      end
+    end
+
+    context "when file includes backslash in double quote" do
+      let(:file){ "tmp/i18n-js/%{locale}.js" }
+      let(:translations){ { en: { "double-backslash-in-double-quote" => '"\\\\"' } } }
+
+      it "should escape backslash" do
+        file_should_exist "en.js"
+
+        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"] || {}), JSON.parse('{"double-backslash-in-double-quote":"\\\\"\\\\\\\\\\\\\\\\\\\\""}'));
         EOF
       end
     end
@@ -166,7 +208,7 @@ MyNamespace.translations["fr"] = I18n.extend((MyNamespace.translations["fr"] ||
 
         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"});
+MyNamespace.translations["en"] = I18n.extend((MyNamespace.translations["en"] || {}), JSON.parse('{"a":"Test","b":"Test"}'));
         EOF
       end
     end
@@ -181,7 +223,7 @@ MyNamespace.translations["en"] = I18n.extend((MyNamespace.translations["en"] ||
 
         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"};
+MyNamespace.translations["en"] = JSON.parse('{"a":"Test","b":"Test"}');
         EOF
       end
     end
@@ -196,7 +238,7 @@ MyNamespace.translations["en"] = {"a":"Test","b":"Test"};
 
         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"});
+MyNamespace.translations["en"] = I18n.extend((MyNamespace.translations["en"] || {}), JSON.parse('{"a":"Test","b":"Test"}'));
         EOF
       end
     end
@@ -211,7 +253,32 @@ MyNamespace.translations["en"] = I18n.extend((MyNamespace.translations["en"] ||
 
         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"});
+MyNamespace.translations["en"] = I18n.extend((MyNamespace.translations["en"] || {}), JSON.parse('{"b":"Test","a":"Test"}'));
+        EOF
+      end
+    end
+
+    context "when translation entries contain procs" do
+      let(:translations) do
+        {
+          en: {
+            "test" => "Test",
+            "i18n" => {"plural" => {"rule" => proc {} }},
+          },
+          fr: {
+            "test" => "Test2",
+            "i18n" => {"plural" => {"rule" => proc {} }},
+          },
+        }
+      end
+
+      it "should write files without procs or their string representations" do
+        file_should_exist "segment.js"
+
+        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"] || {}), JSON.parse('{"i18n":{"plural":{}},"test":"Test"}'));
+MyNamespace.translations["fr"] = I18n.extend((MyNamespace.translations["fr"] || {}), JSON.parse('{"i18n":{"plural":{}},"test":"Test2"}'));
         EOF
       end
     end

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

@@ -103,4 +103,36 @@ describe I18n::JS::Utils do
       expect(described_class.scopes_match?([:a, :b, :c], [:a, '*', '*'])).to eql true
     end
   end
+
+  describe ".deep_remove_procs" do
+    let(:proc_obj) { proc {} }
+    let(:hash_with_proc) do
+      {
+        :a => :b,
+        :c => proc_obj,
+        :d => {
+          :e => proc_obj,
+          :f => :g,
+        }
+      }
+    end
+    subject { described_class.deep_remove_procs(hash_with_proc) }
+
+    it "performs a deep keys sort without changing the original hash" do
+      should eql({
+        :a => :b,
+        :d => {
+          :f => :g,
+        }
+      })
+      expect(hash_with_proc).to eql({
+        :a => :b,
+        :c => proc_obj,
+        :d => {
+          :e => proc_obj,
+          :f => :g,
+        }
+      })
+    end
+  end
 end

data/spec/ruby/i18n/js_spec.rb

@@ -67,13 +67,13 @@ describe I18n::JS do
       en_output = File.read(File.join(I18n::JS.export_i18n_js_dir_path, "en.js"))
       expect(en_output).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"]}});
+I18n.translations["en"] = I18n.extend((I18n.translations["en"] || {}), JSON.parse('{"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"]}}'));
 EOS
 )
       fr_output = File.read(File.join(I18n::JS.export_i18n_js_dir_path, "fr.js"))
       expect(fr_output).to eq(<<EOS
 I18n.translations || (I18n.translations = {});
-I18n.translations["fr"] = I18n.extend((I18n.translations["fr"] || {}), {"admin":{"edit":{"title":"Editer"},"show":{"note":"plus de détails","title":"Visualiser"}},"date":{"abbr_day_names":["dim","lun","mar","mer","jeu","ven","sam"],"abbr_month_names":[null,"jan.","fév.","mar.","avr.","mai","juin","juil.","août","sept.","oct.","nov.","déc."],"day_names":["dimanche","lundi","mardi","mercredi","jeudi","vendredi","samedi"],"formats":{"default":"%d/%m/%Y","long":"%e %B %Y","long_ordinal":"%e %B %Y","only_day":"%e","short":"%e %b"},"month_names":[null,"janvier","février","mars","avril","mai","juin","juillet","août","septembre","octobre","novembre","décembre"]}});
+I18n.translations["fr"] = I18n.extend((I18n.translations["fr"] || {}), JSON.parse('{"admin":{"edit":{"title":"Editer"},"show":{"note":"plus de détails","title":"Visualiser"}},"date":{"abbr_day_names":["dim","lun","mar","mer","jeu","ven","sam"],"abbr_month_names":[null,"jan.","fév.","mar.","avr.","mai","juin","juil.","août","sept.","oct.","nov.","déc."],"day_names":["dimanche","lundi","mardi","mercredi","jeudi","vendredi","samedi"],"formats":{"default":"%d/%m/%Y","long":"%e %B %Y","long_ordinal":"%e %B %Y","only_day":"%e","short":"%e %b"},"month_names":[null,"janvier","février","mars","avril","mai","juin","juillet","août","septembre","octobre","novembre","décembre"]}}'));
 EOS
 )
     end
@@ -98,13 +98,13 @@ EOS
       en_output = File.read(File.join(I18n::JS.export_i18n_js_dir_path, "bits.en.js"))
       expect(en_output).to eq(<<EOS
 I18n.translations || (I18n.translations = {});
-I18n.translations["en"] = I18n.extend((I18n.translations["en"] || {}), {"date":{"formats":{"default":"%Y-%m-%d","long":"%B %d, %Y","short":"%b %d"}},"number":{"currency":{"format":{"delimiter":",","format":"%u%n","precision":2,"separator":".","unit":"$"}}}});
+I18n.translations["en"] = I18n.extend((I18n.translations["en"] || {}), JSON.parse('{"date":{"formats":{"default":"%Y-%m-%d","long":"%B %d, %Y","short":"%b %d"}},"number":{"currency":{"format":{"delimiter":",","format":"%u%n","precision":2,"separator":".","unit":"$"}}}}'));
 EOS
 )
       fr_output = File.read(File.join(I18n::JS.export_i18n_js_dir_path, "bits.fr.js"))
       expect(fr_output).to eq(<<EOS
 I18n.translations || (I18n.translations = {});
-I18n.translations["fr"] = I18n.extend((I18n.translations["fr"] || {}), {"date":{"formats":{"default":"%d/%m/%Y","long":"%e %B %Y","long_ordinal":"%e %B %Y","only_day":"%e","short":"%e %b"}},"number":{"currency":{"format":{"format":"%n %u","precision":2,"unit":"€"}}}});
+I18n.translations["fr"] = I18n.extend((I18n.translations["fr"] || {}), JSON.parse('{"date":{"formats":{"default":"%d/%m/%Y","long":"%e %B %Y","long_ordinal":"%e %B %Y","only_day":"%e","short":"%e %b"}},"number":{"currency":{"format":{"format":"%n %u","precision":2,"unit":"€"}}}}'));
 EOS
 )
     end
@@ -307,21 +307,30 @@ EOS
       expect(subject[:de][:null_test]).to eql(nil)
     end
 
-    context "when given locale is in `I18n.available_locales` but its translation is missing" do
+    context 'when given locale is in `I18n.available_locales` but its translation is missing' do
       subject { translations[:fr][:fallback_test] }
 
-      let(:new_locale) { :pirate }
-      let!(:old_available_locales) { I18n.config.available_locales }
-      let!(:new_available_locales) { I18n.config.available_locales + [new_locale] }
+      let(:available_locales) { %i[fr pirate] }
+
       before do
-        I18n.config.available_locales = new_available_locales
-        set_config "js_file_per_locale_with_fallbacks_as_locale_without_fallback_translations.yml"
+        allow(::I18n).to receive(:available_locales).and_return(available_locales)
+        set_config 'js_file_per_locale_with_fallbacks_as_locale_without_fallback_translations.yml'
       end
-      after do
-        I18n.config.available_locales = old_available_locales
+
+      it { should eql(nil) }
+    end
+
+    context 'when given locale is in `.js_available_locales` but its translation is missing' do
+      subject { translations[:fr][:fallback_test] }
+
+      let(:available_locales) { %i[fr pirate] }
+
+      before do
+        allow(described_class).to receive(:js_available_locales).and_return(available_locales)
+        set_config 'js_file_per_locale_with_fallbacks_as_locale_without_fallback_translations.yml'
       end
 
-      it {should eql(nil)}
+      it { should eql(nil) }
     end
 
     context "with I18n::Fallbacks enabled" do
@@ -351,11 +360,11 @@ EOS
     end
   end
 
-  context "namespace 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)
-      set_config "js_file_with_namespace_and_pretty_print.yml"
+      set_config "js_file_with_namespace_prefix_and_pretty_print.yml"
     end
 
     it "exports with defined locale as fallback when enabled" do
@@ -364,6 +373,7 @@ EOS
       output = File.read(File.join(I18n::JS.export_i18n_js_dir_path, "en.js"))
       expect(output).to match(/^#{
 <<EOS
+import random from 'random-library';
 Foo.translations || (Foo.translations = {});
 Foo.translations["en"] = {
   "number": {
@@ -378,32 +388,73 @@ EOS
   "foo": "Foo",
   "fallback_test": "Success"
 };
+//test
 EOS
 }$/)
     end
   end
 
-  context "I18n.available_locales" do
+  describe '.js_available_locales' do
+    subject { described_class.js_available_locales }
+
+    let(:results) { described_class.scoped_translations('*.admin.*.title') }
+    let(:result)  { ->(locale) { results[locale][:admin][:show][:title] } }
 
-    context "when I18n.available_locales is not set" do
-      it "should allow all locales" do
-        result = I18n::JS.scoped_translations("*.admin.*.title")
+    context 'when I18n.available_locales is not set' do
+      it { expect(subject).to eq ::I18n.available_locales }
 
-        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")
+      it 'should allow all locales' do
+        expect(result.call(:en)).to eql('Show')
+        expect(result.call(:fr)).to eql('Visualiser')
+        expect(result.call(:ja)).to eql('Ignore me')
       end
     end
 
-    context "when I18n.available_locales is set" do
-      before { allow(::I18n).to receive(:available_locales){ [:en, :fr] } }
+    context 'when I18n.available_locales is set' do
+      let(:available_locales) { %i[en fr] }
+
+      before { allow(::I18n).to receive(:available_locales).and_return(available_locales) }
+
+      it { expect(subject).to eq available_locales }
+
+      it 'should ignore non-valid locales' do
+        expect(result.call(:en)).to eql('Show')
+        expect(result.call(:fr)).to eql('Visualiser')
+        expect(results).not_to include(:ja)
+      end
+
+      context 'when :js_available_locales set in config' do
+        before { set_config 'js_available_locales_custom.yml' }
+
+        it { expect(subject).to eq %i[en foo] }
+
+        it 'should ignore non-valid locales' do
+          expect(result.call(:en)).to eql('Show')
+          expect(results).not_to include(:fr, :ja)
+        end
+      end
+    end
+  end
 
-      it "should ignore non-valid locales" do
-        result = I18n::JS.scoped_translations("*.admin.*.title")
+  context 'I18n.available_locales' do
+    let(:results) { described_class.scoped_translations('*.admin.*.title') }
+    let(:result)  { ->(locale) { results[locale][:admin][:show][:title] } }
 
-        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)
+    context 'when I18n.available_locales is not set' do
+      it 'should allow all locales' do
+        expect(result.call(:en)).to eql('Show')
+        expect(result.call(:fr)).to eql('Visualiser')
+        expect(result.call(:ja)).to eql('Ignore me')
+      end
+    end
+
+    context 'when I18n.available_locales is set' do
+      before { allow(::I18n).to receive(:available_locales){ [:en, :fr] } }
+
+      it 'should ignore non-valid locales' do
+        expect(result.call(:en)).to eql('Show')
+        expect(result.call(:fr)).to eql('Visualiser')
+        expect(results).not_to include(:ja)
       end
     end
   end
@@ -597,7 +648,7 @@ EOS
         it "exports with the keys sorted" do
           expect(subject).to eq <<EOS
 I18n.translations || (I18n.translations = {});
-I18n.translations["en"] = I18n.extend((I18n.translations["en"] || {}), {"admin":{"edit":{"title":"Edit"},"show":{"note":"more details","title":"Show"}},"date":{"abbr_day_names":["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],"abbr_month_names":[null,"Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],"day_names":["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],"formats":{"default":"%Y-%m-%d","long":"%B %d, %Y","short":"%b %d"},"month_names":[null,"January","February","March","April","May","June","July","August","September","October","November","December"]},"fallback_test":"Success","foo":"Foo","merge_plurals":{"one":"Apple","other":"Apples"},"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"] || {}), JSON.parse('{"admin":{"edit":{"title":"Edit"},"show":{"note":"more details","title":"Show"}},"date":{"abbr_day_names":["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],"abbr_month_names":[null,"Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],"day_names":["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],"formats":{"default":"%Y-%m-%d","long":"%B %d, %Y","short":"%b %d"},"month_names":[null,"January","February","March","April","May","June","July","August","September","October","November","December"]},"fallback_test":"Success","foo":"Foo","merge_plurals":{"one":"Apple","other":"Apples"},"merge_plurals_with_no_overrides":{"one":"Apple","other":"Apples","zero":"No Apple"},"merge_plurals_with_partial_overrides":{"one":"Cat","other":"Cats"},"null_test":"fallback for null","number":{"currency":{"format":{"delimiter":",","format":"%u%n","precision":2,"separator":".","unit":"$"}},"format":{"delimiter":",","precision":3,"separator":"."},"human":{"decimal_units":{"units":{"million":"Million"}}}},"time":{"am":"am","formats":{"default":"%a, %d %b %Y %H:%M:%S %z","long":"%B %d, %Y %H:%M","short":"%d %b %H:%M"},"pm":"pm"}}'));
 EOS
         end
       end
@@ -609,6 +660,34 @@ EOS
       stub_const('I18n::JS::DEFAULT_EXPORT_DIR_PATH', temp_path)
     end
 
+    # https://github.com/fnando/i18n-js/issues/553
+    describe "millions" do
+      before do
+        stub_const('I18n::JS::DEFAULT_EXPORT_DIR_PATH', temp_path)
+      end
+
+      subject do
+        File.read(File.join(I18n::JS.export_i18n_js_dir_path, "millions.js"))
+      end
+
+      it "should correctly export millions" do
+        set_config "millions.yml"
+        I18n::JS.export
+        file_should_exist "millions.js"
+
+        expect(subject).to eq <<EOS
+I18n.translations || (I18n.translations = {});
+I18n.translations[\"de\"] = I18n.extend((I18n.translations[\"de\"] || {}), JSON.parse('{\"number\":{\"human\":{\"decimal_units\":{\"units\":{\"million\":\"Million\"}}}}}'));
+I18n.translations[\"en\"] = I18n.extend((I18n.translations[\"en\"] || {}), JSON.parse('{\"number\":{\"human\":{\"decimal_units\":{\"units\":{\"million\":\"Million\"}}}}}'));
+I18n.translations[\"en-US\"] = I18n.extend((I18n.translations[\"en-US\"] || {}), JSON.parse('{\"number\":{\"human\":{\"decimal_units\":{\"units\":{\"million\":\"Million\"}}}}}'));
+I18n.translations[\"es\"] = I18n.extend((I18n.translations[\"es\"] || {}), JSON.parse('{\"number\":{\"human\":{\"decimal_units\":{\"units\":{\"million\":{\"one\":\"millón\",\"other\":\"millones\"}}}}}}'));
+I18n.translations[\"fr\"] = I18n.extend((I18n.translations[\"fr\"] || {}), JSON.parse('{\"number\":{\"human\":{\"decimal_units\":{\"units\":{\"million\":\"Million\"}}}}}'));
+I18n.translations[\"ja\"] = I18n.extend((I18n.translations[\"ja\"] || {}), JSON.parse('{\"number\":{\"human\":{\"decimal_units\":{\"units\":{\"million\":\"Million\"}}}}}'));
+I18n.translations[\"ru\"] = I18n.extend((I18n.translations[\"ru\"] || {}), JSON.parse('{\"number\":{\"human\":{\"decimal_units\":{\"units\":{\"million\":\"Million\"}}}}}'));
+EOS
+      end
+    end
+
     it "exports with js_extend option at parent level" do
       set_config "js_extend_parent.yml"
       I18n::JS.export
@@ -618,8 +697,8 @@ EOS
       output = File.read(File.join(I18n::JS.export_i18n_js_dir_path, "js_extend_parent.js"))
       expect(output).to eq(<<EOS
 I18n.translations || (I18n.translations = {});
-I18n.translations[\"en\"] = {\"date\":{\"formats\":{\"default\":\"%Y-%m-%d\",\"long\":\"%B %d, %Y\",\"short\":\"%b %d\"}}};
-I18n.translations[\"fr\"] = {\"date\":{\"formats\":{\"default\":\"%d/%m/%Y\",\"long\":\"%e %B %Y\",\"long_ordinal\":\"%e %B %Y\",\"only_day\":\"%e\",\"short\":\"%e %b\"}}};
+I18n.translations[\"en\"] = JSON.parse('{\"date\":{\"formats\":{\"default\":\"%Y-%m-%d\",\"long\":\"%B %d, %Y\",\"short\":\"%b %d\"}}}');
+I18n.translations[\"fr\"] = JSON.parse('{\"date\":{\"formats\":{\"default\":\"%d/%m/%Y\",\"long\":\"%e %B %Y\",\"long_ordinal\":\"%e %B %Y\",\"only_day\":\"%e\",\"short\":\"%e %b\"}}}');
 EOS
 )
     end
@@ -633,8 +712,8 @@ EOS
       output = File.read(File.join(I18n::JS.export_i18n_js_dir_path, "js_extend_segment.js"))
       expect(output).to eq(<<EOS
 I18n.translations || (I18n.translations = {});
-I18n.translations[\"en\"] = {\"date\":{\"formats\":{\"default\":\"%Y-%m-%d\",\"long\":\"%B %d, %Y\",\"short\":\"%b %d\"}}};
-I18n.translations[\"fr\"] = {\"date\":{\"formats\":{\"default\":\"%d/%m/%Y\",\"long\":\"%e %B %Y\",\"long_ordinal\":\"%e %B %Y\",\"only_day\":\"%e\",\"short\":\"%e %b\"}}};
+I18n.translations[\"en\"] = JSON.parse('{\"date\":{\"formats\":{\"default\":\"%Y-%m-%d\",\"long\":\"%B %d, %Y\",\"short\":\"%b %d\"}}}');
+I18n.translations[\"fr\"] = JSON.parse('{\"date\":{\"formats\":{\"default\":\"%d/%m/%Y\",\"long\":\"%e %B %Y\",\"long_ordinal\":\"%e %B %Y\",\"only_day\":\"%e\",\"short\":\"%e %b\"}}}');
 EOS
 )
     end
@@ -656,7 +735,62 @@ EOS
 
       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\"}});
+I18n.translations[\"en\"] = I18n.extend((I18n.translations[\"en\"] || {}), JSON.parse('{\"merge_plurals\":{\"one\":\"Apple\",\"other\":\"Apples\"}}'));\nI18n.translations[\"fr\"] = I18n.extend((I18n.translations[\"fr\"] || {}), JSON.parse('{\"merge_plurals\":{\"one\":\"Pomme\",\"other\":\"Pommes\",\"zero\":\"Pomme\"}}'));
+EOS
+    end
+  end
+
+  describe "merging plural keys, with fallbacks" 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_with_no_overrides.js"))
+    end
+
+    it "should correctly merge the plural keys" do
+      set_config "merge_plurals_with_no_overrides.yml"
+      I18n::JS.export
+      file_should_exist "merge_plurals_with_no_overrides.js"
+
+      expect(subject).to eq <<EOS
+I18n.translations || (I18n.translations = {});
+I18n.translations[\"de\"] = I18n.extend((I18n.translations[\"de\"] || {}), JSON.parse('{\"merge_plurals_with_no_overrides\":{\"one\":\"Apple\",\"other\":\"Apples\",\"zero\":\"No Apple\"}}'));
+I18n.translations[\"en\"] = I18n.extend((I18n.translations[\"en\"] || {}), JSON.parse('{\"merge_plurals_with_no_overrides\":{\"one\":\"Apple\",\"other\":\"Apples\",\"zero\":\"No Apple\"}}'));
+I18n.translations[\"en-US\"] = I18n.extend((I18n.translations[\"en-US\"] || {}), JSON.parse('{\"merge_plurals_with_no_overrides\":{\"one\":\"Apple\",\"other\":\"Apples\",\"zero\":\"No Apple\"}}'));
+I18n.translations[\"es\"] = I18n.extend((I18n.translations[\"es\"] || {}), JSON.parse('{\"merge_plurals_with_no_overrides\":{\"one\":\"Apple\",\"other\":\"Apples\",\"zero\":\"No Apple\"}}'));
+I18n.translations[\"fr\"] = I18n.extend((I18n.translations[\"fr\"] || {}), JSON.parse('{\"merge_plurals_with_no_overrides\":{\"one\":\"Apple\",\"other\":\"Apples\",\"zero\":\"No Apple\"}}'));
+I18n.translations[\"ja\"] = I18n.extend((I18n.translations[\"ja\"] || {}), JSON.parse('{\"merge_plurals_with_no_overrides\":{\"one\":\"Apple\",\"other\":\"Apples\",\"zero\":\"No Apple\"}}'));
+I18n.translations[\"ru\"] = I18n.extend((I18n.translations[\"ru\"] || {}), JSON.parse('{\"merge_plurals_with_no_overrides\":{\"few\":\"кошек\",\"many\":\"кошка\",\"one\":\"кот\",\"other\":\"кошек\"}}'));
+EOS
+    end
+  end
+
+  # see discussion @ https://github.com/fnando/i18n-js/pull/551#issuecomment-543205767
+  describe "merging plural keys, with fallbacks, with partial overrides" 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_with_partial_overrides.js"))
+    end
+
+    it "should correctly merge the plural keys" do
+      set_config "merge_plurals_with_partial_overrides.yml"
+      I18n::JS.export
+      file_should_exist "merge_plurals_with_partial_overrides.js"
+
+      expect(subject).to eq <<EOS
+I18n.translations || (I18n.translations = {});
+I18n.translations[\"de\"] = I18n.extend((I18n.translations[\"de\"] || {}), JSON.parse('{\"merge_plurals_with_partial_overrides\":{\"one\":\"Cat\",\"other\":\"Cats\"}}'));
+I18n.translations[\"en\"] = I18n.extend((I18n.translations[\"en\"] || {}), JSON.parse('{\"merge_plurals_with_partial_overrides\":{\"one\":\"Cat\",\"other\":\"Cats\"}}'));
+I18n.translations[\"en-US\"] = I18n.extend((I18n.translations[\"en-US\"] || {}), JSON.parse('{\"merge_plurals_with_partial_overrides\":{\"few\":null,\"many\":null,\"one\":\"Cat\",\"other\":\"Cats\"}}'));
+I18n.translations[\"es\"] = I18n.extend((I18n.translations[\"es\"] || {}), JSON.parse('{\"merge_plurals_with_partial_overrides\":{\"one\":\"Cat\",\"other\":\"Cats\"}}'));
+I18n.translations[\"fr\"] = I18n.extend((I18n.translations[\"fr\"] || {}), JSON.parse('{\"merge_plurals_with_partial_overrides\":{\"one\":\"Cat\",\"other\":\"Cats\"}}'));
+I18n.translations[\"ja\"] = I18n.extend((I18n.translations[\"ja\"] || {}), JSON.parse('{\"merge_plurals_with_partial_overrides\":{\"one\":\"Cat\",\"other\":\"Cats\"}}'));
+I18n.translations[\"ru\"] = I18n.extend((I18n.translations[\"ru\"] || {}), JSON.parse('{\"merge_plurals_with_partial_overrides\":{\"one\":\"Cat\",\"other\":\"Cats\"}}'));
 EOS
     end
   end

data/spec/spec_helper.rb

@@ -64,6 +64,7 @@ RSpec.configure do |config|
 
   config.after do
     FileUtils.rm_rf(temp_path)
+    I18n::JS::Private::ConfigStore.instance.flush_cache
   end
 
   config.include Helpers