i18n-js 3.0.0.rc11 → 3.0.0.rc12

data/app/assets/javascripts/i18n.js

@@ -38,6 +38,47 @@
     return ("0" + number.toString()).substr(-2);
   };
 
+  // Improved toFixed number rounding function with support for unprecise floating points
+  // JavaScript's standard toFixed function does not round certain numbers correctly (for example 0.105 with precision 2).
+  var toFixed = function(number, precision) {
+    return decimalAdjust('round', number, -precision).toFixed(precision);
+  };
+
+  // Is a given variable an object?
+  // Borrowed from Underscore.js
+  var isObject = function(obj) {
+    var type = typeof obj;
+    return type === 'function' || type === 'object' && !!obj;
+  };
+
+  // Is a given value an array?
+  // Borrowed from Underscore.js
+  var isArray = function(obj) {
+    if (Array.isArray) {
+      return Array.isArray(obj);
+    };
+    return Object.prototype.toString.call(obj) === '[object Array]';
+  };
+
+  var decimalAdjust = function(type, value, exp) {
+    // If the exp is undefined or zero...
+    if (typeof exp === 'undefined' || +exp === 0) {
+      return Math[type](value);
+    }
+    value = +value;
+    exp = +exp;
+    // If the value is not a number or the exp is not an integer...
+    if (isNaN(value) || !(typeof exp === 'number' && exp % 1 === 0)) {
+      return NaN;
+    }
+    // Shift
+    value = value.toString().split('e');
+    value = Math[type](+(value[0] + 'e' + (value[1] ? (+value[1] - exp) : -exp)));
+    // Shift back
+    value = value.toString().split('e');
+    return +(value[0] + 'e' + (value[1] ? (+value[1] + exp) : exp));
+  }
+
   // Set default days/months translations.
   var DATE = {
       day_names: ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"]
@@ -86,7 +127,7 @@
     , locale: "en"
     // Set the translation key separator.
     , defaultSeparator: "."
-    // Set the placeholder format. Accepts `{placeholder}}` and `%{placeholder}`.}
+    // Set the placeholder format. Accepts `{{placeholder}}` and `%{placeholder}`.
     , placeholder: /(?:\{\{|%\{)(.*?)(?:\}\}?)/gm
     // Set if engine should fallback to the default locale when a translation
     // is missing.
@@ -179,7 +220,7 @@
       result = result(locale);
     }
 
-    if (result instanceof Array === false) {
+    if (isArray(result) === false) {
       result = [result];
     }
 
@@ -408,7 +449,7 @@
 
     if (typeof(translation) === "string") {
       translation = this.interpolate(translation, options);
-    } else if (translation instanceof Object && this.isSet(options.count)) {
+    } else if (isObject(translation) && this.isSet(options.count)) {
       translation = this.pluralize(options.count, translation, options);
     }
 
@@ -438,9 +479,9 @@
       if (this.isSet(options[name])) {
         value = options[name].toString().replace(/\$/gm, "_#$#_");
       } else if (name in options) {
-        value = this.nullPlaceholder(placeholder, message);
+        value = this.nullPlaceholder(placeholder, message, options);
       } else {
-        value = this.missingPlaceholder(placeholder, message);
+        value = this.missingPlaceholder(placeholder, message, options);
       }
 
       regex = new RegExp(placeholder.replace(/\{/gm, "\\{").replace(/\}/gm, "\\}"));
@@ -457,7 +498,7 @@
     options = this.prepareOptions(options);
     var translations, pluralizer, keys, key, message;
 
-    if (scope instanceof Object) {
+    if (isObject(scope)) {
       translations = scope;
     } else {
       translations = this.lookup(scope, options);
@@ -502,7 +543,7 @@
   };
 
   // Return a missing placeholder message for given parameters
-  I18n.missingPlaceholder = function(placeholder, message) {
+  I18n.missingPlaceholder = function(placeholder, message, options) {
     return "[missing " + placeholder + " value]";
   };
 
@@ -529,7 +570,7 @@
     );
 
     var negative = number < 0
-      , string = Math.abs(number).toFixed(options.precision).toString()
+      , string = toFixed(Math.abs(number), options.precision).toString()
       , parts = string.split(".")
       , precision
       , buffer = []
@@ -857,7 +898,32 @@
     }
 
     return scope;
-  }
+  };
+  /**
+   * Merge obj1 with obj2 (shallow merge), without modifying inputs
+   * @param {Object} obj1
+   * @param {Object} obj2
+   * @returns {Object} Merged values of obj1 and obj2
+   *
+   * In order to support ES3, `Object.prototype.hasOwnProperty.call` is used
+   * Idea is from:
+   * https://stackoverflow.com/questions/8157700/object-has-no-hasownproperty-method-i-e-its-undefined-ie8
+   */
+  I18n.extend = function ( obj1, obj2 ) {
+    var extended = {};
+    var prop;
+    for (prop in obj1) {
+      if (Object.prototype.hasOwnProperty.call(obj1, prop)) {
+        extended[prop] = obj1[prop];
+      }
+    }
+    for (prop in obj2) {
+      if (Object.prototype.hasOwnProperty.call(obj2, prop)) {
+        extended[prop] = obj2[prop];
+      }
+    }
+    return extended;
+  };
 
   // Set aliases, so we can save some typing.
   I18n.t = I18n.translate;

