i18n-js 1.0.0 → 1.0.1

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    i18n-js (0.1.6)
+    i18n-js (1.0.1)
       i18n
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.0.3)
+    activesupport (3.0.5)
     archive-tar-minitar (0.5.2)
     columnize (0.3.2)
     diff-lcs (1.1.2)

data/README.rdoc

@@ -24,14 +24,14 @@ Every time your application is started, the translations messages defined in you
 To speed up the development process, you can automatically export your messages by adding something
 like this to your <tt>ApplicationController</tt>:
 
-	class ApplicationController < ActionController::Base
-	  before_filter :export_i18n_messages
+  class ApplicationController < ActionController::Base
+    before_filter :export_i18n_messages
 
-	  private
+    private
     def export_i18n_messages
       SimplesIdeias::I18n.export! if Rails.env.development?
     end
-	end
+  end
 
 ==== Configuration
 
@@ -130,7 +130,7 @@ Similar to Rails helpers, you have localize number and currency formatting.
   I18n.l("percentage", 123.45);
   // 123.450%
 
-To have more control over number formatting, you can use the <tt>I18n.toNumber</tt>, <tt>I18n.toPercentage</tt> and <tt>I18n.toCurrency</tt> functions.
+To have more control over number formatting, you can use the <tt>I18n.toNumber</tt>, <tt>I18n.toPercentage</tt>, <tt>I18n.toCurrency</tt> and <tt>I18n.toHumanSize</tt> functions.
 
   I18n.toNumber(1000);     // 1,000.000
   I18n.toCurrency(1000);   // $1,000.00
@@ -141,6 +141,7 @@ The +toNumber+ and +toPercentage+ functions accept the following options:
 * +precision+: defaults to 3
 * +separator+: defaults to <tt>.</tt>
 * +delimiter+: defaults to <tt>,</tt>
+* +strip_insignificant_zeros+: defaults to <tt>false</tt>
 
 See some number formatting examples:
 
@@ -155,10 +156,23 @@ The +toCurrency+ function accepts the following options:
 * +delimiter+: sets the thousands delimiter
 * +format+: sets the format of the output string
 * +unit+: sets the denomination of the currency
+* +strip_insignificant_zeros+: defaults to <tt>false</tt>
 
 You can provide only the options you want to override:
 
-  I18n.toCurrency(1000, {precision: 0}); /$1,000/
+  I18n.toCurrency(1000, {precision: 0}); // $1,000
+
+The +toHumanSize+ function accepts the following options:
+
+* +precision+: defaults to 1
+* +separator+: defaults to <tt>.</tt>
+* +delimiter+: defaults to <tt>""</tt>
+* +strip_insignificant_zeros+: defaults to <tt>false</tt>
+* +format+: defaults to <tt>%n%u</tt>
+
+  I18n.toHumanSize(1234); // 1KB
+  I18n.toHumanSize(1234 * 1024); // 1MB
+
 
 ==== Date formatting
 
@@ -234,7 +248,7 @@ Once you've made your great commits:
 4. Create an Issue[http://github.com/fnando/i18n-js/issues] with a link to your branch
 5. That's it!
 
-Please respect the indentation rules. And use tabs, not spaces (on the JavaScript).
+Please respect the indentation rules. And use 2 spaces, not tabs.
 
 === Running tests
 

data/lib/i18n-js/version.rb

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

data/source/i18n.js

@@ -41,7 +41,7 @@ I18n.lookup = function(scope, options) {
     }
   }
 
