i18n-js 1.0.1 → 1.0.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    i18n-js (1.0.1)
+    i18n-js (1.0.2)
       i18n
 
 GEM

data/lib/i18n-js/version.rb

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

data/source/i18n.js

@@ -13,6 +13,12 @@ I18n.locale = null;
 // Set the placeholder format. Accepts `{{placeholder}}` and `%{placeholder}`.
 I18n.PLACEHOLDER = /(?:\{\{|%\{)(.*?)(?:\}\}?)/gm;
 
+I18n.isValidNode = function(obj, node) {
+    // local undefined variable in case another library corrupts window.undefined
+    var undef;
+    return obj[node] !== null && obj[node] !== undef;
+}
+
 I18n.lookup = function(scope, options) {
   var translations = this.prepareOptions(I18n.translations);
   var messages = translations[I18n.currentLocale()];
@@ -41,7 +47,7 @@ I18n.lookup = function(scope, options) {
     }
   }
 
-  if (!messages && options.defaultValue !== null && options.defaultValue !== undefined) {
+  if (!messages && this.isValidNode(options, "defaultValue")) {
     messages = options.defaultValue;
   }
 
@@ -67,7 +73,7 @@ I18n.prepareOptions = function() {
     }
 
     for (var key in opts) {
-      if (options[key] === undefined || options[key] === null) {
+      if (!this.isValidNode(options, key)) {
         options[key] = opts[key];
       }
     }
@@ -91,7 +97,7 @@ I18n.interpolate = function(message, options) {
 
     value = options[name];
 
-    if (options[name] === null || options[name] === undefined) {
+    if (!this.isValidNode(options, name)) {
       value = "[missing " + placeholder + " value]";
     }
 
@@ -369,13 +375,16 @@ I18n.pluralize = function(count, scope, options) {
 
   switch(Math.abs(count)) {
     case 0:
-      message = translation.zero || translation.none || translation.other || this.missingTranslation(scope, "zero");
+      message = this.isValidNode(translation, "zero") ? translation.zero :
+                this.isValidNode(translation, "none") ? translation.none :
+                this.isValidNode(translation, "other") ? translation.other :
+                this.missingTranslation(scope, "zero");
       break;
     case 1:
-      message = translation.one || this.missingTranslation(scope, "one");
+      message = this.isValidNode(translation, "one") ? translation.one : this.missingTranslation(scope, "one");
       break;
     default:
-      message = translation.other || this.missingTranslation(scope, "other");
+      message = this.isValidNode(translation, "other") ? translation.other : this.missingTranslation(scope, "other");
   }
 
   return this.interpolate(message, options);

data/spec/i18n_spec.js

@@ -216,6 +216,12 @@ describe("I18n.js", function(){
     expect(actual).toBeEqualTo("You have no new messages (5 unread)");
   });
   
+  specify("pluralize should allow empty strings", function(){
+    I18n.translations["en"]["inbox"]["zero"] = "";
+
+    expect(I18n.p(0, "inbox")).toBeEqualTo("");
+  });
+
   specify("numbers with default settings", function(){
     expect(I18n.toNumber(1)).toBeEqualTo("1.000");
     expect(I18n.toNumber(12)).toBeEqualTo("12.000");

metadata

@@ -2,7 +2,7 @@
 name: i18n-js
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors: 
 - Nando Vieira
@@ -10,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-11 00:00:00 -03:00
-default_executable: 
+date: 2011-04-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: i18n
@@ -111,7 +110,6 @@ files:
 - spec/resources/no_scope.yml
 - spec/resources/simple_scope.yml
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://rubygems.org/gems/i18n-js
 licenses: []
 
@@ -135,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.0
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: It's a small library to provide the Rails I18n translations on the Javascript.