i18n-js 1.0.2 → 1.1.0

data/.rspec

@@ -0,0 +1 @@
+--color --format documentation

data/Gemfile.lock

@@ -1,30 +1,31 @@
 PATH
   remote: .
   specs:
-    i18n-js (1.0.2)
+    i18n-js (1.1.0)
       i18n
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.0.5)
+    activesupport (3.0.9)
     archive-tar-minitar (0.5.2)
-    columnize (0.3.2)
+    columnize (0.3.4)
     diff-lcs (1.1.2)
     fakeweb (1.3.0)
-    i18n (0.5.0)
-    linecache19 (0.5.11)
+    i18n (0.6.0)
+    linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
-    notifier (0.1.2)
-    rspec (2.5.0)
-      rspec-core (~> 2.5.0)
-      rspec-expectations (~> 2.5.0)
-      rspec-mocks (~> 2.5.0)
-    rspec-core (2.5.1)
-    rspec-expectations (2.5.0)
+    notifier (0.1.3)
+    rake (0.8.7)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.5.0)
-    ruby-debug-base19 (0.11.24)
+    rspec-mocks (2.6.0)
+    ruby-debug-base19 (0.11.25)
       columnize (>= 0.3.1)
       linecache19 (>= 0.5.11)
       ruby_core_source (>= 0.1.4)
@@ -32,7 +33,7 @@ GEM
       columnize (>= 0.3.1)
       linecache19 (>= 0.5.11)
       ruby-debug-base19 (>= 0.11.19)
-    ruby_core_source (0.1.4)
+    ruby_core_source (0.1.5)
       archive-tar-minitar (>= 0.5.2)
     spec-js (0.1.0.beta.3)
       notifier
@@ -41,9 +42,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport (~> 3.0.0)
+  activesupport (>= 3.0.0)
   fakeweb
   i18n-js!
-  rspec (~> 2.5.0)
+  rake (= 0.8.7)
+  rspec (~> 2.6)
   ruby-debug19
   spec-js (~> 0.1.0.beta.0)

data/README.rdoc

@@ -17,21 +17,22 @@ This library has been tested on:
 
 === Setting up
 
+==== Rails <= 3.0
 Run <tt>rake i18n:setup</tt> to copy <tt>i18n.js</tt> to your javascript directory and <tt>i18n-js.yml</tt> to your config folder (if not already present). Then you're ready to go!
 
-Every time your application is started, the translations messages defined in your configuration file will be generated.
+==== Rails >= 3.1
+Run <tt>rake i18n:setup</tt> to copy <tt>i18n-js.yml</tt> to your config folder (if not already present). You should change the path in <tt>i18n.js.yml</tt> to <tt>app/assets/javascripts/i18n</tt> to make full use of the asset pipeline.
+Next add the following lines to your application.js to make the javascripts and translations available to your app:
 
-To speed up the development process, you can automatically export your messages by adding something
-like this to your <tt>ApplicationController</tt>:
+  //= require i18n
+  //= require i18n/translations
 
-  class ApplicationController < ActionController::Base
-    before_filter :export_i18n_messages
+If you don't want to use the asset pipeline, just disable it on your configuration file by setting <tt>asset_pipeline</tt> to <tt>false</tt>.
 
-    private
-    def export_i18n_messages
-      SimplesIdeias::I18n.export! if Rails.env.development?
-    end
-  end
+==== Exporting translations
+
+You can export the translations file by running `rake i18n:js:export`. Translations will be automatically exported in development mode, but you can set the <tt>auto_export</tt> option
+to <tt>true</tt> on your configuration file if you want to export translations when your app is booted.
 
 ==== Configuration
 
@@ -258,7 +259,7 @@ To run Ruby tests, you need to install http://github.com/rspec/rspec
 
 To run JavaScript tests, you need to install http://github.com/fnando/spec-js
 
-  gem install specjs
+  gem install spec-js --pre
 
 Then just run `rake spec`.
 

data/config/i18n-js.yml

@@ -0,0 +1,18 @@
+# Find more details about this configuration file
+# at http://github.com/fnando/i18n-js
+
+# Automatically export translations when running in
+# development mode, or once when your app is booted
+# in production mode.
+auto_export: no
+
+# Split context in several files.
+# By default only one file is exported.
+translations:
+  - file: "public/javascripts/translations.js"
+    only: "*"
+
+# Use Rails 3.1 asset pipeline feature.
+# You can disable it by changing the following
+# line to "no".
+asset_pipeline: yes