-  if (!messages && options.defaultValue != null && options.defaultValue != undefined) {
+  if (!messages && options.defaultValue !== null && options.defaultValue !== undefined) {
     messages = options.defaultValue;
   }
 
@@ -67,7 +67,7 @@ I18n.prepareOptions = function() {
     }
 
     for (var key in opts) {
-      if (options[key] == undefined || options[key] == null) {
+      if (options[key] === undefined || options[key] === null) {
         options[key] = opts[key];
       }
     }
@@ -91,7 +91,7 @@ I18n.interpolate = function(message, options) {
 
     value = options[name];
 
-    if (options[name] == null || options[name] == undefined) {
+    if (options[name] === null || options[name] === undefined) {
       value = "[missing " + placeholder + " value]";
     }
 
@@ -142,7 +142,7 @@ I18n.localize = function(scope, value) {
 I18n.parseDate = function(d) {
   var matches, date;
   matches = d.toString().match(/(\d{4})-(\d{2})-(\d{2})(?:[ |T](\d{2}):(\d{2}):(\d{2}))?(Z)?/);
-  
+
   if (matches) {
     // date/time strings: yyyy-mm-dd hh:mm:ss or yyyy-mm-dd or yyyy-mm-ddThh:mm:ssZ
     for (var i = 1; i <= 6; i++) {
@@ -191,6 +191,7 @@ I18n.strftime = function(date, format) {
   if (!options) {
     return date.toString();
   }
+  options.meridian = options.meridian || ["AM", "PM"];
 
   var weekDay = date.getDay();
   var day = date.getDate();
@@ -198,7 +199,7 @@ I18n.strftime = function(date, format) {
   var month = date.getMonth() + 1;
   var hour = date.getHours();
   var hour12 = hour;
-  var meridian = hour > 12? "PM" : "AM";
+  var meridian = hour > 11 ? 1 : 0;
   var secs = date.getSeconds();
   var mins = date.getMinutes();
   var offset = date.getTimezoneOffset();
@@ -208,6 +209,8 @@ I18n.strftime = function(date, format) {
 
   if (hour12 > 12) {
     hour12 = hour12 - 12;
+  } else if (hour12 === 0) {
+    hour12 = 12;
   }
 
   var padding = function(n) {
@@ -216,10 +219,10 @@ I18n.strftime = function(date, format) {
   };
 
   var f = format;
-  f = f.replace("%a", options["abbr_day_names"][weekDay]);
-  f = f.replace("%A", options["day_names"][weekDay]);
-  f = f.replace("%b", options["abbr_month_names"][month]);
-  f = f.replace("%B", options["month_names"][month]);
+  f = f.replace("%a", options.abbr_day_names[weekDay]);
+  f = f.replace("%A", options.day_names[weekDay]);
+  f = f.replace("%b", options.abbr_month_names[month]);
+  f = f.replace("%B", options.month_names[month]);
   f = f.replace("%d", padding(day));
   f = f.replace("%-d", day);
   f = f.replace("%H", padding(hour));
@@ -230,7 +233,7 @@ I18n.strftime = function(date, format) {
   f = f.replace("%-m", month);
   f = f.replace("%M", padding(mins));
   f = f.replace("%-M", mins);
-  f = f.replace("%p", meridian);
+  f = f.replace("%p", options.meridian[meridian]);
   f = f.replace("%S", padding(secs));
   f = f.replace("%-S", secs);
   f = f.replace("%w", weekDay);
@@ -246,11 +249,11 @@ I18n.toNumber = function(number, options) {
   options = this.prepareOptions(
     options,
     this.lookup("number.format"),
-    {precision: 3, separator: ".", delimiter: ","}
+    {precision: 3, separator: ".", delimiter: ",", strip_insignificant_zeros: false}
   );
-  
+
   var negative = number < 0;
-  var string = Math.abs(number).toFixed(options["precision"]).toString();
+  var string = Math.abs(number).toFixed(options.precision).toString();
   var parts = string.split(".");
 
   number = parts[0];
@@ -263,16 +266,27 @@ I18n.toNumber = function(number, options) {
     number = number.substr(0, number.length -3);
   }
 
-  var formattedNumber = n.join(options["delimiter"]);
+  var formattedNumber = n.join(options.delimiter);
 
-  if (options["precision"] > 0) {
-    formattedNumber += options["separator"] + parts[1];
+  if (options.precision > 0) {
+    formattedNumber += options.separator + parts[1];
   }
-  
+
   if (negative) {
     formattedNumber = "-" + formattedNumber;
   }
 
+  if (options.strip_insignificant_zeros) {
+    var regex = {
+        separator: new RegExp(options.separator.replace(/\./, "\\.") + "$")
+      , zeros: /0+$/
+    };
+
+    formattedNumber = formattedNumber
+      .replace(regex.zeros, "")
+      .replace(regex.separator, "");
+  }
+
   return formattedNumber;
 };
 
@@ -285,8 +299,8 @@ I18n.toCurrency = function(number, options) {
   );
 
   number = this.toNumber(number, options);
-  number = options["format"]
-    .replace("%u", options["unit"])
+  number = options.format
+    .replace("%u", options.unit)
     .replace("%n", number);
 
   return number;
@@ -297,33 +311,32 @@ I18n.toHumanSize = function(number, options) {
     , size = number
     , iterations = 0
     , unit
-    , precision;
-  
+    , precision
+  ;
+
   while (size >= kb && iterations < 4) {
     size = size / kb;
     iterations += 1;
-  };
-  
-  switch (iterations) {
-    case 0:
-      unit = this.t("number.human.storage_units.units.byte", {count: size});
-      precision = 0;
-      break;
-    default:
-      unit = this.t("number.human.storage_units.units." + [null, "kb", "mb", "gb", "tb"][iterations]);
-      precision = (size - Math.floor(size) == 0) ? 0 : 1;
-  };
-  
+  }
+
+  if (iterations === 0) {
+    unit = this.t("number.human.storage_units.units.byte", {count: size});
+    precision = 0;
+  } else {
+    unit = this.t("number.human.storage_units.units." + [null, "kb", "mb", "gb", "tb"][iterations]);
+    precision = (size - Math.floor(size) === 0) ? 0 : 1;
+  }
+
   options = this.prepareOptions(
     options,
     {precision: precision, format: "%n%u", delimiter: ""}
   );
-  
+
   number = this.toNumber(size, options);
-  number = options["format"]
+  number = options.format
     .replace("%u", unit)
     .replace("%n", number);
-  
+
   return number;
 };
 
@@ -341,28 +354,28 @@ I18n.toPercentage = function(number, options) {
 
 I18n.pluralize = function(count, scope, options) {
   var translation;
-  
+
   try {
     translation = this.lookup(scope, options);
   } catch (error) {}
-  
+
   if (!translation) {
     return this.missingTranslation(scope);
   }
-  
+
   var message;
   options = this.prepareOptions(options);
-  options["count"] = count.toString();
+  options.count = count.toString();
 
   switch(Math.abs(count)) {
     case 0:
-      message = translation["zero"] || translation["none"] || translation["other"] || this.missingTranslation(scope, "zero");
+      message = translation.zero || translation.none || translation.other || this.missingTranslation(scope, "zero");
       break;
     case 1:
-      message = translation["one"] || this.missingTranslation(scope, "one");
+      message = translation.one || this.missingTranslation(scope, "one");
       break;
     default:
-      message = translation["other"] || this.missingTranslation(scope, "other");
+      message = translation.other || this.missingTranslation(scope, "other");
   }
 
   return this.interpolate(message, options);

data/spec/i18n_spec.js

@@ -76,6 +76,21 @@ describe("I18n.js", function(){
           am: "AM",
           pm: "PM"
         }
+      },
+
+      "en-US": {
+        date: {
+          formats: {
+            "default": "%d/%m/%Y",
+            "short": "%d de %B",
+            "long": "%d de %B de %Y"
+          },
+            day_names: ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"],
+            abbr_day_names: ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"],
+            month_names: [null, "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"],
+            abbr_month_names: [null, "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sept", "Oct", "Nov", "Dec"],
+            meridian: ["am", "pm"]
+        }
       }
     };
   });
@@ -505,6 +520,33 @@ describe("I18n.js", function(){
     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);
+    expect(I18n.strftime(date, "%p")).toBeEqualTo("pm");
+  });
+
+  specify("date formatting meridian boundaries", function(){
+    I18n.locale = "en-US";
+    var date = new Date(2009, 3, 26, 0, 35, 44);
+    expect(I18n.strftime(date, "%p")).toBeEqualTo("am");
+
+    date = new Date(2009, 3, 26, 12, 35, 44);
+    expect(I18n.strftime(date, "%p")).toBeEqualTo("pm");
+  });
+
+  specify("date formatting hour12 values", function(){
+    I18n.locale = "pt-BR";
+    var date = new Date(2009, 3, 26, 19, 35, 44);
+    expect(I18n.strftime(date, "%I")).toBeEqualTo("07");
+
+    date = new Date(2009, 3, 26, 12, 35, 44);
+    expect(I18n.strftime(date, "%I")).toBeEqualTo("12");
+
+    date = new Date(2009, 3, 26, 0, 35, 44);
+    expect(I18n.strftime(date, "%I")).toBeEqualTo("12");
+  });
+
   specify("localize date strings", function(){
     I18n.locale = "pt-BR";
   
@@ -683,4 +725,13 @@ describe("I18n.js", function(){
   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");
+    expect(I18n.toHumanSize(1.2, options)).toBeEqualTo("1.2Bytes");
+  });
 });

metadata

@@ -2,7 +2,7 @@
 name: i18n-js
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors: 
 - Nando Vieira
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-07 00:00:00 -02:00
+date: 2011-03-11 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -135,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.6.0
 signing_key: 
 specification_version: 3
 summary: It's a small library to provide the Rails I18n translations on the Javascript.