data/gemfiles/i18n_0_6.gemfile

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "i18n", "0.6.11"
+gem "i18n", "~> 0.6.0", ">= 0.6.6"
 
 gemspec :path => "../"

data/gemfiles/i18n_0_7.gemfile

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "i18n", "0.7.0"
+gem "i18n", "~> 0.7.0"
 
 gemspec :path => "../"

data/i18n-js.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "i18n", "~> 0.6"
+  s.add_dependency "i18n", "~> 0.6", ">= 0.6.6"
   s.add_development_dependency "appraisal", "~> 2.0"
   s.add_development_dependency "activesupport", ">= 3.2.22"
   s.add_development_dependency "rspec", "~> 3.0"

data/lib/i18n/js/engine.rb

@@ -3,15 +3,36 @@ require "i18n/js"
 module I18n
   module JS
     class Engine < ::Rails::Engine
-      initializer "i18n-js.register_preprocessor", :after => "sprockets.environment" do
+      # `sprockets.environment` was used for 1.x of `sprockets-rails`
+      # https://github.com/rails/sprockets-rails/issues/227
+      #
+      # References for current values:
+      #
+      # Here is where sprockets are attached with Rails. There is no 'sprockets.environment' mentioned.
+      # https://github.com/rails/sprockets-rails/blob/master/lib/sprockets/railtie.rb
+      #
+      # Finisher hook is the place which should be used as border.
+      # http://guides.rubyonrails.org/configuring.html#initializers
+      #
+      # For detail see Pull Request:
+      # https://github.com/fnando/i18n-js/pull/371
+      initializer "i18n-js.register_preprocessor", after: :engines_blank_point, before: :finisher_hook do
         next unless JS::Dependencies.using_asset_pipeline?
         next unless JS::Dependencies.sprockets_supports_register_preprocessor?
 
-        Rails.application.assets.register_preprocessor "application/javascript", :"i18n-js_dependencies" do |context, source|
-          if context.logical_path == "i18n/filtered"
-            ::I18n.load_path.each {|path| context.depend_on(File.expand_path(path))}
+        # From README of 2.x & 3.x of `sprockets-rails`
+        # It seems the `configure` block is preferred way to call `register_preprocessor`
+        # Not sure if this will break older versions of rails
+        #
+        # https://github.com/rails/sprockets-rails/blob/v2.3.3/README.md
+        # https://github.com/rails/sprockets-rails/blob/v3.0.0/README.md
+        Rails.application.config.assets.configure do |config|
+          config.register_preprocessor "application/javascript", :"i18n-js_dependencies" do |context, source|
+            if context.logical_path == "i18n/filtered"
+              ::I18n.load_path.each {|path| context.depend_on(File.expand_path(path))}
+            end
+            source
           end
-          source
         end
       end
     end

data/lib/i18n/js/fallback_locales.rb

@@ -73,7 +73,7 @@ module I18n
       #   This ignores option `I18n.enforce_available_locales`
       def ensure_valid_locales!(locales)
         if locales.any? { |locale| !::I18n.available_locales.include?(locale) }
-          fail ArgumentError, "Valid locales: #{::I18n.available_locales} - Given Locales: #{locales}"
+          fail ArgumentError, "Valid locales: #{::I18n.available_locales.join(", ")} - Given Locales: #{locales.join(", ")}"
         end
       end
     end

data/lib/i18n/js/segment.rb

