i18n-js 3.0.0.rc7 → 3.0.0.rc8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4377851d9bebcdaf860e76c466587f7486255752
-  data.tar.gz: 9b52dbf3c12aca86c6de92073323dcb5dbeb02f0
+  metadata.gz: f5f7d877f8e94243760d5e3c4c3bbe232badc99d
+  data.tar.gz: 0d2cf27dc10c17acc846c457ec48573ae9832413
 SHA512:
-  metadata.gz: d33c4c88cdbcbeda6233f65a7455d5cfec3b958f3b4aa74f04cbe0ecd4896f7fdd9ee7a853deaae44c932ae9d127146128df24a00f6a2956c31c4f73f8474738
-  data.tar.gz: f8333679e32ad823e9c5946734c031f761609dc30ac8a15b143b030d2d85e6c68dbba0073192a020da39a4aaa1057ae1cad4e60f47459c86dd03b3d3d34dcce2
+  metadata.gz: 6ebf38bdbc12665767e0c7c3806fd02221204b26e8b1f82dda78c3f07534ec5cedd18b4b6bc133c2820effc6ddb0f3c6902318a76b78563ceb232e99272213b8
+  data.tar.gz: c505d9671c59b80c51c28a033b03c8cac3bdc4174621789f7f9e48e5257324c37803f4e1f084cc337c3512894c193bbbf8a820e78c6495f570872dee4ff50f28

data/CHANGELOG.md

@@ -3,6 +3,33 @@
 
 ### enhancements
 