data/i18n-js.gemspec

@@ -19,8 +19,9 @@ Gem::Specification.new do |s|
 
   s.add_dependency "i18n"
   s.add_development_dependency "fakeweb"
-  s.add_development_dependency "activesupport", "~> 3.0.0"
-  s.add_development_dependency "rspec", "~> 2.5.0"
+  s.add_development_dependency "activesupport", ">= 3.0.0"
+  s.add_development_dependency "rspec", "~> 2.6"
   s.add_development_dependency "ruby-debug19"
   s.add_development_dependency "spec-js", "~> 0.1.0.beta.0"
+  s.add_development_dependency "rake", "0.8.7"
 end

data/lib/i18n-js.rb

@@ -5,6 +5,7 @@ module SimplesIdeias
     extend self
 
     require "i18n-js/railtie" if Rails.version >= "3.0"
+    require "i18n-js/engine" if Rails.version >= "3.1"
 
     # deep_merge by Stefan Rusterholz, see http://www.ruby-forum.com/topic/142809
     MERGER = proc { |key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &MERGER) : v2 }
@@ -13,8 +14,16 @@ module SimplesIdeias
       Rails.root.join("config/i18n-js.yml")
     end
 
+    def export_dir
+      if Rails.version >= "3.1" && config.fetch(:asset_pipeline, true)
+        "app/assets/javascripts/i18n"
+      else
+        "public/javascripts"
+      end
+    end
+
     def javascript_file
-      Rails.root.join("public/javascripts/i18n.js")
+      Rails.root.join(export_dir, "i18n.js")
     end
 
     # Export translations to JavaScript, considering settings
@@ -32,14 +41,23 @@ module SimplesIdeias
           end
         end
       else
-        save translations, "public/javascripts/translations.js"
+        save translations, "#{export_dir}/translations.js"
       end
     end
 
     # Load configuration file for partial exporting and
     # custom output directory
     def config
-      HashWithIndifferentAccess.new YAML.load_file(config_file)
+      if config?
+        YAML.load_file(config_file).with_indifferent_access
+      else
+        {}
+      end
+    end
+
+    # Check if translations can be automatically exported.
+    def auto_export?
+      Rails.env.development? || (config? && config[:auto_export])
     end
 
     # Check if configuration file exist
@@ -50,8 +68,8 @@ module SimplesIdeias
     # Copy configuration and JavaScript library files to
     # <tt>config/i18n-js.yml</tt> and <tt>public/javascripts/i18n.js</tt>.
     def setup!
-      FileUtils.cp File.dirname(__FILE__) + "/../source/i18n.js", javascript_file
-      FileUtils.cp(File.dirname(__FILE__) + "/../source/i18n-js.yml", config_file) unless config?
+      FileUtils.cp(File.dirname(__FILE__) + "/../vendor/assets/javascripts/i18n.js", javascript_file) unless Rails.version >= "3.1"
+      FileUtils.cp(File.dirname(__FILE__) + "/../config/i18n-js.yml", config_file) unless config?
     end
 
     # Retrieve an updated JavaScript library from Github.

data/lib/i18n-js/engine.rb

@@ -0,0 +1,7 @@
+module SimplesIdeias
+  module I18n
+    class Engine < ::Rails::Engine
+      # Engine so the vendor directory gets recognized by the asset pipeline
+    end
+  end
+end

data/lib/i18n-js/railtie.rb

@@ -2,7 +2,13 @@ module SimplesIdeias
   module I18n
     class Railtie < Rails::Railtie
       rake_tasks do
-        load File.dirname(__FILE__) + "/../tasks/i18n-js_tasks.rake"
+        require "i18n-js/rake"
+      end
+
+      config.to_prepare do
+        SimplesIdeias::I18n.tap do |i18n|
+          i18n.export! if i18n.auto_export?
+        end
       end
     end
   end

data/lib/{tasks/i18n-js_tasks.rake → i18n-js/rake.rb}

@@ -1,4 +1,4 @@
-namespace :i18n do
+namespace "i18n:js" do
   desc "Copy i18n.js and configuration file"
   task :setup => :environment do
     SimplesIdeias::I18n.setup!

data/lib/i18n-js/version.rb

@@ -2,8 +2,8 @@ module SimplesIdeias
   module I18n
     module Version
       MAJOR = 1