@@ -33,7 +33,7 @@ module I18n
           f << %(#{self.namespace}.translations || (#{self.namespace}.translations = {});\n)
           _translations.each do |locale, translations_for_locale|
             output_translations = I18n::JS.sort_translation_keys? ? Utils.deep_key_sort(translations_for_locale) : translations_for_locale
-            f << %(#{self.namespace}.translations["#{locale}"] = #{print_json(output_translations)};\n);
+            f << %(#{self.namespace}.translations["#{locale}"] = I18n.extend((#{self.namespace}.translations["#{locale}"] || {}), #{print_json(output_translations)});\n)
           end
         end
       end

data/lib/i18n/js/version.rb

@@ -4,7 +4,7 @@ module I18n
       MAJOR = 3
       MINOR = 0
       PATCH = 0
-      STRING = "#{MAJOR}.#{MINOR}.#{PATCH}.rc11"
+      STRING = "#{MAJOR}.#{MINOR}.#{PATCH}.rc12"
     end
   end
 end

data/spec/js/extend.spec.js

@@ -0,0 +1,41 @@
+var I18n = require("../../app/assets/javascripts/i18n")
+  , Translations = require("./translations")
+;
+
+describe("Extend", function () {
+  it("should return an object", function () {
+    expect(typeof I18n.extend()).toBe('object');
+  });
+
+  it("should merge 2 objects into 1", function () {
+    var obj1 = {
+      test1: "abc"
+    }
+    , obj2 = {
+      test2: "xyz"
+    }
+    , expected = {
+      test1: "abc"
+      , test2: "xyz"
+    };
+
+    expect(I18n.extend(obj1,obj2)).toEqual(expected);
+  });
+  it("should overwrite a property from obj1 with the same property of obj2", function () {
+    var obj1 = {
+      test1: "abc"
+      , test3: "def"
+    }
+    , obj2 = {
+      test2: "xyz"
+      , test3: "uvw"
+    }
+    , expected = {
+      test1: "abc"
+      , test2: "xyz"
+      , test3: "uvw"
+    };
+
+    expect(I18n.extend(obj1,obj2)).toEqual(expected);
+  });
+});

data/spec/js/interpolation.spec.js

@@ -97,4 +97,17 @@ describe("Interpolation", function(){
     expect(actual).toEqual("Hello !");
     I18n.nullPlaceholder = orig;
   });
+
+  it("provides missingPlaceholder with the placeholder, message, and options object", function(){
+    var orig = I18n.missingPlaceholder;
+    I18n.missingPlaceholder = function(placeholder, message, options) {
+      expect(placeholder).toEqual('{{name}}');
+      expect(message).toEqual('Hello {{name}}!');
+      expect(options.debugScope).toEqual('landing-page');
+      return '[missing-placeholder-debug]';
+    };
+    actual = I18n.t("greetings.name", {debugScope: 'landing-page'});
+    expect(actual).toEqual("Hello [missing-placeholder-debug]!");
+    I18n.missingPlaceholder = orig;
+  });
 });

data/spec/js/locales.spec.js

@@ -0,0 +1,31 @@
+var I18n = require("../../app/assets/javascripts/i18n");
+
+describe("Locales", function(){
+  beforeEach(function(){
+    I18n.reset();
+  });
+
+  it("returns the requested locale, if available", function(){
+    I18n.locales["ab"] = ["ab"];
+    expect(I18n.locales.get("ab")).toEqual(["ab"]);
+  });
+
+  it("wraps single results in an array", function(){
+    I18n.locales["cd"] = "cd";
+    expect(I18n.locales.get("cd")).toEqual(["cd"]);
+  });
+
+  it("returns the result of locale functions", function(){
+    I18n.locales["fn"] = function() {
+      return "gg";
+    };
+    expect(I18n.locales.get("fn")).toEqual(["gg"]);
+  });
+
+  it("uses I18n.locale as a fallback", function(){
+    I18n.locale = "xx";
+    I18n.locales["xx"] = ["xx"];
+    expect(I18n.locales.get()).toEqual(["xx"]);
+    expect(I18n.locales.get("yy")).toEqual(["xx"]);
+  });
+});

data/spec/js/numbers.spec.js

@@ -97,6 +97,34 @@ describe("Numbers", function(){
     expect(I18n.toNumber(1.98, options)).toEqual("2");
   });
 
+  it("rounds numbers correctly when precision is given", function(){
+    options = {separator: ".", delimiter: ","};
+
+    options["precision"] = 2;
+    expect(I18n.toNumber(0.104, options)).toEqual("0.10");
+
+    options["precision"] = 2;
+    expect(I18n.toNumber(0.105, options)).toEqual("0.11");
+
+    options["precision"] = 2;
+    expect(I18n.toNumber(1.005, options)).toEqual("1.01");
+
+    options["precision"] = 3;
+    expect(I18n.toNumber(35.855, options)).toEqual("35.855");
+
+    options["precision"] = 2;
+    expect(I18n.toNumber(35.855, options)).toEqual("35.86");
+
+    options["precision"] = 1;
+    expect(I18n.toNumber(35.855, options)).toEqual("35.9");
+
+    options["precision"] = 0;
+    expect(I18n.toNumber(35.855, options)).toEqual("36");
+
+    options["precision"] = 0;
+    expect(I18n.toNumber(0.000000000000001, options)).toEqual("0");
+  });
+
   it("returns number as human size", function(){
     var kb = 1024;
 
@@ -139,4 +167,4 @@ describe("Numbers", function(){
     actual = I18n.toNumber(30, {strip_insignificant_zeros: true, precision: 0});
     expect(actual).toEqual("30");
   });
-});
+});