+### bug fixes
+
+
+## 3.0.0.rc8
+
+### enhancements
+
+- Add support for loading via AMD and CommonJS module loaders ([#266](https://github.com/fnando/i18n-js/pull/266))
+- Add `I18n.nullPlaceholder`  
+  Defaults to I18n.missingPlaceholder (`[missing {{name}} value]`)  
+  Set to `function() {return "";}` to match Ruby `I18n.t("name: %{name}", name: nil)`
+- For date formatting, you can now also add placeholders to the date format, see README for detail
+- Add fallbacks option to `i18n-js.yml`, defaults to `true`
+
+### bug fixes
+
+- Fix factory initialization so that the Node/CommonJS branch only gets executed if the environment is Node/CommonJS
+  (it currently will execute if module is defined in the global scope, which occurs with QUnit, for example)
+- Fix pluralization rules selection for negative `count` (e.g. `-1` was lead to use `one` for pluralization) ([#268](https://github.com/fnando/i18n-js/pull/268))
+- Remove check for `Rails.configuration.assets.compile` before telling Sprockets the dependency of translations JS file  
+  This might be the reason of many "cache not expired" issues  
+  Discovered/reported in #277
+
+## 3.0.0.rc7
+
+### enhancements
+
 - The Rails Engine initializer is now named as `i18n-js.register_preprocessor` (https://github.com/fnando/i18n-js/pull/261)
 - Rename `I18n::JS.config_file` to `I18n::JS.config_file_path` and make it configurable  
   Expected a `String`, default is still `config/i18n-js.yml`

data/README.md

@@ -121,6 +121,65 @@ translations:
 
 To find more examples on how to use the configuration file please refer to the tests.
 
+##### Fallbacks
+
+If you specify the `fallbacks` option, you will be able to fill missing translations with those inside fallback locale(s).  
+Default value is `true`.
+
+Examples:
+```yaml
+fallbacks: true
+
+translations:
+- file: "public/javascripts/i18n/%{locale}.js"
+  only: '*'
+```
+This will enable merging fallbacks into each file. (set to `false` to disable).
+If you use `I18n` with fallbacks, the fallbacks defined there will be used.
+Otherwise `I18n.default_locale` will be used.
+
+```yaml
+fallbacks: :de
+
+translations:
+- file: "public/javascripts/i18n/%{locale}.js"
+  only: '*'
+```
+Here, the specified locale `:de` will be used as fallback for all locales.
+
+```yaml
+fallbacks:
+  fr: ["de", "en"]
+  de: "en"
+
+translations:
+- file: "public/javascripts/i18n/%{locale}.js"
+  only: '*'
+```
+Fallbacks defined will be used, if not defined (e.g. `:pl`) `I18n.fallbacks` or `I18n.default_locale` will be used.
+
+```yaml
+fallbacks: :default_locale
+
+translations:
+- file: "public/javascripts/i18n/%{locale}.js"
+  only: '*'
+```
+Setting the option to `:default_locale` will enforce the fallback to use the `I18n.default_locale`, ignoring `I18n.fallbacks`.
+
+Examples:
+```yaml
+fallbacks: false
+
+translations:
+- file: "public/javascripts/i18n/%{locale}.js"
+  only: '*'
+```
+You must disable this feature by setting the option to `false`.
+
+To find more examples on how to use the configuration file please refer to the tests.
+
+
 #### Vanilla JavaScript
 
 Just add the `i18n.js` file to your page. You'll have to build the translations object
@@ -320,6 +379,17 @@ The `toHumanSize` function accepts the following options:
     I18n.l("date.formats.short", "09/18/2009");           // mm/dd/yyyy
     I18n.l("date.formats.short", (new Date()));           // Date object
 
+You can also add placeholders to the date format:
+
+    I18n.translations["en"] = {
+      date: {
+        formats: {
+          ordinal_day: "%B %{day}"
+        }
+      }
+    }
+    I18n.l("date.formats.ordinal_day", "2009-09-18", { day: '18th' }); // Sep 18th
+
 If you prefer, you can use the `I18n.strftime` function to format dates.
 
     var date = new Date();

data/Rakefile

@@ -9,7 +9,8 @@ RSpec::Core::RakeTask.new(:"spec:ruby")
 
 desc "Run JavaScript specs"
 task "spec:js" do
-  system "npm", "test"
+  # Need to call `exit!` manually to propogate exit status
+  system "npm", "test" or exit!(1)
 end
 
 desc "Run all specs"

data/app/assets/javascripts/i18n.js

@@ -11,9 +11,26 @@
 //
 // See tests for specific formatting like numbers and dates.
 //
-;(function(I18n){
+
+;(function(factory) {
+  if (typeof module !== 'undefined' && module.exports) {
+    // Node/CommonJS
+    module.exports = factory(this);
+
+  } else if (typeof define === 'function' && define.amd) {
+    // AMD
+    define((function(global){ return function(){ factory(global); }})(this));
+
+  } else {
+    // Browser globals
+    this.I18n = factory(this);
+  }
+}(function(global) {
   "use strict";
 
+  // Use previously defined object if exists in current scope
+  var I18n = global && global.I18n || {};
+
   // Just cache the Array#slice function.
   var slice = Array.prototype.slice;
 
@@ -407,6 +424,8 @@
 
       if (this.isSet(options[name])) {
         value = options[name].toString().replace(/\$/gm, "_#$#_");
+      } else if (name in options) {
+        value = this.nullPlaceholder(placeholder, message);
       } else {
         value = this.missingPlaceholder(placeholder, message);
       }
@@ -436,7 +455,7 @@
     }
 
     pluralizer = this.pluralization.get(options.locale);
-    keys = pluralizer(Math.abs(count));
+    keys = pluralizer(count);
 
     while (keys.length) {
       key = keys.shift();
@@ -467,6 +486,10 @@
     return "[missing " + placeholder + " value]";
   };
 
+  I18n.nullPlaceholder = function() {
+    return I18n.missingPlaceholder.apply(I18n, arguments);
+  };
+
   // Format number using localization rules.
   // The options will be retrieved from the `number.format` scope.
   // If this isn't present, then the following options will be used:
@@ -557,7 +580,9 @@
   //
   // It will default to the value's `toString` function.
   //
-  I18n.localize = function(scope, value) {
+  I18n.localize = function(scope, value, options) {
+    options || (options = {});
+
     switch (scope) {
       case "currency":
         return this.toCurrency(value);
@@ -567,11 +592,15 @@
       case "percentage":
         return this.toPercentage(value);
       default:
+        var localizedValue;
+
         if (scope.match(/^(date|time)/)) {
-          return this.toTime(scope, value);
+          localizedValue = this.toTime(scope, value);
         } else {
-          return value.toString();
+          localizedValue = value.toString();
         }
+
+        return this.interpolate(localizedValue, options);
     }
   };
 
@@ -797,4 +826,6 @@
   I18n.t = I18n.translate;
   I18n.l = I18n.localize;
   I18n.p = I18n.pluralize;
-})(typeof(exports) === "undefined" ? (this.I18n || (this.I18n = {})) : exports);
+
+  return I18n;
+}));

data/app/assets/javascripts/i18n/filtered.js.erb

@@ -1,2 +1,20 @@
 <%# encoding: utf-8 %>
-;I18n.translations = <%= I18n::JS.filtered_translations.to_json %>;
+
+;(function(factory) {
+  if (typeof module !== 'undefined') {
+    // Node/CommonJS
+    factory(require('i18n'));
+
+  } else if (typeof define === 'function' && define.amd) {
+    // AMD
+    define(['i18n'], factory);
+
+  } else {
+    // Browser globals
+    factory(this.I18n);
+  }
+}(function(I18n) {
+  "use strict";
+
+  I18n.translations = <%= I18n::JS.filtered_translations.to_json %>;
+}));

data/lib/i18n/js.rb

@@ -6,6 +6,7 @@ require "i18n/js/utils"
 module I18n
   module JS
     require "i18n/js/dependencies"
+    require "i18n/js/fallback_locales"
     if JS::Dependencies.rails?
       require "i18n/js/middleware"
       require "i18n/js/engine"
@@ -37,6 +38,8 @@ module I18n
       I18n.available_locales.each_with_object({}) do |locale, segments|
         scope = [scope] unless scope.respond_to?(:each)
         result = scoped_translations(scope.collect{|s| "#{locale}.#{s}"})
+        merge_with_fallbacks!(result, locale, scope) if use_fallbacks?
+
         next if result.empty?
 
         segment_name = ::I18n.interpolate(pattern,{:locale => locale})
@@ -145,6 +148,28 @@ module I18n
       end
     end
 
+    def self.use_fallbacks?
+      fallbacks != false
+    end
+
+    def self.fallbacks
+      config.fetch(:fallbacks) do
+        # default value
+        true
+      end
+    end
+
+    # deep_merge! given result with result for fallback locale
+    def self.merge_with_fallbacks!(result, locale, scope)
+      result[locale] ||= {}
+      fallback_locales = FallbackLocales.new(fallbacks, locale)
+
+      fallback_locales.each do |fallback_locale|
+        fallback_result = scoped_translations(scope.collect{|s| "#{fallback_locale}.#{s}"}) # NOTE: Duplicated code here
+        result[locale] = Utils.deep_merge(fallback_result[fallback_locale], result[locale])
+      end
+    end
+
 
     ### Export i18n.js
     begin

data/lib/i18n/js/engine.rb

@@ -6,7 +6,6 @@ module I18n
       initializer "i18n-js.register_preprocessor", :after => "sprockets.environment" do
         next unless JS::Dependencies.using_asset_pipeline?
         next unless JS::Dependencies.sprockets_supports_register_preprocessor?
-        next unless Rails.configuration.assets.compile
 
         Rails.application.assets.register_preprocessor "application/javascript", :"i18n-js_dependencies" do |context, source|
           if context.logical_path == "i18n/filtered"

data/lib/i18n/js/fallback_locales.rb

@@ -0,0 +1,81 @@
+module I18n
+  module JS
+    class FallbackLocales
+      attr_reader :fallbacks, :locale
+
+      def initialize(fallbacks, locale)
+        @fallbacks = fallbacks
+        @locale = locale
+      end
+
+      def each
+        locales.each { |locale| yield(locale) }
+      end
+
+      # @return [Array<String, Symbol>]
+      #   An Array of locales to use as fallbacks for given locale.
+      def locales
+        locales = case fallbacks
+                  when true
+                    default_fallbacks
+                  when :default_locale
+                    [::I18n.default_locale]
+                  when Symbol, String
+                    [fallbacks.to_sym]
+                  when Array
+                    ensure_valid_fallbacks_as_array!
+                    fallbacks
+                  when Hash
+                    Array(fallbacks[locale] || default_fallbacks)
+                  else
+                    fail ArgumentError, "fallbacks must be: true, :default_locale an Array or a Hash - given: #{fallbacks}"
+                  end
+
+        locales.map! { |locale| locale.to_sym }
+        ensure_valid_locales!(locales)
+        locales
+      end
+
+      private
+
+      # @return [Array<String, Symbol>] An Array of locales.
+      def default_fallbacks
+        if using_i18n_fallbacks_module?
+          I18n.fallbacks[locale]
+        else
+          [::I18n.default_locale]
+        end
+      end
+
+      # @return
+      #   true if we can safely use I18n.fallbacks, false otherwise.
+      #
+      # @note
+      #   We should implement this as `I18n.respond_to?(:fallbacks)`, but
+      #   once I18n::Backend::Fallbacks is included, I18n will _always_
+      #   respond to :fallbacks. Even if we switch the backend to one
+      #   without fallbacks!
+      #
+      #   Maybe this should be fixed within I18n.
+      def using_i18n_fallbacks_module?
+        I18n.backend.class.included_modules.include?(I18n::Backend::Fallbacks)
+      end
+
+      def ensure_valid_fallbacks_as_array!
+        return if fallbacks.all? { |e| e.is_a?(String) || e.is_a?(Symbol) }
+
+        fail ArgumentError, "If fallbacks is passed as Array, it must ony include Strings or Symbols. Given: #{fallbacks}"
+      end
+
+      # Ensures that only valid locales are returned.
+      #
+      # @note
+      #   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}"
+        end
+      end
+    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}.rc7"
+      STRING = "#{MAJOR}.#{MINOR}.#{PATCH}.rc8"
     end
   end
 end

data/package.json

@@ -4,7 +4,7 @@
   "devDependencies": {
     "jasmine-node": "*"
   },
-
+  "main": "app/assets/javascripts/i18n.js",
   "scripts": {
     "test": "./node_modules/.bin/jasmine-node spec/js"
   }

data/spec/fixtures/js_file_per_locale_with_fallbacks_as_default_locale_symbol.yml

@@ -0,0 +1,4 @@
+fallbacks: :default_locale
+
+translations:
+- file: "tmp/i18n-js/%{locale}.js"

data/spec/fixtures/js_file_per_locale_with_fallbacks_as_hash.yml

@@ -0,0 +1,6 @@
+fallbacks:
+  fr: ["de", "en"]
+  de: "en"
+
+translations:
+  - file: "tmp/i18n-js/%{locale}.js"

data/spec/fixtures/js_file_per_locale_with_fallbacks_as_locale.yml

@@ -0,0 +1,4 @@
+fallbacks: :de
+
+translations:
+- file: "tmp/i18n-js/%{locale}.js"

data/spec/fixtures/js_file_per_locale_with_fallbacks_enabled.yml

@@ -0,0 +1,4 @@
+fallbacks: true
+
+translations:
+- file: "tmp/i18n-js/%{locale}.js"

data/spec/fixtures/js_file_per_locale_without_fallbacks.yml

@@ -0,0 +1,4 @@
+fallbacks: false
+
+translations:
+- file: "tmp/i18n-js/%{locale}.js"

data/spec/fixtures/locales.yml

@@ -35,6 +35,10 @@ en:
     edit:
       title: "Edit"
   foo: "Foo"
+  fallback_test: "Success"
+
+de:
+  fallback_test: "Erfolg"
 
 fr:
   date:

data/spec/i18n_js_fallback_locales_spec.rb

@@ -0,0 +1,94 @@
+require "spec_helper"
+
+describe I18n::JS::FallbackLocales do
+  let(:locale) { :fr }
+  let(:default_locale) { :en }
+
+  describe "#locales" do
+    let(:fallbacks_locales) { described_class.new(fallbacks, locale) }
+    subject { fallbacks_locales.locales }
+
+    let(:fetching_locales) { proc do fallbacks_locales.locales end }
+
+    context "when given true as fallbacks" do
+      let(:fallbacks) { true }
+      it { should eq([default_locale]) }
+    end
+
+    context "when given false as fallbacks" do
+      let(:fallbacks) { false }
+      it { expect(fetching_locales).to raise_error(ArgumentError) }
+    end
+
+    context "when given a valid locale as fallbacks" do
+      let(:fallbacks) { :de }
+      it { should eq([:de]) }
+    end
+
+    context "when given a valid Array as fallbacks" do
+      let(:fallbacks) { [:de, :en] }
+      it { should eq([:de, :en]) }
+    end
+
+    context "when given a valid Hash with current locale as key as fallbacks" do
+      let(:fallbacks) do { :fr => [:de, :en] } end
+      it { should eq([:de, :en]) }
+    end
+
+    context "when given a valid Hash without current locale as key as fallbacks" do
+      let(:fallbacks) do { :de => [:fr, :en] } end
+      it { should eq([default_locale]) }
+    end
+
+    context "when given a invalid locale as fallbacks" do
+      let(:fallbacks) { :invalid_locale }
+      it { expect(fetching_locales).to raise_error(ArgumentError) }
+    end
+
+    context "when given a invalid type as fallbacks" do
+      let(:fallbacks) { 42 }
+      it { expect(fetching_locales).to raise_error(ArgumentError) }
+    end
+
+    context "when given an invalid Array as fallbacks" do
+      let(:fallbacks) { [:de, :en, :invalid_locale] }
+      it { expect(fetching_locales).to raise_error(ArgumentError) }
+    end
+
+    context "when given a invalid Hash as fallbacks" do
+      let(:fallbacks) do { :fr => [:de, :en, :invalid_locale] } end
+      it { expect(fetching_locales).to raise_error(ArgumentError) }
+    end
+
+    # I18n::Backend::Fallbacks
+    context "when I18n::Backend::Fallbacks is used" do
+      let(:backend_with_fallbacks) { backend_class_with_fallbacks.new }
+
+      before do
+        I18n.backend = backend_with_fallbacks
+        I18n.fallbacks[:fr] = [:de, :en]
+      end
+      after { I18n.backend = I18n::Backend::Simple.new }
+
+      context "given true as fallbacks" do
+        let(:fallbacks) { true }
+        it { should eq([:de, :en]) }
+      end
+
+      context "given :default_locale as fallbacks" do
+        let(:fallbacks) { :default_locale }
+        it { should eq([:en]) }
+      end
+
+      context "given a Hash with current locale as fallbacks" do
+        let(:fallbacks) do { :fr => [:en] } end
+        it { should eq([:en]) }
+      end
+
+      context "given a Hash without current locale as fallbacks" do
+        let(:fallbacks) do { :de => [:en] } end
+        it { should eq([:de, :en]) }
+      end
+    end
+  end
+end

data/spec/i18n_js_spec.rb

@@ -73,10 +73,13 @@ describe I18n::JS do
 
       set_config "multiple_conditions_per_locale.yml"
 
+      expected_locales = %w(en fr)
+
       result = I18n::JS.translation_segments
-      result.keys.should eql(["tmp/i18n-js/bits.en.js", "tmp/i18n-js/bits.fr.js"])
+      expected_files = expected_locales.map { |locale| "tmp/i18n-js/bits.#{locale}.js" }
+      result.keys.should eql(expected_files)
 
-      %w{en fr}.each do |lang|
+      expected_locales.each do |lang|
         result["tmp/i18n-js/bits.#{lang}.js"].keys.should eql([lang.to_sym])
         result["tmp/i18n-js/bits.#{lang}.js"][lang.to_sym].keys.sort.should eql([:date, :number])
       end
@@ -129,6 +132,68 @@ describe I18n::JS do
     end
   end
 
+  context "fallbacks" do
+    it "exports without fallback when disabled" do
+      set_config "js_file_per_locale_without_fallbacks.yml"
+
+      result = I18n::JS.translation_segments
+      result["tmp/i18n-js/fr.js"][:fr][:fallback_test].should eql(nil)
+    end
+
+    it "exports with default_locale as fallback when enabled" do
+      set_config "js_file_per_locale_with_fallbacks_enabled.yml"
+
+      result = I18n::JS.translation_segments
+      result["tmp/i18n-js/fr.js"][:fr][:fallback_test].should eql("Success")
+    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"
+
+      result = I18n::JS.translation_segments
+      result["tmp/i18n-js/fr.js"][:fr][:fallback_test].should eql("Success")
+    end
+
+    it "exports with given locale as fallback" do
+      set_config "js_file_per_locale_with_fallbacks_as_locale.yml"
+
+      result = I18n::JS.translation_segments
+      result["tmp/i18n-js/fr.js"][:fr][:fallback_test].should eql("Erfolg")
+    end
+
+    context "with I18n::Fallbacks enabled" do
+      let(:backend_with_fallbacks) { backend_class_with_fallbacks.new }
+      let!(:old_backebad) { I18n.backend }
+
+      before do
+        I18n.backend = backend_with_fallbacks
+        I18n.fallbacks[:fr] = [:de, :en]
+      end
+      after { I18n.backend = old_backebad }
+
+      it "exports with defined locale as fallback when enabled" do
+        set_config "js_file_per_locale_with_fallbacks_enabled.yml"
+
+        result = I18n::JS.translation_segments
+        result["tmp/i18n-js/fr.js"][:fr][:fallback_test].should 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"
+
+        result = I18n::JS.translation_segments
+        result["tmp/i18n-js/fr.js"][:fr][:fallback_test].should eql("Success")
+      end
+
+      it "exports with Fallbacks as Hash" do
+        set_config "js_file_per_locale_with_fallbacks_as_hash.yml"
+
+        result = I18n::JS.translation_segments
+        result["tmp/i18n-js/fr.js"][:fr][:fallback_test].should eql("Erfolg")
+      end
+    end
+  end
+
   context "I18n.available_locales" do
     context "when I18n.available_locales is not set" do
       it "should allow all locales" do

data/spec/js/interpolation.spec.js

@@ -29,5 +29,18 @@ describe("Interpolation", function(){
   it("outputs missing placeholder message if interpolation value is missing", function(){
     actual = I18n.t("greetings.name");
     expect(actual).toEqual("Hello [missing {{name}} value]!");
-  })
+  });
+
+  it("outputs missing placeholder message if interpolation value is null", function(){
+    actual = I18n.t("greetings.name", {name: null});
+    expect(actual).toEqual("Hello [missing {{name}} value]!");
+  });
+
+  it("allows overriding the null placeholder message", function(){
+    var orig = I18n.nullPlaceholder;
+    I18n.nullPlaceholder = function() {return "";}
+    actual = I18n.t("greetings.name", {name: null});
+    expect(actual).toEqual("Hello !");
+    I18n.nullPlaceholder = orig;
+  });
 });

data/spec/js/localization.spec.js

@@ -34,6 +34,13 @@ describe("Localization", function(){
     expect(I18n.l("time.formats.long", "2009-11-29 15:07:59")).toEqual("Domingo, 29 de Novembro de 2009, 15:07 h");
   });
 
+  it("localizes date/time strings with placeholders", function(){
+    I18n.locale = "pt-BR";
+
+    expect(I18n.l("date.formats.short_with_placeholders", "2009-01-07", { p1: "!", p2: "?" })).toEqual("07 de Janeiro ! ?");
+    expect(I18n.l("time.formats.short_with_placeholders", "2009-01-07 09:12:35", { p1: "!" })).toEqual("07/01, 09:12 h !");
+  });
+
   it("localizes percentage", function(){
     I18n.locale = "pt-BR";
     expect(I18n.l("percentage", 123.45)).toEqual("123,45%");

data/spec/js/pluralization.spec.js

@@ -32,7 +32,7 @@ describe("Pluralization", function(){
   });
 
   it("pluralizes using negative values", function(){
-    expect(I18n.p(-1, "inbox")).toEqual("You have -1 message");
+    expect(I18n.p(-1, "inbox")).toEqual("You have -1 messages");
     expect(I18n.p(-5, "inbox")).toEqual("You have -5 messages");
   });
 
@@ -76,6 +76,7 @@ describe("Pluralization", function(){
 
     expect(I18n.p(0, "things")).toEqual("No things");
     expect(I18n.p(4, "things")).toEqual("A few things");
+    expect(I18n.p(-4, "things")).toEqual("-4 things");
     expect(I18n.p(10, "things")).toEqual("10 things");
   });
 

data/spec/js/translations.js

@@ -88,6 +88,7 @@ var DEBUG = false;
               "default": "%d/%m/%Y"
             , "short": "%d de %B"
             , "long": "%d de %B de %Y"
+            , "short_with_placeholders": "%d de %B {{p1}} {{p2}}"
           }
           , day_names: ["Domingo", "Segunda", "Terça", "Quarta", "Quinta", "Sexta", "Sábado"]
           , abbr_day_names: ["Dom", "Seg", "Ter", "Qua", "Qui", "Sex", "Sáb"]
@@ -100,6 +101,7 @@ var DEBUG = false;
                 "default": "%A, %d de %B de %Y, %H:%M h"
               , "short": "%d/%m, %H:%M h"
               , "long": "%A, %d de %B de %Y, %H:%M h"
+              , "short_with_placeholders": "%d/%m, %H:%M h {{p1}}"
             }
           , am: "AM"
           , pm: "PM"

data/spec/spec_helper.rb

@@ -24,6 +24,15 @@ module Helpers
   def temp_path(file_name = "")
     File.expand_path("../../tmp/i18n-js/#{file_name}", __FILE__)
   end
+
+
+  def self.included(base)
+    base.let(:backend_class_with_fallbacks) do
+      klass = Class.new(I18n::Backend::Simple)
+      klass.send(:include, I18n::Backend::Fallbacks)
+      klass
+    end
+  end
 end
 
 RSpec.configure do |config|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-js
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc7
+  version: 3.0.0.rc8
 platform: ruby
 authors:
 - Nando Vieira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-20 00:00:00.000000000 Z
+date: 2014-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -132,6 +132,7 @@ files:
 - lib/i18n/js.rb
 - lib/i18n/js/dependencies.rb
 - lib/i18n/js/engine.rb
+- lib/i18n/js/fallback_locales.rb
 - lib/i18n/js/middleware.rb
 - lib/i18n/js/utils.rb
 - lib/i18n/js/version.rb
@@ -143,6 +144,11 @@ files:
 - spec/fixtures/default.yml
 - spec/fixtures/erb.yml
 - spec/fixtures/js_file_per_locale.yml
+- spec/fixtures/js_file_per_locale_with_fallbacks_as_default_locale_symbol.yml
+- spec/fixtures/js_file_per_locale_with_fallbacks_as_hash.yml
+- spec/fixtures/js_file_per_locale_with_fallbacks_as_locale.yml
+- spec/fixtures/js_file_per_locale_with_fallbacks_enabled.yml
+- spec/fixtures/js_file_per_locale_without_fallbacks.yml
 - spec/fixtures/locales.yml
 - spec/fixtures/multiple_conditions.yml
 - spec/fixtures/multiple_conditions_per_locale.yml
@@ -150,6 +156,7 @@ 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
@@ -191,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: It's a small library to provide the Rails I18n translations on the Javascript.
@@ -200,6 +207,11 @@ test_files:
 - spec/fixtures/default.yml
 - spec/fixtures/erb.yml
 - spec/fixtures/js_file_per_locale.yml
+- spec/fixtures/js_file_per_locale_with_fallbacks_as_default_locale_symbol.yml
+- spec/fixtures/js_file_per_locale_with_fallbacks_as_hash.yml
+- spec/fixtures/js_file_per_locale_with_fallbacks_as_locale.yml
+- spec/fixtures/js_file_per_locale_with_fallbacks_enabled.yml
+- spec/fixtures/js_file_per_locale_without_fallbacks.yml
 - spec/fixtures/locales.yml
 - spec/fixtures/multiple_conditions.yml
 - spec/fixtures/multiple_conditions_per_locale.yml
@@ -207,6 +219,7 @@ 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