-      MINOR = 0
-      PATCH = 2
+      MINOR = 1
+      PATCH = 0
       STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
     end
   end

data/spec/i18n_spec.js

@@ -1,4 +1,4 @@
-load("source/i18n.js");
+load("vendor/assets/javascripts/i18n.js");
 
 describe("I18n.js", function(){
   before(function() {
@@ -34,7 +34,7 @@ describe("I18n.js", function(){
                   one: "Byte",
                   other: "Bytes"
                 },
-                
+
                 "kb": "KB",
                 "mb": "MB",
                 "gb": "GB",
@@ -94,128 +94,128 @@ describe("I18n.js", function(){
       }
     };
   });
-  
+
   specify("with default options", function(){
     expect(I18n.defaultLocale).toBeEqualTo("en");
     expect(I18n.locale).toBeEqualTo(null);
     expect(I18n.currentLocale()).toBeEqualTo("en");
   });
-  
+
   specify("with custom locale", function(){
     I18n.locale = "pt-BR";
     expect(I18n.currentLocale()).toBeEqualTo("pt-BR");
   });
-  
+
   specify("aliases", function(){
     expect(I18n.t).toBe(I18n.translate);
     expect(I18n.l).toBe(I18n.localize);
     expect(I18n.p).toBe(I18n.pluralize);
   });
-  
+
   specify("translation with single scope", function(){
     expect(I18n.t("hello")).toBeEqualTo("Hello World!");
   });
-  
+
   specify("translation as object", function(){
     expect(I18n.t("greetings")).toBeInstanceOf(Object);
   });
-  
+
   specify("translation with invalid scope shall not block", function(){
     actual = I18n.t("invalid.scope.shall.not.block");
     expected = '[missing "en.invalid.scope.shall.not.block" translation]';
     expect(actual).toBeEqualTo(expected);
   });
-  
+
   specify("translation for single scope on a custom locale", function(){
     I18n.locale = "pt-BR";
     expect(I18n.t("hello")).toBeEqualTo("Olá Mundo!");
   });
-  
+
   specify("translation for multiple scopes", function(){
     expect(I18n.t("greetings.stranger")).toBeEqualTo("Hello stranger!");
   });
-  
+
   specify("single interpolation", function(){
     actual = I18n.t("greetings.name", {name: "John Doe"});
     expect(actual).toBeEqualTo("Hello John Doe!");
   });
-  
+
   specify("multiple interpolation", function(){
     actual = I18n.t("profile.details", {name: "John Doe", age: 27});
     expect(actual).toBeEqualTo("John Doe is 27-years old");
   });
-  
+
   specify("translation with count option", function(){
     expect(I18n.t("inbox", {count: 0})).toBeEqualTo("You have no messages");
     expect(I18n.t("inbox", {count: 1})).toBeEqualTo("You have 1 message");
     expect(I18n.t("inbox", {count: 5})).toBeEqualTo("You have 5 messages");
   });
-  
+
   specify("translation with count option and multiple placeholders", function(){
     actual = I18n.t("unread", {unread: 5, count: 1});
     expect(actual).toBeEqualTo("You have 1 new message (5 unread)");
-  
+
     actual = I18n.t("unread", {unread: 2, count: 10});
     expect(actual).toBeEqualTo("You have 10 new messages (2 unread)");
-  
+
     actual = I18n.t("unread", {unread: 5, count: 0});
     expect(actual).toBeEqualTo("You have no new messages (5 unread)");
   });
-  
+
   specify("missing translation with count option", function(){
     actual = I18n.t("invalid", {count: 1});
     expect(actual).toBeEqualTo('[missing "en.invalid" translation]');
-  
+
     I18n.translations.en.inbox.one = null;
     actual = I18n.t("inbox", {count: 1});
     expect(actual).toBeEqualTo('[missing "en.inbox.one" translation]');
   });
-  
+
   specify("pluralization", function(){
     expect(I18n.p(0, "inbox")).toBeEqualTo("You have no messages");
     expect(I18n.p(1, "inbox")).toBeEqualTo("You have 1 message");
     expect(I18n.p(5, "inbox")).toBeEqualTo("You have 5 messages");
   });
-  
+
   specify("pluralize should return 'other' scope", function(){
     I18n.translations["en"]["inbox"]["zero"] = null;
     expect(I18n.p(0, "inbox")).toBeEqualTo("You have 0 messages");
   });
-  
+
   specify("pluralize should return 'zero' scope", function(){
     I18n.translations["en"]["inbox"]["zero"] = "No messages (zero)";
     I18n.translations["en"]["inbox"]["none"] = "No messages (none)";
-  
+
     expect(I18n.p(0, "inbox")).toBeEqualTo("No messages (zero)");
   });
-  
+
   specify("pluralize should return 'none' scope", function(){
     I18n.translations["en"]["inbox"]["zero"] = null;
     I18n.translations["en"]["inbox"]["none"] = "No messages (none)";
-  
+
     expect(I18n.p(0, "inbox")).toBeEqualTo("No messages (none)");
   });
-  
+
   specify("pluralize with negative values", function(){
     expect(I18n.p(-1, "inbox")).toBeEqualTo("You have -1 message");
     expect(I18n.p(-5, "inbox")).toBeEqualTo("You have -5 messages");
   });
-  
+
   specify("pluralize with missing scope", function(){
     expect(I18n.p(-1, "missing")).toBeEqualTo('[missing "en.missing" translation]');
   });
-  
+
   specify("pluralize with multiple placeholders", function(){
     actual = I18n.p(1, "unread", {unread: 5});
     expect(actual).toBeEqualTo("You have 1 new message (5 unread)");
-  
+
     actual = I18n.p(10, "unread", {unread: 2});
     expect(actual).toBeEqualTo("You have 10 new messages (2 unread)");
-  
+
     actual = I18n.p(0, "unread", {unread: 5});
     expect(actual).toBeEqualTo("You have no new messages (5 unread)");
   });
-  
+
   specify("pluralize should allow empty strings", function(){
     I18n.translations["en"]["inbox"]["zero"] = "";
 
@@ -233,7 +233,7 @@ describe("I18n.js", function(){
     expect(I18n.toNumber(12345678)).toBeEqualTo("12,345,678.000");
     expect(I18n.toNumber(123456789)).toBeEqualTo("123,456,789.000");
   });
-  
+
   specify("negative numbers with default settings", function(){
     expect(I18n.toNumber(-1)).toBeEqualTo("-1.000");
     expect(I18n.toNumber(-12)).toBeEqualTo("-12.000");
@@ -245,17 +245,17 @@ describe("I18n.js", function(){
     expect(I18n.toNumber(-12345678)).toBeEqualTo("-12,345,678.000");
     expect(I18n.toNumber(-123456789)).toBeEqualTo("-123,456,789.000");
   });
-  
+
   specify("numbers with partial translation and default options", function(){
     I18n.translations.en.number = {
       format: {
         precision: 2
       }
     };
-  
+
     expect(I18n.toNumber(1234)).toBeEqualTo("1,234.00");
   });
-  
+
   specify("numbers with full translation and default options", function(){
     I18n.translations.en.number = {
       format: {
@@ -264,23 +264,23 @@ describe("I18n.js", function(){
         precision: 2
       }
     };
-  
+
     expect(I18n.toNumber(1234)).toBeEqualTo("1.234,00");
   });
-  
+
   specify("numbers with some custom options that should be merged with default options", function(){
     expect(I18n.toNumber(1234, {precision: 0})).toBeEqualTo("1,234");
     expect(I18n.toNumber(1234, {separator: '-'})).toBeEqualTo("1,234-000");
     expect(I18n.toNumber(1234, {delimiter: '-'})).toBeEqualTo("1-234.000");
   });
-  
+
   specify("numbers considering options", function(){
     options = {
       precision: 2,
       separator: ",",
       delimiter: "."
     };
-  
+
     expect(I18n.toNumber(1, options)).toBeEqualTo("1,00");
     expect(I18n.toNumber(12, options)).toBeEqualTo("12,00");
     expect(I18n.toNumber(123, options)).toBeEqualTo("123,00");
@@ -289,31 +289,31 @@ describe("I18n.js", function(){
     expect(I18n.toNumber(1234567, options)).toBeEqualTo("1.234.567,00");
     expect(I18n.toNumber(12345678, options)).toBeEqualTo("12.345.678,00");
   });
-  
+
   specify("numbers with different precisions", function(){
     options = {separator: ".", delimiter: ","};
-  
+
     options["precision"] = 2;
     expect(I18n.toNumber(1.98, options)).toBeEqualTo("1.98");
-  
+
     options["precision"] = 3;
     expect(I18n.toNumber(1.98, options)).toBeEqualTo("1.980");
-  
+
     options["precision"] = 2;
     expect(I18n.toNumber(1.987, options)).toBeEqualTo("1.99");
-  
+
     options["precision"] = 1;
     expect(I18n.toNumber(1.98, options)).toBeEqualTo("2.0");
-  
+
     options["precision"] = 0;
     expect(I18n.toNumber(1.98, options)).toBeEqualTo("2");
   });
-  
+
   specify("currency with default settings", function(){
     expect(I18n.toCurrency(100.99)).toBeEqualTo("$100.99");
     expect(I18n.toCurrency(1000.99)).toBeEqualTo("$1,000.99");
   });
-  
+
   specify("currency with custom settings", function(){
     I18n.translations.en.number = {
       currency: {
@@ -326,12 +326,12 @@ describe("I18n.js", function(){
         }
       }
     };
-  
+
     expect(I18n.toCurrency(12)).toBeEqualTo("12,00 USD");
     expect(I18n.toCurrency(123)).toBeEqualTo("123,00 USD");
     expect(I18n.toCurrency(1234.56)).toBeEqualTo("1.234,56 USD");
   });
-  
+
   specify("currency with custom settings and partial overriding", function(){
     I18n.translations.en.number = {
       currency: {
@@ -344,11 +344,11 @@ describe("I18n.js", function(){
         }
       }
     };
-  
+
     expect(I18n.toCurrency(12, {precision: 0})).toBeEqualTo("12 USD");
     expect(I18n.toCurrency(123, {unit: "bucks"})).toBeEqualTo("123,00 bucks");
   });
-  
+
   specify("currency with some custom options that should be merged with default options", function(){
     expect(I18n.toCurrency(1234, {precision: 0})).toBeEqualTo("$1,234");
     expect(I18n.toCurrency(1234, {unit: "º"})).toBeEqualTo("º1,234.00");
@@ -356,176 +356,185 @@ describe("I18n.js", function(){
     expect(I18n.toCurrency(1234, {delimiter: "-"})).toBeEqualTo("$1-234.00");
     expect(I18n.toCurrency(1234, {format: "%u %n"})).toBeEqualTo("$ 1,234.00");
   });
-  
+
   specify("localize numbers", function(){
     expect(I18n.l("number", 1234567)).toBeEqualTo("1,234,567.000");
   });
-  
+
   specify("localize currency", function(){
     expect(I18n.l("currency", 1234567)).toBeEqualTo("$1,234,567.00");
   });
-  
+
   specify("parse date", function(){
     expected = new Date(2009, 0, 24, 0, 0, 0);
     actual = I18n.parseDate("2009-01-24");
     expect(actual.toString()).toBeEqualTo(expected.toString());
-  
+
     expected = new Date(2009, 0, 24, 0, 15, 0);
     actual = I18n.parseDate("2009-01-24 00:15:00");
     expect(actual.toString()).toBeEqualTo(expected.toString());
-  
+
     expected = new Date(2009, 0, 24, 0, 0, 15);
     actual = I18n.parseDate("2009-01-24 00:00:15");
     expect(actual.toString()).toBeEqualTo(expected.toString());
-  
+
     expected = new Date(2009, 0, 24, 15, 33, 44);
     actual = I18n.parseDate("2009-01-24 15:33:44");
     expect(actual.toString()).toBeEqualTo(expected.toString());
-  
+
     expected = new Date(2009, 0, 24, 0, 0, 0);
     actual = I18n.parseDate(expected.getTime());
     expect(actual.toString()).toBeEqualTo(expected.toString());
-  
+
     expected = new Date(2009, 0, 24, 0, 0, 0);
     actual = I18n.parseDate("01/24/2009");
     expect(actual.toString()).toBeEqualTo(expected.toString());
-  
+
     expected = new Date(2009, 0, 24, 14, 33, 55);
     actual = I18n.parseDate(expected).toString();
     expect(actual).toBeEqualTo(expected.toString());
-  
+
     expected = new Date(2009, 0, 24, 15, 33, 44);
     actual = I18n.parseDate("2009-01-24T15:33:44");
     expect(actual.toString()).toBeEqualTo(expected.toString());
-  
+
+    expected = new Date(Date.UTC(2011, 6, 20, 12, 51, 55));
+    actual = I18n.parseDate("2011-07-20T12:51:55+0000");
+    expect(actual.toString()).toBeEqualTo(expected.toString());
+
+    expected = new Date(Date.UTC(2011, 6, 20, 13, 03, 39));
+    actual = I18n.parseDate("Wed Jul 20 13:03:39 +0000 2011");
+    expect(actual.toString()).toBeEqualTo(expected.toString());
+
     expected = new Date(Date.UTC(2009, 0, 24, 15, 33, 44));
     actual = I18n.parseDate("2009-01-24T15:33:44Z");
     expect(actual.toString()).toBeEqualTo(expected.toString());
   });
-  
+
   specify("date formatting", function(){
     I18n.locale = "pt-BR";
-  
+
     // 2009-04-26 19:35:44 (Sunday)
     var date = new Date(2009, 3, 26, 19, 35, 44);
-  
+
     // short week day
     expect(I18n.strftime(date, "%a")).toBeEqualTo("Dom");
-  
+
     // full week day
     expect(I18n.strftime(date, "%A")).toBeEqualTo("Domingo");
-  
+
     // short month
     expect(I18n.strftime(date, "%b")).toBeEqualTo("Abr");
-  
+
     // full month
     expect(I18n.strftime(date, "%B")).toBeEqualTo("Abril");
-  
+
     // day
     expect(I18n.strftime(date, "%d")).toBeEqualTo("26");
-  
+
     // 24-hour
     expect(I18n.strftime(date, "%H")).toBeEqualTo("19");
-  
+
     // 12-hour
     expect(I18n.strftime(date, "%I")).toBeEqualTo("07");
-  
+
     // month
     expect(I18n.strftime(date, "%m")).toBeEqualTo("04");
-  
+
     // minutes
     expect(I18n.strftime(date, "%M")).toBeEqualTo("35");
-  
+
     // meridian
     expect(I18n.strftime(date, "%p")).toBeEqualTo("PM");
-  
+
     // seconds
     expect(I18n.strftime(date, "%S")).toBeEqualTo("44");
-  
+
     // week day
     expect(I18n.strftime(date, "%w")).toBeEqualTo("0");
-  
+
     // short year
     expect(I18n.strftime(date, "%y")).toBeEqualTo("09");
-  
+
     // full year
     expect(I18n.strftime(date, "%Y")).toBeEqualTo("2009");
   });
-  
+
   specify("date formatting without padding", function(){
     I18n.locale = "pt-BR";
-  
+
     // 2009-04-26 19:35:44 (Sunday)
     var date = new Date(2009, 3, 9, 7, 8, 9);
-  
+
     // 24-hour without padding
     expect(I18n.strftime(date, "%-H")).toBeEqualTo("7");
-  
+
     // 12-hour without padding
     expect(I18n.strftime(date, "%-I")).toBeEqualTo("7");
-  
+
     // minutes without padding
     expect(I18n.strftime(date, "%-M")).toBeEqualTo("8");
-  
+
     // seconds without padding
     expect(I18n.strftime(date, "%-S")).toBeEqualTo("9");
-  
+
     // short year without padding
     expect(I18n.strftime(date, "%-y")).toBeEqualTo("9");
-  
+
     // month without padding
     expect(I18n.strftime(date, "%-m")).toBeEqualTo("4");
-  
+
     // day without padding
     expect(I18n.strftime(date, "%-d")).toBeEqualTo("9");
+    expect(I18n.strftime(date, "%e")).toBeEqualTo("9");
   });
-  
+
   specify("date formatting with padding", function(){
     I18n.locale = "pt-BR";
-  
+
     // 2009-04-26 19:35:44 (Sunday)
     var date = new Date(2009, 3, 9, 7, 8, 9);
-  
+
     // 24-hour
     expect(I18n.strftime(date, "%H")).toBeEqualTo("07");
-  
+
     // 12-hour
     expect(I18n.strftime(date, "%I")).toBeEqualTo("07");
-  
+
     // minutes
     expect(I18n.strftime(date, "%M")).toBeEqualTo("08");
-  
+
     // seconds
     expect(I18n.strftime(date, "%S")).toBeEqualTo("09");
-  
+
     // short year
     expect(I18n.strftime(date, "%y")).toBeEqualTo("09");
-  
+
     // month
     expect(I18n.strftime(date, "%m")).toBeEqualTo("04");
-  
+
     // day
     expect(I18n.strftime(date, "%d")).toBeEqualTo("09");
   });
-  
+
   specify("date formatting with negative time zone", function(){
     I18n.locale = "pt-BR";
     var date = new Date(2009, 3, 26, 19, 35, 44);
     stub(date, "getTimezoneOffset()", 345);
-  
+
     expect(I18n.strftime(date, "%z")).toMatch(/^(\+|-)[\d]{4}$/);
     expect(I18n.strftime(date, "%z")).toBeEqualTo("-0545");
   });
-  
+
   specify("date formatting with positive time zone", function(){
     I18n.locale = "pt-BR";
     var date = new Date(2009, 3, 26, 19, 35, 44);
     stub(date, "getTimezoneOffset()", -345);
-  
+
     expect(I18n.strftime(date, "%z")).toMatch(/^(\+|-)[\d]{4}$/);
     expect(I18n.strftime(date, "%z")).toBeEqualTo("+0545");
   });
-  
+
   specify("date formatting with custom meridian", function(){
     I18n.locale = "en-US";
     var date = new Date(2009, 3, 26, 19, 35, 44);
@@ -555,78 +564,78 @@ describe("I18n.js", function(){
 
   specify("localize date strings", function(){
     I18n.locale = "pt-BR";
-  
+
     expect(I18n.l("date.formats.default", "2009-11-29")).toBeEqualTo("29/11/2009");
     expect(I18n.l("date.formats.short", "2009-01-07")).toBeEqualTo("07 de Janeiro");
     expect(I18n.l("date.formats.long", "2009-01-07")).toBeEqualTo("07 de Janeiro de 2009");
   });
-  
+
   specify("localize time strings", function(){
     I18n.locale = "pt-BR";
-    
+
     expect(I18n.l("time.formats.default", "2009-11-29 15:07:59")).toBeEqualTo("Domingo, 29 de Novembro de 2009, 15:07 h");
     expect(I18n.l("time.formats.short", "2009-01-07 09:12:35")).toBeEqualTo("07/01, 09:12 h");
     expect(I18n.l("time.formats.long", "2009-11-29 15:07:59")).toBeEqualTo("Domingo, 29 de Novembro de 2009, 15:07 h");
   });
-  
+
   specify("localize percentage", function(){
     I18n.locale = "pt-BR";
     expect(I18n.l("percentage", 123.45)).toBeEqualTo("123,45%");
   });
-  
+
   specify("default value for simple translation", function(){
     actual = I18n.t("warning", {defaultValue: "Warning!"});
     expect(actual).toBeEqualTo("Warning!");
   });
-  
+
   specify("default value with interpolation", function(){
     actual = I18n.t(
-      "alert", 
+      "alert",
       {defaultValue: "Attention! {{message}}", message: "You're out of quota!"}
     );
-    
+
     expect(actual).toBeEqualTo("Attention! You're out of quota!");
   });
-  
+
   specify("default value should not be used when scope exist", function(){
     actual = I18n.t("hello", {defaultValue: "What's up?"});
     expect(actual).toBeEqualTo("Hello World!");
   });
-  
+
   specify("default value for pluralize", function(){
     options = {defaultValue: {
       none: "No things here!",
       one: "There is {{count}} thing here!",
       other: "There are {{count}} things here!"
     }};
-  
+
     expect(I18n.p(0, "things", options)).toBeEqualTo("No things here!");
     expect(I18n.p(1, "things", options)).toBeEqualTo("There is 1 thing here!");
     expect(I18n.p(5, "things", options)).toBeEqualTo("There are 5 things here!");
   });
-  
+
   specify("default value for pluralize should not be used when scope exist", function(){
     options = {defaultValue: {
       none: "No things here!",
       one: "There is {{count}} thing here!",
       other: "There are {{count}} things here!"
     }};
-  
+
     expect(I18n.pluralize(0, "inbox", options)).toBeEqualTo("You have no messages");
     expect(I18n.pluralize(1, "inbox", options)).toBeEqualTo("You have 1 message");
     expect(I18n.pluralize(5, "inbox", options)).toBeEqualTo("You have 5 messages");
   });
-  
+
   specify("prepare options", function(){
     options = I18n.prepareOptions(
       {name: "Mary Doe"},
       {name: "John Doe", role: "user"}
     );
-  
+
     expect(options["name"]).toBeEqualTo("Mary Doe");
     expect(options["role"]).toBeEqualTo("user");
   });
-  
+
   specify("prepare options with multiple options", function(){
     options = I18n.prepareOptions(
       {name: "Mary Doe"},
@@ -635,27 +644,27 @@ describe("I18n.js", function(){
       {email: "mary@doe.com", url: "http://marydoe.com"},
       {role: "admin", email: "john@doe.com"}
     );
-  
+
     expect(options["name"]).toBeEqualTo("Mary Doe");
     expect(options["role"]).toBeEqualTo("user");
     expect(options["age"]).toBeEqualTo(33);
     expect(options["email"]).toBeEqualTo("mary@doe.com");
     expect(options["url"]).toBeEqualTo("http://marydoe.com");
   });
-  
+
   specify("prepare options should return an empty hash when values are null", function(){
     expect({}).toBeEqualTo(I18n.prepareOptions(null, null));
   });
-  
+
   specify("percentage with defaults", function(){
     expect(I18n.toPercentage(1234)).toBeEqualTo("1234.000%");
   });
-  
+
   specify("percentage with custom options", function(){
     actual = I18n.toPercentage(1234, {delimiter: "_", precision: 0});
     expect(actual).toBeEqualTo("1_234%");
   });
-  
+
   specify("percentage with translation", function(){
     I18n.translations.en.number = {
       percentage: {
@@ -666,10 +675,10 @@ describe("I18n.js", function(){
         }
       }
     };
-  
+
     expect(I18n.toPercentage(1234)).toBeEqualTo("1.234,00%");
   });
-  
+
   specify("percentage with translation and custom options", function(){
     I18n.translations.en.number = {
       percentage: {
@@ -680,61 +689,61 @@ describe("I18n.js", function(){
         }
       }
     };
-    
+
     actual = I18n.toPercentage(1234, {precision: 4, delimiter: "-", separator: "+"});
     expect(actual).toBeEqualTo("1-234+0000%");
   });
-  
+
   specify("scope option as string", function(){
     actual = I18n.t("stranger", {scope: "greetings"});
     expect(actual).toBeEqualTo("Hello stranger!");
   });
-  
+
   specify("scope as array", function(){
     actual = I18n.t(["greetings", "stranger"]);
     expect(actual).toBeEqualTo("Hello stranger!");
   });
-  
+
   specify("new placeholder syntax", function(){
     I18n.translations["en"]["new_syntax"] = "Hi %{name}!";
     actual = I18n.t("new_syntax", {name: "John"});
     expect(actual).toBeEqualTo("Hi John!");
   });
-  
+
   specify("return translation for custom scope separator", function(){
     I18n.defaultSeparator = "•";
     actual = I18n.t("greetings•stranger");
     expect(actual).toBeEqualTo("Hello stranger!");
   });
-  
+
   specify("return number as human size", function(){
     kb = 1024;
-    
+
     expect(I18n.toHumanSize(1)).toBeEqualTo("1Byte");
     expect(I18n.toHumanSize(100)).toBeEqualTo("100Bytes");
-    
+
     expect(I18n.toHumanSize(kb)).toBeEqualTo("1KB");
     expect(I18n.toHumanSize(kb * 1.5)).toBeEqualTo("1.5KB");
-    
+
     expect(I18n.toHumanSize(kb * kb)).toBeEqualTo("1MB");
     expect(I18n.toHumanSize(kb * kb * 1.5)).toBeEqualTo("1.5MB");
-    
+
     expect(I18n.toHumanSize(kb * kb * kb)).toBeEqualTo("1GB");
     expect(I18n.toHumanSize(kb * kb * kb * 1.5)).toBeEqualTo("1.5GB");
-    
+
     expect(I18n.toHumanSize(kb * kb * kb * kb)).toBeEqualTo("1TB");
     expect(I18n.toHumanSize(kb * kb * kb * kb * 1.5)).toBeEqualTo("1.5TB");
-    
+
     expect(I18n.toHumanSize(kb * kb * kb * kb * kb)).toBeEqualTo("1024TB");
   });
-  
+
   specify("return number as human size using custom options", function(){
     expect(I18n.toHumanSize(1024 * 1.6, {precision: 0})).toBeEqualTo("2KB");
   });
-  
+
   specify("return number without insignificant zeros", function(){
     options = {precision: 4, strip_insignificant_zeros: true};
-    
+
     expect(I18n.toNumber(65, options)).toBeEqualTo("65");
     expect(I18n.toNumber(1.2, options)).toBeEqualTo("1.2");
     expect(I18n.toCurrency(1.2, options)).toBeEqualTo("$1.2");