data/spec/js/specs.html

@@ -31,12 +31,14 @@
         <script type="text/javascript" src="defaults.spec.js"></script>
         <script type="text/javascript" src="interpolation.spec.js"></script>
         <script type="text/javascript" src="localization.spec.js"></script>
+        <script type="text/javascript" src="locales.spec.js"></script>
         <script type="text/javascript" src="numbers.spec.js"></script>
         <script type="text/javascript" src="placeholder.spec.js"></script>
         <script type="text/javascript" src="pluralization.spec.js"></script>
         <script type="text/javascript" src="prepare_options.spec.js"></script>
         <script type="text/javascript" src="translate.spec.js"></script>
         <script type="text/javascript" src="utility_functions.spec.js"></script>
+        <script type="text/javascript" src="extend.spec.js"></script>
 
         <!-- run specs -->
         <script type="text/javascript">

data/spec/js/specs_requirejs.html

@@ -13,7 +13,7 @@
 
         <!-- load your javascript files -->
         <script type="text/javascript" src="require.js"></script>
-    
+
         <script type="text/javascript">
         // Prepare requirejs shims to wrap each test so that it will work with the
         // require syntax loading
@@ -30,7 +30,8 @@
                 "./pluralization.spec.js",
                 "./prepare_options.spec.js",
                 "./translate.spec.js",
-                "./utility_functions.spec.js"
+                "./utility_functions.spec.js",
+                "./extend.spec.js"
                 ];
         var shims = {};
         for(var i = 0; i < testScripts.length; i++) {

data/spec/js/translate.spec.js

@@ -103,7 +103,7 @@ describe("Translate", function(){
     expect(I18n.t("hello")).toEqual("Hei Verden!");
   });
 
-  describe("when provided default valutes", function() {
+  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"}]});
       expect(actual).toEqual("Hello stranger!");

data/spec/{sprockets_spec.rb → ruby/i18n/js/dependencies_spec.rb}

@@ -1,3 +1,4 @@
+require "spec_helper"
 
 describe I18n::JS::Dependencies, ".sprockets_supports_register_preprocessor?" do
 

data/spec/{segment_spec.rb → ruby/i18n/js/segment_spec.rb}

@@ -64,8 +64,8 @@ describe I18n::JS::Segment do
 
         File.open(File.join(temp_path, "segment.js")){|f| f.read}.should eql <<-EOF
 MyNamespace.translations || (MyNamespace.translations = {});
-MyNamespace.translations["en"] = {"test":"Test"};
-MyNamespace.translations["fr"] = {"test":"Test2"};
+MyNamespace.translations["en"] = I18n.extend((MyNamespace.translations["en"] || {}), {"test":"Test"});
+MyNamespace.translations["fr"] = I18n.extend((MyNamespace.translations["fr"] || {}), {"test":"Test2"});
         EOF
       end
     end
@@ -79,12 +79,12 @@ MyNamespace.translations["fr"] = {"test":"Test2"};
 
         File.open(File.join(temp_path, "en.js")){|f| f.read}.should eql <<-EOF
 MyNamespace.translations || (MyNamespace.translations = {});
-MyNamespace.translations["en"] = {"test":"Test"};
+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
 MyNamespace.translations || (MyNamespace.translations = {});
-MyNamespace.translations["fr"] = {"test":"Test2"};
+MyNamespace.translations["fr"] = I18n.extend((MyNamespace.translations["fr"] || {}), {"test":"Test2"});
         EOF
       end
     end
@@ -101,7 +101,7 @@ MyNamespace.translations["fr"] = {"test":"Test2"};
 
         File.open(File.join(temp_path, "segment.js")){|f| f.read}.should eql <<-EOF
 MyNamespace.translations || (MyNamespace.translations = {});
-MyNamespace.translations["en"] = {"a":"Test","b":"Test"};
+MyNamespace.translations["en"] = I18n.extend((MyNamespace.translations["en"] || {}), {"a":"Test","b":"Test"});
         EOF
       end
     end

data/spec/{i18n_js_spec.rb → 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"] = {"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"] || {}), {"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"] = {"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"] || {}), {"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"] = {"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"] || {}), {"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"] = {"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"] || {}), {"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
@@ -581,7 +581,7 @@ EOS
         it "exports with the keys sorted" do
           expect(subject).to eq(<<EOS
 I18n.translations || (I18n.translations = {});
-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","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

data/spec/spec_helper.rb

@@ -18,7 +18,7 @@ module Helpers
 
   def file_should_exist(name)
     file_path = File.join(temp_path, name)
-    File.should be_file(file_path)
+    expect(File.file?(file_path)).to eq(true)
   end
 
   def temp_path(file_name = "")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-js
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc11
+  version: 3.0.0.rc12
 platform: ruby
 authors:
 - Nando Vieira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-26 00:00:00.000000000 Z
+date: 2015-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -17,6 +17,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.6.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.6.6
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -151,18 +157,18 @@ files:
 - spec/fixtures/no_config.yml
 - spec/fixtures/no_scope.yml
 - spec/fixtures/simple_scope.yml
-- spec/i18n_js_fallback_locales_spec.rb
-- spec/i18n_js_spec.rb
 - spec/js/currency.spec.js
 - spec/js/current_locale.spec.js
 - spec/js/dates.spec.js
 - spec/js/defaults.spec.js
+- spec/js/extend.spec.js
 - spec/js/interpolation.spec.js
 - spec/js/jasmine/MIT.LICENSE
 - spec/js/jasmine/jasmine-html.js
 - spec/js/jasmine/jasmine.css
 - spec/js/jasmine/jasmine.js
 - spec/js/jasmine/jasmine_favicon.png
+- spec/js/locales.spec.js
 - spec/js/localization.spec.js
 - spec/js/numbers.spec.js
 - spec/js/placeholder.spec.js
@@ -174,10 +180,12 @@ files:
 - spec/js/translate.spec.js
 - spec/js/translations.js
 - spec/js/utility_functions.spec.js
-- spec/segment_spec.rb
+- spec/ruby/i18n/js/dependencies_spec.rb
+- spec/ruby/i18n/js/fallback_locales_spec.rb
+- spec/ruby/i18n/js/segment_spec.rb
+- spec/ruby/i18n/js/utils_spec.rb
+- spec/ruby/i18n/js_spec.rb
 - spec/spec_helper.rb
-- spec/sprockets_spec.rb
-- spec/utils_spec.rb
 homepage: http://rubygems.org/gems/i18n-js
 licenses:
 - MIT
@@ -198,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: It's a small library to provide the Rails I18n translations on the Javascript.
@@ -226,18 +234,18 @@ test_files:
 - spec/fixtures/no_config.yml
 - spec/fixtures/no_scope.yml
 - spec/fixtures/simple_scope.yml
-- spec/i18n_js_fallback_locales_spec.rb
-- spec/i18n_js_spec.rb
 - spec/js/currency.spec.js
 - spec/js/current_locale.spec.js
 - spec/js/dates.spec.js
 - spec/js/defaults.spec.js
+- spec/js/extend.spec.js
 - spec/js/interpolation.spec.js
 - spec/js/jasmine/MIT.LICENSE
 - spec/js/jasmine/jasmine-html.js
 - spec/js/jasmine/jasmine.css
 - spec/js/jasmine/jasmine.js
 - spec/js/jasmine/jasmine_favicon.png
+- spec/js/locales.spec.js
 - spec/js/localization.spec.js
 - spec/js/numbers.spec.js
 - spec/js/placeholder.spec.js
@@ -249,8 +257,10 @@ test_files:
 - spec/js/translate.spec.js
 - spec/js/translations.js
 - spec/js/utility_functions.spec.js
-- spec/segment_spec.rb
+- spec/ruby/i18n/js/dependencies_spec.rb
+- spec/ruby/i18n/js/fallback_locales_spec.rb
+- spec/ruby/i18n/js/segment_spec.rb
+- spec/ruby/i18n/js/utils_spec.rb
+- spec/ruby/i18n/js_spec.rb
 - spec/spec_helper.rb
-- spec/sprockets_spec.rb
-- spec/utils_spec.rb
 has_rdoc: